From 71cd8e3a743046573744123777061b64881bf372 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Sat, 4 Jul 2015 17:13:50 +0300 Subject: Imported Upstream version 8.24 --- .mailmap | 10 +- .prev-version | 2 +- .tarball-version | 2 +- .version | 2 +- .vg-suppressions | 2 +- AUTHORS | 2 +- ChangeLog | 3895 ++++++-- ChangeLog-2005 | 2 +- ChangeLog-2006 | 2 +- ChangeLog-2007 | 2 +- ChangeLog-2008 | 2 +- GNUmakefile | 2 +- INSTALL | 320 +- Makefile.am | 19 +- Makefile.in | 1130 ++- NEWS | 147 +- README | 4 +- THANKS | 96 +- THANKS-to-translators | 1 + THANKS.in | 52 +- TODO | 2 +- aclocal.m4 | 66 +- bootstrap | 62 +- bootstrap.conf | 12 +- build-aux/ChangeLog-2007 | 2 +- build-aux/announce-gen | 19 +- build-aux/compile | 2 +- build-aux/config.guess | 42 +- build-aux/config.rpath | 2 +- build-aux/config.sub | 36 +- build-aux/depcomp | 2 +- build-aux/do-release-commit-and-tag | 2 +- build-aux/gen-single-binary.sh | 6 +- build-aux/gendocs.sh | 38 +- build-aux/git-version-gen | 6 +- build-aux/gitlog-to-changelog | 174 +- build-aux/gnu-web-doc-update | 19 +- build-aux/gnupload | 2 +- build-aux/mdate-sh | 2 +- build-aux/missing | 2 +- build-aux/prefix-gnulib-mk | 10 - 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 | 2 +- build-aux/test-driver | 15 +- build-aux/texinfo.tex | 379 +- build-aux/update-copyright | 6 +- build-aux/useless-if-before-free | 2 +- build-aux/vc-list-files | 2 +- build-aux/ylwrap | 2 +- cfg.mk | 174 +- configure | 2607 ++--- configure.ac | 45 +- doc/ChangeLog-2007 | 2 +- doc/coreutils.info | 2397 +++-- doc/coreutils.texi | 1686 ++-- doc/local.mk | 2 +- doc/parse-datetime.texi | 4 +- doc/perm.texi | 2 +- doc/stamp-vti | 8 +- doc/version.texi | 8 +- gnulib-tests/Makefile.in | 457 +- gnulib-tests/accept.c | 2 +- gnulib-tests/at-func.c | 2 +- gnulib-tests/binary-io.h | 2 +- gnulib-tests/bind.c | 2 +- gnulib-tests/connect.c | 2 +- gnulib-tests/gl_array_list.c | 680 ++ gnulib-tests/gl_array_list.h | 34 + gnulib-tests/glthread/thread.c | 2 +- gnulib-tests/glthread/thread.h | 2 +- gnulib-tests/glthread/yield.h | 2 +- gnulib-tests/gnulib.mk | 42 +- gnulib-tests/inet_pton.c | 2 +- gnulib-tests/infinity.h | 2 +- gnulib-tests/init.sh | 24 +- gnulib-tests/ioctl.c | 2 +- gnulib-tests/listen.c | 2 +- gnulib-tests/localename.c | 113 +- gnulib-tests/localename.h | 2 +- gnulib-tests/macros.h | 2 +- gnulib-tests/minus-zero.h | 2 +- gnulib-tests/nan.h | 2 +- gnulib-tests/nap.h | 2 +- gnulib-tests/perror.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 | 16 +- gnulib-tests/symlinkat.c | 28 +- gnulib-tests/test-accept.c | 2 +- gnulib-tests/test-alignof.c | 2 +- gnulib-tests/test-alloca-opt.c | 2 +- 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-array_list.c | 329 + gnulib-tests/test-base64.c | 2 +- gnulib-tests/test-binary-io.c | 2 +- gnulib-tests/test-bind.c | 2 +- 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 | 2 +- gnulib-tests/test-closein.c | 2 +- gnulib-tests/test-connect.c | 2 +- gnulib-tests/test-copy-acl.c | 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 | 6 +- gnulib-tests/test-dup-safer.c | 2 +- gnulib-tests/test-dup.c | 2 +- gnulib-tests/test-dup2.c | 2 +- gnulib-tests/test-environ.c | 2 +- gnulib-tests/test-errno.c | 2 +- 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 | 2 +- gnulib-tests/test-fadvise.c | 2 +- gnulib-tests/test-fchdir.c | 2 +- gnulib-tests/test-fchmodat.c | 2 +- gnulib-tests/test-fchownat.c | 2 +- gnulib-tests/test-fclose.c | 2 +- gnulib-tests/test-fcntl-h.c | 4 +- gnulib-tests/test-fcntl-safer.c | 2 +- gnulib-tests/test-fcntl.c | 2 +- gnulib-tests/test-fdatasync.c | 2 +- gnulib-tests/test-fdopen.c | 2 +- gnulib-tests/test-fdopendir.c | 14 +- gnulib-tests/test-fdutimensat.c | 2 +- gnulib-tests/test-fflush.c | 2 +- gnulib-tests/test-fflush2.c | 2 +- gnulib-tests/test-fgetc.c | 2 +- gnulib-tests/test-file-has-acl.c | 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 | 2 +- gnulib-tests/test-fread.c | 2 +- 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 | 2 +- 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 | 2 +- gnulib-tests/test-fseterr.c | 2 +- gnulib-tests/test-fstat.c | 2 +- gnulib-tests/test-fstatat.c | 2 +- gnulib-tests/test-fsync.c | 2 +- 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 | 2 +- gnulib-tests/test-ftruncate.c | 2 +- gnulib-tests/test-futimens.c | 2 +- gnulib-tests/test-futimens.h | 2 +- gnulib-tests/test-fwrite.c | 2 +- gnulib-tests/test-getaddrinfo.c | 12 +- gnulib-tests/test-getcwd-lgpl.c | 2 +- gnulib-tests/test-getcwd.c | 10 +- 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 | 8 +- gnulib-tests/test-getndelim2.c | 4 +- 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 | 18 +- gnulib-tests/test-inttypes.c | 2 +- gnulib-tests/test-ioctl.c | 2 +- gnulib-tests/test-isatty.c | 2 +- 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 | 22 +- 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 | 2 +- gnulib-tests/test-linked_list.c | 411 + gnulib-tests/test-listen.c | 2 +- gnulib-tests/test-locale.c | 13 +- gnulib-tests/test-localeconv.c | 2 +- gnulib-tests/test-localename.c | 2 +- gnulib-tests/test-lock.c | 2 +- gnulib-tests/test-lseek.c | 2 +- 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 | 2 +- gnulib-tests/test-math.c | 2 +- gnulib-tests/test-mbrtowc-w32.c | 2 +- gnulib-tests/test-mbrtowc.c | 2 +- gnulib-tests/test-mbsalign.c | 2 +- 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 | 10 +- 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 | 10 +- gnulib-tests/test-openat-safer.c | 2 +- gnulib-tests/test-openat.c | 2 +- gnulib-tests/test-parse-datetime.c | 2 +- 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-posixtm.c | 2 +- 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 | 2 +- gnulib-tests/test-rand-isaac.c | 2 +- gnulib-tests/test-read-file.c | 8 +- gnulib-tests/test-read.c | 2 +- gnulib-tests/test-readlink.c | 2 +- gnulib-tests/test-readlink.h | 2 +- gnulib-tests/test-readlinkat.c | 2 +- gnulib-tests/test-readtokens.c | 2 +- gnulib-tests/test-realloc-gnu.c | 2 +- gnulib-tests/test-regex.c | 2 +- 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 | 2 +- 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 | 2 +- gnulib-tests/test-set-mode-acl.c | 2 +- gnulib-tests/test-setenv.c | 2 +- gnulib-tests/test-setlocale1.c | 2 +- gnulib-tests/test-setlocale2.c | 2 +- gnulib-tests/test-setsockopt.c | 2 +- gnulib-tests/test-sha1.c | 6 +- gnulib-tests/test-sigaction.c | 2 +- gnulib-tests/test-signal-h.c | 2 +- gnulib-tests/test-signbit.c | 2 +- gnulib-tests/test-sigprocmask.c | 2 +- gnulib-tests/test-sleep.c | 2 +- gnulib-tests/test-snprintf.c | 2 +- gnulib-tests/test-sockets.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 | 2 +- gnulib-tests/test-stdalign.c | 2 +- gnulib-tests/test-stdbool.c | 2 +- gnulib-tests/test-stddef.c | 25 +- gnulib-tests/test-stdint.c | 2 +- gnulib-tests/test-stdio.c | 2 +- gnulib-tests/test-stdlib.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-strncat.c | 2 +- gnulib-tests/test-strnlen.c | 2 +- gnulib-tests/test-strsignal.c | 2 +- gnulib-tests/test-strtod.c | 2 +- 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 | 2 +- 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 | 2 +- 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 | 2 +- gnulib-tests/test-tls.c | 2 +- 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 | 2 +- gnulib-tests/test-unsetenv.c | 2 +- gnulib-tests/test-update-copyright.sh | 2 +- gnulib-tests/test-userspec.c | 40 +- gnulib-tests/test-utimens-common.h | 2 +- gnulib-tests/test-utimens.c | 2 +- gnulib-tests/test-utimens.h | 2 +- gnulib-tests/test-utimensat.c | 2 +- gnulib-tests/test-vasnprintf.c | 2 +- gnulib-tests/test-vasprintf-posix.c | 116 +- 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 | 2 +- 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/test-yesno.sh | 8 + 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/uniwidth/test-uc_width2.sh | 195 +- gnulib-tests/unlinkdir.c | 2 +- gnulib-tests/unlinkdir.h | 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 | 9 +- lib/ChangeLog-2007 | 2 +- lib/acl-errno-valid.c | 2 +- lib/acl-internal.c | 500 + lib/acl-internal.h | 71 +- lib/acl.h | 2 +- lib/acl_entries.c | 2 +- lib/alignof.h | 2 +- lib/alloca.in.h | 2 +- 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/assure.h | 37 + lib/at-func.c | 2 +- lib/at-func2.c | 2 +- lib/backupfile.c | 2 +- lib/backupfile.h | 2 +- lib/base64.c | 2 +- lib/base64.h | 2 +- lib/basename-lgpl.c | 2 +- lib/basename.c | 2 +- lib/bitrotate.h | 2 +- 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 | 2 +- lib/c-strtod.h | 2 +- lib/calloc.c | 2 +- lib/canon-host.c | 2 +- lib/canon-host.h | 2 +- lib/canonicalize.c | 2 +- lib/canonicalize.h | 2 +- lib/careadlinkat.c | 2 +- lib/careadlinkat.h | 2 +- lib/chdir-long.c | 17 +- lib/chdir-long.h | 2 +- lib/chown.c | 2 +- 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 | 6 +- lib/config.hin | 80 +- lib/copy-acl.c | 2 +- lib/creat-safer.c | 2 +- lib/ctype.in.h | 2 +- lib/cycle-check.c | 10 +- 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 | 3 +- lib/dirent-private.h | 2 +- lib/dirent-safer.h | 2 +- lib/dirent.in.h | 4 +- lib/dirfd.c | 2 +- lib/dirname-lgpl.c | 2 +- lib/dirname.c | 2 +- lib/dirname.h | 10 +- lib/dosname.h | 2 +- lib/dtotimespec.c | 2 +- lib/dup-safer-flag.c | 2 +- lib/dup-safer.c | 2 +- lib/dup.c | 2 +- lib/dup2.c | 2 +- lib/errno.in.h | 2 +- lib/error.c | 8 +- lib/error.h | 16 +- lib/euidaccess.c | 2 +- lib/exclude.c | 4 +- lib/exclude.h | 2 +- lib/exitfail.c | 2 +- lib/exitfail.h | 2 +- lib/faccessat.c | 2 +- lib/fadvise.c | 2 +- lib/fadvise.h | 2 +- lib/fchdir.c | 8 +- lib/fchmodat.c | 2 +- lib/fchownat.c | 2 +- lib/fclose.c | 2 +- lib/fcntl--.h | 2 +- lib/fcntl-safer.h | 2 +- lib/fcntl.c | 24 +- lib/fcntl.in.h | 6 +- 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 | 15 +- lib/fdutimensat.c | 2 +- lib/fflush.c | 14 +- lib/file-has-acl.c | 476 +- lib/file-set.c | 2 +- lib/file-type.c | 2 +- lib/file-type.h | 2 +- lib/fileblocks.c | 2 +- lib/filemode.c | 2 +- lib/filemode.h | 2 +- lib/filename.h | 2 +- lib/filenamecat-lgpl.c | 2 +- lib/filenamecat.c | 2 +- lib/filenamecat.h | 2 +- lib/filevercmp.c | 2 +- lib/filevercmp.h | 4 +- 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 | 2 +- lib/fpending.c | 2 +- lib/fpending.h | 2 +- lib/fprintftime.h | 2 +- lib/fpucw.h | 2 +- lib/fpurge.c | 8 +- lib/freadahead.c | 5 +- lib/freadahead.h | 2 +- lib/freading.c | 5 +- lib/freading.h | 2 +- lib/freadptr.c | 5 +- lib/freadptr.h | 2 +- lib/freadseek.c | 5 +- lib/freadseek.h | 2 +- lib/freopen-safer.c | 2 +- lib/freopen.c | 20 +- lib/frexp.c | 2 +- lib/frexpl.c | 2 +- lib/fseek.c | 2 +- lib/fseeko.c | 13 +- lib/fseterr.c | 5 +- lib/fseterr.h | 2 +- lib/fstat.c | 2 +- lib/fstatat.c | 2 +- lib/fsusage.c | 2 +- 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 | 2 +- lib/fts-cycle.c | 2 +- lib/fts.c | 32 +- lib/fts_.h | 10 +- lib/full-read.c | 2 +- lib/full-read.h | 3 +- lib/full-write.c | 2 +- lib/full-write.h | 2 +- lib/futimens.c | 2 +- lib/gai_strerror.c | 2 +- lib/get-permissions.c | 285 + lib/getaddrinfo.c | 2 +- lib/getcwd-lgpl.c | 2 +- lib/getcwd.c | 10 +- lib/getdelim.c | 2 +- lib/getdtablesize.c | 40 +- lib/getfilecon.c | 3 +- lib/getgroups.c | 2 +- lib/gethostname.c | 2 +- lib/gethrxtime.c | 2 +- lib/gethrxtime.h | 2 +- lib/getline.c | 2 +- lib/getloadavg.c | 2 +- lib/getlogin.c | 2 +- lib/getndelim2.c | 2 +- lib/getndelim2.h | 2 +- lib/getopt.c | 54 +- lib/getopt.in.h | 2 +- lib/getopt1.c | 2 +- lib/getopt_int.h | 2 +- lib/getpagesize.c | 2 +- lib/getpass.c | 4 +- lib/getpass.h | 2 +- lib/gettext.h | 2 +- lib/gettime.c | 2 +- lib/gettimeofday.c | 2 +- lib/getugroups.c | 9 +- lib/getugroups.h | 2 +- lib/getusershell.c | 2 +- lib/gl_anylinked_list1.h | 48 + lib/gl_anylinked_list2.h | 1195 +++ lib/gl_linked_list.c | 64 + lib/gl_linked_list.h | 34 + lib/gl_list.c | 3 + lib/gl_list.h | 841 ++ lib/gl_openssl.h | 2 +- lib/gl_xlist.c | 3 + lib/gl_xlist.h | 177 + lib/glthread/lock.c | 2 +- lib/glthread/lock.h | 2 +- lib/glthread/threadlib.c | 2 +- lib/glthread/tls.c | 2 +- lib/glthread/tls.h | 2 +- lib/gnulib.mk | 80 +- lib/group-member.c | 2 +- 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 | 10 +- lib/hash.h | 6 +- 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.c | 2 +- lib/idcache.c | 2 +- lib/ignore-value.h | 2 +- lib/inet_ntop.c | 2 +- lib/ino-map.c | 2 +- lib/intprops.h | 2 +- lib/inttostr.h | 2 +- lib/inttypes.in.h | 6 +- lib/isapipe.c | 2 +- lib/isatty.c | 2 +- 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 | 20 +- lib/localcharset.c | 81 +- lib/localcharset.h | 2 +- lib/locale.in.h | 2 +- lib/localeconv.c | 2 +- lib/long-options.c | 2 +- lib/long-options.h | 2 +- lib/lseek.c | 2 +- lib/lstat.c | 2 +- lib/malloc.c | 2 +- lib/malloca.c | 2 +- lib/malloca.h | 2 +- lib/math.in.h | 2 +- lib/mbchar.c | 2 +- lib/mbchar.h | 2 +- lib/mbiter.h | 2 +- lib/mbrlen.c | 2 +- lib/mbrtowc.c | 2 +- lib/mbsalign.c | 2 +- lib/mbsalign.h | 2 +- lib/mbscasecmp.c | 2 +- lib/mbsinit.c | 2 +- lib/mbslen.c | 2 +- lib/mbsrtowcs-impl.h | 2 +- lib/mbsrtowcs-state.c | 2 +- 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.h | 2 +- lib/md5.c | 2 +- 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 | 2 +- lib/memcoll.h | 2 +- lib/mempcpy.c | 2 +- lib/memrchr.c | 2 +- lib/mgetgroups.c | 8 +- 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 | 2 +- lib/modechange.c | 2 +- lib/modechange.h | 2 +- lib/mountlist.c | 187 +- 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 | 2 +- lib/nproc.h | 2 +- lib/obstack.c | 324 +- lib/obstack.h | 250 +- lib/open-safer.c | 2 +- lib/open.c | 2 +- lib/openat-die.c | 6 +- lib/openat-priv.h | 2 +- lib/openat-proc.c | 2 +- lib/openat-safer.c | 2 +- lib/openat.c | 2 +- lib/openat.h | 2 +- lib/opendir-safer.c | 2 +- lib/opendir.c | 2 +- lib/parse-datetime.c | 1348 ++- lib/parse-datetime.h | 2 +- lib/parse-datetime.y | 6 +- lib/pathmax.h | 2 +- lib/physmem.c | 2 +- lib/physmem.h | 2 +- lib/pipe-safer.c | 2 +- lib/pipe.c | 2 +- lib/posixtm.c | 73 +- 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 | 2 +- lib/printf-parse.h | 2 +- lib/priv-set.c | 2 +- lib/priv-set.h | 2 +- lib/progname.c | 2 +- lib/progname.h | 2 +- lib/propername.c | 2 +- lib/propername.h | 12 +- lib/pthread.in.h | 2 +- lib/putenv.c | 2 +- lib/qcopy-acl.c | 544 +- lib/qset-acl.c | 641 +- lib/quote.h | 2 +- lib/quotearg.c | 2 +- lib/quotearg.h | 2 +- lib/raise.c | 2 +- lib/rand-isaac.c | 18 +- lib/rand-isaac.h | 2 +- lib/randint.c | 2 +- lib/randint.h | 2 +- lib/randperm.c | 2 +- lib/randread.c | 4 +- lib/randread.h | 2 +- lib/read-file.c | 2 +- lib/read-file.h | 2 +- lib/read.c | 2 +- lib/readdir.c | 2 +- lib/readlink.c | 2 +- lib/readlinkat.c | 56 +- lib/readtokens.c | 2 +- lib/readtokens.h | 2 +- lib/readtokens0.c | 2 +- lib/readtokens0.h | 2 +- lib/readutmp.c | 4 +- lib/readutmp.h | 4 +- lib/realloc.c | 2 +- lib/ref-add.sin | 2 +- lib/ref-del.sin | 2 +- lib/regcomp.c | 2 +- lib/regex.c | 2 +- lib/regex.h | 2 +- lib/regex_internal.c | 6 +- lib/regex_internal.h | 2 +- lib/regexec.c | 2 +- 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 | 2 +- lib/rpmatch.c | 2 +- lib/safe-read.c | 2 +- lib/safe-read.h | 2 +- lib/safe-write.c | 2 +- lib/safe-write.h | 2 +- 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 | 5 +- lib/savedir.h | 2 +- lib/savewd.c | 18 +- lib/savewd.h | 4 +- lib/sched.in.h | 9 +- lib/se-selinux.in.h | 2 +- lib/secure_getenv.c | 2 +- lib/select.c | 2 +- lib/selinux-at.c | 2 +- lib/selinux-at.h | 2 +- lib/set-acl.c | 2 +- lib/set-permissions.c | 833 ++ lib/setenv.c | 2 +- lib/settime.c | 2 +- lib/sha1.c | 2 +- lib/sha1.h | 2 +- lib/sha256.c | 2 +- lib/sha256.h | 2 +- lib/sha512.c | 2 +- lib/sha512.h | 2 +- lib/sig-handler.h | 4 +- lib/sig2str.c | 2 +- lib/sig2str.h | 2 +- lib/sigaction.c | 2 +- lib/siglist.h | 2 +- lib/signal.in.h | 10 +- lib/signbitd.c | 2 +- lib/signbitf.c | 2 +- lib/signbitl.c | 2 +- lib/sigprocmask.c | 2 +- lib/size_max.h | 2 +- lib/smack.h | 2 +- lib/snprintf.c | 2 +- lib/sockets.c | 2 +- lib/sockets.h | 2 +- lib/stat-size.h | 2 +- lib/stat-time.h | 18 +- lib/stat.c | 2 +- lib/stdalign.in.h | 7 +- lib/stdarg.in.h | 2 +- lib/stdbool.in.h | 2 +- lib/stddef.in.h | 54 +- lib/stdint.in.h | 2 +- lib/stdio--.h | 2 +- lib/stdio-impl.h | 7 +- lib/stdio-safer.h | 2 +- lib/stdio.in.h | 12 +- lib/stdlib--.h | 2 +- lib/stdlib-safer.h | 2 +- lib/stdlib.in.h | 25 +- lib/stpcpy.c | 2 +- lib/stpncpy.c | 2 +- lib/str-kmp.h | 2 +- lib/str-two-way.h | 2 +- lib/strdup.c | 2 +- lib/streq.h | 2 +- lib/strerror-override.c | 2 +- lib/strerror-override.h | 2 +- lib/strerror.c | 2 +- lib/strftime.c | 2 +- lib/strftime.h | 2 +- lib/striconv.c | 2 +- lib/striconv.h | 2 +- lib/string.in.h | 23 +- lib/strintcmp.c | 2 +- lib/stripslash.c | 2 +- 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 | 2 +- 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 | 17 +- lib/sys_socket.in.h | 2 +- lib/sys_stat.in.h | 2 +- lib/sys_time.in.h | 2 +- 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 | 135 +- lib/tempname.h | 20 +- lib/termios.in.h | 2 +- lib/time.in.h | 4 +- lib/time_r.c | 2 +- lib/timespec.h | 6 +- lib/trim.c | 2 +- lib/trim.h | 2 +- lib/u64.h | 2 +- lib/uname.c | 2 +- lib/unicodeio.c | 2 +- lib/unicodeio.h | 2 +- lib/unistd--.h | 2 +- lib/unistd-safer.h | 2 +- lib/unistd.in.h | 39 +- 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 | 152 +- lib/unlink.c | 2 +- lib/unlinkat.c | 23 +- lib/unlocked-io.h | 2 +- lib/unsetenv.c | 2 +- lib/userspec.c | 4 +- lib/utimecmp.c | 2 +- lib/utimecmp.h | 2 +- lib/utimens.c | 4 +- lib/utimens.h | 2 +- lib/utimensat.c | 2 +- lib/vasnprintf.c | 199 +- lib/vasnprintf.h | 2 +- lib/vasprintf.c | 2 +- lib/verify.h | 2 +- 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/wchar.in.h | 11 +- lib/wcrtomb.c | 2 +- lib/wcswidth-impl.h | 2 +- lib/wcswidth.c | 2 +- lib/wctype.in.h | 2 +- lib/wcwidth.c | 2 +- lib/write-any-file.c | 2 +- lib/write.c | 2 +- lib/xalloc-die.c | 2 +- lib/xalloc-oversized.h | 2 +- lib/xalloc.h | 6 +- lib/xasprintf.c | 2 +- lib/xdectoimax.c | 6 + lib/xdectoint.c | 86 + lib/xdectoint.h | 36 + lib/xdectoumax.c | 6 + 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 | 2 +- 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.h | 2 +- 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 | 9 +- lib/xstrtol.h | 2 +- lib/xtime.h | 2 +- lib/xvasprintf.c | 2 +- lib/xvasprintf.h | 2 +- lib/yesno.c | 7 +- lib/yesno.h | 2 +- m4/00gnulib.m4 | 2 +- m4/ChangeLog-2007 | 2 +- m4/absolute-header.m4 | 2 +- m4/acl.m4 | 63 +- 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 | 2 +- m4/bison.m4 | 2 +- m4/boottime.m4 | 2 +- m4/btowc.m4 | 2 +- m4/c-strtod.m4 | 2 +- m4/calloc.m4 | 2 +- m4/canon-host.m4 | 2 +- m4/canonicalize.m4 | 2 +- m4/chdir-long.m4 | 2 +- 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/config-h.m4 | 2 +- m4/configmake.m4 | 2 +- m4/ctype.m4 | 2 +- m4/cycle-check.m4 | 2 +- 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 | 2 +- m4/dup2.m4 | 86 +- m4/eealloc.m4 | 2 +- m4/environ.m4 | 2 +- m4/errno_h.m4 | 2 +- m4/error.m4 | 2 +- m4/euidaccess.m4 | 2 +- m4/exponentd.m4 | 2 +- m4/exponentf.m4 | 2 +- m4/exponentl.m4 | 2 +- m4/extensions.m4 | 7 +- m4/extern-inline.m4 | 45 +- m4/faccessat.m4 | 2 +- m4/fchdir.m4 | 2 +- m4/fchmodat.m4 | 2 +- m4/fchownat.m4 | 2 +- m4/fclose.m4 | 2 +- m4/fcntl-o.m4 | 2 +- m4/fcntl-safer.m4 | 2 +- m4/fcntl.m4 | 60 +- m4/fcntl_h.m4 | 2 +- m4/fdatasync.m4 | 2 +- m4/fdopen.m4 | 2 +- m4/fdopendir.m4 | 2 +- m4/fflush.m4 | 2 +- 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 | 2 +- m4/fpending.m4 | 2 +- m4/fpieee.m4 | 2 +- m4/fpurge.m4 | 2 +- m4/freadahead.m4 | 2 +- m4/freading.m4 | 2 +- m4/freadptr.m4 | 2 +- m4/freadseek.m4 | 2 +- m4/freopen.m4 | 6 +- m4/frexp.m4 | 2 +- m4/frexpl.m4 | 2 +- m4/fseek.m4 | 2 +- m4/fseeko.m4 | 2 +- m4/fseterr.m4 | 2 +- m4/fstat.m4 | 2 +- m4/fstatat.m4 | 2 +- m4/fstypename.m4 | 2 +- m4/fsusage.m4 | 2 +- m4/fsync.m4 | 2 +- m4/ftell.m4 | 2 +- m4/ftello.m4 | 2 +- m4/ftruncate.m4 | 2 +- m4/fts.m4 | 2 +- m4/futimens.m4 | 2 +- m4/getaddrinfo.m4 | 2 +- m4/getcwd-abort-bug.m4 | 2 +- m4/getcwd-path-max.m4 | 15 +- m4/getcwd.m4 | 9 +- m4/getdelim.m4 | 2 +- m4/getdtablesize.m4 | 8 +- m4/getgroups.m4 | 2 +- m4/gethostname.m4 | 2 +- m4/gethrxtime.m4 | 2 +- m4/getline.m4 | 2 +- m4/getloadavg.m4 | 2 +- m4/getlogin.m4 | 2 +- m4/getndelim2.m4 | 2 +- m4/getopt.m4 | 2 +- m4/getpagesize.m4 | 2 +- m4/getpass.m4 | 2 +- m4/gettime.m4 | 2 +- m4/gettimeofday.m4 | 2 +- m4/getugroups.m4 | 2 +- m4/getusershell.m4 | 2 +- m4/gl-openssl.m4 | 2 +- m4/glibc21.m4 | 2 +- m4/gmp.m4 | 2 +- m4/gnu-make.m4 | 2 +- m4/gnulib-common.m4 | 54 +- m4/gnulib-comp.m4 | 63 +- 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 | 61 +- 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/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 | 2 +- m4/isblank.m4 | 2 +- m4/isnand.m4 | 2 +- m4/isnanf.m4 | 2 +- m4/isnanl.m4 | 43 +- m4/iswblank.m4 | 2 +- m4/jm-macros.m4 | 20 +- m4/jm-winsz1.m4 | 2 +- m4/jm-winsz2.m4 | 2 +- m4/langinfo_h.m4 | 2 +- m4/largefile.m4 | 2 +- m4/lchmod.m4 | 2 +- m4/lchown.m4 | 2 +- m4/ldexp.m4 | 2 +- m4/ldexpl.m4 | 2 +- m4/lib-ignore.m4 | 2 +- m4/lib-ld.m4 | 2 +- m4/lib-link.m4 | 2 +- m4/lib-prefix.m4 | 2 +- m4/libunistring-base.m4 | 2 +- m4/link-follow.m4 | 2 +- m4/link.m4 | 2 +- m4/linkat.m4 | 74 +- m4/localcharset.m4 | 2 +- m4/locale-fr.m4 | 2 +- m4/locale-ja.m4 | 2 +- m4/locale-tr.m4 | 2 +- m4/locale-zh.m4 | 2 +- m4/locale_h.m4 | 2 +- m4/localeconv.m4 | 2 +- m4/localename.m4 | 2 +- m4/lock.m4 | 2 +- m4/longlong.m4 | 2 +- m4/ls-mntd-fs.m4 | 6 +- m4/lseek.m4 | 2 +- m4/lstat.m4 | 50 +- m4/malloc.m4 | 2 +- m4/malloca.m4 | 2 +- m4/manywarnings.m4 | 51 +- m4/math_h.m4 | 2 +- m4/mbchar.m4 | 2 +- m4/mbiter.m4 | 2 +- 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 | 2 +- m4/memcasecmp.m4 | 2 +- m4/memchr.m4 | 2 +- m4/memcoll.m4 | 2 +- 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 | 2 +- m4/mkstemp.m4 | 2 +- m4/mktime.m4 | 2 +- m4/mmap-anon.m4 | 2 +- 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 | 2 +- m4/nanosleep.m4 | 2 +- m4/netdb_h.m4 | 2 +- m4/netinet_in_h.m4 | 2 +- m4/nl_langinfo.m4 | 2 +- m4/nocrash.m4 | 2 +- m4/non-recursive-gnulib-prefix-hack.m4 | 2 +- m4/nproc.m4 | 2 +- m4/obstack.m4 | 35 + m4/off_t.m4 | 2 +- m4/open.m4 | 2 +- m4/openat.m4 | 2 +- m4/opendir.m4 | 2 +- m4/parse-datetime.m4 | 2 +- m4/pathmax.m4 | 2 +- m4/perl.m4 | 2 +- m4/perror.m4 | 2 +- m4/physmem.m4 | 2 +- m4/pipe.m4 | 2 +- m4/po.m4 | 4 +- m4/posix-shell.m4 | 2 +- m4/posixtm.m4 | 2 +- m4/posixver.m4 | 2 +- m4/prereq.m4 | 2 +- m4/printf-frexp.m4 | 2 +- m4/printf-frexpl.m4 | 2 +- m4/printf.m4 | 51 +- m4/priv-set.m4 | 2 +- m4/progtest.m4 | 2 +- m4/pthread.m4 | 8 +- m4/putenv.m4 | 2 +- m4/quote.m4 | 2 +- m4/quotearg.m4 | 2 +- m4/raise.m4 | 2 +- m4/read-file.m4 | 2 +- m4/read.m4 | 2 +- m4/readdir.m4 | 2 +- m4/readlink.m4 | 2 +- m4/readlinkat.m4 | 27 +- m4/readtokens.m4 | 2 +- m4/readutmp.m4 | 2 +- m4/realloc.m4 | 2 +- m4/regex.m4 | 2 +- m4/remove.m4 | 2 +- m4/rename.m4 | 2 +- m4/rewinddir.m4 | 2 +- m4/rmdir.m4 | 2 +- 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 | 2 +- m4/sched_h.m4 | 17 +- m4/secure_getenv.m4 | 2 +- m4/select.m4 | 2 +- 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 | 2 +- m4/sha256.m4 | 2 +- m4/sha512.m4 | 2 +- m4/sig2str.m4 | 2 +- m4/sigaction.m4 | 2 +- m4/signal_h.m4 | 2 +- m4/signalblocking.m4 | 2 +- m4/signbit.m4 | 2 +- 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/ssize_t.m4 | 2 +- m4/st_dm_mode.m4 | 2 +- m4/stat-prog.m4 | 2 +- m4/stat-size.m4 | 2 +- m4/stat-time.m4 | 2 +- m4/stat.m4 | 2 +- m4/stdalign.m4 | 10 +- m4/stdarg.m4 | 2 +- m4/stdbool.m4 | 2 +- m4/stddef_h.m4 | 10 +- m4/stdint.m4 | 2 +- m4/stdint_h.m4 | 2 +- m4/stdio_h.m4 | 31 +- m4/stdlib_h.m4 | 4 +- m4/stpcpy.m4 | 2 +- m4/stpncpy.m4 | 2 +- m4/strdup.m4 | 2 +- m4/strerror.m4 | 2 +- m4/strerror_r.m4 | 2 +- m4/strftime.m4 | 2 +- m4/string_h.m4 | 2 +- m4/strncat.m4 | 2 +- m4/strndup.m4 | 2 +- m4/strnlen.m4 | 2 +- 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 | 37 +- m4/sys_ioctl_h.m4 | 2 +- m4/sys_resource_h.m4 | 2 +- m4/sys_select_h.m4 | 2 +- m4/sys_socket_h.m4 | 2 +- m4/sys_stat_h.m4 | 2 +- m4/sys_time_h.m4 | 2 +- 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 | 2 +- m4/threadlib.m4 | 40 +- m4/time_h.m4 | 21 +- m4/time_r.m4 | 2 +- m4/timer_time.m4 | 2 +- m4/timespec.m4 | 2 +- m4/tls.m4 | 2 +- m4/tm_gmtoff.m4 | 2 +- m4/tzset.m4 | 2 +- m4/uname.m4 | 2 +- m4/ungetc.m4 | 7 +- m4/unicodeio.m4 | 2 +- m4/unistd-safer.m4 | 2 +- m4/unistd_h.m4 | 6 +- m4/unlink-busy.m4 | 2 +- m4/unlink.m4 | 2 +- m4/unlinkat.m4 | 3 +- m4/unlinkdir.m4 | 2 +- m4/unlocked-io.m4 | 2 +- m4/uptime.m4 | 2 +- m4/userspec.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 | 2 +- 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/warnings.m4 | 2 +- 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 | 2 +- m4/wcwidth.m4 | 2 +- m4/wint_t.m4 | 2 +- m4/write-any-file.m4 | 2 +- m4/write.m4 | 2 +- m4/xalloc.m4 | 2 +- m4/xattr.m4 | 2 +- m4/xgetcwd.m4 | 2 +- m4/xnanosleep.m4 | 2 +- m4/xsize.m4 | 2 +- m4/xstrndup.m4 | 2 +- m4/xstrtod.m4 | 2 +- m4/xstrtol.m4 | 2 +- m4/xvasprintf.m4 | 2 +- m4/yesno.m4 | 2 +- m4/yield.m4 | 2 +- maint.mk | 14 +- man/chmod.x | 2 +- man/chown.x | 2 +- man/df.x | 2 +- man/du.x | 2 +- man/dummy-man | 2 +- man/help2man | 24 +- man/local.mk | 148 +- man/rm.x | 2 +- man/stdbuf.x | 4 +- man/sync.x | 7 +- man/timeout.x | 2 +- old/fileutils/ChangeLog | 2 +- 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 | 2 +- old/textutils/NEWS | 2 +- po/ChangeLog-2007 | 2 +- po/LINGUAS | 1 + po/Makefile.in.in | 53 +- po/Makevars | 31 + po/POTFILES.in | 2 +- po/Rules-quot | 15 +- po/af.gmo | Bin 29893 -> 28515 bytes po/af.po | 2882 +++--- po/be.gmo | Bin 66585 -> 63776 bytes po/be.po | 2911 +++--- po/bg.gmo | Bin 156433 -> 140084 bytes po/bg.po | 3253 +++--- po/ca.gmo | Bin 353253 -> 319316 bytes po/ca.po | 3615 ++++--- po/coreutils.pot | 2726 ++--- po/cs.gmo | Bin 358912 -> 305584 bytes po/cs.po | 3286 +++--- po/da.gmo | Bin 317604 -> 286282 bytes po/da.po | 3440 ++++--- po/de.gmo | Bin 356178 -> 360363 bytes po/de.po | 3440 ++++--- po/el.gmo | Bin 27157 -> 26047 bytes po/el.po | 3074 +++--- po/eo.gmo | Bin 189636 -> 180671 bytes po/eo.po | 3096 +++--- po/es.gmo | Bin 341146 -> 307840 bytes po/es.po | 3532 ++++--- po/et.gmo | Bin 330563 -> 334540 bytes po/et.po | 3195 +++--- po/eu.gmo | Bin 29430 -> 28605 bytes po/eu.po | 3123 +++--- po/fi.gmo | Bin 115664 -> 118267 bytes po/fi.po | 5338 +++++----- po/fr.gmo | Bin 368788 -> 313938 bytes po/fr.po | 3327 ++++--- po/ga.gmo | Bin 140468 -> 125969 bytes po/ga.po | 3219 +++--- po/gl.gmo | Bin 34340 -> 31921 bytes po/gl.po | 3033 +++--- po/hr.gmo | Bin 15669 -> 15669 bytes po/hr.po | 2838 +++--- po/hu.gmo | Bin 347780 -> 313292 bytes po/hu.po | 3573 ++++--- po/ia.gmo | Bin 7804 -> 7804 bytes po/ia.po | 2795 +++--- po/id.gmo | Bin 183619 -> 165387 bytes po/id.po | 3238 +++--- po/it.gmo | Bin 210317 -> 188041 bytes po/it.po | 3247 +++--- po/ja.gmo | Bin 230268 -> 214327 bytes po/ja.po | 3425 ++++--- po/kk.gmo | Bin 1647 -> 1647 bytes po/kk.po | 2808 +++--- po/ko.gmo | Bin 29632 -> 27043 bytes po/ko.po | 2921 +++--- po/lg.gmo | Bin 270248 -> 239694 bytes po/lg.po | 3503 ++++--- po/lt.gmo | Bin 32623 -> 32046 bytes po/lt.po | 2898 +++--- po/ms.gmo | Bin 23617 -> 23157 bytes po/ms.po | 2889 +++--- po/nb.gmo | Bin 171708 -> 290615 bytes po/nb.po | 5836 +++++++---- po/nl.gmo | Bin 345564 -> 294388 bytes po/nl.po | 3329 ++++--- po/pl.gmo | Bin 357077 -> 361886 bytes po/pl.po | 3246 +++--- po/pt.gmo | Bin 134320 -> 120173 bytes po/pt.po | 3220 +++--- po/pt_BR.gmo | Bin 169366 -> 152278 bytes po/pt_BR.po | 3244 +++--- po/ro.gmo | Bin 52033 -> 50344 bytes po/ro.po | 2894 +++--- po/ru.gmo | Bin 455530 -> 388481 bytes po/ru.po | 3307 +++--- po/sk.gmo | Bin 76116 -> 73765 bytes po/sk.po | 3011 +++--- po/sl.gmo | Bin 326960 -> 294978 bytes po/sl.po | 3457 ++++--- po/sr.gmo | Bin 0 -> 371932 bytes po/sr.po | 13251 +++++++++++++++++++++++++ po/sv.gmo | Bin 338717 -> 289110 bytes po/sv.po | 3251 +++--- po/tr.gmo | Bin 98639 -> 161437 bytes po/tr.po | 6658 ++++++------- po/uk.gmo | Bin 447941 -> 454637 bytes po/uk.po | 3655 ++++--- po/vi.gmo | Bin 380249 -> 323999 bytes po/vi.po | 3294 +++--- po/zh_CN.gmo | Bin 186399 -> 169363 bytes po/zh_CN.po | 3327 ++++--- po/zh_TW.gmo | Bin 52112 -> 49486 bytes po/zh_TW.po | 2982 +++--- src/base64.c | 10 +- src/basename.c | 6 +- src/cat.c | 60 +- src/chcon.c | 6 +- src/chgrp.c | 6 +- src/chmod.c | 6 +- src/chown-core.c | 2 +- src/chown-core.h | 2 +- src/chown.c | 6 +- src/chroot.c | 78 +- src/cksum.c | 8 +- src/comm.c | 12 +- src/copy.c | 301 +- src/copy.h | 4 +- src/coreutils-arch.c | 11 +- src/coreutils-dir.c | 11 +- src/coreutils-vdir.c | 11 +- src/coreutils.c | 29 +- src/cp-hash.c | 2 +- src/cp.c | 10 +- src/csplit.c | 23 +- src/cut.c | 11 +- src/date.c | 44 +- src/dcgen | 2 +- src/dd.c | 291 +- src/df.c | 82 +- src/dircolors.c | 8 +- src/dircolors.h | 9 +- src/dircolors.hin | 9 +- src/dirname.c | 6 +- src/du.c | 37 +- src/echo.c | 10 +- src/env.c | 14 +- src/expand.c | 8 +- src/expr.c | 6 +- src/extent-scan.c | 4 +- src/extent-scan.h | 10 +- src/extract-magic | 2 +- src/factor.c | 122 +- src/fiemap.h | 2 +- src/find-mount-point.c | 2 +- src/find-mount-point.h | 2 +- src/fmt.c | 29 +- src/fold.c | 23 +- src/fs-is-local.h | 1 + src/fs.h | 1 + src/getlimits.c | 6 +- src/group-list.c | 2 +- src/group-list.h | 2 +- src/groups.c | 6 +- src/head.c | 187 +- src/hostid.c | 6 +- src/hostname.c | 6 +- src/id.c | 6 +- src/install.c | 6 +- src/ioblksize.h | 2 +- src/join.c | 18 +- src/kill.c | 14 +- src/libstdbuf.c | 4 +- src/link.c | 6 +- src/ln.c | 6 +- src/local.mk | 25 +- src/logname.c | 19 +- src/longlong.h | 208 +- src/ls.c | 103 +- src/make-prime-list.c | 11 +- src/md5sum.c | 19 +- src/mkdir.c | 25 +- src/mkfifo.c | 6 +- src/mknod.c | 8 +- src/mktemp.c | 6 +- src/mv.c | 8 +- src/nice.c | 16 +- src/nl.c | 54 +- src/nohup.c | 51 +- src/nproc.c | 14 +- src/numfmt.c | 552 +- src/od.c | 43 +- src/operand2sig.c | 2 +- src/operand2sig.h | 2 +- src/paste.c | 14 +- src/pathchk.c | 6 +- src/pinky.c | 9 +- src/pr.c | 140 +- src/printenv.c | 6 +- src/printf.c | 8 +- src/prog-fprintf.c | 2 +- src/prog-fprintf.h | 2 +- src/ptx.c | 22 +- src/pwd.c | 8 +- src/readlink.c | 6 +- src/realpath.c | 6 +- src/relpath.c | 2 +- src/relpath.h | 2 +- src/remove.c | 2 +- src/remove.h | 2 +- src/rm.c | 22 +- src/rmdir.c | 6 +- src/runcon.c | 14 +- src/selinux.c | 2 +- src/selinux.h | 2 +- src/seq.c | 123 +- src/shred.c | 43 +- src/shuf.c | 34 +- src/single-binary.mk | 212 +- src/sleep.c | 6 +- src/sort.c | 11 +- src/split.c | 365 +- src/stat.c | 11 +- src/stdbuf.c | 20 +- src/stty.c | 428 +- src/sum.c | 15 +- src/sync.c | 191 +- src/system.h | 74 +- src/tac-pipe.c | 2 +- src/tac.c | 90 +- src/tail.c | 377 +- src/tee.c | 95 +- src/test.c | 12 +- src/timeout.c | 31 +- src/touch.c | 6 +- src/tr.c | 10 +- src/true.c | 6 +- src/truncate.c | 42 +- src/tsort.c | 14 +- src/tty.c | 6 +- src/uname.c | 6 +- src/unexpand.c | 8 +- src/uniq.c | 12 +- src/unlink.c | 6 +- src/uptime.c | 6 +- src/users.c | 6 +- src/wc.c | 112 +- src/who.c | 10 +- src/whoami.c | 17 +- src/yes.c | 62 +- tests/Coreutils.pm | 6 +- tests/CuSkip.pm | 2 +- tests/CuTmpdir.pm | 2 +- tests/chgrp/basic.sh | 2 +- tests/chgrp/default-no-deref.sh | 2 +- tests/chgrp/deref.sh | 2 +- tests/chgrp/no-x.sh | 2 +- tests/chgrp/posix-H.sh | 2 +- tests/chgrp/recurse.sh | 2 +- tests/chmod/c-option.sh | 2 +- tests/chmod/equal-x.sh | 2 +- tests/chmod/equals.sh | 2 +- tests/chmod/inaccessible.sh | 2 +- tests/chmod/no-x.sh | 2 +- tests/chmod/octal.sh | 8 +- tests/chmod/setgid.sh | 2 +- tests/chmod/silent.sh | 2 +- tests/chmod/thru-dangling.sh | 2 +- tests/chmod/umask-x.sh | 4 +- tests/chmod/usage.sh | 6 +- tests/chown/basic.sh | 4 +- tests/chown/deref.sh | 2 +- tests/chown/preserve-root.sh | 2 +- tests/chown/separator.sh | 4 +- tests/cp/abuse.sh | 2 +- tests/cp/acl.sh | 2 +- tests/cp/attr-existing.sh | 2 +- tests/cp/backup-1.sh | 2 +- tests/cp/backup-dir.sh | 2 +- tests/cp/backup-is-src.sh | 2 +- tests/cp/capability.sh | 2 +- tests/cp/cp-HL.sh | 4 +- tests/cp/cp-a-selinux.sh | 23 +- tests/cp/cp-deref.sh | 2 +- tests/cp/cp-i.sh | 4 +- tests/cp/cp-mv-backup.sh | 2 +- tests/cp/cp-mv-enotsup-xattr.sh | 2 +- tests/cp/cp-parents.sh | 4 +- tests/cp/deref-slink.sh | 2 +- tests/cp/dir-rm-dest.sh | 2 +- tests/cp/dir-slash.sh | 2 +- tests/cp/dir-vs-file.sh | 4 +- tests/cp/duplicate-sources.sh | 44 + tests/cp/existing-perm-dir.sh | 2 +- tests/cp/existing-perm-race.sh | 10 +- tests/cp/fail-perm.sh | 4 +- tests/cp/fiemap-2.sh | 2 +- tests/cp/fiemap-FMR.sh | 2 +- tests/cp/fiemap-empty.sh | 3 +- tests/cp/fiemap-perf.sh | 4 +- tests/cp/file-perm-race.sh | 10 +- tests/cp/into-self.sh | 2 +- tests/cp/link-deref.sh | 5 +- tests/cp/link-heap.sh | 2 +- tests/cp/link-no-deref.sh | 2 +- tests/cp/link-preserve.sh | 2 +- tests/cp/link-symlink.sh | 2 +- tests/cp/link.sh | 2 +- tests/cp/nfs-removal-race.sh | 8 +- tests/cp/no-ctx.sh | 9 +- tests/cp/no-deref-link1.sh | 2 +- tests/cp/no-deref-link2.sh | 2 +- tests/cp/no-deref-link3.sh | 2 +- tests/cp/parent-perm-race.sh | 9 +- tests/cp/parent-perm.sh | 2 +- tests/cp/perm.sh | 2 +- tests/cp/preserve-2.sh | 2 +- tests/cp/preserve-gid.sh | 5 +- tests/cp/preserve-link.sh | 2 +- tests/cp/preserve-mode.sh | 2 +- tests/cp/preserve-slink-time.sh | 2 +- tests/cp/proc-short-read.sh | 2 +- tests/cp/proc-zero-len.sh | 4 +- tests/cp/r-vs-symlink.sh | 2 +- tests/cp/reflink-auto.sh | 4 +- tests/cp/reflink-perm.sh | 2 +- tests/cp/same-file.sh | 28 +- tests/cp/slink-2-slink.sh | 2 +- tests/cp/sparse-fiemap.sh | 2 +- tests/cp/sparse-to-pipe.sh | 9 +- tests/cp/sparse.sh | 39 +- tests/cp/special-bits.sh | 5 +- tests/cp/special-f.sh | 2 +- tests/cp/src-base-dot.sh | 2 +- tests/cp/symlink-slash.sh | 2 +- tests/cp/thru-dangling.sh | 2 +- tests/d_type-check | 5 +- tests/dd/ascii.sh | 73 +- tests/dd/bytes.sh | 2 +- tests/dd/direct.sh | 2 +- tests/dd/misc.sh | 17 +- tests/dd/no-allocate.sh | 2 +- tests/dd/nocache.sh | 6 +- tests/dd/not-rewound.sh | 2 +- tests/dd/reblock.sh | 2 +- tests/dd/skip-seek-past-dev.sh | 2 +- tests/dd/skip-seek-past-file.sh | 2 +- tests/dd/skip-seek.pl | 2 +- tests/dd/skip-seek2.sh | 2 +- tests/dd/sparse.sh | 11 +- tests/dd/stats.sh | 73 + tests/dd/stderr.sh | 6 +- tests/dd/unblock-sync.sh | 2 +- tests/dd/unblock.pl | 2 +- tests/df/df-P.sh | 2 +- tests/df/df-output.sh | 4 +- tests/df/df-symlink.sh | 4 +- tests/df/header.sh | 2 +- tests/df/no-mtab-status.sh | 82 +- tests/df/over-mount-device.sh | 2 +- tests/df/problematic-chars.sh | 2 +- tests/df/skip-duplicates.sh | 98 +- tests/df/skip-rootfs.sh | 11 +- tests/df/total-unprocessed.sh | 2 +- tests/df/total-verify.sh | 5 +- tests/df/unreadable.sh | 2 +- tests/du/2g.sh | 29 +- tests/du/8gb.sh | 2 +- tests/du/basic.sh | 2 +- tests/du/bigtime.sh | 2 +- tests/du/bind-mount-dir-cycle-v2.sh | 38 + tests/du/bind-mount-dir-cycle.sh | 2 +- tests/du/deref-args.sh | 2 +- tests/du/deref.sh | 4 +- tests/du/exclude.sh | 2 +- tests/du/fd-leak.sh | 2 +- tests/du/files0-from-dir.sh | 2 +- tests/du/files0-from.pl | 2 +- tests/du/hard-link.sh | 2 +- tests/du/inacc-dest.sh | 2 +- tests/du/inacc-dir.sh | 2 +- tests/du/inaccessible-cwd.sh | 2 +- tests/du/inodes.sh | 2 +- tests/du/long-from-unreadable.sh | 2 +- tests/du/long-sloop.sh | 2 +- tests/du/max-depth.sh | 2 +- tests/du/move-dir-while-traversing.sh | 9 +- tests/du/no-deref.sh | 2 +- tests/du/no-x.sh | 2 +- tests/du/one-file-system.sh | 2 +- tests/du/restore-wd.sh | 2 +- tests/du/slash.sh | 2 +- tests/du/threshold.sh | 8 +- tests/du/trailing-slash.sh | 2 +- tests/du/two-args.sh | 2 +- tests/envvar-check | 4 +- tests/factor/create-test.sh | 2 +- tests/factor/run.sh | 2 +- tests/fmt/base.pl | 9 +- tests/fmt/goal-option.sh | 2 +- tests/fmt/long-line.sh | 2 +- tests/id/context.sh | 9 +- tests/id/gnu-zero-uids.sh | 4 +- tests/id/no-context.sh | 2 +- tests/id/setgid.sh | 10 +- tests/id/smack.sh | 2 +- tests/id/uid.sh | 4 +- tests/id/zero.sh | 8 +- tests/init.sh | 24 +- tests/install/basic-1.sh | 6 +- tests/install/create-leading.sh | 2 +- tests/install/d-slashdot.sh | 2 +- tests/install/install-C-root.sh | 2 +- tests/install/install-C-selinux.sh | 2 +- tests/install/install-C.sh | 6 +- tests/install/strip-program.sh | 6 +- tests/install/trap.sh | 2 +- tests/ln/backup-1.sh | 2 +- tests/ln/hard-backup.sh | 2 +- tests/ln/hard-to-sym.sh | 38 +- tests/ln/misc.sh | 10 +- tests/ln/relative.sh | 2 +- tests/ln/sf-1.sh | 2 +- tests/ln/slash-decorated-nonexistent-dest.sh | 4 +- tests/ln/target-1.sh | 2 +- tests/local.mk | 32 +- tests/ls/abmon-align.sh | 2 +- tests/ls/block-size.sh | 2 +- tests/ls/capability.sh | 2 +- tests/ls/color-clear-to-eol.sh | 2 +- tests/ls/color-dtype-dir.sh | 2 +- tests/ls/color-norm.sh | 4 +- tests/ls/color-term.sh | 2 +- tests/ls/dangle.sh | 14 +- tests/ls/dired.sh | 2 +- tests/ls/file-type.sh | 2 +- tests/ls/follow-slink.sh | 6 +- tests/ls/getxattr-speedup.sh | 4 +- tests/ls/hex-option.sh | 24 + tests/ls/infloop.sh | 2 +- tests/ls/inode.sh | 2 +- tests/ls/m-option.sh | 2 +- tests/ls/multihardlink.sh | 2 +- tests/ls/nameless-uid.sh | 2 +- tests/ls/no-arg.sh | 2 +- tests/ls/no-cap.sh | 7 +- tests/ls/proc-selinux-segfault.sh | 2 +- tests/ls/readdir-mountpoint-inode.sh | 2 +- tests/ls/recursive.sh | 2 +- tests/ls/root-rel-symlink-color.sh | 2 +- tests/ls/rt-1.sh | 2 +- tests/ls/slink-acl.sh | 2 +- tests/ls/stat-dtype.sh | 2 +- tests/ls/stat-failed.sh | 6 +- tests/ls/stat-free-color.sh | 2 +- tests/ls/stat-free-symlinks.sh | 2 +- tests/ls/stat-vs-dirent.sh | 2 +- tests/ls/symlink-slash.sh | 2 +- tests/ls/time-style-diag.sh | 2 +- tests/ls/x-option.sh | 2 +- tests/misc/arch.sh | 2 +- tests/misc/base64.pl | 2 +- tests/misc/basename.pl | 4 +- tests/misc/cat-buf.sh | 8 +- tests/misc/cat-proc.sh | 2 +- tests/misc/cat-self.sh | 33 + tests/misc/chcon-fail.sh | 10 +- tests/misc/chcon.sh | 8 +- tests/misc/chroot-credentials.sh | 9 +- tests/misc/chroot-fail.sh | 54 +- tests/misc/close-stdout.sh | 18 +- tests/misc/comm.pl | 2 +- tests/misc/coreutils.sh | 2 +- tests/misc/csplit-1000.sh | 2 +- tests/misc/csplit-heap.sh | 2 +- tests/misc/csplit-suppress-matched.pl | 2 +- tests/misc/csplit.sh | 2 +- tests/misc/cut-huge-range.sh | 6 +- tests/misc/cut.pl | 2 +- tests/misc/date-next-dow.pl | 2 +- tests/misc/date-sec.sh | 2 +- tests/misc/date.pl | 2 +- tests/misc/dircolors.pl | 2 +- tests/misc/dirname.pl | 2 +- tests/misc/env-null.sh | 2 +- tests/misc/env.sh | 4 +- tests/misc/expand.pl | 2 +- tests/misc/expr.pl | 2 +- tests/misc/factor-parallel.sh | 34 + tests/misc/factor.pl | 2 +- tests/misc/false-status.sh | 10 +- tests/misc/fold.pl | 2 +- tests/misc/groups-dash.sh | 2 +- tests/misc/groups-version.sh | 2 +- tests/misc/head-c.sh | 14 +- tests/misc/head-elide-tail.pl | 2 +- tests/misc/head-pos.sh | 2 +- tests/misc/head-write-error.sh | 2 +- tests/misc/head.pl | 2 +- tests/misc/help-version.sh | 15 +- tests/misc/invalid-opt.pl | 2 +- tests/misc/join.pl | 2 +- tests/misc/ls-misc.pl | 4 +- tests/misc/ls-time.sh | 2 +- tests/misc/md5sum-bsd.sh | 10 +- tests/misc/md5sum-newline.pl | 2 +- tests/misc/md5sum-parallel.sh | 8 +- tests/misc/md5sum.pl | 2 +- tests/misc/mknod.sh | 2 +- tests/misc/mktemp.pl | 2 +- tests/misc/nice-fail.sh | 2 +- tests/misc/nice.sh | 4 +- tests/misc/nl.sh | 2 +- tests/misc/nohup.sh | 2 +- tests/misc/nproc-avail.sh | 2 +- tests/misc/nproc-positive.sh | 4 +- tests/misc/numfmt.pl | 438 +- tests/misc/od-N.sh | 2 +- tests/misc/od-endian.sh | 2 +- tests/misc/od-float.sh | 22 +- tests/misc/od-j.sh | 39 + tests/misc/od-multiple-t.sh | 2 +- tests/misc/od-x8.sh | 2 +- tests/misc/od.pl | 2 +- tests/misc/paste.pl | 2 +- tests/misc/pathchk1.sh | 12 +- tests/misc/printenv.sh | 10 +- tests/misc/printf-cov.pl | 2 +- tests/misc/printf-hex.sh | 2 +- tests/misc/printf-surprise.sh | 9 +- tests/misc/printf.sh | 16 +- tests/misc/ptx-overrun.sh | 2 +- tests/misc/ptx.pl | 2 +- tests/misc/pwd-long.sh | 3 +- tests/misc/pwd-option.sh | 2 +- tests/misc/readlink-fp-loop.sh | 2 +- tests/misc/readlink-root.sh | 2 +- tests/misc/realpath.sh | 14 +- tests/misc/runcon-no-reorder.sh | 2 +- tests/misc/selinux.sh | 4 +- tests/misc/seq-long-double.sh | 2 +- tests/misc/seq-precision.sh | 79 + tests/misc/seq.pl | 2 +- tests/misc/sha1sum-vec.pl | 2 +- tests/misc/sha1sum.pl | 2 +- tests/misc/sha224sum.pl | 2 +- tests/misc/sha256sum.pl | 2 +- tests/misc/sha384sum.pl | 2 +- tests/misc/sha512sum.pl | 2 +- tests/misc/shred-exact.sh | 4 +- tests/misc/shred-negative.sh | 28 - tests/misc/shred-passes.sh | 2 +- tests/misc/shred-remove.sh | 6 +- tests/misc/shred-size.sh | 34 + tests/misc/shuf-reservoir.sh | 2 +- tests/misc/shuf.sh | 23 +- tests/misc/sort-NaN-infloop.sh | 2 +- tests/misc/sort-benchmark-random.sh | 2 +- tests/misc/sort-compress-hang.sh | 6 +- tests/misc/sort-compress-proc.sh | 17 +- tests/misc/sort-compress.sh | 6 +- tests/misc/sort-continue.sh | 2 +- tests/misc/sort-debug-keys.sh | 2 +- tests/misc/sort-debug-warn.sh | 2 +- tests/misc/sort-discrim.sh | 2 +- tests/misc/sort-exit-early.sh | 10 +- tests/misc/sort-files0-from.pl | 2 +- tests/misc/sort-float.sh | 2 +- tests/misc/sort-merge-fdlimit.sh | 2 +- tests/misc/sort-merge.pl | 2 +- tests/misc/sort-month.sh | 2 +- tests/misc/sort-rand.sh | 2 +- tests/misc/sort-spinlock-abuse.sh | 7 +- tests/misc/sort-stale-thread-mem.sh | 2 +- tests/misc/sort-u-FMR.sh | 2 +- tests/misc/sort-unique-segv.sh | 2 +- tests/misc/sort-unique.sh | 2 +- tests/misc/sort-version.sh | 2 +- tests/misc/sort.pl | 10 +- tests/misc/stat-birthtime.sh | 2 +- tests/misc/stat-fmt.sh | 2 +- tests/misc/stat-hyphen.sh | 4 +- tests/misc/stat-mount.sh | 2 +- tests/misc/stat-nanoseconds.sh | 2 +- tests/misc/stat-printf.pl | 2 +- tests/misc/stat-slash.sh | 4 +- tests/misc/stdbuf.sh | 15 +- tests/misc/stty-invalid.sh | 8 +- tests/misc/stty-pairs.sh | 2 +- tests/misc/stty-row-col.sh | 4 +- tests/misc/stty.sh | 12 +- tests/misc/sum-sysv.sh | 2 +- tests/misc/sum.pl | 2 +- tests/misc/sync.sh | 52 + tests/misc/tac-2-nonseekable.sh | 16 +- tests/misc/tac-continue.sh | 16 +- tests/misc/tac.pl | 2 +- tests/misc/tail.pl | 15 +- tests/misc/tee-dash.sh | 24 - tests/misc/tee.sh | 95 +- tests/misc/test-diag.pl | 2 +- tests/misc/test.pl | 2 +- tests/misc/timeout-blocked.pl | 2 +- tests/misc/timeout-group.sh | 19 +- tests/misc/timeout-parameters.sh | 2 +- tests/misc/timeout.sh | 2 +- tests/misc/tr-case-class.sh | 12 +- tests/misc/tr.pl | 2 +- tests/misc/truncate-dangling-symlink.sh | 2 +- tests/misc/truncate-dir-fail.sh | 4 +- tests/misc/truncate-fail-diag.sh | 2 +- tests/misc/truncate-fifo.sh | 2 +- tests/misc/truncate-no-create-missing.sh | 2 +- tests/misc/truncate-overflow.sh | 8 +- tests/misc/truncate-owned-by-other.sh | 4 +- tests/misc/truncate-parameters.sh | 14 +- tests/misc/truncate-relative.sh | 10 +- tests/misc/tsort.pl | 2 +- tests/misc/tty-eof.pl | 2 +- tests/misc/unexpand.pl | 2 +- tests/misc/uniq-perf.sh | 4 +- tests/misc/uniq.pl | 2 +- tests/misc/wc-files0-from.pl | 2 +- tests/misc/wc-files0.sh | 2 +- tests/misc/wc-parallel.sh | 8 +- tests/misc/wc-proc.sh | 32 + tests/misc/wc.pl | 2 +- tests/misc/xattr.sh | 2 +- tests/misc/xstrtol.pl | 2 +- tests/misc/yes.sh | 42 + tests/mkdir/p-1.sh | 2 +- tests/mkdir/p-2.sh | 2 +- tests/mkdir/p-3.sh | 5 +- tests/mkdir/p-acl.sh | 2 +- tests/mkdir/p-slashdot.sh | 2 +- tests/mkdir/p-thru-slink.sh | 2 +- tests/mkdir/p-v.sh | 2 +- tests/mkdir/parents.sh | 4 +- tests/mkdir/perm.sh | 4 +- tests/mkdir/restorecon.sh | 5 +- tests/mkdir/selinux.sh | 2 +- tests/mkdir/smack-no-root.sh | 2 +- tests/mkdir/smack-root.sh | 2 +- tests/mkdir/special-1.sh | 4 +- tests/mkdir/t-slash.sh | 2 +- tests/mkdir/writable-under-readonly.sh | 2 +- tests/mv/acl.sh | 2 +- tests/mv/atomic.sh | 2 +- tests/mv/atomic2.sh | 2 +- tests/mv/backup-dir.sh | 2 +- tests/mv/backup-is-src.sh | 2 +- tests/mv/childproof.sh | 10 +- tests/mv/diag.sh | 2 +- tests/mv/dir-file.sh | 6 +- tests/mv/dir2dir.sh | 2 +- tests/mv/dup-source.sh | 2 +- tests/mv/force.sh | 23 +- tests/mv/hard-2.sh | 2 +- tests/mv/hard-3.sh | 2 +- tests/mv/hard-4.sh | 19 +- tests/mv/hard-link-1.sh | 2 +- tests/mv/hard-verbose.sh | 33 - tests/mv/hardlink-case.sh | 37 + tests/mv/i-1.pl | 2 +- tests/mv/i-2.sh | 2 +- tests/mv/i-3.sh | 9 +- tests/mv/i-4.sh | 16 +- tests/mv/i-5.sh | 2 +- tests/mv/i-link-no.sh | 2 +- tests/mv/into-self-2.sh | 2 +- tests/mv/into-self-3.sh | 2 +- tests/mv/into-self-4.sh | 4 +- tests/mv/into-self.sh | 2 +- tests/mv/leak-fd.sh | 2 +- tests/mv/mv-n.sh | 4 +- tests/mv/mv-special-1.sh | 2 +- tests/mv/no-target-dir.sh | 10 +- tests/mv/part-fail.sh | 2 +- tests/mv/part-hardlink.sh | 2 +- tests/mv/part-rename.sh | 8 +- tests/mv/part-symlink.sh | 2 +- tests/mv/partition-perm.sh | 2 +- tests/mv/perm-1.sh | 2 +- tests/mv/sticky-to-xpart.sh | 7 +- tests/mv/symlink-onto-hardlink-to-self.sh | 37 +- tests/mv/symlink-onto-hardlink.sh | 2 +- tests/mv/to-symlink.sh | 2 +- tests/mv/trailing-slash.sh | 6 +- tests/mv/update.sh | 2 +- tests/other-fs-tmpdir | 2 +- tests/pr/pr-tests.pl | 11 +- tests/readlink/can-e.sh | 28 +- tests/readlink/can-f.sh | 40 +- tests/readlink/can-m.sh | 4 +- tests/readlink/multi.sh | 6 +- tests/readlink/rl-1.sh | 8 +- tests/rm/cycle.sh | 2 +- tests/rm/d-1.sh | 2 +- tests/rm/d-2.sh | 2 +- tests/rm/d-3.sh | 2 +- tests/rm/dangling-symlink.sh | 9 +- tests/rm/deep-1.sh | 2 +- tests/rm/deep-2.sh | 2 +- tests/rm/dir-no-w.sh | 2 +- tests/rm/dir-nonrecur.sh | 2 +- tests/rm/dot-rel.sh | 2 +- tests/rm/empty-inacc.sh | 2 +- tests/rm/empty-name.pl | 2 +- tests/rm/ext3-perf.sh | 2 +- tests/rm/f-1.sh | 2 +- tests/rm/fail-2eperm.sh | 8 +- tests/rm/fail-eacces.sh | 2 +- tests/rm/fail-eperm.xpl | 3 +- tests/rm/hash.sh | 2 +- tests/rm/i-1.sh | 2 +- tests/rm/i-never.sh | 2 +- tests/rm/i-no-r.sh | 4 +- tests/rm/ignorable.sh | 2 +- tests/rm/inaccessible.sh | 2 +- tests/rm/interactive-always.sh | 2 +- tests/rm/interactive-once.sh | 2 +- tests/rm/ir-1.sh | 2 +- tests/rm/isatty.sh | 10 +- tests/rm/many-dir-entries-vs-OOM.sh | 2 +- tests/rm/no-give-up.sh | 6 +- tests/rm/one-file-system.sh | 2 +- tests/rm/one-file-system2.sh | 2 +- tests/rm/r-1.sh | 2 +- tests/rm/r-2.sh | 2 +- tests/rm/r-3.sh | 2 +- tests/rm/r-4.sh | 6 +- tests/rm/r-root.sh | 18 +- tests/rm/read-only.sh | 4 +- tests/rm/readdir-bug.sh | 2 +- tests/rm/rm1.sh | 2 +- tests/rm/rm2.sh | 2 +- tests/rm/rm3.sh | 2 +- tests/rm/rm4.sh | 4 +- tests/rm/rm5.sh | 2 +- tests/rm/sunos-1.sh | 4 +- tests/rm/unread2.sh | 2 +- tests/rm/unread3.sh | 2 +- tests/rm/unreadable.pl | 2 +- tests/rm/v-slash.sh | 2 +- tests/rmdir/fail-perm.sh | 4 +- tests/rmdir/ignore.sh | 2 +- tests/rmdir/t-slash.sh | 2 +- tests/sample-test | 2 +- tests/split/additional-suffix.sh | 4 +- tests/split/b-chunk.sh | 47 +- tests/split/fail.sh | 28 +- tests/split/filter.sh | 4 +- tests/split/guard-input.sh | 10 +- tests/split/l-chunk.sh | 9 +- tests/split/line-bytes.sh | 2 +- tests/split/lines.sh | 2 +- tests/split/numeric.sh | 8 +- tests/split/r-chunk.sh | 2 +- tests/split/record-sep.sh | 78 + tests/split/suffix-auto-length.sh | 25 +- tests/split/suffix-length.sh | 4 +- tests/tail-2/F-headers.sh | 59 + tests/tail-2/F-vs-missing.sh | 51 +- tests/tail-2/F-vs-rename.sh | 104 +- tests/tail-2/append-only.sh | 13 +- tests/tail-2/assert-2.sh | 50 +- tests/tail-2/assert.sh | 55 +- tests/tail-2/big-4gb.sh | 2 +- tests/tail-2/descriptor-vs-rename.sh | 56 + tests/tail-2/flush-initial.sh | 17 +- tests/tail-2/follow-name.sh | 2 +- tests/tail-2/follow-stdin.sh | 2 +- tests/tail-2/infloop-1.sh | 46 - tests/tail-2/inotify-hash-abuse.sh | 56 +- tests/tail-2/inotify-hash-abuse2.sh | 33 +- tests/tail-2/inotify-race.sh | 55 +- tests/tail-2/inotify-race2.sh | 103 + tests/tail-2/inotify-rotate-resources.sh | 108 + tests/tail-2/inotify-rotate.sh | 73 +- tests/tail-2/pid.sh | 18 +- tests/tail-2/pipe-f.sh | 2 +- tests/tail-2/pipe-f2.sh | 18 +- tests/tail-2/proc-ksyms.sh | 2 +- tests/tail-2/retry.sh | 71 +- tests/tail-2/start-middle.sh | 2 +- tests/tail-2/symlink.sh | 54 +- tests/tail-2/tail-c.sh | 34 + tests/tail-2/tail-n0f.sh | 12 +- tests/tail-2/truncate.sh | 56 + tests/tail-2/wait.sh | 46 +- tests/touch/60-seconds.sh | 2 +- tests/touch/dangling-symlink.sh | 2 +- tests/touch/empty-file.sh | 2 +- tests/touch/fail-diag.sh | 2 +- tests/touch/fifo.sh | 2 +- tests/touch/no-create-missing.sh | 2 +- tests/touch/no-dereference.sh | 8 +- tests/touch/no-rights.sh | 2 +- tests/touch/not-owner.sh | 2 +- tests/touch/now-owned-by-other.sh | 4 +- tests/touch/obsolescent.sh | 2 +- tests/touch/read-only.sh | 2 +- tests/touch/relative.sh | 2 +- tests/touch/trailing-slash.sh | 22 +- 2220 files changed, 122329 insertions(+), 76483 deletions(-) create mode 100644 gnulib-tests/gl_array_list.c create mode 100644 gnulib-tests/gl_array_list.h create mode 100644 gnulib-tests/test-array_list.c create mode 100644 gnulib-tests/test-linked_list.c create mode 100644 lib/acl-internal.c create mode 100644 lib/assure.h create mode 100644 lib/get-permissions.c create mode 100644 lib/gl_anylinked_list1.h create mode 100644 lib/gl_anylinked_list2.h create mode 100644 lib/gl_linked_list.c create mode 100644 lib/gl_linked_list.h create mode 100644 lib/gl_list.c create mode 100644 lib/gl_list.h create mode 100644 lib/gl_xlist.c create mode 100644 lib/gl_xlist.h create mode 100644 lib/set-permissions.c create mode 100644 lib/xdectoimax.c create mode 100644 lib/xdectoint.c create mode 100644 lib/xdectoint.h create mode 100644 lib/xdectoumax.c create mode 100644 m4/obstack.m4 create mode 100644 po/sr.gmo create mode 100644 po/sr.po create mode 100755 tests/cp/duplicate-sources.sh create mode 100755 tests/dd/stats.sh create mode 100755 tests/du/bind-mount-dir-cycle-v2.sh create mode 100755 tests/ls/hex-option.sh create mode 100755 tests/misc/cat-self.sh create mode 100755 tests/misc/factor-parallel.sh create mode 100755 tests/misc/od-j.sh create mode 100755 tests/misc/seq-precision.sh delete mode 100755 tests/misc/shred-negative.sh create mode 100755 tests/misc/shred-size.sh create mode 100755 tests/misc/sync.sh delete mode 100755 tests/misc/tee-dash.sh create mode 100755 tests/misc/wc-proc.sh create mode 100755 tests/misc/yes.sh delete mode 100755 tests/mv/hard-verbose.sh create mode 100755 tests/mv/hardlink-case.sh create mode 100755 tests/split/record-sep.sh create mode 100755 tests/tail-2/F-headers.sh create mode 100755 tests/tail-2/descriptor-vs-rename.sh delete mode 100755 tests/tail-2/infloop-1.sh create mode 100755 tests/tail-2/inotify-race2.sh create mode 100755 tests/tail-2/inotify-rotate-resources.sh create mode 100755 tests/tail-2/tail-c.sh create mode 100755 tests/tail-2/truncate.sh diff --git a/.mailmap b/.mailmap index b5cf17cf..c7a18cfb 100644 --- a/.mailmap +++ b/.mailmap @@ -12,7 +12,7 @@ Paul Eggert Evan Hunt Evan Hunt -Pádraig Brady +Pádraig Brady @@ -27,9 +27,17 @@ Pádraig Brady + # Prefer spelled-out middle name and its address. Arne Henrik Juul Arne H. Juul # Had email as name. Dan Jacobson jidanni@jidanni.org + +# Consolidate names of same email address. +Jeff Liu jeff.liu +Jeff Liu Jie Liu + +# Convert to latin1 for a better 'THANKS' sort order. +Aleksej Shilin Алексей Шилин diff --git a/.prev-version b/.prev-version index 92189430..3c7af72b 100644 --- a/.prev-version +++ b/.prev-version @@ -1 +1 @@ -8.22 +8.23 diff --git a/.tarball-version b/.tarball-version index 3c7af72b..de09aeb4 100644 --- a/.tarball-version +++ b/.tarball-version @@ -1 +1 @@ -8.23 +8.24 diff --git a/.version b/.version index 3c7af72b..de09aeb4 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -8.23 +8.24 diff --git a/.vg-suppressions b/.vg-suppressions index db940cb2..52846edb 100644 --- a/.vg-suppressions +++ b/.vg-suppressions @@ -1,6 +1,6 @@ # Suppress valgrind diagnostics we don't care about. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free 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 0296830b..64c11d75 100644 --- a/AUTHORS +++ b/AUTHORS @@ -83,7 +83,7 @@ stat: Michael Meskes stdbuf: Pádraig Brady stty: David MacKenzie sum: Kayvan Aghaiepour, David MacKenzie -sync: Jim Meyering +sync: Jim Meyering, Giuseppe Scrivano tac: Jay Lepreau, David MacKenzie tail: Paul Rubin, David MacKenzie, Ian Lance Taylor, Jim Meyering tee: Mike Parker, Richard M. Stallman, David MacKenzie diff --git a/ChangeLog b/ChangeLog index f9ce4441..ce9c3d43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,2832 @@ +2015-07-03 Pádraig Brady + + version 8.24 + * NEWS: Record release date. + + maint: fix distclean-check failure due to THANKS + * Makefile.am: Remove our dependence on src/sort which + induces awkward dependencies for `make dist` since + THANKS will be rebuilt once src/sort is newer. + Instead we remove the problematic -f option to sort + which actually doesn't change the order given + our current input. + + maint: avoid false syntax-check failure in distcheck + * cfk.mk (sc_tests_executable): Restrict the check to git files, + so we don't flag any gnulib files added to test/ during + `make distcheck`. + + tests: update gnulib submodule and tests/init.sh to latest + * gnulib: Update to latest, with fixes to tests edge cases. + * tests/init.sh: Update from gnulib. + + tests: avoid side effects of $SHELL environment variable + Since non interactive shells don't generally set $SHELL, + its value is propagated through the tests and may cause issues; + for example if $SHELL implicitly adjusts $PATH when run. + Instead we set $SHELL to that determined by the posix-shell module, + and use that consistently for all test sub scripts, + including those created thorugh the `split --filter` command. + * tests/local.mk: Explicitly set $SHELL to $(PREFERABLY_POSIX_SHELL) + which defaults to $CONFIG_SHELL and thus usually /bin/sh. + * tests/envvar-check: Remove bash environment variables with + side effects, in case /bin/bash was selected for $SHELL. + * tests/misc/help-version.sh: Remove redundant initialization of $SHELL. + * tests/install/strip-program.sh: Use $SHELL for sub script. + * tests/misc/sort-compress-hang.sh: Likewise. + * tests/misc/sort-compress-proc.sh: Likewise. + * tests/misc/sort-compress.sh: Likewise. + * tests/misc/timeout-group.sh: Likewise. + * tests/rm/fail-eperm.xpl: Remove redundant elision of bash env vars. + * tests/misc/pwd-long.sh: Likewise. + +2015-07-02 Pádraig Brady + + tests: avoid false failures on OpenBSD 5.7 + * tests/du/threshold.sh: Homogenize getopt error messages. + * tests/misc/numfmt.pl: Likewise. + * tests/mv/i-3.sh: Skip on *BSD not just FreeBSD. + + wc: fix reading of /proc files on aarch64 + tests/misc/wc-proc.sh fails when the page size is 64K + * src/wc.c (wc): The lseek adjustment should be based on st_blksize, + rather than on the internal buffer size. This is significant on + aarch64 where st_blksize in /proc is the 64K (the page size) and + thus larger than the internal buffer. + * src/split.c (main): Even though the similar processing is done + on the internal buffer size, that's based on st_blksize and + so fine in this regard. Add an assert to enforce this. + Avoid this path for the undocumented ---io-blksize option. + +2015-07-01 Pádraig Brady + + build: update gnulib submodule to latest + Mainly with build fixes for FreeBSD and OS X. + + numfmt: increase precision on 32 bit FreeBSD + * m4/jm-macros.m4 (HAVE_FPSETPREC): Define if needed. + * src/numfmt.c (main): Call fpsetprec() if needed. + Fixes large-15 and large-16 test failures on 32 bit FreeBSD. + + tests: avoid false failure on FreeBSD systems + * tests/misc/stty.sh: FreeBSD returns ENOTTY for + the TIOCEXT ioctl, so just avoid this option for now. + + factor: ensure atomic output through pipes + The new tests/misc/factor-parallel.sh test was + seen to fail on FreeBSD (derived) systems, which was + due to split(1) --filter reading partial lines + through pipes, as factor(1) was writing a little + over PIPE_BUF each time. + * src/factor.c (lbuf): A new structure to internally buffer lines. + (lbuf_alloc): A new function to allocate enough at program start. + (lbuf_putint): A new function to buffer a uintmax_t. + (lbuf_flush): A new function to write directly to standard output. + (lbuf_putc): A new function to buffer a character and if enough + lines are buffered, then output complete lines <= PIPE_BUF, + and continue to buffer the rest. + (main): Call the internal buffer allocator, and register + the final flush from the internal buffer at program exit. + + tests: fix false failure on slower systems + * tests/dd/stats.sh: Wait 20s for dd to write 250MB through a fifo, + rather than 10s for 500MB. The failure was seen often on + a lightly loaded SPARC-Enterprise-T5220 running Solaris 10. + +2015-06-29 Jim Meyering + + maint: stdbuf.c: avoid the OS X putenv function + * bootstrap.conf (gnulib_modules): Add setenv, to make this + module dependency explicit; setenv is also used by split. + * src/stdbuf.c (set_LD_PRELOAD) [__APPLE__]: Use the OS X setenv + function, rather than putenv, per that documentation: + https://developer.apple.com/\ + library/mac/documentation/Darwin/Reference/ManPages/man3/putenv.3.html + + build: numfmt.c: avoid a shadowing warning + * src/numfmt.c (parse_field_arg): Rename parameter s/optarg/arg/, + to avoid shadowing getopt's global variable. + Otherwise, building on OS X, with --enable-gcc-warnings, I saw this: + In file included from src/numfmt.c:19:0: + src/numfmt.c: In function 'parse_field_arg': + ./lib/config.h:3109:25: error: declaration of 'rpl_optarg' shadows\ + a global declaration [-Werror=shadow] + +2015-06-29 Assaf Gordon + + numfmt: fix printf argument order + * src/numfmt.c (double_to_human): Fix the argument order + passed to snprintf, which happened to work on amd64 with + its separate va_arg storage area for floats¹, + but would fail tests for example on i686. + ¹ https://blog.nelhage.com/2010/10/amd64-and-va_arg/ + +2015-06-28 Pádraig Brady + + maint: clarify df's use of device IDs from /proc/self/mountinfo + * src/df.c (filter_mount_list): Clarify why we still stat even + though devices IDs may already be available. Note using + /proc/self/mountinfo is still an advantage to get filtered items + with accurate device patchs in chroots and with bind mounts. + I.E. on older setups with static /etc/mtab, df will now + bypass that to get the more accuracte and dynamic info. + +2015-06-26 Pádraig Brady + + chroot: quote argument in error diagnostic + * src/chroot.c (main): Quote the passed argument, + to avoid confusing error messages. + +2015-06-25 Pádraig Brady + + maint: clarify integer operations in recent commit + * src/factor.c (print_uintmaxes): Comment that the + value of n_out doesn't matter on error, and add an + explicit cast to avoid any future warnings. + Suggested by Jim Meyering RE commit v8.23-229-g4d2d6c5 + + tests: avoid false failure when running as root + * tests/misc/sync.sh: Ensure dir is unreadable before + including the permission check. + + tests: avoid false failures with LD_PRELOAD=libasan.so.2 + The LD_PRELOAD checks by -fsanitize=address are overly strict: + https://groups.google.com/forum/#!topic/address-sanitizer/jEvOJgkDqQk + A workaround is to first export LD_PRELOAD=libasan.so.2 + The tests below are adjusted so that workaround is not discarded. + * tests/cp/no-ctx.sh: Append to $LD_PRELOAD. + * tests/df/no-mtab-status.sh: Likewise. + * tests/df/skip-duplicates.sh: Likewise. + * tests/ls/getxattr-speedup.sh: Likewise. + * tests/rm/r-root.sh: Likewise. + * tests/cp/nfs-removal-race.sh: Likewise. Also check that + LD_PRELOAD is effective to aid future maintainability + and avoid false failure if libasan.so.2 is not preloaded. + + build: update to latest gnulib + Mainly for -fsanitize=address and -fsanitize=undefined fixes + + build: allow build to complete with -fsanitize=address + * src/make-prime-list.c (main): When building with + the above option, avoid this build stopping error: + "LeakSanitizer: detected memory leaks" + +2015-06-24 Pádraig Brady + + maint: avoid undefined behavior in qsort call + GCC 5.1.1 -fsanitize=undefined with glibc 2.21 is returning: + "runtime error: null pointer passed as argument 1, + which is declared to never be null" + * src/ptx.c (sort_found_occurs): Avoid the call with no entries. + + factor: avoid interspersed lines for parallel runs + * src/factor.c (n_out): A new global variable to track + how much data has been written to stdout. + (print_factors_single): Use n_out to determine whether + to flush the current (and previous) lines. + * tests/misc/factor-parallel.sh: Add a new test. + * tests/local.mk: Reference the new test. + * NEWS: Mention the bug fix. + + seq: handle exponents more consistently + src/seq.c (scan_arg): Set precision and width _after_ exponentiation. + For example, this will make '1.1e1 12' and '11 1.2e1' equivalent. + One can still set the precision by specifying extra precision on + the start value, or more naturally with a precision on a step value. + * tests/misc/seq-precision.sh: Add new cases. + + seq: use consistent output format with hex integers + * src/seq.c (scan_arg): Set precision to 0 for hex constants + (while avoiding hex floats). This will use then use the + fast path for these arguments. Note we also set the precision + of inf to 0 here, which ensures we use consistent precision + on output where possible. + * tests/misc/seq-precision.sh: Add corresponding test cases. + + seq: support inf last item more generally/efficiently + * src/seq.c (main): Call seq_fast for infinite last value. + This implicitly avoids format conversion on the + 999999 -> 1000000 transition. + * src/seq.c (seq_fast): Generalize the buffer handling, + and adjust to handle the "inf" last value specifics. + * tests/misc/seq-precision.sh: A new test. + * tests/local.mk: Reference the new test. + +2015-06-22 Pádraig Brady + + doc: list numfmt in the main menu with "Numeric operations" + * doc/coreutils.texi (main menu): Add numfmt. + + numfmt: don't hardcode floating point limits + * src/numfmt.c (MAX_UNSCALED_DIGITS): Set this to LDBL_DIG + rather than hardcoding at 18 for better portability. + * tests/misc/numfmt.pl: Restrict limit tests to supported platforms. + + numfmt: handle leading zeros correctly + * src/numfmt.c (simple_strtod_int): Don't count leading zeros + as significant digits. Also have leading zeros as optional + for floating point numbers. + * tests/misc/numfmt.pl: Add test cases. + * NEWS: Mention the fix. + + numfmt: avoid integer overflow when rounding + Due to existing limits this is usually triggered + with an increased precision. We also add further + restrictions to the output of increased precision numbers. + * src/numfmt.c (simple_round): Avoid intmax_t overflow. + (simple_strtod_int): Count digits consistently + for precision loss and overflow detection. + (prepare_padded_number): Include the precision + when excluding numbers to output, since the precision + determines the ultimate values used in the rounding scheme + in double_to_human(). + * tests/misc/numfmt.pl: Add previously failing test cases. + * NEWS: Mention the fix. + +2015-06-21 Pádraig Brady + + numfmt: support user specified output precision + * src/numfmt.c (usage): Update the --format description + to indicate precision is allowed. + (parse_format_string): Parse a precision specification + like the standard printf does. + (double_to_human): Honor the precision in --to mode. + * tests/misc/numfmt.pl: New tests. + * doc/coreutils.texi (numfmt invocation): Mention the new feature. + * NEWS: Likewise. + +2015-06-19 Dylan Cali + + numfmt: implement support for field ranges + * src/numfmt.c: Replace field handling code with logic that understands + field range specifiers. Instead of processing a single field and + printing line prefix/suffix around it, process each field in the line + checking whether it has been included for conversion. If so convert and + print, otherwise just print the unaltered field. + (extract_fields): Removed. + (skip_fields): Removed. + (process_line): Gutted and heavily reworked. + (process_suffixed_number): FIELD is now passed as an arg instead of + using a global. + (parse_field_arg): New function that parses field range specifiers. + (next_field): New function that returns pointers to the next field in + a line. + (process_field): New function that wraps the field conversion logic + (include_field): New function that checks whether a field should be + converted + (compare_field): New function used for field value comparisons in a + gl_list. + (free_field): New function used for freeing field values in a gl_list. + Global variable FIELD removed. + New global variable all_fields indicates whether all fields should be + processed. + New global variable all_fields_after stores the first field of a N- + style range. + New global variable all_fields_before stores the last field of a -M + style range. + New global variable field_list stores explicitly specified fields to + process (N N,M or N-M style specifiers). + (usage): Document newly supported field range specifiers. + * bootstrap.conf: Include xlist and linked-list modules. numfmt now + uses the gl_linked_list implementation to store the field ranges. + * tests/misc/numfmt.pl: Add tests for 'cut style' field ranges. + Adjust existing tests as partial output can occur before an error + Remove test for the 'invalid' field -5.. this is now a valid range. + * gnulib: update to avoid compiler warnings in linked-list. + * NEWS: Mention the new feature. + +2015-06-19 Pádraig Brady + + doc: use correct units in df | numfmt example + * src/numfmt.c (usage): Don't scale output from df + so that numfmt outputs the correct values. + + numfmt: handle suffixes consistently with --{from,to}-unit + * src/numfmt.c (unit_to_umax): Support SI (power of 10) suffixes + with the --from-unit and --to-unit options. Treat suffixes like + is done with --from=auto, which for example will change the meaning + of --to-unit=G to that of --to-unit=Gi. The suffix support was + previously undocumented and it's better to avoid the traditional + coreutils suffix handling in numfmt by default. + * doc/coreutils.texi: Document the new behavior. Also fix a typo + mentioning {from,to}=units=. + * tests/misc/numfmt.pl: Adjust accordingly. + * NEWS: Mention the change in behavior. + +2015-06-17 Pádraig Brady + + maint: remove stale online manual items at release + * gnulib: Update to get the new gnu-web-doc-update with --mirror option. + * README-release: Use the --mirror option in the instructions. + Also clarify and update various release steps. + +2015-06-09 Pádraig Brady + + tail: display consistent diagnostics upon file replacement + * src/tail.c (recheck): Display diagnostices for replaced files + even with reused inodes which is a common case. + * tests/tail-2/F-vs-missing.sh: Use correct diagnostic in comment. + * tests/tail-2/F-vs-rename.sh: Likewise. + + tail: display file headers correctly with inotify + * src/tail.c (tail_forever_inotify): Use the fspec pointer to + distinguish previously output files, rather than a descriptor + from the inotify event. That event descriptor was that of + the parent directory when files were created or renamed etc. + (check_fspec): Adjust for the new comparison. Also show the + header when the file is truncated, since we show data + in this case also. + * tests/tail-2/F-headers.sh: A new test case. + * tests/local.mk: Reference the new test. + * NEWS: Mention the bug fix. + +2015-06-07 Pádraig Brady + + maint: sync .gitignore items with gnulib entries + * .gitignore: Add entries for potentially generated headers. + Also remove a couple of items already present in lib/.gitignore. + * cfg.mk (sc_gitignore_missing): A new syntax check rule to + identify missing .gitignore entries. + (sc_gitignore_redundant): A new syntax check rule to + identify redundant .gitignore entries. + Reported by Tomas Nordin. + +2015-06-06 Pádraig Brady + + tests: fix false failure in recent test adjustment + * configure.ac: Comment on why we link rather than run the test, + and remove the moot __ELF__ check since we never ran it anyway, + and the new CFLAGS and LDFLAGS are a more direct test of support. + * tests/misc/wc-parallel.sh: Fix a syntax error in the previous change. + * tests/misc/md5sum-parallel.sh: Use better error checking, consistent + with that used in wc-parallel.sh. + +2015-06-06 Paul Eggert + + build: port to AIX + Problems reported by Michael Felt, and and part of this fix taken + from code suggested by Pádraig Brady in: + http://bugs.gnu.org/20733#112 + * configure.ac (stdbuf_supported): Check for warnings, and + for -fPIC and -shared, for AIX. + * src/stat.c (STRUCT_STATVFS): Define to struct statvfs64 if + STATFS is statvfs64. + * src/sync.c (sync_arg) [_AIX]: Open in write mode, + since AIX fsync doesn't work on read-only file descriptors. + * tests/misc/wc-parallel.sh: Skip test if xargs -P does not work. + + build: update gnulib submodule to latest + +2015-06-05 Paul Eggert + + build: update gnulib submodule to latest + +2015-06-04 Paul Eggert + + build: port single_binary_prog to POSIX shell + Problem reported privately by Michael Felt. + * Makefile.am (install-exec-hook): + * src/local.mk (src/coreutils_symlinks, src/coreutils_shebangs) + (clean-local): + Port to POSIX shell, which doesn't allow 'for i in ; do ...'. + +2015-06-03 Pádraig Brady + + build: add a dependency on the gnulib tempname module + * bootstrap.conf: Add "tempname" which is needed by mktemp(1). + The explicit dependency supports running gnulib-tool with + the --conditional-dependencies option, used to minimize built + modules. Note on a Fedora 22 system, that results in avoiding + redundant builds of: areadlinkat.o asnprintf.o fd-hook.o + fseterr.o printf-args.o printf-parse.o sockets.o vasnprintf.o. + However --conditional-dependencies is not enabled, since it + currently precludes the inclusion of gnulib tests. + +2015-06-02 Pádraig Brady + + build: update to latest gnulib + Mainly with build fixes for Mac OS X. + +2015-06-01 Pádraig Brady + + tests: fix race in tail test without inotify + * tests/tail-2/wait.sh: Without inotify, skip a portion of the test + that checks that -F never outputs from a tailed descriptor + after the followed name is recreated, because tail_forever() + doesn't guarantee that. + Noticed at http://hydra.nixos.org/build/22766288 + + tests: fix false failure on loaded systems + * tests/misc/uniq-perf.sh: Use our standard 10s timeout, + which is sufficient to trigger the failure and also + avoids a false failure on slow/loaded systems. + Noticed at http://hydra.nixos.org/build/22766288 + +2015-05-30 Pádraig Brady + + maint: avoid new coverity warnings + * src/sync.c (sync_arg): Initialise variable to avoid + unitialized access if assert is disabled. + * src/head.c (elide_tail_bytes_file): Support this function + with ---presume-input-pipe and larger files, + which regressed with commit v8.23-47-g2662702. + (elide_tail_lines_file): Likewise. + * src/dd.c (dd_copy): Explicitly don't try to ftruncate() + upon failure to lseek() (the existing check against + st_size was already protecting that). + * src/factor.c (factor_using_squfof): Assert (only when + linting due to performance) to avoid the implication of + divide by zero. + * src/od.c (read_block): Remove dead code. + * src/tac.c (tac_seekable): Likewise. + * src/ls.c (gobble_file): Likewise. + +2015-05-28 Pádraig Brady + + build: remove workarounds for unsupported gettext versions + Now that we depend on gettext >= 0.19.2 remove the workaround + for issues in autopoint 0.18.3. Note the scheme currently used in + newer gettext (autopoint) to avoid these issues requires + autoconf >= 2.69, therefore we update this requirement also. + Note the gettext version dependence from gnulib comes from + gnulib using gettext macros, and coreutils indirectly depends on + the gettext module due to: + http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=41dca647 + bootstrap will then update m4/po.m4 and thus require a + supportng gettext version. + * bootstrap: Remove moot warning (resyncing with gnulib). + * configure.ac (AC_PREREQ): Change to 2.69 (now 3 years old). + + tests: ln/hard-to-sym FAIL rather than ERROR when ln fails + * tests/ln/hard-to-sym.sh: Only call framework_failure_ when ln + returns success. + + copy: prefer our hardlink to symlink emulation on OS X 10.10 + * src/copy.c (CAN_HARDLINK_SYMLINKS): Don't enable use of linkat() + on Darwin 14, as the gnulib fallback emulation there doesn't + preserve ownership and timestamps etc. This fixes a test failure + in tests/cp/link-symlink.sh + * tests/cp/link-deref.sh: Adjust accordingly. + +2015-05-26 Pádraig Brady + + maint: remove sys/types.h include order check + * src/system.h: This was inadvertently ineffective due to + a typo in commit v8.9-10-ge1aaf89 (Jan 2011), but has + not caused any issues, so remove. + +2015-05-23 Pádraig Brady + + mkdir: fix -pZ with existing parent directories + When the parent directory exists and has a different + default context to the final directory, the context + was incorrectly left as that of the parent directory. + * src/mkdir.c (process_dir): Because defaultcon() is called for + existing ancestors (as it must be to avoid races), then we must + unconditionally call restorecon() on the last component due to + the already documented caveat with make_dir_parents(). + Alternatively you could temp disable o->set_security_context + around make_dir_parents(), but that would be subject to races. + * tests (tests/mkdir/restorecon.sh): Add a TODO for improvement. + Reference mknod and mkfifo with print_ver_. + * NEWS: Mention the bug fix. + Fixes http://bugs.gnu.org/20616 + +2015-05-22 Assaf Gordon + + tests: df-output: accept multiple spaces in header + * tests/df/df-output.sh: Allow for multiple spaces in the header line + of 'df', resulting from alignment with disk sizes >= 10TB. + +2015-05-19 Pádraig Brady + + tests: fix non POSIX constructs causing failures with dash + * tests/cp/no-ctx.sh: Scope of `var=val func` is inconsistent + across shells, so avoid that construct with functions. + * tests/df/no-mtab-status.sh: Likewise. + * tests/tail-2/inotify-race.sh: `read` needs an argument. + * tests/tail-2/inotify-race2.sh: Likewise. + +2015-05-17 Pádraig Brady + + build: fix 'dist' and 'syntax-check' targets in VPATH build + * cfg.mk: Various syntax-check adjustments so that it's + not assumed the $builddir is the base distribution directory. + * Makefile.am: Likewise for the 'dist' target. + + build: avoid issues with case insensitive file systems + * cfg.mk (sc_case_insensitive_file_names): A new syntax-check rule. + * tests/tail-2/descriptor-vs-rename.sh: Rename from + tests/tail-2/f-vs-rename.sh + * tests/local.mk: Reference the renamed test. + Reported by Jim Meyering. + +2015-05-14 Bernhard Voelker + + tests: fix check for local file system in inotify-rotate-resources.sh + * tests/tail-2/inotify-rotate-resources.sh: s/(is_local_dir)/\1_/ + +2015-05-14 Pádraig Brady + + tests: fix async allocation race on BTRFS + * tests/dd/sparse.sh: Sync files before checking allocations, + which may be done asynchronously on NFS and BTRFS at least. + Also mark this test as very expensive on remote file systems. + * tests/du/2g.sh: Likewise, also use fallocate if available + to efficiently allocate the large file, otherwise skip + on remote file systems. + * tests/tail-2/inotify-rotate-resources.sh: Use the more + standard is_local_dir_() to check remoteness. + * tests/cp/fiemap-empty.sh: Comment on the sync issue + for this currerntly unused test. + Fixes http://bugs.gnu.org/20570 + +2015-05-13 Pádraig Brady + + timeout: with --foreground don't send SIGCONT + * src/timeout.c (cleanup): Don't send SIGCONT to the monitored program + when --foreground is specified, as it's generally not needed for + foreground programs, and can cause intermittent signal delivery + issues with monitors like GDB for example. + * doc/coreutils.texi (timeout invocation): Mention that SIGCONT + is not sent with --foreground. + * NEWS: Mention the behavior change. + + split: auto set suffix len for --numeric-suffixes= + + doc: clarify the operation of wc -L + * src/wc.c (usage): State that it calculates display width. + * doc/coreutils.texi (wc invocation): Detail the distinct + items used to determine the display width. + +2015-05-11 Pádraig Brady + + tail: consistently output all data for truncated files + Generally if logs are truncated, they're truncated to 0 length, + so output all existing data when our heuristic determines truncation. + Note with inotify, truncate() and write() are often determined + independently and so all data would be written if that was the case. + * src/tail.c (check_fspec): Reset file offset to 0 upon truncation. + (tail_forever): Likewise. + (recheck): Add a FIXME for the related issue where tail may lose + data due to tail discounting older log files too early. + * tests/tail-2/truncate.sh: A new test. + * tests/local.mk: Reference the new test. + * NEWS: Mention the fix. + + tail: fix inotify startup races + The previous fixes to races in the various tail tests, + identified actual races in the tail inotify implementation. + With --follow=descriptor, if the tailed file was replaced before + the inotify watch was added, then any subsequent changes were ignored. + Similarly in --follow=name mode, all changes to a new name were + effectively ignored if that name was created after the original open() + but before the inotify_add_watch(). + * src/tail.c (tail_forever_inotify): Fix 3 cases. + 1. With -f, don't stop tailing when file removed before watch. + 2. With -f, watch right file when file replaced before watch. + 3. With -F, inspect correct file when replaced before watch. + Existing tests identify these when tail compiled with TAIL_TEST_SLEEP. + * tests/tail-2/inotify-rotate-resources.sh: + This test also identifies the issue with --follow=name + when TAIL_TEST_SLEEP is used. Adjust so the test is immune + to such races, and also fail quicker on remote file systems. + * tests/tail-2/inotify-race2.sh: A new test using GDB, + based on inotify-race.sh, which tests the -F race + without needed recompilation with sleeps. + * tests/local.mk: Reference the new test. + * NEWS: Mention the bug. + + tests: cleanup background processes upon interruption + Reap background processes so that: + - Stray processes aren't left on the system + - Files aren't held open causing deletion issues on NFS + - Partitions used to run the tests from can be unmounted + * tests/tail-2/F-vs-missing.sh: Add the `kill && wait` of the + background $pid(s) to cleanup_(). + * tests/tail-2/F-vs-rename.sh: Likewise. + * tests/tail-2/f-vs-rename.sh: Likewise. + * tests/tail-2/append-only.sh: Likewise. + * tests/tail-2/assert-2.sh: Likewise. + * tests/tail-2/assert.sh: Likewise. + * tests/tail-2/flush-initial.sh: Likewise. + * tests/tail-2/inotify-hash-abuse.sh: Likewise. + * tests/tail-2/inotify-hash-abuse2.sh: Likewise. + * tests/tail-2/inotify-race.sh: Likewise. + * tests/tail-2/inotify-rotate-resources.sh: Likewise. + * tests/tail-2/inotify-rotate.sh: Likewise. + * tests/tail-2/pid.sh: Likewise. + * tests/tail-2/pipe-f2.sh: Likewise. + * tests/tail-2/retry.sh: Likewise. + * tests/tail-2/symlink.sh: Likewise. + * tests/tail-2/tail-n0f.sh: Likewise. + * tests/tail-2/wait.sh: Likewise. + * tests/cp/existing-perm-race.sh: Likewise. + * tests/cp/file-perm-race.sh: Likewise. + * tests/cp/parent-perm-race.sh: Likewise. + * tests/cp/sparse-to-pipe.sh: Likewise. + * tests/dd/stats.sh: Likewise. + * tests/du/move-dir-while-traversing.sh: Likewise. + * tests/misc/cat-buf.sh: Likewise. + * tests/misc/help-version.sh: Likewise. + * tests/misc/printf-surprise.sh: Likewise. + * tests/misc/sort-compress-proc.sh: Likewise. + * tests/misc/sort-spinlock-abuse.sh: Likewise. + * tests/misc/stdbuf.sh: Likewise. + * tests/misc/tac-continue.sh: Likewise. + * tests/misc/timeout-group.sh: Likewise. + * tests/mv/i-3.sh: Likewise. + * tests/rm/dangling-symlink.sh: Likewise. + * tests/rm/isatty.sh: Likewise. + * cfg.mk (sc_prohibit_test_background_without_cleanup_): + A new syntax-check to ensure cleanup_() is defined + when background tasks are created in a test. + + tests: avoid hung processes due to gdb SIGCONT handling + * tests/tail-2/inotify-race.sh: Add a `wait` to ensure that + we reap all background gdb and tail processes. That resulted + in the test hanging intermittently and upon investigation was + due to gdb intermittently failing to terminate the child process + due to receiving a SIGCONT signal. Therefore we avoid using + timeout(1) which sends that signal, and instead rely on tail's + inbuilt --pid monitoring on a background sleep process. + Given this new implementation, the VERY_EXPENSIVE guard was removed. + Related issues with this test hanging were previously discussed at: + https://lists.gnu.org/archive/html/bug-coreutils/2009-12/msg00025.html + + tests: fix races in and standardize the tail tests + * tests/tail-2/F-vs-missing.sh: Use standard "fastpoll" options + (-s.1 --max-unchanged-stats=1) to speedup the non-inotify case. + Add the non-inotify case to the test. `wait` on the background + tail process to terminate which should avoid the need for the + non standard `retry_delay_ cleanup ...` on NFS. + * tests/tail-2/F-vs-rename.sh: Remove 'out' at the start of the loop, + to avoid a race in checking its contents. Also ensure 'a' & 'b' + files are present before the tail process starts. Use the standard + "fastpoll" options as above. + * tests/tail-2/f-vs-rename.sh: Likewise. + * tests/tail-2/append-only.sh: Use more standard variable names. + * tests/tail-2/flush-initial.sh: Use "fastpoll" options for + non-inotify platforms. Also `wait` on the background tail to avoid + stray processes and file cleanup issues on NFS. + * tests/tail-2/inotify-hash-abuse.sh: Always run non-inotify case. + Use "fastpoll" options. Use a more standard retry_delay_ instead + of a hardcoded sleep loop. Add a `wait` on the background tail. + * tests/tail-2/inotify-hash-abuse2.sh: Likewise. + * tests/tail-2/inotify-rotate-resources.sh: Wait just on the + specific tail $pid needed. + * tests/tail-2/inotify-rotate.sh: Use "fastpoll" options. + * tests/tail-2/pid.sh: Use standard variable names. + Add a `wait` on the background tails. + * tests/tail-2/pipe-f2.sh: Likewise. + * tests/tail-2/tail-n0f.sh: Likewise. + * tests/tail-2/retry.sh: Use "fastpoll" options. + * tests/tail-2/symlink.sh: Likewise. + * tests/tail-2/wait.sh: Likewise. Speedup by using sub second + parameters to timeout(1). Improve the part ensuring that + -F never follows a renamed file. + * tests/tail-2/infloop-1.sh: Remove invalid test. tail(1) was not + being passed the --pid=$yes_pid option, retry_delay_ wasn't used + to avoid races, and yes could write huge files before being killed. + * tests/local.mk: Remove the invalid test reference. + * tests/tail-2/assert-2.sh: Rewrite using retry_delay_(). Since + no longer hardcoding large delays, remove the VERY_EXPENSIVE tag. + * tests/tail-2/assert.sh: Likewise. + +2015-05-10 Paul Eggert + + build: rewrite is_ENOTSUP without an #if directive + * src/system.h (is_ENOTSUP): Avoid in-function #if directive. + +2015-05-10 Jim Meyering + + build: avoid a warning form gcc's new -Wlogical-op + Without this change, very recent gcc (e.g., version 6.0.0 20150509) + would print the following when configured with --enable-gcc-warnings: + src/copy.c:165:30: error: logical 'or' of equal expressions \ + [-Werror=logical-op] + && (errno == EOPNOTSUPP || errno == ENOTSUP || errno == ENOSYS)) + ^ + * src/system.h (is_ENOTSUP): New function. + * src/copy.c (punch_hole): Use it. + * src/ls.c (errno_unsupported, gobble_file): Use it. + +2015-04-30 Pádraig Brady + + doc: standardize messages about the '-' stdin FILE + * src/system.h (emit_stdin_note): A new function, refactoring + the usage note about the '-' FILE implying stdin. + * src/base64.c (usage): Use the new function to emit the + note in a standard location and with standard separation. + * src/cat.c (usage): Likewise. + * src/csplit.c (usage): Likewise. + * src/cut.c (usage): Likewise. + * src/expand.c (usage): Likewise. + * src/fmt.c (usage): Likewise. + * src/head.c (usage): Likewise. + * src/md5sum.c (usage): Likewise. + * src/nl.c (usage): Likewise. + * src/od.c (usage): Likewise. + * src/paste.c (usage): Likewise. + * src/pr.c (usage): Likewise. + * src/ptx.c (usage): Likewise. + * src/shred.c (usage): Likewise. + * src/shuf.c (usage): Likewise. + * src/sort.c (usage): Likewise. + * src/sum.c (usage): Likewise. + * src/tac.c (usage): Likewise. + * src/tail.c (usage): Likewise. + * src/tsort.c (usage): Likewise. + * src/unexpand.c (usage): Likewise. + * src/wc.c (usage): Likewise. + * src/join.c (usage): Adjust the separation used for + the message referring to FILE1 or FILE2 as stdin. + * src/comm.c (usage): Add a message using the same + wording (translation) as used in join. + * src/split.c (usage): Reword to using FILE rather than + INPUT, allowing use of emit_stdin_note(). Also remove + the mention of "fixed-size" pieces as this isn't now + always the case. + Fixes http://pad.lv/1450179 + + tests: don't skip df tests with /proc/self/mountinfo + * tests/df/no-mtab-status.sh: getmntent is no longer called + when /proc/self/mountinfo is present, thus causing the test + to be skipped. Therefore wrap fopen() to ignore mountinfo, + and use the test genmntent table instead. + * tests/df/skip-duplicates.sh: Likewise. + +2015-04-28 Yunlian Jiang + + build: fix SINGLE_BINARY build when printf is a macro + * src/coreutils.c (usage): include coreutils.h outside + the printf call, because if it's a macro you will get the error: + embedding a #include directive within macro arguments is not supported + +2015-04-28 Pádraig Brady + + maint: avoid a new -Werror=return-type warning in yes.c + * src/yes.c (main): Simplify the logic so that the + compiler can see this function always returns a value. + This was seen with GCC 5.0 in SINGLE_BINARY mode. + + tests: run ls capability coloring test irrespective of $LS_COLORS + * tests/ls/no-cap.sh: Ensure the test isn't skipped even if + capability coloring is disabled in the current $LS_COLORS. + Also just enable/disable capability coloring to avoid the + dircolors(1) overhead. + +2015-04-27 Pádraig Brady + + maint: use gnulib styling with the online manual + The equivalent styling added in v8.23-155-g3b98ee7, + is now applied to gnulib using projects by default. + + build: rely on gnulib to determine printf routines are safe + gnulib now only checks that the printf routines never crash, + which is all coreutils currrently requires, and so we revert + commit v8.23-81-gf57bfbb to let gnulib decide whether to replace + the system printf routines. + + maint: fix printf format for signed integers + With GCC 5 and the newly added warnings from gnulib, ensure the + correct signed integer is passed for the printf format, + to avoid -Werror=format= failures. + + build: update gnulib submodule to latest + Fix file-has-acl build failure on RHEL/Centos 6. + Fix GCC 5 warnings with printf and in fts.c. + + build: reduce gettext dependency to 0.19.2 + * bootstrap.conf: 0.19.2 is available on openSUSE-13.2, + Debian-8.0, and Ubuntu-14.10. Given there were issues + with earlier 0.19 gettext releases, set this as the new minimum. + * configure.ac (AM_GNU_GETTEXT_VERSION): Likewise. + Reported by Bernhard Voelker + +2015-04-27 Paul Eggert + + ls: on GNU/Linux, remove dependency on libacl + * src/local.mk (src_ls_LDADD): Change from LIB_ACL to LIB_HAS_ACL. + + build: update gnulib submodule to latest + * bootstrap.conf (gnulib_modules): Add file-has-acl. + (buildreq): Bump autopoint and gettext to 0.19.4. + * configure.ac (AM_GNU_GETTEXT_VERSION): + Bump to 0.19.4. + * gl/lib/tempname.c.diff, gl/lib/tempname.h.diff: + Merge recent gnulib changes. + +2015-04-23 Michael Witten + + doc: fix grammar issue in truncate info + * doc/coreutils.texi (truncate invocation): The word 'their' is + incorrect; 'each file' is the antecedent, and is singular, + so 'its' is the correct pronoun. + +2015-04-22 Pádraig Brady + + build: fix potential factor build failure on arm and mips + * src/longlong.h: Sync with the latest longlong.h from libgmp to: + - Use __builtin_c[lt]zl on arm64. + - Fix sparc64 vis3 build failure due to missing __clz_tab. + - Avoid a clang build issue on mips. + - Support thumb2 arm 32 bit system. + * src/cfg.mk (sc_ensure_comma_after_id_est): Exclude longlong.h + to ease merges. + + maint: avoid -Werror=strict-overflow warnings with GCC 5 + All warnings were of the form: "assuming signed overflow does not occur + when simplifying conditional to constant [-Werror=strict-overflow]" + * src/dd.c (cache_round): Use an appropriately sized unsigned type, + to avoid possibility of undefined signed overflow. + * src/mknod.c (main): Likewise. + * src/pr.c (pad_down): Likewise. + * src/wc.c (main): Likewise. + * src/tail.c (main): Assert that argc >= 0 thus allowing the + compiler to assume without implication that argc - optind + is positive. + +2015-04-17 Pádraig Brady + + dircolors: add 'MISSING' to the default database + * src/dircolors.hin: Add the MISSING entry, to indicate + this as a possibility in new templates output from dircolors, + and also to ease comparison with existing databases that + generally do define a MISSING entry. + +2015-04-13 Andreas Gruenbacher + + doc: clarify how cp behaves with default ACLs + * doc/coreutils.texi (cp invocation): Mention that when copying files + without preserving permissions, the umask or a default ACL affect + the mode of new files. + * THANKS.in: Remove committer. + Related to http://bugs.gnu.org/8527 + +2015-04-13 Pádraig Brady + + df: fix --local hanging with inaccessible remote mounts + * src/df.c (filter_mount_list): With -l, avoid stating remote mounts. + * init.cfg: Avoid test hangs with inaccessible remote mounts. + * tests/df/no-mtab-status.sh: Skip with inaccessible remote mounts. + * tests/df/skip-rootfs.sh: Likewise. + * tests/df/total-verify.sh: Likewise. + * NEWS: Mention the bug fix. + Reported at http://bugzilla.redhat.com/1199679 + +2015-04-09 Mitchel Humpherys + + doc: correct pluralization for mkfifo and mknod + * doc/coreutils.texi: `mkfifo' and `mknod' use the optContext macro + which adds a description for the SELinux security context in addition to + the single option already described in each case. The result in both + cases is two options being introduced as `option' (singular). Fix this + by introducing them as `options' (plural). + +2015-04-03 Pádraig Brady + + df: fix use of uninitialized variable reported by valgrind + Conditional jump or move depends on uninitialised value(s) + at 0x40380C: get_field_values (df.c:840) + by 0x403E16: get_dev (df.c:994) + by 0x404D65: get_all_entries (df.c:1364) + by 0x405926: main (df.c:1714) + * src/df.c (get_dev): Initialize the fsu.fsu_bavail_top_bit_set + member, when adding placeholder entries. + (main): Avoid a "definitely lost" memory leak warning from valgrind, + reported by Bernhard Voelker. + +2015-04-01 Pádraig Brady + + doc: clarify that ls --sort=time is newest first + * src/ls.c (usage): Add punctuation to avoid ambiguity in the + description of the --time option. Mention that both the -u + and --sort=time default order is newest first. + +2015-03-31 Stephane Chazelas + + tail: fix -f to follow changes after a rename + * src/tail.c (tail_forever_inotify): Only monitor write()s and + truncate()s to files in --follow=descriptor mode, thus avoiding + the bug where we removed the watch on renamed files. + Also adjust the inotify event processing code that is + now significant only in --follow=name mode. + * tests/tail-2/F-vs-rename.sh: Improve this existing test by running + in both polling and inotify modes. + * tests/tail-2/f-vs-rename.sh: A new test based on the existing one. + * tests/local.mk: Reference the new test. + * NEWS: Mention the bug. + Fixes http://bugs.gnu.org/19760 + +2015-03-29 Pádraig Brady + + doc: move numfmt info to the 'Numeric operations' section + * doc/coreutils.texi: Move numfmt info to this section, + as numfmt functionality aligns more with seq and factor, + than fmt and pr etc. + +2015-03-27 Paul Eggert + + nohup: clarify stdin redirection + Problem reported by Isaac Schwabacher in: + http://bugs.gnu.org/20214 + * doc/coreutils.texi (nohup invocation): Clarify that when nohup's + stdin gets redirected, it's unreadable. + * doc/coreutils.texi (nohup invocation): + * src/nohup.c (usage): Don't promise /dev/null. + +2015-03-27 Assaf Gordon + + tests: fix false test failure with df on Debian/kFreeBSD + * tests/fs/skip-duplicates.sh: On this platform .mnt_opts is significant + so define to empty to avoid a NULL deref in read_file_system_list(). + Fixes http://bugs.gnu.org/20210 + +2015-03-26 Christoph Anton Mitterer + + doc: disambiguate the ls --color description + * src/ls.c (usage): Avoid the implication that the + default ls behavior is to --color=always. + Reported in http://bugs.debian.org/781208 + +2015-03-26 Pádraig Brady + + doc: clarify the date standard output formats + * src/date.c (usage): Use FMT rather than TIMESPEC as the parameter, + since it's simpler to understand and can be better aligned. + Give an example for the --iso-8601 output format. + Adjust the example used for the 3 standard formats to be unambiguous + with respect to day/mon ordering and use of leading zeros in the time. + Reorder the options descriptions slightly, so that the + 3 standards options are together. + Indent the multi-line descriptions so that grouping is obvious. + Remove a redundant description of the --rfc-3339 format, + which is obvious in the existing example. + Separate these 3 standards options to their own translatable string + to simplify translation. + Change 'date and time' to 'date/time' in the --iso-8601 description + to be consistent with --rfc-3339 and to help avoid the implication + that the time is always output or even output by default. + Fixes http://bugs.gnu.org/20203 + +2015-03-24 Pádraig Brady + + maint: apply basic styling to online manual + * README-release: Reference http://www.gnu.org/s/coreutils/manual.css + to apply basic styling to the online coreutils manual, consistent + with the Emacs documentation. + + doc: clarify the uniq -D man page description + * src/uniq.c (usage): The description was very confusing in the man page + due to the stripped newlines. Add punctuation for clarification. + + wc: use a more adaptive wc -l implementation + * src/wc.c (wc): Allow any block to select the count implementation, + rather than just using the first 10 lines. This also simplifies + the code from 3 loops to 2. + +2015-03-23 Dan Jacobson + + doc: clarify default order for ls --sort=size + * src/ls.c (usage): Mention that default order is largest first. + Fixes http://bugs.gnu.org/20172 + +2015-03-20 Pádraig Brady + + maint: really fix wildcard quoting in sc_tests_executable + * cfg.mk (sc_tests_executable): The previous commit avoided + the globbing, but also passed on the quoted wildcards to find(1). + We could use eval to handle the quoting, though that's a bit + awkward and dangerous, so instead explicitly disable globbing + for the whole make target subshell. Note noglob is not available + on solaris, where we fall back to set -f. Note also that zsh + uses set -F for this, but that's moot here. Also correct the + find(1) expression to include the -o between each wildcard. + + maint: fix wildcard quoting in sc_tests_executable + * cfg.mk (sc_tests_executable): If there are files with + $TEST_EXTENSIONS in the current directory, then the + lack of quoting of the $test_extensions_rx contents + could result in globbing and an inconsequential run. + find(1) produces warnings only with more than one expansion. + +2015-03-20 Kristoffer Brånemyr + + wc: speedup counting of short lines + Using a test file generated with: + yes | head -n100M > 2x100M.txt + before> time wc -l 2x100M.txt + real 0.842s + user 0.810s + sys 0.033s + after> time wc -l 2x100M.txt + real 0.142s + user 0.111s + sys 0.031s + * src/wc.c (wc): Split the loop that deals with -l into 3. + The first is used at the start of the input to determine if + the average line length is < 15, and if so the second loop is + used to look for '\n' internally to wc. For longer lines, + memchr is used as before to take advantage of system specific + optimizations which any outweigh function call overhead. + Note the first 2 loops could be combined, though in testing, + GCC 4.9.2 at least, wasn't sophisticated enough to separate + the loops based on the "check_len" invariant. + Note also __builtin_memchr() isn't significant here as + GCC currently only applies constant folding with that. + * NEWS: Mention the improvement. + +2015-03-10 Giuseppe Scrivano + + yes: improve efficiency when all args aren't buffered + * src/yes.c (main): Even when the internal buffer isn't large enough, + output what we've buffered already, and interate over the rest. + This improves the performance in the edge case where there are + many small arguments that overflow the buffer. + * tests/misc/yes.sh: Add a test case for the many small arguments case. + +2015-03-10 Pádraig Brady + + yes: output data more efficiently + yes(1) may be used to generate repeating patterns of text + for test inputs etc., so adjust to be more efficient. + Profiling the case where yes(1) is outputting small items + through stdio (which was the default case), shows the overhead + of continuously processing small items in main() and in stdio: + $ yes >/dev/null & perf top -p $! + 31.02% yes [.] main + 27.36% libc-2.20.so [.] _IO_file_xsputn@@GLIBC_2.2.5 + 14.51% libc-2.20.so [.] fputs_unlocked + 13.50% libc-2.20.so [.] strlen + 10.66% libc-2.20.so [.] __GI___mempcpy + 1.98% yes [.] fputs_unlocked@plta + Sending more data per stdio call improves the situation, + but still, there is significant stdio overhead due to memory copies, + and the repeated string length checking: + $ yes "`echo {1..1000}`" >/dev/null & perf top -p $! + 42.26% libc-2.20.so [.] __GI___mempcpy + 17.38% libc-2.20.so [.] strlen + 5.21% [kernel] [k] __srcu_read_lock + 4.58% [kernel] [k] __srcu_read_unlock + 4.27% libc-2.20.so [.] _IO_file_xsputn@@GLIBC_2.2.5 + 2.50% libc-2.20.so [.] __GI___libc_write + 2.45% [kernel] [k] system_call + 2.40% [kernel] [k] system_call_after_swapgs + 2.27% [kernel] [k] vfs_write + 2.09% libc-2.20.so [.] _IO_do_write@@GLIBC_2.2.5 + 2.01% [kernel] [k] fsnotify + 1.95% libc-2.20.so [.] _IO_file_write@@GLIBC_2.2.5 + 1.44% yes [.] main + We can avoid all stdio overhead by building up the buffer + _once_ and outputting that, and the profile below shows + the bottleneck moved to the kernel: + $ src/yes >/dev/null & perf top -p $! + 15.42% [kernel] [k] __srcu_read_lock + 12.98% [kernel] [k] __srcu_read_unlock + 9.41% libc-2.20.so [.] __GI___libc_write + 9.11% [kernel] [k] vfs_write + 8.35% [kernel] [k] fsnotify + 8.02% [kernel] [k] system_call + 5.84% [kernel] [k] system_call_after_swapgs + 4.54% [kernel] [k] __fget_light + 3.98% [kernel] [k] sys_write + 3.65% [kernel] [k] selinux_file_permission + 3.44% [kernel] [k] rw_verify_area + 2.94% [kernel] [k] __fsnotify_parent + 2.76% [kernel] [k] security_file_permission + 2.39% yes [.] main + 2.17% [kernel] [k] __fdget_pos + 2.13% [kernel] [k] sysret_check + 0.81% [kernel] [k] write_null + 0.36% yes [.] write@plt + Note this change also ensures that yes(1) will only write + complete lines for lines shorter than BUFSIZ. + * src/yes.c (main): Build up a BUFSIZ buffer of lines, + and output that, rather than having stdio process each item. + * tests/misc/yes.sh: Add a new test for various buffer sizes. + * tests/local.mk: Reference the new test. + Fixes http://bugs.gnu.org/20029 + +2015-03-07 Pádraig Brady + + build: fix make dependencies for test.1 + In certain parallel build situations this would give the error: + help2man: can't get `--help' info from man/test.td/[ + Makefile:14189: recipe for target 'man/test.1' failed + * man/local.mk (test.1): Depend on `[` rather than `test`, + as `test --help` outputs nothing. Also move dir.1 and vdir.1 + back to the main list, as they're no more exceptions than + sha1sum etc. + +2015-03-05 Bernhard Voelker + + maint: be less strict about executable permissions of tests + With "umask 0027" or even "umask 0077", the git clone of coreutils + does not have the executable bit set for 'other' (or 'group). + Therefore, "make syntax-check" would fail. + * cfg.mk (sc_tests_executable): Change the -perm argument of find(1) + to only print the names of the files which are not executable by the + user, rather than insisting on ugo+x (octal 111). + +2015-03-05 Stéphane Aulery + + doc: mention persistence caveats in sync man page + * man/sync.x ([BUGS]): Mention the caveats and reference + the system call man pages for more details. + Fixes http://bugs.gnu.org/19995 + Debian bug #507085 reported by jidanni@jidanni.org + +2015-03-04 Pádraig Brady + + tee: generalize the --write-error option to --output-error + Adjust commit v8.23-140-gfdd6ebf to add the --output-error option + instead of --write-error, and treat open() errors like write() errors. + * doc/coreutils.texi (tee invocation): s/write-error/output-error/. + * src/tee.c (main): Exit on open() error if appropriate. + * tests/misc/tee.sh: Add a case to test open() errors. + * NEWS: Adjust for the more general output error behavior. + Suggested by Bernhard Voelker. + +2015-03-04 Jarosław Gruca + + maint: update stale comment about ls color sequences + * src/ls.c (color_indicator[C_END]): Comment with the correct + sequence, which was used since commit v6.10-61-g483297d + Fixes http://bugs.gnu.org/19992 + +2015-02-27 Shane M Seymour + + tail,stat: improve support for the IBRIX file system + Note that IBRIX used to have a different magic number 0x013111A7 + instead of the current 0x013111A8. However, the former is no longer + used and the version of IBRIX it was used in is really ancient, so + it's extremely unlikely anyone is still using it. Therefore, just + add the newer magic number. + Mark IBRIX as a 'remote' file system type as inotify support had + never been officially tested with it. + * src/stat.c (human_fstype): Add file system ID definition. + * NEWS: Mention the improvement. + Fixes http://bugs.gnu.org/19951 + +2015-02-24 Pádraig Brady + + tee: add --write-error to control handling of closed pipes + tee is very often used with pipes and this gives better control + when writing to them. There are 3 classes of file descriptors + that tee can write to: files(1), pipes(2), and early close pipes(3). + Handling write errors to 1 & 2 is supported at present with the caveat + that failure writing to any pipe will terminate tee immediately. + Handling write errors to type 3 is not currently supported. + To improve the supported combinations we add these options: + --write-error=warn + Warn if error writing any output including pipes. + Allows continued writing to still open files/pipes. + Exit status is failure if any output had error. + --write-error=warn-nopipe, -p + Warn if error writing any output except pipes. + Allows continued writing to still open files/pipes. + Exit status is failure if any non pipe output had error. + --write-error=exit + Exit if error writing any output including pipes. + --write-error=exit-nopipe + Exit if error writing any output except pipes. + Use the "nopipe" variants when files are of types 1 and 3, otherwise + use the standard variants with types 1 and 2. A caveat with the above + scheme is that a combination of pipe types (2 & 3) is not supported + robustly. I.e. if you use the "nopipe" variants when using both type + 2 and 3 pipes, then any "real" errors on type 2 pipes will not be + diagnosed. + Note also a general issue with type 3 pipes that are not on tee's + stdout, is that shell constructs don't allow to distinguish early + close from real failures. For example `tee >(head -n1) | grep -m1 ..` + can't distinguish between an error or an early close in "head" pipe, + while the fail on the grep part of the pipe is distinguished + independently from the resulting pipe errors. This is a general + issue with the >() construct, rather than with tee itself. + * NEWS: Mention the new feature. + * doc/coreutils.texi (tee invocation): Describe the new option. + * src/tee.c (usage): Likewise. + (main): With --write-error ignore SIGPIPE, and handle + the various exit, diagnostics combinations. + * tests/misc/tee.sh: Tess all the new options. + Fixes http://bugs.gnu.org/11540 + +2015-02-23 Bernhard Voelker + + tee: close "-" file + This is a cleanup to the previous commit v8.23-138-g7ceaf1d. + * src/tee.c (tee_files): Do not exempt the "-" file from being closed, + as this is no longer stdout but a normal file. + +2015-02-20 Bernhard Voelker + + tee: treat '-' operand as file name as mandated by POSIX + Since v5.2.1-1247-g8dafbe5, tee(1) treated '-' as stdout while POSIX + explicitly requires to treat this as a file name. Revert this change, + as the interleaved output - due to sending another copy of input to + stdout - is not considered to be useful. Discussed in + http://lists.gnu.org/archive/html/coreutils/2015-02/msg00085.html + * src/tee.c (tee_files): Remove the special handling for "-" operands. + (usage): Remove the corresponding sentence. + * doc/coreutils.texi (common options): Remove the "tee -" example. + (tee invocation): Document that tee(1) now treats "-" as a file name. + * tests/misc/tee.sh: Add a test case for "tee -". + While at it, re-indent the above multi-argument processing case and + extend that to 13 operands, as POSIX mandates that, too. + * tests/misc/tee-dash.sh: Remove now-obsolete test. + * tests/local.mk (all_tests): Remove the above test. + * NEWS (Changes in behavior): Mention the change. + +2015-02-18 Pádraig Brady + + tee: exit early if no more writable outputs + * src/tee.c (main): Don't continue reading if we can't + output anywhere. + * tests/misc/tee.sh: Ensure we exit when no more outputs. + * NEWS: Mention the change in behavior. + + tests: support stderr verification with returns_() + * tests/init.sh (returns_): Disable tracing for this wrapper + function, so that stderr of the wrapped command is unchanged, + allowing for verification of the contents. + +2015-02-17 Bernhard Voelker + + maint: prefer STREQ_LEN and STRPREFIX over strncmp in all cases + * cfg.mk (sc_prohibit_strncmp): Improve the search pattern: use + _sc_search_regexp to find all invocations of strncmp except when + used on a macro definition line; just match the function name with + an opening parenthesis. Before, the expression missed places where + the comparison against 0 was in a subsequent line. + * src/system.h (STRNCMP_LIT): Shorten 'literal' to 'lit' to move + the whole definition of the macro into one line - thus making + sc_prohibit_strncmp pass. + (STRPREFIX): Add space before parenthesis. + * src/du.c (main): Prefer STREQ_LEN over strncmp. + * src/pinky.c (scan_entries): Likewise. + * src/tac.c (tac_seekable): Likewise. + * src/who.c (scan_entries): Likewise. + +2015-02-17 Pádraig Brady + + stty: fix setting of 'extproc' on BSD + This setting is unusual on BSD as it's read normally in the local + flags returned by tcgetattr(), but can only be set with an ioctl. + Setting with tcsetattr() is ignored. + * src/stty.c (NO_SETATTR): A new flag to indicate the setting + is read and displayed like a normal termios flag, but is set + in some other manner. + (main): Skip tcsetattr() for this setting when this flag is set. + Also fixup the exiting 'extproc' processing to handle the + '-extproc' case correctly. + (sane_mode): Skip setting '-extproc' for 'sane' to avoid the error. + This isn't ideal but matches the operation of the BSD native stty. + +2015-02-12 Bernhard Voelker + + maint: enhance '.mailmap' mappings for THANKS generation + * .mailmap (jeff.liu@oracle.com): There are 3 different names in the + 'git log' output for this email address; choose "Jeff Liu" as canonical + form. + (Алексей Шилин): Convert name to latin1 ("Aleksej Shilin") + to improve the sort order of the generated 'THANKS' file. + + maint: sort THANKS using our own gear + At least 'sort' on openSUSE/Fedora have a bug in the case-folding code + of their I18N downstream patch which leads to wrong sort results, + e.g. "Dániel" coming after "Dylan". + * Makefile.am (THANKS): Sort the final contributor list using our + own sort implementation - as others may result in a different order; + add a FIXME comment to remove this again once common platforms have + a functional 'sort -f'. Add '-k1,1' for a better sort order. + While at it, save a grep and perl call to prepare the list from + 'THANKS.in' by doing all in the first perl call. + +2015-02-11 Pádraig Brady + + maint: remove redundant diff filtering from sc_long_lines + * cfg.mk (sc_long_lines): diff files are now completely excluded, + so no need to filter portions of them. + Reported by Bernhard Voelker. + + build: update to latest gnulib + This includes a change to require --with-libmount + to be used with configure, due to the many libmount dependencies. + * bootstrap: Sync with gnulib to exit early on gnulib-tool error. + * gl/lib/tempname.c.diff: Adjust for gnulib changes. + * gl/lib/tempname.h.diff: Likewise. + * gl/modules/tempname: Likewise. + * doc/.gitignore: Add new gendocs_template_min gnulib script. + + maint: exclude diff files from long lines check + * cfg.mk: Add .diff files to the exclusion expression + for sc_long_lines, since the gnulib code might be >= 80 chars. + Note 80 char lines trigger due to the added +/- diff marks. + Also normalize the $$ used in the other sc_long_lines exclusion + expressions. + + maint: avoid arbitrary memory access with buggy localtime() + * src/ls.c (align_nstrftime): Be defensive and validate the tm_mon + index before using to access the abmon array. This was _not_ seen + to be an issue any system. See https://bugzilla.redhat.com/1190454 + + doc: give an example of using a seed for random operations + * doc/coreutils.texi (Random sources): Give an example using openssl, + generating a reproducible arbitrary amount of randomly distributed + data, given a seed value. + +2015-02-09 Bernhard Voelker + + maint: make sc_dd_O_FLAGS more robust + The construct "diff ... || diff=1 || diff=" does not set the variable + in all cases. This could be triggered with: + $ env make diff=1 make sc_dd_O_FLAGS + dd_O_FLAGS + maint.mk: ./src/dd.c has inconsistent O_ flag lists + cfg.mk:59: recipe for target 'sc_dd_O_FLAGS' failed + make: *** [sc_dd_O_FLAGS] Error 1 + * cfg.mk (sc_dd_O_FLAGS): Remember $? of the diff command directly + and check its value later rather than using the above mentioned + mapping. + + maint: make sc_THANKS_in_duplicates more robust + The previous commit v8.23-124-g7b1ca5f made the above syntax-check rule + fail, because that took the whole content of THANKS.in for comparison. + * cfg.mk (sc_THANKS_in_duplicates): Strip off the header (all before the + first empty line) and the footer (all past the next empty line) from + 'THANKS.in' for the check. + + maint: sort contributors in THANKS.in + * THANKS.in: Document the preferred sort order as a comment + at the top of the file. Change "Марк Коренберг" to latin1 + ("Mark Korenberg"). Sort all entries. + * cfg.mk (sc_THANKS_in_sorted): Add rule to ensure that + 'THANKS.in' remains sorted. + +2015-02-06 Pádraig Brady + + maint: document a caveat in the tail inotify implementation + * src/tail.c (main): Document another caveat with the + inotify implementation wrt multiple hardlinked files. + + tail: return inotify resources where possible + Each user has a maximum number of inotify watches, + so handle the cases where we exhaust these resources. + * src/tail.c (tail_forever_inotify): Ensure we inotify_rm_watch() + the watch for an inode, when replacing with a new watch for a name. + Return all used inotify resources when reverting to polling. + Revert to polling upon first indication of inotify resource exhaustion. + Revert to polling on any inotify resource exhaustion. + Diagnose resource exhaustion correctly in all cases. + Avoid redundant reinsertion in the hash for unchanged watches + (where only attributes of the file are changed). + * tests/tail-2/retry.sh: Avoid false failure when reverting to polling. + * tests/tail-2/inotify-rotate.sh: Likewise. + * tests/tail-2/symlink.sh: Likewise. + * tests/tail-2/inotify-rotate-resources.sh: New test to check + that we're calling inotify_rm_watch() for replaced files. + * tests/local.mk: Reference the new test. + * NEWS: Mention the bug fix. + * THANKS.in: Thanks for reporting and problem identification. + + tests: fix recent regression in tail inotify test + * tests/tail-2/inotify-rotate.sh (cleanup_fail_): Set fail=1 + so that failures are identified. Regression in v8.23-63-g111a2b9 + Also use print_ver_ rather than open coding --verbose support. + Also check for more than a single 'b' which seems brittle. + +2015-02-05 Yury Usishchev + + build: ensure make-prime-list doesn't access out of bounds memory + The -fsanitize=address run associated with v8.22-75-gf940fec + failed to check make-prime-list, as src/primes.h is not + regenerated with `make clean`. Running with -fsanitize=address + indicates a read 1 byte beyond the allocated buffer. + $ rm src/make-prime-list.o + $ make AM_CFLAGS=-fsanitize=address src/make-prime-list + $ src/make-prime-list 5000 + ================================================================= + ==13913==ERROR: AddressSanitizer: heap-buffer-overflow on address + 0x61e00000fa43 at pc 0x4016f5 bp 0x7fff9d9840e0 sp 0x7fff9d9840d0 + READ of size 1 at 0x61e00000fa43 thread T0 + #0 0x4016f4 in main src/make-prime-list.c:214 + #1 0x7f98892c5fdf in __libc_start_main (/lib64/libc.so.6+0x1ffdf) + #2 0x401774 (src/make-prime-list+0x401774) + 0x61e00000fa43 is located 0 bytes to the right of 2499-byte + region [0x61e00000f080,0x61e00000fa43) allocated by thread T0 here: + #0 0x7f98896ba7b7 in malloc (/lib64/libasan.so.1+0x577b7) + #1 0x400f3f in xalloc src/make-prime-list.c:163 + #2 0x400f3f in main src/make-prime-list.c:198 + SUMMARY: AddressSanitizer: heap-buffer-overflow + src/make-prime-list.c:214 main + Shadow bytes around the buggy address: + 0x0c3c7fff9ef0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 0x0c3c7fff9f00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 0x0c3c7fff9f10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 0x0c3c7fff9f20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 0x0c3c7fff9f30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + =>0x0c3c7fff9f40: 00 00 00 00 00 00 00 00[03]fa fa fa fa fa fa fa + 0x0c3c7fff9f50: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + 0x0c3c7fff9f60: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + 0x0c3c7fff9f70: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + 0x0c3c7fff9f80: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + 0x0c3c7fff9f90: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + Shadow byte legend (one shadow byte represents 8 application bytes): + Addressable: 00 + Partially addressable: 01 02 03 04 05 06 07 + Heap left redzone: fa + ... + ==13913==ABORTING + * src/make-prime-list.c (main): Bounds check the incremented index, + before using to access the buffer. + Fixes http://bugs.gnu.org/19784 + +2015-02-03 Pádraig Brady + + build: fix invalid gnulib patch + * gl/lib/tempname.c.diff: Fix recent breakage so it applies again. + Invalid patch was noticed at http://hydra.nixos.org/eval/1172233 + * cfg.mk: Exempt diff files from these "id_est" syntax checks. + (sc_ensure_gl_diffs_apply): A new syntax check, to ensure all + patches under gl/ apply cleanly. Note we use --fuzz=0 to check + patches apply cleanly for safety, due to the patch(1) issue detailed + in commit v8.21-117-g46f7e05 + * gl/lib/regcomp.c.diff: Rediffed. + * gl/lib/regex_internal.c.diff: Likewise. + * gl/lib/regex_internal.h.diff: Likewise. + * gl/lib/regexec.c.diff: Likewise. + * gl/lib/tempname.h.diff: Likewise. + +2015-02-03 Bernhard Voelker + + tests: avoid a FP on aarch64 when comparing env/printenv output + The following test fails on aarch64 on openSUSE's OpenBuildService + due to glibc's execvp reversing the pointers of 'environ', i.e., + the output of "env|tac" equals "env env" on that platform. + * tests/misc/printenv.sh: Use 'env env' to work around the behavior + on that platform. + While at it, fix the grep pattern which suppressed all environment + variables starting with an underscore "_" instead of "$_" (and + "$LD_PRELOAD") only. + +2015-02-02 Pádraig Brady + + dircolors: sync with Xiph file extensions + * src/dircolors.hin: Remove deprecated anx, axa, axv. Add opus. + Suggested by Scott Teal. + +2015-01-31 Bernhard Voelker + + doc,maint: fix use of "i.e." in documentation and comments + To align with all other places (and correct grammar), change all + upper-case "I.E." to "I.e.". Furthermore, ensure that "i.e." is + followed by a comma. Finally, ensure to use a double-space before + "I.e.," at the beginning of a sentence. + The following was used to change all offending uses (apart from + old ChangeLog files): + $ git grep -liF 'i.e.' \ + | xargs sed -i \ + -e 's/I\.E\./I.e./g' \ + -e 's/\. \(I\.e\.\)/. \1/g' \ + -e 's/\([Ii]\.e\.\)\( \)/\1,\2/g' \ + -e 's/\([Ii]\.e\.\)$/\1,/g' + * cfg.mk (sc_prohibit_uppercase_id_est): Add new rule. + (sc_ensure_double_space_after_dot_before_id_est): Likewise. + (sc_ensure_comma_after_id_est): Likewise. + (old_NEWS_hash): Refresh hash via "make update-NEWS-hash". + * NEWS: Change use of "id est" abbreviation via the above command. + * README: Likewise. + * README-prereq: Likewise. + * doc/coreutils.texi: Likewise. + * gl/lib/rand-isaac.c: Likewise. + * gl/lib/tempname.c.diff: Likewise. + * man/stdbuf.x: Likewise. + * src/cat.c: Likewise. + * src/copy.c: Likewise. + * src/copy.h: Likewise. + * src/cp.c: Likewise. + * src/cut.c: Likewise. + * src/dd.c: Likewise. + * src/df.c: Likewise. + * src/fiemap.h: Likewise. + * src/longlong.h: Likewise. + * src/ls.c: Likewise. + * src/numfmt.c: Likewise. + * src/pr.c: Likewise. + * src/shred.c: Likewise. + * src/shuf.c: Likewise. + * src/split.c: Likewise. + * tests/Coreutils.pm: Likewise. + * tests/df/df-symlink.sh: Likewise. + * tests/df/skip-rootfs.sh: Likewise. + * tests/init.sh: Likewise. + * tests/ls/color-norm.sh: Likewise. + * tests/misc/basename.pl: Likewise. + * tests/misc/ls-misc.pl: Likewise. + * tests/misc/md5sum-bsd.sh: Likewise. + * tests/misc/shred-exact.sh: Likewise. + * tests/misc/sort.pl: Likewise. + * tests/misc/stdbuf.sh: Likewise. + * tests/misc/tac-continue.sh: Likewise. + * tests/rm/r-root.sh: Likewise. + * tests/tail-2/symlink.sh: Likewise. + +2015-01-29 Pádraig Brady + + doc: clarify the output format for the *sum utilities + * src/md5sum.c (usage): Detail the reasons for the default + double space between checksum and file name. + * doc/coreutils.texi (md5sum invocation): Likewise. + Explicitly mention the 3 formats that --check supports. + Fixes http://bugs.gnu.org/19725 + +2015-01-28 Giuseppe Scrivano + + sync: support syncing specified arguments + * m4/jm-macros.m4 (coreutils_MACROS): Check for syncfs(). + * man/sync.x: Add references to syncfs, fsync and fdatasync. + * doc/coreutils.texi (sync invocation): Document the new feature. + * src/sync.c: Include "quote.h". + (AUTHORS): Include myself. + (MODE_FILE, MODE_DATA, MODE_FILE_SYSTEM, MODE_SYNC): New enum values. + (long_options): Define. + (sync_arg): New function. + (usage): Describe that arguments are now accepted. + (main): Add arguments parsing and add support for fsync(2), + fdatasync(2) and syncfs(2). + * tests/misc/sync.sh: New (and only) test for sync. + * tests/local.mk: Reference the new test. + * AUTHORS: Add myself to sync's authors. + * NEWS: Mention the new feature. + +2015-01-25 Jim Meyering + + scripts: autotools-install: update + * scripts/autotools-install: Increase automake's version number + to 1.15 and add Stefano Lattarini's new GPG key ID. + Increase gettext's version to 0.19.4 and add Daiki Ueno's GPG key ID. + Also move VERSION definition "up" so that it is once again + automatically updated via the emacs hook snippet at the end + of the file. + +2015-01-24 Pádraig Brady + + stty: only print supported options for combined options + * src/stty.c (usage): Don't reference unsupported options, + in the combined options descriptions. + * doc/coreutils.texi (stty invocation): Adjust for the + new order of the 'sane' and 'raw' combined options. + Also add -iutf8 to the 'sane' list. + + stty: document the 'status' character where supported + * src/stty.c (usage): On systems that support this setting (BSD), + display 'status' in the list of adjustable special characters. + * doc/coreutils.texi (stty invocation): Mention the option, and that + it's not currently supported on Linux. + + stty: document the 'discard' character setting + The equivalent of this is 'flush', but that was never documented + as an option (though was output with stty -a). Therefore use + the more descriptive name, also generally used on BSD systems. + Note even though this setting seems ineffective on Linux, supporting + the setting is useful to allow terminal programs to receive + the default ^O character code. + * doc/coreutils.texi (stty invocation): Document the 'discard' option. + * src/stty.c (struct control_info): Add 'discard'; same as 'flush'. + (display_all): Show 'discard' rather than 'flush' char. + (display_changed): Likewise. + (usage): Document the 'discard' option. + + stty: add support for extproc/LINEMODE + Add support for the "extproc" option which is well described at: + http://lists.gnu.org/archive/html/bug-readline/2011-01/msg00004.html + * src/stty.c (usage): Describe the extproc option if either the + Linux EXTPROC local option is defined, or the equivalent + BSD TIOCEXT ioctl is defined. + (main): Make the separate ioctl call for extproc on BSD. + * doc/coreutils.texi (stty invocation): Describe the option, + and reference the related RFC 1116. + * NEWS: Mention the new feature. + +2015-01-20 Bernhard Voelker + + tests: use returns_ function for new split test + * tests/split/record-sep.sh: Use the recently added returns_ function + to simplify the shell syntax in this test. Also remove the redirection + of stdout/stderr to /dev/null as this eases analyzing errors. + +2015-01-19 Assaf Gordon + + split: new -t option to select record separator + * src/split.c (eolchar): A new variable to hold + the separator character (unibyte for now). + This is reference throughout rather than hardcoding '\n'. + (usage): Describe the new --separator option, and + mention records along with lines so there is no ambiguity + that all options treat lines and records equivalently. + (main): Have -t update eolchar, or default to '\n'. + * tests/split/record-sep.sh: New test case. + * tests/local.mk: Reference the new test. + * doc/coreutils.texi (split invocation): Document the new option. + Adjust --lines, --line-bytes, --number=[lr]/... to mention + they pertain to records if --separator is specified. + * NEWS: Mention the new feature. + +2015-01-19 Pádraig Brady + + maint: fix typo in THANKS.in in previous commit + * THANKS.in: s/Stehpen/Stephen/ + + doc: clarify that du operands are interdependent + Following on from http://bugs.gnu.org/17546 + make it more obvious that du may elide specified operands + to avoid double counting in the set. + * src/du.c (usage): Specify that du operates on the set of + operands, rather than each independently. + * doc/coreutils.texi (du invocation): Likewise. Also state + that the number of entries printed may change due to the + order specified. Currently, deeper items specified earlier + will result in them being displayed, but don't mention that + implementation detail in the documentation. + * THANKS.in: Add reporter. + Reported by Stephen Shirley + +2015-01-14 Bernhard Voelker + + tests: use compare-vs-/dev/null instead of 'test -s' + When some program produces unexpected output, that use of + compare-vs-/dev/null will ensure that the surprising output is + printed in the test's output. With "test -s err" only, one + would have to instrument and rerun in order to see the offending + output. + * cfg.mk (sc_prohibit_and_fail_1): Exempt 'compare' from this check. + * tests/dd/misc.sh: Change "tests -s ... || fail=1" to + "compare /dev/null ... && fail=1". + * tests/misc/nice.sh: Likewise. + * tests/rm/read-only.sh: Likewise. + * tests/tail-2/inotify-race.sh: Likewise. + * tests/touch/no-dereference.sh: Likewise. + Suggested by Jim Meyering in + http://lists.gnu.org/archive/html/coreutils/2015-01/msg00042.html + +2015-01-14 Pádraig Brady + + tests: add extra protection against unexpected exits + Many tests use `program ... && fail=1` to ensure expected + error situations are indicated. However that would mask + an unexpected exit (like a crash). Therefore explicitly + check the expected exit code. + Note where error messages are also verified, the extra + protection is not added. + * tests/init.sh (returns_): A new helper function to + check the return code of a command, and used + throughout the tests. + * cfg.mk (sc_prohibit_and_fail_1): Add a syntax check + to avoid new instances of this issue. + +2015-01-12 Pádraig Brady + + tests: avoid skipping some df tests with libmount + * tests/df/no-mtab-status.sh: Provide libmount placeholders, + to avoid skipping the test when libmount is in use. + * tests/df/skip-duplicates.sh: Likewise. + * tests/df/skip-rootfs.sh: Comment that the test is moot + when libmount (/proc/self/mountinfo) is being used. + +2015-01-10 Pádraig Brady + + maint: clean up some test issues identified with shellcheck + * tests/cp/cp-a-selinux.sh: Comment why unused variables are assigned. + Fix misspellings noticed while adjusting. + * tests/cp/fiemap-perf.sh: Fix quoting. + * tests/misc/shuf.sh: Avoid useless use of cat. + * tests/misc/printf-surprise.sh: Likewise. + +2015-01-08 Daiki Ueno + + maint: adjustments related to previous shuf crash fix + * tests/misc/shuf.sh: Improve the test so it detects + crashes in more cases. + * NEWS: Mention the previous fix. + +2015-01-08 Assaf Gordon + + maint: skip long-lines syntax-check if unsupported + * cfg.mk(sc_long_lines): Skip if required wc and sed options + are not supported, which is currently the case on OS X. + +2015-01-06 Paul Eggert + + shuf: do not mishandle 'shuf -i0-0 1' + Problem reported by Daiki Ueno in: http://bugs.gnu.org/19520 + * src/shuf.c (main): Avoid core dump if !input_range. + * tests/misc/shuf.sh: Test for this bug. + +2015-01-01 Bernhard Voelker + + maint: update further copyright year number ranges + * bootstrap: Update copyright year manually (missing in previous + gnulib update). + * tests/init.sh: Likewise. + The entries in the exemption list are processed by + "grep -vEf ./.x-update-copyright", and therefore evaluated as an + extended regular expression (ERE). Thus, the "bootstrap" entry + also matched for bootstrap.conf which we want to be updated. + * .x-update-copyright: Change all entries to EREs, i.e. including + the caret ^ and dollar sign $ meta-characters matching the beginning + and the end of a line. + * bootstrap.conf: Update copyright year by "make update-copyright". + Finally, the only one showing up with the following command should + be the COPYING file: + $ git grep 'Copyright .* Free Software' | grep -v '2015 Free Software' + +2015-01-01 Pádraig Brady + + doc: fix man page formatting for split CHUNKS options + * src/split.c (usage): Indent the info on CHUNKS so that + help2man can match it and align appropriately in its own section. + Fixes http://bugs.gnu.org/19228 + + build: update to latest gnulib + Pick up an errno adjustment in xstrtol() that fixes + a spurious test failure on Darwin 14.0.0. + Also update copyright year to 2015 avoiding a syntax-check failure. + + maint: update all copyright year number ranges + Run "make update-copyright" and then... + * tests/sample-test: Adjust to use the single most recent year. + * tests/du/bind-mount-dir-cycle-v2.sh: Fix case in copyright message, + so that year is updated automatically in future. + +2014-12-30 Pádraig Brady + + tests: fix possible 8 minute running time of inotify-rotate.sh + Commit v8.23-63-g111a2b9 removed the expensive tag on this test, + as it runs quickly on systems with inotify. However without that + it would take about 8 minutes for the test to complete all iterations. + * tests/tail-2/inotify-rotate.sh: Tag as expensive without inotify. + Also adjust the polling parameters used on systems without inotify + so that the test completes within about 15 seconds. + + build: update to latest gnulib + Included in this are gnulib changes 3ea43e02 2768ceb7 + which make the device IDs from /proc/self/mountinfo + available to df. This can be leveraged by a subsequent + change to df to present a more accurate list of file systems. + * bootstrap: Merge from gnulib. + * src/ls.c (dev_ino_pop): s/obstack_blank/obstack_blank_fast/ + as this API/ABI has changed, giving memory exhausted errors + if negative (large positive) numbers are passed to obstack_blank(). + * tests/df/skip-duplicates.sh: Adjust as the new gnulib code + requires a non NULL mnt_opts even when mnt_type is not "none". + +2014-12-29 Pádraig Brady + + maint: remove duplicate names from THANKS + * .mailmap: Adjust so that there is only a single + entry per name in the generated THANKS. + +2014-12-26 Pádraig Brady + + doc: update the URL referencing SI prefixes + Identified at https://www.gnu.org/software/gnun/linc/linc.html + * doc/coreutils.texi (Block size): Fix the stale link. + +2014-12-25 Pádraig Brady + + tests: fix error message check on some systems + http://hydra.nixos.org/build/18129583 identified (on OS X) + an incorrect test assumption in the previous commit. + * gl/lib/xdectoint.c (__xnumtoint): Suppress the EINVAL + error message as it's redundant in this context. + * tests/misc/tail.pl: Suppress _optionally_ appended + strerror messages. + * tests/fmt/base.pl: Likewise. + * tests/pr/pr-tests.pl: Likewise. + * tests/split/l-chunk.sh: Likewise. + +2014-12-19 Pádraig Brady + + diagnose too-large numbers better + Following on from commit v8.23-82-gaddae94, consistently diagnose + numbers that are too large, so as to distinguish from other errors, + and make the limits obvious. + * gl/modules/xdectoint: A new module implementing xdecto[iu]max(), + which handles the common case of parsing a bounded integer and + exiting with a diagnostic on error. + * gl/lib/xdectoimax.c: The signed variant. + * gl/lib/xdectoint.c: The parameterized implementation. + * gl/lib/xdectoint.h: The interface. + * gl/lib/xdectoumax.c: The unsigned variant. + * bootstrap.conf: Reference the new module. + * cfg.mk (exclude_file_name_regexp--sc_require_config_h_first): + Exclude the parameterized templates. + * src/csplit.c: Output EOVERFLOW or ERANGE errors if appropriate. + * src/fmt.c: Likewise. + * src/fold.c: Likewise. + * src/head.c: Likewise. + * src/ls.c: Likewise. + * src/nl.c: Likewise. + * src/nproc.c: Likewise. + * src/shred.c: Likewise. + * src/shuf.c: Likewise. + * src/stdbuf.c: Likewise. + * src/stty.c: Likewise. + * src/tail.c: Likewise. + * src/truncate.c: Likewise. + * src/split.c: Likewise. + * src/pr.c: Likewise. + * tests/pr/pr-tests.pl: Adjust to avoid matching errno diagnostic. + * tests/fmt/base.pl: Likewise. + * tests/split/l-chunk.sh: Likewise. + * tests/misc/shred-negative.sh: Likewise. + * tests/misc/tail.pl: Likewise. Also remove the redundant + existing ERR_SUBST from test err-6. + * tests/ls/hex-option.sh: Check HEX/OCT options. + * tests/misc/shred-size.sh: Likewise. + * tests/misc/stty-row-col.sh: Likewise. + +2014-12-19 KO Myung-Hun + + build: add $(EXEEXT) suffix to man page make targets + * man/local.mk: Add $(EXEEXT) suffix to the executables, + which is significant on OS/2 for example. + + build: don't call OS/2 routines on all systems + * src/system.h: Add a missing __OS2__ ifdef guard. + Also adjust spacing around () to avoid a syntax-check failure. + +2014-12-18 KO Myung-Hun + + build: expand a response file and a wildcard on OS/2 + OS/2 traditional shells(cmd) do not expand a response file(@file) + or a wildcard. Expand them in each utility itself. + * src/system.h (initialize_main): Define on OS/2. Expand a response + file and a wildcard. + +2014-12-16 Bernhard Voelker + + maint: fix how to request changes for THANKS.in + * THANKS.in: Change the comment at the top to send change requests + regarding this file to the main mailing list rather than referring + to cp's --help output for the mailing list's address - which does + not include that information anymore. + +2014-12-16 Paul Eggert + + dd: fix typo in previous change + Reported by Bernhard Voelker in: + http://lists.gnu.org/archive/html/bug-gnulib/2014-12/msg00191.html + * src/dd.c (scanargs): s/IN/OUT/. + + dd: diagnose too-large numbers better + Reported by Isabella Parakiss in: + http://lists.gnu.org/archive/html/bug-gnulib/2014-12/msg00184.html + * src/dd.c (parse_integer): Return strtol_error code, not bool. + All callers changed. + (scanargs): Improve quality of diagnostic when a number is too large. + +2014-12-10 Pádraig Brady + + build: use the system printf routines in most cases + glibc <= 2.5 would crash when passed invalid long double values, + therefore internal gnulib routines were used, essentially only by od, + to output such invalid values. Later glibc versions don't crash, + as per https://sourceware.org/bugzilla/show_bug.cgi?id=4586 + and subsequently od was adjusted to use the system printf routines + through the use of the ftoastr module with commit v8.7-22-ga71c22f. + Consequently our testing of this feature was moot, and use of + the gnulib printf replacement for printf(1), od(1) and error(3) etc. + was redundant. + * configure.ac (gl_printf_safe): Unset so that we don't check that + "nan" is output for these long double values. + * tests/misc/od-float.sh: Adjust all existing checks to fail if od + exits with failure status (like crashing for example). Add a new case + for one of the problematic invalid long double values for x86_64. + We only check that od exits successfully at present, which may change + if https://sourceware.org/bugzilla/show_bug.cgi?id=17661 is resolved. + +2014-12-03 Pádraig Brady + + maint: avoid -fsanitize=undefined warning in rand-isaac + * gl/lib/rand-isaac.c (isaac_refill): readisaac() purposefully passes + unaligned pointers to avoid memory copies. This is only done on + platforms where this is defined, so avoid the associated + runtime warning generated with -fsanitize=undefined, which is: + lib/rand-isaac.c:125:182: runtime error: store to misaligned address + 0x63100003d7fd for type 'isaac_word', which requires 8 byte alignment + 0x63100003d7fd: note: pointer points here + 47 ce ed a4 be be be 00 00 00 00 00 00 00 00 ... + ^ + +2014-12-02 Pádraig Brady + + maint: avoid signed overflow warning with -O3 + Prompted by the implicit -O3 added by american-fuzzy-lop, + seen with GCC 4.9.2 on x86_64. + src/pr.c: In function 'print_files.part.5': + src/pr.c:1781:6: error: assuming signed overflow does not occur + when simplifying conditional to constant [-Werror=strict-overflow] + if (cols_ready_to_print () == 0) + This happens because cols_ready_to_print() is inlined + thus reducing the comparison to the N variable in print_page(). + Now this can't overflow due to the protection when parsing the + specified column, but use an unsigned type to avoid the + apparent signed overflow. + * src/pr.c (cols_ready_to_print): Increment an unsigned type to + avoid the subsequent signed overflow warning. + +2014-12-02 Boris Ranto + + du: handle sub-bind-mount cycles gracefully + This patch fixes the handling of sub-bind-mount cycles which are + incorrectly detected as the file system errors. If you bind mount the + directory 'a' to its subdirectory 'a/b/c' and then run 'du a/b' you + will get the circular dependency warning even though nothing is wrong + with the file system. This happens because the first directory that is + traversed twice in this case is not a bind mount but a child of bind + mount. The solution is to traverse all the directories in the cycle + that fts detected and check whether they are not a (bind) mount. + * src/du.c (mount_point_in_fts_cycle): New function that checks whether + any of the directories in the cycle that fts detected is a mount point. + * src/du.c (process_file): Update the function to use the new function + that looks up all the directories in the fts cycle instead of only the + last one. + * tests/du/bind-mount-dir-cycle-v2.sh: New test case that exhibits the + described behavior. + * tests/local.mk: Reference the new root test. + * NEWS: Mention the bug fix. + +2014-11-29 Pádraig Brady + + tests: avoid hardlink to symlink tests where not supported + These checks weren't correctly avoided in commit v8.23-66-g222d7ac + * tests/cp/same-file.sh: Avoid all hardlink to symlink tests + on platforms where that's not supported. + Identified by http://hydra.nixos.org/build/17636446 + +2014-11-28 Pádraig Brady + + build: fix missing casts from recent change + * src/dd.c (alloc_[io]buf): I committed a stale patch that omitted + the casts needed on 32 bit. + Identified by http://hydra.nixos.org/build/17610188 + +2014-11-27 Pádraig Brady + + rm: fix prompted number of arguments to remove on some platforms + "zu" was output on solaris 8 for example rather than the number, + since coreutils-8.22. + * cfg.mk: Disallow %z, since we don't currently use the gnulib + fprintf module, so any usage with it is non portable. Also + our usage with error() currently works only through an ancillary + dependency on the vfprintf gnulib module. + * src/rm.c (main): Use %PRIuMAX rather than %zu for portability. + * src/dd.c (alloc_[io]buf): Likewise for consistency. + * src/od.c (main): Likewise. + * src/split.c (set_suffix_length): Likewise. + * NEWS: Mention the rm bug fix. + Reported in http://bugs.gnu.org/19184 + +2014-11-26 Pádraig Brady + + tests: fix portability issue in dd/ascii test + Solaris 8 was seen to issue this error: + "printf: `&': illegal format character" + * test/dd/ascii.sh: Use the coreutils printf in this test + rather than the system one, to avoid portability issues. + +2014-11-26 Paul Eggert + + build: port new rule for coreutils.h to old Bash + Reported by Ted Carr in: http://bugs.gnu.org/19184 + * src/local.mk (src/coreutils.h): + Don't assume single_binary_progs is nonempty. + +2014-11-24 Tobias Stoeckmann + + paste: fix possible truncated output with large files + If '\n' was present at the size_t boundary of a file, + then that and subsequent data would be discarded. + * src/paste.c (paste_parallel): Avoid the overflow issue + by changing the flag to a boolean rather than a count. + * NEWS: Mention the bug fix. + +2014-11-24 Pádraig Brady + + df: only suppress remote mounts of separate exports with --total + * src/df.c (filter_mount_list): Separate remote locations are + generally explicitly mounted, so list each even if they share + the same remote device and thus storage. However with --total + keep the suppression to give a more accurate value for the + total storage available. + (usage): Expand on the new implications of --total and move + it in the options list according to alphabetic order. + doc/coreutils.texi (df invocation): Mention that --total impacts + on deduplication of remote file systems and also move location + according to alphabetic order. + * tests/df/skip-duplicates.sh: Add remote test cases. + * NEWS: Mention the change in behavior. + Reported in http://bugs.debian.org/737399 + Reported in http://bugzilla.redhat.com/920806 + Reported in http://bugzilla.opensuse.org/866010 + Reported in http://bugzilla.opensuse.org/901905 + +2014-11-23 Pádraig Brady + + df: ensure -a shows all remote file system entries + commit v8.22-125-g9d736f8 printed placeholder "-" values + for device names that didn't match the preferred device name + for a particular mount point. However that was seen to erroneously + suppress values for aliased host names or exports, common with + remote file systems. + * src/df.c (me_for_dev): Rename from devname_for_dev() so that + we can determine the remoteness as well as the name for the + preferred mount entry. + (get_dev): Don't output place holder values when both + current and preferred mount entries are remote. + Reported in http://bugs.debian.org/737399 + +2014-11-22 Pádraig Brady + + tests: add a case verifying mv on case insensitive file systems + * NEWS: Update the recent entry to also mention the avoidance + of incorrectly unlinking a multi-hardlinked "source" file when + presented with source and dest that only differ in case. + * src/copy.c (same_file_ok): Mention the case issue with same_name(). + * tests/mv/hardlink-case.sh: Test the issue on HFS+. + * tests/local.mk: Reference the new test case. + * tests/mv/vfat: Remove an old related but unused test case. + +2014-11-21 Pádraig Brady + + doc: mention how to avoid newlines impacting ls -1 + * src/ls.c (usage): Mention the -b and -q options + in the -1 description. + * doc/coreutils.texi (ls invocation): Likewise. + + tests: chcon: avoid false failure with newer selinux + file_t is now mapped to unlabeled_t as per: + http://danwalsh.livejournal.com/68189.html + Therefore use the latter to ensure we match correctly. + This is needed on >= Fedora 21 for example, + while it also works on earlier releases. + +2014-11-21 Boris Ranto + + mv: fail when moving a file to a hardlink + We may run into a race condition if we treat hard links to the same file + as distinct files. If we do 'mv a b' and 'mv b a' in parallel, both a + and b can disappear from the file system. The reason is that in this + case the unlink on src is called and the system calls can end up being + run in the order where unlink(a) and unlink(b) are the last two system + calls. Therefore exit with an error code so that we avoid the potential + data loss. + * src/copy.c (same_file_ok): Don't set unlink_src that was used by mv, + and return false for two hardlinks to a file in move_mode. + *src/copy.c (copy_internal): No longer honor the unlink_src option, + used only by mv. + NEWS: Mention the change in behavior. + * tests/cp/same-file.sh: Augment to cover the `cp -a hlsl1 sl1` case. + * tests/mv/hard-verbose.sh: Remove no longer needed test. + * tests/local.mk: Remove the reference to hard-verbose.sh. + * tests/mv/hard-4.sh: Adjust so we fail in this case. + * tests/mv/i-4.sh: Likewise. + * tests/mv/symlink-onto-hardlink-to-self.sh: Likewise. + +2014-11-18 Pádraig Brady + + maint: run strftime syntax check on newer systems + * cfg.mk (sc_strftime_check): Adjust regex to handle + newer glibc info formatting with different indentation + and quoting. + +2014-10-30 Pádraig Brady + + maint: tests: fix comments about retry_delay_ + * tests/tail-2/F-vs-missing.sh: Comment with the correct total delay. + * tests/tail-2/F-vs-rename.shi: Likewise. + * tests/tail-2/flush-initial.sh: Likewise. + * tests/tail-2/inotify-hash-abuse.sh: Likewise. + * tests/tail-2/pipe-f2.sh: Likewise. + * tests/misc/chroot-fail.sh: Initialize can_chroot_root in all cases. + + tests: make inotify-rotate more robust and efficient + * tests/tail-2/inotify-rotate.sh: Use retry_delay_ + to employ an exponential backoff with a total delay of + up to 25.5s. The 15s delay was seen to trigger a false + failure in http://hydra.nixos.org/build/16546517 + Also remove the .1s sleep in each of the 50 iterations + to reduce the running time of the test and thus the + expensive_ tag on this test was removed. + Also ensure that we use the standard exit procedure + upon failure to avoid any erroneous diagnostics due + to persistent files on NFS. + +2014-10-29 Bernhard Voelker + + tests: make du/move-dir-while-traversing more robust + * tests/du/move-dir-while-traversing.sh: Catch failure of retry_delay_ + when waiting for the watcher to get ready. + +2014-10-27 Pádraig Brady + + doc: mention that df -a includes duplicate file systems + * src/df.c (usage): Mention that duplicate file systems are shown + with this option, not just dummy file systems. + * doc/coreutils.texi (df invocation): For the --all option, expand + on the class of normally suppressed mount entries that it includes. + Reported in http://bugs.debian.org/737399 + +2014-10-23 Pádraig Brady + + maint: improve sc_long_lines syntax-check speed + sc_long_lines was the slowest syntax check + before$ time make sc_long_lines + long_lines + real 0m2.740s + after $ time make sc_long_lines + long_lines + real 0m0.677s + * src/cfg.mk (sc_dd_max_sym_length): s/--max-line-length/-L/ + for compat with BSDs. + (sc_long_lines): Prefilter with wc -L to only identify lines + in files that have lines longer than 80 characters. + +2014-10-23 Mike Frysinger + + tests: d_type-check: don't hardcode the C library name + * tests/d_type-check: The hardcoded name doesn't hold true for all + Linux/glibc platforms, let alone Linux/non-glibc. + Use ctypes.util.find_library() instead to search for the library. + +2014-10-17 Bernhard Voelker + + tests: avoid false failure when comparing /proc files + At least the MHz number in /proc/cpuinfo may change, thus leading to + a false positive failure when comparing the expected against the + actual output file. Use an invariant file instead: /proc/version. + * tests/misc/head-c.sh: s/cpuinfo/version/ + +2014-10-16 Pádraig Brady + + tests: fix test hang with unstable inodes in /proc + * cp/proc-zero-len.sh: Search the 'err' file + for the error to ignore, not stdin. + + chroot: call chroot() unconditionally to handle bind mounted "/" + * src/chroot.c (is_root): Adjust to compare canonicalized paths + rather than inodes, to handle (return false in) the case where + we have a tree that is constructed by first bind mounting "/" + (thus having the same inode). + (main): Unconditionally call chroot() because it's safer + and of minimal performance benefit to avoid in this case. + This will cause inconsistency with some platforms + not allowing `chroot / true` for non root users. + * tests/misc/chroot-fail.sh: Adjust appropriately. + * NEWS: Mention the bug fixes. + Fixes http://bugs.gnu.org/18736 + +2014-10-15 Pádraig Brady + + copy: avoid an extraneous error when reporting errors + * src/copy.c (copy_reg): If sparse_copy() failed, then an + erroneous error about failing to extend the file would be reported. + + cp: read sparse files more efficiently with non regular destination + * src.copy.c (copy_reg): Use fiemap to read sparse files, even + if the output is not to a regular file. + * NEWS: Mention the improvement. + + cp: avoid speculative preallocation with --sparse=always + With --sparse=always use fallocate(...PUNCH_HOLE...) to + avoid any permanent allocation due to speculative + preallocation employed by file systems such as XFS. + * m4/jm-macros.m4: Check for and fallocate(). + * src/copy.c (punch_hole): A new function to try and punch + a hole at the specified offset if supported. + (create_hole): Call punch_hole() after requesting a hole. + (extent_copy): Likewise. + * NEWS: Mention the improvement. + + copy: detect smaller holes than the copy buffer size + Previously cp would not detect runs of NULs that were + smaller than the buffer size used for I/O (currently 128KiB). + * src/copy.c (copy_reg): Use an independent hole_size, set to + st_blksize, to increase the chances of detecting a representable hole, + in a run of NULs read from the input. + (create_hole): A new function refactored from sparse_copy() and + extent_copy() so we have a single place to handle holes. + (sparse_copy): Adjust to loop over the larger input buffer + in chunks of the passed hole size. Also adjust to only call + lseek once per hole, rather than at least once per input buffer. + * tests/cp/sparse.sh: Add test cases for various sparse chunk sizes. + * NEWS: Mention the improvement. + +2014-10-09 Wieland Hoffmann + + doc: clarify that timeout limits are not 2038 seconds + * man/timeout.x: The 2038 that the sentence is referring to is the year + 2038, not 2038 seconds (the default unit used for timeouts). + +2014-10-08 Pádraig Brady + + maint: avoid new signed overflow warning on 32 bit + Prompted by http://hydra.nixos.org/build/15682577 + with GCC 4.8.3 on i686 + src/tac.c:557:6: error: assuming signed overflow does not occur + when simplifying conditional to constant [-Werror=strict-overflow] + if (bytes_copied < 0) + This happens because copy_to_temp() is inlined in tac_nonseekable(), + thus reducing the comparison to the bytes_copied variable in + copy_to_temp. Now this can't overflow on either 32 or 64 bit + due to the protection of the preceding fwrite(). We could use a + guard like "if (bytes_copied <= OFF_T_MAX - bytes_read)" to avoid + the warning, but rather than a runtime branch, just use an unsigned + type to avoid apparent signed overflow on systems where the accumulation + is not promoted to unsigned (32 bit size_t, 64 bit off_t). + * src/tac.c (copy_to_temp): Increment an unsigned type to + avoid the subsequent signed overflow warning. + +2014-10-08 Jim Meyering + + tests: split/b-chunk.sh: avoid spurious fail on non-Linux + * tests/split/b-chunk.sh: Skip each file that does not exist. + Some systems lack /proc/version or /sys/kernel/profiling + +2014-10-08 Pádraig Brady + + maint: avoid syntax-check failures in previous patch + * tests/misc/od-j.sh: Non standard comparison order. + * tests/split/b-chunk.sh: Confusing input file name. + * tests/tail-2/tail-c.sh: Redundant require ulimit. + +2014-10-08 Paul Eggert + + wc: don't miscount /sys and similar file systems + Fix similar problems in head, od, split, tac, and tail. + Reported by George Shuklin in: http://bugs.gnu.org/18621 + * NEWS: Document this. + * src/head.c (elseek): Move up. + (elide_tail_bytes_pipe, elide_tail_lines_pipe): New arg + CURRENT_POS. All uses changed. + (elide_tail_bytes_file, elide_tail_lines_file): + New arg ST and remove arg SIZE. All uses changed. + * src/head.c (elide_tail_bytes_file): + * src/od.c (skip): Avoid optimization for /sys files, where + st_size is bogus and st_size == st_blksize. + Don't report error at EOF when not optimizing. + * src/head.c, src/od.c, src/tail.c: Include "stat-size.h". + * src/split.c (input_file_size): New function. + (bytes_split, lines_chunk_split, bytes_chunk_extract): New arg + INITIAL_READ. All uses changed. Use it to double-check st_size. + * src/tac.c (tac_seekable): New arg FILE_POS. All uses changed. + (copy_to_temp): Return size of temp file. All uses changed. + * src/tac.c (tac_seekable): + * src/tail.c (tail_bytes): + * src/wc.c (wc): + Don't trust st_size; double-check by reading. + * src/wc.c (wc): New arg CURRENT_POS. All uses changed. + * tests/local.mk (all_tests): Add tests/misc/wc-proc.sh, + tests/misc/od-j.sh, tests/tail-2/tail-c.sh. + * tests/misc/head-c.sh: + * tests/misc/tac-2-nonseekable.sh: + * tests/split/b-chunk.sh: + Add tests for problems with /proc and /sys files. + * tests/misc/od-j.sh, tests/misc/wc-proc.sh, tests/tail-2/tail-c.sh: + New files. + +2014-10-04 Bernhard Voelker + + doc: document stat's output with the --terse option + * doc/coreutils.texi (stat invocation): Add a paragraph documenting + stat's output format when the --terse option is specified, both in + normal and in --file-system mode. + Reported by Dan Jacobson + in http://bugs.gnu.org/18624 + +2014-10-02 Nick Alcock + + tests: fix false failure for test referencing libdl + * init.cfg (gcc_shared_): -ldl has to be positioned after the object + files that may rely upon it. This fixes tests/cp/nfs-removal-race.sh + which references dlsym() from libdl. + +2014-10-02 Bernhard Voelker + + maint: avoid double semicolon syntax check failure + A syntax-check recently added to gnulib would trigger a failure + (once gnulib gets updated here) for a statement introduced with + commit v8.23-43-gaf2a4ed: + src/dd.c:806: char const *time_fmt = _(", %g s, %s/s\n");; + maint.mk: Double semicolon detected + make: *** [sc_prohibit_double_semicolon] Error 1 + * src/dd.c (print_xfer_stats): s/;;/;/ + +2014-09-30 Federico Simoncelli + + dd: new status=progress level to print stats periodically + * src/dd.c: Report the transfer progress every second when the + new status=progress level is used. Adjust the handling and + description of the status= option so that they're treated as + mutually exclusive levels, rather than flags with implicit precedence. + * doc/coreutils.texi (dd invocation): Document the new progress + status level. Reference the new level in the description of SIGUSR1. + * tests/dd/stats.sh: Add new test for status=progress. + * tests/dd/misc.sh: Change so status=none only takes precedence + if it's the last level specified. + * NEWS: Mention the feature. + +2014-09-30 Pádraig Brady + + dd: use more robust SIGUSR1 handling + * src/dd.c (ifd_reopen): A new wrapper to ensure we + don't exit upon receiving a SIGUSR1 in a blocking open() + on a fifo for example. + (iftruncate): Likewise for ftruncate(). + (iread): Process signals also after a short read. + (install_signal_handlers): Install SIGINFO/SIGUSR1 handler + even if set to SIG_IGN, as this is what the parent can easily + set from a shell script that can send SIGUSR1 without the + possiblity of inadvertently killing the dd process. + * doc/coreutils.texi (dd invocation): Improve the example to + show robust usage wrt signal races and short reads. + * tests/dd/stats.sh: A new test for various signal races. + * tests/local.mk: Reference the new test. + * NEWS: Mention the fix. + +2014-09-24 Paul Eggert + + test: check for Fedora 20 sort key bug + Problem reported by Göran Uddeborg in: http://bugs.gnu.org/18540 + * tests/misc/sort.pl: New test 23. + +2014-09-24 David Sterba + + mv: use reflink=auto mode by default + On some filesystems (BTRFS), moving a file within the filesystem may + cross subvolume boundaries and we can use a lightweight reflink copy, + similar to what cp(1) can do, which is faster than a full file copy. + This is enabled by default because it's only an optimization for + the fall back copy and does not break user expectations or usability. + * src/mv.c (cp_option_init): Set the reflink mode to AUTO. + * NEWS: Mention the improvement. + +2014-09-23 Pádraig Brady + + stty: only list supported options in --help and man pages + * src/stty.c (usage): Exclude unsupported options from --help, + which for example impacts the "dsusp" and "cdtrdsr" options on Linux. + Fixes http://bugs.gnu.org/18506 + +2014-09-23 Michal Nazarewicz + + doc: fix use of "e.g." in stdbuf help message + "E.g." stands for latin "exempli gratia" which is typically read + as "for example". "E.g." does not stand for the word "example". + As such, "for e.g." might be read as "for for example". + Fix this usage by simply replacing "e.g." with "example". + +2014-09-23 Bernhard Voelker + + build: pass program name to help2man after other options + * man/local.mk (.x.1): Move the program name argument down after + the last option argument when calling $(run_help2man). + While the other way would be accepted for the GNU help2man program, + it is not for the 'dummy-man' script (called as a fallback on + systems lacking perl). + The wrong order was introduced in commit v8.21-119-gb3578fc while + adding the --info-page option. + + build: fix argument count check in dummy-man again + * man/dummy-man: Fix argument count check, now only permitting + exactly 1 argument, the program name. + Reported by Andreas Schwab + +2014-09-22 Alban Bedel + + build: fix an inverted test breaking dummy-man + * man/dummy-man: Fix argument count check, + allowing dummy-man to run (on systems without perl). + Fixes http://bugs.gnu.org/18531 + +2014-09-19 Pádraig Brady + + build: fix dependency issues with man page generation + * .gitignore: Remove reference to no longer generated make file. + * configure.ac: Don't bother generating placeholder make file. + * man/local.mk: Hardcode the man page deps list for normal builds + to be compatible with all make implementations and configure options. + Note in SINGLE_BINARY mode, all man pages will be generated on + any change to the coreutils binary, but development will generally + not be done in this mode, so this shouldn't be an issue. + Fixes http://bugs.gnu.org/18055 + +2014-09-19 Jim Meyering + + maint: don't trigger gcc-5's new -Wlogical-not-parentheses warning + * src/dircolors.c (main): Parenthesize !VAR as LHS to "<", + to avoid triggering gcc's new -Wlogical-not-parentheses warning. + +2014-09-19 Pádraig Brady + + cp: fix handling of -H with multiply specified source dirs + Following on from commit v5.92-729-g130dd06, also avoid + the erroneous directory hardlink warning with -H. + * src/copy.c (copy_internal): Also handle the -H case + for command line arguments. + * tests/cp/duplicate-sources.sh: Augment the test case. + * NEWS: Augment the news entry. + + cp: issue correct warning and ignore duplicate source dirs + * src/copy.c (copy_internal): Handle the case where we have the + same destination directory as already encountered, which can only + be due to the corresponding source directory being specified multiple + times. + * tests/cp/duplicate-sources.sh: Add a test for the new multiply + specified directory case, and the existing multiply specified file case. + * tests/local.mk: Reference the new test. + * NEWS: Mention the bug fix. + + doc: output correct --help references with --program-prefix + * src/system.h (emit_ancillary_info): Take the invariant PROGRAM_NAME + as a parameter, so that consistent references are made to online docs + and texinfo nodes, when a --program-prefix is in place. Note the + man pages don't need this fix as they're generated before the program + prefix is used. + * NEWS: Mention the improvements in references to online documentation. + + doc: ensure the correct texinfo nodes are referenced in --help + * src/system.h (emit_ancillary_info): For commands that don't have + a 1:1 mapping with the texinfo node names, provide a mapping to + the correct node. + * doc/coreutils.texi: Add some extra cross references noticed while + checking this. + Fixes http://bugs.debian.org/762092 + +2014-09-16 Bernhard Voelker + + tests: fix false du failure on newer XFS + On XFS, when creating the ~2G test file 'big' in a for-loop by + appending 20M each time, the file ends up using ~4G - visible in + 'st_blocks'. The unused space would be reclaimed later. + This feature is called "speculative preallocation" which aims at + avoiding fragmentation. + According to the XFS FAQ [1], there are two particular aspects of + XFS speculative preallocation that are triggering this: + 1. "Applications that repeatedly trigger preallocation and reclaim + cycles [after file close] can cause fragmentation. + Therefore, this pattern is detected and causes the preallocation + to persist beyond the lifecycle of the file descriptor." + 2. "Preallocation sizes grow as files grow larger." + [1] http://xfs.org/index.php/XFS_FAQ + Avoid one of the above by only doing a single close (reclaim cycle). + * tests/du/2g.sh: Similar to the fix for a dd test (see commit + v8.22-65-g7c03fe2), avoid speculative preallocation by creating + the 'big' file in one go instead of appending to it in the loop. + Remove debugging statements as the output with 'set -x' is + sufficient nowadays. + +2014-09-11 Paul Eggert + + cat: allow copying empty files to themselves + Problem reported by Vincent Lefevre in: http://bugs.gnu.org/18449 + * src/cat.c (main): Allow copying an empty file to itself. + * tests/misc/cat-self.sh: New test. + * tests/local.mk (all_tests): Add it. + +2014-09-11 Pádraig Brady + + doc: reference online info pages directly from man pages + * src/system.h (emit_ancillary_info): Add a direct reference + to the corresponding online info documentation. Corresponding + redirects were put in place on www.gnu.org to allow for concise links. + * help2man: Adjust to add the "online help" link (and subsequent + translation bugs link) to a "REPORTING BUGS" section. + Also add the concise links for further information in --help + to the "SEE ALSO" section, and dispense with the more verbose + default for that. + +2014-09-10 Pádraig Brady + + doc: adjust reference to info nodes in man pages + old form: coreutils '$cmd invocation' + new form: '(coreutils) $cmd invocation' + The old form erroneously referenced the node for the 'coreutils' + multi-call program. Now that problematic node name was renamed + in commit v8.23-18-g72e470b, but the newer less ambiguous form + also has the advantage of working with the pinfo viewer for example. + Full discussion at http://bugs.gnu.org/18428 + * man/local.mk: Adjust man page references to texinfo nodes. + * src/system.h: Adjust --help references to texinfo nodes. + + maint: include libstdbuf.c in extraneous headers check + * cfg.mk (sc_system_h_headers): Don't exclude libstdbuf.c. + * src/libstdbuf.c: Remove headers already included in system.h. + + build: adjust previous transformations on libstdbuf name + * src/local.mk (transform): commit v8.23-22-g6f9b018 discarded all + transformations on the libstdbuf.so name. Be more conservative and + only exclude the $(program_transform_name) portion for libstdbuf. + + build: avoid name transformations on libstdbuf + * src/local.mk (transform): Skip the transformation for libstdbuf + since that should not be subject to name clashes, and we need + to reference the name directly in LD_PRELOAD etc. + * configure.ac: Add a comment on the coupling of pkglibexec_PROGRAMS + to $(transform). + Issue reported at https://trac.macports.org/ticket/44922 + Improved by Nick Bowler + +2014-09-09 Pádraig Brady + + maint: fix syntax-check issues in recent commit + Avoid 2 new syntax-check failures introduced in commit v8.23-19-g8defcee + * cfg.mk (sc_some_programs_must_avoid_exit_failure): s/exit/return/. + * src/whoami.c (main): Reinstate translation marker for diagnostic. + +2014-09-09 Paul Eggert + + maint: avoid file-scope names of the form _[a-z]* + The C standard says this isn't portable, if you include + standard include files. + * build-aux/gen-single-binary.sh: + * src/coreutils-arch.c (single_binary_main_arch) + (single_binary_main_uname): + * src/coreutils-dir.c (single_binary_main_ls) + (_single_binary_main_dir): + * src/coreutils-vdir.c (single_binary_main_ls) + (_single_binary_main_vdir): + * src/coreutils.c (SINGLE_BINARY_PROGRAM): + Remove leading _ from single_binary prefix. + * src/numfmt.c (round_style): Rename from _round. All uses changed. + (inval_style): Rename from _invalid. All uses changed. + + maint: prefer 'return status;' to 'exit (status);' in 'main' + * build-aux/gen-single-binary.sh: Don't use ATTRIBUTE_NORETURN + for main functions. + * src/base64.c, src/basename.c, src/cat.c, src/chcon.c, src/chgrp.c: + * src/chmod.c, src/chown.c, src/chroot.c, src/cksum.c, src/comm.c: + * src/cp.c, src/csplit.c, src/cut.c, src/date.c, src/dd.c, src/df.c: + * 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/fmt.c, src/fold.c: + * src/getlimits.c, src/groups.c, src/head.c, src/hostid.c: + * src/hostname.c, src/id.c, src/install.c, src/join.c, src/kill.c: + * src/link.c, src/ln.c, src/logname.c, src/ls.c, src/make-prime-list.c: + * src/md5sum.c, src/mkdir.c, src/mkfifo.c, src/mknod.c, src/mktemp.c: + * src/mv.c, 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.c, src/rm.c, src/rmdir.c, src/runcon.c: + * src/seq.c, src/shred.c, src/shuf.c, src/sleep.c, src/sort.c: + * src/split.c, src/stat.c, src/stdbuf.c, src/stty.c, src/sum.c: + * src/sync.c, src/tac.c, src/tail.c, src/tee.c, src/timeout.c: + * src/touch.c, src/tr.c, src/true.c, src/truncate.c, src/tsort.c: + * src/tty.c, src/uname.c, src/unexpand.c, src/uniq.c, src/unlink.c: + * src/uptime.c, src/users.c, src/wc.c, src/who.c, src/whoami.c: + In 'main' functions, Prefer 'return status;' to 'exit (status);'. + * src/coreutils-arch.c (_single_binary_main_uname) + (_single_binary_main_arch): + * src/coreutils-dir.c, src/coreutils-vdir.c (_single_binary_main_ls) + (_single_binary_main_dir, _single_binary_main_vdir): + Omit ATTRIBUTE_NORETURN. Return a value. + * src/coreutils.c (SINGLE_BINARY_PROGRAM): Omit ATTRIBUTE_NORETURN. + (launch_program): Now static. + * src/dd.c (finish_up): New function. + (quit, main): Use it. + * src/getlimits.c (main): Return a proper exit status. + * src/test.c (test_main_return): New macro. + (main): Use it. + * src/logname.c, src/nohup.c, src/whoami.c: + Use 'error' to simplify exit status in 'main' function. + * src/yes.c (main): Use 'return' rather than 'error' to exit, + so that GCC doesn't suggest ATTRIBUTE_NORETURN. + + doc: rename "coreutils invocation" to "Multi-call invocation" + This supports longstanding shell commands like + 'info coreutils "touch invocation"'. + Problem reported by Vincent Lefevre via Bob Proulx in: + http://bugs.gnu.org/18428 + * doc/coreutils.texi (Multi-call invocation): + Rename from "coreutils invocation". + + doc: mention which commands are optional + * doc/coreutils.texi (coreutils invocation, df invocation) + (stty invocation, whoami invocation, nproc invocation) + (arch invocation, hostname invocation, hostid invocation) + (uptime invocation, chroot invocation, nice invocation) + (stdbuf invocation): Document that the command is installed + optionally. + +2014-09-07 Bernhard Voelker + + doc: fix typos + * doc/coreutils.texi: Fix normal typos: + s/pseudorandom/pseudo-random/; + s/behaviour/behavior/; + s/linux-based/Linux-based/; + s/nonnegative/non-negative/. + Fix IEC's long name: s/Electronical/Electrotechnical/. + Wrap 'getopt' into the @code{} macro. + Fix a grammatical error (from myself): s/splitted/split/. + +2014-09-03 Paul Eggert + + doc: spell "indeterminate" correctly + * doc/coreutils.texi (timeout invocation): Fix misspelling. + Reported by Yureruchihirosan via OKANO Takayoshi in: + http://bugs.gnu.org/18394 + +2014-08-23 Pádraig Brady + + maint: ensure fiemap extents flags are compared correctly + * src/extent-scan.c (extent_scan_read): Following on from the flags size + adjustment in commit v8.23-13-g1505b37, verify that the internal + representation of the flags is never truncated which could happen in the + unlikely case on 32 bit if the kernel flags ever expanded to 64 bits + which is theoretically possible given the reserved space. + +2014-08-22 Paul Eggert + + maint: avoid int64_t and similar types unless they're needed + C11 doesn't require them, even POSIX doesn't strictly require the + 64-bit versions, and it makes the code a bit clearer if they're + used only when needed. + * src/copy.c (write_zeros, extent_copy): + * src/extent-scan.h (struct extent_info.ext_length): + Use off_t, not uint64_t, for a value derived from a file offset. + * src/extent-scan.h (struct extent_info.ext_flags) + Prefer plain unsigned int to uint32_t where either will do. + (struct extent_scan.ei_count): + Use size_t, not uint32_t, for a value bounded by SIZE_MAX. + * src/factor.c (MAGIC64, MAGIC63, MAGIC65): + Remove unnecessary casts to uint64_t. + +2014-08-21 Yurij Goncharuk + + maint: refactor ls QUOTING_STYLE env var handling + * src/ls.c (main): As per the FIXME comment, move the + QUOTING_STYLE handling to a separate function. + +2014-08-21 Fridolin Pokorny + + doc: clarify that duplicate NFS mounts are skipped by df + * doc/coreutils.texi (df invocation): Add a sentence that eliding + duplicate entries for the same file system is not limited to bind + mounts, but also happens for remote file systems like NFS. + +2014-08-19 Pádraig Brady + + df: improve mount point selection with inaccurate mount list + v8.23 has a test failure on Fedora rawhide build servers + in tests/df/skip-duplicate.sh. This was due to no '/' + entry being output by df. That was due to an inaccurate + /proc/mounts on the build environment as stat(/mnt/point) + identified all these /proc/mounts entries as having the + same device id: + / rootfs + / /dev/md1 + /dev devtmpfs + /run tmpfs + /boot /dev/md0 + /proc/filesystems /dev/md1 + Since the device name on the right changes for a given id, + that causes the entries to be continually replaced, thus + resulting in no '/' entry. I'm guessing this is due to + the mock environment bind mounting unneeded or sensitive + items to a dummy file on the host / (/dev/md1) though + have not looked into those details. + So rather than relying on an accurate /proc/mounts, + the attached patch takes a more conservative replacement + approach and only swaps a new device entry when the + mount point matches. That should handle all practical + cases while also avoiding this situation. + * src/df.c (filter_mount_list): Only replace entries with + different device names when the mount point also matches. + +2014-08-11 Rasmus Borup Hansen + + cp: remove redundant possibly expensive heap deallocation + If the hash structures grow sufficiently large so that + the system is actively swapping, then the deallocation + can take a significant amount of time. Details at: + http://lists.gnu.org/archive/html/coreutils/2014-08/msg00012.html + * src/cp.c (main): Only call hash deallocation routines + when in lint checking mode. + * THANKS.in: Remove as now in the git author list. + +2014-08-04 Reuben Thomas + + doc: indicate that FILE arguments are optional with rm -f + * src/rm.c (usage): s/FILE/[FILE]/. + Fixes http://bugs.gnu.org/18187 + +2014-08-03 Anders Jonsson + + numfmt: fix misspelling in --debug message + * src/numfmt.c (parse_format_string): s/overridding/overriding/. + Fixes http://bugs.gnu.org/18050 + +2014-08-01 Paul Eggert + + tests: fix typo in tail-2/inotify-race + Reported by Andreas Schwab in: http://bugs.gnu.org/18057 + * tests/tail-2/inotify-race.sh (break_src): + Use abs_top_srcdir, not abs_top_builddir. + +2014-08-01 Bernhard Voelker + + chroot: perform chdir("/") again unless new --skip-chdir is specified + Since commit v8.22-94-g99960ee, chroot(1) skips the chroot(2) syscall + for "/" arguments (and synonyms). The problem is that it also skips + the following chdir("/") call in that case. The latter breaks existing + scripts which expect "/" to be the working directory inside the chroot. + While the first part of the change - i.e., skipping chroot("/") - is + okay for consistency with systems where it might succeed for a non-root + user, the second part might be malicious, e.g. + cd /home/user && chroot '/' bin/foo + In the "best" case, chroot(1) could not execute 'bin/foo' with ENOENT, + but in the worst case, chroot(1) would execute '/home/user/bin/foo' in + the case that exists - instead of '/bin/foo'. + Revert that second part of the patch, i.e., perform the chdir("/) + in the common case again - unless the new --skip-chdir option is + specified. Restrict this new option to the case of "/" arguments. + * src/chroot.c (SKIP_CHDIR): Add enum. + (long_opts): Add entry for the new --skip-chdir option. + (usage): Add --skip-chdir option, and while at it, move the other + to options into alphabetical order. + (main): Accept the above new option, allowing it only in the case + when NEWROOT is the old "/". + Move down the chdir() call after the if-clause to ensure it is + run in any case - unless --skip-chdir is specified. + Add a 'newroot' variable for the new root directory as it is used + in a couple of places now. + * tests/misc/chroot-fail.sh: Invert the last tests which check the + working directory of the execvp()ed program when a "/"-like + argument was passed: now expect it to be "/" - unless --skip-chdir + is given. + * doc/coreutils.texi (chroot invocation): Document the new option. + Document that chroot(1) usually calls chdir("/") unless the new + --skip-chdir option is specified. Sort options. + * NEWS (Changes in behavior): Mention the fix. + (New features): Mention the new option. + * init.cfg (nonroot_has_perm_): Add chroot's new --skip-chdir option. + * tests/cp/preserve-gid.sh (t1): Likewise. + * tests/cp/special-bits.sh: Likewise. + * tests/id/setgid.sh: Likewise. + * tests/misc/truncate-owned-by-other.sh: Likewise. + * tests/mv/sticky-to-xpart.sh: Likewise. + * tests/rm/fail-2eperm.sh: Likewise. + * tests/rm/no-give-up.sh: Likewise. + * tests/touch/now-owned-by-other.sh: Likewise. + Reported by Andreas Schwab in http://bugs.gnu.org/18062 + +2014-07-31 Pádraig Brady + + build: avoid building stdbuf on cygwin + * configure.ac: Don't add stdbuf to the list of programs to build + if EXEEXT is set, as that is not handled in configure.ac for + libstdbuf.so yet (see bin_PRGRAMS handling in configure.ac). + Also the LD_PRELOAD mechanism will need to be adjusted to support + cygwin in any case, so avoid stdbuf completely in this case for now. + Problem reported by Eric Blake. + +2014-07-29 Eric Blake + + doc: clarify that floating point parses "inf" + * doc/coreutils.texi (Floating point): Document handling of "inf", + "infinity", "NaN", and so on. + +2014-07-19 Paul Eggert + + maint: fix message translation glitches + Problem reported by Sebastian Rasmussen in: http://bugs.gnu.org/18054 + * gl/lib/randread.c (randread_error): Don't put multiple string + literals inside _(...), as xgettext doesn't support that. + * src/chroot.c (main): In diagnostics, don't bother to distinguish + between setting the number of supplemental group IDs to a zero or + to a nonzero value, as the underlying system call is the same + either way. This also makes the string easier to translate correctly. + 2014-07-18 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.23 * NEWS: Record release date. @@ -12,12 +2839,9 @@ which would be the case if there are spaces in the directory hierarchy. This is triggered by `make distcheck` -2014-07-18 Pádraig Brady - build: don't distribute generated coreutils.h This issue was identified by the manifest comparisons done by `make distcheck` - * src/local.mk (noinst_HEADERS): Remove coreutils.h from this always distributed list. (nodist_src_coreutils_SOURCES): Add coreutils.h as its contents @@ -27,20 +2851,15 @@ (DISTCLEANFILES): Add coreutils.h to this rather than CLEANFILES, as its contents are determined at configure time. -2014-07-18 Pádraig Brady - tests: fix false failure in cp --preserve=context test With libselinux-2.2.1-6.fc20.x86_64, kernel-3.12.6-300.fc20.x86_64 `cp --preserve=context src dst` was seen to succeed when src and dst where on the same fixed context file system, as lsetfilecon() returned success in this case when the context wasn't being changed. - * tests/cp/cp-a-selinux.sh: Copy from a different file system to most likely have a different context that will test context setting logic correctly. -2014-07-18 Pádraig Brady - maint: avoid a syntax-check warning in previous commit * cfg.mk: Avoid warning for @AMDEP_TRUE@ usage in man/local.mk @@ -74,7 +2893,6 @@ on cygwin, due to the is*() implementations used there, but the issue is present on all platforms defaulting to signed chars. * NEWS: Mention the bug fix. - Reported by Eric Blake 2014-07-14 Pádraig Brady @@ -112,21 +2930,15 @@ http://bugs.gnu.org/17833 * NEWS: Detail the df bug fix. -2014-07-13 Pádraig Brady - sort: avoid undefined operation with destroying locked mutex This didn't seem to cause any invalid operation on GNU/Linux at least, but depending on the implementation, mutex deadlocks could occur. For example this might be the cause of lockups seen on Solaris: http://lists.gnu.org/archive/html/coreutils/2013-03/msg00048.html - This was identified with valgrind 3.9.0 with this setup: - seq 200000 > file.sort valgrind --tool=drd src/sort file.sort -o file.sort - With that, valgrind would _intermittently_ report the following: - Destroying locked mutex: mutex 0x5419548, recursion count 1, owner 2. at 0x4C2E3F0: pthread_mutex_destroy(in vgpreload_drd-amd64-linux.so) by 0x409FA2: sortlines (sort.c:3649) @@ -140,7 +2952,6 @@ by 0x4090DD: merge_tree_init (sort.c:3234) by 0x40AA5A: sort (sort.c:3951) by 0x40C5D9: main (sort.c:4739) - Thread 2: The object at address 0x5419548 is not a mutex. at 0x4C2F4A4: pthread_mutex_unlock(in vgpreload_drd-amd64-linux.so) @@ -150,7 +2961,6 @@ by 0x409CE3: sortlines_thread (sort.c:3574) by 0x4E44F32: start_thread (in /usr/lib64/libpthread-2.18.so) by 0x514EEAC: clone (in /usr/lib64/libc-2.18.so) - * src/sort.c (sortlines): Move pthread_mutex_destroy() out to merge_tree_destroy(), so that we don't overlap mutex destruction with threads still operating on the nodes. @@ -163,13 +2973,10 @@ sort: fix two threading issues reported by valgrind Neither issue impacts on the correct operation of sort. The issues were detected by both valgrind 3.8.1 and 3.9.0 using: - seq 200000 > file.sort valgrind --tool=drd src/sort file.sort -o file.sort - For tool usage and error details see: http://valgrind.org/docs/manual/drd-manual.html - * src/sort.c (queue_insert): Unlock mutex _after_ signalling the associated condition variable. Valgrind flags this with: "Probably a race condition: condition variable 0xffeffffb0 has been @@ -181,7 +2988,6 @@ programming error which can cause subtle race conditions and unpredictable behavior." This should at least give more defined scheduling behavior. - (merge_tree_destroy): Make symmetrical with merge_tree_init() thus destroying the correct mutex. Valgrind flags this with: "The object at address 0x5476cf8 is not a mutex." @@ -207,7 +3013,6 @@ the selected tools. Which tool gets executed depends on the value of argv[0] which can be set implicitly through symlinks to the single program. - This setup reduces significantly the size of a complete coreutils install, since code from lib/libcoreutils.a is not duplicated in every one of the more than 100 binaries. Runtime overhead is @@ -217,7 +3022,6 @@ alleviated due to caching and lazy mmaping of unused blocks, and in fact the single binary should have better caching characteristics. - Comparing the size of the individual versus single binary on x86_64: $ cd src $ size coreutils @@ -226,7 +3030,6 @@ text data bss dec hex filename 1097416 5388 88432 1191236 122d44 src/coreutils 4901010 124964 163768 5189742 4f306e (TOTALS) - Storage requirements are reduced similarly: $ cd src $ du -h coreutils @@ -234,13 +3037,11 @@ grep -Ev '(coreutils|libstdbuf)') | tail -n1 1.2M coreutils 5.3M total - When installing, the makefile will create either symlinks or shebangs based on the --enable-single-binary setting, for each configured tool. In this way, all the tools are still callable individually, but they are all implemented by the same "coreutils" binary installed on the same directory. - * .gitignore: Add new generated files. * Makefile.am: New rules to generate build-aux/gen-single-binary.sh and install symlinks. @@ -273,7 +3074,6 @@ Avoid complicated and error-prone parsing of df's output via sed(1), cut(1), etc., and instead use df's more modern --output option. - * src/ioblksize.h (in a comment): Simplify the extraction of the device name of the mounted file system from df's output. * tests/dd/skip-seek-past-dev.sh: Likewise. @@ -292,13 +3092,9 @@ states that the default mode should be -L, common practice for stand-alone pwd implementations is to default to -P. - * src/pwd.c (usage): Retain mention of the default mode of operation. - Suggested by Bob Proulx -2014-07-02 Pádraig Brady - tests: avoid false failure with spaces in mount point paths * tests/ls/readdir-mountpoint-inode.sh: Quote appropriately to process mount points with spaces in the path. @@ -331,7 +3127,6 @@ maint: fix context_t init warning on systems without selinux On systems without libselinux, context_t is defined as an int type, but defined as a pointer type by SELinux. - * src/chcon.c: Init with 0 rather than NULL to avoid warning. 2014-07-01 Jim Meyering @@ -357,7 +3152,6 @@ Here we replace security_context_t with char*, and also provide a wrapper function to cater for the const issue on older libselinux. - * src/system.h (se_const): A new function to avoid and identify the const issue on older libselinux. * src/copy.c: s/security_context_t/char */. @@ -378,18 +3172,13 @@ chcon: avoid redundant context allocations Since context is verified by security_check_context() it can be used in change_file_context() without converting to context_t every time. - * src/chcon.c (change_file_context): Use specified_context directly. -2014-07-01 Namhyung Kim - chcon: use security_check_context() for context validation context_new() and _free() are used for checking validity of a specified context. libselinux provides security_check_context for this purpose so use it. - Note that context_new() can fail for a valid context - e.g. ENOMEM. - * src/chcon.c (main): Use security_check_context(). 2014-06-30 Pádraig Brady @@ -456,15 +3245,12 @@ not being accessible, while some of the other mount points are. Discussed at: http://bugs.gnu.org/16539#63 -2014-06-24 Pádraig Brady - df: output placeholder values for inaccessible mount points A system provided mount entry may be unavailable due to TOCTOU race, or if another device has been over-mounted at that position, or due to access permissions. In all these cases output "-" placeholder values rather than either producing an error, or in the over-mount case outputting values for the wrong device. - * src/df.c (device_list): A new global list now updated by filter_mount_list(). (filter_mount_list): Adjust to take a parameter as to whether @@ -476,11 +3262,8 @@ (devname_for_dev): A new function to search the mount <-> dev mapping. * test/df/skip-duplicates.sh: Adjust accordingly. * NEWS: Mention the bug fixes. - Discussed at: http://bugs.gnu.org/16539 -2014-06-24 Pádraig Brady - du: ignore directory cycles due to bind mounts * src/du.c (process_file): Treat cycles due to bind mounts like cycles due to following symlinks. @@ -524,11 +3307,9 @@ tail: fix --follow to use polling mode for VXFS Veritas File System can run in single instance or clustered mode, so mark as remote to avoid using inotify for the latter case. - * src/stat.c (human_fstype): Tag VXFS as remote, to use polling for the clustered variant (VXCFS). * NEWS: Mention the bug fix. - Reported by Ondřej Vašík in http://bugzilla.redhat.com/1104244 Fixes http://bugs.gnu.org/17770 @@ -573,8 +3354,6 @@ * gnulib: Update to latest. * tests/init.sh: Update from gnulib. -2014-06-11 Pádraig Brady - build: update GCC warnings * configure.ac: Remove the -Wsuggest-attribute=pure enablement on GCC >= 4.7, as that was moot since @@ -582,14 +3361,11 @@ The false positive was seen with 4.6.2, but confirmed not present in 4.6.3, so that's sufficiently old to just leave this enabled unconditionally. - Remove the -Wsuggest-attribute={const,noreturn} enablement, as gnulib already has those in the default set. - Enable the -Wlogical-op warning for GCC >= 4.8.0 as that is confirmed OK with coreutils at least, due to fixing: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43772 - Remove the -Wno-logical-op override since the main -Wlogical-op flag is now sufficient to control this warning as of GCC 4.6.3 at least. @@ -630,16 +3406,13 @@ could be used to select arbitrary (ranges of) lines, so as to simplify and optimize the implementation while also matching the behavior of different cut(1) implementations. - However that GNU behavior was in place for a long time, and could be useful in certain cases like making a separated list like `seq 10 | cut -f1- -d$'\n' --output-delimiter=,` although other tools like head(1) and paste(1) are more suited to this operation. This patch reinstates that functionality but restricts the "line behind" buffering behavior to only the -d$'\n' case. - We also fix the following related edge case to be more consistent: - before> printf "\n" | cut -s -d$'\n' -f1- | wc -l 2 before> printf "\n" | cut -d$'\n' -f1- | wc -l @@ -648,7 +3421,6 @@ 1 after > printf "\n" | cut -d$'\n' -f1- | wc -l 1 - * src/cut.c (cut_fields): Adjust as discussed above. * tests/misc/cut.pl: Likewise. * NEWS: Mention the change in behavior both for v8.21 @@ -656,8 +3428,6 @@ * cfg.mk (old_NEWS_hash): Adjust for originally omitted v8.21 entry. * src/paste.c: s/delimeter/delimiter/ comment typo fix. -2014-06-01 Pádraig Brady - stat: avoid redundant stat() calls * src/stat.c (find_bind_mount): NAME is invariant in the loop, so only stat(NAME) outside the loop. @@ -670,7 +3440,6 @@ mounted on a different device. Therefore honor the order of the mount list returned by the system and use the last reported device name. - * src/df.c (filter_mount_list): When discarding the current mount entry, ensure that a new device name is not also discarded. * tests/df/skip-duplicates.sh: Add a test case. Also fix @@ -740,7 +3509,6 @@ to be a consistent width and capitalization so that the src/fs-magic-compare target works without reporting false positives. * cfg.mk (sc_fs-magic-compare): A new syntax check to enforce this. - Improved by: Jim Meyering 2014-05-21 Pádraig Brady @@ -748,12 +3516,10 @@ stdbuf: support compilers other than __GNUC__ __SUNPRO_C >= 0x590 /*12.0*/ supports __attribute((constructor)) required by stdbuf, so use a more direct check for this. - Note ensure that --libexecdir is set to the appropriate install location for libstdbuf.so so that stdbuf works when installed on the system like it does when running tests in the build directory. - * configure.ac (stdbuf_supported): Use a test prog to determine support. * src/libstdbuf.c (stdbuf): Define appropriately for non GCC compilers, and provide early feedback (compilation warning) if trying to compile @@ -763,11 +3529,8 @@ * cfg.mk (sc_prohibit-gl-attributes): Adjust so we can exclude libstdbuf.so from prohibiting '__attribute', since we want this form to avoid silently eliding this required attribute on non GCC. - Reported and tested by Rich Burridge. -2014-05-21 Pádraig Brady - tests: use chroot --user rather than internal setuidgid tool * init.cfg (require_root_): Adjust to use chroot, and make `require_built_ chroot` implicit when chroot used in the test. @@ -797,22 +3560,17 @@ upon hitting a terminal issue, rather than diagnosing multiple issues lest users think previous failing actions are optional. -2014-05-21 Pádraig Brady - chroot: with --userspec clear root's supplemental groups It's dangerous and confusing to leave root's supplemental groups in place when specifying other users with --userspec. In the edge case that that is desired one can explicitly specify --groups. - Also we implicitly set the system defined supplemental groups for a user. The existing mechanism where supplemental groups needed to be explicitly specified is confusing and not general when the lookup needs to be done within the chroot. - Also we extend the --groups syntax slightly to allow clearing the set of supplementary groups using --groups=''. - * src/chroot.c (setgroups): On systems without supplemental groups, clearing then is a noop and so should return success. (main): Lookup the primary GID with getpwuid() when just a numeric @@ -832,7 +3590,6 @@ while not changing the current working directory. It also makes `chroot / true` consistently succeed on all platforms for non root users. - * src/chroot.c (main): If the same root is specified. i.e. '/' then don't change the current working directory, and avoid the overhead of the other redundant calls. @@ -848,31 +3605,23 @@ clang "warning: comparison of constant -1 with expression of type 'display_field_t' is always false" -2014-05-13 Pádraig Brady - df: ignore non file system entries in /proc/mounts Linux with network namespaces contains entries in /proc/mounts like: proc net:[4026532464] proc rw,nosuid,nodev,noexec,relatime 0 0 resulting in a failure to stat 'net:[...]', inducing a warning and an exit with failure status. - * src/df.c (get_dev): Ignore all relative mount points. * tests/df/skip-duplicates.sh: Add an entry to test relative dirs. -2014-05-13 Pádraig Brady - df: fix handling of symlinks in mount list The symlink handling in commit v8.21-172-g33660b4 was incomplete in the case where there were symlinks in the mount list itself. For example, in the case where /dev/mapper/fedora-home was in the mount list and that in turn was a symlink to /dev/dm-2, we have: - before> df --out=source /dev/mapper/fedora-home devtmpfs - after > df --out=source /dev/mapper/fedora-home /dev/mapper/fedora-home - * src/df.c (get_disk): Compare canonicalized device names from the mount list. Note we still display the non canonicalized name, even if longer, as we assume that is the most representative. @@ -880,8 +3629,6 @@ depending on the content of the mount list, but adjust to fail on any system where symlinks are present in the mount list for the current dir. -2014-05-13 Pádraig Brady - df: also deduplicate virtual file systems * src/df.c (filter_mountlist): Remove the constraint that a '/' needs to be in the device name for a mount entry to @@ -974,7 +3721,6 @@ * tests/tail-2/inotify-race.sh: Likewise. * tests/tail-2/wait.sh: Likewise. * tests/touch/no-dereference.sh: Likewise. - * cfg.mk (sc_prohibit_test_empty:): New syntax-check. * tests/cp/proc-zero-len.sh: Adjust to avoid false syntax-check failure. * tests/cp/proc-zero-len.sh: Likewise. @@ -1020,7 +3766,6 @@ The devmsg() calls that took quote_n() arguments, didn't normally output anything, but still incurred the overhead of those quote_n() calls. - * src/numfmt.c (devmsg): Move the inline function with _internal_ enablement check to... * src/system.h: ...here as a variadic macro, with @@ -1029,8 +3774,6 @@ performance change in this case. * NEWS: Mention the significant performance improvement. -2014-05-02 Pádraig Brady - numfmt: support zero padding using --format="%010f" * src/numfmt.c (setup_padding_buffer): Simplify the code by not explicitly dealing with heap exhaustion. @@ -1057,24 +3800,17 @@ * src/pr.c (usage): Add a period to avoid ambiguity in the man page output. -2014-04-29 Pádraig Brady - ptx: fix whitespace trimming with multiple files This issue was identified by running the test suite with http://code.google.com/p/address-sanitizer/ which is included in GCC 4.8 and enabled with -fsanitize=address - This was checked on Fedora 20 with GCC 4.8 as follows: - $ yum install libasan # http://bugzilla.redhat.com/991003 $ rm -f src/ptx.o $ make check AM_CFLAGS='-fsanitize=address' SUBDIRS=. VERBOSE=yes $ failure identified in tests/test-suite.log - To see this particular failure triggered with multiple files: - $ src/ptx <(echo a) <(echo a) 2>&1 | asan_symbolize.py -d - ================================================================= ==32178==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x60200000e74f at pc 0x435442 bp 0x7fffe8a1b290 sp 0x7fffe8a1b288 @@ -1115,9 +3851,7 @@ Poisoned by user: f7 ASan internal: fe ==32178==ABORTING - The initial report and high level analysis were from Jim Meyering... - "The underlying problem is that swallow_file_in_memory() is setting the contents of the global text_buffer for the first file, then updating it (clobbering old value) for the second file. @@ -1125,7 +3859,6 @@ and later, one of them (keyafter) is presumed to point into the new "text_buffer", which it does not. The subsequent SKIP_WHITE_BACKWARDS use backs up "cursor" and goes out of bounds." - * src/ptx.c (text_buffers): Maintain references for the limits of each buffer corresponding to each file, rather than just the last processed. (struct OCCURS): Add a member to map back to the corresponding file. @@ -1167,11 +3900,9 @@ tests: make ls tests independent of COLORTERM env Since the recent commit v8.22-68-g08783f1, ls coloring is now dependent on the COLORTERM environment variable. - * tests/envvar-check: Unset COLORTERM from test environment. * tests/ls/color-dtype-dir.sh: Ensure coloring is used. * tests/misc/ls-misc.pl: Likewise. - Prompted by the continuous integration build failure at: http://hydra.nixos.org/build/10397646 @@ -1187,7 +3918,6 @@ mach-color was replaced by mach-gnu-color in Hurd in 2012. mach-color is left for compatibility and corresponding definitions for mach-color are still found in ncurses. - * src/dircolors.hin: Add hurd and mach-gnu-color. 2014-04-17 Guilherme de Almeida Suckevicz @@ -1196,7 +3926,6 @@ --colors controls whether to output colors depending on whether we're connected to a terminal or not, while this change gives control over which terminals we output colors to. - * NEWS: Mention the change in behavior. * src/ls.c (known_term_type): A new function to search the static list from dircolors.h @@ -1353,12 +4082,9 @@ Bug introduced in 1999-04-04 commit, SH-UTILS-1_16f-269-gd815c15. Spotted by coverity (MISSING_BREAK). -2014-03-26 Bernhard Voelker - basename: mention that the -s option implies -a in usage * src/basename.c (usage): Mention that -s implies -a. (main): Add "fall through" comment to case 's'. - Spotted by coverity: MISSING_BREAK. 2014-03-25 Paul Eggert @@ -1382,11 +4108,9 @@ the input buffer. This is significant when output is being further processed which could happen if split is writing to precreated fifos, or through --filter. - If input is arriving quickly from a pipe then this will already be buffered before we read it, so fast arriving input shouldn't be a performance issue. - * src/split.c (lines_split, lines_bytes_split, bytes_split, lines_chunk_split, bytes_chunk_extract): s/full_read/safe_read/. * THANKS.in: Mention the reporter. @@ -1396,13 +4120,10 @@ doc: clarify the operation of uniq -uD The description of -u was inaccurate when combined with -D: - $ printf '%s\n' '1 a' '2 a' | uniq -uD -f1 1 a - * doc/coreutils.texi (uniq invocation): Clarify that it's the last repeated line that is suppressed from the output. - Fixes http://bugs.gnu.org/17022 2014-03-19 Edward Welbourne @@ -1427,7 +4148,6 @@ file name in the wrong directory, giving an erroneous ENOENT diagnostic. This issue was introduced with commit v5.92-653-gc1994c1 which changed fts to not change directory on traversal. - * src/chmod.c (mode_changed): Use fts->fts_cwd_fd with fstatat rather than stat. All callers changed. * tests/chmod/c-option.sh: Add a test case. @@ -1451,7 +4171,6 @@ All uses changed. (get_birthtime): New function, for porting to Solaris 11. (print_stat): Use it. - * configure.ac (getattrat, LIB_NVPAIR): New checks. * src/local.mk (src_stat_LDADD): Add $(LIB_NVPAIR). @@ -1476,7 +4195,6 @@ * gl/lib/fadvise.c: Use a pragma to turn off this warning option: -Wsuggest-attribute=const. Without this change, building with --enable-gcc-warnings would evoke this error: - lib/fadvise.c:25:1: error: function might be candidate for\ attribute 'const' [-Werror=suggest-attribute=const] @@ -1499,7 +4217,6 @@ to complete the look-up inside the chroot. This can happen for example with a 32 bit chroot on a 64 bit system, where the 32 bit NSS plugins within the chroot fail to load. - * src/chroot.c (parse_additional_groups): A new function refactored from set_addition_groups(), to just do the parsing. The actual setgroups() call is separated out for calling from the chroot later. @@ -1531,11 +4248,9 @@ the framework_failure_ even if there was an error writing the file. shells which do evaluate the failure are ksh 93u+ and bash 4.2, while shells wich don't include bash 4.3, solaris, freebsd, dash. - Furthermore this construct is problematic on Solaris 10 sh, which will try to optimize away a `:' command in a loop after the first iteration, even if it is redirected. - * tests/cp/link-deref.sh: Remove the leading colon on redirections. * tests/cp/reflink-perm.sh: Likewise. * tests/id/zero.sh: Likewise. @@ -1555,8 +4270,6 @@ + cfg.mk (sc_prohibit_colon_redirection): A new syntax check to avoid further instances of this creeping in. -2014-03-05 Pádraig Brady - tests: fix false failure in nohup.sh in non tty builds * tests/misc/nohup.sh: When running tests without a controlling tty, an exec failure is triggered in a subshell, which causes POSIX @@ -1582,7 +4295,6 @@ * gnulib: Update to incorporate the fix. This is the only change in this gnulib update. * tests/misc/date.pl: Add a test for this case. - Fixes http://bugs.gnu.org/16872 2014-02-27 Paul Eggert @@ -1609,11 +4321,8 @@ * src/shuf.c (main): s/No/no/, introduced by commit v8.22-25-g9f60f37. * NEWS: Also adjust the NEWS for that recent commit to make it clear this was new bug rather than a regression. - Prompted by the syntax-check rule sc_error_message_uppercase -2014-02-26 Bernhard Voelker - doc: add dd example for failing disks * doc/coreutils.texi (dd invocation): Add an example for how to call dd to save data from a failing disk. Mention GNU 'ddrescue' as one @@ -1651,7 +4360,6 @@ If we can't output more data, we should immediately diagnose the issue and exit rather than consuming all of input (in some cases). - * src/tail.c (xwrite_stdout): Also diagnose the case where only some data is written. Also clearerr() to avoid the redundant less specific error from atexit (close_stdout); @@ -1716,13 +4424,10 @@ build: remove no longer used spawn-pipe files from POTFILES.in This should have been part of the previous commit v8.22-14-gf18999b - * po/POTFILES.in: Remove gnulib files no longer used. Prompted by the continuous integration build failure at: http://hydra.nixos.org/build/8288209/ -2014-01-17 Pádraig Brady - build: avoid unneeded spawn-pipe gnulib module * bootstrap.conf: Reference the used pipe-posix module rather than the uneeded and larger spawn-pipe module, @@ -1807,7 +4512,6 @@ Prompted by a test framework failure of tests/mkdir/p-acl.sh on armv7l: The previous test for a working setfacl was not sufficient in some circumstances. - * init.cfg (require_setfacl_): Call setfacl twice with conflictive ACL specs, and use ACL specs which can't be mapped into regular file permission bits. Document the reasons. @@ -1818,11 +4522,9 @@ On emulated aarch64 systems like in the qemu-based OpenBuildService of openSUSE, cp fails to copy /proc/cpuinfo because the inode number changes between the initial stat() call and copying the file: - $ cp /proc/cpuinfo exp cp: skipping file '/proc/cpuinfo', as it was \ replaced while being copied - * tests/cp/proc-zero-len.sh: When cp fails, check on the above error message to skip the test. @@ -1839,17 +4541,12 @@ perl -pi -e 's/2\d\d\d-//' tests/sample-test to make that one script use the single most recent year number. -2014-01-02 Bernhard Voelker - maint: prevent update-copyright from updating files from gnulib The files 'bootstrap' and 'tests/init.sh' are taken from the gnulib submodule. Therefore, 'make update-copyright' there should already have updated the copyright year in these 2 files. - * .x-update-copyright: Add entries for the above mentioned files. -2014-01-02 Bernhard Voelker - build: update gnulib submodule, bootstrap and tests/init.sh to latest * gnulib: Update to latest. * bootstrap: Update from gnulib. @@ -1865,18 +4562,13 @@ version 8.22 * NEWS: Record release date. -2013-12-13 Pádraig Brady - stat,tail: improve support for hostfs and smackfs hostfs is provided by the Linux UML subsystem. smackfs is provided by the Linux Smack security module. - * src/stat.c (human_fstype): Add new file system ID definitions. * NEWS: Mention the improvement, and adjust for the fact that SNFS is a remote file system. -2013-12-13 Pádraig Brady - tests: avoid unlikely deadlock in dd/no-allocate on some shells * test/dd/no-allocate.sh: Use 'wait' to ensure we don't have multiple writers to the fifo, which was seen to trigger @@ -1940,8 +4632,6 @@ * gnulib: Update to incorporate a build fix on platforms with only some of md5 and sha* implemented by libcrypto. -2013-12-09 Pádraig Brady - tests: fix false failure due to gdb inline function handling Inline functions are awkward to breakpoint as mentioned at: https://sourceware.org/bugzilla/show_bug.cgi?id=10738 @@ -1951,15 +4641,12 @@ the test failed erroneously due to the breakpoint being successfully set on an "out of line" function, but an inline function was actually being called. - * tests/tail-2/inotify-race.sh: Switch to a line based breakpoint, rather than a symbol base one, which avoids issues with breakpoints on inline functions. Also skip_ on the initial breakpoint check in case the breakpoint is not traversed which would be the case on remote file systems for example. -2013-12-09 Pádraig Brady - tail: use consistent diagnostics with and without inotify * src/tail.c: With inotify, when a file is initially absent, we fstat(-1) for that file spec, thus recording an errnum of EBADF, @@ -2001,10 +4688,8 @@ shuf: invalid input range ‘-e’ and therefore eclipsed the expected one: shuf: cannot combine -e and -i options - While at it, reindent a line with more than 80 characters, present since the previous commit to silence sc_long_lines. - * tests/misc/shuf.sh: Pass a valid range to the -i option. 2013-12-06 Paul Eggert @@ -2024,17 +4709,13 @@ Since v8.21-172-g33660b4, df not only treats symbolic link arguments differently, as stated there, but now generally processes special file arguments in a non-canonicalized form correctly: - $ cd /dev && df-old sdb Filesystem 1K-blocks Used Available Use% Mounted on devtmpfs 1014572 48 1014524 1% /dev - $ cd /dev && df-new sdb Filesystem 1K-blocks Used Available Use% Mounted on /dev/sdb 10190136 6039532 3609932 63% /home - Document df's new behavior. - * doc/coreutils.texi (df invocation): In the paragraph describing df's behavior regarding special file arguments, relax the condition for such special files from "... is an absolute name of ..." to @@ -2046,7 +4727,6 @@ tests: fix false failure with disabled SELinux support This could trigger on SELinux systems where we build --qithout-selinux or where the SELinux development libraries are not installed. - * init.cfg (require_selinux_enforcing_): Call require_selinux_() to determine if the current build supports SELinux. This avoids a false failure in tests/mkdir/selinux.sh where only mkdir would @@ -2054,8 +4734,6 @@ (require_selinux_): Refactor a little to distinguish whether it's the build or the (file) system that doesn't support SELinux. -2013-12-05 Pádraig Brady - selinux: fix --context=CTX for cp and diagnose defaultcon() errors * src/selinux.h (ignorable_ctx_err): A new function used to determine if a warning should be given after a call @@ -2074,38 +4752,30 @@ crypto hash routines particular to various systems. For example, testing sha1sum with openssl-1.0.0j on an i3-2310M, gives a performance boost of about 40%: - $ time sha1sum.old --tag ~/test.iso SHA1 (/home/padraig/test.iso) = 3c27f7ed01965fd2b89e22128fd62dc51a3bef30 real 0m4.692s user 0m4.499s sys 0m0.162s - $ time sha1sum.new --tag ~/test.iso SHA1 (/home/padraig/test.iso) = 3c27f7ed01965fd2b89e22128fd62dc51a3bef30 real 0m2.685s user 0m2.512s sys 0m0.170s - * configure.ac: By default, enable use of libcrypto if available. * src/local.mk: Link with libcrypto. * NEWS: Mention the md5sum and sha*sum improvements. -2013-12-04 Pádraig Brady - df: handle bind mounts when processing device nodes * src/df.c (get_disk): Use the same heuristic used in get_point() to select the shortest file system mount point, in an attempt to show the base mounted file system. * NEWS: Mention the bug fix. -2013-12-04 Pádraig Brady - df: dereference symlinks to disk device nodes This is so the matching for the device is done on the canonical name of the disk node, rather than on the path of the symlink. In any case the user will generally want to use the symlink target. - * src/df.c (get_disk): Canonicalize the passed file, before matching against the list of mounted file system devices. Note we pass the original symlink name to the "file" output field, @@ -2115,20 +4785,14 @@ * NEWS: Mention the fix. Reported by Ondrej Oprala -2013-12-04 Pádraig Brady - build: update gnulib submodule to latest Note tests/init.sh and bootstrap are still in sync with gnulib. - * gnulib: Sync two configure check fixes. - Avoid generating core dumps from regex configure check - Fix compile error in getcwd configure check -2013-12-04 Pádraig Brady - build: update gnulib submodule to latest Note tests/init.sh and bootstrap are still in sync with gnulib. - * gnulib: Sync many fixes/changes, including the base64 encoding speedup mentioned in commit v8.21-145-g9120845 Also included is support for enabling use of libcrypto hash routines @@ -2139,7 +4803,6 @@ maint: avoid '%s' quoting notation in diagnostic messages Add a new rule to ensure the use of quote() instead of '%s' or `%s' in format strings of diagnostics messages. - * cfg.mk (sc_prohibit_quotes_notation): Add rule. * TODO: Remove the entry regarding the '%s' notation. * src/mkfifo.c (main): Remove the offending and in this case even @@ -2172,28 +4835,20 @@ * tests/rm/r-root.sh: Add a non-root test. * tests/local.mk (all_tests): Mention the test. -2013-11-29 Bernhard Voelker - maint: remove various FIXME comments * src/extent-scan.c (extent_need_sync): Remove the FIXME comment about removing the work around. As discussed in [1], the needed FIEMAP fix never made it into the Linux kernel. - * src/realpath.c (longopts): Remove the FIXME comment about deprecating the --strip option as it's a valid alias for --no-symlinks option. Also discussed in [1]. - [1] http://lists.gnu.org/archive/html/coreutils/2013-11/msg00103.html -2013-11-29 Bernhard Voelker - df: remove long-obsolescent --megabytes option This option has been undocumented for 12 years [1], and warned about for a year [2]. - [1] commit FILEUTILS-4_1_4-23-gd177203 [2] commit v8.17-43-g453ce92 - * src/df.c (MEGABYTES_OPTION): Remove. (long_options): Remove "megabytes" element. (main): In the option parsing loop, remove the MEGABYTES_OPTION case. @@ -2220,7 +4875,6 @@ gnulib to provide the necessary stubs for use by this module, but it's more efficient to just stub out the module completely, when not using selinux. - * src/selinux.h: Define stubs for the two module functions, when SELinux is not available. * src/selinux.c: Exclude all logic in preference for the stubs @@ -2228,8 +4882,6 @@ don't use our conflicting static version of mode_to_security_class(). m4/jm-macros.m4: Check for the system mode_to_security_class(). -2013-11-27 Pádraig Brady - build: avoid build failure on non selinux systems * src/selinux.c: This module introduced in commit v8.21-159-gd8e27ab doesn't need to include . That header file @@ -2238,14 +4890,11 @@ Prompted by the continuous integration build failure at: http://hydra.nixos.org/build/6920020 -2013-11-27 Pádraig Brady - selinux: adjust utils to run restorecon with -Z cp, mv, install, mkdir, mkfifo, mknod are adjusted so that: -Z no longer accepts an argument. -Z or --context without an argument do not warn without SELinux. --context with an argument will warn without SELinux. - * src/local.mk: Reference the new selinux module where required. * src/system.h: Make the argument to --context optional. * src/mkdir.c: Likewise. Also handle the SMACK case for --context. @@ -2332,19 +4981,16 @@ I timed the following python script which indicated that each ext4 dir sync was taking about 2ms and 12ms, on an SSD and traditional disk respectively. - import os d=os.open(".", os.O_DIRECTORY|os.O_RDONLY) for i in range(1000): os.fdatasync(d) - So syncing for each character for each file can result in significant delays. Often this overhead is redundant, as only the data is sensitive and not the file name. Even if the names are sensitive, your file system may employ synchronous metadata updates, which also makes explicit syncing redundant. - * tests/misc/shred-remove.sh: Ensure all the new parameters actually unlink the file. * doc/coreutils.texi (shred invocation): Describe the new @@ -2356,14 +5002,11 @@ * NEWS: Mention the new feature. * THANKS.in: Add reporter Joseph D. Wagner -2013-11-27 Pádraig Brady - tail: improve inotify handling of symlinks Previous behavior failed to read contents of a (re)appearing file, when symlinked by tail's watched file. Also we now diagnose other edge cases when running in inotify mode, where an initially missing or regular file changes to a symlink. - * src/tail.c (main): If any arg is a symlink, use polling mode. (recheck): Diagnose the edge case where a symlink appears during inotify processing. @@ -2372,8 +5015,6 @@ * NEWS: Mention the fix. Reported by: Ondrej Oprala -2013-11-27 Pádraig Brady - df: add --output=file to directly output specified arguments * src/df.c (usage): Document the new 'file' --output field. (get_dev): Add a new parameter to pass the specified @@ -2427,7 +5068,6 @@ tests: enhance rm test regarding "." and ".." Recent commit 2da7009d changed the error diagnostic of rm(1) trying to remove "." or "..". Enhance the corresponding test. - * tests/rm/r-4.sh: Ensure rm(1) outputs the expected error diagnostic. 2013-11-21 Bernhard Voelker @@ -2435,18 +5075,14 @@ maint: avoid perl warning in sc_check-AUTHORS With newer perl, "make syntax-check" issues many warnings like: -i used with no filenames on the command line, reading from STDIN. - * cfg.mk (sc_check-AUTHORS): Remove the -i flag in the perl invocation as it is reading from a pipe. -2013-11-21 Bernhard Voelker - doc: enhance diagnostic when rm skips "." or ".." arguments The error diagnostic "rm: cannot remove directory: '.'" does not give the user a hint for the reason. Issue a clearer error message. - * src/remove.c (rm_fts): Enhance the error diagnostic in the above case to emphasize that skipping is done deliberately. In the corresponding comment, mention that POSIX mandates this @@ -2458,10 +5094,8 @@ tests: fix false rm -I test failure when run as root Fix a recent regression introduced in commit v8.21-127-g5ee7d8f - Also related to this is the recent query about root run `rm -I` ignoring the mode bits of a file: https://bugzilla.redhat.com/1013171 - * tests/rm/interactive-once.sh: Avoid the messages and corresponding file presence checks with write protected files when running as root. @@ -2470,7 +5104,6 @@ stty: add support for mark/space parity This adds support for using a constant or "stick" parity bit. - * src/stty.c (usage): Mention the new flag. * tests/misc/stty.sh: Adjust for the new flag. * NEWS: Mention the improvement. @@ -2484,19 +5117,16 @@ than fputc() to output '\n'. Time to process a 100MiB file was measured to decrease from 0.417s to 0.383s, i.e. an 8% improvement. - Related to these changes, is a processing improvement in gnulib, which increases throughput by 60% when processing full buffers, which improves processing of a 100MiB file with standard wrapped output, down to 0.256s. http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=commit;h=43fd1e7b - Also increase the encoding buffer size from 3 to 30KiB. This was seen to give a further 8% improvement, taking processing time down to 0.235s in the wrapped output case. The decoding size buffer is not adjusted, due to the noted caveat with --ignore-garbage. - * src/base64.c (BLOCKSIZE): Split into ENC_ and DEC_ variants, with the former increased from 3KiB to 30KiB. (wrap_write): Use the simpler fputc() rather than fputs() @@ -2523,8 +5153,6 @@ I/O block size from 12KiB to 60KiB (also a multiple of 3 and 4096). * NEWS: Adjust accordingly. -2013-11-08 Pádraig Brady - shred: fix direct I/O failures for last write to file Since direct I/O is now enabled with commit v8.21-139-gebaf961 we must handle the case where we write an odd size at the @@ -2535,7 +5163,6 @@ Theoretically this could have also been an issue after that on systems which didn't have alignment constraints, but did have size constraints for direct I/O. - * src/shred.c (dopass): On the first pass for a file, always retry a write that fails with EINVAL, so we handle direct I/O failure at either the start or end of the file. Adjust the comment @@ -2569,7 +5196,6 @@ * tests/cp/link-deref.sh: Add a new test. * tests/local.mk (all_tests): Reference the above new test. * NEWS (Changes in behavior): Mention the change. - This fixes http://bugs.gnu.org/15173 2013-11-06 Pádraig Brady @@ -2587,7 +5213,6 @@ We want to use direct I/O when possible to avoid impacting the page cache at least, as we know we don't want to cache the data we're writing. - * src/shred.c (dopass): Allocate the buffer on the heap, while using a more general calculation to allow to have the output size independent from the fillpattern() size @@ -2621,14 +5246,12 @@ Although the above man pages depend on src/md5sum.c as a shared source, the build of the man pages directly requires their own executables to exist. - * man/local.mk (man/sha1sum.1): Change the dependency from 'src/md5sum' to 'src/sha1sum'. (man/sha224sum.1): s/md5sum/sha224sum/ (man/sha256sum.1): s/md5sum/sha256sum/ (man/sha384sum.1): s/md5sum/sha384sum/ (man/sha512sum.1): s/md5sum/sha512sum/ - Reported by Pádraig Brady in http://lists.gnu.org/archive/html/coreutils/2013-11/msg00006.html @@ -2681,13 +5304,10 @@ suppress only some subset of possible errors. The most useful separation here is with usage/internal errors, and errors due to file creation etc. (i.e. I/O errors). - * src/mktemp.c (main): Match the --help and info docs and only suppress the file/dir creation error messages. * tests/misc/mktemp.pl: Adjust accordingly. -2013-10-06 Pádraig Brady - mktemp: synchronize the -p option with docs * src/mktemp.c (usage): Synchronize the -p option description with the logic and info docs. I.E. that -p is just an alias of --tmpdir. @@ -2706,7 +5326,6 @@ rm: with -I, prompt before deleting a write protected file This regression was introduced in commit v6.7-71-g0928c24 - * src/rm.c (main): Make the -I option behave like --interactive=once. * tests/rm/interactive-once.sh: Add cases for single and multiple files. * NEWS: Mention the bug fix. @@ -2743,21 +5362,15 @@ * NEWS: Mention the new feature. Addresses http://bugs.gnu.org/15421 -2013-09-22 Pádraig Brady - build: update gnulib submodule to latest; also bootstrap to latest Notes tests/init.sh is still in sync with gnulib. - * bootstrap: Update to latest. * gnulib: Sync many fixes/changes, including: a fix for http://bugs.gnu.org/15066 and preparation for http://bugs.gnu.org/15421 -2013-09-22 Pádraig Brady - tests: avoid a failure when there isn't a name for all user IDs * tests/misc/id-zero.sh: Don't check exit status when in -n mode. - Prompted by the continuous integration build failure at: http://hydra.nixos.org/build/6196762 @@ -2803,7 +5416,6 @@ done outside of help2man. Therefore, this commit partly reverts the recent separation of help2man into 'help2man.in' and 'help2man.diff', and instead uses the original help2man script. - * man/help2man.in: Rename to ... * man/help2man: ... this file. * man/help2man.diff: Remove. @@ -2827,34 +5439,26 @@ 'man/help2man.diff', exempt 'man/help2man'. * man/dummy-man: Recognize the option --info-page=... as no-op. -2013-09-12 Bernhard Voelker - maint: use help2man configured with --disable-nls Prompted by the continuous integration build failure at: http://hydra.nixos.org/build/6038769 - The previously committed 'help2man' requires a Perl module which does not seem to be installed everywhere - and which is not needed for our purposes: - Can't locate Locale/gettext.pm in @INC BEGIN failed--compilation aborted at ./man/help2man line 28. - This module was pulled in automatically by the default configure call. Use the NLS-disabled version instead. - * man/help2man.in: Use help2man configured with the --disable-nls option to avoid the dependency to the above Perl module. * man/help2man.diff: Adapt the line numbers of the hunks in the coreutils-specific patch for help2man to apply without fuzz. - Reported by Pádraig Brady. 2013-09-10 Pádraig Brady build: fix corrupted patch causing bootstrap failures The patch was corrupted in commit v8.21-50-g7b65f8e - * gl/modules/tempname.diff: Fix the offsets so that the patch applies cleanly. Note that this was only apparent with patch < 2.6. With patch >= 2.6, patch will not indicate an error applying @@ -2871,12 +5475,10 @@ Instead of diverging further from the upstream GNU help2man project (http://www.gnu.org/software/help2man/), hold a copy of the original script and keep track of our changes in a separate patch file. - The man pages created with the new version show the following, non-invasive differences: a) command options in the EXAMPLE sections are no longer in bold format, b) file names are underlined now consistently. - * man/help2man: Rename to ... * man/help2man.in: ... this file, and update content from the upstream GNU help2man project. @@ -2906,7 +5508,6 @@ then exit with the "less serious" exit code, rather than the "serious" exit code reserved for command line arguments. This issue was introduced in commit v5.2.1-1908-gb58dea5 - * src/ls.c (print_dir): Ensure that the command_line_arg param is false for directories being recursed into. * NEWS: Mention the bug fix. @@ -2956,7 +5557,6 @@ doc: more semicolons instead of periods in option descriptions Also slightly rephrase some descriptions for extra clarity, and add more consistent indentation. - * src/df.c (usage): Semicolon, no final period. * src/du.c (usage): Likewise, plus indentation and clarifying words. * src/ls.c (usage): Semicolon, rephrasings, added parentheses for @@ -2975,7 +5575,6 @@ maint: update copyright year number ranges of numfmt sources Run "make update-copyright". - * src/numfmt.c: Update copyright year number range. This file has obviously been added to coreutils after and without the annual update. * tests/misc/numfmt.pl: Likewise. @@ -2985,7 +5584,6 @@ doc: use semicolon instead of period in option descriptions Also do not end option descriptions with a period, properly indent continuation lines, and make some tiny clarifications. - * src/du.c (usage): Lowercase after semicolon. * src/ls.c (usage): Semicolons instead of periods, small rephrasing and two hyphens for clarity, proper indentation. @@ -3012,11 +5610,9 @@ tests: fix another test failure in test/du/inodes.sh Prompted by the continuous integration build failure at: http://hydra.nixos.org/build/5584121 - du(1) uses the first file object of the two test files linked to the same inode, 'd/f' and 'd/h', whatever the system returns first. Use 'd/f' in both the expected and the actual output. - * test/du/inodes.sh: Change the expected output as described above when returning the --all directory entries (without -l). Also replace the name of the hardlink 'd/h' by 'd/f' in the actual output. @@ -3045,12 +5641,9 @@ (process_regexp): Avoid a redundant assignment of the "line" pointer. (process_line_count): Likewise. Also reduce the "line" pointer scope. -2013-07-28 Pádraig Brady - tests: fix intermittent failure in test/du/inodes.sh Prompted by the continuous integration build failure at: http://hydra.nixos.org/build/5582213 - * test/du/inodes.sh: Due to undefined order in returned directory entries, the expected output might not match, so sort both expected and actual output when returning --all directory entries. @@ -3063,7 +5656,6 @@ amount of files. The GNU find utility has the printf format "%h" which prints the number of entries in a directory, but this is non-cumulative and doesn't handle hard links. - * src/du.c (struct duinfo): Add new member for counting inodes. (duinfo_init): Initialize inodes member with Zero. (duinfo_set): Set inodes counter to 1. @@ -3103,14 +5695,11 @@ * src/du.c (fill_mount_table): Use free_mount_entry() instead of freeing struct members manually. -2013-07-22 Bernhard Voelker - maint: make some shell and perl scripts executable in 'tests/' Some newer test scripts - partially ones from me - are not executable. It does not seem to be a problem, but for consistency and to avoid future problems on unusual platforms or shells change the permissions by adding the executable bit. - * cfg.mk (sc_tests_executable): Add new syntax-check rule to ensure that all test scripts are executable. * tests/df/df-output.sh: Change file mode from 644 to 755. @@ -3129,12 +5718,9 @@ where the arguments were not provided by hand, but instead were the result of various shell expansions. A simple, if somewhat contrived, example (assuming rm is aliased to rm -I) could be: - rm * .o - where the prompt "Remove 120 arguments?" is more likely to make the user catch the problem. - * src/rm.c (main): Include correctly pluralized n_files in the output message. Also remove the now redudant "all". * tests/rm/interactive-always.sh: Adjust to the new prompt. @@ -3161,8 +5747,6 @@ circuit code could not be reached due to logic error. Spotted by coverity. -2013-07-12 Pádraig Brady - maint: avoid a valgrind memory leak warning from pinky Similarly to commit v8.21-84-g8d2da3f in src/uptime.c avoid a "definitely lost" error from valgrind. Note this @@ -3170,7 +5754,6 @@ in which case certain paths aren't eliminated casuing valgrind to trigger the message. Note also that coverity flags this "resource leak" too. - * src/pinky.c (short_pinky): free utmp_buf for developer builds. 2013-07-11 Anton Ovchinnikov @@ -3179,7 +5762,6 @@ Avoid Valgrind reports of "definitely lost" items and while at it, free all discarded mount entries to minimize the amount of memory used. - * src/df.c (filter_mount_list): Use the newly exported free_mount_entry() from gnulib to free all mount entries as they're discarded. @@ -3188,12 +5770,9 @@ build: update gnulib submodule to latest -2013-07-11 Pádraig Brady - build: fix a build warning on 32 bit systems in shuf.c Prompted by the continuous integration build failure at: http://hydra.nixos.org/build/5508873 - * src/shuf.c (write_random_numbers): Convert to an int type that matches the prinft format spec. @@ -3271,7 +5850,6 @@ Consolidate all smack routines and checks in a module. We replace and wrap the most commonly used smack routines, which allows removing ifdefs throughout the code. - * gl/lib/smack.h: A new header containing the implementation of the wrapped and replacement routines. Note the is_smack_enabled() routine should be optimized out at compile time when compiled @@ -3286,8 +5864,6 @@ * src/mkfifo.c: Likewise. * src/mknod.c: Likewise. -2013-07-02 Pádraig Brady - id: don't show SMACK errors unless -Z is specified * src/id.c (main): Be consistent with the SELinux case, and only show errors in getting the security context @@ -3298,7 +5874,6 @@ mkdir,mkfifo,mknod: with -Z, create SMACK security context Enable creation of SMACK security context with -Z command-line switch if SMACK is enabled. - * mkdir.c (main): Set process security context to given SMACK label. * mkfifo.c (main): Likewise. * mknod.c (main): Likewise. @@ -3320,7 +5895,6 @@ if SMACK is enabled. Showing SMACK context of a file does not strictly require SMACK to be enabled but this required to make choice whether to show SELinux or SMACK security context. - * src/ls.c (getfilecon_cache): Retrieve SMACK context if available. (gobble_file): Handle SMACK context similarly to SELinux context. * src/local.mk: Link lsl with libsmack. @@ -3333,15 +5907,12 @@ This is consistent with the documented interface and avoids any ambiguity in a user thinking that stdbuf without options might reset to a "standard" buffering setup. - * src/stdbuf.c (set_libstdbuf_options): Indicate with the return value whether any env variables were actually set. (main): Fail unless some env variables were set. * tests/misc/stdbuf.sh: Ensure this constraint is enforced. * NEWS: Mention the small change in behavior. -2013-06-22 Pádraig Brady - doc: clarify that truncate --size represents bytes by default * src/truncate.c (usage): Mention that --size is in bytes which is by far the most common usage. @@ -3355,7 +5926,6 @@ There was slight change to libsmack such that positive values are reserved for returning length of the label for smack_new_label_from_* functions. - * m4/jm-macros.m4: Set HAVE_SMACK when both smack_new_label_from_self() and recently added smack_new_label_from_path() are present. The latter's presence indicates the newer API of the former. @@ -3392,9 +5962,7 @@ For a file of size 1234 bytes, commit ca9aa759 had the side effect of changing 'stat -c "%'s" file' from outputting "?s" to the nicer "1,234", depending on locale. This is worth mentioning in the NEWS. - Resolves part of http://bugs.gnu.org/14556. - * NEWS: Mention 8.7 improvement in stat. * cfg.mk (old_NEWS_hash): Adjust accordingly. @@ -3402,7 +5970,6 @@ build: update gnulib submodule; also bootstrap to latest Notes tests/init.sh is still in sync with gnulib. - * bootstrap: Update to latest. * gnulib: Update avoiding gnulib-test failures. @@ -3411,7 +5978,6 @@ tests: avoid a race in tail --retry testing Prompted by the continuous integration build failure at: http://hydra.nixos.org/build/5221053 - * tests/tail-2/retry.sh: Ensure the 'out' file is truncated, as it's used to arbitrate the run order of commands. Relying on the truncation in the background tail command @@ -3553,7 +6119,6 @@ id: with -Z, show SMACK security context Adds an optional dependency on libsmack. - * m4/jm-macros.m4: Look for the smack library/header. * src/id.c (main): Output the smack context if available. * src/local.mk: Link with libsmack if available. @@ -3564,11 +6129,8 @@ cut: improve performance, especially with --output-delimiter Use a sentinel value that's checked implicitly, rather than a bit array, to determine if an item should be output. - Benchmark results for this change are: - $ yes abcdfeg | head -n1MB > big-file - $ for c in orig sentinel; do src/cut-$c 2>/dev/null echo -ne "\n== $c ==" @@ -3578,12 +6140,10 @@ real 0m0.049s user 0m0.044s sys 0m0.005s - == sentinel == real 0m0.035s user 0m0.032s sys 0m0.002s - ## Again with --output-delimiter ## $ for c in orig sentinel; do src/cut-$c 2>/dev/null @@ -3594,12 +6154,10 @@ real 0m0.106s user 0m0.103s sys 0m0.002s - == sentinel == real 0m0.055s user 0m0.052s sys 0m0.003s - eol_range_start: Removed. 'n-' is no longer treated specially, and instead SIZE_MAX is set for the 'hi' limit, and tested implicitly. complement_rp: Used to complement 'rp' when '--complement' is specified. @@ -3613,7 +6171,6 @@ cut: fix handling of overlapping ranges This issue was introduced in commit v8.21-43-g3e466ad - * src/cut.c (set_fields): Process all range pairs when merging. * tests/misc/cut-huge-range.sh: Add a test for this edge case. Also fix an issue where we could miss reported errors due @@ -3631,34 +6188,27 @@ Ensure appropriate functions are inlined. This was seen to be required with gcc 4.6.0 with -O2 on x86_64 at least. It was reported that gcc 4.8.0 did inline these functions though. - Also reinstate the bit vector for the common case, to further improve performance. - Benchmark results for both aspects of this change are: - $ yes abcdfeg | head -n1MB > big-file $ for c in orig inline inline-array; do src/cut-$c 2>/dev/null echo -ne "\n== $c ==" time src/cut-$c -b1,3 big-file > /dev/null done - == orig == real 0m0.088s user 0m0.081s sys 0m0.007s - == inline == real 0m0.070s user 0m0.060s sys 0m0.009s - == inline-array == real 0m0.049s user 0m0.044s sys 0m0.005s - * src/cut.c (set_fields): Set up the printable_field bit vector for performance, but only when it's appropriate. I.E. not when either --output-delimeter or huge ranges are specified. @@ -3673,29 +6223,23 @@ determine if an item is to be output or not, so simplify it by moving some logic outside. Benchmark results for this change are: - $ yes abcdfeg | head -n1MB > big-file $ for c in orig split; do src/cut-$c 2>/dev/null echo -ne "\n== $c ==" time src/cut-$c -b1,3 big-file > /dev/null done - == orig == real 0m0.111s user 0m0.108s sys 0m0.002s - == split == real 0m0.088s user 0m0.081s sys 0m0.007s - * src/cut.c (print_kth): Refactor a branch to outside the function. Related to http://bugs.gnu.org/13127 -2013-04-29 Cojocaru Alexandru - cut: make memory allocation independent of range width The current implementation of cut, uses a bit array, an array of `struct range_pair's, and (when --output-delimiter @@ -3706,29 +6250,23 @@ memory for `printable_field'. 2. When --output-delimiter is specified, it will allocate 31 buckets. Even if only a few ranges are specified. - Note CPU overhead is increased to determine if an item is to be printed, as shown by: - $ yes abcdfeg | head -n1MB > big-file $ for c in with-bitarray without-bitarray; do src/cut-$c 2>/dev/null echo -ne "\n== $c ==" time src/cut-$c -b1,3 big-file > /dev/null done - == with-bitarray == real 0m0.084s user 0m0.078s sys 0m0.006s - == without-bitarray == real 0m0.111s user 0m0.108s sys 0m0.002s - Subsequent patches will reduce this overhead. - * src/cut.c (set_fields): Set and initialize RP instead of printable_field. * src/cut.c (is_range_start_index): Use CURRENT_RP rather than a hash. @@ -3741,7 +6279,6 @@ stat,tail: improve support for snfs The StorNext distributed file system was previously known as CVFS. - * src/stat.c (human_fstype): Add new file system ID definition. * NEWS: Mention the improvement. Fixes http://bugs.gnu.org/14251 @@ -3781,7 +6318,6 @@ This can happen, for example, when the argument file name appears as directory. Tail sets the 'ignore' flag of this file to true, but instead of exiting the program, tail would continue the loop. - * src/tail.c (any_live_files): Change the function to return true if any of the files is still tailable or if tail should continue to try to check again. @@ -3792,17 +6328,13 @@ then reset reopen_inaccessible_files to false. * tests/tail-2/retry.sh: Add test case. -2013-04-20 Bernhard Voelker - tail: let -f --retry wait for inaccessible files The --retry option is indeed useful for both following modes by name and by file descriptor. The difference is that in the latter case, it is effective only during the initial open. - As a regression of the implementation of the inotify support, tail -f --retry would immediately exit if the given file is inaccessible. - * src/tail.c (usage): Change the description of the --retry option: remove the note that this option would mainly be useful when following by name. @@ -3821,7 +6353,6 @@ regarding the --retry option when combined with the following modes name versus descriptor. * NEWS (Bug fixes): Mention the fix. - Reported by Noel Morrison in: http://lists.gnu.org/archive/html/coreutils/2013-04/msg00003.html @@ -3832,15 +6363,12 @@ are set to a that of the directory rather than the current user. It's not currently understood when this happens, but it was confirmed that ACLs, extended attributes and setgid bits are _not_ involved. - * init.cfg (skip_if_nondefault_group_): A new function to detect and avoid this situation. Document with links to the discussions for hopefully future clarification. * tests/install/install-C-root.sh: Use the new function. * tests/install/install-C-selinux.sh: Likewise. - * tests/install/install-C.sh: Likewise. - -2013-04-14 Pádraig Brady + * tests/install/install-C.sh: Likewise. doc: mention caveats with using install --compare * doc/coreutils.texi (install invocation): Mention that install(1) may @@ -3872,7 +6400,6 @@ With --suppress-matched, the lines that match the pattern will not be printed in the output files. I.E. the first line from the second and subsequent splits will be suppressed. - * src/csplit.c: process_regexp(),process_line_count(): Don't output the matched lines. Since csplit includes "up to but not including" matched lines in each split, the first line (in the next group) is the matched @@ -3893,9 +6420,7 @@ which is not the case in the presence of POSIX default ACLs for e.g. In that case, chmod may print a warning like the following, and exit with failure status: - chmod: man/hostid.1-t: new permissions are r--rw-r--, not r--r--r-- - * man/local.mk: s/-w/a-w/ 2013-04-04 Pádraig Brady @@ -3934,7 +6459,6 @@ Don't dereference an existing symlink being replaced. I.E. generate the symlink relative to the symlink's containing dir, rather than to some arbitrary place it points to. - * src/ln.c (convert_abs_rel): Don't consider the final component of the symlink name when canonicalizing, as we want to avoid dereferencing the final component. @@ -3948,7 +6472,6 @@ Reservoir sampling optimizes selecting K random lines from large or unknown-sized input: http://en.wikipedia.org/wiki/Reservoir_sampling Note this also avoids reading any input when -n0 is specified. - * src/shuf.c (main): Use reservoir-sampling when the number of output lines is known, and the input size is large or unknown. (input_size): A new function to get the input size for regular files. @@ -4150,7 +6673,6 @@ order, and defaulting to "vi" if none of them is set) to decide which editor should be invoked for the user when he has to or want to edit his commit message. - However, our commit-msg hook, when invoking an editor on behalf of the user to allow him to fix a non-policy-complaint commit message, only honoured the EDITOR environment variable. To avoid potential annoying @@ -4158,11 +6680,8 @@ selection of the editor. Luckily, we don't have to duplicate this logic (that would be brittle in the long term), as we can rely on the "git var" command, designed exactly to be used in situations like this. - * scripts/git-hooks ($editor): Adjust definition. -2013-02-18 Stefano Lattarini - maint: don't reset PATH in the commit-msg git hook I have a custom 'editor' script in ~/bin, and a system-provided 'editor' program in /usr/bin (on Debian, this is a link set up the @@ -4173,7 +6692,6 @@ coreutils unconditionally resets its PATH to '/bin:/usr/bin', which causes it to call the "wrong" editor (the one in /usr/bin, not the one in ~/bin) when it makes me update a botched commit message. - * scripts/git-hooks: Don't reset $ENV{PATH} to '/bin:/usr/bin', which was only done to avoid failure when enabling Perl's taint checking. @@ -4201,13 +6719,10 @@ 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. @@ -4242,7 +6757,6 @@ 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 @@ -4260,7 +6774,6 @@ 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. @@ -4272,11 +6785,8 @@ * 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 @@ -4303,7 +6813,6 @@ 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. @@ -4313,7 +6822,6 @@ 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. @@ -4333,7 +6841,6 @@ 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. @@ -4345,7 +6852,6 @@ 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. @@ -4371,7 +6877,6 @@ 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. @@ -4393,7 +6898,6 @@ 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. @@ -4460,13 +6964,10 @@ 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. @@ -4495,17 +6996,13 @@ 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: @@ -4515,7 +7012,6 @@ * 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: @@ -4553,24 +7049,18 @@ 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 @@ -4593,11 +7083,9 @@ 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 @@ -4653,7 +7141,6 @@ 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. @@ -4673,11 +7160,8 @@ 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. @@ -4690,7 +7174,6 @@ 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. @@ -4744,15 +7227,12 @@ 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. @@ -4785,14 +7265,11 @@ 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/ @@ -4812,7 +7289,6 @@ 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. @@ -4820,9 +7296,7 @@ * 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 @@ -4872,10 +7346,8 @@ 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. @@ -4913,7 +7385,6 @@ 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. @@ -4928,12 +7399,10 @@ 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. @@ -5014,7 +7483,6 @@ 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. @@ -5039,12 +7507,10 @@ 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 @@ -5060,13 +7526,11 @@ 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 @@ -5162,15 +7626,12 @@ 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. @@ -5178,12 +7639,9 @@ 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. @@ -5213,19 +7671,14 @@ (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. @@ -5263,24 +7716,19 @@ 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, @@ -5293,7 +7741,6 @@ * 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. @@ -5329,27 +7776,21 @@ 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 @@ -5380,13 +7821,11 @@ 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 @@ -5396,11 +7835,9 @@ * 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, @@ -5419,7 +7856,6 @@ 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. @@ -5442,19 +7878,14 @@ 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. @@ -5474,7 +7905,6 @@ 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. @@ -5484,7 +7914,6 @@ 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 @@ -5506,7 +7935,6 @@ * 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 @@ -5519,22 +7947,16 @@ 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 @@ -5546,16 +7968,13 @@ 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. @@ -5618,7 +8037,6 @@ 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 @@ -5704,7 +8122,6 @@ 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. @@ -5720,7 +8137,6 @@ 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. @@ -5754,8 +8170,6 @@ 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. @@ -5782,14 +8196,11 @@ (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. @@ -5911,7 +8322,6 @@ 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. @@ -5989,10 +8399,8 @@ 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 @@ -6009,7 +8417,6 @@ 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 @@ -6057,33 +8464,25 @@ * 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. @@ -6094,12 +8493,9 @@ * 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 @@ -6139,26 +8535,19 @@ 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, @@ -6168,8 +8557,6 @@ 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: @@ -6278,23 +8665,18 @@ 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 @@ -6309,11 +8691,9 @@ 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. @@ -6335,7 +8715,6 @@ 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. @@ -6406,17 +8785,12 @@ * 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. @@ -6441,11 +8815,8 @@ * 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)' @@ -6453,8 +8824,6 @@ (.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' @@ -6464,13 +8833,10 @@ 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 @@ -6481,14 +8847,12 @@ 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' @@ -6496,8 +8860,6 @@ '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 @@ -6646,27 +9008,20 @@ 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 @@ -6677,10 +9032,8 @@ 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. @@ -6693,14 +9046,11 @@ * 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. @@ -6710,8 +9060,6 @@ (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. @@ -6719,12 +9067,9 @@ 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 @@ -6749,21 +9094,15 @@ '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 @@ -6773,15 +9112,12 @@ 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' @@ -6790,15 +9126,12 @@ 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'. @@ -6823,16 +9156,12 @@ 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 @@ -6857,11 +9186,8 @@ (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. @@ -6872,7 +9198,6 @@ 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 @@ -6887,18 +9212,13 @@ * 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. @@ -6910,34 +9230,25 @@ 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. @@ -6982,7 +9293,6 @@ 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. @@ -6993,21 +9303,16 @@ 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 @@ -7039,37 +9344,26 @@ * 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. @@ -7080,7 +9374,6 @@ 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. @@ -7096,19 +9389,14 @@ $(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'. @@ -7128,62 +9416,45 @@ 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 + * man/Makefile.am: Here. 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. @@ -7225,18 +9496,13 @@ 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 @@ -7264,7 +9530,6 @@ 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 @@ -7308,7 +9573,6 @@ 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. @@ -7340,7 +9604,6 @@ 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. @@ -7359,7 +9622,6 @@ 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. @@ -7374,7 +9636,6 @@ 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 @@ -7437,7 +9698,6 @@ 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. @@ -7473,10 +9733,8 @@ 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. @@ -7540,22 +9798,17 @@ 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. @@ -7564,7 +9817,6 @@ * 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 @@ -7578,24 +9830,18 @@ 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 @@ -7610,7 +9856,6 @@ 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". @@ -7628,12 +9873,10 @@ 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 @@ -7687,18 +9930,14 @@ 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 @@ -7706,14 +9945,12 @@ 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. @@ -7760,13 +9997,11 @@ 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 @@ -7859,11 +10094,8 @@ * 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. @@ -7887,13 +10119,10 @@ (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 @@ -7903,14 +10132,11 @@ 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 @@ -7927,12 +10153,9 @@ * 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. @@ -7941,11 +10164,8 @@ * 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` @@ -8014,8 +10234,6 @@ * 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. @@ -8026,7 +10244,6 @@ 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 @@ -8124,14 +10341,12 @@ 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 @@ -8241,7 +10456,6 @@ maint: fix common spelling errors These were identified using: https://github.com/lyda/misspell-check executed like: git ls-files | misspellings -f - - * src/cat.c: Correct a spelling error. * src/comm.c: Likewise. * src/expr.c: Likewise. @@ -8298,7 +10512,6 @@ cp,mv,install: provide POSIX_FADV_SEQUENTIAL hint to input This was inadvertently omitted from v8.5-104-g47076e3, and gives the same 5% speedup when copying from an SSD. - * src/copy.c (copy_internal): Apply the FADVISE_SEQUENTIAL hint. 2012-05-02 Jim Meyering @@ -8365,36 +10578,25 @@ * src/id.c (main): Factor out uses of "argc - optind". Move option-consistency checks to precede the potential getcon call. -2012-04-27 Jim Meyering - id,groups: with no user name, print only real and/or effective IDs, ... i.e., don't use the getpw* functions. - Before this change, running groups or id with no user name argument would include a group name or ID from /etc/passwd. Thus, under unusual circumstances (default group is changed, but has not taken effect for a given session), those programs could print a name or ID that is neither real nor effective. - To demonstrate, run this: - echo 'for i in 1 2; do id -G; sleep 1.5; done' \ |su -s /bin/sh ftp - & sleep 1; perl -pi -e 's/^(ftp:x:\d+):(\d+)/$1:9876/' /etc/passwd - Those id -G commands printed the following: - 50 50 9876 - With this change, they print this: - 50 50 - Similarly, running those programs set-GID could make them print one ID too many. - * src/group-list.c (print_group_list): When username is NULL, pass egid, not getpwuid(ruid)->pw_gid), to xgetgroups, per the API requirements of xgetgroups callee, mgetgroups. @@ -8537,8 +10739,6 @@ * tests/misc/pwd-long: Likewise. * tests/misc/uniq: Likewise. -2012-04-04 Jim Meyering - tests: convert nearly all `...` expressions to $(...) Exempt init.sh because it runs before we're assured to have a shell that groks $(...). Exempt *.mk because "$" would have to @@ -8546,17 +10746,14 @@ almost certainly evaluated before init.sh is run. Finally, also exempt the perl-based tests, because perl's `...` cannot be converted to $(...). Do that by running this command: - git grep -l '`.*`' tests \ | grep -Ev 'init\.sh|\.mk$' | xargs grep -Lw perl \ | xargs perl -pi -e 's/`(.*?)`/\$($1)/g' - One minor fix-up change was required after that, due to how quoting differs: diff --git a/tests/chmod/equals b/tests/chmod/equals - expected_perms=$(eval 'echo \$expected_'$dest) + expected_perms=$(eval 'echo $expected_'$dest) - Another was to make these required quoting adjustments: diff --git a/tests/misc/stty b/tests/misc/stty ... @@ -8567,10 +10764,8 @@ - rev2=$(eval echo "\\\$REV_$opt2") + rev1=$(eval echo "\$REV_$opt1") + rev2=$(eval echo "\$REV_$opt2") - Also, transform two files that were needlessly excluded above: (both use perl, but are mostly bourne shell) - perl -pi -e 's/`(.*?)`/\$($1)/g' \ tests/du/long-from-unreadable tests/init.cfg @@ -8645,7 +10840,6 @@ maint: avoid a doc syntax check failure Prompted by the continuous integration build failure at: http://hydra.nixos.org/build/2315847 - * doc/coreutils.texi (ln invocation): s/path/file name/ 2012-03-22 Harald Hoyer @@ -8653,12 +10847,9 @@ ln: add the --relative option With the "--relative --symbolic" options, ln computes the relative symbolic link for the user. - So, ln works just as cp, but creates relative symbolic links instead of copying the file. - I miss this feature since the beginning of using ln. - $ tree ./ / `-- usr @@ -8666,12 +10857,9 @@ `-- lib `-- foo `-- foo - 4 directories, 1 file - $ ln -s -v --relative usr/lib/foo/foo usr/bin/foo ‘usr/bin/foo’ -> ‘../lib/foo/foo’ - $ tree ./ / `-- usr @@ -8680,12 +10868,9 @@ `-- lib `-- foo `-- foo - 4 directories, 2 files - $ ln -s -v --relative usr/bin/foo usr/lib/foo/link-to-foo ‘usr/lib/foo/link-to-foo’ -> ‘foo’ - $ tree ./ / `-- usr @@ -8695,9 +10880,7 @@ `-- foo |-- link-to-foo -> foo `-- foo - 4 directories, 3 files - * src/Makefile.am: Reference the relpath module. * src/ln.c (usage): Mention the new option. (do_link): Call the relative conversion if specified. @@ -8719,11 +10902,8 @@ * po/POTFILES.in: Likewise. * src/realpath.c: Adjust to the refactored relpath module. -2012-03-22 Pádraig Brady - maint: ensure PATH_MAX is set correctly This reverts part of commit v8.12-103-g54cbe6e. - * src/system.h: Include gnulib's pathmax.h to honor system specific limits, and then we set PATH_MAX only if needed. Note pathmax.h no longer uses pathconf ("/", _PC_PATH_MAX). @@ -8757,7 +10937,6 @@ by omitting the framework for a posix check, this patch makes it so that the framework is omitted by default, while still giving instructions for maintainers to re-enable it. - It's been a while since we've used GNULIB_POSIXCHECK; see this email: https://lists.gnu.org/archive/html/coreutils/2012-03/msg00126.html Some of those failures are because we are intentionally avoiding @@ -8765,7 +10944,6 @@ like fprintf-posix), but until we work with gnulib to avoid particular warnings, wiring up an automatic GNULIB_POSIXCHECK to happen during 'make my-distcheck' is not feasible. - * configure.ac (gl_ASSERT_NO_GNULIB_POSIXCHECK): Conditionally define, according to whether $GNULIB_POSIXCHECK is in environment. @@ -8785,15 +10963,12 @@ doc: clarify current realpath --relative-base behavior For compatibility with MacOS relpath(1), as seen here: - http://opensource.apple.com/source/bootstrap_cmds/\ bootstrap_cmds-79/relpath.tproj/relpath.c - we implemented 'realpath --relative-base=dir1 --relative-to=dir2 file' in the same way as 'relpath -d dir1 dir2 file'. This can result in --relative-base rendering --relative-to as a no-op if dir1 is a child of dir2. Document this. - * doc/coreutils.texi (realpath invocation): Mention restriction. 2012-03-20 Pádraig Brady @@ -8818,26 +10993,20 @@ realpath: optimize --relative-base usage There is no need to recompute for every path being visited whether the base is a prefix of the relative location. - * src/realpath.c (relpath): Hoist base check... (main): ...here. Based on a suggestion by Pádraig Brady. -2012-03-15 Eric Blake - realpath: let --relative-to default to --relative-base Most of the time, if someone wants to filter which paths are relative while leaving all others absolute, they also want to to the filtering based on the same --relative-to directory. Make this easier to specify. - * src/realpath.c (main): Convert error to default. * doc/coreutils.texi (realpath invocation): Document this. * tests/misc/realpath: Adjust test to match. * NEWS: Document it. -2012-03-15 Eric Blake - tests: cover more realpath scenarios 'realpath --relative-base --relative-to' is identical to --relative-base=--relative-to, so the test wasn't covering what @@ -8846,18 +11015,13 @@ exposes our design decision that --relative-base that is not a prefix of --relative-to is a no-op (if we later change behavior, we will also have to change that part of the test). - * tests/misc/realpath: Fix typo. Add some tests. -2012-03-15 Eric Blake - realpath: fix problems with root handling When --relative-base is /, all other paths should be treated as relative (except for // where it matters). - Also, on platforms like Cygwin where / and // are distinct, realpath was incorrectly collapsing // into /. http://debbugs.gnu.org/10472. - * src/realpath.c (path_prefix, path_common_prefix): Treat / and // as having no common match. (relpath): Allow for no match even without --relative-base. @@ -8874,12 +11038,9 @@ if slashes separating the symlink from the rest of the name are elided (see http://austingroupbugs.net/view.php?id=541), as that is the only useful (and current) behavior on Cygwin. That is, - ln -s / root ls root/dev - must list the contents of /dev, not //dev. - * tests/misc/readlink-root: New test. * tests/Makefile.am (TESTS): Run it. @@ -8940,11 +11101,9 @@ Note that the problem arises only when processing a non-directory specified on the command line. Not surprisingly, "du -x" still works as expected for any directory argument. - When performing its same-file-system check, du may skip an entry only if it is at fts_level 1 or greater. Command-line arguments are at fts_level == 0 (FTS_ROOTLEVEL). - * src/du.c (process_file): Don't use the top-level FTS->fts_dev when testing for --one-file-system (-x). It happens to be valid for directories, but it is always 0 for a non-directory. @@ -8985,7 +11144,6 @@ tests: work around a block alignment issue in dd/sparse Prompted by the continuous integration build failure at: http://hydra.nixos.org/build/2188210 (which uses XFS). - * tests/dd/sparse (alloc_equal): Add a block allocation comparison function that accounts for variations due to alignment. @@ -9014,9 +11172,7 @@ Notes: Small seeks are not coalesced to larger ones, like is done in cache_round() for example. - conv= is used rather then oflag= for FreeBSD compatibility. - * src/dd.c (final_op_was_seek): A new global boolean to flag whether the final "write" was converted to a seek. (usage): Describe the new conf=sparse option. @@ -9064,7 +11220,6 @@ split: add the --additional-suffix option Add the --additional-suffix option, to append an additional static suffix to output file names. - * src/split.c (next_file_name): Append suffix to output file names. (main): Handle new --additional-suffix option. * NEWS (New features): Mention it. @@ -9141,7 +11296,6 @@ split: support optional start value for --numeric-suffixes Allow changing the --numeric-suffixes start number from the default of 0. - * src/split.c (next_file_name): Initialize the suffix index and the output filename according to start value. (main): Check that the suffix length is large enough for the @@ -9169,7 +11323,6 @@ dd: fix issues in the count_bytes and seek_bytes flags change These edge cases were missed in the previous commit 140eca15c. - * src/dd.c (main): Include the bytes slop when truncating without further I/O. Don't invalidate the whole file cache in the case where 0 < count < ibs. @@ -9183,7 +11336,6 @@ dd now accepts the count_bytes and skip_bytes input flag and the seek_bytes output flag, to more easily allow processing portions of a file. - * src/dd.c (scanargs): Compute skip_records and skip_bytes when 'skip_bytes' iflag is used. Compute max_records and max_bytes when 'count_bytes' iflag is used. Compute seek_records and seek_bytes @@ -9285,16 +11437,11 @@ * test/misc/stdbuf: Fixup the minor copy & paste issue introduced in commit ff7f0ff8 -2012-01-25 Pádraig Brady - realpath: avoid the use of printf This was seen to give an 11% performance improvement. - * src/realpath.c (relpath): Avoid using printf. (process_path): Likewise. -2012-01-25 Pádraig Brady - maint: use the standard require_perl_ function * tests/cp/sparse-fiemap: Don't use a separate check. @@ -9359,7 +11506,6 @@ maint: fix minor whitespace issues The previous commit introduced a couple of spacing issues, luckily one of which caused a test to fail. - * src/stat.c (default_format): Add a space so times are aligned. * src/tr.c (string2_extentd): Remove an extraneous space. @@ -9388,12 +11534,9 @@ maint: straggler *.[ch] files: convert more `...' to '...' The preceding commands ignored .[ch] files in lib/ and gl/. This is what I should have been doing from the start: - git grep -l '`.*'\' $(g ls-files |grep '\.[ch]$') \ | xargs perl -pi -e 's/`(.+?'\'')/'\''$1/' -2012-01-09 Jim Meyering - maint: src/*.[ch]: convert more `...' to '...' Run this (twice): git grep -E -l '`.+'\' src/*.[ch] \ @@ -9433,12 +11576,9 @@ * tests/misc/chcon: Likewise. * tests/misc/stat-printf: Likewise. -2012-01-09 Jim Meyering - tests: more automated quote adjustment Relax initial regexp to match more instances, but add a filter to avoid some invalid conversions. Run this: - git grep -l "\`[^']*'" tests | xargs perl -pi -e '$q=q"'\''";' \ -e '$q="$q\\$q$q"; /(= ?\`|\`expr|\`echo|\Q$q\E)/ and next;' \ -e ' s/\`([^'\''"]*?'\'')/'\''$1/g' @@ -9447,13 +11587,10 @@ With quoting like that, converting a ` to ' is likely to cause trouble, so we'll handle those manually. Here are three examples where the exemption is required: - *': `link-to-dir/'\'': hard link not allowed for directory'*) ;; printf 'creating file `%s'\''\n' $f 'mv: inter-device move failed: `%s'\'' to `%s'\'';'\ -2012-01-09 Jim Meyering - tests: change `...' to '...' on lines not matching /[=\$]/ Exempt lines with '$' or '=', since those are prone to improper conversion. Run this: @@ -9483,12 +11620,9 @@ maint: update quoting of "Try `prog --help'" to "Try 'prog --help'" Automatically adjust both the source (now in only one place) and all tests that expect the resulting output via this: - git grep -l 'Try.*--help' src/system.h tests \ | xargs perl -pi -e 's/Try \\?`(\S+ --help)/Try '\''$1/' -2012-01-07 Jim Meyering - maint: use new emit_try_help in place of equivalent fprintf Run this command: perl -0777 -pi -e \ @@ -9540,14 +11674,11 @@ the ulimit, as it was seen to make the glob fail on bash 3.2 on Mac OS X 10.6.8 at least. -2012-01-05 Pádraig Brady - tests: avoid a false positive due to overflow on Linux/HPPA * tests/misc/timeout-parameters: Verify that the timer doesn't fire immediately in the problematic range, and avoid overflow checks in that case. * man/timeout.x: Mention the possible bug. - Reported by Bruno Haible 2012-01-05 Jim Meyering @@ -9592,14 +11723,11 @@ * NEWS (New programs): Move this small section to the top. (df): Reword entry, from Pádraig Brady. -2012-01-03 Jim Meyering - df: work around long-named /dev/disk/by-uuid/... symlinks On systems with recent kernel/tools, a symlink from /etc/mtab to /proc/mounts, and a by-UUID mount (i.e., soon, nearly everyone), you will see something like the following when running "df -hT": (this has been truncated to fit in a width-limited ChangeLog file) - Filesystem Type Siz... rootfs rootfs 11G udev devtmpfs 3.8G @@ -9609,10 +11737,8 @@ /dev/sda2 ext3 494M /dev/sda5 ext4 12G /dev/sda6 ext4 9.9G - Contrast that with what we're used to seeing (modulo the two entries mounted on "/", which is a separate problem): - Filesystem Type Size Used Avail Use% Mounted on rootfs rootfs 11G 1.9G 8.0G 19% / udev devtmpfs 3.8G 0 3.8G 0% /dev @@ -9622,7 +11748,6 @@ /dev/sda2 ext3 494M 78M 392M 17% /boot /dev/sda5 ext4 12G 7.6G 3.7G 68% /usr /dev/sda6 ext4 9.9G 6.6G 2.8G 71% /var - When that long /dev/disk/by-uuid/... name is merely a symlink to a much shorter (and often more useful) device name like "/dev/sda3", and when it's part of a listing of all file systems, @@ -9630,7 +11755,6 @@ an encrypted root file system, you would see a name like /dev/mapper/luks-828fc648-9f30-43d8-a0b1-f7196a2edb66 pointing to say, /dev/dm-0, I prefer the shorter name. - I.e., if I explicitly run "df -hT /dev/disk/by-uuid/828fc648-9f30-43d8-a0b1-f7096a2edb66", then, it's fine -- and expected -- to print to the long name. @@ -9638,7 +11762,6 @@ df should print the shorter name. Note that performing this translation at a lower level (via a change to gnulib's mountlist.c) would make it impossible to distinguish those two cases. - * src/df.c: Include "canonicalize.h". (get_dev): Add a parameter, telling when we're in process-all- mount-points mode; update all callers. When true, resolve @@ -9647,8 +11770,6 @@ Reported by Nao Nishijima in http://bugzilla.redhat.com/766461 and by Dan Jacobson in http://bugs.gnu.org/10363 -2012-01-03 Jim Meyering - tests: adjust realpath test to avoid "make distcheck" failure * tests/misc/realpath: Quote lhs of test ... = ..., so that when $PWD contains a space (like it does via "make distcheck"), @@ -9662,7 +11783,6 @@ through the --relative options. The relpath support was suggested by Peng Yu, who also provided an initial implemenation of that functionality. - * AUTHORS: Add my name. * NEWS: Mention the new command. * README: Likewise. @@ -9678,8 +11798,6 @@ * tests/Makefile.am (TESTS): Add misc/realpath. * tests/misc/realpath: New file. -2012-01-03 Pádraig Brady - build: update gnulib for canonicalize_filename_mode improvements This is required for the new realpath command. @@ -9740,7 +11858,6 @@ * src/chown.c: Likewise. * src/chcon.c (usage): Likewise. Document the --dereference option. - Suggested by Paul Eggert and Jari Aalto 2011-12-26 Jim Meyering @@ -9919,11 +12036,9 @@ I didn't check how long these were documented as GNU extensions, nor when they were added by POSIX; but since they are all part of POSIX 2008, we no longer need call them out as extensions. - The next version of POSIX will standardize %s: http://austingroupbugs.net/view.php?id=169 but as that is not out yet, I didn't change %s. - * doc/coreutils.texi (Time conversion specifiers): %R and %z are now POSIX. (Date conversion specifiers): Likewise for %F, %g, %G. @@ -9952,17 +12067,13 @@ build: simplify warnings based on last gnulib update We no longer need to exclude this warning. - * configure.ac (WARN_CFLAGS): Gnulib dropped -Wunsuffixed-float-constants, as non-portable. -2011-11-29 Eric Blake - build: update gnulib for syntax-check improvement Commit 5b3e538 proved useful enough to migrate to gnulib after enhancing it to be more generic, which in turn pointed out that commit a2c811db missed an offender. - * gnulib: Update to latest. * cfg.mk (sc_prohibit_reversed_compare_failure): Delete, now that gnulib provides it. @@ -10061,14 +12172,11 @@ not "compare out /dev/null". I.e., specify the expected/desired contents via the first file name. Prompted by a suggestion from Bruno Haible in http://thread.gmane.org/gmane.comp.gnu.grep.bugs/4020/focus=29154 - Run these commands: - git grep -l -E 'compare [^ ]+ exp' \ |xargs perl -pi -e 's/(compare) (\S+) (exp\S*)/$1 $3 $2/' git grep -l -E 'compare [^ ]+ /dev/null' \ |xargs perl -pi -e 's/(compare) (\S+) (\/dev\/null)/$1 $3 $2/' - * tests/chgrp/no-x: As above. * tests/chmod/no-x: Likewise. * tests/chmod/silent: Likewise. @@ -10211,8 +12319,6 @@ * tests/touch/not-owner: Likewise. * tests/touch/relative: Likewise. -2011-11-22 Jim Meyering - tests: use compare, not "diff", in a few stray tests * tests/install/basic-1: Use compare, not diff. * tests/mkdir/p-v: Likewise. @@ -10314,16 +12420,12 @@ id: undo previous commit, which was done by mistake * src/id.c (GETID_MAY_FAIL, main, print_full_info): Undo previous change. -2011-11-15 Paul Eggert - doc: update for ISO/IEC 80000-13 * doc/coreutils.texi (Block size): IEC 60027-2 has been superseded by ISO/IEC 80000-13, so prefer the newer standard but also mention the old. The new standard specifies Zi and Yi, so they are no longer GNU extensions. Fix stale URL to BIPM. - 2011-11-14 Paul Eggert - id: handle (uid_t) -1 more portably * src/id.c (GETID_MAY_FAIL): Remove. (main): Check for negative return values, not for -1. @@ -10448,30 +12550,24 @@ (kernel 2.6.22.5 x86_64, glibc 2.6.1-18, bash updated to 4.2), and also on a 64 bit SLES system with a 2.6.16 kernel. Both systems had 2 CPUs. - There were two issues seen. 1. Occasionally the timeout.cmd shell script would block SIGINT until the sleep command exited. 2. Much less frequently the signal handler in the timeout command itself was ignored, causing SIGALRM to kill the process. - * tests/misc/timeout-group: Detect the above two cases, and skip rather than fail. Note only issue 2. causes a failure unless skipped, but we skip for case 1. also, for diagnostic purposes. -2011-11-03 Pádraig Brady - tests: fix a race in timeout-group This could cause a false failure, or even an infinite loop in rare circumstances. - * tests/misc/timeout-group: Increase the timeouts passed to the timeout command, so that they're effectively not used. Instead the command termination is triggered by the kill commands when everything is in the correct state. - Reported by Bernhard Voelker. 2011-11-02 Jim Meyering @@ -10614,7 +12710,6 @@ At the moment, things like man/arch.1 are not included in the tarball. This makes perl a requirement if you want to build/install the arch helper. - * man/Makefile.am (EXTRA_DIST): Add $(NO_INSTALL_PROGS_DEFAULT:%=%.1). 2011-10-19 Jim Meyering @@ -10802,29 +12897,23 @@ doc: mention the recent ls -L "argetm" fix in NEWS * NEWS: Mention the bug fix -2011-10-01 Pádraig Brady - ls: fix output of dangling symlinks colored as target This is related to commit b7f2b51c, 2010-01-01, "ls: fix color of broken symlinks colored as target" which didn't handle the --dereference case. The simplest way to reproduce the resultant erroneous "argetm" is as follows: - $ ln -s /no-such dangle $ env LS_COLORS=ln=target ls --dereference --color ls: cannot access dangle: No such file or directory argetmdangle - This is also an issue with the `tree` utility, reported here: http://bugs.debian.org/586765 - * src/ls.c (print_color_indicator): Move the handling of 'ln=target' in $LS_COLORS (color_symlink_as_referent == true) to a higher scope, to handle all cases where type == C_LINK. * tests/misc/ls-misc: Add a test case for the specific issue, and 2 further test cases to verify other code paths in this area. - Reported by Jason Glassey. 2011-09-30 Jim Meyering @@ -10898,7 +12987,6 @@ implicitly created when timer_settime() is used. This breaks our scheme to ignore signals we've sent ourselves. - * src/timeout.c (send_sig): Change the scheme used to ignore signals we've sent ourselves, to a more robust but perhaps limited scheme of ignoring all signals of @@ -11135,7 +13223,6 @@ timeout: revert signal propagation enhancement This effectively reverts the unreleased commit 5a647a05 - * src/timeout.c (main): Don't propagate signals from the monitored process, as on Linux /proc/sys/kernel/core_pattern could still handle them and cause false reports against `timeout` @@ -11164,12 +13251,10 @@ "Apply big patch (patch-20) from Roland Huebner" it was ignored when -t or -T were specified or when -l <= 10. - * src/pr.c (print_page): Increment the current page here. (print_header): Don't increment the current page here. * tests/pr/pr-tests: Add a test case. * NEWS: Mention the fix - Reported at http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9347 2011-08-20 Erik Auerswald @@ -11268,12 +13353,9 @@ tests: complete the renaming framework_failure -> framework_failure_ These changes were mostly mechanical, made by running the following command: - git grep -lw framework_failure | grep -v ChangeLog \ | xargs perl -pi -e 's/\b(framework_failure)\b/${1}_/' - and then editing init.cfg and `tests/cp/cp-a-selinux' by hand. - * tests/init.cfg (framework_failure): Remove, `framework_failure_' from init.sh should be used instead in the tests. Remove now-obsolete "FIXME" comment. @@ -11325,12 +13407,9 @@ affecting at least glibc 2.13 and FreeBSD. Reported by Bernhard Voelker. Suggested by Eric Blake. -2011-07-29 Jim Meyering - build: update gnulib, for "make syntax-check" fix Without the recent maint.mk fix, "make syntax-check" would fail like this: - src/dd.c:# define SA_RESETHAND 0 src/ls.c:# define SA_RESTART 0 src/timeout.c:# define SA_RESTART 0 @@ -11445,8 +13524,6 @@ * m4/jm-macros.m4: Remove gl_CLOCK_TIME as it's already done by the gettime gnulib module. -2011-07-20 Pádraig Brady - unexpand: fix misalignment when spaces span a tabstop The following dropped the space from the first field printf "1234567 \t1\n" | unexpand -a @@ -11454,7 +13531,6 @@ Also a single trailing space should not be converted if the next field starts with non blank characters. So we enforce those rules too, with this change. - * src/unexpand.c (unexpand): Implement as per POSIX rules. * tests/misc/unexpand: Add tests, and adjust existing tests as per POSIX rules. @@ -11489,15 +13565,10 @@ Fix capiTalization in comments. -2011-07-16 Paul Eggert - * src/timeout.c (main): Use waitpid, not wait (Bug#9098). Reported by Andreas Schwab. - * src/timeout.c (SA_RESTART): Define to 0 if not defined. -2011-07-16 Paul Eggert - timeout: port to NonStop (Bug#9077) * src/timeout.c (SA_RESTART): Define to 0 if not defined. (main): Don't assume signal handling uses SA_RESTART. @@ -11559,12 +13630,9 @@ Reported by Jordi Pujol in http://bugs.debian.org/551093. Wording improvments from Eric Blake. -2011-07-13 Benoît Knecht - doc: note the order in which wc counts are printed This information has already been added to the Texinfo manual, but was missing from the --help output. - * src/wc.c (usage): As above, for --help. Reported by Vincent Lefevre in http://bugs.debian.org/395430. @@ -11604,7 +13672,6 @@ man-pages(7) explicitly says about SEE ALSO sections: "Do not terminate this with a period." This is also in line with all the other man pages in coreutils. - * man/cat.x: Remove period at the end of the SEE ALSO section. * man/tac.x: Likewise. @@ -11625,12 +13692,9 @@ * test/misc/timeout-group: Add a test case. * NEWS: Mention the fix. -2011-07-08 Pádraig Brady - timeout: add --foreground to support interactive commands Or more accurately, commands not started from the shell prompt, that are interactive, or need to receive Ctrl-C etc. from the terminal. - * doc/coreutils.texi (timeout invocation): Document --foreground. * src/timeout.c (main): Set the foreground flag and don't create a separate group. @@ -11640,7 +13704,6 @@ * tests/misc/timeout-group: Add a new test. * tests/Makefile.am: Reference new test. NEWS: Mention the new option. - Reported by Shay Shimony Analysis by Alan Curry Fix suggested by Paul Eggert @@ -11665,7 +13728,6 @@ consist solely of checksum lines. With only --check, an invalid line evokes a warning, but the program can still exit successfully. With --strict, any invalid line makes the program exit non-zero. - * src/md5sum.c (strict, STRICT_OPTION): Declare/define. (long_options): Add "strict". (usage): Describe --strict. @@ -11806,8 +13868,6 @@ so add extra sanity checks, verifying that the test script exists and is readable, before trying to read from it. -2011-06-19 Stefano Lattarini - tests: make test runner a script, not a shell function This change implements a more correct and idiomatic use of the features of the Automake-provided 'parallel-tests' harness. @@ -11815,7 +13875,6 @@ continue to work with the new testsuite harness that is planned to be introduced in Automake 1.12 (which, as of the writing date, is still under development and in alpha state). - * tests/shell-or-perl: New auxiliary script. * tests/Makefile.am (EXTRA_DIST): Distribute it. * tests/check.mk (TESTS_ENVIRONMENT): Remove definition of the @@ -11985,7 +14044,6 @@ maint: remove unneeded includes Remove unneeded includes as reported by: http://code.google.com/p/include-what-you-use/ - * src/cp-hash.c: Remove unused include. * src/dd.c: Likewise. * src/du.c: Likewise. @@ -11996,8 +14054,6 @@ * src/timeout.c: Likewise. * src/truncate.c: Likewise. -2011-06-09 Pádraig Brady - doc: add examples to date --help * src/date.c (usage): Add examples for TZ handling, and "seconds since epoch" parsing, neither of which @@ -12031,7 +14087,6 @@ I think it would be better to exit through the error() and not to call the exit() after the error(). This way we can get rid of one function call (and curly brackets). - * src/yes.c (main): Exit through the error(), remove exit() call after error(). @@ -12294,7 +14349,6 @@ of single quote characters combined with a numeric format. * THANKS.in: Add bug reporter. * NEWS: Mention the fix. - Reported-by: Paul Marinescu 2011-05-17 Pádraig Brady @@ -12479,17 +14533,12 @@ doc: remove a name from THANKS.in that is derived from git log * THANKS.in: Remove a now-duplicate name. -2011-05-03 Jim Meyering - copy: fix my typo * src/copy.c (copy_reg): Fix my typo (mis-applied patch). The patch by Jeff Liu was fine, but I mis-applied it and introduced a compilation error in commit efa479c1. - 2011-05-03 Jim Meyering -2011-05-03 Jim Meyering - build: avoid bootstrap failure when $GZIP is set Running "GZIP=-9 ./bootstrap" would fail right away, because the tool-version-checking code would treat the upper-cased program name @@ -12629,7 +14678,6 @@ as an argument to awk's printf. Otherwise, gawk 3.0.1 and the one from debian stable's original-awk would get a syntax error. Reported by Dennis Clarke. - Copyright note: tiny change 2011-04-21 Jim Meyering @@ -12895,8 +14943,6 @@ was thought too expensive in memory or time. * NEWS: Mention the fix -2011-04-01 Pádraig Brady - copy: link rather than copy symlinks, when --link used This bug was introduced in commit ca9e212c, 2009-09-24, "cp, mv: use linkat to guarantee semantics", which @@ -12904,7 +14950,6 @@ However rather than implementing the intention of that commit and relying on gnulib linkat emulation, we'll revert to the previous emulation as that maintains ownership and timestamps. - * src/copy.c (copy_internal): Use our existing hardlink to symlink emulation when link() might dereference the symlink. Also ensure that we copy the timestamps of the original symlink @@ -12986,7 +15031,6 @@ This is already the case in GNU coreutils' expr, bash, ksh, busybox ash, FreeBSD-current /bin/sh and /bin/test, and OpenBSD's /bin/sh. - Before, env test a '==' a would fail with this diagnostic: "test: ==: binary operator expected". Now, it succeeds. * src/test.c: Accept "==" as a synonym for "=". @@ -13172,14 +15216,11 @@ * doc/coreutils.texi (dd invocation): Apply the same grouping as above, by splitting the "conv=" table in two. -2011-03-05 Pádraig Brady - dd: warn when we disable oflag=direct not at EOF An alternative to this is to auto enable iflag=fullblock when oflag=direct and bs= is specified. It was thought better though, to warn about the specific issue, and give full control of dd's options to the user. - * src/dd.c (iwrite): Warn, when we write after having disabled O_DIRECT. See https://bugzilla.redhat.com/show_bug.cgi?id=614605 @@ -13263,12 +15304,9 @@ Don't depend on heuristics to detect sparse files if fiemap is available. Also don't scan for new holes unless --sparse=always has been specified. - * src/copy.c (extent_copy): Pass the user specified sparse mode, and handle as described above. -2011-02-11 Pádraig Brady - copy: suppress redundant lseeks when using fiemap * src/copy.c (extent_copy): Suppress redundant lseek()s in both the source and dest files, when there is no hole between extents. @@ -13333,18 +15371,13 @@ * gl/tests/test-ino-map.c: Likewise. * gnulib: Update to latest, now that these two modules are there. -2011-02-07 Jim Meyering - di-set: provide a lookup method This is required for patch, and hence is about to move to gnulib. * gl/lib/di-set.c (di_set_lookup): New function. * gl/lib/di-set.h: Declare it. * gl/tests/test-di-set.c (main): Exercise it. - The bug was introduced on 2004-12-04 via commit 7380cf79. -2011-02-07 Jim Meyering - cut: don't segfault for large unbounded range * src/cut.c (set_fields): When computing the maximum range endpoint, take into consideration the start of any unbounded range, like "999-". @@ -13389,7 +15422,6 @@ sort: fix --debug key highlighting when key start after key end This case was overlooked in commit bdde34f9, 2010-08-05, "sort: tune and refactor --debug code, and fix minor underlining bug" - * src/sort.c (debug_key): Don't adjust the key end when it's before the key start. * tests/misc/sort-debug-keys: Add a test case. @@ -13575,7 +15607,6 @@ release the memory allocated to extent info which should be called combine with get_extents_info(), it just one line, so IMHO, define it as macro should be ok. - * src/extent-scan.c: New file; functions to read "extents". * src/extent-scan.h: Header file of extent-scan.c. * src/Makefile.am: Reference it and link it to copy_source. @@ -13656,12 +15687,9 @@ 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-29 Pádraig Brady - join: don't report disorder against an empty file This allows one to use join as a field extractor like: join -a1 -o 1.3,1.1 - /dev/null - * src/join.c (join): Don't flag unpairable lines when one of the files is empty. * tests/misc/join: Add a new test for empty input, and adjust @@ -13669,19 +15697,14 @@ * doc/coreutils.texi (join invocation): Document the change. * NEWS: Likewise. -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-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, will be truncated or padded. - * src/join.c (prfields): A new function refactored from prjoin(), to output all but the join field. (prjoin): Don't swap line1 and line2 when line1 is blank @@ -13906,8 +15929,6 @@ build: update gnulib for version-etc copyright year update * tests/sample-test: Update copyright to 2011, to appease syntax-check. -2011-01-01 Jim Meyering - maint: generate much of the THANKS file Before this change, we had a tendency to manually list each contributor's name in THANKS. Now, each commit "Author" is @@ -13915,7 +15936,6 @@ of the old THANKS file is now a template, THANKS.in. We'll still have to manually list the names of people who report problems without a usable patch. - * THANKS.in: New file, derived from THANKS, but removing names of those who are listed as git log 'Author:'s. * THANKS: Remove file. @@ -13941,12 +15961,10 @@ coreutils has long preferred to use it as an external library). But that commit overlooked two places necessary to allow the use of gettext 0.17. - This does not force you to downgrade (using gettext 0.18.1.1 is still just fine), nor does it affect tarballs (once a tarball is built with a given gettext version, it can be built on other machines regardless of what gettext version is present). - * bootstrap.conf (buildreq): Relax prerequisite. * configure.ac (AM_GNU_GETTEXT_VERSION): Likewise. @@ -14357,7 +16375,6 @@ When -n l/N is used and long lines are present that both span partitions and multiple buffers, one would get inconsistent chunk sizes. - * src/split.c (main): Add a new undocumented ---io-blksize option to support full testing with varied buffer sizes. (cwrite): Refactor most handling of --elide-empty to here. @@ -14571,17 +16588,12 @@ tests: convert tests/misc/selinux manually -2010-11-17 Jim Meyering - tests: convert the multi-prog $VERBOSE/--version uses E.g., - -test "$VERBOSE" = yes && { env -- pwd --version; readlink --version; } +print_ver_ pwd readlink - -test "$VERBOSE" = yes && { stdbuf --version; mv --version; } +print_ver_ stdbuf mv - Use this command: git grep -l 'VERBOSE.*--version'|xargs perl -ni \ -e '/^test "\$VERBOSE" = yes && { .*--version/ or print,next;' \ @@ -14589,30 +16601,20 @@ -e 's/test "\$VERBOSE" = yes && { /print_ver_ /;' \ -e ' s/(\w+) --version;/$1/g; s/ *}$//; print' -2010-11-17 Jim Meyering - tests: convert "... env -- prog --version" uses E.g., - -test "$VERBOSE" = yes && env -- pwd --version +print_ver_ pwd - git grep -l 'VERBOSE.*--version'|xargs perl -pi -e \ 's/test "\$VERBOSE" = yes && env -- (\w+) --version/print_ver_ $1/' -2010-11-17 Jim Meyering - tests: substitute the single-program $VERBOSE/--version uses Automatically make all of the changes like this: - -test "$VERBOSE" = yes && chgrp --version +print_ver_ chgrp - git grep -l 'VERBOSE.*--version'|xargs perl -pi -e \ 's/test "\$VERBOSE" = yes && (\w+) --version/print_ver_ $1/' -2010-11-17 Jim Meyering - tests: factor out VERBOSE-only --version-printing code * tests/init.cfg (print_ver_): New function. @@ -14628,15 +16630,12 @@ tests: convert 'if test "$VERBOSE" = yes; then' to test ... && -2010-11-17 Jim Meyering - tests: convert first batch of tests from test-lib.sh to init.sh Initially, I did this, git grep -l srcdir/test-lib.sh|xargs perl -p0i -e '~180-byte script' but that line would have been much longer than the maximum permitted by coreutils' commit hook, and wasn't readable besides, so here's a more readable version: - lhs=$(printf '%s\\n' \ 'if test "$VERBOSE" = yes; then' \ ' set -x' \ @@ -14645,16 +16644,12 @@ '' \ '. $srcdir/test-lib.sh' \ | sed 's/\$/\\\$/g;s/touch/(\\w+)/') - rhs=$(printf '%s\\n' \ '. "${srcdir=.}/init.sh"; path_prepend_ ../src' \ 'test "$VERBOSE" = yes && FIXME --version' \ | sed 's/\$/\\\$/g;s/FIXME/\$1/') - git grep -l srcdir/test-lib.sh|xargs perl -p0i -e "s,$lhs,$rhs," -2010-11-17 Jim Meyering - tests: move a comment so automated conversion works maint: add a NEWS-checking syntax-check rule @@ -14680,13 +16675,10 @@ * src/csplit.c (max_out): Fix a new warning introduced with commit 6568b173, 2010-11-10, "csplit: do not rely on..." -2010-11-16 Pádraig Brady - build: enable the -Wpointer-sign gcc warning ... when configured with the --enable-gcc-warnings option. This follows on from commit 34ef0a01, 2010-10-14, "sort: fix unportable cast of unsigned char * -> char *" - * configure.ac: -Wall implicitly enables this warning so remove the explicit disabling. @@ -14871,11 +16863,8 @@ cp: NEWS entry for previous fix Resolves bug#7324 - * NEWS: Document the extent of the Solaris crash. -2010-11-04 Eric Blake - cp, mv, touch: fix file time manipulation on Solaris 10 * gnulib: Update to latest, for futimens fix. * .gitignore: Ignore another recent gnulib-generated file. @@ -14989,7 +16978,6 @@ md5sum: print a summary warning for improperly formatted lines And remove the now-superfluous totals from the other two warnings, so the plurals will also work in other languages than English. - * src/md5sum.c (digest_check): Change as above. * tests/misc/md5sum (check-quiet2): Adjust accordingly. @@ -15135,7 +17123,6 @@ split: fix reporting of read errors The bug was introduced with commit 23f6d41f, 19-02-2003. - * src/split.c (bytes_split, lines_split, line_bytes_split): Correctly check the return from full_read(). * tests/misc/split-fail: Ensure split fails when @@ -15210,7 +17197,6 @@ This touches all new tests added since commit b062bbd9, when init.cfg was added. Older tests still exist that could use conversion, but we can address those later. - * tests/sample-test: Restore hint for --version output. * tests/misc/stat-birthtime: Include --version if verbose. * tests/misc/tr-case-class: Likewise. @@ -15219,19 +17205,14 @@ * tests/misc/sort-benchmark-random: Likewise. Suggested by Jim Meyering. -2010-10-01 Eric Blake - stat: print SELinux context when available * src/stat.c (default_format): Include context when present. * NEWS: Update blurb explaining the replacement for -Z. -2010-10-01 Eric Blake - stat: optimize and translate default format strings Yes, this patch intentionally leaks the results of default_format(), since it is called only twice, and since the results are in scope until main() exits. Not worth the extra code to pacify valgrind. - * src/stat.c (main): Hoist default format computation out of loop. (do_statfs, do_stat): Move default format generation... (default_format): ...into new function. Allocate the result in @@ -15241,8 +17222,6 @@ file type. * NEWS: Document the translation aspect. -2010-10-01 Eric Blake - stat: print timestamps to full resolution * src/stat.c (epoch_time): New function. (print_stat): Use it for %[WXYZ]. @@ -15265,7 +17244,6 @@ maint: ensure the mbsalign module is C89 compatible This module may be moved to gnulib at some stage, so keep it C89 compatible. - * gl/lib/mbsalign.c (mbsalign): Declare variables at start of scope (ambsalign): Likewise * gl/lib/mbsalign.h: Remove trailing comma from enum @@ -15305,15 +17283,12 @@ LC_ALL=en_US.iso-8859-1 tr '[:upper:] ' '[:lower:]' This was caused by commit 6efd1046, 05-01-2008, "Avoid tr case-conversion failure in some locales" - This misaligned conversion spec was allowed: LC_ALL=C tr 'A-Y[:lower:]' 'a-z[:upper:]' This was caused by commit af5d0c36, 21-10-2007, "tr: do not reject an unmatched [:lower:] or [:upper:] in SET1" - This misaligned spec was allowed by extending the class: LC_ALL=C tr '[:upper:] ' '[:lower:]' - * src/tr.c (validate_case_classes): A new function to check alignment of case conversion classes. Also it adjusts the length of the sets so that locales with different numbers of @@ -15403,7 +17378,6 @@ dircolors: add rxvt-unicode-256color terminal type rxvt-unicode introduced new terminal type: http://cvs.schmorp.de/rxvt-unicode/src/rxvt.h?r1=1.398&r2=1.399 - * src/dircolors.hin: Add rxvt-unicode-256color terminal type. Reported by Alexey I. Froloff in . @@ -15423,12 +17397,9 @@ from 1 second to a range of .1s - 3.1s. * tests/rm/dangling-symlink: Likewise. -2010-09-07 Pádraig Brady - tests: exclude some tests when running on NFS All tests currently pass on NFS on Linux kernel 2.6.22 at least, but some fail on 2.6.9, so we exclude those here. - * tests/init.cfg (is_local_dir_): A new function returning if the specified directory is on a local file system. (require_local_dir_): A new function to skip tests @@ -15469,7 +17440,6 @@ "join: make -t '' operate on the whole line". Bypassing the delimiter search in this case, gives about an 8% performance boost. - * src/join (xfields): Don't bother looking for '\n' in the data, which we know won't be present. @@ -15585,7 +17555,6 @@ build: update to latest gnulib Fixes bug 6053 for NFS on HP-UX not recognizing ACL operations. - * gnulib: Update to latest version. 2010-08-10 Jim Meyering @@ -15645,7 +17614,6 @@ shortens the source code and executable size a tad, and improves CPU performance by 2.4% on my platform with a simple benchmark (C locale, line sorting, no debug). - * src/sort.c (long_double, strtold): Move back to prelude, since they're now used by multiple functions again. (unit_order): Move to file scope, since it's now used by two functions. @@ -15670,8 +17638,6 @@ a number, so its first character should not be underlined when debugging a numeric sort. -2010-08-05 Paul Eggert - sort: -R now uses less memory on long lines with internal NULs * lib/Makefile.am (libcoreutils_a_SOURCES): Remove xmemxfrm.c, xmemxfrm.h. @@ -15891,7 +17857,6 @@ apply the same hint to all appropriate utils. This currently gives around a 5% speedup for reading large files from fast flash devices on GNU/Linux. - * src/base64.c: Call fadvise (..., FADVISE_SEQUENTIAL); * src/cat.c: Likewise. * src/cksum.c: Likewise. @@ -15915,8 +17880,6 @@ * src/uniq.c: Likewise. * src/wc.c: Likewise, unless we don't actually read(). -2010-07-22 Pádraig Brady - fadvise: new module providing a simpler interface to posix_fadvise * bootstrap.conf: Include the new module * gl/lib/fadvise.c: Provide a simpler interface to posix_fadvise. @@ -16004,7 +17967,6 @@ Don't write NUL after the comparison buffers on each compare, which increases performance by about 3% for short lines on a pentium-m with gcc-4.4.1 - * src/sort.c: (fillbuf): Delimit input items with NUL. (write_bytes): Restore the item delimiter char which was replaced with NUL in fillbuf(). @@ -16055,11 +18017,9 @@ Nichols, based off of a patch by Paul Eggert, Glen Lenker, et. al., with a basic heap implementation based off of the GDSL heap, originally by Nicolas Darnis. - The number of sorts done in parallel is limited to the number of available processors by default, or can be further restricted with the --parallel option. - On a dual-die, 8 core Intel Xeon, results show sorting with 8 threads is almost 4 times faster than using a single thread. Timings when sorting a 96MB file: @@ -16068,7 +18028,6 @@ 2 2.87 4 1.75 8 1.31 - Single threaded sorting has also been improved, especially for cheaper comparison operations: COMMAND BEFORE (s) AFTER (s) @@ -16076,7 +18035,6 @@ sort -g 10.336 10.222 sort -n 3.077 2.961 LANG=C sort 2.169 2.066 - * bootstrap.conf: Add heap, pthread. * coreutils.texi (sort): Describe the new --parallel option. * gl/lib/heap.c: New file. Very basic heap implementation. @@ -16236,8 +18194,6 @@ containing 100,000 files, each with a link count greater than 1, all pointing to files in some other tree. -2010-07-04 Jim Meyering - du: use less than half as much memory when tracking hard links When processing a hard-linked file, du must keep track of the file's device and inode numbers in order to avoid counting its storage @@ -16257,7 +18213,6 @@ dev,inode information and put those bits in place of the pointer, and thus do away with the need to allocate additional space for each dev,inode pair. - * src/du.c: Include "di-set.h". Don't include "hash.h"; it's no longer used. (INITIAL_DI_SET_SIZE): Define. @@ -16268,8 +18223,6 @@ * bootstrap.conf (gnulib_modules): Add the new di-set module. * NEWS (New features): Mention it. -2010-07-04 Jim Meyering - di-set: manipulate sets of dev/inode pairs efficiently * gl/lib/di-set.c: Implementation. * gl/lib/di-set.h: Declarations. @@ -16540,7 +18493,6 @@ it may also do, but for `truncate` we should display all errors. Also we used the st_size from non regular files which is undefined, so we display an error when the user tries this. - * src/truncate (do_truncate): Error when referencing the size of non regular files or non shared memory objects. Display all errors returned by ftruncate(). @@ -16904,7 +18856,6 @@ tests: fix exit status of signal handlers in shell scripts The value of `$?' on entrance to signal handlers in shell scripts cannot be relied upon, so set the exit code explicitly. - * cfg.mk (sc_always_defined_macros, sc_system_h_headers): Set the exit code in signal handler explicitly to 128 + SIG. * src/Makefile.am (sc_tight_scope): Likewise. @@ -16917,7 +18868,6 @@ in that it clobbers O_APPEND, but it is no different than any other use of xfreopen to force binary mode, so all such uses should be fixed at once in a later patch. - * src/base64.c (main): Open input in binary mode. * THANKS: Update. Reported by Yutaka Amanai. @@ -16945,7 +18895,6 @@ "sort: Fix two bugs with determining the end of field". The specific regression being that we include 1 field too many when an end field is specified using obsolescent key syntax (+POS -POS). - * src/sort.c (struct keyfield): Clarify the description of the eword member, as suggested by Alan Curry. (main): When processing obsolescent format key specifications, @@ -16971,11 +18920,8 @@ * HACKING (Add tests): Change example name, "newtest" to "new-test". Not that anyone would confuse with something newt-related, but just because it is more readable that way. - doc: tweak HACKING -2010-04-16 Jim Meyering - doc: tweak HACKING * HACKING (Curly braces): Tweak a sentence. Filter a few paragraphs through "fmt". @@ -16986,11 +18932,8 @@ * src/Makefile.am (kill_LDADD): Add $(LIBTHREAD) so that we link with the appropriate libraries to provide Thread Local Storage on platforms that replace strsignal (like AIX for example). - Tested-by: Daniel Richard G. -2010-04-16 Pádraig Brady - tests: avoid spurious failure of ls/color-norm test * tests/ls/color-norm: Use the "time" output by `ls -l` to check normal style. Previously we used the size from `ls -s`, @@ -17028,7 +18971,6 @@ The 2010-03-26 commit, 4c38625e, "doc: fix info on cp --preserve..." was not entirely correct as cp --preserve=all does produce some xattr warnings. - * src/copy.h: Update and clarify the comments for reduce_diagnostics and require_preserve_{xattr,context}. * doc/coreutils.texi (cp invocation): Update the -a and @@ -17302,7 +19244,6 @@ Rather than changing such a signal into a KILL, we provide the more general mechanism of sending the KILL after the specified grace period. - * src/timeout.c (cleanup): If a non zero kill delay is specified, (re)set the alarm to that delay, after which a KILL signal will be sent to the process group. @@ -17372,22 +19313,18 @@ sort: inform the system about our input access pattern Tell the system that we'll access input sequentially, so that we more efficiently process uncached files in a few cases: - Reading from faster flash devices. E.g. 21 MB/s key: NORMAL 31.6s (26.8 user) SEQUENTIAL 27.7s WILLNEED 27.7s - Processing in parallel with readahead when using a small 1M buffer: NORMAL 24.7s (21.1 user) SEQUENTIAL 22.7s WILLNEED 25.6s - A small benefit when merging: NORMAL 25.0s (16.9 user) SEQUENTIAL 24.6s (16.6 user) WILLNEED 38.4s (13.1 user) - Note WILLNEED is presented above for comparison to show it has some unwanted characteristics due to its synchronous prepopulation of the cache. It has a good benefit on a @@ -17398,7 +19335,6 @@ WILLNEED 05.22s However the scheduling differences causing this result are probably best explicitly managed using `nice` etc. - * m4/jm-macros.m4 (coreutils_MACROS): check for posix_fadvise(). * src/sort.c (fadvise_input): A new function to apply the POSIX_FADV_SEQUENTIAL hint to an input stream. @@ -17410,15 +19346,11 @@ * tests/envvar-check (vars): Add LANGUAGE to the list of envvars to unset. At least in glibc (as an extension to POSIX), its value actually trumps LC_ALL: - $ LC_ALL=es_ES LANGUAGE=fr_FR.UTF-8 /bin/cat no-such /bin/cat: no-such: Aucun fichier ou dossier de ce type - but only when the default locale is not C: - $ LC_ALL=C LANGUAGE=fr_FR.UTF-8 /bin/cat no-such /bin/cat: no-such: No such file or directory - Prompted by a report from Mads Kiilerich. 2010-03-01 Pádraig Brady @@ -17475,7 +19407,6 @@ not otherwise be colored unless FILE is also set. The regression was introduced with commit 483297d5, 28-02-2009, "ls --color no longer outputs unnecessary escape sequences". - * src/ls.c (set_normal_color): A new function to output the NORMAL attribute sequence if it's enabled. (print_current_files): Output NORMAL before printing long format info. @@ -17495,7 +19426,6 @@ These checks were not being run as distcheck-hook targets are only supported in the top-level Makefile. Instead these tests are now run during a syntax-check. - * cfg.mk (sc_man_file_correlation): A new syntax check to call the 2 existing tests to check the correlation between the programs and man/*.[1x]. @@ -17507,8 +19437,6 @@ from the list of programs. This issue was not noticed as the checks were not actually being run. -2010-02-16 Pádraig Brady - tests: fix an unlikely race in tail-2/inotify-hash-abuse2 * tests/tail-2/inotify-hash-abuse2: Explicitly kill the process by using cleanup_() rather than using a timeout which may trigger @@ -17597,7 +19525,6 @@ tests: fix various timeout races Prompted by the continuous integration build failure at: http://hydra.nixos.org/build/277485 - * tests/misc/timeout: Set all expected timeouts to 1s and all unexpected timeouts to 10s. In this way, tests normally proceed quickly but may delay up to 10s before reporting failures. @@ -17618,15 +19545,12 @@ maint: fix a typo in NEWS * NEWS: s/contains/contain/ -2010-02-01 Pádraig Brady - join: make -t '' operate on the whole line Previously passing an empty parameter to -t would raise an error, but now it means to treat each line as a single field for matching. This matches the default operation of `sort` which is usually used in conjunction with join. - * src/join.c (main): Set the field delimiter to '\n' if an empty parameter is passed to -t. (usage): Mention the operation of -t ''. @@ -17644,10 +19568,8 @@ Note join without --check-order will already handle the common case where headings do match in each file, however using --check-order will fail often when the header sorts after the first line of data. - Note also that this will join header lines from each file even if they don't match, with headings from the first file being used. - * NEWS: Mention the new option. * doc/coreutils.texi (join invocation): Describe the new option. * src/join.c (usage): Likewise. @@ -17704,7 +19626,6 @@ Enabled when coreutils is configured with --with-tty-group. Based on a patch written by Piotr Gackiewicz. Details at http://bugzilla.redhat.com/454261 - * src/who.c (is_tty_writable): A new function returning true if a TTY device is writable by the group. Additionally it checks the group to be the same as TTY_GROUP_NAME when compiled with --with-tty-group. @@ -17887,7 +19808,6 @@ field on the right, rather than leaving a one-space separator in each case. Fixes a regression introduced on Mar 6 2009, by commit a4053c5291d5797734b3e4f042f9e1adf3944fd6 - * src/pr.c (print_header): Ensure that there is at least one space before and after the file name part of the header line. * NEWS: Mention it. @@ -17895,8 +19815,6 @@ * THANKS: Update. Reported by Denis McKeon, in https://savannah.gnu.org/bugs/?28492. -2010-01-07 Eric Blake - maint: apply correct license to auxiliary files * gnulib: Update, for maint.mk improvements. * HACKING: Use GFDL 1.3, not 1.2. @@ -18031,7 +19949,6 @@ This fixes a bug whereby tail -F would fail to track changes to a file that was a target of a rename, and when the source of the rename was another tailed file. - * src/tail.c (tail_forever_inotify): Ensure the wd is not already present in the hash table before trying to add it. When a new watch descriptor is added to the `wd_to_name' hash table, check that it is @@ -18085,12 +20002,9 @@ maint: ignore more built files Recent gnulib changes added new built files. - * .gitignore: Add arg-nonnull.h, link-warning.h, unused-parameter.h. -2009-12-26 Eric Blake - tac: supply link dependency * src/Makefile.am (tac_LDADD): Add LIB_GETHRXTIME. * THANKS: Update. @@ -18170,7 +20084,6 @@ touch: fix ctime regression in 'touch -a' Regression introduced in coreutils 8.1 due to a bug in the Linux kernel implementation of utimensat with mtime of UTIME_OMIT. - * gnulib: Update to latest, to pick up utimensat fix. * NEWS: Mention the change. * THANKS: Update. @@ -18394,9 +20307,7 @@ Meanwhile, we were not using xalloc_die properly. Both issues are better solved in gnulib, by introducing xgetgroups; this patch uses the new interface. - Regression introduced by commit 6a31fd8d7. - * gnulib: Update, for mgetgroups improvments. * src/id.c (print_full_info): Adjust caller to die on allocation failure, and no longer worry about ENOSYS. @@ -18417,7 +20328,6 @@ sort: fix link failure on Solaris Commit f9d0bb8481 made sort depend on xnanosleep. - * src/Makefile.am (sort_LDADD): Add LIB_NANOSLEEP. 2009-12-01 Jim Meyering @@ -18467,11 +20377,8 @@ tests: fix link failure on cygwin Counterpart to commit 8fe40b84bd8, since test-link.c uses rename, and we override gnulib with a rename() replacement that can xalloc_die. - * gl/modules/link-tests.diff: New file. -2009-11-24 Eric Blake - build: fix link failure on cygwin Cygwin 1.5 has a broken sleep, and the gnulib tests dragged in rpl_sleep which then caused a link failure because it wasn't in @@ -18479,7 +20386,6 @@ However, sleep and usleep may interact poorly with SIGALRM, and they have less granularity; so it is better to adopt a policy that if we must sleep, prefer xnanosleep. - * src/sort.c (pipe_fork): Use xnanosleep, to avoid the need for rpl_sleep on cygwin, and to reduce granularity. (MAX_FORK_TRIES_COMPRESS, MAX_FORK_TRIES_DECOMPRESS): Increase, @@ -18533,7 +20439,6 @@ With commit 0cc04241, we took the alternate approach of untainting the incoming $ENV{PATH}, but that fails when it contains an other-writable directory. Instead, now we hard code it to '/bin:/usr/bin'. - * tests/misc/pwd-long: Hard code $ENV{PATH} to a safe value. * tests/rm/fail-eperm: Likewise. Reported by Gilles Espinasse, Andreas Schwab, and Bauke Jan Douma. @@ -18639,7 +20544,6 @@ A replacement getgroups is now guaranteed to exist, but it may fail with ENOSYS. mgetgroups is moved to gnulib, and now takes gid_t instead of GETGROUPS_T (but setgroups still needs GETGROUPS_T). - * gnulib: Update to latest. * gl/modules/mgetgroups: Delete, moved to gnulib. * gl/m4/mgetgroups.m4: Likewise. @@ -18679,7 +20583,6 @@ non executable files. Note passing absolute rather than relative names to cap_get_file() reduces the has_capability() overhead from around 33% to 30%. I.E. ls --color is now around 3% faster. - * src/ls.c (struct fileinfo): Add a has_capability member. (print_color_indicator): Refactor to pass just a fileinfo pointer and a flag to say if we're dealing with a symlink target. @@ -18702,7 +20605,6 @@ on stdout, and were potentially vulnerable. dircolors, du, and tsort only used it on stdin, which is unaffected by freopen_safer, but this covers all uses for consistency. - * cfg.mk (sc_require_stdio_safer): New rule. * gl/modules/xfreopen (Depends-on): Add freopen-safer. * gl/lib/xfreopen.c (includes): Use stdio--.h. @@ -18713,13 +20615,10 @@ * src/du.c (includes): Likewise. * src/tsort.c (includes): Likewise. -2009-11-07 Eric Blake - mktemp: fix bug with -q and closed stdout If stdin or stdout is closed, then freopen(,stderr) can violate the premise that STDERR_FILENO==fileno(stderr), which in turn breaks mktemp -q. - * bootstrap.conf (gnulib_modules): Add freopen-safer. * src/mktemp.c (includes): Use stdio--.h. * tests/misc/close-stdout: Enhance test to catch bug. @@ -18769,16 +20668,12 @@ mktemp: use more robust means to avoid double-close of stdout Reverts earlier patch - fflush() can succeed but fclose() fail for some cases of write failures, and we want to catch those. - * src/mktemp.c (stdout_closed): New variable. (maybe_close_stdout): New function, borrowed from dd.c. (main): Track whether stdout has been closed. -2009-11-05 Eric Blake - mktemp: enhance test to catch just-fixed typo behavior Penance for botching the conflict resolution while rebasing my series. - * tests/misc/mktemp (check_tmp): Test for the bug when wrong parameter is used. @@ -18797,7 +20692,6 @@ mktemp: add suffix handling Now that mkstemps is supported, we might as well use it. - * src/mktemp.c (TMPDIR_OPTION): New enum value. (longopts): Add new option. (usage): Document it. @@ -18812,13 +20706,10 @@ * NEWS: Likewise. Fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=548316. -2009-11-05 Eric Blake - build: reflect gnulib changes to tempname In glibc 2.11 and gnulib, gen_tempname added a parameter suffixlen (unfortunately, it is typed as int rather than size_t, for historical compatibility to a poor choice by BSD). - * gnulib: Import latest changes. * gl/lib/tempname.h.diff: Accommodate new suffixlen parameter. * gl/lib/tempname.c.diff (check_x_suffix): Allow for X in suffix @@ -18827,19 +20718,14 @@ (__gen_tempname): Update caller. * src/mktemp.c (mkstemp_len, mkdtemp_len): Update callers. -2009-11-05 Eric Blake - build: override gnulib tempname via diff Diffs are more robust than wholesale replacement, because bootstrap will inform us of any incompatible changes made in upstream gnulib. - * gl/lib/tempname.h: Change... * gl/lib/tempname.h.diff: ...to diff. * gl/lib/tempname.c: Change... * gl/lib/tempname.c.diff: ...to diff. -2009-11-05 Eric Blake - mktemp: rearrange --help output * src/mktemp.c (usage): Align indentation and sort by long options. Describe valid templates. @@ -18983,7 +20869,6 @@ maint: avoid exiting with magic number Cope with gnulib's new sc_prohibit_magic_number_exit rule. - * .x-sc_prohibit_magic_number_exit: New file, to add exemptions. * Makefile.am (syntax_check_exceptions): Distribute it. * lib/euidaccess-stat.c (main): Fix culprits. @@ -19015,11 +20900,9 @@ exec'ing a subsidiary program. However, if we thought the situation warranted a diagnostic, we insist that the diagnostic be printed without error, rather than blindly exec, as it may be a security risk. - For an example, try 'nice -n -1 nice 2>/dev/full'. Failure to raise priority (by lowering niceness) is not fatal, but failure to inform the user about failure to change priority is dangerous. - * src/nice.c (main): Declare failure if writing advisory message to stderr fails. * src/nohup.c (main): Likewise. @@ -19066,7 +20949,6 @@ printenv: ignore bogus variable names Exposed by env a=b=c printenv a=b. - * src/printenv.c (main): Silently reject = in names. * tests/misc/printenv: Test for it. * NEWS: Document this. @@ -19083,12 +20965,9 @@ * doc/coreutils.texi (env invocation): ...into documentation. Suggested by Jim Meyering. -2009-10-28 Eric Blake - env, printenv: add -0/--null option Allows for unambiguous processing when environment values (or even non-portable names!) contain newline. - * src/env.c (longopts): Add new option. (usage): Document it. (main): Implement it. @@ -19101,8 +20980,6 @@ * tests/misc/env-null: New test. * tests/Makefile.am (TESTS): Run it. -2009-10-28 Eric Blake - tests: add printenv coverage * tests/misc/printenv: New test. * tests/Makefile.am (TESTS): Run it. @@ -19123,15 +21000,12 @@ tests: clean up tests of env -- handling The comment in env.c about -- handling has not matched the behavior in the code since the initial commit back in 1992. - * src/env.c: Fix bogus comment. * tests/misc/env: Further tweaks, avoiding PATH problems inherent in testing -i, and testing program name containing =. * doc/coreutils.texi (env invocation): Mention that intermediate program is needed to invoke program with name containing =. -2009-10-27 Eric Blake - doc: document PATH interactions with env * doc/coreutils.texi (env invocation): Mention that PATH is modified prior to exec. @@ -19352,7 +21226,6 @@ could cause a configure-time and/or build-time malfunction. Typically, a configure-time function-in-library test is performed via code like this: - LIB_VAR= AC_SUBST([LIB_VAR]) prefix_saved_LIBS=$LIBS @@ -19360,7 +21233,6 @@ [test "$ac_cv_search_FUNC" = "none required" || LIB_VAR=$ac_cv_search_FUNC]) LIBS=$prefix_saved_LIBS - However, in each of the files affected by this change, the LIB_VAR= initialization was omitted. Thus, when set in the environment, its value would propagate into generated Makefiles when FUNC is not found @@ -19599,11 +21471,8 @@ tail -s.1 --pid=$PID_T_MAX does not wait forever, use a timeout longer than 1 second. A 1-second timeout could be too short on a very busy system, and result in a timeout, and hence false-positive failure. - 2009-09-30 Jim Meyering -2009-09-30 Jim Meyering - build: update gnulib submodule to latest build: translate diagnostics from two new files @@ -20163,11 +22032,8 @@ maint: remove unused file: lib/fdopendir-glibc.c * lib/fdopendir-glibc.c: Remove unused file. - 2009-09-05 Jim Meyering -2009-09-05 Jim Meyering - tests: ls/stat-vs-dirent: avoid spurious test failure * tests/ls/stat-vs-dirent: Avoid test failure when run from a directory whose name (or ancestor directory name) starts with ".". @@ -20361,7 +22227,6 @@ forgoing the readdir optimization, for any kernel (including linux!) with POSIX-nonconforming readdir. Note that currently, only Cygwin has been agile enough to conform. - * src/ls.c (RELIABLE_D_INO): Define. (print_dir): Use it. For plenty of discussion, see this long thread: @@ -20621,11 +22486,8 @@ tests: stdbuf: fix a bug in test script * tests/misc/stdbuf: Use skip_test_ only after it's defined. Reported by Berhnard Voelker. - (sc_check-AUTHORS): Rename rule from check-AUTHORS. -2009-08-18 Jim Meyering - build: perform check-AUTHORS via syntax-check, not via "make check" * src/Makefile.am (check): Don't depend on check-AUTHORS. That check fails on systems for which a program like stdbuf is @@ -20749,12 +22611,9 @@ * gl/modules/selinux-at: Likewise. * gnulib: update to latest, to get the new module. -2009-08-06 Jim Meyering - dd: work around buffer length restrictions with oflag=direct (O_DIRECT) dd oflag=direct would fail to copy a file with size that is not a multiple of 512 (destination file system specific) - * NEWS (Bug fixes): Mention it. * src/dd.c (iwrite): Turn off O_DIRECT for any smaller-than-obs-sized write. Don't bother to restore it. @@ -21730,15 +23589,12 @@ by optimizing away; 2005-11-24) appears to have been worth less than a 2% speed-up (and usually much less), so the impact of removing it is negligible. - * src/copy.c (copy_reg): Don't exit the loop early. * tests/cp/proc-short-read: New test, lightly based on a suggestion from Mike Frysinger, to exercise this fix. * tests/Makefile.am (TESTS): Add cp/proc-short-read. * NEWS (Improve robustness): Mention this change. -2009-04-22 Jim Meyering - tests: avoid new "make distcheck" failure due to newer File::Temp With newer perl (e.g., Fedora 10's 4:5.10.0-68.fc10), tests/CuTmpdir.pm stopped removing its temporary directories, with diagnostics like this: @@ -22223,8 +24079,6 @@ Patch by Paul Eggert, Nima Nikzad, Max Chang, Alexander Nguyen, Sahil Amoli, and Nick Graham. -2009-03-18 Paul Eggert - sort: handle fd exhaustion better when merging This is an alternative to my 9 March patch labeled "Silently lower nmerge; don't (sometimes incorrectly) range-check" @@ -22234,14 +24088,12 @@ until one of these calls fails due to file descriptor exhaustion; it then backs off by 1, does a merge with the files that it has opened, and then retries with the (now-smaller) number of files. - This patch requires quite a few more changes to the source code than the earlier patch, but it is in some sense "better" because it doesn't need to call "dup" ahead of time in order to decide whether "open" or "pipe" will fail. Also, it's more robust in the case where "open" or "pipe" fails with errno==EMFILE because some system-wide limit is exhausted. - * src/sort.c (create_temp_file): New arg SURVIVE_FD_EXHAUSTION. (stream_open): New function, containing guts of xfopen. (xfopen): Use it. @@ -22557,39 +24409,30 @@ * HACKING: avoid trailing white space -2009-02-27 Jim Meyering - cp: diagnose invalid "cp -rl dir dir" right away, once again Running "mkdir dir; cp -rl dir dir" would create dir/dir/dir/... rather than diagnosing the "copy-into-self" failure. - The easy fix would have been to revert this part of the change [3ece0355 2008-11-09 cp: use far less memory in some cases] that introduced the bug: - - remember_copied (dst_name, dst_sb.st_ino, dst_sb.st_dev); + if (!x->hard_link) + remember_copied (dst_name, dst_sb.st_ino, dst_sb.st_dev); - However, that would have induced the failure of the new cp/link-heap test, due to the added memory pressure of recording 10k dev/ino pairs. And besides, I liked that improvement and wanted to keep it. - Now that it's obvious recording the just-created-directory dev/ino needn't depend on the setting of hard_link, I realized it is necessary to record the pair only for the first directory created for each source command-line argument. - I made that change, then noticed the new test, cp -rl a d d, would pass when run once, yet output the into-self diagnostic twice. Also note the side effect: it creates d/a and d/d. However, running that same command a second time, now with the modified directory, would fail. - That turned out to be due to the fact that although the first into-self failure was detected in copy_dir, that function would continue copying other entries regardless -- and that would make it fail (eventually) with the unwanted recursion. - * src/copy.c (copy_internal): This function needed an indicator of whether, for a give command line argument, it had already created its first directory. If so, no more need to record dev/ino pairs. If this @@ -22642,7 +24485,6 @@ Ensure comment for translators is included in po file Issue reported by Göran Uddeborg. - * src/system.h: Move the translator comment adjacent to the translated string. * THANKS: Update Göran's email address. @@ -22804,7 +24646,6 @@ seq: Fix equal width calculation when '.' added to last number Issue reported by Samuel Hapák. - * src/seq.c: Account for '.' added to "last" number. * tests/misc/seq: Add corresponding test. * NEWS: Mention the fix. @@ -22868,26 +24709,20 @@ Reported by Alexander V. Lukyanov. See thread for details: http://thread.gmane.org/gmane.linux.kernel/740021/focus=14824 Thanks to Jan Engelhardt for helping me reproduce the problem. - Demonstrate with this in an 80-column xterm: seq 200 # to start in the "bottom" row touch zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz.foo env LS_COLORS='*.foo=0;31;42' ls -og --color=always - Before the fix, you'd see something like this: (where the file name is printed in red on a green background, and each "=" denotes a space on a green background) ... -rw-r--r-- 1 0 Feb 5 11:31 zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz\ zzzzzzzzzzzzzz.foo=================================================== - After the patch, the trailing green spaces are gone: - -rw-r--r-- 1 0 Feb 5 11:31 zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz\ zzzzzzzzzzzzzz.foo -2009-02-10 Jim Meyering - * tests/test-lib.sh: Use skip_test_... in place of echo...;exit 77. 2009-02-10 Nix @@ -22973,7 +24808,6 @@ This patch was originally written by Andreas Grünbacher, nowadays available at http://www.suse.de/~agruen/coreutils/5.91/coreutils-xattr.diff - * bootstrap.conf: Add gnulib module verror. * po/POTFILES.in: Add lib/verror.c. * m4/xattr.m4: Check for libattr availability, new configure option @@ -23018,37 +24852,30 @@ * tests/misc/shred-passes: Verify the operations shred does by default to overwrite and remove a zero length file. -2009-01-28 Pádraig Brady - dd: Better handle user specified offsets that are too big Following are the before and after operations for seekable files, for the various erroneous offsets handled by this patch: - skip beyond end of file before: immediately exit(0); after : immediately printf("cannot skip to specified offset"); exit(0); - skip > max file size before: read whole file and exit(0); after : immediately printf("cannot skip: Invalid argument"); exit(1); seek > max file size before: immediately printf("truncate error: EFBIG"); exit(1); after : immediately printf("truncate error: EFBIG"); exit(1); - skip > OFF_T_MAX before: read whole device/file and exit(0); after : immediately printf("cannot skip:"); exit(1); seek > OFF_T_MAX before: immediately printf("truncate error: offset too large"); exit(1); after : immediately printf("truncate error: offset too large"); exit(1); - skip > device size before: read whole device and exit(0); after : immediately printf("cannot skip: Invalid argument"); exit(1); seek > device size before: read whole device and printf("write error: ENOSPC"); exit(1); after : immediately printf("cannot seek: Invalid argument"); exit(1); - * NEWS: Summarize this change in behavior. * src/dd.c (skip): Add error checking for large seek/skip offsets on seekable files, rather than deferring to using read() to advance offset. @@ -23279,7 +25106,6 @@ (gl_CHECK_ALL_TYPES): Likewise. * m4/lib-check.m4 (cu_LIB_CHECK): Likewise. * m4/stat-prog.m4 (cu_PREREQ_STAT_PROG): Likewise. - FYI, I first ran this command: git ls-files | grep -E '\.(m4|ac)$' | xargs perl -pi \ -e 's/(AC_[A-Z_]+\()([^[()]+?)([,)])/$1\[$2]$3/g;' \ @@ -23375,7 +25201,6 @@ add configure-time --enable-gcc-warnings option; avoid warnings". Pádraig Brady spotted the contradiction between the log message and actual change. - This reverts commit 292d68565a34b237cd2bf586ace545b7cd3dbfcf. 2008-12-23 Pádraig Brady @@ -23780,7 +25605,6 @@ for all but the C/POSIX locale. * src/system.h: Include "hard-locale.h". (emit_bug_reporting_address): Tell where to report translation bugs. - don't include "hard-locale.h", now that system.h does * src/comm.c: Likewise. * src/join.c: Likewise. @@ -23791,8 +25615,6 @@ * src/uniq.c: Likewise. * src/who.c: Likewise. -2008-11-10 Jim Meyering - avoid warnings about discarding "qualifiers from pointer target type" Use the new "bad_cast" function or an actual cast-to-"(char *)" to avoid warnings. @@ -23909,7 +25731,6 @@ 'factor'. The case for removing --bignum isn't as strong as that for 'expr', but still, it seems to me that these options are not needed and complicate the documentation unnecessarily. - * doc/coreutils.texi (factor invocation): Remove --bignum, --no-bignum. * src/factor.c (algorithm, ALGORITHM_CHOICE, USE_BIGNUM, NO_USE_BIGNUM): Remove; all uses removed. @@ -23976,7 +25797,6 @@ Add better checks and docs for build tools Prompted by a report from Ed Avis: - * README-hacking: Organise LZMA and Valgrind as as optional requirements rather than in their own sections. Mention bootstrap will now check tool versions. @@ -24364,8 +26184,6 @@ * tests/rm/ext3-perf: New file. Test for the performance fix. * NEWS: mention the new feature -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. (top_dir): Param is no longer "const". @@ -24379,11 +26197,8 @@ (ds_free): Don't free DS, now that it's no longer malloc'd. (rm): Allocate DS on the stack. Arrange to handle ds_init allocation failure. - step1 -2008-09-26 Jim Meyering - * maint.mk (my-distcheck): remove duplicate c99-related test code maint: allow more C99 constructs; stop maintaining c99-to-c89 patch set @@ -24391,26 +26206,20 @@ With the recent changes to remove.c, I no longer wish to maintain the c99-to-c89 patch set. -2008-09-26 Jim Meyering - seq -0.1 0.1 2: print final number when locale's decimal point is "," * src/seq.c (print_numbers): Use strtold, not c_strtold to convert from just-formatted-using-asprintf string back to double, since asprintf may have used something other than "." as the decimal point. Reported by lsof@nodata.co.uk as . Thanks to Ondřej Vašík for discovering that the bug was locale-related. - $ LC_ALL=cs_CZ.UTF-8 seq -0.1 0.1 2|grep 2.0 [Exit 1] $ seq -0.1 0.1 2|grep 2.0 2.0 - * tests/check.mk (TESTS_ENVIRONMENT): Add LOCALE_FR_UTF8, for... * tests/misc/seq [locale-dec-pt]: New test for the above. * NEWS (bug fix): Mention it. -2008-09-26 Jim Meyering - maint: relax a check so "make distcheck" succeeds again * maint.mk (makefile-check): Relax the check, in order to exempt the necessary use of a sole @...@-delimited Makefile.am variable. @@ -24555,21 +26364,15 @@ Avoid failure on Solaris 11, since their /bin/sh passes the tests in posix-shell.m4, yet does not support "local" (which is not POSIX). -2008-09-10 Jim Meyering - tests: use "Exit $fail", not (exit $fail); exit $fail * tests/test-lib.sh (Exit): New function by Ralf Wildenhues in automake http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=20594c08f63 * tests/**: Convert all uses: - This restrictive change converted the vast majority: - git grep -l '^(exit \$fail); exit \$fail$' \ | xargs perl -pi -e 's/'^\(exit \$fail\); exit \$fail$/Exit \$fail/' - And this did the rest, plus a few undesirable ones, so I manually backed out the changes to ChangeLog-* and build-aux/check.mk: - git grep -l -E '\(exit [^)]+\); exit ' \ | xargs perl -pi -e 's/\(exit (.+?)\); exit \1/Exit $1/' @@ -25131,7 +26934,6 @@ tests: expand: test for lines starting with both spaces and tabs The expand released in current distributions (Fedora Core 4 - Fedora 9 at least), doesn't expand --initial tabs if spaces are present. - tests/misc/expand: Add test to verify --initial works correctly with lines starting with both spaces and tabs. @@ -26153,8 +27955,6 @@ * tests/Makefile.am (TESTS): Add misc/invalid-opt. * tests/misc/invalid-opt: New file. -2008-05-17 Jim Meyering - tests: remove ugly /bin/sh wrapper around each perl-based test script * tests/check.mk (TESTS_ENVIRONMENT): Save and restore TMPDIR around envvar-check, so that the few scripts that require $TMPDIR don't fail. @@ -26163,20 +27963,16 @@ FIXME: this is pretty ugly. maybe undo it and find a better way. (TESTS_ENVIRONMENT): Invoke perl scripts with $(PERL), and use -T if the script requires that. Otherwise, use $(SHELL). - * tests/misc/md5sum-newline: Create a file whose name contains a newline in Perl (resort to using "system", since open refuses). - Fix old brokenness exposed by this change: * tests/du/files0-from: Correct test not to rely on stdin being attached to a non-tty. * tests/misc/sort (3g, 3h, 3i): Likewise: add explicit empty input file. Avoid warnings about using qw()-around-commas. - * tests/rm/fail-eperm: Now that this test is run from a temporary subdirectory, adjust the full name of the "rm" program we're going to run. - Change #!/bin/sh to #!/usr/bin/perl, and factor out the few lines of boilerplate code to invoke perl. Do not "require 5.00x"; a configure-time Perl test handles that @@ -26394,18 +28190,13 @@ * tests/head/in-1024: Remove file. * tests/Coreutils.pm (triple_test): New function. -2008-05-06 Jim Meyering - tests: Coreutils.pm improvements * tests/Coreutils.pm: Allow test names longer than 12. Print a useful diagnostic for bogus spec entry. - Handle the combination of IN_PIPE and ENV properly. * tests/Coreutils.pm (run_tests): Put ENV right before command, not before the "cat INPUT_FILE |" prefix. -2008-05-06 Jim Meyering - tests: move "sparse-file" into test-lib.sh * tests/sparse-file: Remove file Move contents into ... * tests/test-lib.sh (require_sparse_support_): ...here. New function. @@ -26562,8 +28353,6 @@ * maint.mk (sc_prohibit_strcmp): Relax regexp to recognize other formatting styles. -2008-05-06 Jim Meyering - avoid problems with sign-extended "char" operand to is* functions * src/cut.c (set_fields): Apply to_uchar to isblank operands. * src/uniq.c (find_field): Likewise. @@ -26574,19 +28363,14 @@ * configure.ac: Use gt_LOCALE_FR. * tests/check.mk (TESTS_ENVIRONMENT): Propagate LOCALE_FR to scripts. * NEWS: Mention the bug fixes. - Before this patch, on FreeBSD 6: - $ printf 'x y z\nx \xa0 y z\n' > in $ LC_ALL=fr_FR.UTF-8 uniq -f2 in|tr ' ' . x.y.z x. .y.z - With the patch: - $ LC_ALL=fr_FR.UTF-8 uniq -f2 in|tr ' ' . x.y.z - This also affected many other locales: for i in $(locale -a); do test $(LC_ALL=$i ./uniq -f1 in|wc -l) = $(LC_ALL=$i uniq -f1 in|wc -l) || echo $i ; done @@ -26802,7 +28586,6 @@ http://thread.gmane.org/gmane.org.fsf.announce/867/focus=13345 This also reverts the bug-fix that applied solely to the new code used to avoid printing those IDs - Revert "id bug fix: don't point to potentially clobbered static storage" This reverts commit f7d1c59c224f81a8bab5fa2afcaf815988f50467. Revert "Work around AFS bug: id and groups would print invalid group number." @@ -26859,25 +28642,18 @@ * maint.mk (sc_root_tests): Adapt rule to new syntax used in tests/Makefile.am. -2008-04-20 Jim Meyering - Revamp test-related Makefiles. One side-effect of this change is that "make check" now works even if you put "." early in your shell's search PATH (don't do that!). - Remove all test-related Makefile.am files, except those generated by mk-script. Instead, tests/Makefile.am now lists not only the tests directly under tests/, but also those in tests/*/ that are not generated by mk-script, e.g., cp/abuse, cp/acl, mv/i-1, etc. - A lot of these changes are like this: - -. $srcdir/../lang-default +. $top_srcdir/tests/lang-default - -. $srcdir/../test-lib.sh +. $top_srcdir/tests/test-lib.sh - * configure.ac (AC_CONFIG_FILES): Remove corresponding Makefiles. * tests/check.mk (vc_exe_in_TESTS): Relax syntax requirements. * tests/rwx-to-mode: Remove file. Rewritten as... @@ -26887,8 +28663,6 @@ (EXTRA_DIST): Add $(TESTS). (TESTS): Add over 300 entries. -2008-04-20 Jim Meyering - * tests/misc/Makefile.am (built_programs): Remove. Unused. Use "env" to invoke potential built-ins. @@ -27643,7 +29417,6 @@ Make copyright comments consistent. * src/mktemp.c: Update copyright to use newer form. - Make first copyright lines consistent. Some did not end in ", Inc.". Due to that missing ", Inc" at end of line, emacs' copyright-updating code missed some opportunities. This corrects most of those, and @@ -27806,14 +29579,11 @@ * Makefile.am (check-ls-dircolors): New rule. (distcheck-hook): Depend on it. -2008-02-17 Jim Meyering - Expand "ls --color" tests to also use the dircolors defaults. * tests/misc/ls-misc: Adjust this test so each is run twice. First, as usual, and the second time with LS_COLORS set using the default settings produced by running dircolors. * tests/Coreutils.pm: See below. - This required some changes: - save and restore $ENV{LS_COLORS} for each individual test that requires a specific value. @@ -27821,8 +29591,6 @@ than once, it has exposed that that function erroneously modifies the \@Tests array. Fix that in tests/Coreutils.pm. -2008-02-17 Jim Meyering - Adjust dircolors to match ls.c. * src/dircolors.hin: comment out NORMAL and FILE, define RESET. * src/dircolors.c (slack_codes) Add "RESET". @@ -27995,8 +29763,6 @@ * Makefile.maint (sc_root_tests): Reflect this change: search for the new function name. -2008-02-09 Jim Meyering - tests: factor out the perl-requiring code in many test scripts * tests/require-perl: New file. * tests/Makefile.am (EXTRA_DIST): Add require-perl. @@ -28044,11 +29810,8 @@ * tests/rm/empty-name: Likewise. * tests/rm/fail-eperm: Likewise. * tests/rm/unreadable: Likewise. - (EXTRA_DIST): *do* require require-perl as a stand-alone, 'source'able script. -2008-02-09 Jim Meyering - tests: call skip_test_ in place of echo+exit 77 * tests/mv/no-target-dir: Likewise. * tests/other-fs-tmpdir: Likewise. diff --git a/ChangeLog-2005 b/ChangeLog-2005 index 5aafb1c8..efa22d84 100644 --- a/ChangeLog-2005 +++ b/ChangeLog-2005 @@ -11609,7 +11609,7 @@ ----- - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 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 d173c814..4bb68f94 100644 --- a/ChangeLog-2006 +++ b/ChangeLog-2006 @@ -4033,7 +4033,7 @@ ----- - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 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 f4b34a1c..dbcea618 100644 --- a/ChangeLog-2007 +++ b/ChangeLog-2007 @@ -4015,7 +4015,7 @@ ----- - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 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 c04457ab..5ab5bbd1 100644 --- a/ChangeLog-2008 +++ b/ChangeLog-2008 @@ -372,7 +372,7 @@ ----- - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 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 4ab64294..6617eec2 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2006-2015 Free Software Foundation, Inc. # This program is free 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 20998407..dadea5c1 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, -Inc. + Copyright (C) 1994-1996, 1999-2002, 2004-2015 Free Software +Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -12,97 +12,96 @@ without warranty of any kind. Basic Installation ================== - Briefly, the shell command `./configure && make && make install' + Briefly, the shell command './configure && make && make install' should configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for +more-detailed instructions are generic; see the 'README' file for instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented +'INSTALL' file but do not implement all of the features documented below. The lack of an optional feature in a given package is not necessarily a bug. More recommendations for GNU packages can be found in *note Makefile Conventions: (standards)Makefile Conventions. - The `configure' shell script attempts to guess correct values for + The 'configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that +those values to create a 'Makefile' in each directory of the package. +It may also create one or more '.h' files containing system-dependent +definitions. Finally, it creates a shell script 'config.status' that you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). +file 'config.log' containing compiler output (useful mainly for +debugging 'configure'). - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. + It can also use an optional file (typically called 'config.cache' and +enabled with '--cache-file=config.cache' or simply '-C') that saves the +results of its tests to speed up reconfiguring. Caching is disabled by +default to prevent problems with accidental use of stale cache files. If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can +to figure out how 'configure' could check whether to do them, and mail +diffs or instructions to the address given in the 'README' so they can be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you +some point 'config.cache' contains results you don't want to keep, you may remove or edit it. - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. + The file 'configure.ac' (or 'configure.in') is used to create +'configure' by a program called 'autoconf'. You need 'configure.ac' if +you want to change it or regenerate 'configure' using a newer version of +'autoconf'. The simplest way to compile this package is: - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. + 1. 'cd' to the directory containing the package's source code and type + './configure' to configure the package for your system. - Running `configure' might take a while. While running, it prints + Running 'configure' might take a while. While running, it prints some messages telling which features it is checking for. - 2. Type `make' to compile the package. + 2. Type 'make' to compile the package. - 3. Optionally, type `make check' to run any self-tests that come with + 3. Optionally, type 'make check' to run any self-tests that come with the package, generally using the just-built uninstalled binaries. - 4. Type `make install' to install the programs and any data files and + 4. Type 'make install' to install the programs and any data files and documentation. When installing into a prefix owned by root, it is recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root + user, and only the 'make install' phase executed with root privileges. - 5. Optionally, type `make installcheck' to repeat any self-tests, but + 5. Optionally, type 'make installcheck' to repeat any self-tests, but this time using the binaries in their final installed location. This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required + regular user, particularly if the prior 'make install' required root privileges, verifies that the installation completed correctly. 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly + source code directory by typing 'make clean'. To also remove the + files that 'configure' created (so you can compile the package for + a different kind of computer), type 'make distclean'. There is + also a 'make maintainer-clean' target, but that is intended mainly for the package's developers. If you use it, you may have to get all sorts of other programs in order to regenerate files that came with the distribution. - 7. Often, you can also type `make uninstall' to remove the installed + 7. Often, you can also type 'make uninstall' to remove the installed files again. In practice, not all packages have tested that uninstallation works correctly, even though it is required by the GNU Coding Standards. - 8. Some packages, particularly those that use Automake, provide `make + 8. Some packages, particularly those that use Automake, provide 'make distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. + targets like 'make install' and 'make uninstall' work correctly. This target is generally not run by end users. Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' +the 'configure' script does not know about. Run './configure --help' for details on some of the pertinent environment variables. - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: + You can give 'configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here is +an example: ./configure CC=c99 CFLAGS=-g LIBS=-lposix @@ -113,21 +112,21 @@ Compiling For Multiple Architectures You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the +own directory. To do this, you can use GNU 'make'. 'cd' to the directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. +the 'configure' script. 'configure' automatically checks for the source +code in the directory that 'configure' is in and in '..'. This is known +as a "VPATH" build. - With a non-GNU `make', it is safer to compile the package for one + With a non-GNU 'make', it is safer to compile the package for one architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before +installed the package for one architecture, use 'make distclean' before reconfiguring for another architecture. On MacOS X 10.5 and later systems, you 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 +"universal" binaries--by specifying multiple '-arch' options to the +compiler but only a single '-arch' option to the preprocessor. Like this: ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ @@ -136,105 +135,104 @@ this: This is not guaranteed to produce working output in all cases, you may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. +using the 'lipo' tool if you have problems. Installation Names ================== - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an + By default, 'make install' installs the package's commands under +'/usr/local/bin', include files under '/usr/local/include', etc. You +can specify an installation prefix other than '/usr/local' by giving +'configure' the option '--prefix=PREFIX', where PREFIX must be an absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses +pass the option '--exec-prefix=PREFIX' to 'configure', the package uses PREFIX as the prefix for installing programs and libraries. Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory +options like '--bindir=DIR' to specify different values for particular +kinds of files. Run 'configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the default +for these options is expressed in terms of '${prefix}', so that +specifying just '--prefix' will affect all of the other directory specifications that were not explicitly provided. The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or +correct locations to 'configure'; however, many packages provide one or both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without +'make install' command line to change installation locations without having to reconfigure or recompile. The first method involves providing an override variable for each -affected directory. For example, `make install +affected directory. For example, 'make install prefix=/alternate/directory' will choose an alternate location for all directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and +'${prefix}'. Any directories that were specified during 'configure', +but not in terms of '${prefix}', must each be overridden at install time +for the entire installation to be relocated. The approach of makefile +variable overrides for each directory variable is required by the GNU +Coding Standards, and ideally causes no recompilation. However, some +platforms have known limitations with the semantics of shared libraries +that end up requiring recompilation when using this method, particularly +noticeable in packages that use GNU Libtool. + + The second method involves providing the 'DESTDIR' variable. For +example, 'make install DESTDIR=/alternate/directory' will prepend +'/alternate/directory' before all installation names. The approach of +'DESTDIR' overrides is not required by the GNU Coding Standards, and does not work on platforms that have drive letters. On the other hand, it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. +when some directory options were not specified in terms of '${prefix}' +at 'configure' time. Optional Features ================= If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the +with an extra prefix or suffix on their names by giving 'configure' the +option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'. + + Some packages pay attention to '--enable-FEATURE' options to +'configure', where FEATURE indicates an optional part of the package. +They may also pay attention to '--with-PACKAGE' options, where PACKAGE +is something like 'gnu-as' or 'x' (for the X Window System). The +'README' should mention any '--enable-' and '--with-' options that the package recognizes. - For packages that use the X Window System, `configure' can usually + For packages that use the X Window System, 'configure' can usually find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. +you can use the 'configure' options '--x-includes=DIR' and +'--x-libraries=DIR' to specify their locations. Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure +execution of 'make' will be. For these packages, running './configure --enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure +overridden with 'make V=1'; while running './configure --disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. +overridden with 'make V=0'. Particular systems ================== - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in + On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC +is not installed, it is recommended to use the following options in order to use an ANSI C compiler: ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. + HP-UX 'make' updates targets which have the same time stamps as their +prerequisites, which makes it generally unusable when shipped generated +files such as 'configure' are involved. Use GNU 'make' instead. On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try +parse its '' header file. The option '-nodtk' can be used as a +workaround. If GNU CC is not installed, it is therefore recommended to +try ./configure CC="cc" @@ -242,26 +240,26 @@ and if that doesn't work, try ./configure CC="cc -nodtk" - On Solaris, don't put `/usr/ucb' early in your `PATH'. This + On Solaris, don't put '/usr/ucb' early in your 'PATH'. This directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. +these programs are available in '/usr/bin'. So, if you need '/usr/ucb' +in your 'PATH', put it _after_ '/usr/bin'. - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: + On Haiku, software installed for all users goes in '/boot/common', +not '/usr/local'. It is recommended to use the following options: ./configure --prefix=/boot/common Specifying the System Type ========================== - There may be some features `configure' cannot figure out + There may be some features 'configure' cannot figure out automatically, but needs to determine by the type of machine the package will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints +_same_ architectures, 'configure' can figure that out, but if it prints a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: +'--build=TYPE' option. TYPE can either be a short name for the system +type, such as 'sun4', or a canonical name which has the form: CPU-COMPANY-SYSTEM @@ -270,101 +268,101 @@ where SYSTEM can have one of these forms: OS KERNEL-OS - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't + See the file 'config.sub' for the possible values of each field. If +'config.sub' isn't included in this package, then this package doesn't need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will +use the option '--target=TYPE' to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a platform different from the build platform, you should specify the "host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. +eventually be run) with '--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. + If you want to set default values for 'configure' scripts to share, +you can create a site shell script called 'config.site' that gives +default values for variables like 'CC', 'cache_file', and 'prefix'. +'configure' looks for 'PREFIX/share/config.site' if it exists, then +'PREFIX/etc/config.site' if it exists. Or, you can set the +'CONFIG_SITE' environment variable to the location of the site script. +A warning: not all 'configure' scripts look for a site script. Defining Variables ================== Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run +environment passed to 'configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: +them in the 'configure' command line, using 'VAR=value'. For example: ./configure CC=/usr/local2/bin/gcc -causes the specified `gcc' to be used as the C compiler (unless it is +causes the specified 'gcc' to be used as the C compiler (unless it is overridden in the site shell script). -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf limitation. Until the limitation is lifted, you can use -this workaround: +Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an +Autoconf limitation. Until the limitation is lifted, you can use this +workaround: CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash -`configure' Invocation +'configure' Invocation ====================== - `configure' recognizes the following options to control how it + 'configure' recognizes the following options to control how it operates. -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. +'--help' +'-h' + Print a summary of all of the options to 'configure', and exit. -`--help=short' -`--help=recursive' +'--help=short' +'--help=recursive' Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. + 'configure', and exit. The 'short' variant lists options used only + in the top level, while the 'recursive' variant lists options also + present in any nested packages. -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' +'--version' +'-V' + Print the version of Autoconf used to generate the 'configure' script, and exit. -`--cache-file=FILE' +'--cache-file=FILE' Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to + traditionally 'config.cache'. FILE defaults to '/dev/null' to disable caching. -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. +'--config-cache' +'-C' + Alias for '--cache-file=config.cache'. -`--quiet' -`--silent' -`-q' +'--quiet' +'--silent' +'-q' Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error + suppress all normal output, redirect it to '/dev/null' (any error messages will still be shown). -`--srcdir=DIR' +'--srcdir=DIR' Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. + 'configure' can determine that directory automatically. -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. +'--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: for + more details, including other options available for fine-tuning the + installation locations. -`--no-create' -`-n' +'--no-create' +'-n' Run the configure checks, but stop before creating any output files. -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. +'configure' also accepts some other, not widely useful, options. Run +'configure --help' for more details. diff --git a/Makefile.am b/Makefile.am index fb4af272..cc4fde7a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # Make coreutils. -*-Makefile-*- -# Copyright (C) 1990-2014 Free Software Foundation, Inc. +# Copyright (C) 1990-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -158,16 +158,24 @@ ASSORT = LC_ALL=C sort # Extract all lines up to the first one starting with "##". prologue = perl -ne '/^\#\#/ and exit; print' $(srcdir)/THANKS.in +# FIXME: avoid dependency to build our own 'sort' for 'make dist' ... +# when common platforms have a functional case-folding implementation: +# $ test 'abácad' = "$(printf '%s\n' 'ab' 'ác' 'ad' \ +# | LC_ALL=en_US.UTF-8 sort -f \ +# | tr -d '\n')" && echo GOOD || echo BAD +# Note we don't enable case folding (-f) in the sort below, due to bugs +# in the I18N patch used in many distros (as of 2015). Also using our +# own src/sort here would induce awkward dependencies for `make dist`. THANKS: THANKS.in Makefile.am .mailmap thanks-gen .version $(AM_V_GEN)rm -f $@-t $@; \ { \ $(prologue); echo; \ - { perl -ne '/^$$/.../^$$/ and print' $(srcdir)/THANKS.in \ - | grep -v '^$$' | perl -pe 's/ +/\0/'; \ + { perl -ne '/^$$/.../^$$/ and !/^$$/ and s/ +/\0/ and print' \ + $(srcdir)/THANKS.in; \ git log --pretty=format:'%aN%x00%aE' \ | $(ASSORT) -u; \ } | $(srcdir)/thanks-gen \ - | LC_ALL=en_US.UTF-8 sort -f; \ + | LC_ALL=en_US.UTF-8 sort -k1,1; \ echo; \ printf ';; %s\n' 'Local Variables:' 'coding: utf-8' End:; \ } > $@-t && chmod a-w $@-t && mv $@-t $@ @@ -190,7 +198,8 @@ check-git-hook-script-sync: # the selected tools when installing. install-exec-hook: $(AM_V_at)ctrans=$$(printf coreutils | sed -e "$(transform)"); \ - for p in $(single_binary_progs); do \ + for p in x $(single_binary_progs); do \ + test $$p = x && continue; \ ptrans=$$(printf '%s' "$$p" | sed -e "$(transform)"); \ rm -f $(DESTDIR)$(bindir)/$$ptrans$(EXEEXT) || exit $$?; \ if test "x$(single_binary_install_type)" = xshebangs; then \ diff --git a/Makefile.in b/Makefile.in index 140a4286..4de12342 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,7 @@ # Make coreutils. -*-Makefile-*- -# Copyright (C) 1990-2014 Free Software Foundation, Inc. +# Copyright (C) 1990-2015 Free Software Foundation, Inc. # This 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 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 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 @@ -52,7 +52,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libcoreutils --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=build-aux --with-tests --avoid=canonicalize-lgpl --avoid=dummy --makefile-name=gnulib.mk --no-conditional-dependencies --no-libtool --macro-prefix=gl acl alignof alloca announce-gen areadlink-with-size argmatch argv-iter assert autobuild backupfile base64 buffer-lcm c-strcase c-strtod c-strtold calloc-gnu canon-host canonicalize chown cloexec closein closeout config-h configmake crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 cycle-check d-ino d-type di-set diacrit dirfd dirname do-release-commit-and-tag dtoastr dup2 environ error euidaccess exclude exitfail faccessat fadvise fchdir fchmodat fchownat fclose fcntl fcntl-safer fd-reopen fdatasync fdl fdopen fdutimensat file-type fileblocks filemode filenamecat filevercmp fnmatch-gnu fopen-safer fprintftime freopen freopen-safer fseeko fstatat fsusage fsync ftello ftoastr ftruncate fts full-read full-write getgroups gethrxtime getline getloadavg getlogin getndelim2 getopt-gnu getpagesize getpass-gnu gettext-h gettime gettimeofday getugroups getusershell git-version-gen gitlog-to-changelog gnu-make gnu-web-doc-update gnumakefile gnupload group-member hard-locale hash hash-pjw heap host-os human idcache ignore-value inttostr inttypes isapipe isatty isblank largefile lchmod lchown ldtoastr lib-ignore linebuffer link link-follow linkat long-options lstat maintainer-makefile malloc-gnu manywarnings mbrlen mbrtowc mbsalign mbswidth memcasecmp memchr memcmp2 mempcpy memrchr mgetgroups mkancesdirs mkdir mkdir-p mkfifo mknod mkstemp mktime modechange mountlist mpsort netinet_in non-recursive-gnulib-prefix-hack nproc obstack parse-datetime pathmax perl physmem pipe-posix posix-shell posixtm posixver priv-set progname propername pthread putenv quote quotearg randint randperm read-file readlink readtokens readtokens0 readutmp realloc-gnu regex remove rename rmdir root-dev-ino rpmatch safe-read same save-cwd savedir savewd selinux-at settime sig2str sigaction smack ssize_t stat-macros stat-size stat-time statat stdbool stdlib-safer stpcpy stpncpy strdup-posix strftime strncat strnumcmp strpbrk strsignal strtod strtoimax strtoumax symlink sys_ioctl sys_resource sys_stat sys_wait termios timer-time timespec tzset uname unicodeio unistd-safer unlink-busy unlinkat unlocked-io unsetenv update-copyright uptime useless-if-before-free userspec utimecmp utimens vasprintf-posix vc-list-files verify verror version-etc-fsf wcswidth wcwidth winsz-ioctl winsz-termios write-any-file xalloc xfreopen xfts xgetcwd xgetgroups xgethostname xmemcoll xnanosleep xprintf xprintf-posix xreadlink xstrtod xstrtoimax xstrtol xstrtold xstrtoumax yesno +# 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-has-acl 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 linked-list long-options lstat maintainer-makefile malloc-gnu manywarnings mbrlen mbrtowc mbsalign mbswidth memcasecmp memchr memcmp2 mempcpy memrchr mgetgroups mkancesdirs mkdir mkdir-p mkfifo mknod mkstemp mktime modechange mountlist mpsort netinet_in non-recursive-gnulib-prefix-hack nproc obstack parse-datetime pathmax perl physmem pipe-posix posix-shell posixtm posixver priv-set progname propername pthread putenv quote quotearg randint randperm read-file readlink readtokens readtokens0 readutmp realloc-gnu regex remove rename rmdir root-dev-ino rpmatch safe-read same save-cwd savedir savewd selinux-at setenv settime sig2str sigaction smack ssize_t stat-macros stat-size stat-time statat stdbool stdlib-safer stpcpy stpncpy strdup-posix strftime strncat strnumcmp strpbrk strsignal strtod strtoimax strtoumax symlink sys_ioctl sys_resource sys_stat sys_wait tempname 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 xdectoint xfreopen xfts xgetcwd xgetgroups xgethostname xlist 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. @@ -60,7 +60,7 @@ # Make coreutils documentation. -*-Makefile-*- # This is included by the top-level Makefile.am. -# Copyright (C) 1995-2014 Free Software Foundation, Inc. +# Copyright (C) 1995-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -78,7 +78,7 @@ # Make coreutils man pages. -*-Makefile-*- # This is included by the top-level Makefile.am. -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This 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,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -157,29 +167,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk \ - $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk \ - $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk \ - $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk \ - INSTALL NEWS README AUTHORS ChangeLog $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(top_srcdir)/lib/config.hin ABOUT-NLS \ - $(top_srcdir)/lib/alloca.c lib/parse-datetime.c \ - $(top_srcdir)/build-aux/depcomp $(top_srcdir)/build-aux/ylwrap \ - $(doc_coreutils_TEXINFOS) $(top_srcdir)/build-aux/mdate-sh \ - $(srcdir)/doc/version.texi $(srcdir)/doc/stamp-vti \ - $(top_srcdir)/build-aux/texinfo.tex $(noinst_HEADERS) \ - $(top_srcdir)/build-aux/test-driver COPYING THANKS TODO \ - build-aux/compile build-aux/config.guess \ - build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ - build-aux/install-sh build-aux/mdate-sh build-aux/missing \ - build-aux/texinfo.tex build-aux/ylwrap \ - $(top_srcdir)/build-aux/compile \ - $(top_srcdir)/build-aux/config.guess \ - $(top_srcdir)/build-aux/config.rpath \ - $(top_srcdir)/build-aux/config.sub \ - $(top_srcdir)/build-aux/install-sh \ - $(top_srcdir)/build-aux/missing @LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__append_1 = lib/unistr/u8-mbtoucr.c @LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__append_2 = lib/unistr/u8-uctomb.c lib/unistr/u8-uctomb-aux.c @LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_3 = lib/uniwidth/width.c @@ -397,6 +384,7 @@ noinst_PROGRAMS = src/getlimits$(EXEEXT) src/make-prime-list$(EXEEXT) @SINGLE_BINARY_TRUE@ src/libsinglebin_wc.a \ @SINGLE_BINARY_TRUE@ src/libsinglebin_whoami.a \ @SINGLE_BINARY_TRUE@ src/libsinglebin_yes.a +@SINGLE_BINARY_TRUE@am__append_5 = src/coreutils$(EXEEXT) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ @@ -518,15 +506,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.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/po.m4 \ - $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/posixtm.m4 \ - $(top_srcdir)/m4/posixver.m4 $(top_srcdir)/m4/prereq.m4 \ - $(top_srcdir)/m4/printf-frexp.m4 \ + $(top_srcdir)/m4/nproc.m4 $(top_srcdir)/m4/obstack.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/po.m4 $(top_srcdir)/m4/posix-shell.m4 \ + $(top_srcdir)/m4/posixtm.m4 $(top_srcdir)/m4/posixver.m4 \ + $(top_srcdir)/m4/prereq.m4 $(top_srcdir)/m4/printf-frexp.m4 \ $(top_srcdir)/m4/printf-frexpl.m4 $(top_srcdir)/m4/printf.m4 \ $(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/pthread.m4 $(top_srcdir)/m4/putenv.m4 \ @@ -611,6 +599,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/cu-progs.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(srcdir)/doc/version.texi \ + $(srcdir)/doc/stamp-vti $(noinst_HEADERS) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -626,10 +617,11 @@ lib_libcoreutils_a_AR = $(AR) $(ARFLAGS) am__DEPENDENCIES_1 = LIBOBJDIR = lib/ am__lib_libcoreutils_a_SOURCES_DIST = lib/copy-acl.c lib/set-acl.c \ - lib/allocator.c lib/areadlink.c lib/areadlink-with-size.c \ - lib/areadlinkat.c lib/argmatch.c lib/argv-iter.c \ - lib/argv-iter.h lib/backupfile.c lib/base64.h lib/base64.c \ - lib/bitrotate.h lib/bitrotate.c lib/buffer-lcm.c \ + lib/acl-errno-valid.c lib/acl-internal.c lib/get-permissions.c \ + lib/set-permissions.c lib/allocator.c lib/areadlink.c \ + lib/areadlink-with-size.c lib/areadlinkat.c lib/argmatch.c \ + lib/argv-iter.c lib/argv-iter.h lib/backupfile.c lib/base64.h \ + lib/base64.c lib/bitrotate.h lib/bitrotate.c lib/buffer-lcm.c \ lib/buffer-lcm.h lib/c-ctype.h lib/c-ctype.c lib/c-strcase.h \ lib/c-strcasecmp.c lib/c-strncasecmp.c lib/c-strtod.c \ lib/c-strtold.c lib/canon-host.c lib/canonicalize.c \ @@ -642,70 +634,74 @@ am__lib_libcoreutils_a_SOURCES_DIST = lib/copy-acl.c lib/set-acl.c \ lib/exitfail.c lib/fadvise.c lib/fadvise.h lib/chmodat.c \ lib/chownat.c lib/creat-safer.c lib/open-safer.c lib/fd-hook.c \ lib/fd-reopen.c lib/fd-reopen.h lib/fd-safer-flag.c \ - lib/dup-safer-flag.c lib/fdutimensat.c lib/file-set.c \ - lib/file-type.c lib/filemode.c lib/filenamecat.c \ - 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/dup-safer-flag.c lib/fdutimensat.c lib/file-has-acl.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/posixtm.c lib/posixver.c lib/printf-frexp.c \ - lib/printf-frexpl.c lib/priv-set.c lib/progname.h \ - lib/progname.c lib/propername.h lib/propername.c \ - lib/acl-errno-valid.c lib/file-has-acl.c lib/qcopy-acl.c \ - lib/qset-acl.c lib/quotearg.c lib/randint.c lib/randint.h \ - lib/randperm.c lib/randperm.h lib/randread.c lib/randread.h \ - lib/rand-isaac.c lib/rand-isaac.h lib/read-file.c \ - lib/readtokens.c lib/readtokens0.h lib/readtokens0.c \ - 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/smack.h \ - lib/sockets.h lib/sockets.c lib/stat-time.c lib/statat.c \ - lib/mkstemp-safer.c lib/strftime.c lib/striconv.h \ - lib/striconv.c lib/strnlen1.h lib/strnlen1.c lib/strintcmp.c \ - lib/strnumcmp.c lib/strnumcmp.h lib/sys_socket.c \ - lib/tempname.c lib/glthread/threadlib.c lib/timespec.c \ - lib/glthread/tls.h lib/glthread/tls.c lib/trim.c lib/u64.c \ - lib/unicodeio.h lib/unicodeio.c lib/unistd.c lib/dup-safer.c \ - lib/fd-safer.c lib/pipe-safer.c lib/unistr/u8-mbtoucr.c \ - lib/unistr/u8-uctomb.c lib/unistr/u8-uctomb-aux.c \ - lib/uniwidth/width.c lib/userspec.c lib/utimecmp.c \ - lib/utimens.c lib/verror.h lib/verror.c lib/version-etc.h \ - lib/version-etc.c lib/version-etc-fsf.c lib/wctype-h.c \ - lib/write-any-file.c lib/xmalloc.c lib/xalloc-die.c \ + lib/linebuffer.h lib/linebuffer.c lib/gl_linked_list.h \ + lib/gl_linked_list.c lib/gl_anylinked_list1.h \ + lib/gl_anylinked_list2.h lib/gl_list.h lib/gl_list.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/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/qcopy-acl.c lib/qset-acl.c lib/quotearg.c \ + lib/randint.c lib/randint.h lib/randperm.c lib/randperm.h \ + lib/randread.c lib/randread.h lib/rand-isaac.c \ + lib/rand-isaac.h lib/read-file.c lib/readtokens.c \ + lib/readtokens0.h lib/readtokens0.c 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/smack.h lib/sockets.h lib/sockets.c \ + lib/stat-time.c lib/statat.c lib/mkstemp-safer.c \ + lib/strftime.c lib/striconv.h lib/striconv.c lib/strnlen1.h \ + lib/strnlen1.c lib/strintcmp.c lib/strnumcmp.c lib/strnumcmp.h \ + lib/sys_socket.c lib/tempname.c lib/glthread/threadlib.c \ + lib/timespec.c lib/glthread/tls.h lib/glthread/tls.c \ + lib/trim.c lib/u64.c lib/unicodeio.h lib/unicodeio.c \ + lib/unistd.c lib/dup-safer.c lib/fd-safer.c lib/pipe-safer.c \ + lib/unistr/u8-mbtoucr.c lib/unistr/u8-uctomb.c \ + lib/unistr/u8-uctomb-aux.c lib/uniwidth/width.c lib/userspec.c \ + lib/utimecmp.c lib/utimens.c lib/verror.h lib/verror.c \ + lib/version-etc.h lib/version-etc.c lib/version-etc-fsf.c \ + lib/wctype-h.c lib/write-any-file.c lib/xmalloc.c \ + lib/xalloc-die.c lib/xdectoimax.c lib/xdectoumax.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/xgethostname.c lib/gl_xlist.h lib/gl_xlist.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/copy-acl.$(OBJEXT) \ - lib/set-acl.$(OBJEXT) lib/allocator.$(OBJEXT) \ + lib/set-acl.$(OBJEXT) lib/acl-errno-valid.$(OBJEXT) \ + lib/acl-internal.$(OBJEXT) lib/get-permissions.$(OBJEXT) \ + lib/set-permissions.$(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) \ @@ -729,79 +725,81 @@ am_lib_libcoreutils_a_OBJECTS = lib/copy-acl.$(OBJEXT) \ lib/creat-safer.$(OBJEXT) lib/open-safer.$(OBJEXT) \ lib/fd-hook.$(OBJEXT) lib/fd-reopen.$(OBJEXT) \ lib/fd-safer-flag.$(OBJEXT) lib/dup-safer-flag.$(OBJEXT) \ - lib/fdutimensat.$(OBJEXT) lib/file-set.$(OBJEXT) \ - lib/file-type.$(OBJEXT) lib/filemode.$(OBJEXT) \ - lib/filenamecat.$(OBJEXT) lib/filenamecat-lgpl.$(OBJEXT) \ - lib/filevercmp.$(OBJEXT) lib/fopen-safer.$(OBJEXT) \ - lib/fprintftime.$(OBJEXT) lib/freading.$(OBJEXT) \ - lib/freadseek.$(OBJEXT) lib/freopen-safer.$(OBJEXT) \ - lib/ftoastr.$(OBJEXT) lib/full-read.$(OBJEXT) \ - lib/full-write.$(OBJEXT) lib/gethrxtime.$(OBJEXT) \ - lib/xtime.$(OBJEXT) lib/getndelim2.$(OBJEXT) \ - lib/gettime.$(OBJEXT) lib/getugroups.$(OBJEXT) \ - lib/hard-locale.$(OBJEXT) lib/hash.$(OBJEXT) \ - lib/hash-pjw.$(OBJEXT) lib/hash-triple.$(OBJEXT) \ - lib/heap.$(OBJEXT) lib/human.$(OBJEXT) lib/i-ring.$(OBJEXT) \ - lib/idcache.$(OBJEXT) lib/ino-map.$(OBJEXT) \ - lib/imaxtostr.$(OBJEXT) lib/inttostr.$(OBJEXT) \ - lib/offtostr.$(OBJEXT) lib/uinttostr.$(OBJEXT) \ - lib/umaxtostr.$(OBJEXT) lib/ldtoastr.$(OBJEXT) \ - lib/linebuffer.$(OBJEXT) lib/localcharset.$(OBJEXT) \ - lib/glthread/lock.$(OBJEXT) lib/long-options.$(OBJEXT) \ - lib/malloca.$(OBJEXT) lib/math.$(OBJEXT) lib/mbchar.$(OBJEXT) \ - lib/mbiter.$(OBJEXT) lib/mbsalign.$(OBJEXT) \ - lib/mbscasecmp.$(OBJEXT) lib/mbslen.$(OBJEXT) \ - lib/mbsstr.$(OBJEXT) lib/mbswidth.$(OBJEXT) \ - lib/mbuiter.$(OBJEXT) lib/memcasecmp.$(OBJEXT) \ - lib/memchr2.$(OBJEXT) lib/memcmp2.$(OBJEXT) \ - lib/memcoll.$(OBJEXT) lib/mgetgroups.$(OBJEXT) \ - lib/mkancesdirs.$(OBJEXT) lib/dirchownmod.$(OBJEXT) \ - lib/mkdir-p.$(OBJEXT) lib/modechange.$(OBJEXT) \ - lib/mpsort.$(OBJEXT) lib/nproc.$(OBJEXT) \ - lib/openat-die.$(OBJEXT) lib/openat-safer.$(OBJEXT) \ - lib/parse-datetime.$(OBJEXT) lib/physmem.$(OBJEXT) \ - lib/posixtm.$(OBJEXT) lib/posixver.$(OBJEXT) \ - lib/printf-frexp.$(OBJEXT) lib/printf-frexpl.$(OBJEXT) \ - lib/priv-set.$(OBJEXT) lib/progname.$(OBJEXT) \ - lib/propername.$(OBJEXT) lib/acl-errno-valid.$(OBJEXT) \ - lib/file-has-acl.$(OBJEXT) lib/qcopy-acl.$(OBJEXT) \ - lib/qset-acl.$(OBJEXT) lib/quotearg.$(OBJEXT) \ - lib/randint.$(OBJEXT) lib/randperm.$(OBJEXT) \ - lib/randread.$(OBJEXT) lib/rand-isaac.$(OBJEXT) \ - lib/read-file.$(OBJEXT) lib/readtokens.$(OBJEXT) \ - lib/readtokens0.$(OBJEXT) lib/root-dev-ino.$(OBJEXT) \ - lib/safe-read.$(OBJEXT) lib/safe-write.$(OBJEXT) \ - lib/same.$(OBJEXT) lib/save-cwd.$(OBJEXT) \ - lib/savedir.$(OBJEXT) lib/savewd.$(OBJEXT) \ - lib/se-context.$(OBJEXT) lib/se-selinux.$(OBJEXT) \ - lib/settime.$(OBJEXT) lib/sig-handler.$(OBJEXT) \ - lib/sockets.$(OBJEXT) lib/stat-time.$(OBJEXT) \ - lib/statat.$(OBJEXT) lib/mkstemp-safer.$(OBJEXT) \ - lib/strftime.$(OBJEXT) lib/striconv.$(OBJEXT) \ - lib/strnlen1.$(OBJEXT) lib/strintcmp.$(OBJEXT) \ - 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/fdutimensat.$(OBJEXT) lib/file-has-acl.$(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/gl_linked_list.$(OBJEXT) lib/gl_list.$(OBJEXT) \ + lib/localcharset.$(OBJEXT) lib/glthread/lock.$(OBJEXT) \ + lib/long-options.$(OBJEXT) lib/malloca.$(OBJEXT) \ + lib/math.$(OBJEXT) lib/mbchar.$(OBJEXT) lib/mbiter.$(OBJEXT) \ + lib/mbsalign.$(OBJEXT) lib/mbscasecmp.$(OBJEXT) \ + lib/mbslen.$(OBJEXT) lib/mbsstr.$(OBJEXT) \ + lib/mbswidth.$(OBJEXT) lib/mbuiter.$(OBJEXT) \ + lib/memcasecmp.$(OBJEXT) lib/memchr2.$(OBJEXT) \ + lib/memcmp2.$(OBJEXT) lib/memcoll.$(OBJEXT) \ + lib/mgetgroups.$(OBJEXT) lib/mkancesdirs.$(OBJEXT) \ + lib/dirchownmod.$(OBJEXT) lib/mkdir-p.$(OBJEXT) \ + lib/modechange.$(OBJEXT) lib/mpsort.$(OBJEXT) \ + lib/nproc.$(OBJEXT) lib/openat-die.$(OBJEXT) \ + lib/openat-safer.$(OBJEXT) lib/parse-datetime.$(OBJEXT) \ + lib/physmem.$(OBJEXT) lib/posixtm.$(OBJEXT) \ + lib/posixver.$(OBJEXT) lib/printf-frexp.$(OBJEXT) \ + lib/printf-frexpl.$(OBJEXT) lib/priv-set.$(OBJEXT) \ + lib/progname.$(OBJEXT) lib/propername.$(OBJEXT) \ + lib/qcopy-acl.$(OBJEXT) lib/qset-acl.$(OBJEXT) \ + lib/quotearg.$(OBJEXT) lib/randint.$(OBJEXT) \ + lib/randperm.$(OBJEXT) lib/randread.$(OBJEXT) \ + lib/rand-isaac.$(OBJEXT) lib/read-file.$(OBJEXT) \ + lib/readtokens.$(OBJEXT) lib/readtokens0.$(OBJEXT) \ + lib/root-dev-ino.$(OBJEXT) lib/safe-read.$(OBJEXT) \ + lib/safe-write.$(OBJEXT) lib/same.$(OBJEXT) \ + lib/save-cwd.$(OBJEXT) lib/savedir.$(OBJEXT) \ + lib/savewd.$(OBJEXT) lib/se-context.$(OBJEXT) \ + lib/se-selinux.$(OBJEXT) lib/settime.$(OBJEXT) \ + lib/sig-handler.$(OBJEXT) lib/sockets.$(OBJEXT) \ + lib/stat-time.$(OBJEXT) lib/statat.$(OBJEXT) \ + lib/mkstemp-safer.$(OBJEXT) lib/strftime.$(OBJEXT) \ + lib/striconv.$(OBJEXT) lib/strnlen1.$(OBJEXT) \ + lib/strintcmp.$(OBJEXT) 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/wctype-h.$(OBJEXT) lib/write-any-file.$(OBJEXT) \ lib/xmalloc.$(OBJEXT) lib/xalloc-die.$(OBJEXT) \ + lib/xdectoimax.$(OBJEXT) lib/xdectoumax.$(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/xgethostname.$(OBJEXT) lib/gl_xlist.$(OBJEXT) \ + lib/xmemcoll.$(OBJEXT) lib/xnanosleep.$(OBJEXT) \ + lib/xprintf.$(OBJEXT) lib/xreadlink.$(OBJEXT) \ + lib/xsize.$(OBJEXT) lib/xstriconv.$(OBJEXT) \ + lib/xstrndup.$(OBJEXT) lib/xstrtod.$(OBJEXT) \ + lib/xstrtoimax.$(OBJEXT) lib/xstrtol.$(OBJEXT) \ + lib/xstrtoul.$(OBJEXT) lib/xstrtol-error.$(OBJEXT) \ + lib/xstrtold.$(OBJEXT) lib/xstrtoumax.$(OBJEXT) \ + lib/xvasprintf.$(OBJEXT) lib/xasprintf.$(OBJEXT) \ + lib/yesno.$(OBJEXT) lib_libcoreutils_a_OBJECTS = $(am_lib_libcoreutils_a_OBJECTS) src_libsinglebin___a_AR = $(AR) $(ARFLAGS) src_libsinglebin___a_LIBADD = @@ -2519,6 +2517,28 @@ XPL_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver XPL_LOG_COMPILE = $(XPL_LOG_COMPILER) $(AM_XPL_LOG_FLAGS) \ $(XPL_LOG_FLAGS) DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(doc_coreutils_TEXINFOS) $(srcdir)/Makefile.in \ + $(srcdir)/lib/gnulib.mk $(srcdir)/src/cu-progs.mk \ + $(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/depcomp \ + $(top_srcdir)/build-aux/install-sh \ + $(top_srcdir)/build-aux/mdate-sh \ + $(top_srcdir)/build-aux/missing \ + $(top_srcdir)/build-aux/test-driver \ + $(top_srcdir)/build-aux/texinfo.tex \ + $(top_srcdir)/build-aux/ylwrap $(top_srcdir)/doc/local.mk \ + $(top_srcdir)/lib/alloca.c $(top_srcdir)/lib/config.hin \ + $(top_srcdir)/lib/local.mk $(top_srcdir)/man/local.mk \ + $(top_srcdir)/src/local.mk $(top_srcdir)/src/single-binary.mk \ + $(top_srcdir)/tests/local.mk ABOUT-NLS AUTHORS COPYING \ + ChangeLog INSTALL NEWS README 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/parse-datetime.c DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -2566,7 +2586,13 @@ 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) + +# Don't apply prefix transformations to libstdbuf shared lib +# as that's not generally needed, and we need to reference the +# name directly in LD_PRELOAD etc. In general it's surprising +# that $(transform) is applied to libexec at all given that is +# for internal package naming, not privy to $(transform). +transform = s/ginstall/install/;/libstdbuf/!$(program_transform_name) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ @@ -2849,6 +2875,7 @@ GNULIB_PUTCHAR = @GNULIB_PUTCHAR@ GNULIB_PUTENV = @GNULIB_PUTENV@ GNULIB_PUTS = @GNULIB_PUTS@ GNULIB_PWRITE = @GNULIB_PWRITE@ +GNULIB_QSORT_R = @GNULIB_QSORT_R@ GNULIB_RAISE = @GNULIB_RAISE@ GNULIB_RANDOM = @GNULIB_RANDOM@ GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ @@ -3182,6 +3209,7 @@ HAVE_LOGF = @HAVE_LOGF@ HAVE_LOGL = @HAVE_LOGL@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ +HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ HAVE_MBSINIT = @HAVE_MBSINIT@ @@ -3395,6 +3423,7 @@ LIB_EACCESS = @LIB_EACCESS@ LIB_FDATASYNC = @LIB_FDATASYNC@ LIB_GETHRXTIME = @LIB_GETHRXTIME@ LIB_GMP = @LIB_GMP@ +LIB_HAS_ACL = @LIB_HAS_ACL@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ LIB_NVPAIR = @LIB_NVPAIR@ LIB_PTHREAD = @LIB_PTHREAD@ @@ -3663,10 +3692,12 @@ REPLACE_PTSNAME = @REPLACE_PTSNAME@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ +REPLACE_QSORT_R = @REPLACE_QSORT_R@ REPLACE_RAISE = @REPLACE_RAISE@ REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ REPLACE_READ = @REPLACE_READ@ REPLACE_READLINK = @REPLACE_READLINK@ +REPLACE_READLINKAT = @REPLACE_READLINKAT@ REPLACE_REALLOC = @REPLACE_REALLOC@ REPLACE_REALPATH = @REPLACE_REALPATH@ REPLACE_REMAINDER = @REPLACE_REMAINDER@ @@ -3709,6 +3740,7 @@ REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ +REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ @@ -3757,6 +3789,7 @@ 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_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ 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@ @@ -3875,22 +3908,23 @@ 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 \ build-aux/gen-single-binary.sh cfg.mk dist-check.mk maint.mk \ - tests/GNUmakefile thanks-gen lib/alignof.h lib/alloca.c \ - lib/alloca.in.h lib/allocator.h \ - $(top_srcdir)/build-aux/announce-gen lib/areadlink.h \ - lib/areadlink.h lib/areadlink.h lib/at-func.c lib/argmatch.h \ - lib/arpa_inet.in.h lib/openat-priv.h lib/openat-proc.c \ - 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/gl_openssl.h lib/md5.h lib/gl_openssl.h \ - lib/sha1.h lib/gl_openssl.h lib/sha256.h lib/gl_openssl.h \ - lib/sha512.h lib/ctype.in.h lib/cycle-check.h lib/dev-ino.h \ - lib/dirent.in.h lib/dirent--.h lib/dirent-safer.h lib/dirfd.c \ - lib/stripslash.c lib/dirname.h \ + 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/assure.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/gl_openssl.h lib/md5.h lib/gl_openssl.h lib/sha1.h \ + lib/gl_openssl.h lib/sha256.h lib/gl_openssl.h lib/sha512.h \ + lib/ctype.in.h lib/cycle-check.h lib/dev-ino.h lib/dirent.in.h \ + lib/dirent--.h lib/dirent-safer.h lib/dirfd.c lib/stripslash.c \ + lib/dirname.h \ $(top_srcdir)/build-aux/do-release-commit-and-tag \ lib/dosname.h lib/ftoastr.c lib/ftoastr.h lib/dup.c lib/dup2.c \ lib/errno.in.h lib/error.c lib/error.h lib/euidaccess.c \ @@ -3966,13 +4000,12 @@ EXTRA_DIST = $(changelog_etc) .mailmap .prev-version .version \ lib/parse-datetime.h lib/pathmax.h lib/physmem.h lib/pipe.c \ lib/posixtm.h lib/posixver.h lib/printf-frexp.h \ lib/printf-frexp.c lib/printf-frexpl.h lib/priv-set.h \ - lib/pthread.c lib/pthread.in.h lib/putenv.c lib/acl-internal.h \ - lib/acl.h lib/acl_entries.c lib/quote.h lib/quote.h \ - lib/quotearg.h lib/raise.c lib/read.c lib/read-file.h \ - lib/dirent-private.h lib/readdir.c lib/readlink.c \ - lib/at-func.c lib/readlinkat.c lib/readtokens.h lib/readutmp.c \ - lib/readutmp.h lib/realloc.c lib/realloc.c lib/regcomp.c \ - lib/regex.c lib/regex.h lib/regex_internal.c \ + lib/pthread.c lib/pthread.in.h lib/putenv.c lib/quote.h \ + lib/quote.h lib/quotearg.h lib/raise.c lib/read.c \ + lib/read-file.h lib/dirent-private.h lib/readdir.c \ + lib/readlink.c lib/at-func.c lib/readlinkat.c lib/readtokens.h \ + lib/readutmp.c lib/readutmp.h lib/realloc.c lib/realloc.c \ + lib/regcomp.c 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 \ @@ -4019,18 +4052,19 @@ EXTRA_DIST = $(changelog_etc) .mailmap .prev-version .version \ lib/verify.h lib/vfprintf.c lib/vprintf.c lib/wchar.in.h \ lib/wcrtomb.c lib/wcswidth-impl.h lib/wcswidth.c \ lib/wctype.in.h lib/wcwidth.c lib/write.c lib/write-any-file.h \ - lib/xalloc.h lib/xalloc-oversized.h lib/xgetcwd.h \ - lib/xnanosleep.h lib/xreadlink.h lib/xstrtod.h lib/xstrtol.h \ - lib/xstrtod.c lib/xstrtod.h lib/xalloc.h lib/yesno.h src/dcgen \ - src/dircolors.hin src/primes.h src/tac-pipe.c \ - src/extract-magic src/c99-to-c89.diff man/help2man \ - man/dummy-man $(man1_MANS:.1=.x) $(EXTRA_MANS:.1=.x) \ - $(all_tests) init.cfg tests/Coreutils.pm tests/CuSkip.pm \ - tests/CuTmpdir.pm tests/d_type-check tests/envvar-check \ - tests/factor/run.sh tests/factor/create-test.sh \ - tests/filefrag-extent-compare tests/fiemap-capable \ - tests/init.sh tests/lang-default tests/no-perl \ - tests/other-fs-tmpdir tests/sample-test $(pr_data) + lib/xalloc.h lib/xalloc-oversized.h lib/xdectoint.c \ + lib/xdectoint.h lib/xgetcwd.h lib/xnanosleep.h lib/xreadlink.h \ + lib/xstrtod.h lib/xstrtol.h lib/xstrtod.c lib/xstrtod.h \ + lib/xalloc.h lib/yesno.h src/dcgen src/dircolors.hin \ + src/primes.h src/tac-pipe.c src/extract-magic \ + src/c99-to-c89.diff man/help2man man/dummy-man \ + $(man1_MANS:.1=.x) $(EXTRA_MANS:.1=.x) $(all_tests) init.cfg \ + tests/Coreutils.pm tests/CuSkip.pm tests/CuTmpdir.pm \ + tests/d_type-check tests/envvar-check tests/factor/run.sh \ + tests/factor/create-test.sh tests/filefrag-extent-compare \ + tests/fiemap-capable tests/init.sh tests/lang-default \ + tests/no-perl tests/other-fs-tmpdir tests/sample-test \ + $(pr_data) gen_progs_lists = $(top_srcdir)/build-aux/gen-lists-of-programs.sh gen_single_binary = $(top_srcdir)/build-aux/gen-single-binary.sh ACLOCAL_AMFLAGS = -I m4 @@ -4092,14 +4126,8 @@ gen_start_date = 2008-02-08 # once for each program list on $(single_binary_progs). Note that # for [ the macro invocation is: # SINGLE_BINARY_PROGRAM("[", _) - -# Most prog.1 man pages depend on src/$prog, except when they are part of a -# single binary, in which case they depend on src/coreutils. The exceptions -# are handled by converting $name to $prog on the following code. -# $(ALL_MANS) includes the $(EXTRA_MANS) so even the programs that are not -# being installed will have the right dependency for the manpages. DISTCLEANFILES = VERSION src/fs-latest-magic.h src/coreutils.h \ - src/version.c src/version.h man/dynamic-deps.mk + 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 \ @@ -4169,10 +4197,11 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib -Isrc -I$(top_srcdir)/src #EXTRA_DIST += script.in #MOSTLYCLEANFILES += script script-t lib_libcoreutils_a_SOURCES = lib/copy-acl.c lib/set-acl.c \ - lib/allocator.c lib/areadlink.c lib/areadlink-with-size.c \ - lib/areadlinkat.c lib/argmatch.c lib/argv-iter.c \ - lib/argv-iter.h lib/backupfile.c lib/base64.h lib/base64.c \ - lib/bitrotate.h lib/bitrotate.c lib/buffer-lcm.c \ + lib/acl-errno-valid.c lib/acl-internal.c lib/get-permissions.c \ + lib/set-permissions.c lib/allocator.c lib/areadlink.c \ + lib/areadlink-with-size.c lib/areadlinkat.c lib/argmatch.c \ + lib/argv-iter.c lib/argv-iter.h lib/backupfile.c lib/base64.h \ + lib/base64.c lib/bitrotate.h lib/bitrotate.c lib/buffer-lcm.c \ lib/buffer-lcm.h lib/c-ctype.h lib/c-ctype.c lib/c-strcase.h \ lib/c-strcasecmp.c lib/c-strncasecmp.c lib/c-strtod.c \ lib/c-strtold.c lib/canon-host.c lib/canonicalize.c \ @@ -4185,109 +4214,110 @@ lib_libcoreutils_a_SOURCES = lib/copy-acl.c lib/set-acl.c \ lib/exitfail.c lib/fadvise.c lib/fadvise.h lib/chmodat.c \ lib/chownat.c lib/creat-safer.c lib/open-safer.c lib/fd-hook.c \ lib/fd-reopen.c lib/fd-reopen.h lib/fd-safer-flag.c \ - lib/dup-safer-flag.c lib/fdutimensat.c lib/file-set.c \ - lib/file-type.c lib/filemode.c lib/filenamecat.c \ - 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/dup-safer-flag.c lib/fdutimensat.c lib/file-has-acl.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/posixtm.c lib/posixver.c lib/printf-frexp.c \ - lib/printf-frexpl.c lib/priv-set.c lib/progname.h \ - lib/progname.c lib/propername.h lib/propername.c \ - lib/acl-errno-valid.c lib/file-has-acl.c lib/qcopy-acl.c \ - lib/qset-acl.c lib/quotearg.c lib/randint.c lib/randint.h \ - lib/randperm.c lib/randperm.h lib/randread.c lib/randread.h \ - lib/rand-isaac.c lib/rand-isaac.h lib/read-file.c \ - lib/readtokens.c lib/readtokens0.h lib/readtokens0.c \ - 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/smack.h \ - lib/sockets.h lib/sockets.c lib/stat-time.c lib/statat.c \ - lib/mkstemp-safer.c lib/strftime.c lib/striconv.h \ - lib/striconv.c lib/strnlen1.h lib/strnlen1.c lib/strintcmp.c \ - lib/strnumcmp.c lib/strnumcmp.h lib/sys_socket.c \ - lib/tempname.c lib/glthread/threadlib.c lib/timespec.c \ - lib/glthread/tls.h lib/glthread/tls.c lib/trim.c lib/u64.c \ - lib/unicodeio.h lib/unicodeio.c lib/unistd.c lib/dup-safer.c \ - lib/fd-safer.c lib/pipe-safer.c $(am__append_1) \ - $(am__append_2) $(am__append_3) lib/userspec.c lib/utimecmp.c \ - lib/utimens.c lib/verror.h lib/verror.c lib/version-etc.h \ - lib/version-etc.c lib/version-etc-fsf.c lib/wctype-h.c \ - lib/write-any-file.c lib/xmalloc.c lib/xalloc-die.c \ + lib/linebuffer.h lib/linebuffer.c lib/gl_linked_list.h \ + lib/gl_linked_list.c lib/gl_anylinked_list1.h \ + lib/gl_anylinked_list2.h lib/gl_list.h lib/gl_list.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/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/qcopy-acl.c lib/qset-acl.c lib/quotearg.c \ + lib/randint.c lib/randint.h lib/randperm.c lib/randperm.h \ + lib/randread.c lib/randread.h lib/rand-isaac.c \ + lib/rand-isaac.h lib/read-file.c lib/readtokens.c \ + lib/readtokens0.h lib/readtokens0.c 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/smack.h lib/sockets.h lib/sockets.c \ + lib/stat-time.c lib/statat.c lib/mkstemp-safer.c \ + lib/strftime.c lib/striconv.h lib/striconv.c lib/strnlen1.h \ + lib/strnlen1.c lib/strintcmp.c lib/strnumcmp.c lib/strnumcmp.h \ + lib/sys_socket.c lib/tempname.c lib/glthread/threadlib.c \ + lib/timespec.c lib/glthread/tls.h lib/glthread/tls.c \ + lib/trim.c lib/u64.c lib/unicodeio.h lib/unicodeio.c \ + lib/unistd.c lib/dup-safer.c lib/fd-safer.c lib/pipe-safer.c \ + $(am__append_1) $(am__append_2) $(am__append_3) lib/userspec.c \ + lib/utimecmp.c lib/utimens.c lib/verror.h lib/verror.c \ + lib/version-etc.h lib/version-etc.c lib/version-etc-fsf.c \ + lib/wctype-h.c lib/write-any-file.c lib/xmalloc.c \ + lib/xalloc-die.c lib/xdectoimax.c lib/xdectoumax.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/xgethostname.c lib/gl_xlist.h lib/gl_xlist.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/alloca.c lib/at-func.c \ - lib/openat-proc.c lib/btowc.c lib/c-strtod.c lib/calloc.c \ - lib/calloc.c lib/chdir-long.c lib/chown.c lib/fchown-stub.c \ - lib/close.c lib/closedir.c lib/dirfd.c lib/stripslash.c \ - lib/ftoastr.c lib/dup.c lib/dup2.c lib/error.c \ - lib/euidaccess.c lib/at-func.c lib/faccessat.c lib/fchdir.c \ - lib/at-func.c lib/fchmodat.c lib/at-func.c lib/fchownat.c \ - lib/fclose.c lib/fcntl.c lib/fdatasync.c lib/fdopen.c \ - lib/fdopendir.c lib/fflush.c lib/fileblocks.c lib/float.c \ - lib/itold.c lib/fnmatch.c lib/fnmatch_loop.c lib/fopen.c \ - lib/fpending.c lib/fpurge.c lib/freadahead.c lib/freadptr.c \ - lib/freopen.c lib/frexp.c lib/frexp.c lib/frexpl.c lib/fseek.c \ - lib/fseeko.c lib/fseterr.c lib/fstat.c lib/at-func.c \ - lib/fstatat.c lib/fsusage.c lib/fsync.c lib/ftell.c \ - lib/ftello.c lib/ftruncate.c lib/fts-cycle.c lib/fts.c \ - lib/full-write.c lib/futimens.c lib/gai_strerror.c \ - lib/getaddrinfo.c lib/getcwd.c lib/getcwd-lgpl.c \ - lib/getdelim.c lib/getdtablesize.c lib/getgroups.c \ - lib/gethostname.c lib/getline.c lib/getloadavg.c \ - lib/getlogin.c lib/getopt.c lib/getopt1.c lib/getpagesize.c \ - lib/getpass.c lib/gettimeofday.c lib/getusershell.c \ - lib/group-member.c lib/iconv.c lib/iconv_close.c \ - lib/iconv_open.c lib/inet_ntop.c lib/anytostr.c lib/isapipe.c \ - lib/isatty.c lib/isblank.c lib/isnan.c lib/isnand.c \ - lib/isnan.c lib/isnanf.c lib/isnan.c lib/isnanl.c \ - lib/iswblank.c lib/lchown.c lib/ftoastr.c lib/link.c \ - lib/at-func2.c lib/linkat.c lib/localeconv.c lib/lseek.c \ - lib/lstat.c lib/malloc.c lib/malloc.c lib/mbrlen.c \ +EXTRA_lib_libcoreutils_a_SOURCES = lib/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/pipe.c \ - lib/printf-frexp.c lib/pthread.c lib/putenv.c \ - lib/acl_entries.c lib/raise.c lib/read.c lib/readdir.c \ - lib/readlink.c lib/at-func.c lib/readlinkat.c lib/readutmp.c \ - lib/realloc.c lib/realloc.c lib/regcomp.c lib/regex.c \ - lib/regex_internal.c lib/regexec.c lib/remove.c lib/rename.c \ - lib/rewinddir.c lib/rmdir.c lib/rpmatch.c lib/safe-read.c \ - lib/secure_getenv.c lib/select.c lib/at-func.c \ - lib/selinux-at.c lib/getfilecon.c lib/setenv.c lib/sig2str.c \ - lib/sigaction.c lib/signbitd.c lib/signbitf.c lib/signbitl.c \ - lib/sigprocmask.c lib/snprintf.c lib/stat.c lib/stpcpy.c \ - lib/stpncpy.c lib/strdup.c lib/strerror.c \ + lib/printf-frexp.c lib/pthread.c lib/putenv.c lib/raise.c \ + lib/read.c lib/readdir.c lib/readlink.c lib/at-func.c \ + lib/readlinkat.c lib/readutmp.c lib/realloc.c lib/realloc.c \ + lib/regcomp.c lib/regex.c lib/regex_internal.c lib/regexec.c \ + lib/remove.c lib/rename.c lib/rewinddir.c lib/rmdir.c \ + lib/rpmatch.c lib/safe-read.c lib/secure_getenv.c lib/select.c \ + lib/at-func.c lib/selinux-at.c lib/getfilecon.c lib/setenv.c \ + lib/sig2str.c lib/sigaction.c lib/signbitd.c lib/signbitf.c \ + lib/signbitl.c lib/sigprocmask.c lib/snprintf.c lib/stat.c \ + lib/stpcpy.c lib/stpncpy.c lib/strdup.c lib/strerror.c \ lib/strerror-override.c lib/strncat.c lib/strndup.c \ lib/strnlen.c lib/strpbrk.c lib/strsignal.c lib/strstr.c \ lib/strtod.c lib/strtoimax.c lib/strtol.c lib/strtoll.c \ @@ -4298,7 +4328,7 @@ EXTRA_lib_libcoreutils_a_SOURCES = lib/alloca.c lib/at-func.c \ lib/printf-args.c lib/printf-parse.c lib/vasnprintf.c \ lib/asprintf.c lib/vasprintf.c lib/vfprintf.c lib/vprintf.c \ lib/wcrtomb.c lib/wcswidth.c lib/wcwidth.c lib/write.c \ - lib/xstrtod.c + lib/xdectoint.c lib/xstrtod.c # Use this preprocessor expression to decide whether #include_next works. # Do not rely on a 'configure'-time test for this, since the expression @@ -4448,7 +4478,7 @@ src_logname_LDADD = $(LDADD) # for cap_get_file src_ls_LDADD = $(LDADD) $(LIB_SELINUX) $(LIB_SMACK) \ - $(LIB_CLOCK_GETTIME) $(LIB_CAP) $(LIB_ACL) + $(LIB_CLOCK_GETTIME) $(LIB_CAP) $(LIB_HAS_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 @@ -4610,270 +4640,270 @@ src_libstdbuf_so_CFLAGS = -fPIC $(AM_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_arch_a_DEPENDENCIES = src/libsinglebin_uname.a @SINGLE_BINARY_TRUE@src_libsinglebin_arch_a_SOURCES = src/coreutils-arch.c @SINGLE_BINARY_TRUE@src_libsinglebin_arch_a_ldadd = src/libsinglebin_uname.a -@SINGLE_BINARY_TRUE@src_libsinglebin_arch_a_CFLAGS = "-Dmain=_single_binary_main_arch(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_arch" -Dusage=_usage_arch $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_arch_a_CFLAGS = "-Dmain=single_binary_main_arch (int, char **); int single_binary_main_arch" -Dusage=_usage_arch $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_hostname_a_SOURCES = src/hostname.c @SINGLE_BINARY_TRUE@src_libsinglebin_hostname_a_ldadd = $(GETHOSTNAME_LIB) -@SINGLE_BINARY_TRUE@src_libsinglebin_hostname_a_CFLAGS = "-Dmain=_single_binary_main_hostname(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_hostname" -Dusage=_usage_hostname $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_hostname_a_CFLAGS = "-Dmain=single_binary_main_hostname (int, char **); int single_binary_main_hostname" -Dusage=_usage_hostname $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_chroot_a_SOURCES = src/chroot.c -@SINGLE_BINARY_TRUE@src_libsinglebin_chroot_a_CFLAGS = "-Dmain=_single_binary_main_chroot(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_chroot" -Dusage=_usage_chroot $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_chroot_a_CFLAGS = "-Dmain=single_binary_main_chroot (int, char **); int single_binary_main_chroot" -Dusage=_usage_chroot $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_df_a_SOURCES = src/df.c src/find-mount-point.c @SINGLE_BINARY_TRUE@src_libsinglebin_df_a_ldadd = $(LIBICONV) -@SINGLE_BINARY_TRUE@src_libsinglebin_df_a_CFLAGS = "-Dmain=_single_binary_main_df(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_df" -Dusage=_usage_df $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_df_a_CFLAGS = "-Dmain=single_binary_main_df (int, char **); int single_binary_main_df" -Dusage=_usage_df $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_hostid_a_SOURCES = src/hostid.c -@SINGLE_BINARY_TRUE@src_libsinglebin_hostid_a_CFLAGS = "-Dmain=_single_binary_main_hostid(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_hostid" -Dusage=_usage_hostid $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_hostid_a_CFLAGS = "-Dmain=single_binary_main_hostid (int, char **); int single_binary_main_hostid" -Dusage=_usage_hostid $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_nice_a_SOURCES = src/nice.c -@SINGLE_BINARY_TRUE@src_libsinglebin_nice_a_CFLAGS = "-Dmain=_single_binary_main_nice(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_nice" -Dusage=_usage_nice $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_nice_a_CFLAGS = "-Dmain=single_binary_main_nice (int, char **); int single_binary_main_nice" -Dusage=_usage_nice $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_pinky_a_SOURCES = src/pinky.c @SINGLE_BINARY_TRUE@src_libsinglebin_pinky_a_ldadd = $(GETADDRINFO_LIB) -@SINGLE_BINARY_TRUE@src_libsinglebin_pinky_a_CFLAGS = "-Dmain=_single_binary_main_pinky(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_pinky" -Dusage=_usage_pinky $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_pinky_a_CFLAGS = "-Dmain=single_binary_main_pinky (int, char **); int single_binary_main_pinky" -Dusage=_usage_pinky $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_stdbuf_a_SOURCES = src/stdbuf.c @SINGLE_BINARY_TRUE@src_libsinglebin_stdbuf_a_ldadd = $(LIBICONV) -@SINGLE_BINARY_TRUE@src_libsinglebin_stdbuf_a_CFLAGS = "-Dmain=_single_binary_main_stdbuf(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_stdbuf" -Dusage=_usage_stdbuf $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_stdbuf_a_CFLAGS = "-Dmain=single_binary_main_stdbuf (int, char **); int single_binary_main_stdbuf" -Dusage=_usage_stdbuf $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_stty_a_SOURCES = src/stty.c -@SINGLE_BINARY_TRUE@src_libsinglebin_stty_a_CFLAGS = "-Dmain=_single_binary_main_stty(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_stty" -Dusage=_usage_stty $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_stty_a_CFLAGS = "-Dmain=single_binary_main_stty (int, char **); int single_binary_main_stty" -Dusage=_usage_stty $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_uptime_a_SOURCES = src/uptime.c @SINGLE_BINARY_TRUE@src_libsinglebin_uptime_a_ldadd = $(GETLOADAVG_LIBS) -@SINGLE_BINARY_TRUE@src_libsinglebin_uptime_a_CFLAGS = "-Dmain=_single_binary_main_uptime(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_uptime" -Dusage=_usage_uptime $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_uptime_a_CFLAGS = "-Dmain=single_binary_main_uptime (int, char **); int single_binary_main_uptime" -Dusage=_usage_uptime $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_users_a_SOURCES = src/users.c -@SINGLE_BINARY_TRUE@src_libsinglebin_users_a_CFLAGS = "-Dmain=_single_binary_main_users(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_users" -Dusage=_usage_users $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_users_a_CFLAGS = "-Dmain=single_binary_main_users (int, char **); int single_binary_main_users" -Dusage=_usage_users $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_who_a_SOURCES = src/who.c @SINGLE_BINARY_TRUE@src_libsinglebin_who_a_ldadd = $(GETADDRINFO_LIB) -@SINGLE_BINARY_TRUE@src_libsinglebin_who_a_CFLAGS = "-Dmain=_single_binary_main_who(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_who" -Dusage=_usage_who $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_who_a_CFLAGS = "-Dmain=single_binary_main_who (int, char **); int single_binary_main_who" -Dusage=_usage_who $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin___a_SOURCES = src/lbracket.c @SINGLE_BINARY_TRUE@src_libsinglebin___a_ldadd = $(src_test_LDADD) -@SINGLE_BINARY_TRUE@src_libsinglebin___a_CFLAGS = "-Dmain=_single_binary_main__(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main__" -Dusage=_usage__ $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin___a_CFLAGS = "-Dmain=single_binary_main__ (int, char **); int single_binary_main__" -Dusage=_usage__ $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_base64_a_SOURCES = src/base64.c -@SINGLE_BINARY_TRUE@src_libsinglebin_base64_a_CFLAGS = "-Dmain=_single_binary_main_base64(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_base64" -Dusage=_usage_base64 $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_base64_a_CFLAGS = "-Dmain=single_binary_main_base64 (int, char **); int single_binary_main_base64" -Dusage=_usage_base64 $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_basename_a_SOURCES = src/basename.c -@SINGLE_BINARY_TRUE@src_libsinglebin_basename_a_CFLAGS = "-Dmain=_single_binary_main_basename(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_basename" -Dusage=_usage_basename $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_basename_a_CFLAGS = "-Dmain=single_binary_main_basename (int, char **); int single_binary_main_basename" -Dusage=_usage_basename $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_cat_a_SOURCES = src/cat.c @SINGLE_BINARY_TRUE@src_libsinglebin_cat_a_ldadd = $(LIBICONV) -@SINGLE_BINARY_TRUE@src_libsinglebin_cat_a_CFLAGS = "-Dmain=_single_binary_main_cat(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_cat" -Dusage=_usage_cat $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_cat_a_CFLAGS = "-Dmain=single_binary_main_cat (int, char **); int single_binary_main_cat" -Dusage=_usage_cat $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_chcon_a_SOURCES = src/chcon.c @SINGLE_BINARY_TRUE@src_libsinglebin_chcon_a_ldadd = $(LIB_SELINUX) -@SINGLE_BINARY_TRUE@src_libsinglebin_chcon_a_CFLAGS = "-Dmain=_single_binary_main_chcon(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_chcon" -Dusage=_usage_chcon $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_chcon_a_CFLAGS = "-Dmain=single_binary_main_chcon (int, char **); int single_binary_main_chcon" -Dusage=_usage_chcon $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_chgrp_a_SOURCES = src/chgrp.c src/chown-core.c -@SINGLE_BINARY_TRUE@src_libsinglebin_chgrp_a_CFLAGS = "-Dmain=_single_binary_main_chgrp(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_chgrp" -Dusage=_usage_chgrp $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_chgrp_a_CFLAGS = "-Dmain=single_binary_main_chgrp (int, char **); int single_binary_main_chgrp" -Dusage=_usage_chgrp $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_chmod_a_SOURCES = src/chmod.c -@SINGLE_BINARY_TRUE@src_libsinglebin_chmod_a_CFLAGS = "-Dmain=_single_binary_main_chmod(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_chmod" -Dusage=_usage_chmod $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_chmod_a_CFLAGS = "-Dmain=single_binary_main_chmod (int, char **); int single_binary_main_chmod" -Dusage=_usage_chmod $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_chown_a_SOURCES = src/chown.c src/chown-core.c -@SINGLE_BINARY_TRUE@src_libsinglebin_chown_a_CFLAGS = "-Dmain=_single_binary_main_chown(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_chown" -Dusage=_usage_chown $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_chown_a_CFLAGS = "-Dmain=single_binary_main_chown (int, char **); int single_binary_main_chown" -Dusage=_usage_chown $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_cksum_a_SOURCES = src/cksum.c -@SINGLE_BINARY_TRUE@src_libsinglebin_cksum_a_CFLAGS = "-Dmain=_single_binary_main_cksum(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_cksum" -Dusage=_usage_cksum $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_cksum_a_CFLAGS = "-Dmain=single_binary_main_cksum (int, char **); int single_binary_main_cksum" -Dusage=_usage_cksum $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_comm_a_SOURCES = src/comm.c -@SINGLE_BINARY_TRUE@src_libsinglebin_comm_a_CFLAGS = "-Dmain=_single_binary_main_comm(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_comm" -Dusage=_usage_comm $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_comm_a_CFLAGS = "-Dmain=single_binary_main_comm (int, char **); int single_binary_main_comm" -Dusage=_usage_comm $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_cp_a_SOURCES = src/cp.c $(copy_sources) $(selinux_sources) @SINGLE_BINARY_TRUE@src_libsinglebin_cp_a_ldadd = $(copy_ldadd) $(LIBICONV) -@SINGLE_BINARY_TRUE@src_libsinglebin_cp_a_CFLAGS = "-Dmain=_single_binary_main_cp(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_cp" -Dusage=_usage_cp $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_cp_a_CFLAGS = "-Dmain=single_binary_main_cp (int, char **); int single_binary_main_cp" -Dusage=_usage_cp $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_csplit_a_SOURCES = src/csplit.c -@SINGLE_BINARY_TRUE@src_libsinglebin_csplit_a_CFLAGS = "-Dmain=_single_binary_main_csplit(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_csplit" -Dusage=_usage_csplit $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_csplit_a_CFLAGS = "-Dmain=single_binary_main_csplit (int, char **); int single_binary_main_csplit" -Dusage=_usage_csplit $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_cut_a_SOURCES = src/cut.c -@SINGLE_BINARY_TRUE@src_libsinglebin_cut_a_CFLAGS = "-Dmain=_single_binary_main_cut(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_cut" -Dusage=_usage_cut $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_cut_a_CFLAGS = "-Dmain=single_binary_main_cut (int, char **); int single_binary_main_cut" -Dusage=_usage_cut $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_date_a_SOURCES = src/date.c @SINGLE_BINARY_TRUE@src_libsinglebin_date_a_ldadd = $(LIB_CLOCK_GETTIME) -@SINGLE_BINARY_TRUE@src_libsinglebin_date_a_CFLAGS = "-Dmain=_single_binary_main_date(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_date" -Dusage=_usage_date $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_date_a_CFLAGS = "-Dmain=single_binary_main_date (int, char **); int single_binary_main_date" -Dusage=_usage_date $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_dd_a_SOURCES = src/dd.c @SINGLE_BINARY_TRUE@src_libsinglebin_dd_a_ldadd = $(LIB_GETHRXTIME) $(LIB_FDATASYNC) -@SINGLE_BINARY_TRUE@src_libsinglebin_dd_a_CFLAGS = "-Dmain=_single_binary_main_dd(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_dd" -Dusage=_usage_dd $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_dd_a_CFLAGS = "-Dmain=single_binary_main_dd (int, char **); int single_binary_main_dd" -Dusage=_usage_dd $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_dir_a_SOURCES = src/coreutils-dir.c @SINGLE_BINARY_TRUE@src_libsinglebin_dir_a_ldadd = $(src_ls_LDADD) src/libsinglebin_ls.a -@SINGLE_BINARY_TRUE@src_libsinglebin_dir_a_CFLAGS = "-Dmain=_single_binary_main_dir(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_dir" -Dusage=_usage_dir $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_dir_a_CFLAGS = "-Dmain=single_binary_main_dir (int, char **); int single_binary_main_dir" -Dusage=_usage_dir $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_dircolors_a_SOURCES = src/dircolors.c -@SINGLE_BINARY_TRUE@src_libsinglebin_dircolors_a_CFLAGS = "-Dmain=_single_binary_main_dircolors(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_dircolors" -Dusage=_usage_dircolors $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_dircolors_a_CFLAGS = "-Dmain=single_binary_main_dircolors (int, char **); int single_binary_main_dircolors" -Dusage=_usage_dircolors $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_dirname_a_SOURCES = src/dirname.c -@SINGLE_BINARY_TRUE@src_libsinglebin_dirname_a_CFLAGS = "-Dmain=_single_binary_main_dirname(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_dirname" -Dusage=_usage_dirname $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_dirname_a_CFLAGS = "-Dmain=single_binary_main_dirname (int, char **); int single_binary_main_dirname" -Dusage=_usage_dirname $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_du_a_SOURCES = src/du.c @SINGLE_BINARY_TRUE@src_libsinglebin_du_a_ldadd = $(LIBICONV) -@SINGLE_BINARY_TRUE@src_libsinglebin_du_a_CFLAGS = "-Dmain=_single_binary_main_du(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_du" -Dusage=_usage_du $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_du_a_CFLAGS = "-Dmain=single_binary_main_du (int, char **); int single_binary_main_du" -Dusage=_usage_du $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_echo_a_SOURCES = src/echo.c -@SINGLE_BINARY_TRUE@src_libsinglebin_echo_a_CFLAGS = "-Dmain=_single_binary_main_echo(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_echo" -Dusage=_usage_echo $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_echo_a_CFLAGS = "-Dmain=single_binary_main_echo (int, char **); int single_binary_main_echo" -Dusage=_usage_echo $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_env_a_SOURCES = src/env.c -@SINGLE_BINARY_TRUE@src_libsinglebin_env_a_CFLAGS = "-Dmain=_single_binary_main_env(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_env" -Dusage=_usage_env $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_env_a_CFLAGS = "-Dmain=single_binary_main_env (int, char **); int single_binary_main_env" -Dusage=_usage_env $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_expand_a_SOURCES = src/expand.c -@SINGLE_BINARY_TRUE@src_libsinglebin_expand_a_CFLAGS = "-Dmain=_single_binary_main_expand(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_expand" -Dusage=_usage_expand $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_expand_a_CFLAGS = "-Dmain=single_binary_main_expand (int, char **); int single_binary_main_expand" -Dusage=_usage_expand $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_expr_a_SOURCES = src/expr.c @SINGLE_BINARY_TRUE@src_libsinglebin_expr_a_ldadd = $(LIB_GMP) -@SINGLE_BINARY_TRUE@src_libsinglebin_expr_a_CFLAGS = "-Dmain=_single_binary_main_expr(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_expr" -Dusage=_usage_expr $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_expr_a_CFLAGS = "-Dmain=single_binary_main_expr (int, char **); int single_binary_main_expr" -Dusage=_usage_expr $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_factor_a_SOURCES = src/factor.c @SINGLE_BINARY_TRUE@src_libsinglebin_factor_a_ldadd = $(LIB_GMP) $(LIBICONV) -@SINGLE_BINARY_TRUE@src_libsinglebin_factor_a_CFLAGS = "-Dmain=_single_binary_main_factor(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_factor" -Dusage=_usage_factor $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_factor_a_CFLAGS = "-Dmain=single_binary_main_factor (int, char **); int single_binary_main_factor" -Dusage=_usage_factor $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_false_a_SOURCES = src/false.c -@SINGLE_BINARY_TRUE@src_libsinglebin_false_a_CFLAGS = "-Dmain=_single_binary_main_false(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_false" -Dusage=_usage_false $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_false_a_CFLAGS = "-Dmain=single_binary_main_false (int, char **); int single_binary_main_false" -Dusage=_usage_false $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_fmt_a_SOURCES = src/fmt.c -@SINGLE_BINARY_TRUE@src_libsinglebin_fmt_a_CFLAGS = "-Dmain=_single_binary_main_fmt(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_fmt" -Dusage=_usage_fmt $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_fmt_a_CFLAGS = "-Dmain=single_binary_main_fmt (int, char **); int single_binary_main_fmt" -Dusage=_usage_fmt $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_fold_a_SOURCES = src/fold.c -@SINGLE_BINARY_TRUE@src_libsinglebin_fold_a_CFLAGS = "-Dmain=_single_binary_main_fold(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_fold" -Dusage=_usage_fold $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_fold_a_CFLAGS = "-Dmain=single_binary_main_fold (int, char **); int single_binary_main_fold" -Dusage=_usage_fold $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_ginstall_a_SOURCES = src/install.c src/prog-fprintf.c $(copy_sources) $(selinux_sources) @SINGLE_BINARY_TRUE@src_libsinglebin_ginstall_a_ldadd = $(copy_ldadd) $(LIB_SELINUX) $(LIB_CLOCK_GETTIME) -@SINGLE_BINARY_TRUE@src_libsinglebin_ginstall_a_CFLAGS = "-Dmain=_single_binary_main_ginstall(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_ginstall" -Dusage=_usage_ginstall $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_ginstall_a_CFLAGS = "-Dmain=single_binary_main_ginstall (int, char **); int single_binary_main_ginstall" -Dusage=_usage_ginstall $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_ginstall_a_CPPFLAGS = -DENABLE_MATCHPATHCON=1 $(AM_CPPFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_groups_a_SOURCES = src/groups.c src/group-list.c -@SINGLE_BINARY_TRUE@src_libsinglebin_groups_a_CFLAGS = "-Dmain=_single_binary_main_groups(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_groups" -Dusage=_usage_groups $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_groups_a_CFLAGS = "-Dmain=single_binary_main_groups (int, char **); int single_binary_main_groups" -Dusage=_usage_groups $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_head_a_SOURCES = src/head.c -@SINGLE_BINARY_TRUE@src_libsinglebin_head_a_CFLAGS = "-Dmain=_single_binary_main_head(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_head" -Dusage=_usage_head $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_head_a_CFLAGS = "-Dmain=single_binary_main_head (int, char **); int single_binary_main_head" -Dusage=_usage_head $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_id_a_SOURCES = src/id.c src/group-list.c @SINGLE_BINARY_TRUE@src_libsinglebin_id_a_ldadd = $(LIB_SELINUX) $(LIB_SMACK) -@SINGLE_BINARY_TRUE@src_libsinglebin_id_a_CFLAGS = "-Dmain=_single_binary_main_id(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_id" -Dusage=_usage_id $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_id_a_CFLAGS = "-Dmain=single_binary_main_id (int, char **); int single_binary_main_id" -Dusage=_usage_id $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_join_a_SOURCES = src/join.c -@SINGLE_BINARY_TRUE@src_libsinglebin_join_a_CFLAGS = "-Dmain=_single_binary_main_join(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_join" -Dusage=_usage_join $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_join_a_CFLAGS = "-Dmain=single_binary_main_join (int, char **); int single_binary_main_join" -Dusage=_usage_join $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_kill_a_SOURCES = src/kill.c src/operand2sig.c @SINGLE_BINARY_TRUE@src_libsinglebin_kill_a_ldadd = $(LIBTHREAD) -@SINGLE_BINARY_TRUE@src_libsinglebin_kill_a_CFLAGS = "-Dmain=_single_binary_main_kill(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_kill" -Dusage=_usage_kill $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_kill_a_CFLAGS = "-Dmain=single_binary_main_kill (int, char **); int single_binary_main_kill" -Dusage=_usage_kill $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_link_a_SOURCES = src/link.c -@SINGLE_BINARY_TRUE@src_libsinglebin_link_a_CFLAGS = "-Dmain=_single_binary_main_link(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_link" -Dusage=_usage_link $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_link_a_CFLAGS = "-Dmain=single_binary_main_link (int, char **); int single_binary_main_link" -Dusage=_usage_link $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_ln_a_SOURCES = src/ln.c src/relpath.c src/relpath.h -@SINGLE_BINARY_TRUE@src_libsinglebin_ln_a_CFLAGS = "-Dmain=_single_binary_main_ln(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_ln" -Dusage=_usage_ln $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_ln_a_CFLAGS = "-Dmain=single_binary_main_ln (int, char **); int single_binary_main_ln" -Dusage=_usage_ln $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_logname_a_SOURCES = src/logname.c -@SINGLE_BINARY_TRUE@src_libsinglebin_logname_a_CFLAGS = "-Dmain=_single_binary_main_logname(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_logname" -Dusage=_usage_logname $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_logname_a_CFLAGS = "-Dmain=single_binary_main_logname (int, char **); int single_binary_main_logname" -Dusage=_usage_logname $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_ls_a_SOURCES = src/ls.c src/ls-ls.c -@SINGLE_BINARY_TRUE@src_libsinglebin_ls_a_ldadd = $(LIB_SELINUX) $(LIB_SMACK) $(LIB_CLOCK_GETTIME) $(LIB_CAP) $(LIB_ACL) -@SINGLE_BINARY_TRUE@src_libsinglebin_ls_a_CFLAGS = "-Dmain=_single_binary_main_ls(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_ls" -Dusage=_usage_ls $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_ls_a_ldadd = $(LIB_SELINUX) $(LIB_SMACK) $(LIB_CLOCK_GETTIME) $(LIB_CAP) $(LIB_HAS_ACL) +@SINGLE_BINARY_TRUE@src_libsinglebin_ls_a_CFLAGS = "-Dmain=single_binary_main_ls (int, char **); int single_binary_main_ls" -Dusage=_usage_ls $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_md5sum_a_SOURCES = src/md5sum.c @SINGLE_BINARY_TRUE@src_libsinglebin_md5sum_a_ldadd = $(LIB_CRYPTO) -@SINGLE_BINARY_TRUE@src_libsinglebin_md5sum_a_CFLAGS = "-Dmain=_single_binary_main_md5sum(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_md5sum" -Dusage=_usage_md5sum $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_md5sum_a_CFLAGS = "-Dmain=single_binary_main_md5sum (int, char **); int single_binary_main_md5sum" -Dusage=_usage_md5sum $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_md5sum_a_CPPFLAGS = -DHASH_ALGO_MD5=1 $(AM_CPPFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_mkdir_a_SOURCES = src/mkdir.c src/prog-fprintf.c $(selinux_sources) @SINGLE_BINARY_TRUE@src_libsinglebin_mkdir_a_ldadd = $(LIB_SELINUX) $(LIB_SMACK) -@SINGLE_BINARY_TRUE@src_libsinglebin_mkdir_a_CFLAGS = "-Dmain=_single_binary_main_mkdir(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_mkdir" -Dusage=_usage_mkdir $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_mkdir_a_CFLAGS = "-Dmain=single_binary_main_mkdir (int, char **); int single_binary_main_mkdir" -Dusage=_usage_mkdir $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_mkfifo_a_SOURCES = src/mkfifo.c $(selinux_sources) @SINGLE_BINARY_TRUE@src_libsinglebin_mkfifo_a_ldadd = $(LIB_SELINUX) $(LIB_SMACK) -@SINGLE_BINARY_TRUE@src_libsinglebin_mkfifo_a_CFLAGS = "-Dmain=_single_binary_main_mkfifo(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_mkfifo" -Dusage=_usage_mkfifo $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_mkfifo_a_CFLAGS = "-Dmain=single_binary_main_mkfifo (int, char **); int single_binary_main_mkfifo" -Dusage=_usage_mkfifo $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_mknod_a_SOURCES = src/mknod.c $(selinux_sources) @SINGLE_BINARY_TRUE@src_libsinglebin_mknod_a_ldadd = $(LIB_SELINUX) $(LIB_SMACK) -@SINGLE_BINARY_TRUE@src_libsinglebin_mknod_a_CFLAGS = "-Dmain=_single_binary_main_mknod(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_mknod" -Dusage=_usage_mknod $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_mknod_a_CFLAGS = "-Dmain=single_binary_main_mknod (int, char **); int single_binary_main_mknod" -Dusage=_usage_mknod $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_mktemp_a_SOURCES = src/mktemp.c -@SINGLE_BINARY_TRUE@src_libsinglebin_mktemp_a_CFLAGS = "-Dmain=_single_binary_main_mktemp(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_mktemp" -Dusage=_usage_mktemp $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_mktemp_a_CFLAGS = "-Dmain=single_binary_main_mktemp (int, char **); int single_binary_main_mktemp" -Dusage=_usage_mktemp $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_mv_a_SOURCES = src/mv.c src/remove.c $(copy_sources) $(selinux_sources) @SINGLE_BINARY_TRUE@src_libsinglebin_mv_a_ldadd = $(copy_ldadd) $(remove_ldadd) -@SINGLE_BINARY_TRUE@src_libsinglebin_mv_a_CFLAGS = "-Dmain=_single_binary_main_mv(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_mv" -Dusage=_usage_mv $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_mv_a_CFLAGS = "-Dmain=single_binary_main_mv (int, char **); int single_binary_main_mv" -Dusage=_usage_mv $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_nl_a_SOURCES = src/nl.c -@SINGLE_BINARY_TRUE@src_libsinglebin_nl_a_CFLAGS = "-Dmain=_single_binary_main_nl(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_nl" -Dusage=_usage_nl $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_nl_a_CFLAGS = "-Dmain=single_binary_main_nl (int, char **); int single_binary_main_nl" -Dusage=_usage_nl $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_nproc_a_SOURCES = src/nproc.c -@SINGLE_BINARY_TRUE@src_libsinglebin_nproc_a_CFLAGS = "-Dmain=_single_binary_main_nproc(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_nproc" -Dusage=_usage_nproc $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_nproc_a_CFLAGS = "-Dmain=single_binary_main_nproc (int, char **); int single_binary_main_nproc" -Dusage=_usage_nproc $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_nohup_a_SOURCES = src/nohup.c -@SINGLE_BINARY_TRUE@src_libsinglebin_nohup_a_CFLAGS = "-Dmain=_single_binary_main_nohup(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_nohup" -Dusage=_usage_nohup $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_nohup_a_CFLAGS = "-Dmain=single_binary_main_nohup (int, char **); int single_binary_main_nohup" -Dusage=_usage_nohup $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_numfmt_a_SOURCES = src/numfmt.c -@SINGLE_BINARY_TRUE@src_libsinglebin_numfmt_a_CFLAGS = "-Dmain=_single_binary_main_numfmt(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_numfmt" -Dusage=_usage_numfmt $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_numfmt_a_CFLAGS = "-Dmain=single_binary_main_numfmt (int, char **); int single_binary_main_numfmt" -Dusage=_usage_numfmt $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_od_a_SOURCES = src/od.c -@SINGLE_BINARY_TRUE@src_libsinglebin_od_a_CFLAGS = "-Dmain=_single_binary_main_od(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_od" -Dusage=_usage_od $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_od_a_CFLAGS = "-Dmain=single_binary_main_od (int, char **); int single_binary_main_od" -Dusage=_usage_od $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_paste_a_SOURCES = src/paste.c -@SINGLE_BINARY_TRUE@src_libsinglebin_paste_a_CFLAGS = "-Dmain=_single_binary_main_paste(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_paste" -Dusage=_usage_paste $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_paste_a_CFLAGS = "-Dmain=single_binary_main_paste (int, char **); int single_binary_main_paste" -Dusage=_usage_paste $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_pathchk_a_SOURCES = src/pathchk.c -@SINGLE_BINARY_TRUE@src_libsinglebin_pathchk_a_CFLAGS = "-Dmain=_single_binary_main_pathchk(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_pathchk" -Dusage=_usage_pathchk $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_pathchk_a_CFLAGS = "-Dmain=single_binary_main_pathchk (int, char **); int single_binary_main_pathchk" -Dusage=_usage_pathchk $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_pr_a_SOURCES = src/pr.c @SINGLE_BINARY_TRUE@src_libsinglebin_pr_a_ldadd = $(LIB_CLOCK_GETTIME) -@SINGLE_BINARY_TRUE@src_libsinglebin_pr_a_CFLAGS = "-Dmain=_single_binary_main_pr(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_pr" -Dusage=_usage_pr $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_pr_a_CFLAGS = "-Dmain=single_binary_main_pr (int, char **); int single_binary_main_pr" -Dusage=_usage_pr $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_printenv_a_SOURCES = src/printenv.c -@SINGLE_BINARY_TRUE@src_libsinglebin_printenv_a_CFLAGS = "-Dmain=_single_binary_main_printenv(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_printenv" -Dusage=_usage_printenv $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_printenv_a_CFLAGS = "-Dmain=single_binary_main_printenv (int, char **); int single_binary_main_printenv" -Dusage=_usage_printenv $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_printf_a_SOURCES = src/printf.c @SINGLE_BINARY_TRUE@src_libsinglebin_printf_a_ldadd = $(LIBICONV) -@SINGLE_BINARY_TRUE@src_libsinglebin_printf_a_CFLAGS = "-Dmain=_single_binary_main_printf(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_printf" -Dusage=_usage_printf $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_printf_a_CFLAGS = "-Dmain=single_binary_main_printf (int, char **); int single_binary_main_printf" -Dusage=_usage_printf $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_ptx_a_SOURCES = src/ptx.c @SINGLE_BINARY_TRUE@src_libsinglebin_ptx_a_ldadd = $(LIBICONV) -@SINGLE_BINARY_TRUE@src_libsinglebin_ptx_a_CFLAGS = "-Dmain=_single_binary_main_ptx(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_ptx" -Dusage=_usage_ptx $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_ptx_a_CFLAGS = "-Dmain=single_binary_main_ptx (int, char **); int single_binary_main_ptx" -Dusage=_usage_ptx $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_pwd_a_SOURCES = src/pwd.c -@SINGLE_BINARY_TRUE@src_libsinglebin_pwd_a_CFLAGS = "-Dmain=_single_binary_main_pwd(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_pwd" -Dusage=_usage_pwd $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_pwd_a_CFLAGS = "-Dmain=single_binary_main_pwd (int, char **); int single_binary_main_pwd" -Dusage=_usage_pwd $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_readlink_a_SOURCES = src/readlink.c -@SINGLE_BINARY_TRUE@src_libsinglebin_readlink_a_CFLAGS = "-Dmain=_single_binary_main_readlink(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_readlink" -Dusage=_usage_readlink $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_readlink_a_CFLAGS = "-Dmain=single_binary_main_readlink (int, char **); int single_binary_main_readlink" -Dusage=_usage_readlink $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_realpath_a_SOURCES = src/realpath.c src/relpath.c src/relpath.h @SINGLE_BINARY_TRUE@src_libsinglebin_realpath_a_ldadd = $(LIBICONV) -@SINGLE_BINARY_TRUE@src_libsinglebin_realpath_a_CFLAGS = "-Dmain=_single_binary_main_realpath(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_realpath" -Dusage=_usage_realpath $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_realpath_a_CFLAGS = "-Dmain=single_binary_main_realpath (int, char **); int single_binary_main_realpath" -Dusage=_usage_realpath $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_rm_a_SOURCES = src/rm.c src/remove.c @SINGLE_BINARY_TRUE@src_libsinglebin_rm_a_ldadd = $(remove_ldadd) -@SINGLE_BINARY_TRUE@src_libsinglebin_rm_a_CFLAGS = "-Dmain=_single_binary_main_rm(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_rm" -Dusage=_usage_rm $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_rm_a_CFLAGS = "-Dmain=single_binary_main_rm (int, char **); int single_binary_main_rm" -Dusage=_usage_rm $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_rmdir_a_SOURCES = src/rmdir.c src/prog-fprintf.c -@SINGLE_BINARY_TRUE@src_libsinglebin_rmdir_a_CFLAGS = "-Dmain=_single_binary_main_rmdir(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_rmdir" -Dusage=_usage_rmdir $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_rmdir_a_CFLAGS = "-Dmain=single_binary_main_rmdir (int, char **); int single_binary_main_rmdir" -Dusage=_usage_rmdir $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_runcon_a_SOURCES = src/runcon.c @SINGLE_BINARY_TRUE@src_libsinglebin_runcon_a_ldadd = $(LIB_SELINUX) -@SINGLE_BINARY_TRUE@src_libsinglebin_runcon_a_CFLAGS = "-Dmain=_single_binary_main_runcon(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_runcon" -Dusage=_usage_runcon $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_runcon_a_CFLAGS = "-Dmain=single_binary_main_runcon (int, char **); int single_binary_main_runcon" -Dusage=_usage_runcon $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_seq_a_SOURCES = src/seq.c -@SINGLE_BINARY_TRUE@src_libsinglebin_seq_a_CFLAGS = "-Dmain=_single_binary_main_seq(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_seq" -Dusage=_usage_seq $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_seq_a_CFLAGS = "-Dmain=single_binary_main_seq (int, char **); int single_binary_main_seq" -Dusage=_usage_seq $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_sha1sum_a_SOURCES = src/md5sum.c @SINGLE_BINARY_TRUE@src_libsinglebin_sha1sum_a_ldadd = $(LIB_CRYPTO) -@SINGLE_BINARY_TRUE@src_libsinglebin_sha1sum_a_CFLAGS = "-Dmain=_single_binary_main_sha1sum(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_sha1sum" -Dusage=_usage_sha1sum $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_sha1sum_a_CFLAGS = "-Dmain=single_binary_main_sha1sum (int, char **); int single_binary_main_sha1sum" -Dusage=_usage_sha1sum $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_sha1sum_a_CPPFLAGS = -DHASH_ALGO_SHA1=1 $(AM_CPPFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_sha224sum_a_SOURCES = src/md5sum.c @SINGLE_BINARY_TRUE@src_libsinglebin_sha224sum_a_ldadd = $(LIB_CRYPTO) -@SINGLE_BINARY_TRUE@src_libsinglebin_sha224sum_a_CFLAGS = "-Dmain=_single_binary_main_sha224sum(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_sha224sum" -Dusage=_usage_sha224sum $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_sha224sum_a_CFLAGS = "-Dmain=single_binary_main_sha224sum (int, char **); int single_binary_main_sha224sum" -Dusage=_usage_sha224sum $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_sha224sum_a_CPPFLAGS = -DHASH_ALGO_SHA224=1 $(AM_CPPFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_sha256sum_a_SOURCES = src/md5sum.c @SINGLE_BINARY_TRUE@src_libsinglebin_sha256sum_a_ldadd = $(LIB_CRYPTO) -@SINGLE_BINARY_TRUE@src_libsinglebin_sha256sum_a_CFLAGS = "-Dmain=_single_binary_main_sha256sum(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_sha256sum" -Dusage=_usage_sha256sum $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_sha256sum_a_CFLAGS = "-Dmain=single_binary_main_sha256sum (int, char **); int single_binary_main_sha256sum" -Dusage=_usage_sha256sum $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_sha256sum_a_CPPFLAGS = -DHASH_ALGO_SHA256=1 $(AM_CPPFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_sha384sum_a_SOURCES = src/md5sum.c @SINGLE_BINARY_TRUE@src_libsinglebin_sha384sum_a_ldadd = $(LIB_CRYPTO) -@SINGLE_BINARY_TRUE@src_libsinglebin_sha384sum_a_CFLAGS = "-Dmain=_single_binary_main_sha384sum(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_sha384sum" -Dusage=_usage_sha384sum $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_sha384sum_a_CFLAGS = "-Dmain=single_binary_main_sha384sum (int, char **); int single_binary_main_sha384sum" -Dusage=_usage_sha384sum $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_sha384sum_a_CPPFLAGS = -DHASH_ALGO_SHA384=1 $(AM_CPPFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_sha512sum_a_SOURCES = src/md5sum.c @SINGLE_BINARY_TRUE@src_libsinglebin_sha512sum_a_ldadd = $(LIB_CRYPTO) -@SINGLE_BINARY_TRUE@src_libsinglebin_sha512sum_a_CFLAGS = "-Dmain=_single_binary_main_sha512sum(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_sha512sum" -Dusage=_usage_sha512sum $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_sha512sum_a_CFLAGS = "-Dmain=single_binary_main_sha512sum (int, char **); int single_binary_main_sha512sum" -Dusage=_usage_sha512sum $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_sha512sum_a_CPPFLAGS = -DHASH_ALGO_SHA512=1 $(AM_CPPFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_shred_a_SOURCES = src/shred.c @SINGLE_BINARY_TRUE@src_libsinglebin_shred_a_ldadd = $(LIB_FDATASYNC) -@SINGLE_BINARY_TRUE@src_libsinglebin_shred_a_CFLAGS = "-Dmain=_single_binary_main_shred(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_shred" -Dusage=_usage_shred $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_shred_a_CFLAGS = "-Dmain=single_binary_main_shred (int, char **); int single_binary_main_shred" -Dusage=_usage_shred $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_shuf_a_SOURCES = src/shuf.c -@SINGLE_BINARY_TRUE@src_libsinglebin_shuf_a_CFLAGS = "-Dmain=_single_binary_main_shuf(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_shuf" -Dusage=_usage_shuf $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_shuf_a_CFLAGS = "-Dmain=single_binary_main_shuf (int, char **); int single_binary_main_shuf" -Dusage=_usage_shuf $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_sleep_a_SOURCES = src/sleep.c @SINGLE_BINARY_TRUE@src_libsinglebin_sleep_a_ldadd = $(LIB_NANOSLEEP) -@SINGLE_BINARY_TRUE@src_libsinglebin_sleep_a_CFLAGS = "-Dmain=_single_binary_main_sleep(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_sleep" -Dusage=_usage_sleep $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_sleep_a_CFLAGS = "-Dmain=single_binary_main_sleep (int, char **); int single_binary_main_sleep" -Dusage=_usage_sleep $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_sort_a_SOURCES = src/sort.c @SINGLE_BINARY_TRUE@src_libsinglebin_sort_a_ldadd = $(LIB_EACCESS) $(LIB_NANOSLEEP) $(LIB_CRYPTO) $(LIB_PTHREAD) -@SINGLE_BINARY_TRUE@src_libsinglebin_sort_a_CFLAGS = "-Dmain=_single_binary_main_sort(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_sort" -Dusage=_usage_sort $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_sort_a_CFLAGS = "-Dmain=single_binary_main_sort (int, char **); int single_binary_main_sort" -Dusage=_usage_sort $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_split_a_SOURCES = src/split.c @SINGLE_BINARY_TRUE@src_libsinglebin_split_a_ldadd = $(LIBICONV) -@SINGLE_BINARY_TRUE@src_libsinglebin_split_a_CFLAGS = "-Dmain=_single_binary_main_split(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_split" -Dusage=_usage_split $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_split_a_CFLAGS = "-Dmain=single_binary_main_split (int, char **); int single_binary_main_split" -Dusage=_usage_split $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_stat_a_SOURCES = src/stat.c src/find-mount-point.c @SINGLE_BINARY_TRUE@src_libsinglebin_stat_a_ldadd = $(LIB_SELINUX) $(LIB_NVPAIR) -@SINGLE_BINARY_TRUE@src_libsinglebin_stat_a_CFLAGS = "-Dmain=_single_binary_main_stat(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_stat" -Dusage=_usage_stat $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_stat_a_CFLAGS = "-Dmain=single_binary_main_stat (int, char **); int single_binary_main_stat" -Dusage=_usage_stat $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_sum_a_SOURCES = src/sum.c -@SINGLE_BINARY_TRUE@src_libsinglebin_sum_a_CFLAGS = "-Dmain=_single_binary_main_sum(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_sum" -Dusage=_usage_sum $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_sum_a_CFLAGS = "-Dmain=single_binary_main_sum (int, char **); int single_binary_main_sum" -Dusage=_usage_sum $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_sync_a_SOURCES = src/sync.c -@SINGLE_BINARY_TRUE@src_libsinglebin_sync_a_CFLAGS = "-Dmain=_single_binary_main_sync(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_sync" -Dusage=_usage_sync $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_sync_a_CFLAGS = "-Dmain=single_binary_main_sync (int, char **); int single_binary_main_sync" -Dusage=_usage_sync $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_tac_a_SOURCES = src/tac.c -@SINGLE_BINARY_TRUE@src_libsinglebin_tac_a_CFLAGS = "-Dmain=_single_binary_main_tac(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_tac" -Dusage=_usage_tac $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_tac_a_CFLAGS = "-Dmain=single_binary_main_tac (int, char **); int single_binary_main_tac" -Dusage=_usage_tac $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_tail_a_SOURCES = src/tail.c @SINGLE_BINARY_TRUE@src_libsinglebin_tail_a_ldadd = $(LIB_NANOSLEEP) -@SINGLE_BINARY_TRUE@src_libsinglebin_tail_a_CFLAGS = "-Dmain=_single_binary_main_tail(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_tail" -Dusage=_usage_tail $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_tail_a_CFLAGS = "-Dmain=single_binary_main_tail (int, char **); int single_binary_main_tail" -Dusage=_usage_tail $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_tee_a_SOURCES = src/tee.c -@SINGLE_BINARY_TRUE@src_libsinglebin_tee_a_CFLAGS = "-Dmain=_single_binary_main_tee(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_tee" -Dusage=_usage_tee $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_tee_a_CFLAGS = "-Dmain=single_binary_main_tee (int, char **); int single_binary_main_tee" -Dusage=_usage_tee $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_test_a_SOURCES = src/test.c @SINGLE_BINARY_TRUE@src_libsinglebin_test_a_ldadd = $(LIB_EACCESS) -@SINGLE_BINARY_TRUE@src_libsinglebin_test_a_CFLAGS = "-Dmain=_single_binary_main_test(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_test" -Dusage=_usage_test $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_test_a_CFLAGS = "-Dmain=single_binary_main_test (int, char **); int single_binary_main_test" -Dusage=_usage_test $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_timeout_a_SOURCES = src/timeout.c src/operand2sig.c @SINGLE_BINARY_TRUE@src_libsinglebin_timeout_a_ldadd = $(LIB_TIMER_TIME) $(LIBICONV) -@SINGLE_BINARY_TRUE@src_libsinglebin_timeout_a_CFLAGS = "-Dmain=_single_binary_main_timeout(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_timeout" -Dusage=_usage_timeout $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_timeout_a_CFLAGS = "-Dmain=single_binary_main_timeout (int, char **); int single_binary_main_timeout" -Dusage=_usage_timeout $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_touch_a_SOURCES = src/touch.c @SINGLE_BINARY_TRUE@src_libsinglebin_touch_a_ldadd = $(LIB_CLOCK_GETTIME) -@SINGLE_BINARY_TRUE@src_libsinglebin_touch_a_CFLAGS = "-Dmain=_single_binary_main_touch(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_touch" -Dusage=_usage_touch $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_touch_a_CFLAGS = "-Dmain=single_binary_main_touch (int, char **); int single_binary_main_touch" -Dusage=_usage_touch $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_tr_a_SOURCES = src/tr.c -@SINGLE_BINARY_TRUE@src_libsinglebin_tr_a_CFLAGS = "-Dmain=_single_binary_main_tr(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_tr" -Dusage=_usage_tr $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_tr_a_CFLAGS = "-Dmain=single_binary_main_tr (int, char **); int single_binary_main_tr" -Dusage=_usage_tr $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_true_a_SOURCES = src/true.c -@SINGLE_BINARY_TRUE@src_libsinglebin_true_a_CFLAGS = "-Dmain=_single_binary_main_true(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_true" -Dusage=_usage_true $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_true_a_CFLAGS = "-Dmain=single_binary_main_true (int, char **); int single_binary_main_true" -Dusage=_usage_true $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_truncate_a_SOURCES = src/truncate.c @SINGLE_BINARY_TRUE@src_libsinglebin_truncate_a_ldadd = $(LIBICONV) -@SINGLE_BINARY_TRUE@src_libsinglebin_truncate_a_CFLAGS = "-Dmain=_single_binary_main_truncate(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_truncate" -Dusage=_usage_truncate $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_truncate_a_CFLAGS = "-Dmain=single_binary_main_truncate (int, char **); int single_binary_main_truncate" -Dusage=_usage_truncate $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_tsort_a_SOURCES = src/tsort.c -@SINGLE_BINARY_TRUE@src_libsinglebin_tsort_a_CFLAGS = "-Dmain=_single_binary_main_tsort(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_tsort" -Dusage=_usage_tsort $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_tsort_a_CFLAGS = "-Dmain=single_binary_main_tsort (int, char **); int single_binary_main_tsort" -Dusage=_usage_tsort $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_tty_a_SOURCES = src/tty.c -@SINGLE_BINARY_TRUE@src_libsinglebin_tty_a_CFLAGS = "-Dmain=_single_binary_main_tty(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_tty" -Dusage=_usage_tty $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_tty_a_CFLAGS = "-Dmain=single_binary_main_tty (int, char **); int single_binary_main_tty" -Dusage=_usage_tty $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_uname_a_SOURCES = src/uname.c src/uname-uname.c @SINGLE_BINARY_TRUE@src_libsinglebin_uname_a_ldadd = $(GETHOSTNAME_LIB) -@SINGLE_BINARY_TRUE@src_libsinglebin_uname_a_CFLAGS = "-Dmain=_single_binary_main_uname(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_uname" -Dusage=_usage_uname $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_uname_a_CFLAGS = "-Dmain=single_binary_main_uname (int, char **); int single_binary_main_uname" -Dusage=_usage_uname $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_unexpand_a_SOURCES = src/unexpand.c -@SINGLE_BINARY_TRUE@src_libsinglebin_unexpand_a_CFLAGS = "-Dmain=_single_binary_main_unexpand(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_unexpand" -Dusage=_usage_unexpand $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_unexpand_a_CFLAGS = "-Dmain=single_binary_main_unexpand (int, char **); int single_binary_main_unexpand" -Dusage=_usage_unexpand $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_uniq_a_SOURCES = src/uniq.c -@SINGLE_BINARY_TRUE@src_libsinglebin_uniq_a_CFLAGS = "-Dmain=_single_binary_main_uniq(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_uniq" -Dusage=_usage_uniq $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_uniq_a_CFLAGS = "-Dmain=single_binary_main_uniq (int, char **); int single_binary_main_uniq" -Dusage=_usage_uniq $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_unlink_a_SOURCES = src/unlink.c -@SINGLE_BINARY_TRUE@src_libsinglebin_unlink_a_CFLAGS = "-Dmain=_single_binary_main_unlink(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_unlink" -Dusage=_usage_unlink $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_unlink_a_CFLAGS = "-Dmain=single_binary_main_unlink (int, char **); int single_binary_main_unlink" -Dusage=_usage_unlink $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_vdir_a_SOURCES = src/coreutils-vdir.c @SINGLE_BINARY_TRUE@src_libsinglebin_vdir_a_ldadd = $(src_ls_LDADD) src/libsinglebin_ls.a -@SINGLE_BINARY_TRUE@src_libsinglebin_vdir_a_CFLAGS = "-Dmain=_single_binary_main_vdir(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_vdir" -Dusage=_usage_vdir $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_vdir_a_CFLAGS = "-Dmain=single_binary_main_vdir (int, char **); int single_binary_main_vdir" -Dusage=_usage_vdir $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_wc_a_SOURCES = src/wc.c -@SINGLE_BINARY_TRUE@src_libsinglebin_wc_a_CFLAGS = "-Dmain=_single_binary_main_wc(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_wc" -Dusage=_usage_wc $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_wc_a_CFLAGS = "-Dmain=single_binary_main_wc (int, char **); int single_binary_main_wc" -Dusage=_usage_wc $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_whoami_a_SOURCES = src/whoami.c -@SINGLE_BINARY_TRUE@src_libsinglebin_whoami_a_CFLAGS = "-Dmain=_single_binary_main_whoami(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_whoami" -Dusage=_usage_whoami $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_whoami_a_CFLAGS = "-Dmain=single_binary_main_whoami (int, char **); int single_binary_main_whoami" -Dusage=_usage_whoami $(src_coreutils_CFLAGS) @SINGLE_BINARY_TRUE@src_libsinglebin_yes_a_SOURCES = src/yes.c -@SINGLE_BINARY_TRUE@src_libsinglebin_yes_a_CFLAGS = "-Dmain=_single_binary_main_yes(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_yes" -Dusage=_usage_yes $(src_coreutils_CFLAGS) +@SINGLE_BINARY_TRUE@src_libsinglebin_yes_a_CFLAGS = "-Dmain=single_binary_main_yes (int, char **); int single_binary_main_yes" -Dusage=_usage_yes $(src_coreutils_CFLAGS) # Creates symlinks or shebangs to the installed programs when building # coreutils single binary. @@ -4972,7 +5002,7 @@ ALL_MANS = $(man1_MANS) $(EXTRA_MANS) # 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 +mandeps = .version $(top_srcdir)/src/system.h $(am__append_5) # Indirections required so that we'll still be able to know the # complete list of our tests even if the user overrides TESTS @@ -5030,7 +5060,7 @@ TESTS_ENVIRONMENT = \ MAKE=$(MAKE) \ PACKAGE_VERSION=$(PACKAGE_VERSION) \ PERL='$(PERL)' \ - PREFERABLY_POSIX_SHELL='$(PREFERABLY_POSIX_SHELL)' \ + 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 @@ -5050,6 +5080,7 @@ all_root_tests = \ tests/df/problematic-chars.sh \ tests/df/over-mount-device.sh \ tests/du/bind-mount-dir-cycle.sh \ + tests/du/bind-mount-dir-cycle-v2.sh \ tests/id/setgid.sh \ tests/install/install-C-root.sh \ tests/ls/capability.sh \ @@ -5060,6 +5091,7 @@ all_root_tests = \ tests/misc/truncate-owned-by-other.sh \ tests/mkdir/writable-under-readonly.sh \ tests/mkdir/smack-root.sh \ + tests/mv/hardlink-case.sh \ tests/mv/sticky-to-xpart.sh \ tests/rm/fail-2eperm.sh \ tests/rm/no-give-up.sh \ @@ -5087,6 +5119,7 @@ all_root_tests = \ all_tests = \ tests/misc/help-version.sh \ tests/tail-2/inotify-race.sh \ + tests/tail-2/inotify-race2.sh \ tests/misc/invalid-opt.pl \ tests/rm/ext3-perf.sh \ tests/rm/cycle.sh \ @@ -5097,7 +5130,10 @@ all_tests = \ tests/tail-2/inotify-hash-abuse2.sh \ tests/tail-2/F-vs-missing.sh \ tests/tail-2/F-vs-rename.sh \ + tests/tail-2/F-headers.sh \ + tests/tail-2/descriptor-vs-rename.sh \ tests/tail-2/inotify-rotate.sh \ + tests/tail-2/inotify-rotate-resources.sh \ tests/chmod/no-x.sh \ tests/chgrp/basic.sh \ tests/rm/dangling-symlink.sh \ @@ -5121,7 +5157,6 @@ all_tests = \ 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 \ @@ -5159,6 +5194,7 @@ all_tests = \ tests/misc/test.pl \ tests/misc/seq.pl \ tests/misc/seq-long-double.sh \ + tests/misc/seq-precision.sh \ tests/misc/head.pl \ tests/misc/head-elide-tail.pl \ tests/tail-2/tail-n0f.sh \ @@ -5184,8 +5220,10 @@ all_tests = \ tests/misc/wc-files0-from.pl \ tests/misc/wc-files0.sh \ tests/misc/wc-parallel.sh \ + tests/misc/wc-proc.sh \ tests/misc/cat-proc.sh \ tests/misc/cat-buf.sh \ + tests/misc/cat-self.sh \ tests/misc/base64.pl \ tests/misc/basename.pl \ tests/misc/close-stdout.sh \ @@ -5202,6 +5240,7 @@ all_tests = \ tests/misc/expand.pl \ tests/misc/expr.pl \ tests/misc/factor.pl \ + tests/misc/factor-parallel.sh \ tests/misc/false-status.sh \ tests/misc/fold.pl \ tests/misc/groups-dash.sh \ @@ -5222,6 +5261,7 @@ all_tests = \ tests/misc/nproc-positive.sh \ tests/misc/numfmt.pl \ tests/misc/od-N.sh \ + tests/misc/od-j.sh \ tests/misc/od-multiple-t.sh \ tests/misc/od-x8.sh \ tests/misc/paste.pl \ @@ -5243,9 +5283,9 @@ all_tests = \ tests/misc/sha384sum.pl \ tests/misc/sha512sum.pl \ tests/misc/shred-exact.sh \ - tests/misc/shred-negative.sh \ tests/misc/shred-passes.sh \ tests/misc/shred-remove.sh \ + tests/misc/shred-size.sh \ tests/misc/shuf.sh \ tests/misc/shuf-reservoir.sh \ tests/misc/sort.pl \ @@ -5281,6 +5321,7 @@ all_tests = \ tests/split/line-bytes.sh \ tests/split/l-chunk.sh \ tests/split/r-chunk.sh \ + tests/split/record-sep.sh \ tests/split/numeric.sh \ tests/split/guard-input.sh \ tests/misc/stat-birthtime.sh \ @@ -5297,12 +5338,12 @@ all_tests = \ tests/misc/stty-row-col.sh \ tests/misc/sum.pl \ tests/misc/sum-sysv.sh \ + tests/misc/sync.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 \ @@ -5323,9 +5364,12 @@ all_tests = \ tests/misc/uniq.pl \ tests/misc/uniq-perf.sh \ tests/misc/xattr.sh \ + tests/misc/yes.sh \ tests/tail-2/wait.sh \ tests/tail-2/retry.sh \ - tests/tail-2/symlink.sh \ + tests/tail-2/symlink.sh \ + tests/tail-2/tail-c.sh \ + tests/tail-2/truncate.sh \ tests/chmod/c-option.sh \ tests/chmod/equal-x.sh \ tests/chmod/equals.sh \ @@ -5354,6 +5398,7 @@ all_tests = \ tests/cp/dir-rm-dest.sh \ tests/cp/dir-slash.sh \ tests/cp/dir-vs-file.sh \ + tests/cp/duplicate-sources.sh \ tests/cp/existing-perm-dir.sh \ tests/cp/existing-perm-race.sh \ tests/cp/fail-perm.sh \ @@ -5404,7 +5449,7 @@ all_tests = \ tests/dd/ascii.sh \ tests/dd/direct.sh \ tests/dd/misc.sh \ - tests/dd/no-allocate.sh \ + tests/dd/no-allocate.sh \ tests/dd/nocache.sh \ tests/dd/not-rewound.sh \ tests/dd/reblock.sh \ @@ -5416,6 +5461,7 @@ all_tests = \ tests/dd/stderr.sh \ tests/dd/unblock.pl \ tests/dd/unblock-sync.sh \ + tests/dd/stats.sh \ tests/df/total-verify.sh \ tests/du/2g.sh \ tests/du/8gb.sh \ @@ -5477,6 +5523,7 @@ all_tests = \ tests/ls/file-type.sh \ tests/ls/follow-slink.sh \ tests/ls/getxattr-speedup.sh \ + tests/ls/hex-option.sh \ tests/ls/infloop.sh \ tests/ls/inode.sh \ tests/ls/m-option.sh \ @@ -5527,7 +5574,6 @@ all_tests = \ 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 \ @@ -5780,7 +5826,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/lib/local.mk $(srcdi echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -5790,7 +5835,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)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk: +$(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -5828,6 +5873,14 @@ lib/copy-acl.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) lib/set-acl.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) +lib/acl-errno-valid.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/acl-internal.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/get-permissions.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/set-permissions.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) lib/allocator.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) lib/areadlink.$(OBJEXT): lib/$(am__dirstamp) \ @@ -5924,6 +5977,8 @@ lib/dup-safer-flag.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) lib/fdutimensat.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) +lib/file-has-acl.$(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) \ @@ -5990,6 +6045,10 @@ lib/ldtoastr.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) lib/linebuffer.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) +lib/gl_linked_list.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/gl_list.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) lib/localcharset.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) lib/glthread/$(am__dirstamp): @@ -6064,10 +6123,6 @@ lib/progname.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) lib/propername.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) -lib/acl-errno-valid.$(OBJEXT): lib/$(am__dirstamp) \ - lib/$(DEPDIR)/$(am__dirstamp) -lib/file-has-acl.$(OBJEXT): lib/$(am__dirstamp) \ - lib/$(DEPDIR)/$(am__dirstamp) lib/qcopy-acl.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) lib/qset-acl.$(OBJEXT): lib/$(am__dirstamp) \ @@ -6189,6 +6244,10 @@ lib/xmalloc.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) lib/xalloc-die.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) +lib/xdectoimax.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) +lib/xdectoumax.$(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) @@ -6198,6 +6257,8 @@ lib/xgetgroups.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) lib/xgethostname.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) +lib/gl_xlist.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) lib/xmemcoll.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) lib/xnanosleep.$(OBJEXT): lib/$(am__dirstamp) \ @@ -6230,6 +6291,8 @@ lib/xvasprintf.$(OBJEXT): lib/$(am__dirstamp) \ lib/xasprintf.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) lib/yesno.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/acl_entries.$(OBJEXT): lib/$(am__dirstamp) \ + lib/$(DEPDIR)/$(am__dirstamp) lib/alloca.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) lib/at-func.$(OBJEXT): lib/$(am__dirstamp) \ @@ -6436,8 +6499,6 @@ lib/pthread.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) lib/putenv.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) -lib/acl_entries.$(OBJEXT): lib/$(am__dirstamp) \ - lib/$(DEPDIR)/$(am__dirstamp) lib/raise.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) lib/read.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) lib/readdir.$(OBJEXT): lib/$(am__dirstamp) \ @@ -6563,6 +6624,8 @@ lib/wcswidth.$(OBJEXT): lib/$(am__dirstamp) \ lib/wcwidth.$(OBJEXT): lib/$(am__dirstamp) \ lib/$(DEPDIR)/$(am__dirstamp) lib/write.$(OBJEXT): lib/$(am__dirstamp) lib/$(DEPDIR)/$(am__dirstamp) +lib/xdectoint.$(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 @@ -8102,6 +8165,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/acl-errno-valid.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/acl-internal.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/acl_entries.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/alloca.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/allocator.Po@am__quote@ @@ -8218,6 +8282,7 @@ distclean-compile: @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)/get-permissions.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@ @@ -8239,6 +8304,9 @@ distclean-compile: @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)/gl_linked_list.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/gl_list.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/gl_xlist.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@ @@ -8380,6 +8448,7 @@ distclean-compile: @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-acl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/set-permissions.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@ @@ -8455,6 +8524,9 @@ distclean-compile: @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)/xdectoimax.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xdectoint.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/xdectoumax.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@ @@ -10938,15 +11010,16 @@ $(srcdir)/doc/stamp-vti: doc/coreutils.texi $(top_srcdir)/configure 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 + 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.tmp$$$$ && \ + mv $(srcdir)/doc/version.texi.tmp$$$$ $(srcdir)/doc/version.texi)) && \ + rm -f vti.tmp$$$$ $(srcdir)/doc/version.texi.$$$$ @cp $(srcdir)/doc/version.texi $@ mostlyclean-vti: - -rm -f vti.tmp + -rm -f vti.tmp* $(srcdir)/doc/version.texi.tmp* maintainer-clean-vti: -rm -f $(srcdir)/doc/stamp-vti $(srcdir)/doc/version.texi @@ -11223,7 +11296,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -11460,15 +11533,15 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -11504,18 +11577,18 @@ distcheck: dist esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && $(MAKE) $(AM_MAKEFLAGS) distcheck-hook \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -11833,6 +11906,8 @@ uninstall-man: uninstall-man1 uninstall-local uninstall-man uninstall-man1 uninstall-pdf-am \ uninstall-pkglibexecPROGRAMS uninstall-ps-am +.PRECIOUS: Makefile + # Keep these in sync with bootstrap.conf:bootstrap_post_import_hook(). # Use '$(top_srcdir)/m4' and '$(srcdir)/src' for the benefit of non-GNU @@ -11903,16 +11978,24 @@ check-ls-dircolors: |sed -n 's/^"\(..\)"/\1/p'|sort -u); \ test "$$dc" = "$$ls" +# FIXME: avoid dependency to build our own 'sort' for 'make dist' ... +# when common platforms have a functional case-folding implementation: +# $ test 'abácad' = "$(printf '%s\n' 'ab' 'ác' 'ad' \ +# | LC_ALL=en_US.UTF-8 sort -f \ +# | tr -d '\n')" && echo GOOD || echo BAD +# Note we don't enable case folding (-f) in the sort below, due to bugs +# in the I18N patch used in many distros (as of 2015). Also using our +# own src/sort here would induce awkward dependencies for `make dist`. THANKS: THANKS.in Makefile.am .mailmap thanks-gen .version $(AM_V_GEN)rm -f $@-t $@; \ { \ $(prologue); echo; \ - { perl -ne '/^$$/.../^$$/ and print' $(srcdir)/THANKS.in \ - | grep -v '^$$' | perl -pe 's/ +/\0/'; \ + { perl -ne '/^$$/.../^$$/ and !/^$$/ and s/ +/\0/ and print' \ + $(srcdir)/THANKS.in; \ git log --pretty=format:'%aN%x00%aE' \ | $(ASSORT) -u; \ } | $(srcdir)/thanks-gen \ - | LC_ALL=en_US.UTF-8 sort -f; \ + | LC_ALL=en_US.UTF-8 sort -k1,1; \ echo; \ printf ';; %s\n' 'Local Variables:' 'coding: utf-8' End:; \ } > $@-t && chmod a-w $@-t && mv $@-t $@ @@ -11935,7 +12018,8 @@ check-git-hook-script-sync: # the selected tools when installing. install-exec-hook: $(AM_V_at)ctrans=$$(printf coreutils | sed -e "$(transform)"); \ - for p in $(single_binary_progs); do \ + for p in x $(single_binary_progs); do \ + test $$p = x && continue; \ ptrans=$$(printf '%s' "$$p" | sed -e "$(transform)"); \ rm -f $(DESTDIR)$(bindir)/$$ptrans$(EXEEXT) || exit $$?; \ if test "x$(single_binary_install_type)" = xshebangs; then \ @@ -12872,6 +12956,7 @@ lib/warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h @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_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|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; \ @@ -13066,6 +13151,7 @@ lib/stdlib.h: lib/stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -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_QSORT_R''@/$(GNULIB_QSORT_R)/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' \ @@ -13117,6 +13203,7 @@ lib/stdlib.h: lib/stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -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_QSORT_R''@|$(REPLACE_QSORT_R)|g' \ -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ @@ -13526,6 +13613,7 @@ lib/time.h: lib/time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -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 's|@''UNISTD_H_DEFINES_STRUCT_TIMESPEC''@|$(UNISTD_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)' \ @@ -13659,9 +13747,11 @@ lib/unistd.h: lib/unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_N -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ + -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|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_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \ -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ @@ -13851,13 +13941,15 @@ dist-hook: $(noinst_LIBRARIES) .PHONY: dist-hook src/coreutils_symlinks: Makefile $(AM_V_GEN)touch $@ - $(AM_V_at)for i in $(single_binary_progs); do \ + $(AM_V_at)for i in x $(single_binary_progs); do \ + test $$i = x && continue; \ rm -f src/$$i$(EXEEXT) || exit $$?; \ $(LN_S) -s coreutils$(EXEEXT) src/$$i$(EXEEXT) || exit $$?; \ done src/coreutils_shebangs: Makefile $(AM_V_GEN)touch $@ - $(AM_V_at)for i in $(single_binary_progs); do \ + $(AM_V_at)for i in x $(single_binary_progs); do \ + test $$i = x && continue; \ rm -f src/$$i$(EXEEXT) || exit $$?; \ printf '#!%s --coreutils-prog-shebang=%s\n' \ $(abs_top_builddir)/src/coreutils$(EXEEXT) $$i \ @@ -13866,7 +13958,8 @@ src/coreutils_shebangs: Makefile done clean-local: - $(AM_V_at)for i in $(single_binary_progs); do \ + $(AM_V_at)for i in x $(single_binary_progs); do \ + test $$i = x && continue; \ rm -f src/$$i$(EXEEXT) || exit $$?; \ done src/dircolors.h: src/dcgen src/dircolors.hin @@ -13939,7 +14032,8 @@ src/version.h: Makefile $(AM_V_at)mv $@t $@ src/coreutils.h: Makefile $(AM_V_GEN)rm -f $@ - $(AM_V_at)for prog in $(single_binary_progs); do \ + $(AM_V_at)for prog in x $(single_binary_progs); do \ + test $$prog = x && continue; \ prog=`basename $$prog`; \ main=`echo $$prog | tr '[' '_'`; \ echo "SINGLE_BINARY_PROGRAM(\"$$prog\", $$main)"; \ @@ -14039,27 +14133,113 @@ distclean-local: test x$(srcdir) = x$(builddir) || rm -f $(ALL_MANS) $(ALL_MANS): $(mandeps) -man/dynamic-deps.mk: Makefile - $(AM_V_GEN)rm -f $@ $@-t - $(AM_V_at)for man in $(ALL_MANS); do \ - name=`echo "$$man"|sed 's|.*/||; s|\.1$$||'` || exit 1; \ - case $$name in \ - arch) prog='uname';; \ - install) prog='ginstall';; \ - test) prog='[';; \ - *) prog=$$name;; \ - esac; \ - case " $(single_binary_progs) " in \ - *" $$prog "*) \ - echo $$man: src/coreutils$(EXEEXT);; \ - *) \ - echo $$man: src/$$prog$(EXEEXT);; \ - esac \ - done > $@-t \ - && mv $@-t $@ - -# Include the generated man dependencies. -@AMDEP_TRUE@@am__include@ man/dynamic-deps.mk +# Most prog.1 man pages depend on src/prog. List the exceptions: +@SINGLE_BINARY_FALSE@man/arch.1: src/uname$(EXEEXT) +@SINGLE_BINARY_FALSE@man/install.1: src/ginstall$(EXEEXT) +@SINGLE_BINARY_FALSE@man/test.1: src/[$(EXEEXT) + +@SINGLE_BINARY_FALSE@man/base64.1: src/base64$(EXEEXT) +@SINGLE_BINARY_FALSE@man/basename.1: src/basename$(EXEEXT) +@SINGLE_BINARY_FALSE@man/cat.1: src/cat$(EXEEXT) +@SINGLE_BINARY_FALSE@man/chcon.1: src/chcon$(EXEEXT) +@SINGLE_BINARY_FALSE@man/chgrp.1: src/chgrp$(EXEEXT) +@SINGLE_BINARY_FALSE@man/chmod.1: src/chmod$(EXEEXT) +@SINGLE_BINARY_FALSE@man/chown.1: src/chown$(EXEEXT) +@SINGLE_BINARY_FALSE@man/chroot.1: src/chroot$(EXEEXT) +@SINGLE_BINARY_FALSE@man/cksum.1: src/cksum$(EXEEXT) +@SINGLE_BINARY_FALSE@man/comm.1: src/comm$(EXEEXT) +@SINGLE_BINARY_FALSE@man/coreutils.1: src/coreutils$(EXEEXT) +@SINGLE_BINARY_FALSE@man/cp.1: src/cp$(EXEEXT) +@SINGLE_BINARY_FALSE@man/csplit.1: src/csplit$(EXEEXT) +@SINGLE_BINARY_FALSE@man/cut.1: src/cut$(EXEEXT) +@SINGLE_BINARY_FALSE@man/date.1: src/date$(EXEEXT) +@SINGLE_BINARY_FALSE@man/dd.1: src/dd$(EXEEXT) +@SINGLE_BINARY_FALSE@man/df.1: src/df$(EXEEXT) +@SINGLE_BINARY_FALSE@man/dir.1: src/dir$(EXEEXT) +@SINGLE_BINARY_FALSE@man/dircolors.1: src/dircolors$(EXEEXT) +@SINGLE_BINARY_FALSE@man/dirname.1: src/dirname$(EXEEXT) +@SINGLE_BINARY_FALSE@man/du.1: src/du$(EXEEXT) +@SINGLE_BINARY_FALSE@man/echo.1: src/echo$(EXEEXT) +@SINGLE_BINARY_FALSE@man/env.1: src/env$(EXEEXT) +@SINGLE_BINARY_FALSE@man/expand.1: src/expand$(EXEEXT) +@SINGLE_BINARY_FALSE@man/expr.1: src/expr$(EXEEXT) +@SINGLE_BINARY_FALSE@man/factor.1: src/factor$(EXEEXT) +@SINGLE_BINARY_FALSE@man/false.1: src/false$(EXEEXT) +@SINGLE_BINARY_FALSE@man/fmt.1: src/fmt$(EXEEXT) +@SINGLE_BINARY_FALSE@man/fold.1: src/fold$(EXEEXT) +@SINGLE_BINARY_FALSE@man/groups.1: src/groups$(EXEEXT) +@SINGLE_BINARY_FALSE@man/head.1: src/head$(EXEEXT) +@SINGLE_BINARY_FALSE@man/hostid.1: src/hostid$(EXEEXT) +@SINGLE_BINARY_FALSE@man/hostname.1: src/hostname$(EXEEXT) +@SINGLE_BINARY_FALSE@man/id.1: src/id$(EXEEXT) +@SINGLE_BINARY_FALSE@man/join.1: src/join$(EXEEXT) +@SINGLE_BINARY_FALSE@man/kill.1: src/kill$(EXEEXT) +@SINGLE_BINARY_FALSE@man/link.1: src/link$(EXEEXT) +@SINGLE_BINARY_FALSE@man/ln.1: src/ln$(EXEEXT) +@SINGLE_BINARY_FALSE@man/logname.1: src/logname$(EXEEXT) +@SINGLE_BINARY_FALSE@man/ls.1: src/ls$(EXEEXT) +@SINGLE_BINARY_FALSE@man/md5sum.1: src/md5sum$(EXEEXT) +@SINGLE_BINARY_FALSE@man/mkdir.1: src/mkdir$(EXEEXT) +@SINGLE_BINARY_FALSE@man/mkfifo.1: src/mkfifo$(EXEEXT) +@SINGLE_BINARY_FALSE@man/mknod.1: src/mknod$(EXEEXT) +@SINGLE_BINARY_FALSE@man/mktemp.1: src/mktemp$(EXEEXT) +@SINGLE_BINARY_FALSE@man/mv.1: src/mv$(EXEEXT) +@SINGLE_BINARY_FALSE@man/nice.1: src/nice$(EXEEXT) +@SINGLE_BINARY_FALSE@man/nl.1: src/nl$(EXEEXT) +@SINGLE_BINARY_FALSE@man/nohup.1: src/nohup$(EXEEXT) +@SINGLE_BINARY_FALSE@man/nproc.1: src/nproc$(EXEEXT) +@SINGLE_BINARY_FALSE@man/numfmt.1: src/numfmt$(EXEEXT) +@SINGLE_BINARY_FALSE@man/od.1: src/od$(EXEEXT) +@SINGLE_BINARY_FALSE@man/paste.1: src/paste$(EXEEXT) +@SINGLE_BINARY_FALSE@man/pathchk.1: src/pathchk$(EXEEXT) +@SINGLE_BINARY_FALSE@man/pinky.1: src/pinky$(EXEEXT) +@SINGLE_BINARY_FALSE@man/pr.1: src/pr$(EXEEXT) +@SINGLE_BINARY_FALSE@man/printenv.1: src/printenv$(EXEEXT) +@SINGLE_BINARY_FALSE@man/printf.1: src/printf$(EXEEXT) +@SINGLE_BINARY_FALSE@man/ptx.1: src/ptx$(EXEEXT) +@SINGLE_BINARY_FALSE@man/pwd.1: src/pwd$(EXEEXT) +@SINGLE_BINARY_FALSE@man/readlink.1: src/readlink$(EXEEXT) +@SINGLE_BINARY_FALSE@man/realpath.1: src/realpath$(EXEEXT) +@SINGLE_BINARY_FALSE@man/rm.1: src/rm$(EXEEXT) +@SINGLE_BINARY_FALSE@man/rmdir.1: src/rmdir$(EXEEXT) +@SINGLE_BINARY_FALSE@man/runcon.1: src/runcon$(EXEEXT) +@SINGLE_BINARY_FALSE@man/seq.1: src/seq$(EXEEXT) +@SINGLE_BINARY_FALSE@man/sha1sum.1: src/sha1sum$(EXEEXT) +@SINGLE_BINARY_FALSE@man/sha224sum.1: src/sha224sum$(EXEEXT) +@SINGLE_BINARY_FALSE@man/sha256sum.1: src/sha256sum$(EXEEXT) +@SINGLE_BINARY_FALSE@man/sha384sum.1: src/sha384sum$(EXEEXT) +@SINGLE_BINARY_FALSE@man/sha512sum.1: src/sha512sum$(EXEEXT) +@SINGLE_BINARY_FALSE@man/shred.1: src/shred$(EXEEXT) +@SINGLE_BINARY_FALSE@man/shuf.1: src/shuf$(EXEEXT) +@SINGLE_BINARY_FALSE@man/sleep.1: src/sleep$(EXEEXT) +@SINGLE_BINARY_FALSE@man/sort.1: src/sort$(EXEEXT) +@SINGLE_BINARY_FALSE@man/split.1: src/split$(EXEEXT) +@SINGLE_BINARY_FALSE@man/stat.1: src/stat$(EXEEXT) +@SINGLE_BINARY_FALSE@man/stdbuf.1: src/stdbuf$(EXEEXT) +@SINGLE_BINARY_FALSE@man/stty.1: src/stty$(EXEEXT) +@SINGLE_BINARY_FALSE@man/sum.1: src/sum$(EXEEXT) +@SINGLE_BINARY_FALSE@man/sync.1: src/sync$(EXEEXT) +@SINGLE_BINARY_FALSE@man/tac.1: src/tac$(EXEEXT) +@SINGLE_BINARY_FALSE@man/tail.1: src/tail$(EXEEXT) +@SINGLE_BINARY_FALSE@man/tee.1: src/tee$(EXEEXT) +@SINGLE_BINARY_FALSE@man/timeout.1: src/timeout$(EXEEXT) +@SINGLE_BINARY_FALSE@man/touch.1: src/touch$(EXEEXT) +@SINGLE_BINARY_FALSE@man/tr.1: src/tr$(EXEEXT) +@SINGLE_BINARY_FALSE@man/true.1: src/true$(EXEEXT) +@SINGLE_BINARY_FALSE@man/truncate.1: src/truncate$(EXEEXT) +@SINGLE_BINARY_FALSE@man/tsort.1: src/tsort$(EXEEXT) +@SINGLE_BINARY_FALSE@man/tty.1: src/tty$(EXEEXT) +@SINGLE_BINARY_FALSE@man/uname.1: src/uname$(EXEEXT) +@SINGLE_BINARY_FALSE@man/unexpand.1: src/unexpand$(EXEEXT) +@SINGLE_BINARY_FALSE@man/uniq.1: src/uniq$(EXEEXT) +@SINGLE_BINARY_FALSE@man/unlink.1: src/unlink$(EXEEXT) +@SINGLE_BINARY_FALSE@man/uptime.1: src/uptime$(EXEEXT) +@SINGLE_BINARY_FALSE@man/users.1: src/users$(EXEEXT) +@SINGLE_BINARY_FALSE@man/vdir.1: src/vdir$(EXEEXT) +@SINGLE_BINARY_FALSE@man/wc.1: src/wc$(EXEEXT) +@SINGLE_BINARY_FALSE@man/who.1: src/who$(EXEEXT) +@SINGLE_BINARY_FALSE@man/whoami.1: src/whoami$(EXEEXT) +@SINGLE_BINARY_FALSE@man/yes.1: src/yes$(EXEEXT) .x.1: $(AM_V_GEN)name=`echo $@ | sed 's|.*/||; s|\.1$$||'` || exit 1; \ @@ -14072,12 +14252,14 @@ man/dynamic-deps.mk: Makefile && t=$*.td \ && rm -rf $$t \ && $(MKDIR_P) $$t \ - && (cd $$t && $(LN_S) '$(abs_top_builddir)/src/'$$prog $$argv) \ + && (cd $$t && $(LN_S) '$(abs_top_builddir)/src/'$$prog$(EXEEXT) \ + $$argv$(EXEEXT)) \ && $(run_help2man) \ --source='$(PACKAGE_STRING)' \ --include=$(srcdir)/man/$$name.x \ - --output=$$t/$$name.1 $$t/$$argv \ - --info-page='coreutils \(aq'$$name' invocation\(aq' \ + --output=$$t/$$name.1 \ + --info-page='\(aq(coreutils) '$$name' invocation\(aq' \ + $$t/$$argv$(EXEEXT) \ && sed \ -e 's|$*\.td/||g' \ -e '/For complete documentation/d' \ diff --git a/NEWS b/NEWS index 4bffdf23..4dc4b561 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,146 @@ GNU coreutils NEWS -*- outline -*- +* Noteworthy changes in release 8.24 (2015-07-03) [stable] + +** Bug fixes + + dd supports more robust SIGINFO/SIGUSR1 handling for outputting statistics. + Previously those signals may have inadvertently terminated the process. + + df --local no longer hangs with inaccessible remote mounts. + [bug introduced in coreutils-8.21] + + du now silently ignores all directory cycles due to bind mounts. + Previously it would issue a warning and exit with a failure status. + [bug introduced in coreutils-8.1 and partially fixed in coreutils-8.23] + + chroot again calls chroot(DIR) and chdir("/"), even if DIR is "/". + This handles separate bind mounted "/" trees, and environments + depending on the implicit chdir("/"). + [bugs introduced in coreutils-8.23] + + cp no longer issues an incorrect warning about directory hardlinks when a + source directory is specified multiple times. Now, consistent with other + file types, a warning is issued for source directories with duplicate names, + or with -H the directory is copied again using the symlink name. + + factor avoids writing partial lines, thus supporting parallel operation. + [the bug dates back to the initial implementation] + + head, od, split, tac, tail, and wc no longer mishandle input from files in + /proc and /sys file systems that report somewhat-incorrect file sizes. + + mkdir --parents -Z now correctly sets the context for the last component, + even if the parent directory exists and has a different default context. + [bug introduced with the -Z restorecon functionality in coreutils-8.22] + + numfmt no longer outputs incorrect overflowed values seen with certain + large numbers, or with numbers with increased precision. + [bug introduced when numfmt was added in coreutils-8.21] + + numfmt now handles leading zeros correctly, not counting them when + settings processing limits, and making them optional with floating point. + [bug introduced when numfmt was added in coreutils-8.21] + + paste no longer truncates output for large input files. This would happen + for example with files larger than 4GiB on 32 bit systems with a '\n' + character at the 4GiB position. + [the bug dates back to the initial implementation] + + rm indicates the correct number of arguments in its confirmation prompt, + on all platforms. [bug introduced in coreutils-8.22] + + shuf -i with a single redundant operand, would crash instead of issuing + a diagnostic. [bug introduced in coreutils-8.22] + + tail releases inotify resources when unused. Previously it could exhaust + resources with many files, or with -F if files were replaced many times. + [bug introduced in coreutils-7.5] + + tail -f again follows changes to a file after it's renamed. + [bug introduced in coreutils-7.5] + + tail --follow no longer misses changes to files if those files were + replaced before inotify watches were created. + [bug introduced in coreutils-7.5] + + tail --follow consistently outputs all data for a truncated file. + [bug introduced in the beginning] + + tail --follow=name correctly outputs headers for multiple files + when those files are being created or renamed. + [bug introduced in coreutils-7.5] + +** New features + + chroot accepts the new --skip-chdir option to not change the working directory + to "/" after changing into the chroot(2) jail, thus retaining the current wor- + king directory. The new option is only permitted if the new root directory is + the old "/", and therefore is useful with the --group and --userspec options. + + dd accepts a new status=progress level to print data transfer statistics + on stderr approximately every second. + + numfmt can now process multiple fields with field range specifications similar + to cut, and supports setting the output precision with the --format option. + + split accepts a new --separator option to select a record separator character + other than the default newline character. + + stty allows setting the "extproc" option where supported, which is + a useful setting with high latency links. + + sync no longer ignores arguments, and syncs each specified file, or with the + --file-system option, the file systems associated with each specified file. + + tee accepts a new --output-error option to control operation with pipes + and output errors in general. + +** Changes in behavior + + df no longer suppresses separate exports of the same remote device, as + these are generally explicitly mounted. The --total option does still + suppress duplicate remote file systems. + [suppression was introduced in coreutils-8.21] + + mv no longer supports moving a file to a hardlink, instead issuing an error. + The implementation was susceptible to races in the presence of multiple mv + instances, which could result in both hardlinks being deleted. Also on case + insensitive file systems like HFS, mv would just remove a hardlinked 'file' + if called like `mv file File`. The feature was added in coreutils-5.0.1. + + numfmt --from-unit and --to-unit options now interpret suffixes as SI units, + and IEC (power of 2) units are now specified by appending 'i'. + + tee will exit early if there are no more writable outputs. + + tee does not treat the file operand '-' as meaning standard output any longer, + for better conformance to POSIX. This feature was added in coreutils-5.3.0. + + timeout --foreground no longer sends SIGCONT to the monitored process, + which was seen to cause intermittent issues with GDB for example. + +** Improvements + + cp,install,mv will convert smaller runs of NULs in the input to holes, + and cp --sparse=always avoids speculative preallocation on XFS for example. + + cp will read sparse files more efficiently when the destination is a + non regular file. For example when copying a disk image to a device node. + + mv will try a reflink before falling back to a standard copy, which is + more efficient when moving files across BTRFS subvolume boundaries. + + stat and tail now know about IBRIX. stat -f --format=%T now reports the file + system type, and tail -f uses polling for files on IBRIX file systems. + + wc -l processes short lines much more efficiently. + + References from --help and the man pages of utilities have been corrected + in various cases, and more direct links to the corresponding online + documentation are provided. + + * Noteworthy changes in release 8.23 (2014-07-18) [stable] ** Bug fixes @@ -841,7 +982,7 @@ GNU coreutils NEWS -*- outline -*- ** Bug fixes chown and chgrp with the -v --from= options, now output the correct owner. - I.E. for skipped files, the original ownership is output, not the new one. + I.e., for skipped files, the original ownership is output, not the new one. [bug introduced in sh-utils-2.0g] cp -r could mistakenly change the permissions of an existing destination @@ -2364,7 +2505,7 @@ GNU coreutils NEWS -*- outline -*- the DF_BLOCK_SIZE, BLOCK_SIZE, and BLOCKSIZE environment variables. It is still affected by POSIXLY_CORRECT, though. - Using pr -m -s (i.e. merging files, with TAB as the output separator) + Using pr -m -s (i.e., merging files, with TAB as the output separator) no longer inserts extraneous spaces between output columns. * Noteworthy changes in release 6.8 (2007-02-24) [not-unstable] @@ -4217,7 +4358,7 @@ packages, see ./old/*/NEWS. ======================================================================== -Copyright (C) 2001-2014 Free Software Foundation, Inc. +Copyright (C) 2001-2015 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 bd0bce59..7473aebb 100644 --- a/README +++ b/README @@ -107,7 +107,7 @@ HPUX 11.x build failure ----------------------- A known problem exists when compiling on HPUX on both hppa and ia64 -in 64-bit mode (i.e. +DD64) on HP-UX 11.0, 11.11, and 11.23. This +in 64-bit mode (i.e., +DD64) on HP-UX 11.0, 11.11, and 11.23. This is not due to a bug in the package but instead due to a bug in the system header file which breaks things in 64-bit mode. The default compilation mode is 32-bit and the software compiles fine using the @@ -242,7 +242,7 @@ the address on the last line of --help output. ======================================================================== -Copyright (C) 1998-2014 Free Software Foundation, Inc. +Copyright (C) 1998-2015 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 e6299d6b..cc38bd86 100644 --- a/THANKS +++ b/THANKS @@ -4,7 +4,7 @@ have contributed improvements to the documentation, actual code, and even complete programs. Those contributions are described in the version control logs and ChangeLog files. If your name has been left out, if you'd rather not be listed, or if you'd prefer a different address be used, please send a -note to the bug-report mailing list (as seen at end of e.g., cp --help). +note to the GNU coreutils mailing list . ??? kytek@cybercomm.net A Costa agcosta@gis.net @@ -22,11 +22,13 @@ 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 +Alban Bedel alban.bedel@avionic-design.de Albert Chin-A-Young china@thewrittenword.com Albert Hopkins ahopkins@dynacare.com Alberto Accomazzi alberto@cfa0.harvard.edu aldomel aldomel@ix.netcom.com Aleksej Serdjukov deletesoftware@yandex.ru +Aleksej Shilin rootlexx@mail.ru Alen Muzinic zveki@fly.cc.fer.hr Alex Deymo deymo@chromium.org Alexander Nguyen vinh@seas.ucla.edu @@ -38,12 +40,13 @@ Alfred M. Szmidt ams@kemisten.nu Allen Hewes allen@decisiv.net Ambrose Feinstein ambrose@google.com Amr Ali amr.ali.cc@gmail.com +Anders Jonsson anders.jonsson@norsjovallen.se Anders Kaseorg andersk@mit.edu Andi Kleen freitag@alancoxonachip.com Andre Novaes Cunha Andre.Cunha@br.global-one.net Andreas Dilger adilger@sun.com Andreas Frische andreasfrische@gmail.com -Andreas Gruenbacher ag@bestbits.at +Andreas Gruenbacher andreas.gruenbacher@gmail.com Andreas Jaeger jaeger@gnu.org Andreas Luik luik@isa.de Andreas Mohr andi@lisas.de @@ -53,14 +56,15 @@ Andrei Gaponenko andr@triumf.ca Andres Soolo andres@soolo.matti.ee Andrew Burgess aab@cichlid.com Andrew Church achurch@achurch.org -Andrew D Warshall warshall@99main.com 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 Anton Ovchinnikov revolver112@gmail.com @@ -105,6 +109,7 @@ Bjorn Helgaas helgaas@rsn.hp.com Bo Borgerson gigabo@gmail.com Bob McCracken kerouac@ravenet.com Bob Proulx bob@proulx.com +Boris Ranto branto@redhat.com Branden Robinson branden@necrotic.deadbeast.net Brendan O'Dea bod@compusol.com.au Brian Foster bfoster@redhat.com @@ -128,6 +133,7 @@ Chas. Owens chas.owens@gmail.com Chen Guo chen.guo.0625@gmail.com Chengwei Yang chengwei.yang@intel.com Chip Salzenberg chip@valinux.com +Choi Jongu zoopi01@gmail.com Chris Clayton chris2553@googlemail.com Chris Faylor cgf@cygnus.com Chris J. Bednar cjb@AdvancedDataSolutions.com @@ -141,6 +147,7 @@ Christian Jullien eligis@orange.fr Christian Krackowizer ckrackowiz@std.schuler-ag.com Christian Rose menthos@menthos.com Christian von Roques roques@pond.sub.org +Christoph Anton Mitterer calestyo@scientia.net Christophe LYON christophe.lyon@st.com Chuck Hedrick hedrick@klinzhai.rutgers.edu Chusslove Illich caslav.ilic@gmx.net @@ -156,6 +163,7 @@ Cray-Cyber Project http://www.cray-cyber.org Cristian Cadar cristic@stanford.edu Cyril Bouthors cyril@bouthors.org D. Hugh Redelmeier hugh@mimosa.com +Daiki Ueno ueno@gnu.org Dale Scheetz dwarf@polaris.net Dameon G. Rogers dgr03@uark.edu Dan Hagerty hag@gnu.ai.it.edu @@ -170,12 +178,13 @@ 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 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 A. Wheeler dwheeler@dwheeler.com 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 @@ -188,6 +197,7 @@ David Madore david.madore@ens.fr David Malone dwmalone@cnri.dit.ie David Matei matei@cs.toronto.edu David Michael fedora.dm0@gmail.com +David Sterba dsterba@suse.cz Davide Canova kc.canova@gmail.com Dawson Engler engler@stanford.edu Dean Gaudet dean-savannah@arctic.org @@ -209,8 +219,8 @@ Doug Coleman coleman@iarc1.ece.utexas.edu Doug McLaren dougmc@comco.com Dragos Harabor dharabor@us.oracle.com Duncan Roe duncanr@optimation.com.au +Dylan Cali calid1984@gmail.com Dylan Simon dylan@dylex.net -Dániel Varga danielv@axelero.hu Ed Avis ed@membled.com Ed Santiago ed@edsantiago.com Edgars Irmejs edgars.irmejs@gmail.com @@ -237,6 +247,7 @@ Erik Bennett bennett@cvo.oneworld.com Erik Bernstein erik@fscking.org Erik Corry erik@kroete2.freinet.de Evan Hunt ethanol@armory.com +Federico Simoncelli fsimonce@redhat.com Felix Lee flee@teleport.com Felix Rauch Valenti frauch@cse.unsw.edu.au Ferdinand fw@scenic.mine.nu @@ -246,21 +257,21 @@ Florent Bayle florent@sarcelle.net Florian Schlichting fschlich@cis.fu-berlin.de Florin Iucha fiucha@hsys.mic.ro Francesco Montorsi fr_m@hotmail.com +François Pinard pinard@iro.umontreal.ca Frank Adler fadler@allesklar.de Frank T Lofaro ftlofaro@snooks.Egr.UNLV.EDU -François Pinard pinard@iro.umontreal.ca Fred Fish fnf@ninemoons.com -Frederik Eaton frederik@caltech.edu Frédéric L. W. Meunier 0@pervalidus.net +Frederik Eaton frederik@caltech.edu +Fridolin Pokorny fpokorny@redhat.com FUJIWARA Katsunori foozy@lares.dti.ne.jp -G.P. Halkes buscom@ghalkes.nl Gabor Z. Papp gzp@gzp.org.hu +Gaël Quéri gqueri@mail.dotcom.fr Galen Hazelwood galenh@micron.net Gary Anderson ganderson@clark.net Gary Johnson garyjohn@spk.agilent.com Gary V. Vaughan gary@gnu.org Gaute Hvoslef Kvalnes gaute@verdsveven.com -Gaël Quéri gqueri@mail.dotcom.fr Geoff Collyer geoff at collyer.net Geoff Kuenning geoff@cs.hmc.edu Geoff Odhner geoff@franklin.com @@ -272,7 +283,9 @@ Gian Piero Carrubba gpiero@rm-rf.it Gilles Espinasse g.esp@free.fr Giuseppe Scrivano gscrivano@gnu.org Glen Lenker glen.lenker@gmail.com +Göran Uddeborg goeran@uddeborg.se GOTO Masanori gotom@debian.or.jp +G.P. Halkes buscom@ghalkes.nl Greg Louis glouis@dynamicro.on.ca Greg McGary gkm@gnu.org Greg Metcalfe metcalfegreg@qwest.net @@ -285,7 +298,6 @@ Guido Leenders guido.leenders@invantive.com Guilherme de Almeida Suckevicz guito.linux@gmail.com Guntram Blohm Extern.Guntram.Blohm@AUDI.DE Guochun Shi gshi@ncsa.uiuc.edu -Göran Uddeborg goeran@uddeborg.se H. J. Lu hjl@valinux.com Hans Ginzel hans@matfyz.cz Hans Lermen lermen@fgan.de @@ -318,12 +330,12 @@ Ivo Timmermans ivo@debian.org J. Scott Edwards qrw.software@gmail.com Jacky Fong jacky.fong@utoronto.ca Jakob Truelsen jakob@scalgo.com -James james@albion.glarp.com James Antill jmanti%essex.ac.uk@seralph21.essex.ac.uk James Hunt jamesodhunt@hotmail.com +James james@albion.glarp.com James Lemley James.Lemley@acxiom.com -James R. Van Zandt jrv@debian.org James Ralston ralston@pobox.com +James R. Van Zandt jrv@debian.org James Sneeringer jvs@ocslink.com James Tanis jtt@soscorp.com James Youngman jay@gnu.org @@ -334,28 +346,30 @@ Jan Engelhardt jengelh@medozas.de Jan Fedak J.Fedak@sh.cvut.cz Jan Moringen jan.moringen@uni-bielefeld.de Jan Nieuwenhuizen janneke@gnu.org -Jan-Pawel Wrozstinski jpwroz@gmail.com Janos Farkas chexum@shadow.banki.hu +Jan-Pawel Wrozstinski jpwroz@gmail.com Jari Aalto jari.aalto@cante.net Jarkko Hietaniemi jhi@epsilon.hut.fi Jarkko Sakkinen jarkko.sakkinen@iki.fi Jarod Wilson jwilson@redhat.com +Jarosław Gruca jgruca1981@gmail.com Javier López chilicuil@ubuntu.com Jean Charles Delepine delepine@u-picardie.fr Jean-Pierre Tosoni jpt.7196@gmail.com Jeff Liu jeff.liu@oracle.com Jeff Moore jbm@mordor.com Jeff Sheinberg jeff@bsrd.net -jeff.liu jeff.liu@oracle.com Jens Elkner elkner@imsgroup.de Jens Schmidt jms@jsds.hamburg.com Jeph Cowan jeph@ucar.edu Jeremy Maitin-Shepard jbms@cmu.edu +Jérémy Compostella jeremy.compostella@gmail.com +Jérémy Magrin jeremy.magrin@epitech.eu Jerome Abela abela@hsc.fr +Jérôme Zago bug-coreutils-ml@agt-the-walker.net Jerry Snitselaar dev@snitselaar.org Jesse Kornblum kornblum@usna.edu Jesse Thilo jgt2@eecs.lehigh.edu -Jie Liu jeff.liu@oracle.com Jie Xu xuj@iag.net Jim Blandy jimb@cyclic.com Jim Dennis jimd@starshine.org @@ -370,8 +384,8 @@ Joey Degges jdegges@gmail.com Joey Hess joeyh@debian.org Johan Boule bohan@bohan.dyndns.org Johan Danielsson joda@pdc.kth.se -John da_audiophile@yahoo.com John Bley jbb6@acpub.duke.edu +John da_audiophile@yahoo.com John David Anglin dave.anglin@nrc.ca John Gatewood Ham zappaman@alphabox.compsci.buu.ac.th John Gotts jgotts@umich.edu @@ -397,13 +411,10 @@ Juan M. Guerrero st001906@hrz1.hrz.tu-darmstadt.de Julian Bradfield jcb@inf.ed.ac.uk Jungshik Shin jshin@pantheon.yale.edu Juraj Marko jmarko@redhat.com +Jürgen Fluk louis@dachau.marco.de Jurriaan thunder7@xs4all.nl Justin Pryzby justinpryzby@users.sourceforge.net jvogel jvogel@linkny.com -Jérémy Compostella jeremy.compostella@gmail.com -Jérémy Magrin jeremy.magrin@epitech.eu -Jérôme Zago bug-coreutils-ml@agt-the-walker.net -Jürgen Fluk louis@dachau.marco.de Kai Henningsen kai@debian.org Kai-Uwe Rommel rommel@informatik.tu-muenchen.de Kalle Olavi Niemitalo kon@iki.fi @@ -427,8 +438,10 @@ Kevin Mudrick kmudrick@healthmarketscience.com Kim Hansen kim@i9.dk Kirk Kelsey kirk.kelsey@0x4b.net Kjetil Torgrim Homme kjetilho@ifi.uio.no +KO Myung-Hun komh@chollian.net Konrad Wróblewski coni@o2.pl Kristin E Thomas kristint@us.ibm.com +Kristoffer Brånemyr ztion1@yahoo.se Kristoffer Rose kris@diku.dk Krzysztof Goj krzysztof.goj@gmail.com Ladislav Hagara ladislav.hagara@unob.cz @@ -468,17 +481,18 @@ Mark Hewitt mhewitt@armature.com Mark Hounschell markh@compro.net Mark Hubbart discord@mac.com Mark Kettenis kettenis@phys.uva.nl +Mark Korenberg socketpair@gmail.com Mark Melahn mmelahn@gmail.com Mark Nudelman marknu@flash.net Mark W. Eichin eichin@cygnus.com Markus Demleitner msdemlei@auriga.ari.uni-heidelberg.de Markus Duft mduft@gentoo.org Martial Bornet mbornet.pro@gmail.com -Martin martin@dresden.nacamar.de Martin Buck martin.buck@ascom.ch Martin Gallant martyg@goodbit.net Martin Hippe martin.hippe@schlund.de Martin Jacobs martin.jacobs@arcor.de +Martin martin@dresden.nacamar.de Martin Michlmayr tbm@cyrius.com Martin Mitchell martin@debian.org Martin P.J. Zinser zinser@decus.de @@ -486,6 +500,7 @@ Marty Leisner leisner@sdsp.mc.xerox.com Masami Takikawa takikawm@CS.ORST.EDU Mate Wierdl mw@moni.msci.memphis.edu Matej Vela mvela@public.srce.hr +Matěj Cepl mcepl@redhat.com Mathias Brodala info@noctus.net Mathieu Bridon bochecha@fedoraproject.org Matias A. Fonzo selk@dragora.org @@ -507,12 +522,9 @@ Matthew Woehlke mw_triad@users.sourceforge.net Matthias Urlichs smurf@noris.de Matti Aarnio matti.aarnio@zmailer.org Mattias Wadenstein maswan@acc.umu.se -Matěj Cepl mcepl@redhat.com Max Chang maxchang@ucla.edu Meelis Roos mroos@tartu.cyber.ee Micah Cowan micah@cowan.name -Michael michael@aplatform.com -Michael ??? michael@roka.net Michael Bacarella mbac@netgraft.com Michael Deutschmann michael@talamasca.ocis.net Michael Elizabeth Chastain mec.gnu@mindspring.com @@ -524,6 +536,8 @@ Michael J. Daniel michael.j.daniel@comcast.net Michael McFarland sidlon@yahoo.com Michael McLagan mmclagan@invlogic.com Michael Meskes michael@fam-meskes.de +Michael michael@aplatform.com +Michael ??? michael@roka.net Michael Mol mikemol@gmail.com Michael Piefel piefel@informatik.hu-berlin.de Michael Price mprice@atl.lmco.com @@ -534,7 +548,9 @@ 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 +Michael Witten mfwitten@gmail.com Michail Litvak mci@owl.openwall.com +Michal Nazarewicz mina86@mina86.com Michal Politowski mpol@charybda.icm.edu.pl Michal Svec msvec@suse.cz Michal Trunecka mtruneck@redhat.com @@ -549,6 +565,7 @@ Mikko Tuumanen m@sorvankyla.yok.utu.fi Mikulas Patocka mikulas@artax.karlin.mff.cuni.cz Miles Bader miles@gnu.ai.mit.edu Minh Tran-Le tranle@intellicorp.com +Mitchel Humpherys mitch.special@gmail.com Moritz Orbach ml-coreutils@apfelboymchen.homeunix.net Morten Welinder terra@diku.dk Nadav Har'El nyh@math.technion.ac.il @@ -583,8 +600,10 @@ Oliver Kiddle okiddle@yahoo.co.uk Olivier Fourdan ofourdan@redhat.com Ondrej Oprala ooprala@redhat.com Ondřej Vašík ovasik@redhat.com +Ørn E. Hansen oehansen@daimi.aau.dk Oskar Liljeblad osk@hem.passagen.se Otavio Salvador otavio@ossystems.com.br +Pádraig Brady P@draigBrady.com Paolo Bonzini bonzini@gnu.org Patrick Mauritz oxygene@studentenbude.ath.cx Patrick Schoenfeld schoenfeld@debian.org @@ -635,17 +654,16 @@ Pozsár Balázs pozsy@uhulinux.hu Prashant TR tr@eth.net Priit Jõerüüt jemm4jemm@yahoo.com Primoz PETERLIN primozz.peterlin@gmail.com -Pádraig Brady P@draigBrady.com -Pádraig Brady p@draigBrady.com Raimonds Miltins raimonds@pro-9.com Rainer Orth ro@TechFak.Uni-Bielefeld.DE -Ralf W. Stephan stephan@tmt.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 Rasmus Villemoes rv@rasmusvillemoes.dk Raul Miller moth@magenta.com Raúl Núñez de Arenas Coronado raul@pleyades.net +Rémy Lefevre lefevreremy@gmail.com Reuben Thomas rrt@sc3d.org ribalba geerd.dietger.hoffmann@gmail.com Rich Burridge rich.burridge@oracle.com @@ -677,7 +695,6 @@ Ross Paterson rap@doc.ic.ac.uk Ross Ridge rridge@calum.csclub.uwaterloo.ca Rudolf Kastl rkastl@redhat.com Ruediger Meier sweet_f_a@gmx.de -Rémy Lefevre lefevreremy@gmail.com Sahil Amoli sahilamoli@gmail.com Sami Farin sfarin@ratol.fi Sami Kerola kerolasa@iki.fi @@ -689,9 +706,11 @@ Santiago Vila Doncel sanvila@unex.es Savochkin Andrey Vladimirovich saw@msu.ru Scott Harrison scott.gnu.2009@scottrix.co.uk Scott Lurndal slurn@griffin.engr.sgi.com +Sébastien Maret smaret@umich.edu Sergei Steshenko sergstesh@yahoo.com Sergey Vlasov vsu@altlinux.org Sergio Durigan Junior sergiodj@sergiodj.net +Shane M Seymour shane.seymour@hp.com Shayan Pooya shayan@liveve.org Shing-Shong Shei shei@cs.indiana.edu Simon Josefsson simon@josefsson.org @@ -702,9 +721,14 @@ Stavros Passas stabat@ics.forth.gr Stefan Vargyas stvar@yahoo.com Stefano Lattarini stefano.lattarini@gmail.com Stephan Krempel krempel@par-tec.com +Stephane Chazelas stephane.chazelas@gmail.com +Stéphane Aulery saulery@free.fr +Stéphane Chazelas Stephane_CHAZELAS@yahoo.fr +Stéphane Raimbault stephane.raimbault@gmail.com Stephen Depooter sbdep@myrealbox.com Stephen Eglen eglen@pcg.wustl.edu Stephen Gildea gildea@stop.mail-abuse.org +Stephen Shirley kormat@gmail.com Stephen Smoogen smooge@mindspring.com Steve McConnel steve@acadcomp.sil.org Steve McIntyre steve@einval.com @@ -712,19 +736,16 @@ Steve Ward planet36@gmail.com Steven Drake sbd@users.sourceforge.net Steven G. Johnson stevenj@alum.mit.edu Steven Mocking ufo@quicknet.nl -Steven P Watson steven@magelico.net Steven Parkes smparkes@smparkes.net +Steven P Watson steven@magelico.net Steven Schubiger schubiger@gmail.com Steven Schveighoffer schveiguy@yahoo.com Stuart Citrin ctrn3e8@gmail.com Stuart Kemp skemp@peter.bmc.com Stuart Shelton stuart@shelton.me -Stéphane Chazelas Stephane_CHAZELAS@yahoo.fr -Stéphane Raimbault stephane.raimbault@gmail.com Sven Breuner sven.breuner@itwm.fraunhofer.de Sven Joachim svenjoac@gmx.de Szakacsits Szabolcs szaka@sienet.hu -Sébastien Maret smaret@umich.edu Tadayoshi Funaba tadf@kt.rim.or.jp TAKAI Kousuke takai@vlsi.kuee.kyoto-u.ac.jp The Wanderer inverseparadox@comcast.net @@ -748,7 +769,7 @@ Tim Smithers mouse@dmouse.com.au Tim Underwood timunderwood@gmail.com Tim Waugh twaugh@redhat Tobias Quathamer toddy@debian.org -Tobias Stoeckmann tobias@bugol.de +Tobias Stoeckmann tobias@stoeckmann.org Toby Peterson toby@opendarwin.org Todd A. Jacobs tjacobs@codegnome.org Tom Fitzhenry tom@tom-fitzhenry.me.uk @@ -790,6 +811,7 @@ Wayne Stewart wstewa@atl.com Wenjun Zheng zwj@yahoo.com Werner Almesberger Werner.Almesberger@epfl.ch Wichert Akkerman wichert@cistron.nl +Wieland Hoffmann themineo@gmail.com Will Edgington wedgingt@acm.org William Bader william@nscs.fast.net William Dowling will@franklin.com @@ -803,13 +825,13 @@ Xu Zhongxing xu_zhong_xing@163.com Yang Ren ryang@redhat.com Yanko Kaneti yaneti@declera.com Yann Dirson dirson@debian.org +Youngjun Song mastojun@gmail.com +Yunlian Jiang yunlian@chromium.org +Yurij Goncharuk lnkgyv@gmail.com +Yury Usishchev y.usishchev@samsung.com Yutaka Amanai yasai-itame1942@jade.plala.or.jp Zartaj Majeed zmajeed@sbcglobal.net Zvi Har'El rl@math.technion.ac.il -Ángel González keisial@gmail.com -Ørn E. Hansen oehansen@daimi.aau.dk -Алексей Шилин rootlexx@mail.ru -Марк Коренберг socketpair@gmail.com ;; Local Variables: ;; coding: utf-8 diff --git a/THANKS-to-translators b/THANKS-to-translators index 99883b1d..8864074b 100644 --- a/THANKS-to-translators +++ b/THANKS-to-translators @@ -38,6 +38,7 @@ http://translationproject.org/team/ro.html http://translationproject.org/team/ru.html http://translationproject.org/team/sk.html http://translationproject.org/team/sl.html +http://translationproject.org/team/sr.html http://translationproject.org/team/sv.html http://translationproject.org/team/tr.html http://translationproject.org/team/uk.html diff --git a/THANKS.in b/THANKS.in index 6fd79d32..ba8e264b 100644 --- a/THANKS.in +++ b/THANKS.in @@ -4,13 +4,16 @@ have contributed improvements to the documentation, actual code, and even complete programs. Those contributions are described in the version control logs and ChangeLog files. If your name has been left out, if you'd rather not be listed, or if you'd prefer a different address be used, please send a -note to the bug-report mailing list (as seen at end of e.g., cp --help). +note to the GNU coreutils mailing list . ## ## There is no need to list here any name that appears as an Author in ## "git log" output. Those are automatically added when this template ## is used to generate the THANKS file. Note that numerous people listed ## here would have been listed as commit authors if we had been using git ## for version control when they contributed. +## +## Let's keep the list in this order ... which sc_THANKS_in_sorted ensures: +## $ LC_ALL=en_US.UTF-8 src/sort -f -k1,1 ??? kytek@cybercomm.net A Costa agcosta@gis.net @@ -33,19 +36,17 @@ aldomel aldomel@ix.netcom.com Alen Muzinic zveki@fly.cc.fer.hr Alexander Nguyen vinh@seas.ucla.edu Alexander V. Lukyanov lav@netis.ru -Allen Hewes allen@decisiv.net -Axel Dörfler axeld@pinc-software.de Alexandre Duret-Lutz duret_g@epita.fr Alexey Solovyov alekso@math.uu.se Alexey Vyskubov alexey@pippuri.mawhrin.net Alfred M. Szmidt ams@kemisten.nu +Allen Hewes allen@decisiv.net Ambrose Feinstein ambrose@google.com Amr Ali amr.ali.cc@gmail.com Anders Kaseorg andersk@mit.edu Andi Kleen freitag@alancoxonachip.com Andre Novaes Cunha Andre.Cunha@br.global-one.net Andreas Frische andreasfrische@gmail.com -Andreas Gruenbacher ag@bestbits.at Andreas Jaeger jaeger@gnu.org Andreas Luik luik@isa.de Andreas Stolcke stolcke@ICSI.Berkeley.EDU @@ -72,6 +73,7 @@ Arun Sharma arun.sharma@intel.com Arvind Autar Autar022@planet.nl Augey Mikus mikus@dqc.org Austin Donnelly Austin.Donnelly@cl.cam.ac.uk +Axel Dörfler axeld@pinc-software.de Axel Kittenberger Anshil@gmx.net Barry Kelly http://barrkel.blogspot.com/ Bauke Jan Douma bjdouma@xs4all.nl @@ -110,6 +112,7 @@ Charles Karney karney@pppl.gov Charles Randall crandall@matchlogic.com Chas. Owens chas.owens@gmail.com Chip Salzenberg chip@valinux.com +Choi Jongu zoopi01@gmail.com Chris Clayton chris2553@googlemail.com Chris Faylor cgf@cygnus.com Chris J. Bednar cjb@AdvancedDataSolutions.com @@ -164,8 +167,8 @@ Dean Gaudet dean-savannah@arctic.org Deepak Goel deego@gnufans.org Denis Excoffier gcc@Denis-Excoffier.org Denis McKeon dmckeon@swcp.com -Dennis Henriksen opus@flamingo.osrl.dk Dennis Clarke dclarke@blastwave.org +Dennis Henriksen opus@flamingo.osrl.dk Dennis Smit ds@nerds-incorporated.org Derek Clegg dclegg@next.com Dick Streefland dick_streefland@tasking.com @@ -225,7 +228,6 @@ Gerhard Poul gpoul@gnu.org Germano Leichsenring germano@jedi.cs.kobe-u.ac.jp Glen Lenker glen.lenker@gmail.com Göran Uddeborg goeran@uddeborg.se -Guochun Shi gshi@ncsa.uiuc.edu GOTO Masanori gotom@debian.or.jp Greg Louis glouis@dynamicro.on.ca Greg McGary gkm@gnu.org @@ -236,6 +238,7 @@ Greg Wooledge gawooledge@sherwin.com Gregory Leblanc gleblanc@cu-portland.edu Guido Leenders guido.leenders@invantive.com Guntram Blohm Extern.Guntram.Blohm@AUDI.DE +Guochun Shi gshi@ncsa.uiuc.edu H. J. Lu hjl@valinux.com Hans Ginzel hans@matfyz.cz Hans Lermen lermen@fgan.de @@ -250,8 +253,8 @@ Herbert Xu herbert@gondor.apana.org.au Holger Berger hberger@ess.nec.de Hon-Yin Kok hkok@yoda.unl.edu Hugh Daniel hugh@xanadu.com -Ian Bruce ian.bruce@myrealbox.com Iain Calder ic56@rogers.com +Ian Bruce ian.bruce@myrealbox.com Ian Jackson ijackson@chiark.greenend.org.uk Ian Kent ikent@redhat.com Ian Lance Taylor ian@cygnus.com @@ -262,10 +265,10 @@ Ingo Saitz ingo@debian.org Ivan Labath labath3@st.fmph.uniba.sk Ivo Timmermans ivo@debian.org Jacky Fong jacky.fong@utoronto.ca -James james@albion.glarp.com James Antill jmanti%essex.ac.uk@seralph21.essex.ac.uk -James Lemley James.Lemley@acxiom.com James Hunt jamesodhunt@hotmail.com +James james@albion.glarp.com +James Lemley James.Lemley@acxiom.com James Ralston ralston@pobox.com James Sneeringer jvs@ocslink.com James Tanis jtt@soscorp.com @@ -275,8 +278,8 @@ Jan Engelhardt jengelh@medozas.de Jan Fedak J.Fedak@sh.cvut.cz Jan Moringen jan.moringen@uni-bielefeld.de Jan Nieuwenhuizen janneke@gnu.org -Jan-Pawel Wrozstinski jpwroz@gmail.com Janos Farkas chexum@shadow.banki.hu +Jan-Pawel Wrozstinski jpwroz@gmail.com Jari Aalto jari.aalto@cante.net Jarkko Hietaniemi jhi@epsilon.hut.fi Jarod Wilson jwilson@redhat.com @@ -326,8 +329,8 @@ Juan F. Codagnone juam@arnet.com.ar Juan M. Guerrero st001906@hrz1.hrz.tu-darmstadt.de Julian Bradfield jcb@inf.ed.ac.uk Jungshik Shin jshin@pantheon.yale.edu -Jürgen Fluk louis@dachau.marco.de Juraj Marko jmarko@redhat.com +Jürgen Fluk louis@dachau.marco.de Jurriaan thunder7@xs4all.nl Justin Pryzby justinpryzby@users.sourceforge.net jvogel jvogel@linkny.com @@ -346,9 +349,9 @@ Ken Irving ken.irving@alaska.edu Ken Pizzini kenp@halcyon.com Kevin Mudrick kmudrick@healthmarketscience.com 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 -Kjetil Torgrim Homme kjetilho@ifi.uio.no Kristoffer Rose kris@diku.dk Ladislav Hagara ladislav.hagara@unob.cz Larry McVoy lm@sgi.com @@ -365,11 +368,10 @@ M. P. Suzuki mpsuzuki@hiroshima-u.ac.jp Maciej Kwapulinski pikpok@univ.gda.pl Manas Garg manas@cygsoft.com Manfred Hollstein manfred@s-direktnet.de -Марк Коренберг socketpair@gmail.com Marc Boucher marc@mbsi.ca Marc Haber mh+debian-bugs@zugschlus.de -Marc Mengel mengel@fnal.gov Marc Lehman schmorp@schmorp.de +Marc Mengel mengel@fnal.gov Marc Olzheim marcolz@stack.nl Marcel Böhme http://www.comp.nus.edu.sg/~mboehme Marco Franzen Marco.Franzen@Thyron.com @@ -384,15 +386,16 @@ Mark Hewitt mhewitt@armature.com Mark Hounschell markh@compro.net Mark Hubbart discord@mac.com Mark Kettenis kettenis@phys.uva.nl +Mark Korenberg socketpair@gmail.com Mark Melahn mmelahn@gmail.com Mark Nudelman marknu@flash.net Mark W. Eichin eichin@cygnus.com Markus Demleitner msdemlei@auriga.ari.uni-heidelberg.de -Martin martin@dresden.nacamar.de Martin Buck martin.buck@ascom.ch Martin Gallant martyg@goodbit.net Martin Hippe martin.hippe@schlund.de Martin Jacobs martin.jacobs@arcor.de +Martin martin@dresden.nacamar.de Martin Michlmayr tbm@cyrius.com Martin Mitchell martin@debian.org Martin P.J. Zinser zinser@decus.de @@ -400,6 +403,7 @@ Marty Leisner leisner@sdsp.mc.xerox.com Masami Takikawa takikawm@CS.ORST.EDU Mate Wierdl mw@moni.msci.memphis.edu Matej Vela mvela@public.srce.hr +Mathias Brodala info@noctus.net Matias A. Fonzo selk@dragora.org Matt Kraai kraai@ftbfs.org Matt McCutchen matt@mattmccutchen.net @@ -408,20 +412,17 @@ Matt Pham mattvpham@gmail.com Matt Schalit mschalit@pacbell.net Matt Swift swift@alum.mit.edu Matthew Arnison maffew@cat.org.au -Matthew M. Boedicker matthewm@boedicker.org Matthew Braun matthew@ans.net Matthew Clarke Matthew_Clarke@mindlink.bc.ca +Matthew M. Boedicker matthewm@boedicker.org Matthew S. Levine mslevine@theory.lcs.mit.edu Matthew Smith matts@bluesguitar.org Matthew Swift swift@alum.mit.edu Matthias Urlichs smurf@noris.de Matti Aarnio matti.aarnio@zmailer.org -Mathias Brodala info@noctus.net Mattias Wadenstein maswan@acc.umu.se Max Chang maxchang@ucla.edu Meelis Roos mroos@tartu.cyber.ee -Michael michael@aplatform.com -Michael ??? michael@roka.net Michael Bacarella mbac@netgraft.com Michael Deutschmann michael@talamasca.ocis.net Michael Elizabeth Chastain mec.gnu@mindspring.com @@ -432,6 +433,8 @@ 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 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 @@ -507,11 +510,11 @@ Petr Uzel petr.uzel@suse.cz Petter Reinholdtsen pere@hungry.com Phelippe Neveu pneveu@pcigeomatics.com Phil Richards phil.richards@vf.vodafone.co.uk +Philipp Gortan gortan@gmail.com +Philipp Thomas pth@suse.de 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 Piotr Gackiewicz gacek@intertele.pl @@ -523,7 +526,6 @@ 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 Rich Burridge rich.burridge@oracle.com @@ -574,6 +576,7 @@ Stéphane Chazelas Stephane_CHAZELAS@yahoo.fr Stephen Depooter sbdep@myrealbox.com Stephen Eglen eglen@pcg.wustl.edu Stephen Gildea gildea@stop.mail-abuse.org +Stephen Shirley kormat@gmail.com Stephen Smoogen smooge@mindspring.com Steve McConnel steve@acadcomp.sil.org Steve McIntyre steve@einval.com @@ -582,8 +585,8 @@ Steven Drake sbd@users.sourceforge.net Steven G. Johnson stevenj@alum.mit.edu Steven Mocking ufo@quicknet.nl Steven Parkes smparkes@smparkes.net -Steven Schveighoffer schveiguy@yahoo.com Steven P Watson steven@magelico.net +Steven Schveighoffer schveiguy@yahoo.com Stuart Citrin ctrn3e8@gmail.com Stuart Kemp skemp@peter.bmc.com Stuart Shelton stuart@shelton.me @@ -591,8 +594,8 @@ Sven Breuner sven.breuner@itwm.fraunhofer.de Szakacsits Szabolcs szaka@sienet.hu Tadayoshi Funaba tadf@kt.rim.or.jp TAKAI Kousuke takai@vlsi.kuee.kyoto-u.ac.jp -Theodore Ts'o tytso@rsts-11.mit.edu The Wanderer inverseparadox@comcast.net +Theodore Ts'o tytso@rsts-11.mit.edu Thomas Bushnell thomas@gnu.ai.mit.edu Thomas Goerlich thomas@schnappmatik.de Thomas Hood jdthood@yahoo.co.uk @@ -659,6 +662,7 @@ Xu Zhongxing xu_zhong_xing@163.com Yang Ren ryang@redhat.com Yanko Kaneti yaneti@declera.com Yann Dirson dirson@debian.org +Youngjun Song mastojun@gmail.com Yutaka Amanai yasai-itame1942@jade.plala.or.jp ;; Local Variables: diff --git a/TODO b/TODO index 68680f74..f6305b51 100644 --- a/TODO +++ b/TODO @@ -150,7 +150,7 @@ pr's use of nstrftime can make it malloc a very large (up to SIZE_MAX) buffer ----- -Copyright (C) 2002-2014 Free Software Foundation, Inc. +Copyright (C) 2002-2015 Free Software Foundation, Inc. This program is free 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 22010bf2..1609ff87 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ 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'.])]) -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,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.14' +[am__api_version='1.15' 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.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ 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.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])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-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -573,7 +572,11 @@ to "yes", and re-run configure. END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) 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 @@ -602,7 +605,7 @@ 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-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -644,7 +647,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -694,7 +697,7 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -733,7 +736,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -762,7 +765,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -809,7 +812,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -828,7 +831,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -909,7 +912,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -969,7 +972,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -997,7 +1000,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1016,7 +1019,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1370,6 +1373,7 @@ 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/obstack.m4]) m4_include([m4/off_t.m4]) m4_include([m4/open.m4]) m4_include([m4/openat.m4]) diff --git a/bootstrap b/bootstrap index a3e68f00..e72894c1 100755 --- a/bootstrap +++ b/bootstrap @@ -1,10 +1,10 @@ #! /bin/sh # Print a version string. -scriptversion=2013-12-05.23; # UTC +scriptversion=2014-12-08.12; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This 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,6 +42,9 @@ export LC_ALL local_gl_dir=gl +# Honour $PERL, but work even if there is none +PERL="${PERL-perl}" + me=$0 usage() { @@ -210,7 +213,17 @@ bootstrap_sync=false use_git=true check_exists() { - ($1 --version /dev/null 2>&1 + if test "$1" = "--verbose"; then + ($2 --version /dev/null 2>&1 + if test $? -ge 126; then + # If not found, run with diagnostics as one may be + # presented with env variables to set to find the right version + ($2 --version /dev/null 2>&1 + fi + test $? -lt 126 } @@ -408,7 +421,7 @@ sort_ver() { # sort -V is not generally available get_version() { app=$1 - $app --version >/dev/null 2>&1 || return 1 + $app --version >/dev/null 2>&1 || { $app --version; return 1; } $app --version 2>&1 | sed -n '# Move version to start of line. @@ -446,6 +459,7 @@ check_versions() { test "$appvar" = TAR && appvar=AMTAR case $appvar in GZIP) ;; # Do not use $GZIP: it contains gzip options. + PERL::*) ;; # Keep perl modules as-is *) eval "app=\${$appvar-$app}" ;; esac @@ -463,11 +477,22 @@ check_versions() { ret=1 continue } ;; + # Another check is for perl modules. These can be written as + # e.g. perl::XML::XPath in case of XML::XPath module, etc. + perl::*) + # Extract module name + app="${app#perl::}" + if ! $PERL -m"$app" -e 'exit 0' >/dev/null 2>&1; then + warn_ "Error: perl module '$app' not found" + ret=1 + fi + continue + ;; esac if [ "$req_ver" = "-" ]; then # Merely require app to exist; not all prereq apps are well-behaved # so we have to rely on $? rather than get_version. - if ! check_exists $app; then + if ! check_exists --verbose $app; then warn_ "Error: '$app' not found" ret=1 fi @@ -598,8 +623,8 @@ case ${GNULIB_SRCDIR--} in # Note that $use_git is necessarily true in this case. if git_modules_config submodule.gnulib.url >/dev/null; then echo "$0: getting gnulib files..." - git submodule init || exit $? - git submodule update || exit $? + git submodule init -- "$gnulib_path" || exit $? + git submodule update -- "$gnulib_path" || exit $? elif [ ! -d "$gnulib_path" ]; then echo "$0: getting gnulib files..." @@ -628,13 +653,14 @@ case ${GNULIB_SRCDIR--} in # This fallback allows at least git 1.5.5. if test -f "$gnulib_path"/gnulib-tool; then # Since file already exists, assume submodule init already complete. - git submodule update || exit $? + git submodule update -- "$gnulib_path" || exit $? else # Older git can't clone into an empty directory. rmdir "$gnulib_path" 2>/dev/null git clone --reference "$GNULIB_SRCDIR" \ "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \ - && git submodule init && git submodule update \ + && git submodule init -- "$gnulib_path" \ + && git submodule update -- "$gnulib_path" \ || exit $? fi fi @@ -807,21 +833,6 @@ version_controlled_file() { fi } -# Avoid boostrap failure with gettext/autopoint bug in version 0.18.3.1 -# http://lists.gnu.org/archive/html/coreutils/2013-11/msg00038.html -# Remove in 2015 when distros have upgraded to >= 0.18.3.2 -autopoint_version=$(get_version $AUTOPOINT) -# Note autopoint returns version 0.18.3 for version 0.18.3.1 -if test "$autopoint_version" = '0.18.3' ; then - if test "$package" = 'coreutils' ; then - test -e 'm4/cu-progs.m4' || touch 'm4/cu-progs.m4' - fi - if ! test -e 'build-aux/git-version-gen' ; then - printf "#!/bin/sh\n" > 'build-aux/git-version-gen' - chmod a+x 'build-aux/git-version-gen' - fi -fi - # NOTE: we have to be careful to run both autopoint and libtoolize # before gnulib-tool, since gnulib-tool is likely to provide newer # versions of files "installed" by these two programs. @@ -904,7 +915,8 @@ if test $use_libtool = 1; then esac fi echo "$0: $gnulib_tool $gnulib_tool_options --import ..." -$gnulib_tool $gnulib_tool_options --import $gnulib_modules && +$gnulib_tool $gnulib_tool_options --import $gnulib_modules \ + || die "gnulib-tool failed" for file in $gnulib_files; do symlink_to_dir "$GNULIB_SRCDIR" $file \ diff --git a/bootstrap.conf b/bootstrap.conf index c0b5f023..67837b3f 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -1,6 +1,6 @@ # Bootstrap configuration. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -34,6 +34,7 @@ gnulib_modules=" argv-iter assert autobuild + linked-list backupfile base64 buffer-lcm @@ -81,6 +82,7 @@ gnulib_modules=" fdl fdopen fdutimensat + file-has-acl file-type fileblocks filemode @@ -208,6 +210,7 @@ gnulib_modules=" savedir savewd selinux-at + setenv settime sig2str sigaction @@ -235,6 +238,7 @@ gnulib_modules=" sys_resource sys_stat sys_wait + tempname termios timer-time timespec @@ -268,11 +272,13 @@ gnulib_modules=" xgetcwd xgetgroups xgethostname + xlist xmemcoll xnanosleep xprintf xprintf-posix xreadlink + xdectoint xstrtod xstrtoimax xstrtol @@ -317,9 +323,9 @@ gnulib_tool_option_extras="--tests-base=gnulib-tests --with-tests --symlink\ buildreq="\ autoconf 2.64 automake 1.11.2 -autopoint - +autopoint 0.19.2 bison - -gettext 0.18.1 +gettext 0.19.2 git 1.4.4 gperf - gzip - diff --git a/build-aux/ChangeLog-2007 b/build-aux/ChangeLog-2007 index 63b9dbe9..0357555b 100644 --- a/build-aux/ChangeLog-2007 +++ b/build-aux/ChangeLog-2007 @@ -234,7 +234,7 @@ ----- - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 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 a3aebf76..8a6edb5d 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-06-08 06:53'; # UTC +my $VERSION = '2013-07-09 06:39'; # 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This 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,15 +29,18 @@ my $VERSION = '2012-06-08 06:53'; # UTC use strict; use Getopt::Long; -use Digest::MD5; -eval { require Digest::SHA; } - or eval 'use Digest::SHA1'; use POSIX qw(strftime); (my $ME = $0) =~ s|.*/||; my %valid_release_types = map {$_ => 1} qw (alpha beta stable); my @archive_suffixes = ('tar.gz', 'tar.bz2', 'tar.lzma', 'tar.xz'); +my %digest_classes = + ( + 'md5' => (eval { require Digest::MD5; } and 'Digest::MD5'), + 'sha1' => ((eval { require Digest::SHA; } and 'Digest::SHA') + or (eval { require Digest::SHA1; } and 'Digest::SHA1')) + ); my $srcdir = '.'; sub usage ($) @@ -157,15 +160,13 @@ sub print_checksums (@) foreach my $meth (qw (md5 sha1)) { + my $class = $digest_classes{$meth} or next; foreach my $f (@file) { open IN, '<', $f or die "$ME: $f: cannot open for reading: $!\n"; binmode IN; - my $dig = - ($meth eq 'md5' - ? Digest::MD5->new->addfile(*IN)->hexdigest - : Digest::SHA1->new->addfile(*IN)->hexdigest); + my $dig = $class->new->addfile(*IN)->hexdigest; close IN; print "$dig $f\n"; } diff --git a/build-aux/compile b/build-aux/compile index 531136b0..a85b723c 100755 --- a/build-aux/compile +++ b/build-aux/compile @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify diff --git a/build-aux/config.guess b/build-aux/config.guess index 1f5c50c0..e5bdb992 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2014-03-23' +timestamp='2015-06-30' # 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 @@ -24,12 +24,12 @@ timestamp='2014-03-23' # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # 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. +# Please send patches to . me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2015 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." @@ -168,20 +168,27 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) + arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ @@ -197,6 +204,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in os=netbsd ;; esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -213,7 +227,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -579,8 +593,9 @@ EOF else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -932,6 +947,9 @@ EOF crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -1020,7 +1038,7 @@ EOF echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} diff --git a/build-aux/config.rpath b/build-aux/config.rpath index b625621f..a3e25c84 100755 --- a/build-aux/config.rpath +++ b/build-aux/config.rpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2014 Free Software Foundation, Inc. +# Copyright 1996-2015 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit , 1996 # diff --git a/build-aux/config.sub b/build-aux/config.sub index d654d03c..8f1229c6 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2014-05-01' +timestamp='2015-03-08' # 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 @@ -25,7 +25,7 @@ timestamp='2014-05-01' # of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -68,7 +68,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2015 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." @@ -117,7 +117,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os @@ -259,8 +259,8 @@ case $basic_machine in | bfin \ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ | i370 | i860 | i960 | ia64 \ @@ -302,6 +302,7 @@ case $basic_machine in | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ @@ -312,6 +313,7 @@ case $basic_machine in | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -326,6 +328,9 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none @@ -376,7 +381,7 @@ case $basic_machine in | c[123]* | c30-* | [cjt]90-* | c4x-* \ | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ + | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ @@ -436,6 +441,7 @@ case $basic_machine in | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -512,6 +518,9 @@ case $basic_machine in basic_machine=i386-pc os=-aros ;; + asmjs) + basic_machine=asmjs-unknown + ;; aux) basic_machine=m68k-apple os=-aux @@ -773,6 +782,9 @@ case $basic_machine in basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -828,6 +840,10 @@ case $basic_machine in basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -1360,7 +1376,7 @@ case $os in | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ + | -aos* | -aros* | -cloudabi* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1373,7 +1389,7 @@ case $os in | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ diff --git a/build-aux/depcomp b/build-aux/depcomp index 31788017..fda2463f 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # This program is free 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/do-release-commit-and-tag b/build-aux/do-release-commit-and-tag index 5719d0e4..a22469d2 100755 --- a/build-aux/do-release-commit-and-tag +++ b/build-aux/do-release-commit-and-tag @@ -7,7 +7,7 @@ VERSION=2012-08-01.09 # UTC # Note: this is a bash script (could be zsh or dash) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/gen-single-binary.sh b/build-aux/gen-single-binary.sh index a2423e60..4e07cfda 100755 --- a/build-aux/gen-single-binary.sh +++ b/build-aux/gen-single-binary.sh @@ -90,9 +90,9 @@ for cmd in $ALL_PROGRAMS; do # CFLAGS # Hack any other program defining a main() replacing its main by - # _single_binary_main_$PROGRAM_NAME. - echo "${base}_CFLAGS = \"-Dmain=_single_binary_main_${cmd}(int, char**) " \ - "ATTRIBUTE_NORETURN; int _single_binary_main_${cmd}\" " \ + # single_binary_main_$PROGRAM_NAME. + echo "${base}_CFLAGS = \"-Dmain=single_binary_main_${cmd} (int, char **);" \ + " int single_binary_main_${cmd}\" " \ "-Dusage=_usage_${cmd} \$(src_coreutils_CFLAGS)" var=src_${cmd}_CFLAGS eval "value=\$$var" diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh index b2e7b097..c8ca1bbc 100755 --- a/build-aux/gendocs.sh +++ b/build-aux/gendocs.sh @@ -2,10 +2,9 @@ # gendocs.sh -- generate a GNU manual in many formats. This script is # mentioned in maintain.texi. See the help message below for usage details. -scriptversion=2014-05-01.10 +scriptversion=2015-05-05.16 -# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 -# Free Software Foundation, Inc. +# Copyright 2003-2015 Free Software Foundation, Inc. # # This 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,17 +20,16 @@ scriptversion=2014-05-01.10 # along with this program. If not, see . # # Original author: Mohit Agarwal. -# Send bug reports and any other correspondence to bug-texinfo@gnu.org. +# Send bug reports and any other correspondence to bug-gnulib@gnu.org. # # The latest version of this script, and the companion template, is -# available from Texinfo CVS: -# http://savannah.gnu.org/cgi-bin/viewcvs/texinfo/texinfo/util/gendocs.sh -# http://savannah.gnu.org/cgi-bin/viewcvs/texinfo/texinfo/util/gendocs_template +# available from the Gnulib repository: # -# An up-to-date copy is also maintained in Gnulib (gnu.org/software/gnulib). +# http://git.savannah.gnu.org/cgit/gnulib.git/tree/build-aux/gendocs.sh +# http://git.savannah.gnu.org/cgit/gnulib.git/tree/doc/gendocs_template # TODO: -# - image importation was only implemented for HTML generated by +# - image importing 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. @@ -39,12 +37,12 @@ scriptversion=2014-05-01.10 prog=`basename "$0"` srcdir=`pwd` -scripturl="http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs.sh" -templateurl="http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/util/gendocs_template" +scripturl="http://git.savannah.gnu.org/cgit/gnulib.git/plain/build-aux/gendocs.sh" +templateurl="http://git.savannah.gnu.org/cgit/gnulib.git/plain/doc/gendocs_template" : ${SETLANG="env LANG= LC_MESSAGES= LC_ALL= LANGUAGE="} : ${MAKEINFO="makeinfo"} -: ${TEXI2DVI="texi2dvi -t @finalout"} +: ${TEXI2DVI="texi2dvi"} : ${DOCBOOK2HTML="docbook2html"} : ${DOCBOOK2PDF="docbook2pdf"} : ${DOCBOOK2TXT="docbook2txt"} @@ -56,7 +54,7 @@ unset use_texi2html version="gendocs.sh $scriptversion -Copyright 2013 Free Software Foundation, Inc. +Copyright 2015 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." @@ -75,7 +73,8 @@ Options: -o OUTDIR write files into OUTDIR, instead of manual/. -I DIR append DIR to the Texinfo search path. --common ARG pass ARG in all invocations. - --html ARG pass ARG to makeinfo or texi2html for HTML targets. + --html ARG pass ARG to makeinfo or texi2html for HTML targets, + instead of --css-ref=/software/gnulib/manual.css. --info ARG pass ARG to makeinfo for Info, instead of --no-split. --no-ascii skip generating the plain text output. --no-html skip generating the html output. @@ -83,6 +82,7 @@ Options: --no-tex skip generating the dvi and pdf output. --source ARG include ARG in tar archive of sources. --split HOW make split HTML by node, section, chapter; default node. + --tex ARG pass ARG to texi2dvi for DVI and PDF, instead of -t @finalout. --texi2html use texi2html to make HTML target, with all split versions. --docbook convert through DocBook too (xml, txt, html, pdf). @@ -134,7 +134,7 @@ locale, since that's the language of most Texinfo manuals. If you happen to have a non-English manual and non-English web site, see the SETLANG setting in the source. -Email bug reports or enhancement requests to bug-texinfo@gnu.org. +Email bug reports or enhancement requests to bug-gnulib@gnu.org. " MANUAL_TITLE= @@ -143,7 +143,7 @@ EMAIL=webmasters@gnu.org # please override with --email commonarg= # passed to all makeinfo/texi2html invcations. dirargs= # passed to all tools (-I dir). dirs= # -I directories. -htmlarg= +htmlarg=--css-ref=/software/gnulib/manual.css infoarg=--no-split generate_ascii=true generate_html=true @@ -153,6 +153,7 @@ outdir=manual source_extra= split=node srcfile= +texarg="-t @finalout" while test $# -gt 0; do case $1 in @@ -170,6 +171,7 @@ while test $# -gt 0; do --no-tex) generate_tex=false;; --source) shift; source_extra=$1;; --split) shift; split=$1;; + --tex) shift; texarg=$1;; --texi2html) use_texi2html=1;; --help) echo "$usage"; exit 0;; @@ -295,7 +297,7 @@ fi # end info # if $generate_tex; then - cmd="$SETLANG $TEXI2DVI $dirargs \"$srcfile\"" + cmd="$SETLANG $TEXI2DVI $dirargs $texarg \"$srcfile\"" printf "\nGenerating dvi... ($cmd)\n" eval "$cmd" # compress/finish dvi: @@ -304,7 +306,7 @@ if $generate_tex; then mv $PACKAGE.dvi.gz "$outdir/" ls -l "$outdir/$PACKAGE.dvi.gz" - cmd="$SETLANG $TEXI2DVI --pdf $dirargs \"$srcfile\"" + cmd="$SETLANG $TEXI2DVI --pdf $dirargs $texarg \"$srcfile\"" printf "\nGenerating pdf... ($cmd)\n" eval "$cmd" pdf_size=`calcsize $PACKAGE.pdf` diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index 47d65767..8e92c0ad 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -1,8 +1,8 @@ #!/bin/sh # Print a version string. -scriptversion=2014-06-19.19; # UTC +scriptversion=2014-12-02.19; # UTC -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -215,7 +215,7 @@ if test "x$v_from_git" != x; then fi # Omit the trailing newline, so that m4_esyscmd can use the result directly. -echo "$v" | tr -d "$nl" +printf %s "$v" # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index 78afff4e..0cab1bf1 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-07-29 06:11'; # UTC +my $VERSION = '2015-06-11 01:03'; # 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This 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,9 @@ OPTIONS: directory can be derived. --since=DATE convert only the logs since DATE; the default is to convert all log entries. + --until=DATE convert only the logs older than DATE. + --ignore-matching=PAT ignore commit messages whose first lines match PAT. + --ignore-line=PAT ignore lines of commit messages that match PAT. --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' @@ -220,10 +223,13 @@ sub git_dir_option($) { my $since_date; + my $until_date; my $format_string = '%s%n%b%n'; my $amend_file; my $append_dot = 0; my $cluster = 1; + my $ignore_matching; + my $ignore_line; my $strip_tab = 0; my $strip_cherry_pick = 0; my $srcdir; @@ -232,10 +238,13 @@ sub git_dir_option($) help => sub { usage 0 }, version => sub { print "$ME version $VERSION\n"; exit }, 'since=s' => \$since_date, + 'until=s' => \$until_date, 'format=s' => \$format_string, 'amend=s' => \$amend_file, 'append-dot' => \$append_dot, 'cluster!' => \$cluster, + 'ignore-matching=s' => \$ignore_matching, + 'ignore-line=s' => \$ignore_line, 'strip-tab' => \$strip_tab, 'strip-cherry-pick' => \$strip_cherry_pick, 'srcdir=s' => \$srcdir, @@ -243,6 +252,8 @@ sub git_dir_option($) defined $since_date and unshift @ARGV, "--since=$since_date"; + defined $until_date + and unshift @ARGV, "--until=$until_date"; # This is a hash that maps an SHA1 to perl code (i.e., s/old/new/) # that makes a correction in the log or attribution of that commit. @@ -259,6 +270,7 @@ sub git_dir_option($) my $prev_multi_paragraph; my $prev_date_line = ''; my @prev_coauthors = (); + my @skipshas = (); while (1) { defined (my $in = ) @@ -279,6 +291,21 @@ sub git_dir_option($) $sha =~ /^[0-9a-fA-F]{40}$/ or die "$ME:$.: invalid SHA1: $sha\n"; + my $skipflag = 0; + if (@skipshas) + { + foreach(@skipshas) + { + if ($sha =~ /^$_/) + { + $skipflag = 1; + ## Perhaps only warn if a pattern matches more than once? + warn "$ME: warning: skipping $sha due to $_\n"; + last; + } + } + } + # If this commit's log requires any transformation, do it now. my $code = $amend_code->{$sha}; if (defined $code) @@ -306,7 +333,7 @@ sub git_dir_option($) $rest =~ s/^\s*\(cherry picked from commit [\da-f]+\)\n//m; } - my @line = split "\n", $rest; + my @line = split /\s*\n/, $rest; my $author_line = shift @line; defined $author_line or die "$ME:$.: unexpected EOF\n"; @@ -316,17 +343,18 @@ sub git_dir_option($) # Format 'Copyright-paperwork-exempt: Yes' as a standard ChangeLog # `(tiny change)' annotation. - my $tiny = (grep (/^Copyright-paperwork-exempt:\s+[Yy]es$/, @line) + my $tiny = (grep (/^(?:Copyright-paperwork-exempt|Tiny-change):\s+[Yy]es$/, @line) ? ' (tiny change)' : ''); my $date_line = sprintf "%s %s$tiny\n", - strftime ("%F", localtime ($1)), $2; + strftime ("%Y-%m-%d", localtime ($1)), $2; my @coauthors = grep /^Co-authored-by:.*$/, @line; # Omit meta-data lines we've already interpreted. @line = grep !/^(?:Signed-off-by:[ ].*>$ |Co-authored-by:[ ] |Copyright-paperwork-exempt:[ ] + |Tiny-change:[ ] )/x, @line; # Remove leading and trailing blank lines. @@ -336,68 +364,100 @@ sub git_dir_option($) while ($line[$#line] =~ /^\s*$/) { pop @line; } } - # Record whether there are two or more paragraphs. - my $multi_paragraph = grep /^\s*$/, @line; - - # Format 'Co-authored-by: A U Thor ' lines in - # standard multi-author ChangeLog format. - for (@coauthors) + # Handle Emacs gitmerge.el "skipped" commits. + # Yes, this should be controlled by an option. So sue me. + if ( grep /^(; )?Merge from /, @line ) + { + my $found = 0; + foreach (@line) + { + if (grep /^The following commit.*skipped:$/, $_) + { + $found = 1; + ## Reset at each merge to reduce chance of false matches. + @skipshas = (); + next; + } + if ($found && $_ =~ /^([0-9a-fA-F]{7,}) [^ ]/) + { + push ( @skipshas, $1 ); + } + } + } + + # Ignore commits that match the --ignore-matching pattern, if specified. + if (! ($skipflag || (defined $ignore_matching + && @line && $line[0] =~ /$ignore_matching/))) { - s/^Co-authored-by:\s*/\t /; - s/\s*/ - or warn "$ME: warning: missing email address for " - . substr ($_, 5) . "\n"; - } + # Record whether there are two or more paragraphs. + my $multi_paragraph = grep /^\s*$/, @line; - # If clustering of commit messages has been disabled, if this header - # would be different from the previous date/name/email/coauthors header, - # or if this or the previous entry consists of two or more paragraphs, - # then print the header. - if ( ! $cluster - || $date_line ne $prev_date_line - || "@coauthors" ne "@prev_coauthors" - || $multi_paragraph - || $prev_multi_paragraph) - { - $prev_date_line eq '' - or print "\n"; - print $date_line; - @coauthors - and print join ("\n", @coauthors), "\n"; - } - $prev_date_line = $date_line; - @prev_coauthors = @coauthors; - $prev_multi_paragraph = $multi_paragraph; + # Format 'Co-authored-by: A U Thor ' lines in + # standard multi-author ChangeLog format. + for (@coauthors) + { + s/^Co-authored-by:\s*/\t /; + s/\s*/ + or warn "$ME: warning: missing email address for " + . substr ($_, 5) . "\n"; + } + + # If clustering of commit messages has been disabled, if this header + # would be different from the previous date/name/etc. header, + # or if this or the previous entry consists of two or more paragraphs, + # then print the header. + if ( ! $cluster + || $date_line ne $prev_date_line + || "@coauthors" ne "@prev_coauthors" + || $multi_paragraph + || $prev_multi_paragraph) { - # If the first line of the message has enough room, then - if (length $line[0] < 72) + $prev_date_line eq '' + or print "\n"; + print $date_line; + @coauthors + and print join ("\n", @coauthors), "\n"; + } + $prev_date_line = $date_line; + @prev_coauthors = @coauthors; + $prev_multi_paragraph = $multi_paragraph; + + # If there were any lines + if (@line == 0) + { + warn "$ME: warning: empty commit message:\n $date_line\n"; + } + else + { + if ($append_dot) { - # append a dot if there is no other punctuation or blank - # at the end. - $line[0] =~ /[[:punct:]\s]$/ - or $line[0] .= '.'; + # If the first line of the message has enough room, then + if (length $line[0] < 72) + { + # append a dot if there is no other punctuation or blank + # at the end. + $line[0] =~ /[[:punct:]\s]$/ + or $line[0] .= '.'; + } } - } - # Remove one additional leading TAB from each line. - $strip_tab - and map { s/^\t// } @line; + # 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; + # Prefix each non-empty line with a TAB. + @line = map { length $_ ? "\t$_" : '' } @line; - print "\n", join ("\n", @line), "\n"; + print "\n", join ("\n", @line), "\n"; + } } defined ($in = ) diff --git a/build-aux/gnu-web-doc-update b/build-aux/gnu-web-doc-update index 7af2f185..c8fc7e5d 100755 --- a/build-aux/gnu-web-doc-update +++ b/build-aux/gnu-web-doc-update @@ -2,9 +2,9 @@ # Run this after each non-alpha release, to update the web documentation at # http://www.gnu.org/software/$pkg/manual/ -VERSION=2012-12-16.14; # UTC +VERSION=2015-06-16.06; # UTC -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -40,6 +40,7 @@ assumes all documentation is in the doc/ sub-directory. Options: -C, --builddir=DIR location of (configured) Makefile (default: .) -n, --dry-run don't actually commit anything + -m, --mirror remove out of date files from document server --help print this help, then exit --version print version number, then exit @@ -107,6 +108,7 @@ find_tool XARGS gxargs xargs builddir=. dryrun= +rm_stale='echo' while test $# != 0 do # Handle --option=value by splitting apart and putting back on argv. @@ -123,6 +125,7 @@ do --help|--version) ${1#--};; -C|--builddir) shift; builddir=$1; shift ;; -n|--dry-run) dryrun=echo; shift;; + -m|--mirror) rm_stale=''; shift;; --*) die "unrecognized option: $1";; *) break;; esac @@ -159,6 +162,7 @@ $GIT submodule update --recursive ./bootstrap srcdir=$(pwd) cd "$builddir" +builddir=$(pwd) ./config.status --recheck ./config.status make @@ -182,6 +186,17 @@ $RSYNC -avP "$builddir"/doc/manual/ $tmp/$pkg/manual find . -name CVS -prune -o -print \ | $XARGS --no-run-if-empty -- $dryrun $CVS add -ko + # Report/Remove stale files + # excluding doc server specific files like CVS/* and .symlinks + if test -n "$rm_stale"; then + echo 'Consider the --mirror option if all of the manual is generated,' >&2 + echo 'which will run `cvs remove` to remove stale files.' >&2 + fi + { find . \( -name CVS -o -type f -name '.*' \) -prune -o -type f -print + (cd "$builddir"/doc/manual/ && find . -type f -print | sed p) + } | sort | uniq -u \ + | $XARGS --no-run-if-empty -- ${rm_stale:-$dryrun} $CVS remove -f + $dryrun $CVS ci -m $version ) diff --git a/build-aux/gnupload b/build-aux/gnupload index 2da97d89..f87c195d 100755 --- a/build-aux/gnupload +++ b/build-aux/gnupload @@ -3,7 +3,7 @@ scriptversion=2013-03-19.17; # UTC -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # # This program is free 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/mdate-sh b/build-aux/mdate-sh index b3719cf7..b793600a 100755 --- a/build-aux/mdate-sh +++ b/build-aux/mdate-sh @@ -3,7 +3,7 @@ scriptversion=2010-08-21.06; # UTC -# Copyright (C) 1995-2013 Free Software Foundation, Inc. +# Copyright (C) 1995-2015 Free Software Foundation, Inc. # written by Ulrich Drepper , 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 db98974f..f62bbae3 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff --git a/build-aux/prefix-gnulib-mk b/build-aux/prefix-gnulib-mk index 4d0518fa..8af2916f 100755 --- a/build-aux/prefix-gnulib-mk +++ b/build-aux/prefix-gnulib-mk @@ -155,16 +155,6 @@ sub prefix ($) # 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 diff --git a/build-aux/snippet/arg-nonnull.h b/build-aux/snippet/arg-nonnull.h index 9ee8b155..0d55e2bc 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. 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 67b12335..585b38ab 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. 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 41d9510c..f507eb74 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. 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 1c4d7bd4..90f4985c 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/build-aux/test-driver b/build-aux/test-driver index d3060566..8e575b01 100755 --- a/build-aux/test-driver +++ b/build-aux/test-driver @@ -3,7 +3,7 @@ scriptversion=2013-07-13.22; # UTC -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2014 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -106,11 +106,14 @@ 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 + tweaked_estatus=1 +else + tweaked_estatus=$estatus fi -case $estatus:$expect_failure in +case $tweaked_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;; @@ -119,6 +122,12 @@ case $estatus:$expect_failure in *:*) col=$red res=FAIL recheck=yes gcopy=yes;; esac +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + # Report outcome to console. echo "${col}${res}${std}: $test_name" diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex index 6312dadb..f773c90b 100644 --- a/build-aux/texinfo.tex +++ b/build-aux/texinfo.tex @@ -3,11 +3,12 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2014-05-20.16} +\def\texinfoversion{2015-07-01.07} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. +% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 +% 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 @@ -96,7 +97,9 @@ \let\ptexraggedright=\raggedright \let\ptexrbrace=\} \let\ptexslash=\/ +\let\ptexsp=\sp \let\ptexstar=\* +\let\ptexsup=\sup \let\ptext=\t \let\ptextop=\top {\catcode`\'=\active \global\let\ptexquoteright'}% active in plain's math mode @@ -274,6 +277,7 @@ % described on page 260 of The TeXbook. It involves outputting two % marks for the sectioning macros, one before the section break, and % one after. I won't pretend I can describe this better than DEK... +% \def\domark{% \toks0=\expandafter{\lastchapterdefs}% \toks2=\expandafter{\lastsectiondefs}% @@ -301,6 +305,7 @@ % Avoid "undefined control sequence" errors. \def\lastchapterdefs{} \def\lastsectiondefs{} +\def\lastsection{} \def\prevchapterdefs{} \def\prevsectiondefs{} \def\lastcolordefs{} @@ -1010,24 +1015,15 @@ where each line of input produces a line of output.} % paragraph. % \gdef\dosuppressfirstparagraphindent{% - \gdef\indent{% - \restorefirstparagraphindent - \indent - }% - \gdef\noindent{% - \restorefirstparagraphindent - \noindent - }% - \global\everypar = {% - \kern -\parindent - \restorefirstparagraphindent - }% + \gdef\indent {\restorefirstparagraphindent \indent}% + \gdef\noindent{\restorefirstparagraphindent \noindent}% + \global\everypar = {\kern -\parindent \restorefirstparagraphindent}% } - +% \gdef\restorefirstparagraphindent{% - \global \let \indent = \ptexindent - \global \let \noindent = \ptexnoindent - \global \everypar = {}% + \global\let\indent = \ptexindent + \global\let\noindent = \ptexnoindent + \global\everypar = {}% } @@ -2090,12 +2086,9 @@ end \endgroup } - % In order for the font changes to affect most math symbols and letters, -% we have to define the \textfont of the standard families. Since -% texinfo doesn't allow for producing subscripts and superscripts except -% in the main text, we don't bother to reset \scriptfont and -% \scriptscriptfont (which would also require loading a lot more fonts). +% we have to define the \textfont of the standard families. We don't +% bother to reset \scriptfont and \scriptscriptfont; awaiting user need. % \def\resetmathfonts{% \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy @@ -2109,8 +2102,8 @@ end % \tenSTYLE to set the current font. % % Each font-changing command also sets the names \lsize (one size lower) -% and \lllsize (three sizes lower). These relative commands are used in -% the LaTeX logo and acronyms. +% and \lllsize (three sizes lower). These relative commands are used +% in, e.g., the LaTeX logo and acronyms. % % This all needs generalizing, badly. % @@ -2851,6 +2844,8 @@ end \let\v=\check \let\~=\tilde \let\dotaccent=\dot + % have to provide another name for sup operator + \let\mathopsup=\sup $\finishmath } \def\finishmath#1{#1$\endgroup} % Close the group opened by \tex. @@ -2874,6 +2869,18 @@ end } } +% for @sub and @sup, if in math mode, just do a normal sub/superscript. +% If in text, use math to place as sub/superscript, but switch +% into text mode, with smaller fonts. This is a different font than the +% one used for real math sub/superscripts (8pt vs. 7pt), but let's not +% fix it (significant additions to font machinery) until someone notices. +% +\def\sub{\ifmmode \expandafter\sb \else \expandafter\finishsub\fi} +\def\finishsub#1{$\sb{\hbox{\selectfonts\lllsize #1}}$}% +% +\def\sup{\ifmmode \expandafter\ptexsp \else \expandafter\finishsup\fi} +\def\finishsup#1{$\ptexsp{\hbox{\selectfonts\lllsize #1}}$}% + % ctrl is no longer a Texinfo command, but leave this definition for fun. \def\ctrl #1{{\tt \rawbackslash \hat}#1} @@ -3017,11 +3024,16 @@ end \TeX } -% Some math mode symbols. -\def\bullet{$\ptexbullet$} -\def\geq{\ifmmode \ge\else $\ge$\fi} -\def\leq{\ifmmode \le\else $\le$\fi} -\def\minus{\ifmmode -\else $-$\fi} +% Some math mode symbols. Define \ensuremath to switch into math mode +% unless we are already there. Expansion tricks may not be needed here, +% but safer, and can't hurt. +\def\ensuremath{\ifmmode \expandafter\asis \else\expandafter\ensuredmath \fi} +\def\ensuredmath#1{$\relax#1$} +% +\def\bullet{\ensuremath\ptexbullet} +\def\geq{\ensuremath\ge} +\def\leq{\ensuremath\le} +\def\minus{\ensuremath-} % @dots{} outputs an ellipsis using the current font. % We do .5em per period so that it has the same spacing in the cm @@ -3185,8 +3197,15 @@ end \def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E} \def\eogonek{{\ecfont \char"A6}}\def\macrochare{e} % -% Use the ec* fonts (cm-super in outline format) for non-CM glyphs. -\def\ecfont{% +% Use the European Computer Modern fonts (cm-super in outline format) +% for non-CM glyphs. That is ec* for regular text and tc* for the text +% companion symbols (LaTeX TS1 encoding). Both are part of the ec +% package and follow the same conventions. +% +\def\ecfont{\etcfont{e}} +\def\tcfont{\etcfont{t}} +% +\def\etcfont#1{% % We can't distinguish serif/sans and italic/slanted, but this % is used for crude hacks anyway (like adding French and German % quotes to documents typeset with CM, where we lose kerning), so @@ -3195,14 +3214,14 @@ end \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}% \ifmonospace % typewriter: - \font\thisecfont = ectt\ecsize \space at \nominalsize + \font\thisecfont = #1ctt\ecsize \space at \nominalsize \else \ifx\curfontstyle\bfstylename % bold: - \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize + \font\thisecfont = #1cb\ifusingit{i}{x}\ecsize \space at \nominalsize \else % regular: - \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize + \font\thisecfont = #1c\ifusingit{ti}{rm}\ecsize \space at \nominalsize \fi \fi \thisecfont @@ -4484,7 +4503,6 @@ end % Called from \indexdummies and \atdummies. % \def\commondummies{% - % % \definedummyword defines \#1 as \string\#1\space, thus effectively % preventing its expansion. This is used only for control words, % not control letters, because the \space would be incorrect for @@ -4561,6 +4579,7 @@ end \definedummyword\guilsinglright \definedummyword\lbracechar \definedummyword\leq + \definedummyword\mathopsup \definedummyword\minus \definedummyword\ogonek \definedummyword\pounds @@ -4574,6 +4593,8 @@ end \definedummyword\quotesinglbase \definedummyword\rbracechar \definedummyword\result + \definedummyword\sub + \definedummyword\sup \definedummyword\textdegree % % We want to disable all macros so that they are not expanded by \write. @@ -4648,6 +4669,7 @@ end \definedummyword\samp \definedummyword\strong \definedummyword\tie + \definedummyword\U \definedummyword\uref \definedummyword\url \definedummyword\var @@ -5739,13 +5761,16 @@ end % % #1 is the text, #2 is the section type (Ynumbered, Ynothing, % Yappendix, Yomitfromtoc), #3 the chapter number. +% Not used for @heading series. % % To test against our argument. \def\Ynothingkeyword{Ynothing} -\def\Yomitfromtockeyword{Yomitfromtoc} \def\Yappendixkeyword{Yappendix} +\def\Yomitfromtockeyword{Yomitfromtoc} % \def\chapmacro#1#2#3{% + \checkenv{}% chapters, etc., should not start inside an environment. + % % Insert the first mark before the heading break (see notes for \domark). \let\prevchapterdefs=\lastchapterdefs \let\prevsectiondefs=\lastsectiondefs @@ -5798,6 +5823,7 @@ end % {% \chapfonts \rmisbold + \let\footnote=\errfootnoteheading % give better error message % % Have to define \lastsection before calling \donoderef, because the % xref code eventually uses it. On the other hand, it has to be called @@ -5891,22 +5917,29 @@ end % Print any size, any type, section title. % -% #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is -% the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the -% section number. +% #1 is the text of the title, +% #2 is the section level (sec/subsec/subsubsec), +% #3 is the section type (Ynumbered, Ynothing, Yappendix, Yomitfromtoc), +% #4 is the section number. % \def\seckeyword{sec} % \def\sectionheading#1#2#3#4{% {% - \checkenv{}% should not be in an environment. + \def\sectionlevel{#2}% + \def\temptype{#3}% + % + % It is ok for the @heading series commands to appear inside an + % environment (it's been historically allowed, though the logic is + % dubious), but not the others. + \ifx\temptype\Yomitfromtockeyword\else + \checkenv{}% non-@*heading should not be in an environment. + \fi + \let\footnote=\errfootnoteheading % % Switch to the right set of fonts. \csname #2fonts\endcsname \rmisbold % - \def\sectionlevel{#2}% - \def\temptype{#3}% - % % Insert first mark before the heading break (see notes for \domark). \let\prevsectiondefs=\lastsectiondefs \ifx\temptype\Ynothingkeyword @@ -6333,6 +6366,7 @@ end % other math active characters (just in case), to plain's definitions. \mathactive % + % Inverse of the list at the beginning of the file. \let\b=\ptexb \let\bullet=\ptexbullet \let\c=\ptexc @@ -6348,7 +6382,9 @@ end \let\+=\tabalign \let\}=\ptexrbrace \let\/=\ptexslash + \let\sp=\ptexsp \let\*=\ptexstar + %\let\sup=\ptexsup % do not redefine, we want @sup to work in math mode \let\t=\ptext \expandafter \let\csname top\endcsname=\ptextop % we've made it outer \let\frenchspacing=\plainfrenchspacing @@ -6846,7 +6882,7 @@ end % typesetting commands (@smallbook, font changes, etc.) have to be done % beforehand -- and a) we want @copying to be done first in the source % file; b) letting users define the frontmatter in as flexible order as -% possible is very desirable. +% possible is desirable. % \def\copying{\checkenv{}\begingroup\scanargctxt\docopying} \def\docopying#1@end copying{\endgroup\def\copyingtext{#1}} @@ -7414,6 +7450,11 @@ end % % \anythingelse will almost certainly be an error of some kind. +\def\macrolineargctxt{% used for whole-line arguments without braces + \scanctxt + \catcode`\{=\other + \catcode`\}=\other +} % \mbodybackslash is the definition of \ in @macro bodies. % It maps \foo\ => \csname macarg.foo\endcsname => #N @@ -7488,12 +7529,14 @@ end % This makes use of the obscure feature that if the last token of a % is #, then the preceding argument is delimited by % an opening brace, and that opening brace is not consumed. +% \def\getargs#1{\getargsxxx#1{}} \def\getargsxxx#1#{\getmacname #1 \relax\getmacargs} \def\getmacname#1 #2\relax{\macname={#1}} \def\getmacargs#1{\def\argl{#1}} -% For macro processing make @ a letter so that we can make Texinfo private macro names. +% For macro processing make @ a letter so that we can make +% private-to-Texinfo macro names. \edef\texiatcatcode{\the\catcode`\@} \catcode `@=11\relax @@ -7523,8 +7566,8 @@ end % the catcode regime underwhich the body was input). % % If you compile with TeX (not eTeX), and you have macros with 10 or more -% arguments, you need that no macro has more than 256 arguments, otherwise an -% error is produced. +% arguments, no macro can have more than 256 arguments (else error). +% \def\parsemargdef#1;{% \paramno=0\def\paramlist{}% \let\hash\relax @@ -7568,7 +7611,6 @@ end % These two commands read recursive and nonrecursive macro bodies. % (They're different since rec and nonrec macros end differently.) % - \catcode `\@\texiatcatcode \long\def\parsemacbody#1@end macro% {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}% @@ -7582,7 +7624,7 @@ end \long\def\nillm@{\nil@}% % This macro is expanded during the Texinfo macro expansion, not during its -% definition. It gets all the arguments values and assigns them to macros +% definition. It gets all the arguments' values and assigns them to macros % macarg.ARGNAME % % #1 is the macro name @@ -7604,7 +7646,8 @@ end \fi } -% +% Internal for \getargsval@. +% \def\getargvals@@{% \ifx\paramlist\nilm@ % Some sanity check needed here that \argvaluelist is also empty. @@ -7648,7 +7691,8 @@ end } % Replace arguments by their values in the macro body, and place the result -% in macro \@tempa +% in macro \@tempa. +% \def\macvalstoargs@{% % To do this we use the property that token registers that are \the'ed % within an \edef expand only once. So we are going to place all argument @@ -7672,8 +7716,9 @@ end \expandafter\def\expandafter\@tempa\expandafter{\@tempc}% } +% Define the named-macro outside of this group and then close this group. +% \def\macargexpandinbody@{% - %% Define the named-macro outside of this group and then close this group. \expandafter \endgroup \macargdeflist@ @@ -7710,14 +7755,17 @@ end \next } -% Save the token stack pointer into macro #1 +% Save the token stack pointer into macro #1: \def\texisavetoksstackpoint#1{\edef#1{\the\@cclvi}} -% Restore the token stack pointer from number in macro #1 -\def\texirestoretoksstackpoint#1{\expandafter\mathchardef\expandafter\@cclvi#1\relax} -% newtoks that can be used non \outer . +% +% Restore the token stack pointer from number in macro #1: +\def\texirestoretoksstackpoint#1{\expandafter\mathchardef + \expandafter\@cclvi#1\relax} +% Variant \newtoks that can be used non-\outer: \def\texinonouternewtoks{\alloc@ 5\toks \toksdef \@cclvi} -% Tailing missing arguments are set to empty +% Tailing missing arguments are set to empty. +% \def\setemptyargvalues@{% \ifx\paramlist\nilm@ \let\next\macargexpandinbody@ @@ -7762,7 +7810,7 @@ end \noexpand\scanmacro{\temp}}% \or % 1 \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup\noexpand\macroargctxt + \bgroup \noexpand\braceorline \expandafter\noexpand\csname\the\macname xxx\endcsname}% \expandafter\xdef\csname\the\macname xxx\endcsname##1{% @@ -7795,7 +7843,7 @@ end \noexpand\scanmacro{\temp}\egroup}% \or % 1 \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup\noexpand\macroargctxt + \bgroup \noexpand\braceorline \expandafter\noexpand\csname\the\macname xxx\endcsname}% \expandafter\xdef\csname\the\macname xxx\endcsname##1{% @@ -7827,19 +7875,20 @@ end \fi \fi} -\catcode `\@\texiatcatcode\relax +\catcode `\@\texiatcatcode\relax % end private-to-Texinfo catcodes \def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}} -% \braceorline decides whether the next nonwhitespace character is a -% {. If so it reads up to the closing }, if not, it reads the whole -% line. Whatever was read is then fed to the next control sequence -% as an argument (by \parsebrace or \parsearg). +% \braceorline MAC is used for a one-argument macro MAC. It checks +% whether the next non-whitespace character is a {. It sets the context +% for reading the argument (slightly different in the two cases). Then, +% to read the argument, in the whole-line case, it then calls the +% regular \parsearg MAC; in the lbrace case, it just calls MAC itself. % \def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx} \def\braceorlinexxx{% - \ifx\nchar\bgroup\else - \expandafter\parsearg + \ifx\nchar\bgroup\macroargctxt + \else\macrolineargctxt\expandafter\parsearg \fi \macnamexxx} @@ -8318,14 +8367,7 @@ end \catcode`\\=\other % % Make the characters 128-255 be printing characters. - {% - \count1=128 - \def\loop{% - \catcode\count1=\other - \advance\count1 by 1 - \ifnum \count1<256 \loop \fi - }% - }% + {\setnonasciicharscatcodenonglobal\other}% % % @ is our escape character in .aux files, and we need braces. \catcode`\{=1 @@ -8359,9 +8401,6 @@ end % % Auto-number footnotes. Otherwise like plain. \gdef\footnote{% - \let\indent=\ptexindent - \let\noindent=\ptexnoindent - % \global\advance\footnoteno by \@ne \edef\thisfootno{$^{\the\footnoteno}$}% % @@ -8388,7 +8427,7 @@ end % % Nested footnotes are not supported in TeX, that would take a lot % more work. (\startsavinginserts does not suffice.) - \let\footnote=\errfootnote + \let\footnote=\errfootnotenest % % We want to typeset this text as a normal paragraph, even if the % footnote reference occurs in (for example) a display environment. @@ -8427,12 +8466,17 @@ end } }%end \catcode `\@=11 -\def\errfootnote{% +\def\errfootnotenest{% \errhelp=\EMsimple \errmessage{Nested footnotes not supported in texinfo.tex, even though they work in makeinfo; sorry} } +\def\errfootnoteheading{% + \errhelp=\EMsimple + \errmessage{Footnotes in chapters, sections, etc., are not supported} +} + % In case a @footnote appears in a vbox, save the footnote text and create % the real \insert just after the vbox finished. Otherwise, the insertion % would be lost. @@ -8968,10 +9012,12 @@ directory should work if nowhere else does.} % \else \ifx \declaredencoding \utfeight \setnonasciicharscatcode\active - \utfeightchardefs + % since we already invoked \utfeightchardefs at the top level + % (below), do not re-invoke it, then our check for duplicated + % definitions triggers. Making non-ascii chars active is enough. % \else - \message{Unknown document encoding #1, ignoring.}% + \message{Ignoring unknown document encoding: #1.}% % \fi % utfeight \fi % latnine @@ -8980,10 +9026,11 @@ directory should work if nowhere else does.} \fi % ascii } +% emacs-page % A message to be logged when using a character that isn't available % the default font encoding (OT1). % -\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}} +\def\missingcharmsg#1{\message{Character missing, sorry: #1.}} % Take account of \c (plain) vs. \, (Texinfo) difference. \def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi} @@ -8997,17 +9044,17 @@ directory should work if nowhere else does.} \def\latonechardefs{% \gdef^^a0{\tie} \gdef^^a1{\exclamdown} - \gdef^^a2{\missingcharmsg{CENT SIGN}} - \gdef^^a3{{\pounds}} - \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} - \gdef^^a5{\missingcharmsg{YEN SIGN}} - \gdef^^a6{\missingcharmsg{BROKEN BAR}} + \gdef^^a2{{\tcfont \char162}} % cent + \gdef^^a3{\pounds} + \gdef^^a4{{\tcfont \char164}} % currency + \gdef^^a5{{\tcfont \char165}} % yen + \gdef^^a6{{\tcfont \char166}} % broken bar \gdef^^a7{\S} \gdef^^a8{\"{}} \gdef^^a9{\copyright} \gdef^^aa{\ordf} \gdef^^ab{\guillemetleft} - \gdef^^ac{$\lnot$} + \gdef^^ac{\ensuremath\lnot} \gdef^^ad{\-} \gdef^^ae{\registeredsymbol} \gdef^^af{\={}} @@ -9019,12 +9066,10 @@ directory should work if nowhere else does.} \gdef^^b4{\'{}} \gdef^^b5{$\mu$} \gdef^^b6{\P} - % - \gdef^^b7{$^.$} + \gdef^^b7{\ensuremath\cdot} \gdef^^b8{\cedilla\ } \gdef^^b9{$^1$} \gdef^^ba{\ordm} - % \gdef^^bb{\guillemetright} \gdef^^bc{$1\over4$} \gdef^^bd{$1\over2$} @@ -9279,6 +9324,18 @@ directory should work if nowhere else does.} \UTFviiiLoop \endgroup +\def\globallet{\global\let} % save some \expandafter's below + +% @U{xxxx} to produce U+xxxx, if we support it. +\def\U#1{% + \expandafter\ifx\csname uni:#1\endcsname \relax + \errhelp = \EMsimple + \errmessage{Unicode character U+#1 not supported, sorry}% + \else + \csname uni:#1\endcsname + \fi +} + \begingroup \catcode`\"=12 \catcode`\<=12 @@ -9287,7 +9344,6 @@ directory should work if nowhere else does.} \catcode`\;=12 \catcode`\!=12 \catcode`\~=13 - \gdef\DeclareUnicodeCharacter#1#2{% \countUTFz = "#1\relax %\wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}% @@ -9302,6 +9358,13 @@ directory should work if nowhere else does.} \expandafter\expandafter\expandafter\expandafter \expandafter\expandafter\expandafter \gdef\UTFviiiTmp{#2}% + % + \expandafter\ifx\csname uni:#1\endcsname \relax \else + \errmessage{Internal error, already defined: #1}% + \fi + % + % define an additional control sequence for this code point. + \expandafter\globallet\csname uni:#1\endcsname \UTFviiiTmp \endgroup} \gdef\parseXMLCharref{% @@ -9339,23 +9402,53 @@ directory should work if nowhere else does.} \uppercase{\gdef\UTFviiiTmp{#2#3#4}}} \endgroup +% https://en.wikipedia.org/wiki/Plane_(Unicode)#Basic_M +% U+0000..U+007F = https://en.wikipedia.org/wiki/Basic_Latin_(Unicode_block) +% U+0080..U+00FF = https://en.wikipedia.org/wiki/Latin-1_Supplement_(Unicode_block) +% U+0100..U+017F = https://en.wikipedia.org/wiki/Latin_Extended-A +% U+0180..U+024F = https://en.wikipedia.org/wiki/Latin_Extended-B +% +% Many of our renditions are less than wonderful, and all the missing +% characters are available somewhere. Loading the necessary fonts +% awaits user request. We can't truly support Unicode without +% reimplementing everything that's been done in LaTeX for many years, +% plus probably using luatex or xetex, and who knows what else. +% We won't be doing that here in this simple file. But we can try to at +% least make most of the characters not bomb out. +% \def\utfeightchardefs{% \DeclareUnicodeCharacter{00A0}{\tie} \DeclareUnicodeCharacter{00A1}{\exclamdown} + \DeclareUnicodeCharacter{00A2}{{\tcfont \char162}}% 0242=cent \DeclareUnicodeCharacter{00A3}{\pounds} + \DeclareUnicodeCharacter{00A4}{{\tcfont \char164}}% 0244=currency + \DeclareUnicodeCharacter{00A5}{{\tcfont \char165}}% 0245=yen + \DeclareUnicodeCharacter{00A6}{{\tcfont \char166}}% 0246=brokenbar + \DeclareUnicodeCharacter{00A7}{\S} \DeclareUnicodeCharacter{00A8}{\"{ }} \DeclareUnicodeCharacter{00A9}{\copyright} \DeclareUnicodeCharacter{00AA}{\ordf} \DeclareUnicodeCharacter{00AB}{\guillemetleft} + \DeclareUnicodeCharacter{00AC}{\ensuremath\lnot} \DeclareUnicodeCharacter{00AD}{\-} \DeclareUnicodeCharacter{00AE}{\registeredsymbol} \DeclareUnicodeCharacter{00AF}{\={ }} \DeclareUnicodeCharacter{00B0}{\ringaccent{ }} + \DeclareUnicodeCharacter{00B1}{\ensuremath\pm} + \DeclareUnicodeCharacter{00B2}{$^2$} + \DeclareUnicodeCharacter{00B3}{$^3$} \DeclareUnicodeCharacter{00B4}{\'{ }} + \DeclareUnicodeCharacter{00B5}{$\mu$} + \DeclareUnicodeCharacter{00B6}{\P} + \DeclareUnicodeCharacter{00B7}{\ensuremath\cdot} \DeclareUnicodeCharacter{00B8}{\cedilla{ }} + \DeclareUnicodeCharacter{00B9}{$^1$} \DeclareUnicodeCharacter{00BA}{\ordm} \DeclareUnicodeCharacter{00BB}{\guillemetright} + \DeclareUnicodeCharacter{00BC}{$1\over4$} + \DeclareUnicodeCharacter{00BD}{$1\over2$} + \DeclareUnicodeCharacter{00BE}{$3\over4$} \DeclareUnicodeCharacter{00BF}{\questiondown} \DeclareUnicodeCharacter{00C0}{\`A} @@ -9382,6 +9475,7 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{00D4}{\^O} \DeclareUnicodeCharacter{00D5}{\~O} \DeclareUnicodeCharacter{00D6}{\"O} + \DeclareUnicodeCharacter{00D7}{\ensuremath\times} \DeclareUnicodeCharacter{00D8}{\O} \DeclareUnicodeCharacter{00D9}{\`U} \DeclareUnicodeCharacter{00DA}{\'U} @@ -9415,6 +9509,7 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{00F4}{\^o} \DeclareUnicodeCharacter{00F5}{\~o} \DeclareUnicodeCharacter{00F6}{\"o} + \DeclareUnicodeCharacter{00F7}{\ensuremath\div} \DeclareUnicodeCharacter{00F8}{\o} \DeclareUnicodeCharacter{00F9}{\`u} \DeclareUnicodeCharacter{00FA}{\'u} @@ -9434,20 +9529,23 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{0107}{\'c} \DeclareUnicodeCharacter{0108}{\^C} \DeclareUnicodeCharacter{0109}{\^c} - \DeclareUnicodeCharacter{0118}{\ogonek{E}} - \DeclareUnicodeCharacter{0119}{\ogonek{e}} \DeclareUnicodeCharacter{010A}{\dotaccent{C}} \DeclareUnicodeCharacter{010B}{\dotaccent{c}} \DeclareUnicodeCharacter{010C}{\v{C}} \DeclareUnicodeCharacter{010D}{\v{c}} \DeclareUnicodeCharacter{010E}{\v{D}} + \DeclareUnicodeCharacter{010F}{d'} + \DeclareUnicodeCharacter{0110}{\DH} + \DeclareUnicodeCharacter{0111}{\dh} \DeclareUnicodeCharacter{0112}{\=E} \DeclareUnicodeCharacter{0113}{\=e} \DeclareUnicodeCharacter{0114}{\u{E}} \DeclareUnicodeCharacter{0115}{\u{e}} \DeclareUnicodeCharacter{0116}{\dotaccent{E}} \DeclareUnicodeCharacter{0117}{\dotaccent{e}} + \DeclareUnicodeCharacter{0118}{\ogonek{E}} + \DeclareUnicodeCharacter{0119}{\ogonek{e}} \DeclareUnicodeCharacter{011A}{\v{E}} \DeclareUnicodeCharacter{011B}{\v{e}} \DeclareUnicodeCharacter{011C}{\^G} @@ -9457,14 +9555,20 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{0120}{\dotaccent{G}} \DeclareUnicodeCharacter{0121}{\dotaccent{g}} + \DeclareUnicodeCharacter{0122}{\cedilla{G}} + \DeclareUnicodeCharacter{0123}{\cedilla{g}} \DeclareUnicodeCharacter{0124}{\^H} \DeclareUnicodeCharacter{0125}{\^h} + \DeclareUnicodeCharacter{0126}{\missingcharmsg{H WITH STROKE}} + \DeclareUnicodeCharacter{0127}{\missingcharmsg{h WITH STROKE}} \DeclareUnicodeCharacter{0128}{\~I} \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}} \DeclareUnicodeCharacter{012A}{\=I} \DeclareUnicodeCharacter{012B}{\={\dotless{i}}} \DeclareUnicodeCharacter{012C}{\u{I}} \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}} + \DeclareUnicodeCharacter{012E}{\ogonek{I}} + \DeclareUnicodeCharacter{012F}{\ogonek{i}} \DeclareUnicodeCharacter{0130}{\dotaccent{I}} \DeclareUnicodeCharacter{0131}{\dotless{i}} @@ -9472,15 +9576,29 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{0133}{ij} \DeclareUnicodeCharacter{0134}{\^J} \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}} + \DeclareUnicodeCharacter{0136}{\cedilla{K}} + \DeclareUnicodeCharacter{0137}{\cedilla{k}} + \DeclareUnicodeCharacter{0138}{\ensuremath\kappa} \DeclareUnicodeCharacter{0139}{\'L} \DeclareUnicodeCharacter{013A}{\'l} + \DeclareUnicodeCharacter{013B}{\cedilla{L}} + \DeclareUnicodeCharacter{013C}{\cedilla{l}} + \DeclareUnicodeCharacter{013D}{L'}% should kern + \DeclareUnicodeCharacter{013E}{l'}% should kern + \DeclareUnicodeCharacter{013F}{L\U{00B7}} + \DeclareUnicodeCharacter{0140}{l\U{00B7}} \DeclareUnicodeCharacter{0141}{\L} \DeclareUnicodeCharacter{0142}{\l} \DeclareUnicodeCharacter{0143}{\'N} \DeclareUnicodeCharacter{0144}{\'n} + \DeclareUnicodeCharacter{0145}{\cedilla{N}} + \DeclareUnicodeCharacter{0146}{\cedilla{n}} \DeclareUnicodeCharacter{0147}{\v{N}} \DeclareUnicodeCharacter{0148}{\v{n}} + \DeclareUnicodeCharacter{0149}{'n} + \DeclareUnicodeCharacter{014A}{\missingcharmsg{ENG}} + \DeclareUnicodeCharacter{014B}{\missingcharmsg{eng}} \DeclareUnicodeCharacter{014C}{\=O} \DeclareUnicodeCharacter{014D}{\=o} \DeclareUnicodeCharacter{014E}{\u{O}} @@ -9492,6 +9610,8 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{0153}{\oe} \DeclareUnicodeCharacter{0154}{\'R} \DeclareUnicodeCharacter{0155}{\'r} + \DeclareUnicodeCharacter{0156}{\cedilla{R}} + \DeclareUnicodeCharacter{0157}{\cedilla{r}} \DeclareUnicodeCharacter{0158}{\v{R}} \DeclareUnicodeCharacter{0159}{\v{r}} \DeclareUnicodeCharacter{015A}{\'S} @@ -9503,10 +9623,12 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{0160}{\v{S}} \DeclareUnicodeCharacter{0161}{\v{s}} - \DeclareUnicodeCharacter{0162}{\cedilla{t}} - \DeclareUnicodeCharacter{0163}{\cedilla{T}} + \DeclareUnicodeCharacter{0162}{\cedilla{T}} + \DeclareUnicodeCharacter{0163}{\cedilla{t}} \DeclareUnicodeCharacter{0164}{\v{T}} - + \DeclareUnicodeCharacter{0165}{\v{t}} + \DeclareUnicodeCharacter{0166}{\missingcharmsg{H WITH STROKE}} + \DeclareUnicodeCharacter{0167}{\missingcharmsg{h WITH STROKE}} \DeclareUnicodeCharacter{0168}{\~U} \DeclareUnicodeCharacter{0169}{\~u} \DeclareUnicodeCharacter{016A}{\=U} @@ -9518,6 +9640,8 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{0170}{\H{U}} \DeclareUnicodeCharacter{0171}{\H{u}} + \DeclareUnicodeCharacter{0172}{\ogonek{U}} + \DeclareUnicodeCharacter{0173}{\ogonek{u}} \DeclareUnicodeCharacter{0174}{\^W} \DeclareUnicodeCharacter{0175}{\^w} \DeclareUnicodeCharacter{0176}{\^Y} @@ -9529,6 +9653,7 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{017C}{\dotaccent{z}} \DeclareUnicodeCharacter{017D}{\v{Z}} \DeclareUnicodeCharacter{017E}{\v{z}} + \DeclareUnicodeCharacter{017F}{\missingcharmsg{LONG S}} \DeclareUnicodeCharacter{01C4}{D\v{Z}} \DeclareUnicodeCharacter{01C5}{D\v{z}} @@ -9720,6 +9845,8 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{201C}{\quotedblleft} \DeclareUnicodeCharacter{201D}{\quotedblright} \DeclareUnicodeCharacter{201E}{\quotedblbase} + \DeclareUnicodeCharacter{2020}{\ensuremath\dagger} + \DeclareUnicodeCharacter{2021}{\ensuremath\ddagger} \DeclareUnicodeCharacter{2022}{\bullet} \DeclareUnicodeCharacter{2026}{\dots} \DeclareUnicodeCharacter{2039}{\guilsinglleft} @@ -9731,15 +9858,66 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{2212}{\minus} \DeclareUnicodeCharacter{2217}{\point} + \DeclareUnicodeCharacter{2225}{\ensuremath\parallel} \DeclareUnicodeCharacter{2261}{\equiv} }% end of \utfeightchardefs - % US-ASCII character definitions. \def\asciichardefs{% nothing need be done \relax } +% Latin1 (ISO-8859-1) character definitions. +\def\nonasciistringdefs{% + \setnonasciicharscatcode\active + \def\defstringchar##1{\def##1{\string##1}}% + % + \defstringchar^^80\defstringchar^^81\defstringchar^^82\defstringchar^^83% + \defstringchar^^84\defstringchar^^85\defstringchar^^86\defstringchar^^87% + \defstringchar^^88\defstringchar^^89\defstringchar^^8a\defstringchar^^8b% + \defstringchar^^8c\defstringchar^^8d\defstringchar^^8e\defstringchar^^8f% + % + \defstringchar^^90\defstringchar^^91\defstringchar^^92\defstringchar^^93% + \defstringchar^^94\defstringchar^^95\defstringchar^^96\defstringchar^^97% + \defstringchar^^98\defstringchar^^99\defstringchar^^9a\defstringchar^^9b% + \defstringchar^^9c\defstringchar^^9d\defstringchar^^9e\defstringchar^^9f% + % + \defstringchar^^a0\defstringchar^^a1\defstringchar^^a2\defstringchar^^a3% + \defstringchar^^a4\defstringchar^^a5\defstringchar^^a6\defstringchar^^a7% + \defstringchar^^a8\defstringchar^^a9\defstringchar^^aa\defstringchar^^ab% + \defstringchar^^ac\defstringchar^^ad\defstringchar^^ae\defstringchar^^af% + % + \defstringchar^^b0\defstringchar^^b1\defstringchar^^b2\defstringchar^^b3% + \defstringchar^^b4\defstringchar^^b5\defstringchar^^b6\defstringchar^^b7% + \defstringchar^^b8\defstringchar^^b9\defstringchar^^ba\defstringchar^^bb% + \defstringchar^^bc\defstringchar^^bd\defstringchar^^be\defstringchar^^bf% + % + \defstringchar^^c0\defstringchar^^c1\defstringchar^^c2\defstringchar^^c3% + \defstringchar^^c4\defstringchar^^c5\defstringchar^^c6\defstringchar^^c7% + \defstringchar^^c8\defstringchar^^c9\defstringchar^^ca\defstringchar^^cb% + \defstringchar^^cc\defstringchar^^cd\defstringchar^^ce\defstringchar^^cf% + % + \defstringchar^^d0\defstringchar^^d1\defstringchar^^d2\defstringchar^^d3% + \defstringchar^^d4\defstringchar^^d5\defstringchar^^d6\defstringchar^^d7% + \defstringchar^^d8\defstringchar^^d9\defstringchar^^da\defstringchar^^db% + \defstringchar^^dc\defstringchar^^dd\defstringchar^^de\defstringchar^^df% + % + \defstringchar^^e0\defstringchar^^e1\defstringchar^^e2\defstringchar^^e3% + \defstringchar^^e4\defstringchar^^e5\defstringchar^^e6\defstringchar^^e7% + \defstringchar^^e8\defstringchar^^e9\defstringchar^^ea\defstringchar^^eb% + \defstringchar^^ec\defstringchar^^ed\defstringchar^^ee\defstringchar^^ef% + % + \defstringchar^^f0\defstringchar^^f1\defstringchar^^f2\defstringchar^^f3% + \defstringchar^^f4\defstringchar^^f5\defstringchar^^f6\defstringchar^^f7% + \defstringchar^^f8\defstringchar^^f9\defstringchar^^fa\defstringchar^^fb% + \defstringchar^^fc\defstringchar^^fd\defstringchar^^fe\defstringchar^^ff% +} + + +% define all the unicode characters we know about, for the sake of @U. +\utfeightchardefs + + % Make non-ASCII characters printable again for compatibility with % existing Texinfo documents that may use them, even without declaring a % document encoding. @@ -10093,6 +10271,7 @@ directory should work if nowhere else does.} % {@catcode`- = @active @gdef@normalturnoffactive{% + @nonasciistringdefs @let-=@normaldash @let"=@normaldoublequote @let$=@normaldollar %$ font-lock fix @@ -10161,7 +10340,7 @@ directory should work if nowhere else does.} @c Local variables: @c eval: (add-hook 'write-file-hooks 'time-stamp) -@c page-delimiter: "^\\\\message" +@c page-delimiter: "^\\\\message\\|emacs-page" @c time-stamp-start: "def\\\\texinfoversion{" @c time-stamp-format: "%:y-%02m-%02d.%02H" @c time-stamp-end: "}" diff --git a/build-aux/update-copyright b/build-aux/update-copyright index 90624e90..8cc36e22 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 = '2013-01-03.09:41'; # UTC +my $VERSION = '2015-01-15.20:53'; # UTC -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -124,7 +124,7 @@ use strict; use warnings; my $copyright_re = 'Copyright'; -my $circle_c_re = '(?:\([cC]\)|@copyright{}|©)'; +my $circle_c_re = '(?:\([cC]\)|@copyright\{}|\\\\\(co|©)'; my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER}; $holder ||= 'Free Software Foundation, Inc.'; my $prefix_max = 5; diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free index 4c76c75d..82a09b39 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free 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 b2bca54c..3bf93c3c 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/ylwrap b/build-aux/ylwrap index 8f072a8e..7c2d927f 100755 --- a/build-aux/ylwrap +++ b/build-aux/ylwrap @@ -3,7 +3,7 @@ scriptversion=2013-01-12.17; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # Written by Tom Tromey . # diff --git a/cfg.mk b/cfg.mk index 6d96e1b4..29649dcc 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1,5 +1,5 @@ # Customize maint.mk -*- makefile -*- -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This 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 @@ export VERBOSE = yes # 4914152 9e export XZ_OPT = -8e -old_NEWS_hash = adf13e9314300d0dff82fa37b247d7db +old_NEWS_hash = 41e5c3133f5d8947e2ff13aab58fc52b # Add an exemption for sc_makefile_at_at_check. _makefile_at_at_check_exceptions = ' && !/^cu_install_prog/ && !/dynamic-dep/' @@ -61,11 +61,11 @@ sc_dd_O_FLAGS: perl -nle '/^ +\| (O_\w*)$$/ and print $$1' $(dd); } | sort > $@.1 @{ echo O_NOFOLLOW; perl -nle '/{"[a-z]+",\s*(O_\w+)},/ and print $$1' \ $(dd); } | sort > $@.2 - @diff -u $@.1 $@.2 || diff=1 || diff=; \ + @diff -u $@.1 $@.2; diff=$$?; \ rm -f $@.1 $@.2; \ - test "$$diff" \ - && { echo '$(ME): $(dd) has inconsistent O_ flag lists'>&2; \ - exit 1; } || : + test "$$diff" = 0 \ + || { echo '$(ME): $(dd) has inconsistent O_ flag lists'>&2; \ + exit 1; } # Ensure that dd's definition of LONGEST_SYMBOL stays in sync # with the strings from the two affected variables. @@ -74,10 +74,9 @@ sc_dd_max_sym_length: ifneq ($(wildcard $(dd_c)),) @len=$$( (sed -n '/conversions\[\] =$$/,/^};/p' $(dd_c);\ sed -n '/flags\[\] =$$/,/^};/p' $(dd_c) ) \ - |sed -n '/"/s/^[^"]*"\([^"]*\)".*/\1/p' \ - | wc --max-line-length); \ + |sed -n '/"/s/^[^"]*"\([^"]*\)".*/\1/p'| wc -L);\ max=$$(sed -n '/^#define LONGEST_SYMBOL /s///p' $(dd_c) \ - |tr -d '"' | wc --max-line-length); \ + |tr -d '"' | wc -L); \ if test "$$len" = "$$max"; then :; else \ echo 'dd.c: LONGEST_SYMBOL is not longest' 1>&2; \ exit 1; \ @@ -96,7 +95,8 @@ sc_prohibit_jm_in_m4: # Ensure that each root-requiring test is run via the "check-root" rule. sc_root_tests: @t1=sc-root.expected; t2=sc-root.actual; \ - grep -nl '^ *require_root_$$' `$(VC_LIST) tests` | sort > $$t1; \ + grep -nl '^ *require_root_$$' `$(VC_LIST) tests` | \ + sed 's|.*/tests/|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; \ @@ -117,12 +117,22 @@ sc_tests_list_consistency: # Ensure that all version-controlled test scripts are executable. sc_tests_executable: - @test_extensions_rx=`echo $(TEST_EXTENSIONS) \ - | sed -e "s/ / -o -name */g" -e "s/^/-name */"`; \ - find tests/ \( $$test_extensions_rx \) \! -perm -111 -print \ - | sed -e "s/^/$(ME): Please make test executable: /" | grep . \ + @set -o noglob 2>/dev/null || set -f; \ + find_ext="-name '' "`printf -- "-o -name *%s " $(TEST_EXTENSIONS)`;\ + find $(srcdir)/tests/ \( $$find_ext \) \! -perm -u+x -print \ + | { sed "s|^$(srcdir)/||"; git ls-files $(srcdir)/tests/; } \ + | sort | uniq -d \ + | sed -e "s/^/$(ME): Please make test executable: /" | grep . \ && exit 1; : +# Ensure all gnulib patches apply cleanly +sc_ensure_gl_diffs_apply_cleanly: + @find $(srcdir)/gl/ -name '*.diff' | while read p; do \ + patch --fuzz=0 -f -s -d $(srcdir)/gnulib/ -p1 --dry-run < "$$p" >&2 \ + || { echo "$$p" >&2; echo 'To refresh all gl patches run:' \ + 'make refresh-gnulib-patches' >&2; exit 1; } \ + done + # Avoid :>file which doesn't propagate errors sc_prohibit_colon_redirection: @cd $(srcdir)/tests && GIT_PAGER= git grep -n ': *>.*||' \ @@ -214,14 +224,15 @@ sc_check-I18N-AUTHORS: '$$(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; } \ +# Disallow the C99 printf size specifiers %z and %j as they're not portable. +# The gnulib printf replacement does support them, however the printf +# replacement is not currently explicitly depended on by the gnulib error() +# module for example. Also we use fprintf() in a few places to output simple +# formats but don't use the gnulib module as it is seen as overkill at present. +# We'd have to adjust the above gnulib items before disabling this. +sc_prohibit-c99-printf-format: + @cd $(srcdir)/src && GIT_PAGER= git grep -n '%[0*]*[jz][udx]' *.c \ + && { echo '$(ME): Use PRI*MAX instead of %j or %z' 1>&2; exit 1; } \ || : # Ensure the alternative __attribute (keyword) form isn't used as @@ -239,17 +250,20 @@ sc_prohibit-gl-attributes: # - the help2man script copied from upstream, # - tests involving long checksum lines, and # - the 'pr' test cases. -LINE_LEN_MAX = 80 FILTER_LONG_LINES = \ - /^[^:]*\.diff:[^:]*:@@ / d; \ - \|^[^:]*man/help2man:| d; \ + \|^[^:]*man/help2man:| d; \ \|^[^:]*tests/misc/sha[0-9]*sum.*\.pl[-:]| d; \ \|^[^:]*tests/pr/|{ \|^[^:]*tests/pr/pr-tests:| !d; }; sc_long_lines: - @files=$$($(VC_LIST_EXCEPT)) \ - halt='line(s) with more than $(LINE_LEN_MAX) characters; reindent'; \ + @wc -L /dev/null >/dev/null 2>/dev/null \ + || { echo "$@: skipping: wc -L not supported"; exit 0; }; \ + sed -r 1q /dev/null 2>/dev/null \ + || { echo "$@: skipping: sed -r not supported"; exit 0; }; \ + files=$$($(VC_LIST_EXCEPT) | xargs wc -L | sed -rn '/ total$$/d;\ + s/^ *(8[1-9]|9[0-9]|[0-9]\{3,\}) //p'); \ + halt='line(s) with more than 80 characters; reindent'; \ for file in $$files; do \ - expand $$file | grep -nE '^.{$(LINE_LEN_MAX)}.' | \ + expand $$file | grep -nE '^.{80}.' | \ sed -e "s|^|$$file:|" -e '$(FILTER_LONG_LINES)'; \ done | grep . && { msg="$$halt" $(_sc_say_and_exit) } || : @@ -297,6 +311,12 @@ check-programs-vs-x: done; \ exit $$status +# Ensure we can check out on case insensitive file systems +sc_case_insensitive_file_names: src/uniq + @git ls-files | sort -f | src/uniq -Di | grep . && \ + { echo "$(ME): the above file(s) conflict on case insensitive" \ + " file systems" 1>&2; exit 1; } || : + # Ensure that the end of each release's section is marked by two empty lines. sc_NEWS_two_empty_lines: @sed -n 4,/Noteworthy/p $(srcdir)/NEWS \ @@ -337,8 +357,8 @@ sc_strftime_check: grep '^ %. ' $(srcdir)/src/date.c | sort \ | $(extract_char) > $@-src; \ { echo N; \ - info libc date calendar format 2>/dev/null|grep '^ `%.'\'\ - | $(extract_char); } | sort > $@-info; \ + info libc date calendar format 2>/dev/null \ + | grep "^ *['\`]%.'$$"| $(extract_char); }| sort >$@-info;\ if test $$(stat --format %s $@-info) != 2; then \ diff -u $@-src $@-info || exit 1; \ else \ @@ -353,6 +373,24 @@ sc_prohibit_tab_based_indentation: halt='TAB in indentation; use only spaces' \ $(_sc_search_regexp) +# Enforce lowercase 'e' in "I.e.". +sc_prohibit_uppercase_id_est: + @prohibit='I\.E\.' \ + halt='Uppercase "Id Est" abbreviation; use "I.e.," instead' \ + $(_sc_search_regexp) + +# Enforce double-space before "I.e." at the beginning of a sentence. +sc_ensure_dblspace_after_dot_before_id_est: + @prohibit='\. I\.e\.' \ + halt='Single space after dot before "i.e."; use ". i.e." instead' \ + $(_sc_search_regexp) + +# Enforce comma after "i.e." (at least before a blank or at EOL). +sc_ensure_comma_after_id_est: + @prohibit='[Ii]\.e\.( |$$)' \ + halt='Missing comma after "i.e."; use "i.e.," instead' \ + $(_sc_search_regexp) + # The SEE ALSO section of a man page should not be terminated with # a period. Check the first line after each "SEE ALSO" line in man/*.x: sc_prohibit_man_see_also_period: @@ -373,6 +411,17 @@ sc_prohibit_fail_0: halt='fail=0 initialization' \ $(_sc_search_regexp) +# Ensure that tests don't use `cmd ... && fail=1` as that hides crashes. +# The "exclude" expression allows common idioms like `test ... && fail=1` +# and the 2>... portion allows commands that redirect stderr and so probably +# independently check its contents and thus detect any crash messages. +sc_prohibit_and_fail_1: + @prohibit='&& fail=1' \ + exclude='(stat|kill|test |EGREP|grep|env|compare|2> *[^/])' \ + halt='&& fail=1 detected. Please use: returns_ 1 ... || fail=1' \ + in_vc_files='^tests/' \ + $(_sc_search_regexp) + # The mode part of a setfacl -m option argument must be three bytes long. # I.e., an argument of user:bin:rw or user:bin:r will make Solaris 10's # setfacl reject it with: "Unrecognized character found in mode field". @@ -435,22 +484,29 @@ sc_prohibit_test_empty: # 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 . \ + $$(git grep -El '[^T]_FAILURE|EXIT_CANCELED' $(srcdir)/src) \ + | grep -vE '= EXIT_FAILURE|return .* \?' | grep . \ && { echo '$(ME): do not use EXIT_FAILURE in the above' \ 1>&2; exit 1; } || : # Ensure that tests call the require_ulimit_v_ function if using ulimit -v sc_prohibit_test_ulimit_without_require_: - @(git grep -l require_ulimit_v_ tests; \ - git grep -l 'ulimit -v' tests) \ + @(git grep -l require_ulimit_v_ $(srcdir)/tests; \ + git grep -l 'ulimit -v' $(srcdir)/tests) \ | sort | uniq -u | grep . && { echo "$(ME): the above test(s)"\ " should match require_ulimit_v_ with ulimit -v" 1>&2; exit 1; } || : +# Ensure that tests call the cleanup_ function if using background processes +sc_prohibit_test_background_without_cleanup_: + @(git grep -El '( &$$|&[^&]*=\$$!)' $(srcdir)/tests; \ + git grep -l 'cleanup_()' $(srcdir)/tests | sed p) \ + | sort | uniq -u | grep . && { echo "$(ME): the above test(s)"\ + " should use cleanup_ for background processes" 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 \ + @git grep -w print_ver_ $(srcdir)/tests \ | sed 's#:print_ver_##' \ | { fail=0; \ while read file name; do \ @@ -541,11 +597,9 @@ sc_space_before_open_paren: # Similar to the gnulib maint.mk rule for sc_prohibit_strcmp # Use STREQ_LEN or STRPREFIX rather than comparing strncmp == 0, or != 0. sc_prohibit_strncmp: - @grep -nE '! *str''ncmp *\(|\&2; exit 1; } || : + @prohibit='^[^#].*str''ncmp *\(' \ + halt='use STREQ_LEN or STRPREFIX instead of str''ncmp' \ + $(_sc_search_regexp) # Enforce recommended preprocessor indentation style. sc_preprocessor_indentation: @@ -565,11 +619,22 @@ sc_preprocessor_indentation: # 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/ *$$//'; } \ + cut -b-36 $(srcdir)/THANKS.in \ + | sed '/^$$/,/^$$/!d;/^$$/d;s/ *$$//'; } \ | sort | uniq -d | grep . \ && { echo '$(ME): remove the above names from THANKS.in' \ 1>&2; exit 1; } || : +# Ensure the contributor list stays sorted. Use our sort as other +# implementations may result in a different order. +sc_THANKS_in_sorted: src/sort + @sed '/^$$/,/^$$/!d;/^$$/d' $(srcdir)/THANKS.in > $@.1; \ + LC_ALL=en_US.UTF-8 src/sort -f -k1,1 $@.1 > $@.2 + @diff -u $@.1 $@.2; diff=$$?; \ + rm -f $@.1 $@.2; \ + test "$$diff" = 0 \ + || { echo '$(ME): THANKS.in is unsorted' 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: @@ -585,6 +650,21 @@ sc_fs-magic-compare: && { echo '$(ME): Constants in src/stat.c should be 4 or 8' \ 'upper-case chars' 1>&2; exit 1; } || : +# Ensure gnulib generated files are ignored +# TODO: Perhaps augment gnulib-tool to do this in lib/.gitignore? +sc_gitignore_missing: + @{ sed -n '/^\/lib\/.*\.h$$/{p;p}' .gitignore; \ + find lib -name '*.in*' ! -name '*~' ! -name 'sys_*' | \ + sed 's|^|/|; s|_\(.*in\.h\)|/\1|; s/\.in//'; } | \ + sort | uniq -u | grep . && { echo '$(ME): Add above' \ + 'entries to .gitignore' >&2; exit 1; } || : + +# Flag redundant entreis in .gitignore +sc_gitignore_redundant: + @{ grep ^/lib .gitignore; sed 's|^|/lib|' lib/.gitignore; } | \ + sort | uniq -d | grep . && { echo '$(ME): Remove above' \ + 'entries from .gitignore' >&2; exit 1; } || : + # Override the default Cc: used in generating an announcement. announcement_Cc_ = $(translation_project_), \ coreutils@gnu.org, coreutils-announce@gnu.org @@ -603,11 +683,11 @@ exclude_file_name_regexp--sc_bindtextdomain = \ ^(gl/.*|lib/euidaccess-stat|src/make-prime-list)\.c$$ exclude_file_name_regexp--sc_trailing_blank = ^(tests/pr/|man/help2man) exclude_file_name_regexp--sc_system_h_headers = \ - ^src/((system|copy)\.h|libstdbuf\.c|make-prime-list\.c)$$ + ^src/((system|copy)\.h|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 = \ - (^lib/buffer-lcm\.c|src/$(_src)\.c)$$ + (^lib/buffer-lcm\.c|gl/lib/xdecto.max\.c|src/$(_src)\.c)$$ exclude_file_name_regexp--sc_require_config_h = \ $(exclude_file_name_regexp--sc_require_config_h_first) @@ -628,7 +708,6 @@ exclude_file_name_regexp--sc_prohibit_atoi_atof = ^lib/euidaccess-stat\.c$$ # 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)$$ @@ -658,6 +737,11 @@ exclude_file_name_regexp--sc_prohibit_atoi_atof = ^src/make-prime-list\.c$$ # Exception here as we don't want __attribute elided on non GCC exclude_file_name_regexp--sc_prohibit-gl-attributes = ^src/libstdbuf\.c$$ +exclude_file_name_regexp--sc_prohibit_uppercase_id_est = \.diff$$ +exclude_file_name_regexp--sc_ensure_dblspace_after_dot_before_id_est = \.diff$$ +exclude_file_name_regexp--sc_ensure_comma_after_id_est = \.diff|$(_ll)$$ +exclude_file_name_regexp--sc_long_lines = \.diff$$|$(_ll) + # Augment AM_CFLAGS to include our per-directory options: AM_CFLAGS += $($(@D)_CFLAGS) @@ -670,7 +754,7 @@ gnulib-tests_CFLAGS = $(GNULIB_TEST_WARN_CFLAGS) export _gl_TS_headers = $(srcdir)/cfg.mk _gl_TS_dir = . _gl_TS_obj_files = src/*.$(OBJEXT) -_gl_TS_other_headers = src/*.h +_gl_TS_other_headers = $(srcdir)/src/*.h src/*.h # Tell the tight_scope rule about an exceptional "extern" variable. # Normally, the rule would detect its declaration, but that uses a diff --git a/configure b/configure index 5602d6f1..d2e3a3fe 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNU coreutils 8.23. +# Generated by GNU Autoconf 2.69 for GNU coreutils 8.24. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GNU coreutils' PACKAGE_TARNAME='coreutils' -PACKAGE_VERSION='8.23' -PACKAGE_STRING='GNU coreutils 8.23' +PACKAGE_VERSION='8.24' +PACKAGE_STRING='GNU coreutils 8.24' PACKAGE_BUGREPORT='bug-coreutils@gnu.org' PACKAGE_URL='http://www.gnu.org/software/coreutils/' @@ -623,8 +623,8 @@ ac_includes_default="\ #endif" gl_use_threads_default= -ac_header_list= ac_func_list= +ac_header_list= with_openssl_default='no' LIB_CRYPTO= gl_fnmatch_required=POSIX @@ -703,6 +703,7 @@ HAVE_UNISTD_H NEXT_AS_FIRST_DIRECTIVE_UNISTD_H NEXT_UNISTD_H LIB_TIMER_TIME +UNISTD_H_DEFINES_STRUCT_TIMESPEC PTHREAD_H_DEFINES_STRUCT_TIMESPEC SYS_TIME_H_DEFINES_STRUCT_TIMESPEC TIME_H_DEFINES_STRUCT_TIMESPEC @@ -779,8 +780,6 @@ GNULIB_SIGPROCMASK GNULIB_SIGNAL_H_SIGPIPE GNULIB_RAISE GNULIB_PTHREAD_SIGMASK -USE_ACL -LIB_ACL LIB_PTHREAD GL_GENERATE_PTHREAD_H_FALSE GL_GENERATE_PTHREAD_H_TRUE @@ -927,6 +926,7 @@ GL_GENERATE_STDDEF_H_FALSE GL_GENERATE_STDDEF_H_TRUE STDDEF_H HAVE_WCHAR_T +HAVE_MAX_ALIGN_T REPLACE_NULL REPLACE_STRUCT_LCONV REPLACE_DUPLOCALE @@ -1349,6 +1349,7 @@ GL_GENERATE_FLOAT_H_TRUE FLOAT_H NEXT_AS_FIRST_DIRECTIVE_FLOAT_H NEXT_FLOAT_H +LIB_HAS_ACL LIB_FDATASYNC NEXT_AS_FIRST_DIRECTIVE_FCNTL_H NEXT_FCNTL_H @@ -1553,9 +1554,11 @@ REPLACE_USLEEP REPLACE_UNLINKAT REPLACE_UNLINK REPLACE_TTYNAME_R +REPLACE_SYMLINKAT REPLACE_SYMLINK REPLACE_SLEEP REPLACE_RMDIR +REPLACE_READLINKAT REPLACE_READLINK REPLACE_READ REPLACE_PWRITE @@ -1674,6 +1677,7 @@ REPLACE_SETENV REPLACE_REALPATH REPLACE_REALLOC REPLACE_RANDOM_R +REPLACE_QSORT_R REPLACE_PUTENV REPLACE_PTSNAME_R REPLACE_PTSNAME @@ -1725,6 +1729,7 @@ GNULIB_REALPATH GNULIB_REALLOC_POSIX GNULIB_RANDOM_R GNULIB_RANDOM +GNULIB_QSORT_R GNULIB_PUTENV GNULIB_PTSNAME_R GNULIB_PTSNAME @@ -1853,6 +1858,8 @@ GL_GENERATE_ALLOCA_H_FALSE GL_GENERATE_ALLOCA_H_TRUE ALLOCA_H ALLOCA +USE_ACL +LIB_ACL GL_COND_LIBTOOL_FALSE GL_COND_LIBTOOL_TRUE host_os @@ -1959,13 +1966,13 @@ enable_silent_rules enable_dependency_tracking enable_largefile enable_threads +enable_acl enable_assert with_openssl with_gnu_ld enable_rpath with_libiconv_prefix with_libpth_prefix -enable_acl with_included_regex with_selinux enable_libsmack @@ -2536,7 +2543,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.23 to adapt to many kinds of systems. +\`configure' configures GNU coreutils 8.24 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2606,7 +2613,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU coreutils 8.23:";; + short | recursive ) echo "Configuration of GNU coreutils 8.24:";; esac cat <<\_ACEOF @@ -2624,9 +2631,9 @@ Optional Features: --enable-threads={posix|solaris|pth|windows} specify multithreading API --disable-threads build without multithread safety + --disable-acl do not support ACLs --disable-assert turn off assertions --disable-rpath do not hardcode runtime library paths - --disable-acl do not support ACLs --disable-libsmack disable libsmack support --disable-xattr do not support extended attributes --disable-libcap disable libcap support @@ -2766,7 +2773,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU coreutils configure 8.23 +GNU coreutils configure 8.24 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3065,60 +3072,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -# ------------------------------------------- -# Tests whether TYPE exists after having included INCLUDES, setting cache -# variable VAR accordingly. -ac_fn_c_check_type () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof ($2)) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof (($2))) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - eval "$3=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_type - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -3186,6 +3139,60 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_func +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_type + # ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES # --------------------------------------------- # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR @@ -3475,7 +3482,7 @@ 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.23, which was +It was created by GNU coreutils $as_me 8.24, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3755,6 +3762,7 @@ $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_func_list " fchmod" as_fn_append ac_header_list " arpa/inet.h" as_fn_append ac_header_list " features.h" as_fn_append ac_func_list " pathconf" @@ -3771,7 +3779,6 @@ as_fn_append ac_header_list " sys/socket.h" as_fn_append ac_func_list " fchdir" as_fn_append ac_header_list " dirent.h" as_fn_append ac_func_list " fdopendir" -as_fn_append ac_func_list " getdtablesize" as_fn_append ac_func_list " faccessat" as_fn_append ac_func_list " posix_fadvise" as_fn_append ac_func_list " fchmodat" @@ -3808,6 +3815,7 @@ as_fn_append ac_func_list " futimens" as_fn_append ac_header_list " netdb.h" as_fn_append ac_header_list " netinet/in.h" as_fn_append ac_func_list " getdelim" +as_fn_append ac_func_list " getdtablesize" as_fn_append ac_func_list " microuptime" as_fn_append ac_func_list " nanouptime" as_fn_append ac_func_list " getlogin" @@ -3845,7 +3853,6 @@ as_fn_append ac_func_list " isascii" as_fn_append ac_header_list " sys/mman.h" as_fn_append ac_func_list " mprotect" as_fn_append ac_func_list " getgrouplist" -as_fn_append ac_func_list " fchmod" as_fn_append ac_func_list " mkfifo" as_fn_append ac_func_list " mknod" as_fn_append ac_func_list " mkstemp" @@ -3904,6 +3911,7 @@ as_fn_append ac_func_list " symlinkat" as_fn_append ac_func_list " shutdown" as_fn_append ac_func_list " wctob" as_fn_append ac_header_list " hurd.h" +as_fn_append ac_header_list " linux/falloc.h" as_fn_append ac_header_list " paths.h" as_fn_append ac_header_list " stropts.h" as_fn_append ac_header_list " sys/systeminfo.h" @@ -3914,10 +3922,12 @@ 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 " fallocate" as_fn_append ac_func_list " iswspace" as_fn_append ac_func_list " setgroups" as_fn_append ac_func_list " sethostname" as_fn_append ac_func_list " sync" +as_fn_append ac_func_list " syncfs" as_fn_append ac_func_list " sysctl" as_fn_append ac_func_list " sysinfo" as_fn_append ac_func_list " tcgetpgrp" @@ -4030,7 +4040,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.14' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -4202,8 +4212,8 @@ test "$program_suffix" != NONE && ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -4222,7 +4232,7 @@ else $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -4516,7 +4526,7 @@ fi # Define the identity of the package. PACKAGE='coreutils' - VERSION='8.23' + VERSION='8.24' cat >>confdefs.h <<_ACEOF @@ -4550,8 +4560,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -4608,6 +4618,7 @@ END as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 fi fi + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -6527,12 +6538,12 @@ else fi if test -z "$ARFLAGS"; then - ARFLAGS='cru' + ARFLAGS='cr' fi fi else if test -z "$ARFLAGS"; then - ARFLAGS='cru' + ARFLAGS='cr' fi fi @@ -6898,6 +6909,8 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } $as_echo "#define _GNU_SOURCE 1" >>confdefs.h + $as_echo "#define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h + $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h @@ -7311,6 +7324,7 @@ fi # Code from module accept: # Code from module accept-tests: # Code from module acl: + # Code from module acl-permissions: # Code from module acl-tests: # Code from module alignof: # Code from module alignof-tests: @@ -7331,7 +7345,10 @@ fi # Code from module argv-iter-tests: # Code from module arpa_inet: # Code from module arpa_inet-tests: + # Code from module array-list: + # Code from module array-list-tests: # Code from module assert: + # Code from module assure: # Code from module at-internal: # Code from module autobuild: @@ -7490,6 +7507,8 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;} # Code from module fflush-tests: # Code from module fgetc-tests: + # Code from module file-has-acl: + # Code from module file-has-acl-tests: # Code from module file-set: # Code from module file-type: # Code from module fileblocks: @@ -7673,6 +7692,9 @@ $as_echo "$as_me: autobuild timestamp... $date" >&6;} # Code from module link-tests: # Code from module linkat: # Code from module linkat-tests: + # Code from module linked-list: + # Code from module linked-list-tests: + # Code from module list: # Code from module listen: # Code from module listen-tests: # Code from module localcharset: @@ -7798,7 +7820,8 @@ $as_echo "#define _REENTRANT 1" >>confdefs.h $as_echo "#define _THREAD_SAFE 1" >>confdefs.h # Code from module putenv: - # Code from module qacl: + # Code from module qcopy-acl: + # Code from module qset-acl: # Code from module quote: # Code from module quotearg: # Code from module quotearg-simple: @@ -8067,11 +8090,13 @@ $as_echo "#define _THREAD_SAFE 1" >>confdefs.h # Code from module xalloc-die: # Code from module xalloc-die-tests: # Code from module xalloc-oversized: + # Code from module xdectoint: # Code from module xfreopen: # Code from module xfts: # Code from module xgetcwd: # Code from module xgetgroups: # Code from module xgethostname: + # Code from module xlist: # Code from module xmemcoll: # Code from module xnanosleep: # Code from module xprintf: @@ -8103,6 +8128,33 @@ $as_echo "#define _THREAD_SAFE 1" >>confdefs.h LIBC_FATAL_STDERR_=1 export LIBC_FATAL_STDERR_ + + gl_need_lib_has_acl= + # Check whether --enable-acl was given. +if test "${enable_acl+set}" = set; then : + enableval=$enable_acl; +else + enable_acl=auto +fi + + + + + + for ac_func in $ac_func_list +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + 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 : @@ -8560,21 +8612,6 @@ fi - - for ac_func in $ac_func_list -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 $as_echo_n "checking for C/C++ restrict keyword... " >&6; } if ${ac_cv_c_restrict+:} false; then : @@ -8585,17 +8622,19 @@ else for ac_kw in __restrict __restrict__ _Restrict restrict; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -typedef int * int_ptr; - int foo (int_ptr $ac_kw ip) { - return ip[0]; - } +typedef int *int_ptr; + int foo (int_ptr $ac_kw ip) { return ip[0]; } + int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ + int bar (int ip[$ac_kw]) { return ip[0]; } + int main () { int s[1]; - int * $ac_kw t = s; - t[0] = 0; - return foo(t) + int *$ac_kw t = s; + t[0] = 0; + return foo (t) + bar (t); + ; return 0; } @@ -9022,6 +9061,7 @@ $as_echo "#define HAVE_C99_STRTOLD 1" >>confdefs.h GNULIB_PTSNAME=0; GNULIB_PTSNAME_R=0; GNULIB_PUTENV=0; + GNULIB_QSORT_R=0; GNULIB_RANDOM=0; GNULIB_RANDOM_R=0; GNULIB_REALLOC_POSIX=0; @@ -9073,6 +9113,7 @@ $as_echo "#define HAVE_C99_STRTOLD 1" >>confdefs.h REPLACE_PTSNAME=0; REPLACE_PTSNAME_R=0; REPLACE_PUTENV=0; + REPLACE_QSORT_R=0; REPLACE_RANDOM_R=0; REPLACE_REALLOC=0; REPLACE_REALPATH=0; @@ -9464,9 +9505,11 @@ $as_echo "#define FUNC_REALPATH_WORKS 1" >>confdefs.h REPLACE_PWRITE=0; REPLACE_READ=0; REPLACE_READLINK=0; + REPLACE_READLINKAT=0; REPLACE_RMDIR=0; REPLACE_SLEEP=0; REPLACE_SYMLINK=0; + REPLACE_SYMLINKAT=0; REPLACE_TTYNAME_R=0; REPLACE_UNLINK=0; REPLACE_UNLINKAT=0; @@ -10081,8 +10124,6 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5 $as_echo_n "checking if environ is properly declared... " >&6; } if ${gt_cv_var_environ_declaration+:} false; then : @@ -12010,14 +12051,15 @@ if ${gl_cv_func_lstat_dereferences_slashed_symlink+:} false; then : 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 : + if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; - esac + *-gnu*) + # Guess yes on glibc systems. + gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; + *) + # If we don't know, assume the worst. + gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; + esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12027,10 +12069,12 @@ 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; + if (symlink ("conftest.file", "conftest.sym") != 0) + return 1; + /* 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; @@ -12045,11 +12089,6 @@ 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. - gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" - fi rm -f conftest.sym conftest.file fi @@ -13286,6 +13325,19 @@ _ACEOF +ac_fn_c_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_includes_default" +if test "x$ac_cv_have_decl_getdtablesize" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETDTABLESIZE $ac_have_decl +_ACEOF + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for arithmetic hrtime_t" >&5 $as_echo_n "checking for arithmetic hrtime_t... " >&6; } if ${gl_cv_arithmetic_hrtime_t+:} false; then : @@ -15231,36 +15283,42 @@ else if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi - if test "$cross_compiling" = yes; then : - - case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; - *) am_cv_func_iconv_works="guessing yes" ;; - esac - + am_cv_func_iconv_works=no + for ac_iconv_const in '' 'const'; do + if test "$cross_compiling" = yes; then : + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -int main () + +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const +#endif + +int +main () { - int result = 0; +int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful returns. */ { iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); if (cd_utf8_to_88591 != (iconv_t)(-1)) { - static const char input[] = "\342\202\254"; /* EURO SIGN */ + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ char buf[10]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_utf8_to_88591, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) result |= 1; @@ -15273,14 +15331,14 @@ int main () iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); if (cd_ascii_to_88591 != (iconv_t)(-1)) { - static const char input[] = "\263"; + static ICONV_CONST char input[] = "\263"; char buf[10]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_ascii_to_88591, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) result |= 2; @@ -15292,14 +15350,14 @@ int main () iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); if (cd_88591_to_utf8 != (iconv_t)(-1)) { - static const char input[] = "\304"; + static ICONV_CONST char input[] = "\304"; static char buf[2] = { (char)0xDE, (char)0xAD }; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = 1; char *outptr = buf; size_t outbytesleft = 1; size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) result |= 4; @@ -15312,14 +15370,14 @@ int main () iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); if (cd_88591_to_utf8 != (iconv_t)(-1)) { - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; char buf[50]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if ((int)res > 0) result |= 8; @@ -15339,17 +15397,20 @@ int main () && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) result |= 16; return result; + + ; + return 0; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : am_cv_func_iconv_works=yes -else - am_cv_func_iconv_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 + test "$am_cv_func_iconv_works" = no || break + done LIBS="$am_save_LIBS" fi @@ -17328,6 +17389,7 @@ $as_echo "$ac_cv_gnu_library_2_1" >&6; } REPLACE_NULL=0; + HAVE_MAX_ALIGN_T=1; HAVE_WCHAR_T=1; @@ -17367,6 +17429,15 @@ $as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h STDDEF_H= + ac_fn_c_check_type "$LINENO" "max_align_t" "ac_cv_type_max_align_t" "#include + +" +if test "x$ac_cv_type_max_align_t" = xyes; then : + +else + HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h +fi + if test $gt_cv_c_wchar_t = no; then HAVE_WCHAR_T=0 STDDEF_H=stddef.h @@ -17580,26 +17651,42 @@ fi # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist # in libc. IRIX 6.5 has the first one in both libc and libpthread, but # the second one only in libpthread, and lock.c needs it. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # + # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04 + # needs -pthread for some reason. See: + # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html + save_LIBS=$LIBS + for gl_pthread in '' '-pthread'; do + LIBS="$LIBS $gl_pthread" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include + pthread_mutex_t m; + pthread_mutexattr_t ma; + int main () { -pthread_mutex_lock((pthread_mutex_t*)0); - pthread_mutexattr_init((pthread_mutexattr_t*)0); +pthread_mutex_lock (&m); + pthread_mutexattr_init (&ma); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : gl_have_pthread=yes + LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread + LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + LIBS=$save_LIBS + test -n "$gl_have_pthread" && break + done + # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) - if test -n "$gl_have_pthread"; then + if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then # The program links fine without libpthread. But it may actually # need to link with libpthread in order to create multiple threads. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 @@ -17653,7 +17740,7 @@ $as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h fi - else + elif test -z "$gl_have_pthread"; then # Some library is needed. Try libpthread and libc_r. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 $as_echo_n "checking for pthread_kill in -lpthread... " >&6; } @@ -19817,8 +19904,6 @@ _ACEOF - - GNULIB_MKTIME=0; GNULIB_NANOSLEEP=0; GNULIB_STRPTIME=0; @@ -21859,6 +21944,7 @@ $as_echo "$gl_cv_sys_struct_timespec_in_time_h" >&6; } TIME_H_DEFINES_STRUCT_TIMESPEC=0 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0 PTHREAD_H_DEFINES_STRUCT_TIMESPEC=0 + UNISTD_H_DEFINES_STRUCT_TIMESPEC=0 if test $gl_cv_sys_struct_timespec_in_time_h = yes; then TIME_H_DEFINES_STRUCT_TIMESPEC=1 else @@ -21919,6 +22005,36 @@ fi $as_echo "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; } if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in " >&5 +$as_echo_n "checking for struct timespec in ... " >&6; } +if ${gl_cv_sys_struct_timespec_in_unistd_h+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +int +main () +{ +static struct timespec x; x.tv_sec = x.tv_nsec; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_sys_struct_timespec_in_unistd_h=yes +else + gl_cv_sys_struct_timespec_in_unistd_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_unistd_h" >&5 +$as_echo "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; } + if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then + UNISTD_H_DEFINES_STRUCT_TIMESPEC=1 + fi fi fi fi @@ -21937,6 +22053,7 @@ $as_echo "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; } + if test $gl_cv_have_include_next = yes; then gl_cv_next_time_h='<'time.h'>' else @@ -22974,7 +23091,7 @@ int main () # ifdef WORDS_BIGENDIAN # define LDBL80_WORDS(exponent,manthi,mantlo) \ { ((unsigned int) (exponent) << 16) | ((unsigned int) (manthi) >> 16), \ - ((unsigned int) (manthi) << 16) | (unsigned int) (mantlo) >> 16), \ + ((unsigned int) (manthi) << 16) | ((unsigned int) (mantlo) >> 16), \ (unsigned int) (mantlo) << 16 \ } # else @@ -23011,66 +23128,51 @@ int main () { /* Pseudo-NaN. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0xFFFF, 0x40000001, 0x00000000) }; - if (sprintf (buf, "%Lf", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lf", x.value) <= 0) result |= 4; - if (sprintf (buf, "%Le", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Le", x.value) <= 0) result |= 4; - if (sprintf (buf, "%Lg", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lg", x.value) <= 0) result |= 4; } { /* Pseudo-Infinity. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0xFFFF, 0x00000000, 0x00000000) }; - if (sprintf (buf, "%Lf", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lf", x.value) <= 0) result |= 8; - if (sprintf (buf, "%Le", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Le", x.value) <= 0) result |= 8; - if (sprintf (buf, "%Lg", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lg", x.value) <= 0) result |= 8; } { /* Pseudo-Zero. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0x4004, 0x00000000, 0x00000000) }; - if (sprintf (buf, "%Lf", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lf", x.value) <= 0) result |= 16; - if (sprintf (buf, "%Le", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Le", x.value) <= 0) result |= 16; - if (sprintf (buf, "%Lg", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lg", x.value) <= 0) result |= 16; } { /* Unnormalized number. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0x4000, 0x63333333, 0x00000000) }; - if (sprintf (buf, "%Lf", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lf", x.value) <= 0) result |= 32; - if (sprintf (buf, "%Le", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Le", x.value) <= 0) result |= 32; - if (sprintf (buf, "%Lg", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lg", x.value) <= 0) result |= 32; } { /* Pseudo-Denormal. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0x0000, 0x83333333, 0x00000000) }; - if (sprintf (buf, "%Lf", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lf", x.value) <= 0) result |= 64; - if (sprintf (buf, "%Le", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Le", x.value) <= 0) result |= 64; - if (sprintf (buf, "%Lg", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lg", x.value) <= 0) result |= 64; } #endif @@ -24053,8 +24155,9 @@ if ${gl_cv_func_ungetc_works+:} false; then : else if test "$cross_compiling" = yes; then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_ungetc_works="guessing yes" ;; + # Guess yes on glibc and bionic systems. + *-gnu*|*-android*) + gl_cv_func_ungetc_works="guessing yes" ;; # If we don't know, assume the worst. *) gl_cv_func_ungetc_works="guessing no" ;; esac @@ -24291,6 +24394,441 @@ fi gl_source_base='lib' + + LIB_ACL= + use_acl=0 + if test "$enable_acl" != no; then + for ac_header in sys/acl.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/acl.h" "ac_cv_header_sys_acl_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_acl_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_ACL_H 1 +_ACEOF + +fi + +done + + if test $ac_cv_header_sys_acl_h = yes; then + ac_save_LIBS=$LIBS + + if test $use_acl = 0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acl_get_file" >&5 +$as_echo_n "checking for library containing acl_get_file... " >&6; } +if ${ac_cv_search_acl_get_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char acl_get_file (); +int +main () +{ +return acl_get_file (); + ; + return 0; +} +_ACEOF +for ac_lib in '' acl pacl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_acl_get_file=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_acl_get_file+:} false; then : + break +fi +done +if ${ac_cv_search_acl_get_file+:} false; then : + +else + ac_cv_search_acl_get_file=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acl_get_file" >&5 +$as_echo "$ac_cv_search_acl_get_file" >&6; } +ac_res=$ac_cv_search_acl_get_file +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + if test "$ac_cv_search_acl_get_file" != "none required"; then + LIB_ACL=$ac_cv_search_acl_get_file + fi + for ac_func in acl_get_file acl_get_fd acl_set_file acl_set_fd \ + acl_free acl_from_mode acl_from_text \ + acl_delete_def_file acl_extended_file \ + acl_delete_fd_np acl_delete_file_np \ + acl_copy_ext_native acl_create_entry_np \ + acl_to_short_text acl_free_text +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + # If the acl_get_file bug is detected, don't enable the ACL support. + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working acl_get_file" >&5 +$as_echo_n "checking for working acl_get_file... " >&6; } +if ${gl_cv_func_working_acl_get_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + gl_cv_func_working_acl_get_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + #include + +int +main () +{ +if (!acl_get_file (".", ACL_TYPE_ACCESS) && errno == ENOENT) + return 1; + return 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + if test $cross_compiling = yes; then + gl_cv_func_working_acl_get_file="guessing yes" + elif ./conftest$ac_exeext; then + gl_cv_func_working_acl_get_file=yes + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_acl_get_file" >&5 +$as_echo "$gl_cv_func_working_acl_get_file" >&6; } + if test "$gl_cv_func_working_acl_get_file" != no; then : + use_acl=1 +fi + + if test $use_acl = 1; then + for ac_header in acl/libacl.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "acl/libacl.h" "ac_cv_header_acl_libacl_h" "$ac_includes_default" +if test "x$ac_cv_header_acl_libacl_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ACL_LIBACL_H 1 +_ACEOF + +fi + +done + + + + + + + + + + for ac_func in acl_entries +do : + ac_fn_c_check_func "$LINENO" "acl_entries" "ac_cv_func_acl_entries" +if test "x$ac_cv_func_acl_entries" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ACL_ENTRIES 1 +_ACEOF + +else + + gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext" + +fi +done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL_FIRST_ENTRY" >&5 +$as_echo_n "checking for ACL_FIRST_ENTRY... " >&6; } +if ${gl_cv_acl_ACL_FIRST_ENTRY+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +int type = ACL_FIRST_ENTRY; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_acl_ACL_FIRST_ENTRY=yes +else + gl_cv_acl_ACL_FIRST_ENTRY=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_acl_ACL_FIRST_ENTRY" >&5 +$as_echo "$gl_cv_acl_ACL_FIRST_ENTRY" >&6; } + if test $gl_cv_acl_ACL_FIRST_ENTRY = yes; then + +$as_echo "#define HAVE_ACL_FIRST_ENTRY 1" >>confdefs.h + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL_TYPE_EXTENDED" >&5 +$as_echo_n "checking for ACL_TYPE_EXTENDED... " >&6; } +if ${gl_cv_acl_ACL_TYPE_EXTENDED+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +int type = ACL_TYPE_EXTENDED; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_acl_ACL_TYPE_EXTENDED=yes +else + gl_cv_acl_ACL_TYPE_EXTENDED=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_acl_ACL_TYPE_EXTENDED" >&5 +$as_echo "$gl_cv_acl_ACL_TYPE_EXTENDED" >&6; } + if test $gl_cv_acl_ACL_TYPE_EXTENDED = yes; then + +$as_echo "#define HAVE_ACL_TYPE_EXTENDED 1" >>confdefs.h + + fi + else + LIB_ACL= + fi + +fi + + fi + + if test $use_acl = 0; then + for ac_func in facl +do : + ac_fn_c_check_func "$LINENO" "facl" "ac_cv_func_facl" +if test "x$ac_cv_func_facl" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_FACL 1 +_ACEOF + +fi +done + + if test $ac_cv_func_facl = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acl_trivial" >&5 +$as_echo_n "checking for library containing acl_trivial... " >&6; } +if ${ac_cv_search_acl_trivial+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char acl_trivial (); +int +main () +{ +return acl_trivial (); + ; + return 0; +} +_ACEOF +for ac_lib in '' sec; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_acl_trivial=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_acl_trivial+:} false; then : + break +fi +done +if ${ac_cv_search_acl_trivial+:} false; then : + +else + ac_cv_search_acl_trivial=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acl_trivial" >&5 +$as_echo "$ac_cv_search_acl_trivial" >&6; } +ac_res=$ac_cv_search_acl_trivial +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + if test "$ac_cv_search_acl_trivial" != "none required"; then + LIB_ACL=$ac_cv_search_acl_trivial + fi + +fi + + for ac_func in acl_trivial +do : + ac_fn_c_check_func "$LINENO" "acl_trivial" "ac_cv_func_acl_trivial" +if test "x$ac_cv_func_acl_trivial" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ACL_TRIVIAL 1 +_ACEOF + +fi +done + + use_acl=1 + fi + fi + + if test $use_acl = 0; then + for ac_func in getacl +do : + ac_fn_c_check_func "$LINENO" "getacl" "ac_cv_func_getacl" +if test "x$ac_cv_func_getacl" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETACL 1 +_ACEOF + +fi +done + + if test $ac_cv_func_getacl = yes; then + use_acl=1 + fi + for ac_header in aclv.h +do : + ac_fn_c_check_header_compile "$LINENO" "aclv.h" "ac_cv_header_aclv_h" "#include +" +if test "x$ac_cv_header_aclv_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ACLV_H 1 +_ACEOF + +fi + +done + + fi + + if test $use_acl = 0; then + for ac_func in aclx_get +do : + ac_fn_c_check_func "$LINENO" "aclx_get" "ac_cv_func_aclx_get" +if test "x$ac_cv_func_aclx_get" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ACLX_GET 1 +_ACEOF + +fi +done + + if test $ac_cv_func_aclx_get = yes; then + use_acl=1 + fi + fi + + if test $use_acl = 0 || test "$ac_cv_func_aclx_get" = yes; then + for ac_func in statacl +do : + ac_fn_c_check_func "$LINENO" "statacl" "ac_cv_func_statacl" +if test "x$ac_cv_func_statacl" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STATACL 1 +_ACEOF + +fi +done + + if test $ac_cv_func_statacl = yes; then + use_acl=1 + fi + fi + + if test $use_acl = 0; then + for ac_func in aclsort +do : + ac_fn_c_check_func "$LINENO" "aclsort" "ac_cv_func_aclsort" +if test "x$ac_cv_func_aclsort" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ACLSORT 1 +_ACEOF + +fi +done + + if test $ac_cv_func_aclsort = yes; then + use_acl=1 + fi + fi + + LIBS=$ac_save_LIBS + fi + + if test "$enable_acl$use_acl" = yes0; then + as_fn_error $? "ACLs enabled but support not detected" "$LINENO" 5 + elif test "$enable_acl$use_acl" = auto0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libacl development library was not found or not usable." >&5 +$as_echo "$as_me: WARNING: libacl development library was not found or not usable." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GNU coreutils will be built without ACL support." >&5 +$as_echo "$as_me: WARNING: GNU coreutils will be built without ACL support." >&2;} + fi + fi + test $gl_need_lib_has_acl && LIB_HAS_ACL=$LIB_ACL + + +cat >>confdefs.h <<_ACEOF +#define USE_ACL $use_acl +_ACEOF + + USE_ACL=$use_acl + + + + if test $ac_cv_func_alloca_works = no; then : fi @@ -26124,7 +26662,6 @@ $as_echo "#define GNULIB_TEST_DUP 1" >>confdefs.h - $as_echo "#define HAVE_DUP2 1" >>confdefs.h @@ -26140,56 +26677,66 @@ else gl_cv_func_dup2_works="guessing no" ;; cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0 gl_cv_func_dup2_works="guessing no" ;; - linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a - # closed fd may yield -EBADF instead of -1 / errno=EBADF. - gl_cv_func_dup2_works="guessing no" ;; aix* | freebsd*) # on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE, # not EBADF. gl_cv_func_dup2_works="guessing no" ;; haiku*) # on Haiku alpha 2, dup2(1, 1) resets FD_CLOEXEC. gl_cv_func_dup2_works="guessing no" ;; + *-android*) # implemented using dup3(), which fails if oldfd == newfd + gl_cv_func_dup2_works="guessing no" ;; *) gl_cv_func_dup2_works="guessing yes" ;; esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include -#include -#include + #include + #include + #include + #include + #include + #ifndef RLIM_SAVED_CUR + # define RLIM_SAVED_CUR RLIM_INFINITY + #endif + #ifndef RLIM_SAVED_MAX + # define RLIM_SAVED_MAX RLIM_INFINITY + #endif + int main () { int result = 0; -#ifdef HAVE_GETDTABLESIZE - int bad_fd = getdtablesize (); -#else - int bad_fd = 1000000; -#endif -#ifdef FD_CLOEXEC - if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1) - result |= 1; -#endif - if (dup2 (1, 1) == 0) - result |= 2; -#ifdef FD_CLOEXEC - if (fcntl (1, F_GETFD) != FD_CLOEXEC) - result |= 4; -#endif - close (0); - if (dup2 (0, 0) != -1) - result |= 8; - /* Many gnulib modules require POSIX conformance of EBADF. */ - if (dup2 (2, bad_fd) == -1 && errno != EBADF) - result |= 16; - /* Flush out some cygwin core dumps. */ - if (dup2 (2, -1) != -1 || errno != EBADF) - result |= 32; - dup2 (2, 255); - dup2 (2, 256); - return result; - + int bad_fd = INT_MAX; + struct rlimit rlim; + if (getrlimit (RLIMIT_NOFILE, &rlim) == 0 + && 0 <= rlim.rlim_cur && rlim.rlim_cur <= INT_MAX + && rlim.rlim_cur != RLIM_INFINITY + && rlim.rlim_cur != RLIM_SAVED_MAX + && rlim.rlim_cur != RLIM_SAVED_CUR) + bad_fd = rlim.rlim_cur; + #ifdef FD_CLOEXEC + if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1) + result |= 1; + #endif + if (dup2 (1, 1) != 1) + result |= 2; + #ifdef FD_CLOEXEC + if (fcntl (1, F_GETFD) != FD_CLOEXEC) + result |= 4; + #endif + close (0); + if (dup2 (0, 0) != -1) + result |= 8; + /* Many gnulib modules require POSIX conformance of EBADF. */ + if (dup2 (2, bad_fd) == -1 && errno != EBADF) + result |= 16; + /* Flush out some cygwin core dumps. */ + if (dup2 (2, -1) != -1 || errno != EBADF) + result |= 32; + dup2 (2, 255); + dup2 (2, 256); + return result; ; return 0; } @@ -27082,36 +27629,43 @@ if ${gl_cv_func_fcntl_f_dupfd_works+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : - # Guess that it works on glibc systems - case $host_os in #(( - *-gnu*) gl_cv_func_fcntl_f_dupfd_works="guessing yes";; - *) gl_cv_func_fcntl_f_dupfd_works="guessing no";; + case $host_os in + aix* | cygwin* | haiku*) + gl_cv_func_fcntl_f_dupfd_works="guessing no" ;; + *) gl_cv_func_fcntl_f_dupfd_works="guessing yes" ;; esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -#ifdef HAVE_GETDTABLESIZE -# include -#endif -#include #include + #include + #include + #include + #include + #ifndef RLIM_SAVED_CUR + # define RLIM_SAVED_CUR RLIM_INFINITY + #endif + #ifndef RLIM_SAVED_MAX + # define RLIM_SAVED_MAX RLIM_INFINITY + #endif int main () { int result = 0; -#ifdef HAVE_GETDTABLESIZE - int bad_fd = getdtablesize (); -#else - int bad_fd = 1000000; -#endif - if (fcntl (0, F_DUPFD, -1) != -1) result |= 1; - if (errno != EINVAL) result |= 2; - if (fcntl (0, F_DUPFD, bad_fd) != -1) result |= 4; - if (errno != EINVAL) result |= 8; - return result; - + int bad_fd = INT_MAX; + struct rlimit rlim; + if (getrlimit (RLIMIT_NOFILE, &rlim) == 0 + && 0 <= rlim.rlim_cur && rlim.rlim_cur <= INT_MAX + && rlim.rlim_cur != RLIM_INFINITY + && rlim.rlim_cur != RLIM_SAVED_MAX + && rlim.rlim_cur != RLIM_SAVED_CUR) + bad_fd = rlim.rlim_cur; + if (fcntl (0, F_DUPFD, -1) != -1) result |= 1; + if (errno != EINVAL) result |= 2; + if (fcntl (0, F_DUPFD, bad_fd) != -1) result |= 4; + if (errno != EINVAL) result |= 8; + return result; ; return 0; } @@ -27809,6 +28363,52 @@ $as_echo "#define GNULIB_TEST_FFLUSH 1" >>confdefs.h + if test "$enable_acl" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getxattr with XATTR_NAME_POSIX_ACL macros" >&5 +$as_echo_n "checking for getxattr with XATTR_NAME_POSIX_ACL macros... " >&6; } +if ${gl_cv_getxattr_with_posix_acls+:} false; then : + $as_echo_n "(cached) " >&6 +else + gl_cv_getxattr_with_posix_acls=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + #include + +int +main () +{ +ssize_t a = getxattr (".", XATTR_NAME_POSIX_ACL_ACCESS, 0, 0); + ssize_t b = getxattr (".", XATTR_NAME_POSIX_ACL_DEFAULT, 0, 0); + return a < 0 || b < 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gl_cv_getxattr_with_posix_acls=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_getxattr_with_posix_acls" >&5 +$as_echo "$gl_cv_getxattr_with_posix_acls" >&6; } + fi + if test "$gl_cv_getxattr_with_posix_acls" = yes; then + LIB_HAS_ACL= + +$as_echo "#define GETXATTR_WITH_POSIX_ACLS 1" >>confdefs.h + + else + gl_need_lib_has_acl=1 + LIB_HAS_ACL=$LIB_ACL + fi + + + + ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default" if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then : @@ -28716,7 +29316,7 @@ $as_echo "#define GNULIB_TEST_FPURGE 1" >>confdefs.h case "$host_os" in - mingw* | pw*) + mingw* | pw* | os2*) REPLACE_FREOPEN=1 ;; esac @@ -31080,6 +31680,8 @@ main () if (PATH_MAX <= cwd_len && cwd_len < PATH_MAX + DIR_NAME_SIZE) { + struct stat sb; + c = getcwd (buf, PATH_MAX); if (!c && errno == ENOENT) { @@ -31096,6 +31698,16 @@ main () fail = 21; break; } + + /* Our replacement needs to be able to stat() long ../../paths, + so generate a path larger than PATH_MAX to check, + avoiding the replacement if we can't stat(). */ + c = getcwd (buf, cwd_len + 1); + if (c && !AT_FDCWD && stat (c, &sb) != 0 && is_ENAMETOOLONG (errno)) + { + fail = 32; + break; + } } if (dotdot_max <= cwd_len - initial_cwd_len) @@ -31155,6 +31767,7 @@ else case $? in 10|11|12) gl_cv_func_getcwd_path_max='no, but it is partly working';; 31) gl_cv_func_getcwd_path_max='no, it has the AIX bug';; + 32) gl_cv_func_getcwd_path_max='yes, but with shorter paths';; *) gl_cv_func_getcwd_path_max=no;; esac fi @@ -31353,12 +31966,17 @@ $as_echo "#define HAVE_MINIMALLY_WORKING_GETCWD 1" >>confdefs.h $as_echo "#define HAVE_PARTLY_WORKING_GETCWD 1" >>confdefs.h + ;; + "yes, but with shorter paths") + +$as_echo "#define HAVE_GETCWD_SHORTER 1" >>confdefs.h + ;; esac if { case "$gl_cv_func_getcwd_null" in *yes) false;; *) true;; esac; } \ || test $gl_cv_func_getcwd_posix_signature != yes \ - || test "$gl_cv_func_getcwd_path_max" != yes \ + || { case "$gl_cv_func_getcwd_path_max" in *yes*) false;; *) true;; esac; } \ || test $gl_abort_bug = yes; then REPLACE_GETCWD=1 fi @@ -31592,7 +32210,9 @@ $as_echo "#define GNULIB_TEST_GETDELIM 1" >>confdefs.h - if test $ac_cv_func_getdtablesize = yes; then + + if test $ac_cv_func_getdtablesize = yes && + test $ac_cv_have_decl_getdtablesize = yes; then # Cygwin 1.7.25 automatically increases the RLIMIT_NOFILE soft limit # up to an unchangeable hard limit; all other platforms correctly # require setrlimit before getdtablesize() can report a larger value. @@ -34908,17 +35528,7 @@ if ${gl_cv_func_isnanl_works+:} false; then : else if test "$cross_compiling" = yes; then : - case "$host_cpu" in - # Guess no on ia64, x86_64, i386. - ia64 | x86_64 | i*86) gl_cv_func_isnanl_works="guessing no";; - *) - case "$host_os" in - netbsd*) gl_cv_func_isnanl_works="guessing no";; - *) gl_cv_func_isnanl_works="guessing yes";; - esac - ;; - esac - + gl_cv_func_isnanl_works="guessing yes" else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -34977,7 +35587,7 @@ int main () # ifdef WORDS_BIGENDIAN # define LDBL80_WORDS(exponent,manthi,mantlo) \ { ((unsigned int) (exponent) << 16) | ((unsigned int) (manthi) >> 16), \ - ((unsigned int) (manthi) << 16) | (unsigned int) (mantlo) >> 16), \ + ((unsigned int) (manthi) << 16) | ((unsigned int) (mantlo) >> 16), \ (unsigned int) (mantlo) << 16 \ } # else @@ -34997,41 +35607,35 @@ int main () if (!isnanl (x.value)) result |= 2; } - /* The isnanl function should recognize Pseudo-NaNs, Pseudo-Infinities, - Pseudo-Zeroes, Unnormalized Numbers, and Pseudo-Denormals, as defined in - Intel IA-64 Architecture Software Developer's Manual, Volume 1: - Application Architecture. - Table 5-2 "Floating-Point Register Encodings" - Figure 5-6 "Memory to Floating-Point Register Data Translation" - */ + /* isnanl should return something even for noncanonical values. */ { /* Pseudo-NaN. */ static memory_long_double x = { LDBL80_WORDS (0xFFFF, 0x40000001, 0x00000000) }; - if (!isnanl (x.value)) + if (isnanl (x.value) && !isnanl (x.value)) result |= 4; } { /* Pseudo-Infinity. */ static memory_long_double x = { LDBL80_WORDS (0xFFFF, 0x00000000, 0x00000000) }; - if (!isnanl (x.value)) + if (isnanl (x.value) && !isnanl (x.value)) result |= 8; } { /* Pseudo-Zero. */ static memory_long_double x = { LDBL80_WORDS (0x4004, 0x00000000, 0x00000000) }; - if (!isnanl (x.value)) + if (isnanl (x.value) && !isnanl (x.value)) result |= 16; } { /* Unnormalized number. */ static memory_long_double x = { LDBL80_WORDS (0x4000, 0x63333333, 0x00000000) }; - if (!isnanl (x.value)) + if (isnanl (x.value) && !isnanl (x.value)) result |= 32; } { /* Pseudo-Denormal. */ static memory_long_double x = { LDBL80_WORDS (0x0000, 0x83333333, 0x00000000) }; - if (!isnanl (x.value)) + if (isnanl (x.value) && !isnanl (x.value)) result |= 64; } #endif @@ -35857,49 +36461,60 @@ _ACEOF if test $ac_cv_func_linkat = no; then HAVE_LINKAT=0 else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether linkat(,AT_SYMLINK_FOLLOW) works" >&5 -$as_echo_n "checking whether linkat(,AT_SYMLINK_FOLLOW) works... " >&6; } -if ${gl_cv_func_linkat_follow+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether linkat() can link symlinks" >&5 +$as_echo_n "checking whether linkat() can link symlinks... " >&6; } +if ${gl_cv_func_linkat_nofollow+:} false; then : $as_echo_n "(cached) " >&6 else - rm -rf conftest.f1 conftest.f2 - touch conftest.f1 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + rm -rf conftest.l1 conftest.l2 + ln -s target conftest.l1 + if test "$cross_compiling" = yes; then : + case "$host_os" in + darwin*) gl_cv_func_linkat_nofollow="guessing no" ;; + *) gl_cv_func_linkat_nofollow="guessing yes" ;; + esac +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include -#include -#ifdef __linux__ -/* Linux added linkat in 2.6.16, but did not add AT_SYMLINK_FOLLOW - until 2.6.18. Always replace linkat to support older kernels. */ -choke me -#endif + #include int main () { -return linkat (AT_FDCWD, "conftest.f1", AT_FDCWD, "conftest.f2", - AT_SYMLINK_FOLLOW); +return linkat (AT_FDCWD, "conftest.l1", AT_FDCWD, + "conftest.l2", 0); + ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_func_linkat_follow=yes +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_linkat_nofollow=yes else - gl_cv_func_linkat_follow="need runtime check" + gl_cv_func_linkat_nofollow=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - rm -rf conftest.f1 conftest.f2 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_linkat_follow" >&5 -$as_echo "$gl_cv_func_linkat_follow" >&6; } + + + rm -rf conftest.l1 conftest.l2 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_linkat_nofollow" >&5 +$as_echo "$gl_cv_func_linkat_nofollow" >&6; } + + case $gl_cv_func_linkat_nofollow in + *no) LINKAT_SYMLINK_NOTSUP=1 ;; + *yes) LINKAT_SYMLINK_NOTSUP=0 ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether linkat handles trailing slash correctly" >&5 $as_echo_n "checking whether linkat handles trailing slash correctly... " >&6; } if ${gl_cv_func_linkat_slash+:} false; then : $as_echo_n "(cached) " >&6 else - rm -rf conftest.a conftest.b conftest.c conftest.d + rm -rf conftest.a conftest.b conftest.c conftest.d conftest.e conftest.s if test "$cross_compiling" = yes; then : # Guess yes on glibc systems, no otherwise. case "$host_os" in @@ -35941,6 +36556,16 @@ int result; if (linkat (AT_FDCWD, "conftest.a", AT_FDCWD, "conftest.d/", AT_SYMLINK_FOLLOW) == 0) result |= 8; + + /* On OS X 10.10 a trailing "/" will cause the second path to be + dereferenced, and thus will succeed on a dangling symlink. */ + if (symlink ("conftest.e", "conftest.s") == 0) + { + if (linkat (AT_FDCWD, "conftest.a", AT_FDCWD, "conftest.s/", + AT_SYMLINK_FOLLOW) == 0) + result |= 16; + } + return result; ; @@ -35956,7 +36581,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - rm -rf conftest.a conftest.b conftest.c conftest.d + rm -rf conftest.a conftest.b conftest.c conftest.d conftest.e conftest.s fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_linkat_slash" >&5 $as_echo "$gl_cv_func_linkat_slash" >&6; } @@ -35964,7 +36589,13 @@ $as_echo "$gl_cv_func_linkat_slash" >&6; } *yes) gl_linkat_slash_bug=0 ;; *) gl_linkat_slash_bug=1 ;; esac - if test "$gl_cv_func_linkat_follow" != yes \ + + case "$gl_cv_func_linkat_nofollow" in + *yes) linkat_nofollow=yes ;; + *) linkat_nofollow=no ;; + esac + + if test "$linkat_nofollow" != yes \ || test $gl_linkat_slash_bug = 1; then REPLACE_LINKAT=1 @@ -35972,6 +36603,11 @@ cat >>confdefs.h <<_ACEOF #define LINKAT_TRAILING_SLASH_BUG $gl_linkat_slash_bug _ACEOF + +cat >>confdefs.h <<_ACEOF +#define LINKAT_SYMLINK_NOTSUP $LINKAT_SYMLINK_NOTSUP +_ACEOF + fi fi @@ -35986,8 +36622,6 @@ _ACEOF gl_LIBOBJS="$gl_LIBOBJS linkat.$ac_objext" - fi - if test $HAVE_LINKAT = 0; then @@ -39343,7 +39977,7 @@ if test $ac_cv_func_getmntent = yes; then # Determine whether it's the one-argument variant or the two-argument one. if test -z "$ac_list_mounted_fs"; then - # 4.3BSD, SunOS, HP-UX, Dynix, Irix + # GNU/Linux, 4.3BSD, SunOS, HP-UX, Dynix, Irix { $as_echo "$as_me:${as_lineno-$LINENO}: checking for one-argument getmntent function" >&5 $as_echo_n "checking for one-argument getmntent function... " >&6; } if ${fu_cv_sys_mounted_getmntent1+:} false; then : @@ -40485,23 +41119,26 @@ $as_echo "#define HAVE_SCHED_GETAFFINITY_LIKE_GLIBC 1" >>confdefs.h -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for obstacks" >&5 -$as_echo_n "checking for obstacks... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for obstacks that work with any size object" >&5 +$as_echo_n "checking for obstacks that work with any size object... " >&6; } if ${ac_cv_func_obstack+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default - #include "obstack.h" +#include "obstack.h" + void *obstack_chunk_alloc (size_t n) { return 0; } + void obstack_chunk_free (void *p) { } + /* Check that an internal function returns size_t, not int. */ + size_t _obstack_memory_used (struct obstack *); + int main () { struct obstack mem; - #define obstack_chunk_alloc malloc - #define obstack_chunk_free free - obstack_init (&mem); - obstack_free (&mem, 0); + obstack_init (&mem); + obstack_free (&mem, 0); + ; return 0; } @@ -40516,11 +41153,11 @@ rm -f core conftest.err conftest.$ac_objext \ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_obstack" >&5 $as_echo "$ac_cv_func_obstack" >&6; } -if test $ac_cv_func_obstack = yes; then + if test "$ac_cv_func_obstack" = yes; then $as_echo "#define HAVE_OBSTACK 1" >>confdefs.h -else + else @@ -40531,7 +41168,7 @@ else gl_LIBOBJS="$gl_LIBOBJS obstack.$ac_objext" -fi + fi @@ -41646,7 +42283,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - #ifdef strtok_r + #if defined strtok_r || defined localtime_r #error break me #endif @@ -41744,7 +42381,7 @@ if ${gl_cv_lib_pthread+:} false; then : else gl_saved_libs=$LIBS gl_cv_lib_pthread= - for gl_lib_prefix in '' '-lpthread'; do + for gl_lib_prefix in '' '-pthread' '-lpthread'; do LIBS="$gl_lib_prefix $gl_saved_libs" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -41894,446 +42531,6 @@ $as_echo "#define GNULIB_TEST_PUTENV 1" >>confdefs.h - # Check whether --enable-acl was given. -if test "${enable_acl+set}" = set; then : - enableval=$enable_acl; -else - enable_acl=auto -fi - - - - LIB_ACL= - use_acl=0 - if test "x$enable_acl" != "xno"; then - for ac_header in sys/acl.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/acl.h" "ac_cv_header_sys_acl_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_acl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_ACL_H 1 -_ACEOF - -fi - -done - - if test $ac_cv_header_sys_acl_h = yes; then - ac_save_LIBS=$LIBS - - if test $use_acl = 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acl_get_file" >&5 -$as_echo_n "checking for library containing acl_get_file... " >&6; } -if ${ac_cv_search_acl_get_file+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char acl_get_file (); -int -main () -{ -return acl_get_file (); - ; - return 0; -} -_ACEOF -for ac_lib in '' acl pacl; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_acl_get_file=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_acl_get_file+:} false; then : - break -fi -done -if ${ac_cv_search_acl_get_file+:} false; then : - -else - ac_cv_search_acl_get_file=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acl_get_file" >&5 -$as_echo "$ac_cv_search_acl_get_file" >&6; } -ac_res=$ac_cv_search_acl_get_file -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - if test "$ac_cv_search_acl_get_file" != "none required"; then - LIB_ACL=$ac_cv_search_acl_get_file - fi - for ac_func in acl_get_file acl_get_fd acl_set_file acl_set_fd \ - acl_free acl_from_mode acl_from_text \ - acl_delete_def_file acl_extended_file \ - acl_delete_fd_np acl_delete_file_np \ - acl_copy_ext_native acl_create_entry_np \ - acl_to_short_text acl_free_text -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - # If the acl_get_file bug is detected, don't enable the ACL support. - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working acl_get_file" >&5 -$as_echo_n "checking for working acl_get_file... " >&6; } -if ${gl_cv_func_working_acl_get_file+:} false; then : - $as_echo_n "(cached) " >&6 -else - gl_cv_func_working_acl_get_file=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include - #include - -int -main () -{ -if (!acl_get_file (".", ACL_TYPE_ACCESS) && errno == ENOENT) - return 1; - return 0; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - if test $cross_compiling = yes; then - gl_cv_func_working_acl_get_file="guessing yes" - elif ./conftest$ac_exeext; then - gl_cv_func_working_acl_get_file=yes - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_acl_get_file" >&5 -$as_echo "$gl_cv_func_working_acl_get_file" >&6; } - if test "$gl_cv_func_working_acl_get_file" != no; then : - use_acl=1 -fi - - if test $use_acl = 1; then - for ac_header in acl/libacl.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "acl/libacl.h" "ac_cv_header_acl_libacl_h" "$ac_includes_default" -if test "x$ac_cv_header_acl_libacl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ACL_LIBACL_H 1 -_ACEOF - -fi - -done - - - - - - - - - - for ac_func in acl_entries -do : - ac_fn_c_check_func "$LINENO" "acl_entries" "ac_cv_func_acl_entries" -if test "x$ac_cv_func_acl_entries" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ACL_ENTRIES 1 -_ACEOF - -else - - gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext" - -fi -done - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL_FIRST_ENTRY" >&5 -$as_echo_n "checking for ACL_FIRST_ENTRY... " >&6; } -if ${gl_cv_acl_ACL_FIRST_ENTRY+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -int type = ACL_FIRST_ENTRY; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_acl_ACL_FIRST_ENTRY=yes -else - gl_cv_acl_ACL_FIRST_ENTRY=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_acl_ACL_FIRST_ENTRY" >&5 -$as_echo "$gl_cv_acl_ACL_FIRST_ENTRY" >&6; } - if test $gl_cv_acl_ACL_FIRST_ENTRY = yes; then - -$as_echo "#define HAVE_ACL_FIRST_ENTRY 1" >>confdefs.h - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL_TYPE_EXTENDED" >&5 -$as_echo_n "checking for ACL_TYPE_EXTENDED... " >&6; } -if ${gl_cv_acl_ACL_TYPE_EXTENDED+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -int type = ACL_TYPE_EXTENDED; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_acl_ACL_TYPE_EXTENDED=yes -else - gl_cv_acl_ACL_TYPE_EXTENDED=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_acl_ACL_TYPE_EXTENDED" >&5 -$as_echo "$gl_cv_acl_ACL_TYPE_EXTENDED" >&6; } - if test $gl_cv_acl_ACL_TYPE_EXTENDED = yes; then - -$as_echo "#define HAVE_ACL_TYPE_EXTENDED 1" >>confdefs.h - - fi - else - LIB_ACL= - fi - -fi - - fi - - if test $use_acl = 0; then - for ac_func in facl -do : - ac_fn_c_check_func "$LINENO" "facl" "ac_cv_func_facl" -if test "x$ac_cv_func_facl" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_FACL 1 -_ACEOF - -fi -done - - if test $ac_cv_func_facl = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acl_trivial" >&5 -$as_echo_n "checking for library containing acl_trivial... " >&6; } -if ${ac_cv_search_acl_trivial+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char acl_trivial (); -int -main () -{ -return acl_trivial (); - ; - return 0; -} -_ACEOF -for ac_lib in '' sec; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_acl_trivial=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_acl_trivial+:} false; then : - break -fi -done -if ${ac_cv_search_acl_trivial+:} false; then : - -else - ac_cv_search_acl_trivial=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acl_trivial" >&5 -$as_echo "$ac_cv_search_acl_trivial" >&6; } -ac_res=$ac_cv_search_acl_trivial -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - if test "$ac_cv_search_acl_trivial" != "none required"; then - LIB_ACL=$ac_cv_search_acl_trivial - fi - -fi - - for ac_func in acl_trivial -do : - ac_fn_c_check_func "$LINENO" "acl_trivial" "ac_cv_func_acl_trivial" -if test "x$ac_cv_func_acl_trivial" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ACL_TRIVIAL 1 -_ACEOF - -fi -done - - use_acl=1 - fi - fi - - if test $use_acl = 0; then - for ac_func in getacl -do : - ac_fn_c_check_func "$LINENO" "getacl" "ac_cv_func_getacl" -if test "x$ac_cv_func_getacl" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETACL 1 -_ACEOF - -fi -done - - if test $ac_cv_func_getacl = yes; then - use_acl=1 - fi - for ac_header in aclv.h -do : - ac_fn_c_check_header_compile "$LINENO" "aclv.h" "ac_cv_header_aclv_h" "#include -" -if test "x$ac_cv_header_aclv_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ACLV_H 1 -_ACEOF - -fi - -done - - fi - - if test $use_acl = 0; then - for ac_func in aclx_get -do : - ac_fn_c_check_func "$LINENO" "aclx_get" "ac_cv_func_aclx_get" -if test "x$ac_cv_func_aclx_get" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ACLX_GET 1 -_ACEOF - -fi -done - - if test $ac_cv_func_aclx_get = yes; then - use_acl=1 - fi - fi - - if test $use_acl = 0 || test "$ac_cv_func_aclx_get" = yes; then - for ac_func in statacl -do : - ac_fn_c_check_func "$LINENO" "statacl" "ac_cv_func_statacl" -if test "x$ac_cv_func_statacl" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STATACL 1 -_ACEOF - -fi -done - - if test $ac_cv_func_statacl = yes; then - use_acl=1 - fi - fi - - if test $use_acl = 0; then - for ac_func in aclsort -do : - ac_fn_c_check_func "$LINENO" "aclsort" "ac_cv_func_aclsort" -if test "x$ac_cv_func_aclsort" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ACLSORT 1 -_ACEOF - -fi -done - - if test $ac_cv_func_aclsort = yes; then - use_acl=1 - fi - fi - - LIBS=$ac_save_LIBS - fi - if test "x$enable_acl$use_acl" = "xyes0"; then - as_fn_error $? "ACLs enabled but support not detected" "$LINENO" 5 - elif test "x$enable_acl$use_acl" = "xauto0"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libacl development library was not found or not usable." >&5 -$as_echo "$as_me: WARNING: libacl development library was not found or not usable." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GNU coreutils will be built without ACL support." >&5 -$as_echo "$as_me: WARNING: GNU coreutils will be built without ACL support." >&2;} - fi - fi - - -cat >>confdefs.h <<_ACEOF -#define USE_ACL $use_acl -_ACEOF - - USE_ACL=$use_acl - - - : @@ -42616,11 +42813,52 @@ $as_echo "#define GNULIB_TEST_READLINK 1" >>confdefs.h + if test $ac_cv_func_readlinkat = no; then HAVE_READLINKAT=0 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlinkat signature is correct" >&5 +$as_echo_n "checking whether readlinkat signature is correct... " >&6; } +if ${gl_cv_decl_readlinkat_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check whether original declaration has correct type. */ + ssize_t readlinkat (int, char const *, char *, size_t); +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_decl_readlinkat_works=yes +else + gl_cv_decl_readlinkat_works=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_readlinkat_works" >&5 +$as_echo "$gl_cv_decl_readlinkat_works" >&6; } + # Assume readinkat has the same trailing slash bug as readlink, + # as is the case on Mac Os X 10.10 + case "$gl_cv_func_readlink_works" in + *yes) + if test "$gl_cv_decl_readlinkat_works" != yes; then + REPLACE_READLINKAT=1 + fi + ;; + *) + REPLACE_READLINKAT=1 + ;; + esac fi - if test $HAVE_READLINKAT = 0; then + if test $HAVE_READLINKAT = 0 || test $REPLACE_READLINKAT = 1; then @@ -44129,7 +44367,8 @@ $as_echo "$gl_cv_next_sched_h" >&6; } fi - ac_fn_c_check_type "$LINENO" "struct sched_param" "ac_cv_type_struct_sched_param" "#include + if test "$HAVE_SCHED_H" = 1; then + ac_fn_c_check_type "$LINENO" "struct sched_param" "ac_cv_type_struct_sched_param" "#include " if test "x$ac_cv_type_struct_sched_param" = xyes; then : HAVE_STRUCT_SCHED_PARAM=1 @@ -44137,6 +44376,16 @@ else HAVE_STRUCT_SCHED_PARAM=0 fi + else + ac_fn_c_check_type "$LINENO" "struct sched_param" "ac_cv_type_struct_sched_param" "#include +" +if test "x$ac_cv_type_struct_sched_param" = xyes; then : + HAVE_STRUCT_SCHED_PARAM=1 +else + HAVE_STRUCT_SCHED_PARAM=0 +fi + + fi @@ -46181,196 +46430,6 @@ _ACEOF - - - - if test $ac_cv_header_sys_socket_h != yes; then - for ac_header in winsock2.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" -if test "x$ac_cv_header_winsock2_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_WINSOCK2_H 1 -_ACEOF - -fi - -done - - fi - if test "$ac_cv_header_winsock2_h" = yes; then - HAVE_WINSOCK2_H=1 - UNISTD_H_HAVE_WINSOCK2_H=1 - SYS_IOCTL_H_HAVE_WINSOCK2_H=1 - else - HAVE_WINSOCK2_H=0 - fi - - LIBSOCKET= - if test $HAVE_WINSOCK2_H = 1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need to call WSAStartup in winsock2.h and -lws2_32" >&5 -$as_echo_n "checking if we need to call WSAStartup in winsock2.h and -lws2_32... " >&6; } -if ${gl_cv_func_wsastartup+:} false; then : - $as_echo_n "(cached) " >&6 -else - - gl_save_LIBS="$LIBS" - LIBS="$LIBS -lws2_32" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#ifdef HAVE_WINSOCK2_H -# include -#endif -int -main () -{ - - WORD wVersionRequested = MAKEWORD(1, 1); - WSADATA wsaData; - int err = WSAStartup(wVersionRequested, &wsaData); - WSACleanup (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gl_cv_func_wsastartup=yes -else - gl_cv_func_wsastartup=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gl_save_LIBS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wsastartup" >&5 -$as_echo "$gl_cv_func_wsastartup" >&6; } - if test "$gl_cv_func_wsastartup" = "yes"; then - -$as_echo "#define WINDOWS_SOCKETS 1" >>confdefs.h - - LIBSOCKET='-lws2_32' - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setsockopt" >&5 -$as_echo_n "checking for library containing setsockopt... " >&6; } -if ${gl_cv_lib_socket+:} false; then : - $as_echo_n "(cached) " >&6 -else - - gl_cv_lib_socket= - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -extern -#ifdef __cplusplus -"C" -#endif -char setsockopt(); -int -main () -{ -setsockopt(); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - -else - gl_save_LIBS="$LIBS" - LIBS="$gl_save_LIBS -lsocket" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -extern -#ifdef __cplusplus -"C" -#endif -char setsockopt(); -int -main () -{ -setsockopt(); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gl_cv_lib_socket="-lsocket" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$gl_cv_lib_socket"; then - LIBS="$gl_save_LIBS -lnetwork" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -extern -#ifdef __cplusplus -"C" -#endif -char setsockopt(); -int -main () -{ -setsockopt(); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gl_cv_lib_socket="-lnetwork" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$gl_cv_lib_socket"; then - LIBS="$gl_save_LIBS -lnet" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -extern -#ifdef __cplusplus -"C" -#endif -char setsockopt(); -int -main () -{ -setsockopt(); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gl_cv_lib_socket="-lnet" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - fi - fi - LIBS="$gl_save_LIBS" - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$gl_cv_lib_socket"; then - gl_cv_lib_socket="none needed" - fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_lib_socket" >&5 -$as_echo "$gl_cv_lib_socket" >&6; } - if test "$gl_cv_lib_socket" != "none needed"; then - LIBSOCKET="$gl_cv_lib_socket" - fi - fi - - - - - - - : - - ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" " /* is not needed according to POSIX, but the in i386-unknown-freebsd4.10 and @@ -46775,8 +46834,12 @@ else /* Test _Alignas only on platforms where gnulib can help. */ #if \ ((defined __cplusplus && 201103 <= __cplusplus) \ - || __GNUC__ || __IBMC__ || __IBMCPP__ || __ICC \ - || 0x5110 <= __SUNPRO_C || 1300 <= _MSC_VER) + || (defined __APPLE__ && defined __MACH__ \ + ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ + : __GNUC__) \ + || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \ + || __ICC || 0x5110 <= __SUNPRO_C \ + || 1300 <= _MSC_VER) struct alignas_test { char c; char alignas (8) alignas_8; }; char test_alignas[offsetof (struct alignas_test, alignas_8) == 8 ? 1 : -1]; @@ -47030,6 +47093,15 @@ fi STDDEF_H= + ac_fn_c_check_type "$LINENO" "max_align_t" "ac_cv_type_max_align_t" "#include + +" +if test "x$ac_cv_type_max_align_t" = xyes; then : + +else + HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h +fi + if test $gt_cv_c_wchar_t = no; then HAVE_WCHAR_T=0 STDDEF_H=stddef.h @@ -47159,6 +47231,8 @@ $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 @@ -47223,6 +47297,48 @@ $as_echo "$gl_cv_next_stdio_h" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which flavor of printf attribute matches inttypes macros" >&5 +$as_echo_n "checking which flavor of printf attribute matches inttypes macros... " >&6; } +if ${gl_cv_func_printf_attribute_flavor+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define __STDC_FORMAT_MACROS 1 + #include + #include + /* For non-mingw systems, compilation will trivially succeed. + For mingw, compilation will succeed for older mingw (system + printf, "I64d") and fail for newer mingw (gnu printf, "lld"). */ + #if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) && \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) + extern char PRIdMAX_probe[sizeof PRIdMAX == sizeof "I64d" ? 1 : -1]; + #endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_func_printf_attribute_flavor=system +else + gl_cv_func_printf_attribute_flavor=gnu +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5 +$as_echo "$gl_cv_func_printf_attribute_flavor" >&6; } + if test "$gl_cv_func_printf_attribute_flavor" = gnu; then + +$as_echo "#define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h + + fi + GNULIB_FSCANF=1 @@ -49162,289 +49278,6 @@ done - case "$host_os" in - osf*) - -$as_echo "#define _POSIX_PII_SOCKET 1" >>confdefs.h - - ;; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether is self-contained" >&5 -$as_echo_n "checking whether is self-contained... " >&6; } -if ${gl_cv_header_sys_socket_h_selfcontained+:} false; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_header_sys_socket_h_selfcontained=yes -else - gl_cv_header_sys_socket_h_selfcontained=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_sys_socket_h_selfcontained" >&5 -$as_echo "$gl_cv_header_sys_socket_h_selfcontained" >&6; } - if test $gl_cv_header_sys_socket_h_selfcontained = yes; then - for ac_func in shutdown -do : - ac_fn_c_check_func "$LINENO" "shutdown" "ac_cv_func_shutdown" -if test "x$ac_cv_func_shutdown" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SHUTDOWN 1 -_ACEOF - -fi -done - - if test $ac_cv_func_shutdown = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether defines the SHUT_* macros" >&5 -$as_echo_n "checking whether defines the SHUT_* macros... " >&6; } -if ${gl_cv_header_sys_socket_h_shut+:} false; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -int a[] = { SHUT_RD, SHUT_WR, SHUT_RDWR }; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gl_cv_header_sys_socket_h_shut=yes -else - gl_cv_header_sys_socket_h_shut=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_sys_socket_h_shut" >&5 -$as_echo "$gl_cv_header_sys_socket_h_shut" >&6; } - if test $gl_cv_header_sys_socket_h_shut = no; then - SYS_SOCKET_H='sys/socket.h' - fi - fi - fi - # We need to check for ws2tcpip.h now. - - - - - - - - - - - - if test $gl_cv_have_include_next = yes; then - gl_cv_next_sys_socket_h='<'sys/socket.h'>' - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -$as_echo_n "checking absolute name of ... " >&6; } -if ${gl_cv_next_sys_socket_h+:} false; then : - $as_echo_n "(cached) " >&6 -else - - if test $ac_cv_header_sys_socket_h = yes; then - - - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - gl_header_literal_regex=`echo 'sys/socket.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - - gl_cv_absolute_sys_socket_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"` - - gl_header=$gl_cv_absolute_sys_socket_h - gl_cv_next_sys_socket_h='"'$gl_header'"' - else - gl_cv_next_sys_socket_h='<'sys/socket.h'>' - fi - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_socket_h" >&5 -$as_echo "$gl_cv_next_sys_socket_h" >&6; } - fi - NEXT_SYS_SOCKET_H=$gl_cv_next_sys_socket_h - - if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' - gl_next_as_first_directive='<'sys/socket.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_sys_socket_h - fi - NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H=$gl_next_as_first_directive - - - - - if test $ac_cv_header_sys_socket_h = yes; then - HAVE_SYS_SOCKET_H=1 - HAVE_WS2TCPIP_H=0 - else - HAVE_SYS_SOCKET_H=0 - if test $ac_cv_header_ws2tcpip_h = yes; then - HAVE_WS2TCPIP_H=1 - else - HAVE_WS2TCPIP_H=0 - fi - fi - - - - ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockaddr_storage" " - /* 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. */ -#include -#ifdef HAVE_SYS_SOCKET_H -#include -#endif -#ifdef HAVE_WS2TCPIP_H -#include -#endif - -" -if test "x$ac_cv_type_struct_sockaddr_storage" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SOCKADDR_STORAGE 1 -_ACEOF - - -fi -ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_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. */ -#include -#ifdef HAVE_SYS_SOCKET_H -#include -#endif -#ifdef HAVE_WS2TCPIP_H -#include -#endif - -" -if test "x$ac_cv_type_sa_family_t" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_SA_FAMILY_T 1 -_ACEOF - - -fi - - if test $ac_cv_type_struct_sockaddr_storage = no; then - HAVE_STRUCT_SOCKADDR_STORAGE=0 - fi - if test $ac_cv_type_sa_family_t = no; then - HAVE_SA_FAMILY_T=0 - fi - if test $ac_cv_type_struct_sockaddr_storage != no; then - ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "ss_family" "ac_cv_member_struct_sockaddr_storage_ss_family" "#include - #ifdef HAVE_SYS_SOCKET_H - #include - #endif - #ifdef HAVE_WS2TCPIP_H - #include - #endif - -" -if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1 -_ACEOF - - -else - HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=0 -fi - - fi - if test $HAVE_STRUCT_SOCKADDR_STORAGE = 0 || test $HAVE_SA_FAMILY_T = 0 \ - || test $HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY = 0; then - SYS_SOCKET_H='sys/socket.h' - fi - - - - - if test $ac_cv_header_sys_socket_h != yes; then - for ac_header in winsock2.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" -if test "x$ac_cv_header_winsock2_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_WINSOCK2_H 1 -_ACEOF - -fi - -done - - fi - if test "$ac_cv_header_winsock2_h" = yes; then - HAVE_WINSOCK2_H=1 - UNISTD_H_HAVE_WINSOCK2_H=1 - SYS_IOCTL_H_HAVE_WINSOCK2_H=1 - else - HAVE_WINSOCK2_H=0 - fi - - - - - - - - @@ -50298,7 +50131,7 @@ $as_echo "$gl_cv_next_unistd_h" >&6; } || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ - && test $LIBUNISTRING_VERSION_SUBMINOR -lt 2 + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4 } } } @@ -50397,7 +50230,7 @@ fi || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ - && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0 + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4 } } } @@ -50424,7 +50257,7 @@ fi || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ - && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0 + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4 } } } @@ -50451,7 +50284,7 @@ fi || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ - && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4 + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 6 } } } @@ -50711,6 +50544,7 @@ $as_echo "$gl_cv_func_unlink_busy_text" >&6; } ;; *) # GNU/Hurd has unlinkat, but it has the same bug as unlink. + # Darwin has unlinkat, but it has the same UNLINK_PARENT_BUG. if test $REPLACE_UNLINK = 1; then REPLACE_UNLINKAT=1 fi @@ -53242,7 +53076,6 @@ $as_echo "#define GNULIB_TEST_ACCEPT 1" >>confdefs.h - if test "$ac_cv_header_winsock2_h" = yes; then @@ -53846,6 +53679,7 @@ $as_echo "#define GNULIB_TEST_CONNECT 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } if ${ac_cv_c_bigendian+:} false; then : @@ -58461,9 +58295,64 @@ $as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h if test $ac_cv_func_symlinkat = no; then HAVE_SYMLINKAT=0 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether symlinkat handles trailing slash correctly" >&5 +$as_echo_n "checking whether symlinkat handles trailing slash correctly... " >&6; } +if ${gl_cv_func_symlinkat_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_symlinkat_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_symlinkat_works="guessing no" ;; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + +int +main () +{ +int result = 0; + if (!symlinkat ("a", AT_FDCWD, "conftest.link/")) + result |= 1; + if (symlinkat ("conftest.f", AT_FDCWD, "conftest.lnk2")) + result |= 2; + else if (!symlinkat ("a", AT_FDCWD, "conftest.lnk2/")) + result |= 4; + return result; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_symlinkat_works=yes +else + gl_cv_func_symlinkat_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 + + rm -f conftest.f conftest.link conftest.lnk2 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_symlinkat_works" >&5 +$as_echo "$gl_cv_func_symlinkat_works" >&6; } + case "$gl_cv_func_symlinkat_works" in + *yes) ;; + *) + REPLACE_SYMLINKAT=1 + ;; + esac fi - if test $HAVE_SYMLINKAT = 0; then + if test $HAVE_SYMLINKAT = 0 || test $REPLACE_SYMLINKAT = 1; then @@ -59510,6 +59399,8 @@ fi + + for ac_header in sys/sysctl.h do : ac_fn_c_check_header_compile "$LINENO" "sys/sysctl.h" "ac_cv_header_sys_sysctl_h" "$ac_includes_default @@ -59877,6 +59768,10 @@ _ACEOF + + + + @@ -60421,6 +60316,39 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + # See is fpsetprec() required to use extended double precision + # This is needed on 32 bit FreeBSD to give accurate conversion of: + # `numfmt 9223372036854775808` + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +#ifdef __i386__ + fpsetprec(FP_PE); + #else + # error not required on 64 bit + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_have_fpsetprec=yes +else + ac_have_fpsetprec=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test "$ac_have_fpsetprec" = "yes" ; then + +$as_echo "#define HAVE_FPSETPREC 1" >>confdefs.h + + fi + + # Accept configure options: --with-tty-group[=GROUP], --without-tty-group # You can determine the group of a TTY via 'stat --format %G /dev/tty' @@ -60732,6 +60660,14 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } fi # List all gcc warning categories. + # To compare this list to your installed GCC's, run this Bash command: + # + # comm -3 \ + # <(sed -n 's/^ *\(-[^ ]*\) .*/\1/p' manywarnings.m4 | sort) \ + # <(gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort | + # grep -v -x -f <( + # awk '/^[^#]/ {print ws}' ../build-aux/gcc-warning.spec)) + gl_manywarn_set= for gl_manywarn_item in \ -W \ @@ -60739,20 +60675,25 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } -Waddress \ -Waggressive-loop-optimizations \ -Wall \ - -Warray-bounds \ -Wattributes \ -Wbad-function-cast \ + -Wbool-compare \ -Wbuiltin-macro-redefined \ -Wcast-align \ -Wchar-subscripts \ + -Wchkp \ -Wclobbered \ -Wcomment \ -Wcomments \ -Wcoverage-mismatch \ -Wcpp \ + -Wdate-time \ -Wdeprecated \ -Wdeprecated-declarations \ + -Wdesignated-init \ -Wdisabled-optimization \ + -Wdiscarded-array-qualifiers \ + -Wdiscarded-qualifiers \ -Wdiv-by-zero \ -Wdouble-promotion \ -Wempty-body \ @@ -60763,6 +60704,7 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } -Wformat-extra-args \ -Wformat-nonliteral \ -Wformat-security \ + -Wformat-signedness \ -Wformat-y2k \ -Wformat-zero-length \ -Wfree-nonheap-object \ @@ -60770,15 +60712,19 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } -Wimplicit \ -Wimplicit-function-declaration \ -Wimplicit-int \ + -Wincompatible-pointer-types \ -Winit-self \ -Winline \ + -Wint-conversion \ -Wint-to-pointer-cast \ -Winvalid-memory-model \ -Winvalid-pch \ -Wjump-misses-init \ + -Wlogical-not-parentheses \ -Wlogical-op \ -Wmain \ -Wmaybe-uninitialized \ + -Wmemset-transposed-args \ -Wmissing-braces \ -Wmissing-declarations \ -Wmissing-field-initializers \ @@ -60789,9 +60735,10 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } -Wnarrowing \ -Wnested-externs \ -Wnonnull \ - -Wnormalized=nfc \ + -Wodr \ -Wold-style-declaration \ -Wold-style-definition \ + -Wopenmp-simd \ -Woverflow \ -Woverlength-strings \ -Woverride-init \ @@ -60806,6 +60753,9 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } -Wreturn-type \ -Wsequence-point \ -Wshadow \ + -Wshift-count-negative \ + -Wshift-count-overflow \ + -Wsizeof-array-argument \ -Wsizeof-pointer-memaccess \ -Wstack-protector \ -Wstrict-aliasing \ @@ -60815,7 +60765,10 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } -Wsuggest-attribute=format \ -Wsuggest-attribute=noreturn \ -Wsuggest-attribute=pure \ + -Wsuggest-final-methods \ + -Wsuggest-final-types \ -Wswitch \ + -Wswitch-bool \ -Wswitch-default \ -Wsync-nand \ -Wsystem-headers \ @@ -60842,13 +60795,27 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } -Wvla \ -Wvolatile-register-var \ -Wwrite-strings \ - -fdiagnostics-show-option \ - -funit-at-a-time \ \ ; do gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item" done + # gcc --help=warnings outputs an unusual form for these options; list + # them here so that the above 'comm' command doesn't report a false match. + gl_manywarn_set="$gl_manywarn_set -Warray-bounds=2" + gl_manywarn_set="$gl_manywarn_set -Wnormalized=nfc" + + # These are needed for older GCC versions. + if test -n "$GCC"; then + case `($CC --version) 2>/dev/null` in + 'gcc (GCC) '[0-3].* | \ + 'gcc (GCC) '4.[0-7].*) + gl_manywarn_set="$gl_manywarn_set -fdiagnostics-show-option" + gl_manywarn_set="$gl_manywarn_set -funit-at-a-time" + ;; + esac + fi + # Disable specific options as needed. if test "$gl_cv_cc_nomfi_needed" = yes; then gl_manywarn_set="$gl_manywarn_set -Wno-missing-field-initializers" @@ -62586,21 +62553,100 @@ if test $gl_cv_list_mounted_fs = yes && test $gl_cv_fs_space = yes; then } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether this is system supports stdbuf" >&5 -$as_echo_n "checking whether this is system supports stdbuf... " >&6; } +# Build stdbuf only if supported +ac_save_CFLAGS=$CFLAGS +ac_save_LDFLAGS=$LDFLAGS +# Detect warnings about ignored "constructor" attributes. + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror" >&5 +$as_echo_n "checking whether C compiler handles -Werror... " >&6; } +if ${gl_cv_warn_c__Werror+:} false; then : + $as_echo_n "(cached) " >&6 +else + + gl_save_compiler_FLAGS="$CFLAGS" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Werror" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gl_cv_warn_c__Werror=yes +else + gl_cv_warn_c__Werror=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$gl_save_compiler_FLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Werror" >&5 +$as_echo "$gl_cv_warn_c__Werror" >&6; } +if test "x$gl_cv_warn_c__Werror" = xyes; then : + as_fn_append CFLAGS " -Werror" +fi + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -errwarn" >&5 +$as_echo_n "checking whether C compiler handles -errwarn... " >&6; } +if ${gl_cv_warn_c__errwarn+:} false; then : + $as_echo_n "(cached) " >&6 +else + + gl_save_compiler_FLAGS="$CFLAGS" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -errwarn" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gl_cv_warn_c__errwarn=yes +else + gl_cv_warn_c__errwarn=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$gl_save_compiler_FLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__errwarn" >&5 +$as_echo "$gl_cv_warn_c__errwarn" >&6; } +if test "x$gl_cv_warn_c__errwarn" = xyes; then : + as_fn_append CFLAGS " -errwarn" +fi + + +# Put this message here, after gl_WARN_ADD's chatter. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether this system supports stdbuf" >&5 +$as_echo_n "checking whether this system supports stdbuf... " >&6; } +CFLAGS="-fPIC $CFLAGS" +LDFLAGS="-shared $LDFLAGS" +stdbuf_supported=no +# Note we only LINK here rather than RUN to support cross compilation cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ static int stdbuf = 0; - /* Restrict to ELF systems with compilers - that support the constructor attribute. */ void __attribute__ ((constructor)) stdbuf_init (void) { - #if __ELF__ - stdbuf = 1; - #endif + stdbuf = 1; } int main () @@ -62612,15 +62658,14 @@ main () } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_link "$LINENO"; then : stdbuf_supported=yes -else - stdbuf_supported=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $stdbuf_supported" >&5 $as_echo "$stdbuf_supported" >&6; } -if test "$stdbuf_supported" = "yes"; then +if test "$stdbuf_supported" = "yes" && test -z "$EXEEXT"; then { if test -z "$optional_bin_progs"; then optional_bin_progs=stdbuf @@ -62629,6 +62674,8 @@ if test "$stdbuf_supported" = "yes"; then fi } fi +CFLAGS=$ac_save_CFLAGS +LDFLAGS=$ac_save_LDFLAGS ############################################################################ @@ -63372,6 +63419,8 @@ $as_echo "$as_me: WARNING: '$gl_i' is not an optionally-installable program" >&2 # Now that we know which programs will actually be built, determine # which optional helper progs should be compiled. +# Note it adding to pkglibexec_PROGRAMS, $(transform) in src/local.mk +# may need to be updated accordingly. case " $optional_bin_progs " in *' stdbuf '*) pkglibexec_PROGRAMS='src/libstdbuf.so';; *) pkglibexec_PROGRAMS='';; @@ -63501,7 +63550,7 @@ $as_echo "$USE_NLS" >&6; } - GETTEXT_MACRO_VERSION=0.18 + GETTEXT_MACRO_VERSION=0.19 @@ -64054,36 +64103,42 @@ else if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi - if test "$cross_compiling" = yes; then : - - case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; - *) am_cv_func_iconv_works="guessing yes" ;; - esac - + am_cv_func_iconv_works=no + for ac_iconv_const in '' 'const'; do + if test "$cross_compiling" = yes; then : + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -int main () + +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const +#endif + +int +main () { - int result = 0; +int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful returns. */ { iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); if (cd_utf8_to_88591 != (iconv_t)(-1)) { - static const char input[] = "\342\202\254"; /* EURO SIGN */ + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ char buf[10]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_utf8_to_88591, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) result |= 1; @@ -64096,14 +64151,14 @@ int main () iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); if (cd_ascii_to_88591 != (iconv_t)(-1)) { - static const char input[] = "\263"; + static ICONV_CONST char input[] = "\263"; char buf[10]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_ascii_to_88591, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) result |= 2; @@ -64115,14 +64170,14 @@ int main () iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); if (cd_88591_to_utf8 != (iconv_t)(-1)) { - static const char input[] = "\304"; + static ICONV_CONST char input[] = "\304"; static char buf[2] = { (char)0xDE, (char)0xAD }; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = 1; char *outptr = buf; size_t outbytesleft = 1; size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) result |= 4; @@ -64135,14 +64190,14 @@ int main () iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); if (cd_88591_to_utf8 != (iconv_t)(-1)) { - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; char buf[50]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if ((int)res > 0) result |= 8; @@ -64162,17 +64217,20 @@ int main () && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) result |= 16; return result; + + ; + return 0; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : am_cv_func_iconv_works=yes -else - am_cv_func_iconv_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 + test "$am_cv_func_iconv_works" = no || break + done LIBS="$am_save_LIBS" fi @@ -64989,14 +65047,6 @@ $as_echo "$gt_cv_locale_fr" >&6; } -# If doing dynamic dependency checking, create man/dynamic-deps.mk so -# that 'make' doesn't complain about its being absent. Use an old -# time stamp, so that 'make' thinks it is older than 'Makefile'. -# Use time stamp 1, since some 'make' implementations treat 0 specially. -# Use 'touch -t', since older 'touch' implementations don't grok -d. -ac_config_commands="$ac_config_commands man/dynamic-deps.mk" - - ac_config_files="$ac_config_files Makefile po/Makefile.in gnulib-tests/Makefile" cat >confcache <<\_ACEOF @@ -65698,7 +65748,7 @@ 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.23, which was +This file was extended by GNU coreutils $as_me 8.24, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -65770,7 +65820,7 @@ _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.23 +GNU coreutils config.status 8.24 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -65911,7 +65961,6 @@ do "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "$GNUmakefile") CONFIG_LINKS="$CONFIG_LINKS $GNUmakefile:$GNUmakefile" ;; "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; - "man/dynamic-deps.mk") CONFIG_COMMANDS="$CONFIG_COMMANDS man/dynamic-deps.mk" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "gnulib-tests/Makefile") CONFIG_FILES="$CONFIG_FILES gnulib-tests/Makefile" ;; @@ -66749,8 +66798,6 @@ $as_echo X"$file" | ;; esac done ;; - "man/dynamic-deps.mk":C) test -n "$AMDEP_TRUE" || - TZ=UTC0 touch -t 197001010000.01 man/dynamic-deps.mk ;; esac done # for ac_tag diff --git a/configure.ac b/configure.ac index ae78cb18..fc1a0526 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-2014 Free Software Foundation, Inc. +# Copyright (C) 1991-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ dnl Written by Jim Meyering. -AC_PREREQ([2.64]) +AC_PREREQ([2.69]) # Make inter-release version strings look like, e.g., v6.9-219-g58ddd, which # indicates that it is built from the 219th delta (in _some_ repository) @@ -454,28 +454,36 @@ if test $gl_cv_list_mounted_fs = yes && test $gl_cv_fs_space = yes; then gl_ADD_PROG([optional_bin_progs], [df]) fi -AC_MSG_CHECKING([whether this is system supports stdbuf]) -AC_COMPILE_IFELSE( +# Build stdbuf only if supported +ac_save_CFLAGS=$CFLAGS +ac_save_LDFLAGS=$LDFLAGS +# Detect warnings about ignored "constructor" attributes. +gl_WARN_ADD([-Werror], [CFLAGS]) +gl_WARN_ADD([-errwarn], [CFLAGS]) +# Put this message here, after gl_WARN_ADD's chatter. +AC_MSG_CHECKING([whether this system supports stdbuf]) +CFLAGS="-fPIC $CFLAGS" +LDFLAGS="-shared $LDFLAGS" +stdbuf_supported=no +# Note we only LINK here rather than RUN to support cross compilation +AC_LINK_IFELSE( [AC_LANG_PROGRAM([[ static int stdbuf = 0; - /* Restrict to ELF systems with compilers - that support the constructor attribute. */ void __attribute__ ((constructor)) stdbuf_init (void) { - #if __ELF__ - stdbuf = 1; - #endif + stdbuf = 1; }]],[[ return !(stdbuf == 1);]]) ], - [stdbuf_supported=yes], - [stdbuf_supported=no]) + [stdbuf_supported=yes]) AC_MSG_RESULT([$stdbuf_supported]) -if test "$stdbuf_supported" = "yes"; then +if test "$stdbuf_supported" = "yes" && test -z "$EXEEXT"; then gl_ADD_PROG([optional_bin_progs], [stdbuf]) fi +CFLAGS=$ac_save_CFLAGS +LDFLAGS=$ac_save_LDFLAGS ############################################################################ @@ -488,6 +496,8 @@ m4_include([m4/cu-progs.m4]) # Now that we know which programs will actually be built, determine # which optional helper progs should be compiled. +# Note it adding to pkglibexec_PROGRAMS, $(transform) in src/local.mk +# may need to be updated accordingly. case " $optional_bin_progs " in *' stdbuf '*) pkglibexec_PROGRAMS='src/libstdbuf.so';; *) pkglibexec_PROGRAMS='';; @@ -582,20 +592,11 @@ AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes]) # As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in # translatable strings, we must use need-formatstring-macros here. AM_GNU_GETTEXT([external], [need-formatstring-macros]) -AM_GNU_GETTEXT_VERSION([0.18.1]) +AM_GNU_GETTEXT_VERSION([0.19.2]) # For a test of uniq: it uses the $LOCALE_FR envvar. gt_LOCALE_FR -# If doing dynamic dependency checking, create man/dynamic-deps.mk so -# that 'make' doesn't complain about its being absent. Use an old -# time stamp, so that 'make' thinks it is older than 'Makefile'. -# Use time stamp 1, since some 'make' implementations treat 0 specially. -# Use 'touch -t', since older 'touch' implementations don't grok -d. -AC_CONFIG_COMMANDS([man/dynamic-deps.mk], - [test -n "$AMDEP_TRUE" || - TZ=UTC0 touch -t 197001010000.01 man/dynamic-deps.mk]) - AC_CONFIG_FILES( Makefile po/Makefile.in diff --git a/doc/ChangeLog-2007 b/doc/ChangeLog-2007 index 87b26f63..6adae102 100644 --- a/doc/ChangeLog-2007 +++ b/doc/ChangeLog-2007 @@ -2002,7 +2002,7 @@ ----- - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice diff --git a/doc/coreutils.info b/doc/coreutils.info index 495797ec..68b00961 100644 --- a/doc/coreutils.info +++ b/doc/coreutils.info @@ -1,10 +1,10 @@ -This is coreutils.info, produced by makeinfo version 5.1 from +This is coreutils.info, produced by makeinfo version 5.2 from coreutils.texi. -This manual documents version 8.23 of the GNU core utilities, including +This manual documents version 8.24 of the GNU core utilities, including the standard programs for text and file manipulation. - Copyright © 1994-2014 Free Software Foundation, Inc. + Copyright © 1994-2015 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, @@ -33,7 +33,7 @@ START-INFO-DIR-ENTRY * chroot: (coreutils)chroot invocation. Specify the root directory. * cksum: (coreutils)cksum invocation. Print POSIX CRC checksum. * comm: (coreutils)comm invocation. Compare sorted files by line. -* coreutils: (coreutils)coreutils invocation. Multi-call program. +* coreutils: (coreutils)Multi-call invocation. Multi-call program. * cp: (coreutils)cp invocation. Copy files. * csplit: (coreutils)csplit invocation. Split by context. * cut: (coreutils)cut invocation. Print selected parts of lines. @@ -100,7 +100,7 @@ START-INFO-DIR-ENTRY * stdbuf: (coreutils)stdbuf invocation. Modify stdio buffering. * stty: (coreutils)stty invocation. Print/change terminal settings. * sum: (coreutils)sum invocation. Print traditional checksum. -* sync: (coreutils)sync invocation. Synchronize memory and disk. +* sync: (coreutils)sync invocation. Synchronize memory to disk. * tac: (coreutils)tac invocation. Reverse files. * tail: (coreutils)tail invocation. Output the last part of files. * tee: (coreutils)tee invocation. Redirect to multiple files. @@ -131,10 +131,10 @@ File: coreutils.info, Node: Top, Next: Introduction, Up: (dir) GNU Coreutils ************* -This manual documents version 8.23 of the GNU core utilities, including +This manual documents version 8.24 of the GNU core utilities, including the standard programs for text and file manipulation. - Copyright © 1994-2014 Free Software Foundation, Inc. + Copyright © 1994-2015 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, @@ -170,7 +170,7 @@ the standard programs for text and file manipulation. * Modified command invocation:: chroot env nice nohup stdbuf timeout * Process control:: kill * Delaying:: sleep -* Numeric operations:: factor seq +* Numeric operations:: factor numfmt seq * File permissions:: Access modes * Date input formats:: Specifying date strings * Opening the software toolbox:: The software tools philosophy @@ -193,7 +193,7 @@ Common Options * Traversing symlinks:: Traversing symlinks to directories * Treating / specially:: Treating / specially * Standards conformance:: Standards conformance -* coreutils invocation:: Multi-call binary invocation +* Multi-call invocation:: Multi-call program invocation Output of entire files @@ -206,7 +206,6 @@ 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 @@ -309,7 +308,7 @@ Disk usage * df invocation:: Report file system disk space usage * du invocation:: Estimate file space usage * stat invocation:: Report file or file system status -* sync invocation:: Synchronize data on disk with memory +* sync invocation:: Synchronize cached writes to persistent storage * truncate invocation:: Shrink or extend the size of a file Printing text @@ -424,6 +423,7 @@ Delaying Numeric operations * factor invocation:: Print prime factors +* numfmt invocation:: Reformat numbers * seq invocation:: Print numeric sequences File permissions @@ -541,11 +541,11 @@ programs, abbreviations of the long options are not always recognized. reads from the file named ‘-r’. A single ‘-’ operand is not really an option, though it looks like -one. It stands for standard input, or for standard output if that is -clear from the context. For example, ‘sort -’ reads from standard -input, and is equivalent to plain ‘sort’, and ‘tee -’ writes an extra -copy of its input to standard output. Unless otherwise specified, ‘-’ -can appear as any operand that requires a file name. +one. It stands for a file operand, and some tools treat it as standard +input, or as standard output if that is clear from the context. For +example, ‘sort -’ reads from standard input, and is equivalent to plain +‘sort’. Unless otherwise specified, a ‘-’ can appear as any operand +that requires a file name. * Menu: @@ -562,7 +562,7 @@ can appear as any operand that requires a file name. * Treating / specially:: –preserve-root and –no-preserve-root. * Special built-in utilities:: ‘break’, ‘:’, … * Standards conformance:: Conformance to the POSIX standard. -* coreutils invocation:: Multi-call binary invocation. +* Multi-call invocation:: Multi-call program invocation.  File: coreutils.info, Node: Exit status, Next: Backup options, Up: Common options @@ -682,7 +682,7 @@ byte. number of bytes per block, or it can be ‘human-readable’ or ‘si’ to select a human-readable format. Integers may be followed by suffixes that are upward compatible with the SI prefixes -(http://www.bipm.org/en/si/si_brochure/chapter3/prefixes.html) for +(http://www.bipm.org/en/publications/si-brochure/chapter3.html) for decimal multiples and with the ISO/IEC 80000-13 (formerly IEC 60027-2) prefixes (http://physics.nist.gov/cuu/Units/binary.html) for binary multiples. @@ -787,10 +787,13 @@ Floating-Point Arithmetic (http://www.validlab.com/goldberg/paper.pdf). input use the standard C functions ‘strtod’ and ‘strtold’ to convert from text to floating point numbers. These floating point numbers therefore can use scientific notation like ‘1.0e-34’ and ‘-10e100’. -Modern C implementations also accept hexadecimal floating point numbers -such as ‘-0x.ep-3’, which stands for −14/16 times 2^-3, which equals -−0.109375. The ‘LC_NUMERIC’ locale determines the decimal-point -character. *Note (libc)Parsing of Floats::. +Commands that parse floating point also understand case-insensitive +‘inf’, ‘infinity’, and ‘NaN’, although whether such values are useful +depends on the command in question. Modern C implementations also +accept hexadecimal floating point numbers such as ‘-0x.ep-3’, which +stands for −14/16 times 2^-3, which equals −0.109375. The ‘LC_NUMERIC’ +locale determines the decimal-point character. *Note (libc)Parsing of +Floats::.  File: coreutils.info, Node: Signal specifications, Next: Disambiguating names and IDs, Prev: Floating point, Up: Common options @@ -920,7 +923,7 @@ The ‘shuf’, ‘shred’, and ‘sort’ commands sometimes need random data do their work. For example, ‘sort -R’ must choose a hash function at random, and it needs random data to make this selection. - By default these commands use an internal pseudorandom generator + By default these commands use an internal pseudo-random generator initialized by a small amount of entropy, but can be directed to use an external source with the ‘--random-source=FILE’ option. An error is reported if FILE does not contain enough bytes. @@ -930,7 +933,7 @@ source of random data. Typically, this device gathers environmental noise from device drivers and other sources into an entropy pool, and uses the pool to generate random bits. If the pool is short of data, the device reuses the internal pool to produce more bits, using a -cryptographically secure pseudorandom number generator. But be aware +cryptographically secure pseudo-random number generator. But be aware that this device is not designed for bulk random data generation and is relatively slow. @@ -941,7 +944,18 @@ of available sources depends on your operating system. To reproduce the results of an earlier invocation of a command, you can save some random data into a file and then use that file as the -random source in earlier and later invocations of the command. +random source in earlier and later invocations of the command. Rather +than depending on a file, one can generate a reproducible arbitrary +amount of pseudo-random data given a seed value, using for example: + + get_seeded_random() + { + seed="$1" + openssl enc -aes-256-ctr -pass pass:"$seed" -nosalt \ + /dev/null + } + + shuf -i1-100 --random-source=<(get_seeded_random 42)  File: coreutils.info, Node: Target directory, Next: Trailing slashes, Prev: Random sources, Up: Common options @@ -1128,7 +1142,7 @@ the command ‘nice suspend’ generates an error message instead of suspending.  -File: coreutils.info, Node: Standards conformance, Next: coreutils invocation, Prev: Special built-in utilities, Up: Common options +File: coreutils.info, Node: Standards conformance, Next: Multi-call invocation, Prev: Special built-in utilities, Up: Common options 2.13 Standards conformance ========================== @@ -1158,17 +1172,20 @@ any compatibility problems by setting ‘_POSIX2_VERSION=199209’ in your environment.  -File: coreutils.info, Node: coreutils invocation, Prev: Standards conformance, Up: Common options +File: coreutils.info, Node: Multi-call invocation, Prev: Standards conformance, Up: Common options -2.14 ‘coreutils’: Multi-call binary -=================================== +2.14 ‘coreutils’: Multi-call program +==================================== -‘coreutils’ invokes an individual utility, either implicitly selected by -the last component of ‘argv[0]’, or by explicitly calling ‘coreutils’ -with the ‘--coreutils-prog’ option. Synopsis: +The ‘coreutils’ command invokes an individual utility, either implicitly +selected by the last component of the name used to invoke ‘coreutils’, +or explicitly with the ‘--coreutils-prog’ option. Synopsis: coreutils --coreutils-prog=PROGRAM … + The ‘coreutils’ command is not installed by default, so portable +scripts should not rely on its existence. +  File: coreutils.info, Node: Output of entire files, Next: Formatting file contents, Prev: Common options, Up: Top @@ -1688,12 +1705,11 @@ 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: numfmt invocation, Up: Formatting file contents +File: coreutils.info, Node: fmt invocation, Next: pr invocation, Up: Formatting file contents 4.1 ‘fmt’: Reformat paragraph text ================================== @@ -1771,292 +1787,9 @@ options::. indicates failure.  -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 ---------------------- +File: coreutils.info, Node: pr invocation, Next: fold invocation, Prev: fmt invocation, Up: Formatting file contents -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 ‘'’, ‘-’, ‘0’, or width - modifiers. The ‘'’ modifier will enable ‘--grouping’, the ‘-’ - modifier will enable left-aligned ‘--padding’ and the width - modifier will enable right-aligned ‘--padding’. The ‘0’ width - modifier (without the ‘-’ modifier) will generate leading zeros on - the number, up to the specified width. - -‘--from=UNIT’ - Auto-scales input numbers according to UNIT. See UNITS below. The - default is no scaling, meaning suffixes (e.g. ‘M’, ‘G’) will - trigger an error. - -‘--from-unit=N’ - 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: - $ numfmt --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.3 ‘pr’: Paginate or columnate files for printing +4.2 ‘pr’: Paginate or columnate files for printing ================================================== ‘pr’ writes each FILE (‘-’ means standard input), or standard input if @@ -2310,7 +2043,7 @@ indicates failure.  File: coreutils.info, Node: fold invocation, Prev: pr invocation, Up: Formatting file contents -4.4 ‘fold’: Wrap input lines to fit in specified width +4.3 ‘fold’: Wrap input lines to fit in specified width ====================================================== ‘fold’ writes each FILE (‘-’ means standard input), or standard input if @@ -2670,7 +2403,8 @@ options::. ‘-l LINES’ ‘--lines=LINES’ - Put LINES lines of INPUT into each output file. + Put LINES lines of INPUT into each output file. If ‘--separator’ + is specified, then LINES determines the number of records. For compatibility ‘split’ also supports an obsolete option syntax ‘-LINES’. New scripts should use ‘-l LINES’ instead. @@ -2692,9 +2426,10 @@ options::. ‘-C SIZE’ ‘--line-bytes=SIZE’ Put into each output file as many complete lines of INPUT as - possible without exceeding SIZE bytes. Individual lines longer - than SIZE bytes are broken into multiple files. SIZE has the same - format as for the ‘--bytes’ option. + possible without exceeding SIZE bytes. Individual lines or records + longer than SIZE bytes are broken into multiple files. SIZE has + the same format as for the ‘--bytes’ option. If ‘--separator’ is + specified, then LINES determines the number of records. ‘--filter=COMMAND’ With this option, rather than simply writing to each output file, @@ -2718,7 +2453,7 @@ options::. N generate N files based on current size of INPUT K/N only output Kth of N to stdout - l/N generate N files without splitting lines + l/N generate N files without splitting lines or records l/K/N likewise but only output Kth of N to stdout r/N like ‘l’ but use round robin distribution r/K/N likewise but only output Kth of N to stdout @@ -2733,10 +2468,10 @@ options::. For ‘l’ mode, chunks are approximately INPUT size / N. The INPUT is partitioned into N equal sized portions, with the last assigned any excess. If a line _starts_ within a partition it is written - completely to the corresponding file. Since lines are not split - even if they overlap a partition, the files written can be larger - or smaller than the partition size, and even empty if a line is so - long as to completely overlap the partition. + completely to the corresponding file. Since lines or records are + not split even if they overlap a partition, the files written can + be larger or smaller than the partition size, and even empty if a + line/record is so long as to completely overlap the partition. For ‘r’ mode, the size of INPUT is irrelevant, and so can be a pipe for example. @@ -2752,10 +2487,15 @@ options::. ‘-d’ ‘--numeric-suffixes[=FROM]’ Use digits in suffixes rather than lower-case letters. The - numerical suffix counts from FROM if specified, 0 otherwise. Note - specifying a FROM value also disables the default auto suffix - length expansion described above, and so you may also want to - specify ‘-a’ to allow suffixes beyond ‘99’. + numerical suffix counts from FROM if specified, 0 otherwise. + + FROM is used to either set the initial suffix for a single run, or + to set the suffix offset for independently split inputs, and + consequently the auto suffix length expansion described above is + disabled. Therefore you may also want to use option ‘-a’ to allow + suffixes beyond ‘99’. Note if option ‘--number’ is specified and + the number of files is less than FROM, a single run is assumed and + the minimum suffix length required is automatically determined. ‘--additional-suffix=SUFFIX’ Append an additional SUFFIX to output file names. SUFFIX must not @@ -2769,6 +2509,13 @@ options::. completely span a chunk. The output file sequence numbers, always run consecutively even when this option is specified. +‘-t SEPARATOR’ +‘--separator=SEPARATOR’ + Use character SEPARATOR as the record separator instead of the + default newline character (ASCII LF). To specify ASCII NUL as the + separator, use the two-character string ‘\0’, e.g., ‘split -t + '\0'’. + ‘-u’ ‘--unbuffered’ Immediately copy input to output in ‘--number r/…’ mode, which is a @@ -2920,7 +2667,7 @@ options::. Do not remove output files when errors are encountered. ‘--suppress-matched’ - Do not output lines matching the specified PATTERN. I.E. suppress + Do not output lines matching the specified PATTERN. I.e., suppress the boundary line from the start of the second and subsequent splits. @@ -3064,7 +2811,9 @@ options::. ‘-L’ ‘--max-line-length’ - Print only the maximum line lengths. + Print only the maximum display widths. Tabs are set at every 8th + column. Display widths of wide characters are considered. + Non-printable characters are given 0 width. ‘--files0-from=FILE’ Disallow processing files named on the command line, and instead @@ -3182,12 +2931,15 @@ determine whether a file and checksum are consistent. Synopsis: md5sum [OPTION]… [FILE]… - For each FILE, ‘md5sum’ outputs the MD5 checksum, a flag indicating -binary or text input mode, and the file name. If FILE contains a -backslash or newline, the line is started with a backslash, and each -problematic character in the file name is escaped with a backslash, -making the output unambiguous even in the presence of arbitrary file -names. If FILE is omitted or specified as ‘-’, standard input is read. + For each FILE, ‘md5sum’ outputs by default, the MD5 checksum, a +space, a flag indicating binary or text input mode, and the file name. +Binary mode is indicated with ‘*’, text mode with ‘ ’ (space). Binary +mode is the default on systems where it’s significant, otherwise text +mode is the default. If FILE contains a backslash or newline, the line +is started with a backslash, and each problematic character in the file +name is escaped with a backslash, making the output unambiguous even in +the presence of arbitrary file names. If FILE is omitted or specified +as ‘-’, standard input is read. The program accepts the following options. Also see *note Common options::. @@ -3208,9 +2960,12 @@ options::. (or from stdin if no FILE was specified) and report whether the checksums match the contents of the named files. The input to this mode of ‘md5sum’ is usually the output of a prior, - checksum-generating run of ‘md5sum’. Each valid line of input - consists of an MD5 checksum, a binary/text flag, and then a file - name. Binary mode is indicated with ‘*’, text with ‘ ’ (space). + checksum-generating run of ‘md5sum’. Three input formats are + supported. Either the default output format described above, the + ‘--tag’ output format, or the BSD reversed mode format which is + similar to the default mode, but doesn’t use a character to + distinguish binary and text modes. + For each such line, ‘md5sum’ reads the named file and computes its MD5 checksum. Then, if the computed message digest does not match the one on the line with the file name, the file is noted as having @@ -3298,8 +3053,8 @@ File: coreutils.info, Node: sha2 utilities, Prev: sha1sum invocation, Up: Sum The commands ‘sha224sum’, ‘sha256sum’, ‘sha384sum’ and ‘sha512sum’ compute checksums of various lengths (respectively 224, 256, 384 and 512 bits), collectively known as the SHA-2 hashes. The usage and options of -these commands are precisely the same as for ‘md5sum’. *Note md5sum -invocation::. +these commands are precisely the same as for ‘md5sum’ and ‘sha1sum’. +*Note md5sum invocation::. Note: The SHA384 and SHA512 digests are considerably slower to compute, especially on 32-bit computers, than SHA224 or SHA256. @@ -6047,7 +5802,8 @@ These options affect the appearance of the overall output. ‘-1’ ‘--format=single-column’ List one file per line. This is the default for ‘ls’ when standard - output is not a terminal. + output is not a terminal. See also the ‘-b’ and ‘-q’ options to + suppress direct output of newline characters within a file name. ‘-C’ ‘--format=vertical’ @@ -6368,6 +6124,8 @@ File: coreutils.info, Node: vdir invocation, Next: dircolors invocation, Prev in long format and special characters are represented by backslash escape sequences. + *Note ‘ls’: ls invocation. +  File: coreutils.info, Node: dircolors invocation, Prev: vdir invocation, Up: Directory listing @@ -6664,10 +6422,12 @@ options::. ‘--preserve=mode,ownership,timestamps’. In the absence of this option, the permissions of existing - destination files are unchanged, while each new file is created - with the mode bits of the corresponding source file, minus the bits - set in the umask and minus the set-user-ID and set-group-ID bits. - *Note File permissions::. + destination files are unchanged. Each new file is created with the + mode of the corresponding source file minus the set-user-ID, + set-group-ID, and sticky bits as the create mode; the operating + system then applies either the umask or a default ACL, possibly + resulting in a more restrictive file mode. *Note File + permissions::. ‘--no-preserve=ATTRIBUTE_LIST’ Do not preserve the specified attributes. The ATTRIBUTE_LIST has @@ -6715,7 +6475,7 @@ options::. ‘auto’ If the copy-on-write operation is not supported then fall back - to the standard copy behaviour. + to the standard copy behavior. This option is overridden by the ‘--link’, ‘--symbolic-link’ and ‘--attributes-only’ options, thus allowing it to be used to @@ -6891,19 +6651,26 @@ inspired by the DD (data definition) statement of OS/360 JCL. traditional POSIX specified behavior of counting input read operations. -‘status=WHICH’ +‘status=LEVEL’ 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. + the ‘INFO’ signal or when ‘dd’ exits. Specifying LEVEL will adjust + the amount of information printed, with the last LEVEL specified + taking precedence. ‘none’ Do not print any informational or warning messages to stderr. Error messages are output as normal. + ‘noxfer’ + Do not print the final transfer rate and volume statistics + that normally make up the last status line. + + ‘progress’ + Print the transfer rate and volume statistics on stderr, when + processing each input block. Statistics are output on a + single line at most once every second, but updates can be + delayed when waiting on I/O. + ‘conv=CONVERSION[,CONVERSION]…’ Convert the file as specified by the CONVERSION argument(s). (No spaces around any comma(s).) @@ -7028,7 +6795,7 @@ inspired by the DD (data definition) statement of OS/360 JCL. Use direct I/O for data, avoiding the buffer cache. Note that the kernel may impose restrictions on read or write buffer sizes. For example, with an ext4 destination file system and - a linux-based kernel, using ‘oflag=direct’ will cause writes + a Linux-based kernel, using ‘oflag=direct’ will cause writes to fail with ‘EINVAL’ if the output buffer size is not a multiple of 512. @@ -7170,21 +6937,35 @@ occur on disk based devices): # Rescue data from an (unmounted!) partition of a failing disk. dd conv=noerror,sync iflag=fullblock /mnt/rescue.img - Sending an ‘INFO’ signal to a running ‘dd’ process makes it print I/O -statistics to standard error and then resume copying. In the example -below, ‘dd’ is run in the background to copy 10 million blocks. The -‘kill’ command makes it output intermediate I/O statistics, and when -‘dd’ completes normally or is killed by the ‘SIGINT’ signal, it outputs -the final statistics. - - $ dd if=/dev/zero of=/dev/null count=10MB & pid=$! - $ kill -s INFO $pid; wait $pid - 3385223+0 records in - 3385223+0 records out - 1733234176 bytes (1.7 GB) copied, 6.42173 seconds, 270 MB/s - 10000000+0 records in - 10000000+0 records out - 5120000000 bytes (5.1 GB) copied, 18.913 seconds, 271 MB/s + Sending an ‘INFO’ signal (or ‘USR1’ signal where that is unavailable) +to a running ‘dd’ process makes it print I/O statistics to standard +error and then resume copying. In the example below, ‘dd’ is run in the +background to copy 5GB of data. The ‘kill’ command makes it output +intermediate I/O statistics, and when ‘dd’ completes normally or is +killed by the ‘SIGINT’ signal, it outputs the final statistics. + + # Ignore the signal so we never inadvertently terminate the dd child. + # Note this is not needed when SIGINFO is available. + trap '' USR1 + + # Run dd with the fullblock iflag to avoid short reads + # which can be triggered by reception of signals. + dd iflag=fullblock if=/dev/zero of=/dev/null count=5000000 bs=1000 & pid=$! + + # Output stats every half second + until ! kill -s USR1 $pid 2>/dev/null; do sleep .5; done + + The above script will output in the following format + + 859+0 records in + 859+0 records out + 4295000000 bytes (4.3 GB) copied, 0.539934 s, 8.0 GB/s + 1000+0 records in + 1000+0 records out + 5000000000 bytes (5.0 GB) copied, 0.630785 s, 7.9 GB/s + + Note also the ‘status=progress’ option which periodically updates the +last line of the transfer statistics above. On systems lacking the ‘INFO’ signal ‘dd’ responds to the ‘USR1’ signal instead, unless the ‘POSIXLY_CORRECT’ environment variable is @@ -7573,7 +7354,7 @@ or: rm ./-f The Unix ‘rm’ program’s use of a single ‘-’ for this purpose predates -the development of the getopt standard syntax. +the development of the ‘getopt’ standard syntax. An exit status of zero indicates success, and a nonzero value indicates failure. @@ -7985,10 +7766,10 @@ options::. '/tmp/file' -> '../a/file' Relative symbolic links are generated based on their canonicalized - containing directory, and canonicalized targets. I.E. all symbolic - links in these file names will be resolved. *Note realpath - invocation::, which gives greater control over relative file name - generation, as demonstrated in the following example: + containing directory, and canonicalized targets. I.e., all + symbolic links in these file names will be resolved. *Note + realpath invocation::, which gives greater control over relative + file name generation, as demonstrated in the following example: ln--relative() { test "$1" = --no-symlinks && { nosym=$1; shift; } @@ -8140,7 +7921,7 @@ communicate. One process opens the FIFO file for writing, and another for reading, after which data can flow as with the usual anonymous pipe in shells or elsewhere. - The program accepts the following option. Also see *note Common + The program accepts the following options. Also see *note Common options::. ‘-m MODE’ @@ -8204,7 +7985,7 @@ device number begins with ‘0x’ or ‘0X’, it is interpreted as hexadecimal; otherwise, if it begins with ‘0’, as octal; otherwise, as decimal. - The program accepts the following option. Also see *note Common + The program accepts the following options. Also see *note Common options::. ‘-m MODE’ @@ -8899,7 +8680,7 @@ status information, and write buffers to disk. * df invocation:: Report file system disk space usage. * du invocation:: Estimate file space usage. * stat invocation:: Report file or file system status. -* sync invocation:: Synchronize memory and disk. +* sync invocation:: Synchronize cached writes to persistent storage. * truncate invocation:: Shrink or extend the size of a file.  @@ -8944,25 +8725,21 @@ options::. ‘-a’ ‘--all’ - Include in the listing dummy file systems, which are omitted by - default. Such file systems are typically special-purpose - pseudo-file-systems, such as automounter entries. + Include in the listing dummy, duplicate, or inaccessible file + systems, which are omitted by default. Dummy file systems are + typically special purpose pseudo file systems such as ‘/proc’, with + no associated storage. Duplicate file systems are local or remote + file systems that are mounted at separate locations in the local + file hierarchy, or bind mounted locations. Inaccessible file + systems are those which are mounted but subsequently over-mounted + by another file system at that point, or otherwise inaccessible due + to permissions of the mount point etc. ‘-B SIZE’ ‘--block-size=SIZE’ Scale sizes by SIZE before printing them (*note Block size::). For example, ‘-BG’ prints sizes in units of 1,073,741,824 bytes. -‘--total’ - Print a grand total of all arguments after all arguments have been - processed. This can be used to find out the total disk size, usage - and available space of all listed devices. - - For the grand total line, ‘df’ prints ‘"total"’ into the SOURCE - column, and ‘"-"’ into the TARGET column. If there is no SOURCE - column (see ‘--output’), then ‘df’ prints ‘"total"’ into the TARGET - column, if present. - ‘-h’ ‘--human-readable’ Append a size letter to each size, such as ‘M’ for mebibytes. @@ -9041,7 +8818,7 @@ options::. 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 + The definition of the FIELD_LIST can even be split among several ‘--output’ uses. #!/bin/sh @@ -9085,6 +8862,19 @@ options::. results, but in general this option makes ‘df’ much slower, especially when there are many or very busy file systems. +‘--total’ + Print a grand total of all arguments after all arguments have been + processed. This can be used to find out the total disk size, usage + and available space of all listed devices. If no arguments are + specified df will try harder to elide file systems insignificant to + the total available space, by suppressing duplicate remote file + systems. + + 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. + ‘-t FSTYPE’ ‘--type=FSTYPE’ Limit the listing to file systems of type FSTYPE. Multiple file @@ -9123,6 +8913,9 @@ options::. ‘-v’ Ignored; for compatibility with System V versions of ‘df’. + ‘df’ is installed only on systems that have usable mount tables, so +portable scripts should not rely on its existence. + An exit status of zero indicates success, and a nonzero value indicates failure. Failure includes the case where no output is generated, so you can inspect the exit status of a command like ‘df -t @@ -9140,8 +8933,8 @@ File: coreutils.info, Node: du invocation, Next: stat invocation, Prev: df in 14.2 ‘du’: Estimate file space usage ==================================== -‘du’ reports the amount of disk space used by the specified files and -for each subdirectory (of directory arguments). Synopsis: +‘du’ reports the amount of disk space used by the set of specified files +and for each subdirectory (of directory arguments). Synopsis: du [OPTION]… [FILE]… @@ -9152,8 +8945,8 @@ are rounded up to the next higher unit. If two or more hard links point to the same file, only one of the hard links is counted. The FILE argument order affects which links are -counted, and changing the argument order may change the numbers that -‘du’ outputs. +counted, and changing the argument order may change the numbers and +entries that ‘du’ outputs. The program accepts the following options. Also see *note Common options::. @@ -9464,6 +9257,17 @@ stat …’) to avoid interference from the shell. Print the information in terse form, suitable for parsing by other programs. + The output of the following commands are identical and the + ‘--format’ also identifies the items printed (in fuller form) in + the default format. Note the format string would include another + ‘%C’ at the end with an active SELinux security context. + $ stat --format="%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %W %o" ... + $ stat --terse ... + + The same illustrating terse output in ‘--file-system’ mode: + $ stat -f --format="%n %i %l %t %s %S %b %f %a %c %d" ... + $ stat -f --terse ... + The valid FORMAT directives for files with ‘--format’ and ‘--printf’ are: @@ -9561,21 +9365,49 @@ indicates failure.  File: coreutils.info, Node: sync invocation, Next: truncate invocation, Prev: stat invocation, Up: Disk usage -14.4 ‘sync’: Synchronize data on disk with memory -================================================= +14.4 ‘sync’: Synchronize cached writes to persistent storage +============================================================ + +‘sync’ synchronizes in memory files or file systems to persistent +storage. Synopsis: + + sync [OPTION] [FILE]… -‘sync’ writes any data buffered in memory out to disk. This can include -(but is not limited to) modified superblocks, modified inodes, and -delayed reads and writes. This must be implemented by the kernel; The -‘sync’ program does nothing but exercise the ‘sync’ system call. + ‘sync’ writes any data buffered in memory out to disk. This can +include (but is not limited to) modified superblocks, modified inodes, +and delayed reads and writes. This must be implemented by the kernel; +The ‘sync’ program does nothing but exercise the ‘sync’, ‘syncfs’, +‘fsync’, and ‘fdatasync’ system calls. The kernel keeps data in memory to avoid doing (relatively slow) disk reads and writes. This improves performance, but if the computer crashes, data may be lost or the file system corrupted as a result. The -‘sync’ command ensures everything in memory is written to disk. +‘sync’ command instructs the kernel to write data in memory to +persistent storage. - Any arguments are ignored, except for a lone ‘--help’ or ‘--version’ -(*note Common options::). + If any argument is specified then only those files will be +synchronized using the fsync(2) syscall by default. + + If at least one file is specified, it is possible to change the +synchronization method with the following options. Also see *note +Common options::. + +‘-d’ +‘--data’ + Use fdatasync(2) to sync only the data for the file, and any + metadata required to maintain file system consistency. + +‘-f’ +‘--file-system’ + Synchronize all the I/O waiting for the file systems that contain + the file, using the syscall syncfs(2). Note you would usually + _not_ specify this option if passing a device node like ‘/dev/sda’ + for example, as that would sync the containing file system rather + than the referenced one. Note also that depending on the system, + passing individual device nodes or files may have different sync + characteristics than using no arguments. I.e., arguments passed to + fsync(2) may provide greater guarantees through write barriers, + than a global sync(2) used when no arguments are provided. An exit status of zero indicates success, and a nonzero value indicates failure. @@ -9627,7 +9459,7 @@ options::. and so on for ‘T’, ‘P’, ‘E’, ‘Z’, and ‘Y’. SIZE may also be prefixed by one of the following to adjust the - size of each FILE based on their current size: + size of each FILE based on its current size: ‘+’ => extend by ‘-’ => reduce by ‘<’ => at most @@ -10394,9 +10226,11 @@ send some data down a pipe, but also to save a copy. Synopsis: a file being written to already exists, the data it previously contained is overwritten unless the ‘-a’ option is used. - A FILE of ‘-’ causes ‘tee’ to send another copy of input to standard -output, but this is typically not that useful as the copies are -interleaved. + In previous versions of GNU coreutils (v5.3.0 - v8.23), a FILE of ‘-’ +caused ‘tee’ to send another copy of input to standard output. However, +as the interleaved output was not very useful, ‘tee’ now conforms to +POSIX which explicitly mandates it to treat ‘-’ as a file with such +name. The program accepts the following options. Also see *note Common options::. @@ -10410,6 +10244,28 @@ options::. ‘--ignore-interrupts’ Ignore interrupt signals. +‘-p’ +‘--output-error[=MODE]’ + Select the behavior with errors on the outputs, where MODE is one + of the following: + + ‘warn’ + Warn on error opening or writing any output, including pipes. + Writing is continued to still open files/pipes. Exit status + indicates failure if any output has an error. + + ‘warn-nopipe’ + Warn on error opening or writing any output, except pipes. + Writing is continued to still open files/pipes. Exit status + indicates failure if any non pipe output had an error. This + is the default MODE when not specified. + + ‘exit’ + Exit on error opening or writing any output, including pipes. + + ‘exit-nopipe’ + Exit on error opening or writing any output, except pipes. + The ‘tee’ command is useful when you happen to be transferring a large amount of data and also want to summarize that data without reading it a second time. For example, when you are downloading a DVD @@ -11010,6 +10866,10 @@ 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. + ‘stty’ is installed only on platforms with the POSIX terminal +interface, so portable scripts should not rely on its existence on +non-POSIX platforms. + An exit status of zero indicates success, and a nonzero value indicates failure. @@ -11256,6 +11116,12 @@ File: coreutils.info, Node: Local, Next: Combination, Prev: Output, Up: stty line as indicated by the ‘echoprt’ and ‘echoe’ settings, instead of by the ‘echoctl’ and ‘echok’ settings. Non-POSIX. May be negated. +‘extproc’ + Enable ‘LINEMODE’, which is used to avoid echoing each character + over high latency links. See also Internet RFC 1116 + (ftp://ftp.rfc-editor.org/in-notes/rfc1116.txt). Non-POSIX. May + be negated. +  File: coreutils.info, Node: Combination, Next: Characters, Prev: Local, Up: stty invocation @@ -11284,11 +11150,11 @@ Combination settings: ‘sane’ Same as: - cread -ignbrk brkint -inlcr -igncr icrnl -ixoff - -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr - -onocr -onlret -ofill -ofdel nl0 cr0 tab0 bs0 vt0 - ff0 isig icanon iexten echo echoe echok -echonl - -noflsh -xcase -tostop -echoprt echoctl echoke + cread -ignbrk brkint -inlcr -igncr icrnl + icanon iexten echo echoe echok -echonl -noflsh + -ixoff -iutf8 -iuclc -ixany imaxbel -xcase -olcuc -ocrnl + opost -ofill onlcr -onocr -onlret nl0 cr0 tab0 bs0 vt0 ff0 + isig -tostop -ofdel -echoprt echoctl echoke -extproc and also sets all special characters to their default values. @@ -11302,8 +11168,8 @@ Combination settings: Same as: -ignbrk -brkint -ignpar -parmrk -inpck -istrip - -inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany - -imaxbel -opost -isig -icanon -xcase min 1 time 0 + -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost + -isig -iuclc -ixany -imaxbel -xcase min 1 time 0 May be negated. If negated, same as ‘cooked’. @@ -11374,9 +11240,15 @@ like any other, namely to set that special character to .) ‘eol2’ Alternate character to end the line. Non-POSIX. +‘discard’ + Alternate character to toggle discarding of output. Non-POSIX. + ‘swtch’ Switch to a different shell layer. Non-POSIX. +‘status’ + Send an info signal. Not currently supported on Linux. Non-POSIX. + ‘start’ Restart the output after stopping it. @@ -11683,6 +11555,10 @@ is ‘/var/log/wtmp’. The only options are ‘--help’ and ‘--version’. *Note Common options::. + The ‘users’ command is installed only on platforms with the POSIX +‘’ include file or equivalent, so portable scripts should not +rely on its existence on non-POSIX platforms. + An exit status of zero indicates success, and a nonzero value indicates failure. @@ -11787,6 +11663,10 @@ options::. ‘-’ disallowing ‘write’ messages ‘?’ cannot find terminal device + The ‘who’ command is installed only on platforms with the POSIX +‘’ include file or equivalent, so portable scripts should not +rely on its existence on non-POSIX platforms. + An exit status of zero indicates success, and a nonzero value indicates failure. @@ -12365,6 +12245,9 @@ File: coreutils.info, Node: arch invocation, Next: nproc invocation, Prev: da The program accepts the *note Common options:: only. + ‘arch’ is not installed by default, so portable scripts should not +rely on its existence. + An exit status of zero indicates success, and a nonzero value indicates failure. @@ -12495,6 +12378,10 @@ name. Synopsis: The only options are ‘--help’ and ‘--version’. *Note Common options::. + ‘hostname’ is not installed by default, and other packages also +supply a ‘hostname’ command, so portable scripts should not rely on its +existence or on the exact behavior documented above. + An exit status of zero indicates success, and a nonzero value indicates failure. @@ -12516,6 +12403,9 @@ hexadecimal. This command accepts no arguments. The only options are On that system, the 32-bit quantity happens to be closely related to the system’s Internet address, but that isn’t always the case. + ‘hostid’ is installed only on systems that have the ‘gethostid’ +function, so portable scripts should not rely on its existence. + An exit status of zero indicates success, and a nonzero value indicates failure. @@ -12547,6 +12437,14 @@ also include processes in the uninterruptible sleep state (that is, those processes which are waiting for disk I/O). The Linux kernel includes uninterruptible processes. + ‘uptime’ is installed only on platforms with infrastructure for +obtaining the boot time, and other packages also supply an ‘uptime’ +command, so portable scripts should not rely on its existence or on the +exact behavior documented above. + + An exit status of zero indicates success, and a nonzero value +indicates failure. +  File: coreutils.info, Node: SELinux context, Next: Modified command invocation, Prev: System context, Up: Top @@ -12719,22 +12617,28 @@ File: coreutils.info, Node: chroot invocation, Next: env invocation, Up: Modi ============================================================ ‘chroot’ runs a command with a specified root directory. On many -systems, only the super-user can do this.(1) Synopses: +systems, only the super-user can do this.(1). Synopses: chroot OPTION NEWROOT [COMMAND [ARGS]…] chroot OPTION Ordinarily, file names are looked up starting at the root of the directory structure, i.e., ‘/’. ‘chroot’ changes the root to the -directory NEWROOT (which must exist) and then runs COMMAND with optional -ARGS. If COMMAND is not specified, the default is the value of the -‘SHELL’ environment variable or ‘/bin/sh’ if not set, invoked with the -‘-i’ option. COMMAND must not be a special built-in utility (*note -Special built-in utilities::). +directory NEWROOT (which must exist), then changes the working directory +to ‘/’, and finally runs COMMAND with optional ARGS. If COMMAND is not +specified, the default is the value of the ‘SHELL’ environment variable +or ‘/bin/sh’ if not set, invoked with the ‘-i’ option. COMMAND must not +be a special built-in utility (*note Special built-in utilities::). The program accepts the following options. Also see *note Common options::. Options must precede operands. +‘--groups=GROUPS’ + Use this option to override the supplementary GROUPS to be used by + the new process. The items in the list (names or numeric IDs) must + be separated by commas. Use ‘--groups=''’ to disable the + supplementary group look-up implicit in the ‘--userspec’ option. + ‘--userspec=USER[:GROUP]’ By default, COMMAND is run with the same credentials as the invoking process. Use this option to run it as a different USER @@ -12742,11 +12646,13 @@ options::. Options must precede operands. the supplementary groups are set according to the system defined list for that user, unless overridden with the ‘--groups’ option. -‘--groups=GROUPS’ - Use this option to override the supplementary GROUPS to be used by - the new process. The items in the list (names or numeric IDs) must - be separated by commas. Use ‘--groups=''’ to disable the - supplementary group look-up implicit in the ‘--userspec’ option. +‘--skip-chdir’ + Use this option to not change the working directory to ‘/’ after + changing the root directory to NEWROOT, i.e., inside the chroot. + This option is only permitted when NEWROOT is the old ‘/’ + directory, and therefore is mostly useful together with the + ‘--groups’ and ‘--userspec’ options to retain the previous working + directory. The user and group name look-up performed by the ‘--userspec’ and ‘--groups’ options, is done both outside and inside the chroot, with @@ -12779,6 +12685,9 @@ required positions under your intended new root directory. Finally, if the executable requires any other files (e.g., data, state, device files), copy them into place, too. + ‘chroot’ is installed only on systems that have the ‘chroot’ +function, so portable scripts should not rely on its existence. + Exit status: 125 if ‘chroot’ itself fails @@ -12792,7 +12701,9 @@ files), copy them into place, too. certain regular users to use the ‘chroot’ system call, and hence to run this program. Also, on Cygwin, anyone can run the ‘chroot’ command, because the underlying function is non-privileged due to lack of support -in MS-Windows. +in MS-Windows. Furthermore, the ‘chroot’ command avoids the ‘chroot’ +system call when NEWROOT is identical to the old ‘/’ directory for +consistency with systems where this is allowed for non-privileged users.  File: coreutils.info, Node: env invocation, Next: nice invocation, Prev: chroot invocation, Up: Modified command invocation @@ -12929,7 +12840,7 @@ lets applications determine the order in which threads are scheduled to run. Unlike a priority, a niceness is merely advice to the scheduler, which the scheduler is free to ignore. Also, as a point of terminology, POSIX defines the behavior of ‘nice’ in terms of a "nice value", which -is the nonnegative difference between a niceness and the minimum +is the non-negative difference between a niceness and the minimum niceness. Though ‘nice’ conforms to POSIX, its documentation and diagnostics use the term “niceness” for compatibility with historical practice. @@ -12958,6 +12869,10 @@ options::. Options must precede operands. For compatibility ‘nice’ also supports an obsolete option syntax ‘-ADJUSTMENT’. New scripts should use ‘-n ADJUSTMENT’ instead. + ‘nice’ is installed only on systems that have the POSIX ‘setpriority’ +function, so portable scripts should not rely on its existence on +non-POSIX platforms. + Exit status: 0 if no COMMAND is specified and the niceness is output @@ -13016,10 +12931,12 @@ Synopsis: nohup COMMAND [ARG]… - If standard input is a terminal, it is redirected from ‘/dev/null’ so -that terminal sessions do not mistakenly consider the terminal to be -used by the command. This is a GNU extension; programs intended to be -portable to non-GNU hosts should use ‘nohup COMMAND [ARG]… /dev/null’ instead. If standard output is a terminal, the command’s standard output is @@ -13125,6 +13042,10 @@ options::. ‘G’ => 1024*1024*1024 (GibiBytes) and so on for ‘T’, ‘P’, ‘E’, ‘Z’, and ‘Y’. + ‘stdbuf’ is installed only on platforms that use the Executable and +Linkable Format (ELF) and support the ‘constructor’ attribute, so +portable scripts should not rely on its existence. + Exit status: 125 if ‘stdbuf’ itself fails @@ -13152,7 +13073,7 @@ 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 + if the managed COMMAND supports running for an indeterminate amount of time. ‘--foreground’ @@ -13166,7 +13087,10 @@ options::. Options must precede operands. from the terminal (like Ctrl-C for example) Note in this mode of operation, any children of COMMAND will not be - timed out. + timed out. Also SIGCONT will not be sent to COMMAND, as it’s + generally not needed with foreground processes, and can cause + intermittent signal delivery issues with programs that are monitors + themselves (like GDB for example). ‘-k DURATION’ ‘--kill-after=DURATION’ @@ -13276,123 +13200,416 @@ upper case to avoid ambiguity with lower case option letters. *Note Signal specifications::, for a list of supported signal names and numbers. - -File: coreutils.info, Node: Delaying, Next: Numeric operations, Prev: Process control, Up: Top + +File: coreutils.info, Node: Delaying, Next: Numeric operations, Prev: Process control, Up: Top + +25 Delaying +*********** + +* Menu: + +* sleep invocation:: Delay for a specified time. + + +File: coreutils.info, Node: sleep invocation, Up: Delaying + +25.1 ‘sleep’: Delay for a specified time +======================================== + +‘sleep’ pauses for an amount of time specified by the sum of the values +of the command line arguments. Synopsis: + + sleep NUMBER[smhd]… + + Each argument is a number followed by an optional unit; the default +is seconds. The units are: + +‘s’ + seconds +‘m’ + minutes +‘h’ + hours +‘d’ + days + + Historical implementations of ‘sleep’ have required that NUMBER be an +integer, and only accepted a single argument without a suffix. However, +GNU ‘sleep’ accepts arbitrary floating point numbers. *Note Floating +point::. + + The only options are ‘--help’ and ‘--version’. *Note Common +options::. + + Due to shell aliases and built-in ‘sleep’ functions, using an +unadorned ‘sleep’ interactively or in a script may get you different +functionality than that described here. Invoke it via ‘env’ (i.e., ‘env +sleep …’) to avoid interference from the shell. + + An exit status of zero indicates success, and a nonzero value +indicates failure. + + +File: coreutils.info, Node: Numeric operations, Next: File permissions, Prev: Delaying, Up: Top + +26 Numeric operations +********************* + +These programs do numerically-related operations. + +* Menu: + +* factor invocation:: Show factors of numbers. +* numfmt invocation:: Reformat numbers. +* seq invocation:: Print sequences of numbers. + + +File: coreutils.info, Node: factor invocation, Next: numfmt invocation, Up: Numeric operations + +26.1 ‘factor’: Print prime factors +================================== + +‘factor’ prints prime factors. Synopses: + + factor [NUMBER]… + factor OPTION + + If no NUMBER is specified on the command line, ‘factor’ reads numbers +from standard input, delimited by newlines, tabs, or spaces. + + The ‘factor’ command supports only a small number of options: + +‘--help’ + Print a short help on standard output, then exit without further + processing. + +‘--version’ + Print the program version on standard output, then exit without + further processing. + + Factoring the product of the eighth and ninth Mersenne primes takes +about 30 milliseconds of CPU time on a 2.2 GHz Athlon. + + M8=$(echo 2^31-1|bc) + M9=$(echo 2^61-1|bc) + n=$(echo "$M8 * $M9" | bc) + /usr/bin/time -f %U factor $n + 4951760154835678088235319297: 2147483647 2305843009213693951 + 0.03 + + Similarly, factoring the eighth Fermat number 2^{256}+1 takes about +20 seconds on the same machine. + + Factoring large numbers is, in general, hard. The Pollard Rho +algorithm used by ‘factor’ is particularly effective for numbers with +relatively small factors. If you wish to factor large numbers which do +not have small factors (for example, numbers which are the product of +two large primes), other methods are far better. + + If ‘factor’ is built without using GNU MP, only single-precision +arithmetic is available, and so large numbers (typically 2^{64} and +above) will not be supported. The single-precision code uses an +algorithm which is designed for factoring smaller numbers. + + An exit status of zero indicates success, and a nonzero value +indicates failure. + + +File: coreutils.info, Node: numfmt invocation, Next: seq invocation, Prev: factor invocation, Up: Numeric operations + +26.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. + +26.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=FIELDS’ + Convert the number in input field FIELDS (default: 1). FIELDS + supports ‘cut’ style field ranges: + + N N'th field, counted from 1 + N- from N'th field, to end of line + N-M from N'th to M'th field (inclusive) + -M from first to M'th field (inclusive) + - all fields + +‘--format=FORMAT’ + Use printf-style floating FORMAT string. The FORMAT string must + contain one ‘%f’ directive, optionally with ‘'’, ‘-’, ‘0’, width or + precision modifiers. The ‘'’ modifier will enable ‘--grouping’, + the ‘-’ modifier will enable left-aligned ‘--padding’ and the width + modifier will enable right-aligned ‘--padding’. The ‘0’ width + modifier (without the ‘-’ modifier) will generate leading zeros on + the number, up to the specified width. A precision specification + like ‘%.1f’ will override the precision determined from the input + data or set due to ‘--to’ option auto scaling. + +‘--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’). Suffixes are handled as with ‘--from=auto’. + +‘--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-unit=1000’). Suffixes are handled as with ‘--from=auto’. + +26.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) -25 Delaying -*********** +IEC + Auto-scale numbers according to the _International Electrotechnical + 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: -* Menu: + ‘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) -* sleep invocation:: Delay for a specified time. + 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. - -File: coreutils.info, Node: sleep invocation, Up: Delaying +IEC-I + Auto-scale numbers according to the _International Electrotechnical + 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: -25.1 ‘sleep’: Delay for a specified time -======================================== + ‘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) -‘sleep’ pauses for an amount of time specified by the sum of the values -of the command line arguments. Synopsis: + 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. - sleep NUMBER[smhd]… +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. - Each argument is a number followed by an optional unit; the default -is seconds. The units are: +26.2.3 Examples of using ‘numfmt’ +--------------------------------- -‘s’ - seconds -‘m’ - minutes -‘h’ - hours -‘d’ - days +Converting a single number from/to _human_ representation: + $ numfmt --to=si 500000 + 500K - Historical implementations of ‘sleep’ have required that NUMBER be an -integer, and only accepted a single argument without a suffix. However, -GNU ‘sleep’ accepts arbitrary floating point numbers. *Note Floating -point::. + $ numfmt --to=iec 500000 + 489K - The only options are ‘--help’ and ‘--version’. *Note Common -options::. + $ numfmt --to=iec-i 500000 + 489Ki - Due to shell aliases and built-in ‘sleep’ functions, using an -unadorned ‘sleep’ interactively or in a script may get you different -functionality than that described here. Invoke it via ‘env’ (i.e., ‘env -sleep …’) to avoid interference from the shell. + $ numfmt --from=si 1M + 1000000 - An exit status of zero indicates success, and a nonzero value -indicates failure. + $ numfmt --from=iec 1M + 1048576 - -File: coreutils.info, Node: Numeric operations, Next: File permissions, Prev: Delaying, Up: Top + # with '--from=auto', M=Mega, Mi=Mebi + $ numfmt --from=auto 1M + 1000000 + $ numfmt --from=auto 1Mi + 1048576 -26 Numeric operations -********************* + 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): -These programs do numerically-related operations. + $ numfmt --from=si --to=iec 1T + 932G -* Menu: + 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): -* factor invocation:: Show factors of numbers. -* seq invocation:: Print sequences of numbers. + # 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 - -File: coreutils.info, Node: factor invocation, Next: seq invocation, Up: Numeric operations + # 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 -26.1 ‘factor’: Print prime factors -================================== + Output can be tweaked using ‘--padding’ or ‘--format’: -‘factor’ prints prime factors. Synopses: + # 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 - factor [NUMBER]… - factor OPTION + # 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 - If no NUMBER is specified on the command line, ‘factor’ reads numbers -from standard input, delimited by newlines, tabs, or spaces. + # 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 - The ‘factor’ command supports only a small number of options: + # 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 -‘--help’ - Print a short help on standard output, then exit without further - processing. + With locales that support grouping digits, using ‘--grouping’ or +‘--format’ enables grouping. In ‘POSIX’ locale, grouping is silently +ignored: -‘--version’ - Print the program version on standard output, then exit without - further processing. + $ LC_ALL=C numfmt --from=iec --grouping 2G + 2147483648 - Factoring the product of the eighth and ninth Mersenne primes takes -about 30 milliseconds of CPU time on a 2.2 GHz Athlon. + $ LC_ALL=en_US.utf8 numfmt --from=iec --grouping 2G + 2,147,483,648 - M8=$(echo 2^31-1|bc) - M9=$(echo 2^61-1|bc) - n=$(echo "$M8 * $M9" | bc) - /usr/bin/time -f %U factor $n - 4951760154835678088235319297: 2147483647 2305843009213693951 - 0.03 + $ LC_ALL=ta_IN numfmt --from=iec --grouping 2G + 2,14,74,83,648 - Similarly, factoring the eighth Fermat number 2^{256}+1 takes about -20 seconds on the same machine. + $ LC_ALL=C ./src/numfmt --from=iec --format="==%'15f==" 2G + == 2147483648== - Factoring large numbers is, in general, hard. The Pollard Rho -algorithm used by ‘factor’ is particularly effective for numbers with -relatively small factors. If you wish to factor large numbers which do -not have small factors (for example, numbers which are the product of -two large primes), other methods are far better. + $ LC_ALL=en_US.utf8 ./src/numfmt --from=iec --format="==%'15f==" 2G + == 2,147,483,648== - If ‘factor’ is built without using GNU MP, only single-precision -arithmetic is available, and so large numbers (typically 2^{64} and -above) will not be supported. The single-precision code uses an -algorithm which is designed for factoring smaller numbers. + $ LC_ALL=en_US.utf8 ./src/numfmt --from=iec --format="==%'-15f==" 2G + ==2,147,483,648 == - An exit status of zero indicates success, and a nonzero value -indicates failure. + $ LC_ALL=ta_IN ./src/numfmt --from=iec --format="==%'15f==" 2G + == 2,14,74,83,648==  -File: coreutils.info, Node: seq invocation, Prev: factor invocation, Up: Numeric operations +File: coreutils.info, Node: seq invocation, Prev: numfmt invocation, Up: Numeric operations -26.2 ‘seq’: Print numeric sequences +26.3 ‘seq’: Print numeric sequences =================================== ‘seq’ prints a sequence of numbers to standard output. Synopses: @@ -15548,7 +15765,7 @@ Index * ‘-’, removing files beginning with: rm invocation. (line 99) * --: Common options. (line 43) * --across: pr invocation. (line 62) -* --additional-suffix: split invocation. (line 121) +* --additional-suffix: split invocation. (line 128) * --address-radix: od invocation. (line 36) * --adjustment: nice invocation. (line 51) * --all: unexpand invocation. (line 37) @@ -15564,7 +15781,7 @@ Index * --almost-all: Which files are listed. (line 17) * --apparent-size: du invocation. (line 35) -* --append: tee invocation. (line 25) +* --append: tee invocation. (line 27) * --archive: cp invocation. (line 63) * --attributes-only: cp invocation. (line 72) * --author: What information is listed. @@ -15576,9 +15793,9 @@ Index * --backup <4>: ln invocation. (line 80) * --batch-size: sort invocation. (line 255) * --before: tac invocation. (line 21) -* --binary: md5sum invocation. (line 37) +* --binary: md5sum invocation. (line 40) * --block-size: Block size. (line 121) -* --block-size <1>: df invocation. (line 48) +* --block-size <1>: df invocation. (line 54) * --block-size <2>: du invocation. (line 52) * --block-size=SIZE: Block size. (line 12) * --body-numbering: nl invocation. (line 45) @@ -15589,7 +15806,7 @@ Index * --bytes: fold invocation. (line 23) * --bytes <1>: head invocation. (line 24) * --bytes <2>: tail invocation. (line 32) -* --bytes <3>: split invocation. (line 40) +* --bytes <3>: split invocation. (line 41) * --bytes <4>: wc invocation. (line 43) * --bytes <5>: cut invocation. (line 26) * --bytes <6>: du invocation. (line 57) @@ -15609,16 +15826,16 @@ Index * --check <1>: sort invocation. (line 26) * --check-chars: uniq invocation. (line 135) * --classify: General output formatting. - (line 46) + (line 47) * --color: General output formatting. - (line 21) + (line 22) * --columns: pr invocation. (line 49) * --compare: install invocation. (line 46) * --complement: cut invocation. (line 82) * --compute: runcon invocation. (line 27) * --context: What information is listed. (line 255) -* --context <1>: cp invocation. (line 376) +* --context <1>: cp invocation. (line 378) * --context <2>: install invocation. (line 138) * --context <3>: mv invocation. (line 112) * --context <4>: mkdir invocation. (line 56) @@ -15631,13 +15848,14 @@ Index * --crown-margin: fmt invocation. (line 34) * --csh: dircolors invocation. (line 40) +* --data: sync invocation. (line 32) * --date: touch invocation. (line 86) * --date <1>: Options for date. (line 11) * --dead: who invocation. (line 43) * --debug: numfmt invocation. (line 29) * --decode: base64 invocation. (line 30) -* --delimiter: numfmt invocation. (line 34) -* --delimiter <1>: cut invocation. (line 62) +* --delimiter: cut invocation. (line 62) +* --delimiter <1>: numfmt invocation. (line 34) * --delimiters: paste invocation. (line 61) * --dereference: Which files are listed. (line 83) @@ -15665,7 +15883,7 @@ Index * --double-space: pr invocation. (line 74) * --dry-run: mktemp invocation. (line 97) * --echo: shuf invocation. (line 19) -* --elide-empty-files: split invocation. (line 126) +* --elide-empty-files: split invocation. (line 133) * --elide-empty-files <1>: csplit invocation. (line 93) * --endian: od invocation. (line 51) * --error: stdbuf invocation. (line 34) @@ -15673,7 +15891,7 @@ Index (line 11) * --exact: shred invocation. (line 143) * --exclude-from=FILE: du invocation. (line 250) -* --exclude-type: df invocation. (line 214) +* --exclude-type: df invocation. (line 223) * --exclude=PATTERN: du invocation. (line 255) * --expand-tabs: pr invocation. (line 98) * --field: numfmt invocation. (line 38) @@ -15682,12 +15900,13 @@ Index * --file: stty invocation. (line 31) * --file <1>: Options for date. (line 26) * --file-system: stat invocation. (line 28) +* --file-system <1>: sync invocation. (line 37) * --file-type: General output formatting. - (line 57) -* --files0-from=FILE: wc invocation. (line 62) + (line 58) +* --files0-from=FILE: wc invocation. (line 64) * --files0-from=FILE <1>: sort invocation. (line 217) * --files0-from=FILE <2>: du invocation. (line 79) -* --filter: split invocation. (line 60) +* --filter: split invocation. (line 62) * --first-line-number: pr invocation. (line 174) * --follow: tail invocation. (line 48) * --footer-numbering: nl invocation. (line 70) @@ -15699,22 +15918,22 @@ Index * --foreground: timeout invocation. (line 24) * --form-feed: pr invocation. (line 106) * --format: od invocation. (line 89) -* --format <1>: numfmt invocation. (line 41) -* --format <2>: What information is listed. +* --format <1>: What information is listed. (line 131) -* --format <3>: General output formatting. +* --format <2>: General output formatting. (line 10) +* --format <3>: General output formatting. + (line 16) * --format <4>: General output formatting. - (line 15) + (line 93) * --format <5>: General output formatting. - (line 92) -* --format <6>: General output formatting. - (line 102) + (line 103) +* --format <6>: numfmt invocation. (line 48) * --format=FORMAT: stat invocation. (line 34) * --format=FORMAT <1>: seq invocation. (line 26) -* --from: numfmt invocation. (line 50) -* --from <1>: chown invocation. (line 83) -* --from-unit: numfmt invocation. (line 55) +* --from: chown invocation. (line 83) +* --from <1>: numfmt invocation. (line 59) +* --from-unit: numfmt invocation. (line 64) * --full-time: What information is listed. (line 100) * --general-numeric-sort: sort invocation. (line 104) @@ -15724,16 +15943,16 @@ Index * --group <2>: id invocation. (line 29) * --group-directories-first: Which files are listed. (line 50) -* --grouping: numfmt invocation. (line 61) +* --grouping: numfmt invocation. (line 70) * --groups: id invocation. (line 33) -* --groups <1>: chroot invocation. (line 31) +* --groups <1>: chroot invocation. (line 24) * --hardware-platform: uname invocation. (line 35) * --head-count: shuf invocation. (line 31) -* --header: numfmt invocation. (line 67) -* --header <1>: pr invocation. (line 111) -* --header <2>: join invocation. (line 87) +* --header: pr invocation. (line 111) +* --header <1>: join invocation. (line 87) +* --header <2>: numfmt invocation. (line 76) * --header-numbering: nl invocation. (line 74) -* --header=N: numfmt invocation. (line 67) +* --header=N: numfmt invocation. (line 76) * --heading: who invocation. (line 47) * --help: Common options. (line 36) * --hide-control-chars: Formatting the file names. @@ -15744,7 +15963,7 @@ Index * --human-readable: Block size. (line 121) * --human-readable <1>: What information is listed. (line 116) -* --human-readable <2>: df invocation. (line 63) +* --human-readable <2>: df invocation. (line 59) * --human-readable <3>: du invocation. (line 96) * --ignore: nproc invocation. (line 25) * --ignore-backups: Which files are listed. @@ -15755,24 +15974,24 @@ Index * --ignore-environment: env invocation. (line 94) * --ignore-fail-on-non-empty: rmdir invocation. (line 17) * --ignore-garbage: base64 invocation. (line 36) -* --ignore-interrupts: tee invocation. (line 30) +* --ignore-interrupts: tee invocation. (line 32) * --ignore-leading-blanks: sort invocation. (line 78) * --ignore-nonprinting: sort invocation. (line 142) * --ignore=PATTERN: Which files are listed. (line 69) * --indent: pr invocation. (line 180) * --indicator-style: General output formatting. - (line 46) + (line 47) * --indicator-style <1>: General output formatting. - (line 57) + (line 58) * --indicator-style <2>: General output formatting. - (line 61) + (line 62) * --indicator-style <3>: General output formatting. - (line 97) + (line 98) * --initial: expand invocation. (line 33) * --inode: What information is listed. (line 123) -* --inodes: df invocation. (line 73) +* --inodes: df invocation. (line 69) * --inodes <1>: du invocation. (line 102) * --input: stdbuf invocation. (line 26) * --input-range: shuf invocation. (line 23) @@ -15780,7 +15999,7 @@ Index * --interactive <1>: mv invocation. (line 67) * --interactive <2>: rm invocation. (line 54) * --interactive <3>: ln invocation. (line 96) -* --invalid: numfmt invocation. (line 70) +* --invalid: numfmt invocation. (line 79) * --io-blocks: truncate invocation. (line 26) * --iso-8601[=TIMESPEC]: Options for date. (line 34) * --iterations=NUMBER: shred invocation. (line 106) @@ -15792,10 +16011,10 @@ Index * --kernel-version: uname invocation. (line 76) * --key: sort invocation. (line 230) * --kibibytes: General output formatting. - (line 80) -* --kill-after: timeout invocation. (line 38) + (line 81) +* --kill-after: timeout invocation. (line 41) * --length: pr invocation. (line 133) -* --line-bytes: split invocation. (line 54) +* --line-bytes: split invocation. (line 55) * --line-increment: nl invocation. (line 78) * --lines: head invocation. (line 39) * --lines <1>: tail invocation. (line 162) @@ -15804,7 +16023,7 @@ Index * --link: cp invocation. (line 144) * --literal: Formatting the file names. (line 17) -* --local: df invocation. (line 84) +* --local: df invocation. (line 80) * --logical: ln invocation. (line 100) * --logical <1>: realpath invocation. (line 30) * --logical <2>: pwd invocation. (line 15) @@ -15847,9 +16066,9 @@ Index * --no-preserve-root <4>: chcon invocation. (line 43) * --no-renumber: nl invocation. (line 101) * --no-symlinks: realpath invocation. (line 69) -* --no-sync: df invocation. (line 88) +* --no-sync: df invocation. (line 84) * --no-target-directory: Target directory. (line 15) -* --no-target-directory <1>: cp invocation. (line 347) +* --no-target-directory <1>: cp invocation. (line 349) * --no-target-directory <2>: install invocation. (line 129) * --no-target-directory <3>: mv invocation. (line 107) * --no-target-directory <4>: ln invocation. (line 173) @@ -15858,43 +16077,44 @@ Index * --null <1>: printenv invocation. (line 19) * --null <2>: env invocation. (line 82) * --number: cat invocation. (line 31) -* --number <1>: split invocation. (line 76) +* --number <1>: split invocation. (line 78) * --number-format: nl invocation. (line 90) * --number-lines: pr invocation. (line 153) * --number-nonblank: cat invocation. (line 20) * --number-separator: nl invocation. (line 105) * --number-width: nl invocation. (line 115) * --numeric-sort: sort invocation. (line 159) -* --numeric-suffixes: split invocation. (line 114) +* --numeric-suffixes: split invocation. (line 116) * --numeric-uid-gid: What information is listed. (line 222) * --omit-header: pr invocation. (line 210) * --omit-pagination: pr invocation. (line 220) -* --one-file-system: cp invocation. (line 370) +* --one-file-system: cp invocation. (line 372) * --one-file-system <1>: rm invocation. (line 65) * --one-file-system <2>: du invocation. (line 261) * --only-delimited: cut invocation. (line 70) * --operating-system: uname invocation. (line 57) * --output: sort invocation. (line 281) * --output <1>: shuf invocation. (line 36) -* --output <2>: df invocation. (line 95) +* --output <2>: df invocation. (line 91) * --output <3>: stdbuf invocation. (line 30) * --output-delimiter: cut invocation. (line 75) * --output-duplicates: od invocation. (line 149) +* --output-error: tee invocation. (line 36) * --output-tabs: pr invocation. (line 117) * --owner: install invocation. (line 91) -* --padding: numfmt invocation. (line 78) +* --padding: numfmt invocation. (line 87) * --pages=PAGE_RANGE: pr invocation. (line 39) * --page_width: pr invocation. (line 239) * --parallel: sort invocation. (line 351) -* --parents: cp invocation. (line 236) +* --parents: cp invocation. (line 238) * --parents <1>: mkdir invocation. (line 34) * --parents <2>: rmdir invocation. (line 22) * --physical: ln invocation. (line 125) * --physical <1>: realpath invocation. (line 35) * --physical <2>: pwd invocation. (line 22) * --pid: tail invocation. (line 130) -* --portability: df invocation. (line 152) +* --portability: df invocation. (line 148) * --portability <1>: pathchk invocation. (line 44) * --prefix: csplit invocation. (line 61) * --preserve: cp invocation. (line 168) @@ -15908,14 +16128,14 @@ Index * --preserve-timestamps: install invocation. (line 103) * --print-database: dircolors invocation. (line 45) -* --print-type: df invocation. (line 191) +* --print-type: df invocation. (line 200) * --printf=FORMAT: stat invocation. (line 43) * --process: who invocation. (line 65) * --processor: uname invocation. (line 50) * --quiet: head invocation. (line 46) * --quiet <1>: tail invocation. (line 170) * --quiet <2>: csplit invocation. (line 104) -* --quiet <3>: md5sum invocation. (line 68) +* --quiet <3>: md5sum invocation. (line 74) * --quiet <4>: readlink invocation. (line 56) * --quiet <5>: chown invocation. (line 79) * --quiet <6>: chgrp invocation. (line 30) @@ -15943,7 +16163,7 @@ Index * --real: id invocation. (line 42) * --recursive: Which files are listed. (line 90) -* --recursive <1>: cp invocation. (line 249) +* --recursive <1>: cp invocation. (line 251) * --recursive <2>: rm invocation. (line 93) * --recursive <3>: chown invocation. (line 143) * --recursive <4>: chgrp invocation. (line 70) @@ -15956,13 +16176,13 @@ Index * --reference <4>: truncate invocation. (line 30) * --reference <5>: Options for date. (line 59) * --reference <6>: chcon invocation. (line 30) -* --reflink[=WHEN]: cp invocation. (line 262) +* --reflink[=WHEN]: cp invocation. (line 264) * --regex: tac invocation. (line 26) * --relative: ln invocation. (line 134) * --relative-base: realpath invocation. (line 49) * --relative-to: realpath invocation. (line 44) * --remove: shred invocation. (line 123) -* --remove-destination: cp invocation. (line 288) +* --remove-destination: cp invocation. (line 290) * --remove=unlink: shred invocation. (line 123) * --remove=wipe: shred invocation. (line 123) * --remove=wipesync: shred invocation. (line 123) @@ -15976,12 +16196,12 @@ Index * --rfc-822: Options for date. (line 65) * --role: chcon invocation. (line 69) * --role <1>: runcon invocation. (line 35) -* --round: numfmt invocation. (line 85) -* --round=down: numfmt invocation. (line 85) -* --round=from-zero: numfmt invocation. (line 85) -* --round=nearest: numfmt invocation. (line 85) -* --round=towards-zero: numfmt invocation. (line 85) -* --round=up: numfmt invocation. (line 85) +* --round: numfmt invocation. (line 94) +* --round=down: numfmt invocation. (line 94) +* --round=from-zero: numfmt invocation. (line 94) +* --round=nearest: numfmt invocation. (line 94) +* --round=towards-zero: numfmt invocation. (line 94) +* --round=up: numfmt invocation. (line 94) * --runlevel: who invocation. (line 74) * --save: stty invocation. (line 41) * --section-delimiter: nl invocation. (line 63) @@ -15989,6 +16209,7 @@ Index * --separate-dirs: du invocation. (line 138) * --separator: tac invocation. (line 30) * --separator <1>: pr invocation. (line 192) +* --separator <2>: split invocation. (line 141) * --serial: paste invocation. (line 52) * --set: Options for date. (line 106) * --sh: dircolors invocation. @@ -16004,9 +16225,9 @@ Index * --si: Block size. (line 121) * --si <1>: What information is listed. (line 247) -* --si <2>: df invocation. (line 171) +* --si <2>: df invocation. (line 167) * --si <3>: du invocation. (line 145) -* --signal: timeout invocation. (line 45) +* --signal: timeout invocation. (line 48) * --silent: head invocation. (line 46) * --silent <1>: tail invocation. (line 170) * --silent <2>: csplit invocation. (line 104) @@ -16021,6 +16242,7 @@ Index * --size=BYTES: shred invocation. (line 117) * --skip-bytes: od invocation. (line 59) * --skip-chars: uniq invocation. (line 41) +* --skip-chdir: chroot invocation. (line 37) * --skip-fields: uniq invocation. (line 31) * --sleep-interval: tail invocation. (line 120) * --sort: sort invocation. (line 104) @@ -16034,49 +16256,49 @@ Index * --sort <8>: Sorting the output. (line 56) * --sort <9>: Sorting the output. (line 63) * --spaces: fold invocation. (line 29) -* --sparse=WHEN: cp invocation. (line 292) +* --sparse=WHEN: cp invocation. (line 294) * --split-only: fmt invocation. (line 47) * --squeeze-blank: cat invocation. (line 36) * --stable: sort invocation. (line 299) * --starting-line-number: nl invocation. (line 110) -* --status: md5sum invocation. (line 76) -* --strict: md5sum invocation. (line 109) +* --status: md5sum invocation. (line 82) +* --strict: md5sum invocation. (line 115) * --strings: od invocation. (line 80) * --strip: install invocation. (line 113) * --strip <1>: realpath invocation. (line 69) * --strip-program: install invocation. (line 116) -* --strip-trailing-slashes: cp invocation. (line 325) +* --strip-trailing-slashes: cp invocation. (line 327) * --strip-trailing-slashes <1>: mv invocation. (line 93) * --suffix: Backup options. (line 49) -* --suffix <1>: numfmt invocation. (line 90) -* --suffix <2>: csplit invocation. (line 65) -* --suffix <3>: cp invocation. (line 338) -* --suffix <4>: install invocation. (line 120) -* --suffix <5>: mv invocation. (line 98) -* --suffix <6>: ln invocation. (line 164) -* --suffix <7>: basename invocation. (line 38) -* --suffix <8>: mktemp invocation. (line 113) -* --suffix-length: split invocation. (line 106) +* --suffix <1>: csplit invocation. (line 65) +* --suffix <2>: cp invocation. (line 340) +* --suffix <3>: install invocation. (line 120) +* --suffix <4>: mv invocation. (line 98) +* --suffix <5>: ln invocation. (line 164) +* --suffix <6>: basename invocation. (line 38) +* --suffix <7>: mktemp invocation. (line 113) +* --suffix <8>: numfmt invocation. (line 99) +* --suffix-length: split invocation. (line 108) * --summarize: du invocation. (line 153) * --suppress-matched: csplit invocation. (line 87) * --symbolic: ln invocation. (line 158) -* --symbolic-link: cp invocation. (line 330) -* --sync: df invocation. (line 178) +* --symbolic-link: cp invocation. (line 332) +* --sync: df invocation. (line 174) * --sysv: sum invocation. (line 31) * --tabs: expand invocation. (line 22) * --tabs <1>: unexpand invocation. (line 24) * --tabsize: General output formatting. - (line 106) -* --tag: md5sum invocation. (line 85) + (line 107) +* --tag: md5sum invocation. (line 91) * --tagged-paragraph: fmt invocation. (line 40) * --target-directory: Target directory. (line 31) -* --target-directory <1>: cp invocation. (line 343) +* --target-directory <1>: cp invocation. (line 345) * --target-directory <2>: install invocation. (line 125) * --target-directory <3>: mv invocation. (line 103) * --target-directory <4>: ln invocation. (line 169) * --temporary-directory: sort invocation. (line 343) * --terse: stat invocation. (line 54) -* --text: md5sum invocation. (line 95) +* --text: md5sum invocation. (line 101) * --threshold: du invocation. (line 157) * --time: Sorting the output. (line 13) * --time <1>: Sorting the output. (line 42) @@ -16090,31 +16312,31 @@ Index (line 24) * --time-style <1>: du invocation. (line 212) * --tmpdir: mktemp invocation. (line 105) -* --to: numfmt invocation. (line 94) -* --to-unit: numfmt invocation. (line 99) -* --total: df invocation. (line 52) +* --to: numfmt invocation. (line 103) +* --to-unit: numfmt invocation. (line 108) +* --total: df invocation. (line 180) * --total <1>: du invocation. (line 61) * --traditional: od invocation. (line 199) -* --type: df invocation. (line 185) +* --type: df invocation. (line 194) * --type <1>: chcon invocation. (line 73) * --type <2>: runcon invocation. (line 39) -* --unbuffered: split invocation. (line 134) +* --unbuffered: split invocation. (line 148) * --uniform-spacing: fmt invocation. (line 53) * --unique: sort invocation. (line 359) * --unique <1>: uniq invocation. (line 129) * --universal: Options for date. (line 112) * --unset: env invocation. (line 88) -* --update: cp invocation. (line 352) +* --update: cp invocation. (line 354) * --update <1>: mv invocation. (line 80) * --user: id invocation. (line 47) * --user <1>: chcon invocation. (line 65) * --user <2>: runcon invocation. (line 31) -* --userspec: chroot invocation. (line 24) +* --userspec: chroot invocation. (line 30) * --utc: Options for date. (line 112) * --verbose: head invocation. (line 50) * --verbose <1>: tail invocation. (line 174) -* --verbose <2>: split invocation. (line 138) -* --verbose <3>: cp invocation. (line 366) +* --verbose <2>: split invocation. (line 152) +* --verbose <3>: cp invocation. (line 368) * --verbose <4>: install invocation. (line 134) * --verbose <5>: mv invocation. (line 90) * --verbose <6>: rm invocation. (line 97) @@ -16129,13 +16351,13 @@ Index * --verbose <15>: chcon invocation. (line 61) * --version: Common options. (line 40) * --version-sort: sort invocation. (line 176) -* --warn: md5sum invocation. (line 104) +* --warn: md5sum invocation. (line 110) * --width: od invocation. (line 156) * --width <1>: fmt invocation. (line 59) * --width <2>: pr invocation. (line 229) * --width <3>: fold invocation. (line 35) * --width <4>: General output formatting. - (line 117) + (line 118) * --words: wc invocation. (line 51) * --wrap: base64 invocation. (line 22) * --writable: who invocation. (line 94) @@ -16163,7 +16385,7 @@ Index * -A <1>: od invocation. (line 36) * -a: od invocation. (line 168) * -a <1>: pr invocation. (line 62) -* -a <2>: split invocation. (line 106) +* -a <2>: split invocation. (line 108) * -a <3>: join invocation. (line 72) * -a <4>: unexpand invocation. (line 37) * -a <5>: Which files are listed. @@ -16176,7 +16398,7 @@ Index * -a <9>: du invocation. (line 32) * -a <10>: Connectives for test. (line 12) -* -a <11>: tee invocation. (line 25) +* -a <11>: tee invocation. (line 27) * -a <12>: basename invocation. (line 32) * -a <13>: stty invocation. (line 26) * -a <14>: who invocation. (line 35) @@ -16187,9 +16409,9 @@ Index * -b <3>: nl invocation. (line 45) * -b <4>: od invocation. (line 171) * -b <5>: fold invocation. (line 23) -* -b <6>: split invocation. (line 40) +* -b <6>: split invocation. (line 41) * -b <7>: csplit invocation. (line 65) -* -b <8>: md5sum invocation. (line 37) +* -b <8>: md5sum invocation. (line 40) * -b <9>: sort invocation. (line 78) * -b <10>: cut invocation. (line 26) * -B: Which files are listed. @@ -16202,7 +16424,7 @@ Index * -b <14>: install invocation. (line 41) * -b <15>: mv invocation. (line 56) * -b <16>: ln invocation. (line 80) -* -B <1>: df invocation. (line 48) +* -B <1>: df invocation. (line 54) * -B <2>: du invocation. (line 52) * -b <17>: du invocation. (line 57) * -b <18>: File type tests. (line 10) @@ -16212,7 +16434,7 @@ Index * -c <2>: pr invocation. (line 68) * -c <3>: head invocation. (line 24) * -c <4>: tail invocation. (line 32) -* -C: split invocation. (line 54) +* -C: split invocation. (line 55) * -c <5>: wc invocation. (line 43) * -c <6>: sort invocation. (line 18) * -c <7>: sort invocation. (line 26) @@ -16221,7 +16443,7 @@ Index * -c <10>: cut invocation. (line 34) * -c <11>: Sorting the output. (line 13) * -C <1>: General output formatting. - (line 15) + (line 16) * -c <12>: dircolors invocation. (line 40) * -C <2>: install invocation. (line 46) @@ -16239,34 +16461,34 @@ Index * -d: nl invocation. (line 63) * -d <1>: od invocation. (line 178) * -d <2>: base64 invocation. (line 30) -* -d <3>: numfmt invocation. (line 34) -* -d <4>: pr invocation. (line 74) -* -d <5>: split invocation. (line 114) -* -d <6>: sort invocation. (line 86) -* -d <7>: uniq invocation. (line 63) +* -d <3>: pr invocation. (line 74) +* -d <4>: split invocation. (line 116) +* -d <5>: sort invocation. (line 86) +* -d <6>: uniq invocation. (line 63) * -D: uniq invocation. (line 69) -* -d <8>: cut invocation. (line 62) -* -d <9>: paste invocation. (line 61) -* -d <10>: Which files are listed. +* -d <7>: cut invocation. (line 62) +* -d <8>: paste invocation. (line 61) +* -d <9>: Which files are listed. (line 28) * -D <1>: What information is listed. (line 16) -* -d <11>: cp invocation. (line 109) +* -d <10>: cp invocation. (line 109) * -D <2>: install invocation. (line 60) -* -d <12>: install invocation. (line 67) -* -d <13>: rm invocation. (line 35) -* -d <14>: ln invocation. (line 86) -* -d <15>: touch invocation. (line 86) +* -d <11>: install invocation. (line 67) +* -d <12>: rm invocation. (line 35) +* -d <13>: ln invocation. (line 86) +* -d <14>: touch invocation. (line 86) * -D <3>: du invocation. (line 67) -* -d <16>: File type tests. (line 16) -* -d <17>: mktemp invocation. (line 85) -* -d <18>: who invocation. (line 43) -* -d <19>: Options for date. (line 11) +* -d <15>: File type tests. (line 16) +* -d <16>: mktemp invocation. (line 85) +* -d <17>: who invocation. (line 43) +* -d <18>: Options for date. (line 11) +* -d <19>: numfmt invocation. (line 34) * -d DEPTH: du invocation. (line 74) * -e: cat invocation. (line 23) * -E: cat invocation. (line 27) * -e <1>: pr invocation. (line 98) -* -e <2>: split invocation. (line 126) +* -e <2>: split invocation. (line 133) * -e <3>: join invocation. (line 83) * -e <4>: readlink invocation. (line 37) * -e <5>: echo invocation. (line 25) @@ -16290,7 +16512,7 @@ Index * -f <7>: cut invocation. (line 43) * -f <8>: Sorting the output. (line 20) * -F <2>: General output formatting. - (line 46) + (line 47) * -f <9>: cp invocation. (line 115) * -f <10>: mv invocation. (line 61) * -f <11>: rm invocation. (line 39) @@ -16338,8 +16560,8 @@ Index * -h <6>: chgrp invocation. (line 39) * -H <4>: chgrp invocation. (line 74) * -h <7>: touch invocation. (line 100) -* -h <8>: df invocation. (line 63) -* -H <5>: df invocation. (line 69) +* -h <8>: df invocation. (line 59) +* -H <5>: df invocation. (line 65) * -H <6>: du invocation. (line 92) * -h <9>: du invocation. (line 96) * -h <10>: File type tests. (line 23) @@ -16364,8 +16586,8 @@ Index * -i <12>: rm invocation. (line 43) * -I <1>: rm invocation. (line 48) * -i <13>: ln invocation. (line 96) -* -i <14>: df invocation. (line 73) -* -i <15>: tee invocation. (line 30) +* -i <14>: df invocation. (line 69) +* -i <15>: tee invocation. (line 32) * -i <16>: uname invocation. (line 35) * -i <17>: env invocation. (line 94) * -i <18>: stdbuf invocation. (line 26) @@ -16376,12 +16598,12 @@ Index * -k <1>: csplit invocation. (line 84) * -k <2>: sort invocation. (line 230) * -k <3>: General output formatting. - (line 80) -* -k <4>: df invocation. (line 78) + (line 81) +* -k <4>: df invocation. (line 74) * -k <5>: du invocation. (line 111) * -k <6>: Access permission tests. (line 12) -* -k <7>: timeout invocation. (line 38) +* -k <7>: timeout invocation. (line 41) * -L: Traversing symlinks. (line 22) * -l: nl invocation. (line 82) * -l <1>: od invocation. (line 187) @@ -16398,7 +16620,7 @@ Index * -L <4>: ln invocation. (line 100) * -L <5>: chown invocation. (line 151) * -L <6>: chgrp invocation. (line 79) -* -l <7>: df invocation. (line 84) +* -l <7>: df invocation. (line 80) * -L <7>: du invocation. (line 117) * -l <8>: du invocation. (line 123) * -L <8>: stat invocation. (line 22) @@ -16416,7 +16638,7 @@ Index * -m <2>: sort invocation. (line 32) * -M: sort invocation. (line 149) * -m <3>: General output formatting. - (line 92) + (line 93) * -m <4>: install invocation. (line 79) * -m <5>: mkdir invocation. (line 19) * -m <6>: mkfifo invocation. (line 21) @@ -16434,7 +16656,7 @@ Index * -N <1>: pr invocation. (line 174) * -n <3>: head invocation. (line 39) * -n <4>: tail invocation. (line 162) -* -n <5>: split invocation. (line 76) +* -n <5>: split invocation. (line 78) * -n <6>: csplit invocation. (line 79) * -n <7>: sort invocation. (line 159) * -n <8>: shuf invocation. (line 31) @@ -16475,7 +16697,7 @@ Index * -P: Traversing symlinks. (line 26) * -p: nl invocation. (line 101) * -p <1>: General output formatting. - (line 97) + (line 98) * -p <2>: dircolors invocation. (line 45) * -P <1>: cp invocation. (line 161) @@ -16486,16 +16708,17 @@ Index * -p <6>: rmdir invocation. (line 22) * -P <3>: chown invocation. (line 155) * -P <4>: chgrp invocation. (line 83) -* -P <5>: df invocation. (line 152) +* -P <5>: df invocation. (line 148) * -P <6>: du invocation. (line 133) * -p <7>: File type tests. (line 28) -* -p <8>: pathchk invocation. (line 27) +* -p <8>: tee invocation. (line 36) +* -p <9>: pathchk invocation. (line 27) * -P <7>: pathchk invocation. (line 40) -* -p <9>: mktemp invocation. (line 105) +* -p <10>: mktemp invocation. (line 105) * -P <8>: realpath invocation. (line 35) * -P <9>: pwd invocation. (line 22) -* -p <10>: who invocation. (line 65) -* -p <11>: uname invocation. (line 50) +* -p <11>: who invocation. (line 65) +* -p <12>: uname invocation. (line 50) * -P <10>: chcon invocation. (line 56) * -q: head invocation. (line 46) * -q <1>: tail invocation. (line 170) @@ -16517,8 +16740,8 @@ Index * -R <1>: Which files are listed. (line 90) * -r <5>: Sorting the output. (line 27) -* -R <2>: cp invocation. (line 249) -* -r <6>: cp invocation. (line 249) +* -R <2>: cp invocation. (line 251) +* -r <6>: cp invocation. (line 251) * -r <7>: rm invocation. (line 93) * -R <3>: rm invocation. (line 93) * -r <8>: ln invocation. (line 134) @@ -16557,8 +16780,8 @@ Index * -s <13>: What information is listed. (line 232) * -S <4>: Sorting the output. (line 32) -* -s <14>: cp invocation. (line 330) -* -S <5>: cp invocation. (line 338) +* -s <14>: cp invocation. (line 332) +* -S <5>: cp invocation. (line 340) * -s <15>: install invocation. (line 113) * -S <6>: install invocation. (line 120) * -S <7>: mv invocation. (line 98) @@ -16577,7 +16800,7 @@ Index * -s <24>: who invocation. (line 78) * -s <25>: Options for date. (line 106) * -s <26>: uname invocation. (line 65) -* -s <27>: timeout invocation. (line 45) +* -s <27>: timeout invocation. (line 48) * -s BYTES: shred invocation. (line 117) * -t: cat invocation. (line 40) * -T: cat invocation. (line 44) @@ -16585,40 +16808,41 @@ Index * -t <2>: fmt invocation. (line 40) * -t <3>: pr invocation. (line 210) * -T <1>: pr invocation. (line 220) -* -t <4>: md5sum invocation. (line 95) -* -t <5>: sort invocation. (line 322) +* -t <4>: split invocation. (line 141) +* -t <5>: md5sum invocation. (line 101) +* -t <6>: sort invocation. (line 322) * -T <2>: sort invocation. (line 343) -* -t <6>: expand invocation. (line 22) -* -t <7>: unexpand invocation. (line 24) -* -t <8>: Sorting the output. (line 36) +* -t <7>: expand invocation. (line 22) +* -t <8>: unexpand invocation. (line 24) +* -t <9>: Sorting the output. (line 36) * -T <3>: General output formatting. - (line 106) -* -t <9>: cp invocation. (line 343) -* -T <4>: cp invocation. (line 347) -* -t <10>: install invocation. (line 125) + (line 107) +* -t <10>: cp invocation. (line 345) +* -T <4>: cp invocation. (line 349) +* -t <11>: install invocation. (line 125) * -T <5>: install invocation. (line 129) -* -t <11>: mv invocation. (line 103) +* -t <12>: mv invocation. (line 103) * -T <6>: mv invocation. (line 107) -* -t <12>: ln invocation. (line 169) +* -t <13>: ln invocation. (line 169) * -T <7>: ln invocation. (line 173) -* -t <13>: df invocation. (line 185) -* -T <8>: df invocation. (line 191) -* -t <14>: du invocation. (line 157) -* -t <15>: stat invocation. (line 54) -* -t <16>: File type tests. (line 34) -* -t <17>: mktemp invocation. (line 121) -* -t <18>: who invocation. (line 82) +* -t <14>: df invocation. (line 194) +* -T <8>: df invocation. (line 200) +* -t <15>: du invocation. (line 157) +* -t <16>: stat invocation. (line 54) +* -t <17>: File type tests. (line 34) +* -t <18>: mktemp invocation. (line 121) +* -t <19>: who invocation. (line 82) * -T <9>: who invocation. (line 94) -* -t <19>: chcon invocation. (line 73) -* -t <20>: runcon invocation. (line 39) +* -t <20>: chcon invocation. (line 73) +* -t <21>: runcon invocation. (line 39) * -u: cat invocation. (line 47) * -u <1>: fmt invocation. (line 53) -* -u <2>: split invocation. (line 134) +* -u <2>: split invocation. (line 148) * -u <3>: sort invocation. (line 359) * -u <4>: uniq invocation. (line 129) * -u <5>: Sorting the output. (line 42) * -U: Sorting the output. (line 49) -* -u <6>: cp invocation. (line 352) +* -u <6>: cp invocation. (line 354) * -u <7>: mv invocation. (line 80) * -u <8>: shred invocation. (line 123) * -u <9>: Access permission tests. @@ -16638,7 +16862,7 @@ Index * -v <5>: tail invocation. (line 174) * -V: sort invocation. (line 176) * -v <6>: Sorting the output. (line 56) -* -v <7>: cp invocation. (line 366) +* -v <7>: cp invocation. (line 368) * -v <8>: install invocation. (line 134) * -v <9>: mv invocation. (line 90) * -v <10>: rm invocation. (line 97) @@ -16660,10 +16884,10 @@ Index * -W: pr invocation. (line 239) * -w <5>: fold invocation. (line 35) * -w <6>: wc invocation. (line 51) -* -w <7>: md5sum invocation. (line 104) +* -w <7>: md5sum invocation. (line 110) * -w <8>: uniq invocation. (line 135) * -w <9>: General output formatting. - (line 117) + (line 118) * -w <10>: Access permission tests. (line 21) * -w <11>: who invocation. (line 94) @@ -16671,10 +16895,10 @@ Index * -x: od invocation. (line 196) * -X: Sorting the output. (line 63) * -x <1>: General output formatting. - (line 102) -* -x <2>: cp invocation. (line 370) + (line 103) +* -x <2>: cp invocation. (line 372) * -x <3>: shred invocation. (line 143) -* -x <4>: df invocation. (line 214) +* -x <4>: df invocation. (line 223) * -x <5>: du invocation. (line 261) * -x <6>: Access permission tests. (line 24) @@ -16686,7 +16910,7 @@ Index * -z <4>: join invocation. (line 155) * -Z: What information is listed. (line 255) -* -Z <1>: cp invocation. (line 376) +* -Z <1>: cp invocation. (line 378) * -Z <2>: install invocation. (line 138) * -Z <3>: mv invocation. (line 112) * -z <5>: shred invocation. (line 154) @@ -16736,14 +16960,14 @@ Index * access permission tests: Access permission tests. (line 6) * access permissions, changing: chmod invocation. (line 6) -* access time: dd invocation. (line 246) +* access time: dd invocation. (line 253) * 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 208) * across columns: pr invocation. (line 62) * across, listing files: General output formatting. - (line 102) + (line 103) * adding permissions: Setting Permissions. (line 35) * addition: Numeric expressions. (line 12) * ago in date strings: Relative items in date strings. @@ -16752,17 +16976,17 @@ Index * all repeated lines, outputting: uniq invocation. (line 69) * alnum: Character sets. (line 88) * alpha: Character sets. (line 90) -* alternate ebcdic, converting to: dd invocation. (line 96) +* alternate ebcdic, converting to: dd invocation. (line 103) * always color option: General output formatting. - (line 25) + (line 26) * always interactive option: rm invocation. (line 59) * am i: who invocation. (line 21) * am in date strings: Time of day items. (line 21) * and operator: Connectives for test. (line 12) * and operator <1>: Relations for expr. (line 17) -* append: dd invocation. (line 185) -* appending to the output file: dd invocation. (line 185) +* append: dd invocation. (line 192) +* appending to the output file: dd invocation. (line 192) * appropriate privileges: install invocation. (line 91) * appropriate privileges <1>: Setting the time. (line 6) * appropriate privileges <2>: hostname invocation. (line 6) @@ -16772,7 +16996,7 @@ 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 85) +* ascii, converting to: dd invocation. (line 92) * 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 208) @@ -16781,8 +17005,7 @@ Index * authors of ‘parse_datetime’: Authors of parse_datetime. (line 6) * auto color option: General output formatting. - (line 24) -* automounter file systems: df invocation. (line 42) + (line 25) * b for block special file: mknod invocation. (line 31) * background jobs, stopping at terminal write: Local. (line 41) * backslash escapes: Character sets. (line 14) @@ -16817,15 +17040,15 @@ Index * Berry, K.: Introduction. (line 19) * Berry, K. <1>: Authors of parse_datetime. (line 19) -* binary: dd invocation. (line 263) -* binary I/O: dd invocation. (line 263) -* binary input files: md5sum invocation. (line 37) +* binary: dd invocation. (line 270) +* binary I/O: dd invocation. (line 270) +* binary input files: md5sum invocation. (line 40) * bind mount: rm invocation. (line 69) -* bind mount <1>: stat invocation. (line 123) +* bind mount <1>: stat invocation. (line 134) * blank: Character sets. (line 92) * blank lines, numbering: nl invocation. (line 82) * blanks, ignoring leading: sort invocation. (line 78) -* block (space-padding): dd invocation. (line 106) +* block (space-padding): dd invocation. (line 113) * block size: Block size. (line 6) * block size <1>: dd invocation. (line 34) * block size of conversion: dd invocation. (line 41) @@ -16843,12 +17066,12 @@ Index * breaks, ignoring: Input. (line 9) * brkint: Input. (line 12) * bs: dd invocation. (line 34) -* BSD output: md5sum invocation. (line 85) +* BSD output: md5sum invocation. (line 91) * BSD ‘sum’: sum invocation. (line 25) * BSD ‘tail’: tail invocation. (line 19) * BSD ‘touch’ compatibility: touch invocation. (line 96) * bsN: Output. (line 55) -* btrfs file system type: df invocation. (line 202) +* btrfs file system type: df invocation. (line 211) * bugs, reporting: Introduction. (line 12) * built-in shell commands, conflicts with: mknod invocation. (line 20) * built-in shell commands, conflicts with <1>: stat invocation. @@ -16869,13 +17092,13 @@ Index (line 31) * byte count: wc invocation. (line 6) * byte-swapping: od invocation. (line 51) -* byte-swapping <1>: dd invocation. (line 137) +* byte-swapping <1>: dd invocation. (line 144) * c for character special file: mknod invocation. (line 34) * C shell syntax for color setup: dircolors invocation. (line 40) * C-s/C-q flow control: Input. (line 40) * calendar date item: Calendar date items. (line 6) -* calling combined multi-call binary: coreutils invocation. +* calling combined multi-call program: Multi-call invocation. (line 6) * canonical file name: readlink invocation. (line 6) * canonical file name <1>: realpath invocation. (line 6) @@ -16887,8 +17110,8 @@ Index * cat: cat invocation. (line 6) * cbreak: Combination. (line 52) * cbs: dd invocation. (line 41) -* CD-ROM file system type: df invocation. (line 206) -* cdfs file system type: df invocation. (line 206) +* CD-ROM file system type: df invocation. (line 215) +* cdfs file system type: df invocation. (line 215) * cdtrdsr: Control. (line 44) * change or print terminal settings: stty invocation. (line 6) * change SELinux context: chcon invocation. (line 6) @@ -16926,13 +17149,13 @@ Index * chmod: chmod invocation. (line 6) * chown: chown invocation. (line 6) * chroot: chroot invocation. (line 6) -* cio: dd invocation. (line 193) +* cio: dd invocation. (line 200) * cksum: cksum invocation. (line 6) * clocal: Control. (line 38) * clock skew: Formatting file timestamps. (line 11) * clock skew <1>: touch invocation. (line 17) -* clone: cp invocation. (line 262) +* clone: cp invocation. (line 264) * cmspar: Control. (line 16) * cntrl: Character sets. (line 94) * color database, printing: dircolors invocation. @@ -16940,15 +17163,15 @@ Index * color setup: dircolors invocation. (line 6) * color, distinguishing file types with: General output formatting. - (line 21) + (line 22) * cols: Special. (line 27) * column to wrap data after: base64 invocation. (line 22) * COLUMNS: General output formatting. - (line 117) + (line 118) * COLUMNS <1>: Special. (line 30) * columns: Special. (line 27) * combination settings: Combination. (line 6) -* combined: coreutils invocation. +* combined: Multi-call invocation. (line 6) * combined date and time of day item: Combined date and time of day items. (line 6) @@ -16968,7 +17191,7 @@ Index * commands for SELinux context: SELinux context. (line 6) * commands for system context: System context. (line 6) * commas, outputting between files: General output formatting. - (line 92) + (line 93) * comments, in dates: General date syntax. (line 60) * common field, joining on: join invocation. (line 6) * common lines: comm invocation. (line 18) @@ -16977,7 +17200,7 @@ 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 193) +* concurrent I/O: dd invocation. (line 200) * conditional executability: Conditional Executability. (line 6) * conditions: Conditions. (line 6) @@ -16998,8 +17221,8 @@ Index * context, system: System context. (line 6) * control characters, using ‘^C’: Local. (line 51) * control settings: Control. (line 6) -* controlling terminal: dd invocation. (line 251) -* conv: dd invocation. (line 79) +* controlling terminal: dd invocation. (line 258) +* conv: dd invocation. (line 86) * conversion block size: dd invocation. (line 41) * conversion specifiers, date: Date conversion specifiers. (line 6) @@ -17011,27 +17234,27 @@ Index * converting while copying a file: dd invocation. (line 6) * cooked: Combination. (line 37) * Coordinated Universal Time: Options for date. (line 112) -* copy on write: cp invocation. (line 262) +* copy on write: cp invocation. (line 264) * copying directories recursively: cp invocation. (line 96) -* copying directories recursively <1>: cp invocation. (line 249) +* copying directories recursively <1>: cp invocation. (line 251) * copying existing permissions: Copying Permissions. (line 6) * copying files: cat invocation. (line 6) * copying files and directories: cp invocation. (line 6) * copying files and setting attributes: install invocation. (line 6) * core utilities: Top. (line 18) * count: dd invocation. (line 56) -* count_bytes: dd invocation. (line 281) -* COW: cp invocation. (line 262) +* count_bytes: dd invocation. (line 288) +* COW: cp invocation. (line 264) * cp: cp invocation. (line 6) -* crashes and corruption: sync invocation. (line 11) +* crashes and corruption: sync invocation. (line 17) * CRC checksum: cksum invocation. (line 6) * cread: Control. (line 35) * creating directories: mkdir invocation. (line 6) * creating FIFOs (named pipes): mkfifo invocation. (line 6) * creating links (hard only): link invocation. (line 6) * creating links (hard or soft): ln invocation. (line 6) -* creating output file, avoiding: dd invocation. (line 154) -* creating output file, requiring: dd invocation. (line 150) +* creating output file, avoiding: dd invocation. (line 161) +* creating output file, requiring: dd invocation. (line 157) * crN: Output. (line 45) * crown margin: fmt invocation. (line 34) * crt: Combination. (line 75) @@ -17067,7 +17290,7 @@ Index (line 29) * day of week item: Day of week items. (line 6) * dd: dd invocation. (line 6) -* ddrescue: dd invocation. (line 330) +* ddrescue: dd invocation. (line 337) * dec: Combination. (line 78) * decctlq: Combination. (line 63) * Decode base64 data: base64 invocation. (line 30) @@ -17078,8 +17301,8 @@ Index * descriptor follow option: tail invocation. (line 48) * destination directory: Target directory. (line 15) * destination directory <1>: Target directory. (line 31) -* destination directory <2>: cp invocation. (line 343) -* destination directory <3>: cp invocation. (line 347) +* destination directory <2>: cp invocation. (line 345) +* destination directory <3>: cp invocation. (line 349) * destination directory <4>: install invocation. (line 125) * destination directory <5>: install invocation. (line 129) * destination directory <6>: mv invocation. (line 103) @@ -17097,23 +17320,23 @@ Index * dir: dir invocation. (line 6) * dircolors: dircolors invocation. (line 6) -* direct: dd invocation. (line 199) -* direct I/O: dd invocation. (line 199) +* direct: dd invocation. (line 206) +* direct I/O: dd invocation. (line 206) * directories, copying: cp invocation. (line 6) * directories, copying recursively: cp invocation. (line 96) -* directories, copying recursively <1>: cp invocation. (line 249) +* directories, copying recursively <1>: cp invocation. (line 251) * directories, creating: mkdir invocation. (line 6) * directories, creating with given attributes: install invocation. (line 67) * directories, removing: rm invocation. (line 35) * directories, removing (recursively): rm invocation. (line 93) * directories, removing empty: rmdir invocation. (line 6) -* directory: dd invocation. (line 207) +* directory: dd invocation. (line 214) * 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 207) +* directory I/O: dd invocation. (line 214) * directory listing: ls invocation. (line 6) * directory listing, brief: dir invocation. (line 6) * directory listing, recursive: Which files are listed. @@ -17128,14 +17351,15 @@ Index * disabling special characters: Characters. (line 12) * disambiguating group names and IDs: Disambiguating names and IDs. (line 6) -* discarding file cache: dd invocation. (line 224) +* discard: Characters. (line 39) +* discarding file cache: dd invocation. (line 231) * disk allocation: What information is listed. (line 232) * disk device file: df invocation. (line 30) * disk usage: Disk usage. (line 6) * disk usage by file system: df invocation. (line 6) * disk usage for files: du invocation. (line 6) -* disks, failing: dd invocation. (line 330) +* disks, failing: dd invocation. (line 337) * displacement of dates: Relative items in date strings. (line 6) * displaying text: echo invocation. (line 6) @@ -17143,16 +17367,16 @@ 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 210) +* DOS file system: df invocation. (line 219) * double spacing: pr invocation. (line 74) * down columns: pr invocation. (line 49) -* dsusp: Characters. (line 51) -* dsync: dd invocation. (line 213) +* dsusp: Characters. (line 57) +* dsync: dd invocation. (line 220) * DTR/DSR flow control: Control. (line 44) * du: du invocation. (line 6) * DU_BLOCK_SIZE: Block size. (line 12) -* DVD file system type: df invocation. (line 206) -* ebcdic, converting to: dd invocation. (line 91) +* DVD file system type: df invocation. (line 215) +* ebcdic, converting to: dd invocation. (line 98) * echo: echo invocation. (line 6) * echo <1>: Local. (line 18) * echoctl: Local. (line 51) @@ -17201,35 +17425,35 @@ Index * examples of ‘date’: Examples of date. (line 6) * examples of ‘expr’: Examples of expr. (line 6) * exbibyte, definition of: Block size. (line 109) -* excl: dd invocation. (line 150) +* excl: dd invocation. (line 157) * excluding files from ‘du’: du invocation. (line 250) * excluding files from ‘du’ <1>: du invocation. (line 255) * executable file check: Access permission tests. (line 24) * executables and file type, marking: General output formatting. - (line 46) + (line 47) * execute/search permission: Mode Structure. (line 16) * execute/search permission, symbolic: Setting Permissions. (line 56) * existence-of-file check: File characteristic tests. (line 9) * existing backup method: Backup options. (line 39) * exit status commands: Conditions. (line 6) -* exit status of ‘chroot’: chroot invocation. (line 67) +* exit status of ‘chroot’: chroot invocation. (line 78) * exit status of ‘env’: env invocation. (line 97) * exit status of ‘expr’: expr invocation. (line 43) * exit status of ‘false’: false invocation. (line 6) * exit status of ‘ls’: ls invocation. (line 29) * exit status of ‘mktemp’: mktemp invocation. (line 128) -* exit status of ‘nice’: nice invocation. (line 59) -* exit status of ‘nohup’: nohup invocation. (line 46) +* exit status of ‘nice’: nice invocation. (line 63) +* exit status of ‘nohup’: nohup invocation. (line 48) * exit status of ‘pathchk’: pathchk invocation. (line 47) * exit status of ‘printenv’: printenv invocation. (line 23) * exit status of ‘realpath’: realpath invocation. (line 80) * exit status of ‘runcon’: runcon invocation. (line 45) * exit status of ‘sort’: sort invocation. (line 57) -* exit status of ‘stdbuf’: stdbuf invocation. (line 65) +* exit status of ‘stdbuf’: stdbuf invocation. (line 69) * exit status of ‘test’: test invocation. (line 41) -* exit status of ‘timeout’: timeout invocation. (line 58) +* exit status of ‘timeout’: timeout invocation. (line 61) * exit status of ‘true’: true invocation. (line 6) * exit status of ‘tty’: tty invocation. (line 20) * expand: expand invocation. (line 6) @@ -17238,17 +17462,18 @@ Index * expression evaluation <1>: expr invocation. (line 6) * expressions, numeric: Numeric expressions. (line 6) * expressions, string: String expressions. (line 6) -* ext2 file system type: df invocation. (line 202) -* ext3 file system type: df invocation. (line 202) -* ext4 file system type: df invocation. (line 202) +* ext2 file system type: df invocation. (line 211) +* ext3 file system type: df invocation. (line 211) +* ext4 file system type: df invocation. (line 211) * extended attributes, xattr: install invocation. (line 34) * extended attributes, xattr <1>: mv invocation. (line 33) * extension, sorting files by: Sorting the output. (line 63) +* extproc: Local. (line 61) * factor: factor invocation. (line 6) * failure exit status: false invocation. (line 6) * false: false invocation. (line 6) -* fat file system file: df invocation. (line 210) -* fdatasync: dd invocation. (line 166) +* fat file system file: df invocation. (line 219) +* fdatasync: dd invocation. (line 173) * ffN: Output. (line 63) * field separator character: sort invocation. (line 322) * fields, padding numeric: Padding and other flags. @@ -17259,7 +17484,7 @@ Index * file characteristic tests: File characteristic tests. (line 6) * file contents, dumping unambiguously: od invocation. (line 6) -* file information, preserving: cp invocation. (line 232) +* file information, preserving: cp invocation. (line 234) * file information, preserving, extended attributes, xattr: cp invocation. (line 168) * file mode bits, numeric: Numeric Modes. (line 6) @@ -17277,29 +17502,29 @@ Index * 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 48) +* file system sizes: df invocation. (line 54) * file system space, retrieving current data more slowly: df invocation. - (line 178) + (line 174) * file system space, retrieving old data more quickly: df invocation. - (line 88) + (line 84) * file system status: stat invocation. (line 6) * file system types, limiting output to certain: df invocation. - (line 84) + (line 80) * file system types, limiting output to certain <1>: df invocation. - (line 185) -* file system types, printing: df invocation. (line 191) + (line 194) +* file system types, printing: df invocation. (line 200) * file systems: stat invocation. (line 28) * file systems and hard links: ln invocation. (line 6) -* file systems, omitting copying to different: cp invocation. (line 370) +* file systems, omitting copying to different: cp invocation. (line 372) * file timestamp resolution: touch invocation. (line 26) * file timestamps, changing: touch invocation. (line 6) * file type and executables, marking: General output formatting. - (line 46) + (line 47) * file type tests: File type tests. (line 6) * file type, marking: General output formatting. - (line 57) + (line 58) * file type, marking <1>: General output formatting. - (line 97) + (line 98) * file types: Special file types. (line 9) * file types, special: Special file types. (line 6) * file utilities: Top. (line 18) @@ -17320,6 +17545,7 @@ Index * flow control, hardware: Control. (line 41) * flow control, hardware <1>: Control. (line 44) * flow control, software: Input. (line 45) +* flush: Characters. (line 39) * flushing, disabling: Local. (line 32) * fmt: fmt invocation. (line 6) * fold: fold invocation. (line 6) @@ -17333,8 +17559,8 @@ Index * formatting times <1>: date invocation. (line 20) * fortnight in date strings: Relative items in date strings. (line 15) -* fsync: dd invocation. (line 170) -* fullblock: dd invocation. (line 271) +* fsync: dd invocation. (line 177) +* fullblock: dd invocation. (line 278) * general date syntax: General date syntax. (line 6) * general numeric sort: sort invocation. (line 104) * gibibyte, definition of: Block size. (line 94) @@ -17343,7 +17569,7 @@ Index (line 12) * GMT: Options for date. (line 112) * grand total of disk size, usage and available space: df invocation. - (line 52) + (line 180) * grand total of disk space: du invocation. (line 61) * graph: Character sets. (line 98) * Greenwich Mean Time: Options for date. (line 112) @@ -17363,7 +17589,7 @@ Index * hard link check: File characteristic tests. (line 23) * hard link, defined: ln invocation. (line 30) -* hard links: dd invocation. (line 260) +* hard links: dd invocation. (line 267) * hard links to directories: ln invocation. (line 86) * hard links to symbolic links: ln invocation. (line 180) * hard links, counting in ‘du’: du invocation. (line 123) @@ -17381,10 +17607,10 @@ Index * headers, numbering: nl invocation. (line 17) * help, online: Common options. (line 36) * hex dump of files: od invocation. (line 6) -* holes, copying files with: cp invocation. (line 292) +* holes, copying files with: cp invocation. (line 294) * holes, creating files with: truncate invocation. (line 13) * horizontal, listing files: General output formatting. - (line 102) + (line 103) * host processor type: uname invocation. (line 50) * hostid: hostid invocation. (line 6) * hostname: hostname invocation. (line 6) @@ -17395,7 +17621,7 @@ Index * human-readable output: Block size. (line 42) * human-readable output <1>: What information is listed. (line 116) -* human-readable output <2>: df invocation. (line 63) +* human-readable output <2>: df invocation. (line 59) * human-readable output <3>: du invocation. (line 96) * hup[cl]: Control. (line 28) * hurd, author, printing: What information is listed. @@ -17408,7 +17634,7 @@ Index * IEEE floating point: Floating point. (line 6) * iexten: Local. (line 15) * if: dd invocation. (line 18) -* iflag: dd invocation. (line 174) +* iflag: dd invocation. (line 181) * ignbrk: Input. (line 9) * igncr: Input. (line 31) * ignore file systems: df invocation. (line 42) @@ -17426,10 +17652,10 @@ Index * inlcr: Input. (line 28) * inode number, printing: What information is listed. (line 123) -* inode usage: df invocation. (line 73) +* inode usage: df invocation. (line 69) * inode usage, dereferencing in ‘du’: du invocation. (line 102) * inode, and hard links: ln invocation. (line 30) -* inodes, written buffered: sync invocation. (line 6) +* inodes, written buffered: sync invocation. (line 11) * inpck: Input. (line 22) * input block size: dd invocation. (line 26) * input encoding, UTF-8: Input. (line 37) @@ -17445,8 +17671,8 @@ Index (line 6) * ISO 8601 date format: Calendar date items. (line 30) * ISO/IEC 10646: printf invocation. (line 68) -* ISO9660 file system type: df invocation. (line 206) -* iso9660 file system type: df invocation. (line 206) +* ISO9660 file system type: df invocation. (line 215) +* iso9660 file system type: df invocation. (line 215) * ispeed: Special. (line 16) * istrip: Input. (line 25) * items in date strings: General date syntax. (line 6) @@ -17462,7 +17688,7 @@ Index * kernel version: uname invocation. (line 76) * kibibyte, definition of: Block size. (line 82) * kibibytes for file sizes: du invocation. (line 111) -* kibibytes for file system sizes: df invocation. (line 78) +* kibibytes for file system sizes: df invocation. (line 74) * kill: kill invocation. (line 6) * kill <1>: Characters. (line 27) * kilobyte, definition of: Block size. (line 78) @@ -17476,7 +17702,7 @@ Index * last part of files, outputting: tail invocation. (line 6) * lcase: Combination. (line 71) * LCASE: Combination. (line 71) -* lcase, converting to: dd invocation. (line 117) +* lcase, converting to: dd invocation. (line 124) * lchown: chown invocation. (line 106) * lchown <1>: chown invocation. (line 111) * lchown <2>: chgrp invocation. (line 34) @@ -17531,6 +17757,7 @@ Index * line buffered: stdbuf invocation. (line 6) * line count: wc invocation. (line 6) * line numbering: nl invocation. (line 6) +* line separator character: split invocation. (line 141) * line settings of terminal: stty invocation. (line 6) * line-breaking: fmt invocation. (line 19) * line-by-line comparison: comm invocation. (line 6) @@ -17538,14 +17765,14 @@ Index * link: link invocation. (line 6) * links, creating: link invocation. (line 6) * links, creating <1>: ln invocation. (line 6) -* Linux file system types: df invocation. (line 202) +* Linux file system types: df invocation. (line 211) * literal conversion specifiers: Literal conversion specifiers. (line 6) * litout: Combination. (line 59) * ln: ln invocation. (line 6) * ln format for ‘nl’: nl invocation. (line 93) -* lnext: Characters. (line 60) -* local file system types: df invocation. (line 202) +* lnext: Characters. (line 66) +* local file system types: df invocation. (line 211) * local settings: Local. (line 6) * logging out and continuing to run: nohup invocation. (line 6) * logical and operator: Connectives for test. @@ -17569,7 +17796,7 @@ Index * ls: ls invocation. (line 6) * LS_BLOCK_SIZE: Block size. (line 12) * LS_COLORS: General output formatting. - (line 31) + (line 32) * LS_COLORS <1>: dircolors invocation. (line 23) * lutimes: touch invocation. (line 100) @@ -17628,15 +17855,15 @@ Index * month names in date strings: Calendar date items. (line 38) * months, sorting by: sort invocation. (line 149) * months, written-out: General date syntax. (line 32) -* MS-DOS file system: df invocation. (line 210) -* MS-Windows file system: df invocation. (line 210) +* MS-DOS file system: df invocation. (line 219) +* MS-Windows file system: df invocation. (line 219) * mtime, changing: touch invocation. (line 115) -* multicall: coreutils invocation. +* multicall: Multi-call invocation. (line 6) * multicolumn output, generating: pr invocation. (line 6) * multiple changes to permissions: Multiple Changes. (line 6) * multiplication: Numeric expressions. (line 16) -* multipliers after numbers: dd invocation. (line 305) +* multipliers after numbers: dd invocation. (line 312) * multithreaded sort: sort invocation. (line 351) * mv: mv invocation. (line 6) * name follow option: tail invocation. (line 48) @@ -17645,7 +17872,7 @@ Index * named pipes, creating: mkfifo invocation. (line 6) * network node name: uname invocation. (line 46) * never interactive option: rm invocation. (line 56) -* newer files, copying only: cp invocation. (line 352) +* newer files, copying only: cp invocation. (line 354) * newer files, moving only: mv invocation. (line 80) * newer-than file check: File characteristic tests. (line 15) @@ -17656,7 +17883,7 @@ Index * next DAY: Day of week items. (line 15) * next DAY <1>: Options for date. (line 11) * next in date strings: General date syntax. (line 22) -* NFS file system type: df invocation. (line 197) +* NFS file system type: df invocation. (line 206) * NFS mounts from BSD to HP-UX: What information is listed. (line 240) * NFS mounts from BSD to HP-UX <1>: du invocation. (line 264) @@ -17667,28 +17894,28 @@ Index * nlN: Output. (line 39) * no dereference: chcon invocation. (line 26) * no-op: true invocation. (line 6) -* noatime: dd invocation. (line 246) -* nocache: dd invocation. (line 224) -* nocreat: dd invocation. (line 154) -* noctty: dd invocation. (line 251) +* noatime: dd invocation. (line 253) +* nocache: dd invocation. (line 231) +* nocreat: dd invocation. (line 161) +* noctty: dd invocation. (line 258) * node name: uname invocation. (line 46) -* noerror: dd invocation. (line 163) +* noerror: dd invocation. (line 170) * noflsh: Local. (line 32) -* nofollow: dd invocation. (line 257) +* nofollow: dd invocation. (line 264) * nohup: nohup invocation. (line 6) * nohup.out: nohup invocation. (line 6) -* nohup.out <1>: nohup invocation. (line 18) -* nolinks: dd invocation. (line 260) +* nohup.out <1>: nohup invocation. (line 20) +* nolinks: dd invocation. (line 267) * non-directories, copying as special files: cp invocation. (line 96) * non-directories, copying as special files <1>: cp invocation. - (line 249) + (line 251) * non-directory suffix, stripping: dirname invocation. (line 6) -* nonblock: dd invocation. (line 243) -* nonblocking I/O: dd invocation. (line 243) +* nonblock: dd invocation. (line 250) +* nonblocking I/O: dd invocation. (line 250) * none backup method: Backup options. (line 31) * none color option: General output formatting. - (line 23) -* none dd status=: dd invocation. (line 75) + (line 24) +* none dd status=: dd invocation. (line 72) * none, sorting option for ‘ls’: Sorting the output. (line 49) * nonempty file check: File characteristic tests. (line 12) @@ -17696,13 +17923,13 @@ Index * nonzero-length string check: String tests. (line 19) * noon in date strings: Time of day items. (line 21) * not-equal string check: String tests. (line 28) -* notrunc: dd invocation. (line 160) +* notrunc: dd invocation. (line 167) * now in date strings: Relative items in date strings. (line 33) -* noxfer dd status=: dd invocation. (line 71) +* noxfer dd status=: dd invocation. (line 76) * nproc: nproc invocation. (line 6) -* NTFS file system: df invocation. (line 210) -* ntfs file system file: df invocation. (line 210) +* NTFS file system: df invocation. (line 219) +* ntfs file system file: df invocation. (line 219) * number of inputs to merge, nmerge: sort invocation. (line 255) * numbered backup method: Backup options. (line 35) * numbering lines: nl invocation. (line 6) @@ -17730,14 +17957,14 @@ Index * of: dd invocation. (line 21) * ofdel: Output. (line 34) * ofill: Output. (line 30) -* oflag: dd invocation. (line 178) +* oflag: dd invocation. (line 185) * olcuc: Output. (line 12) * older-than file check: File characteristic tests. (line 19) * once interactive option: rm invocation. (line 57) * one file system, restricting ‘du’ to: du invocation. (line 261) * one file system, restricting ‘rm’ to: rm invocation. (line 65) -* one-line output format: df invocation. (line 152) +* one-line output format: df invocation. (line 148) * onlcr: Output. (line 19) * onlret: Output. (line 27) * onocr: Output. (line 23) @@ -17761,7 +17988,7 @@ Index * output file name suffix: csplit invocation. (line 65) * output format: stat invocation. (line 34) * output format <1>: stat invocation. (line 43) -* output format, portable: df invocation. (line 152) +* output format, portable: df invocation. (line 148) * output NUL-byte-terminated lines: readlink invocation. (line 64) * output NUL-byte-terminated lines <1>: du invocation. (line 26) * output NUL-byte-terminated lines <2>: basename invocation. (line 42) @@ -17791,7 +18018,7 @@ Index (line 6) * paragraphs, reformatting: fmt invocation. (line 6) * parenb: Control. (line 9) -* parent directories and ‘cp’: cp invocation. (line 236) +* parent directories and ‘cp’: cp invocation. (line 238) * parent directories, creating: mkdir invocation. (line 34) * parent directories, creating missing: install invocation. (line 67) * parent directories, removing: rmdir invocation. (line 22) @@ -17833,16 +18060,16 @@ Index * platform, hardware: uname invocation. (line 35) * pm in date strings: Time of day items. (line 21) * portable file names, checking for: pathchk invocation. (line 6) -* portable output format: df invocation. (line 152) +* portable output format: df invocation. (line 148) * POSIX: Introduction. (line 11) -* POSIX output format: df invocation. (line 152) +* POSIX output format: df invocation. (line 148) * POSIXLY_CORRECT: Common options. (line 11) * POSIXLY_CORRECT <1>: Standards conformance. (line 6) * POSIXLY_CORRECT <2>: pr invocation. (line 85) * POSIXLY_CORRECT <3>: sort invocation. (line 289) * POSIXLY_CORRECT <4>: sort invocation. (line 406) -* POSIXLY_CORRECT <5>: dd invocation. (line 360) +* POSIXLY_CORRECT <5>: dd invocation. (line 381) * POSIXLY_CORRECT <6>: echo invocation. (line 65) * POSIXLY_CORRECT <7>: printf invocation. (line 47) * POSIXLY_CORRECT <8>: id invocation. (line 15) @@ -17880,6 +18107,7 @@ Index * process zero-terminated items <2>: uniq invocation. (line 141) * process zero-terminated items <3>: join invocation. (line 155) * processes, commands for controlling: Process control. (line 6) +* progress dd status=: dd invocation. (line 80) * prompting, and ‘ln’: ln invocation. (line 96) * prompting, and ‘mv’: mv invocation. (line 37) * prompting, and ‘rm’: rm invocation. (line 11) @@ -17896,6 +18124,7 @@ Index * quoting style: Formatting the file names. (line 34) * radix for file offsets: od invocation. (line 36) +* random seed: Random sources. (line 31) * random sort: sort invocation. (line 188) * random source for shredding: shred invocation. (line 112) * random source for shuffling: shuf invocation. (line 42) @@ -17903,12 +18132,12 @@ Index * random sources: Random sources. (line 6) * ranges: Character sets. (line 44) * raw: Combination. (line 43) -* read errors, ignoring: dd invocation. (line 163) +* read errors, ignoring: dd invocation. (line 170) * 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 52) -* read system call, and holes: cp invocation. (line 292) +* read system call, and holes: cp invocation. (line 294) * readable file check: Access permission tests. (line 15) * readlink: readlink invocation. (line 6) @@ -17917,13 +18146,14 @@ Index * realpath <1>: realpath invocation. (line 6) * realpath <2>: realpath invocation. (line 6) * realpath <3>: realpath invocation. (line 6) +* record separator character: split invocation. (line 141) * recursive directory listing: Which files are listed. (line 90) * recursively changing access permissions: chmod invocation. (line 69) * recursively changing file ownership: chown invocation. (line 143) * recursively changing group ownership: chgrp invocation. (line 70) * recursively copying directories: cp invocation. (line 96) -* recursively copying directories <1>: cp invocation. (line 249) +* recursively copying directories <1>: cp invocation. (line 251) * redirection: Redirection. (line 6) * reference file: chcon invocation. (line 30) * reformatting paragraph text: fmt invocation. (line 6) @@ -17975,7 +18205,7 @@ Index * root directory, running a program in a specified: chroot invocation. (line 6) * rows: Special. (line 22) -* rprnt: Characters. (line 54) +* rprnt: Characters. (line 60) * RTS/CTS flow control: Control. (line 41) * run commands with bounded time: timeout invocation. (line 6) * run with security context: runcon invocation. (line 6) @@ -17997,7 +18227,7 @@ Index * section delimiters of pages: nl invocation. (line 63) * security context: What information is listed. (line 255) -* security context <1>: cp invocation. (line 376) +* security context <1>: cp invocation. (line 378) * security context <2>: install invocation. (line 96) * security context <3>: install invocation. (line 138) * security context <4>: mv invocation. (line 112) @@ -18006,7 +18236,7 @@ Index * security context <7>: mknod invocation. (line 53) * security context <8>: id invocation. (line 51) * seek: dd invocation. (line 51) -* seek_bytes: dd invocation. (line 293) +* seek_bytes: dd invocation. (line 300) * self-backups: cp invocation. (line 51) * SELinux: What information is listed. (line 255) @@ -18015,7 +18245,7 @@ Index * SELinux context: SELinux context. (line 6) * SELinux, context: SELinux context. (line 6) * SELinux, restoring security context: mv invocation. (line 112) -* SELinux, setting/restoring security context: cp invocation. (line 376) +* SELinux, setting/restoring security context: cp invocation. (line 378) * SELinux, setting/restoring security context <1>: install invocation. (line 138) * SELinux, setting/restoring security context <2>: mkdir invocation. @@ -18052,7 +18282,7 @@ Index * sha384sum: sha2 utilities. (line 6) * sha512sum: sha2 utilities. (line 6) * SHELL environment variable, and color: General output formatting. - (line 31) + (line 32) * SHELL environment variable, and color <1>: dircolors invocation. (line 23) * shell utilities: Top. (line 18) @@ -18062,7 +18292,7 @@ Index * SI output: Block size. (line 42) * SI output <1>: What information is listed. (line 247) -* SI output <2>: df invocation. (line 171) +* SI output <2>: df invocation. (line 167) * SI output <3>: du invocation. (line 145) * signals, specifying: Signal specifications. (line 6) @@ -18077,7 +18307,7 @@ Index (line 232) * size of files, sorting files by: Sorting the output. (line 32) * skip: dd invocation. (line 46) -* skip_bytes: dd invocation. (line 287) +* skip_bytes: dd invocation. (line 294) * sleep: sleep invocation. (line 6) * socket check: File type tests. (line 31) * software flow control: Input. (line 45) @@ -18093,8 +18323,8 @@ Index * sorting ‘ls’ output: Sorting the output. (line 6) * space: Character sets. (line 106) * space parity: Control. (line 16) -* sparse: dd invocation. (line 125) -* sparse files, copying: cp invocation. (line 292) +* sparse: dd invocation. (line 132) +* sparse files, copying: cp invocation. (line 294) * sparse files, creating: truncate invocation. (line 13) * special characters: Characters. (line 6) * special file types: Special file types. (line 6) @@ -18112,9 +18342,10 @@ Index * standard input: Common options. (line 47) * standard output: Common options. (line 47) * standard streams, buffering: stdbuf invocation. (line 6) -* start: Characters. (line 42) +* start: Characters. (line 48) * stat: stat invocation. (line 6) * status: dd invocation. (line 66) +* status <1>: Characters. (line 45) * status time, printing or sorting by: Sorting the output. (line 13) * status time, show the most recent: du invocation. (line 203) * stdbuf: stdbuf invocation. (line 6) @@ -18122,7 +18353,7 @@ Index * sticky: Mode Structure. (line 49) * sticky bit check: Access permission tests. (line 12) -* stop: Characters. (line 45) +* stop: Characters. (line 51) * stop bits: Control. (line 32) * strftime and ‘date’: date invocation. (line 20) * string constants, outputting: od invocation. (line 80) @@ -18132,7 +18363,7 @@ Index (line 6) * stripping non-directory suffix: dirname invocation. (line 6) * stripping symbol table information: install invocation. (line 113) -* stripping trailing slashes: cp invocation. (line 325) +* stripping trailing slashes: cp invocation. (line 327) * stripping trailing slashes <1>: mv invocation. (line 93) * stty: stty invocation. (line 6) * substr: String expressions. (line 40) @@ -18142,12 +18373,12 @@ Index * suffix, stripping from file names: basename invocation. (line 6) * sum: sum invocation. (line 6) * summarizing files: Summarizing files. (line 6) -* superblock, writing: sync invocation. (line 6) +* superblock, writing: sync invocation. (line 11) * supplementary groups, printing: groups invocation. (line 6) -* susp: Characters. (line 48) -* swab (byte-swapping): dd invocation. (line 137) +* susp: Characters. (line 54) +* swab (byte-swapping): dd invocation. (line 144) * swap space, saving text image in: Mode Structure. (line 49) -* swtch: Characters. (line 39) +* swtch: Characters. (line 42) * symbol table information, stripping: install invocation. (line 113) * symbol table information, stripping, program: install invocation. (line 116) @@ -18190,7 +18421,7 @@ Index * symbolic links, changing time: touch invocation. (line 100) * symbolic links, copying: cp invocation. (line 109) * symbolic links, copying <1>: cp invocation. (line 161) -* symbolic links, copying with: cp invocation. (line 330) +* symbolic links, copying with: cp invocation. (line 332) * symbolic links, dereferencing: Which files are listed. (line 36) * symbolic links, dereferencing <1>: Which files are listed. @@ -18200,19 +18431,21 @@ Index * symbolic links, dereferencing in ‘du’: du invocation. (line 117) * symbolic links, dereferencing in ‘du’ <1>: du invocation. (line 133) * symbolic links, dereferencing in ‘stat’: stat invocation. (line 22) -* symbolic links, following: dd invocation. (line 257) +* symbolic links, following: dd invocation. (line 264) * symbolic links, permissions of: chmod invocation. (line 10) * symbolic modes: Symbolic Modes. (line 6) * symlinks, resolution: realpath invocation. (line 6) * sync: sync invocation. (line 6) -* sync <1>: dd invocation. (line 221) -* sync (padding with ASCII NULs): dd invocation. (line 142) +* sync <1>: dd invocation. (line 228) +* sync (padding with ASCII NULs): dd invocation. (line 149) +* Synchronize cached writes to persistent storage: sync invocation. + (line 6) * synchronize disk and memory: sync invocation. (line 6) -* synchronized data and metadata I/O: dd invocation. (line 221) +* synchronized data and metadata I/O: dd invocation. (line 228) * synchronized data and metadata writes, before finishing: dd invocation. - (line 170) -* synchronized data reads: dd invocation. (line 213) -* synchronized data writes, before finishing: dd invocation. (line 166) + (line 177) +* synchronized data reads: dd invocation. (line 220) +* synchronized data writes, before finishing: dd invocation. (line 173) * system context: System context. (line 6) * system information, printing: arch invocation. (line 6) * system information, printing <1>: nproc invocation. (line 6) @@ -18230,8 +18463,8 @@ Index * target directory: Target directory. (line 6) * target directory <1>: Target directory. (line 15) * target directory <2>: Target directory. (line 31) -* target directory <3>: cp invocation. (line 343) -* target directory <4>: cp invocation. (line 347) +* target directory <3>: cp invocation. (line 345) +* target directory <4>: cp invocation. (line 349) * target directory <5>: install invocation. (line 125) * target directory <6>: install invocation. (line 129) * target directory <7>: mv invocation. (line 103) @@ -18249,13 +18482,13 @@ Index * terminal lines, currently used: who invocation. (line 11) * terminal settings: stty invocation. (line 6) * terminal, using color iff: General output formatting. - (line 24) + (line 25) * terse output: stat invocation. (line 54) * test: test invocation. (line 6) -* text: dd invocation. (line 267) -* text I/O: dd invocation. (line 267) +* text: dd invocation. (line 274) +* text I/O: dd invocation. (line 274) * text image, saving in swap space: Mode Structure. (line 49) -* text input files: md5sum invocation. (line 95) +* text input files: md5sum invocation. (line 101) * text utilities: Top. (line 18) * text, displaying: echo invocation. (line 6) * text, reformatting: fmt invocation. (line 6) @@ -18273,7 +18506,7 @@ Index * time style: Formatting file timestamps. (line 24) * time style <1>: du invocation. (line 212) -* time units: timeout invocation. (line 49) +* time units: timeout invocation. (line 52) * time units <1>: sleep invocation. (line 11) * time zone correction: Time of day items. (line 29) * time zone item: General date syntax. (line 40) @@ -18302,7 +18535,7 @@ Index * translating characters: Translating. (line 6) * true: true invocation. (line 6) * truncate: truncate invocation. (line 6) -* truncating output file, avoiding: dd invocation. (line 160) +* truncating output file, avoiding: dd invocation. (line 167) * truncating, file sizes: truncate invocation. (line 6) * tsort: tsort invocation. (line 6) * tty: tty invocation. (line 6) @@ -18312,18 +18545,18 @@ Index * TZ <1>: Formatting file timestamps. (line 17) * TZ <2>: touch invocation. (line 65) -* TZ <3>: stat invocation. (line 144) +* TZ <3>: stat invocation. (line 155) * TZ <4>: who invocation. (line 26) * TZ <5>: date invocation. (line 16) * TZ <6>: Options for date. (line 112) * TZ <7>: Specifying time zone rules. (line 6) * u, and disabling special characters: Characters. (line 12) -* ucase, converting to: dd invocation. (line 120) +* ucase, converting to: dd invocation. (line 127) * umask and modes: Umask and Protection. (line 6) * uname: uname invocation. (line 6) -* unblock: dd invocation. (line 111) +* unblock: dd invocation. (line 118) * unexpand: unexpand invocation. (line 6) * Unicode: printf invocation. (line 68) * uniq: uniq invocation. (line 6) @@ -18359,10 +18592,10 @@ Index * vdir: vdir invocation. (line 6) * verbose ls format: What information is listed. (line 131) -* verifying MD5 checksums: md5sum invocation. (line 68) -* verifying MD5 checksums <1>: md5sum invocation. (line 76) -* verifying MD5 checksums <2>: md5sum invocation. (line 104) -* verifying MD5 checksums <3>: md5sum invocation. (line 109) +* verifying MD5 checksums: md5sum invocation. (line 74) +* verifying MD5 checksums <1>: md5sum invocation. (line 82) +* verifying MD5 checksums <2>: md5sum invocation. (line 110) +* verifying MD5 checksums <3>: md5sum invocation. (line 115) * version number sort: sort invocation. (line 176) * version number, finding: Common options. (line 40) * version of kernel: uname invocation. (line 76) @@ -18374,12 +18607,12 @@ Index * VERSION_CONTROL <3>: mv invocation. (line 56) * VERSION_CONTROL <4>: ln invocation. (line 80) * vertical sorted files in columns: General output formatting. - (line 15) + (line 16) * vtN: Output. (line 59) * wc: wc invocation. (line 6) * week in date strings: Relative items in date strings. (line 15) -* werase: Characters. (line 57) +* werase: Characters. (line 63) * who: who invocation. (line 6) * who am i: who invocation. (line 21) * whoami: whoami invocation. (line 6) @@ -18397,7 +18630,7 @@ Index * wtmp <1>: who invocation. (line 15) * xcase: Local. (line 36) * xdigit: Character sets. (line 110) -* xfs file system type: df invocation. (line 202) +* xfs file system type: df invocation. (line 211) * XON/XOFF flow control: Input. (line 40) * year in date strings: Relative items in date strings. (line 15) @@ -18413,228 +18646,228 @@ Index  Tag Table: -Node: Top8459 -Node: Introduction22529 -Node: Common options24088 -Node: Exit status27550 -Node: Backup options28366 -Node: Block size30412 -Node: Floating point35747 -Node: Signal specifications37170 -Node: Disambiguating names and IDs39340 -Ref: Disambiguating names and IDs-Footnote-140957 -Node: Random sources41027 -Node: Target directory42681 -Node: Trailing slashes46331 -Node: Traversing symlinks47370 -Node: Treating / specially48502 -Node: Special built-in utilities50136 -Node: Standards conformance51331 -Node: coreutils invocation52971 -Node: Output of entire files53404 -Node: cat invocation54005 -Node: tac invocation55947 -Node: nl invocation57254 -Node: od invocation61316 -Node: base64 invocation69045 -Node: Formatting file contents70455 -Node: fmt invocation70956 -Node: numfmt invocation73942 -Node: pr invocation84605 -Node: fold invocation96885 -Node: Output of parts of files98400 -Node: head invocation98897 -Node: tail invocation101245 -Node: split invocation111356 -Node: csplit invocation118533 -Node: Summarizing files123763 -Node: wc invocation124411 -Node: sum invocation127596 -Node: cksum invocation129062 -Node: md5sum invocation130242 -Node: sha1sum invocation136010 -Node: sha2 utilities136802 -Node: Operating on sorted files137447 -Node: sort invocation138034 -Ref: sort invocation-Footnote-1163176 -Node: shuf invocation163786 -Node: uniq invocation166987 -Node: comm invocation173050 -Node: ptx invocation175553 -Node: General options in ptx178387 -Node: Charset selection in ptx178987 -Node: Input processing in ptx179900 -Node: Output formatting in ptx185433 -Node: Compatibility in ptx192269 -Node: tsort invocation195652 -Node: tsort background198856 -Node: Operating on fields200564 -Node: cut invocation200926 -Node: paste invocation205025 -Node: join invocation206738 -Node: Operating on characters213794 -Node: tr invocation214217 -Node: Character sets215984 -Node: Translating220732 -Node: Squeezing222890 -Node: expand invocation226096 -Node: unexpand invocation227620 -Node: Directory listing229493 -Node: ls invocation229991 -Ref: ls invocation-Footnote-1232126 -Node: Which files are listed232370 -Node: What information is listed236380 -Node: Sorting the output246006 -Node: Details about version sort248473 -Node: General output formatting250282 -Node: Formatting file timestamps255551 -Node: Formatting the file names261090 -Node: dir invocation264150 -Node: vdir invocation264577 -Node: dircolors invocation264967 -Node: Basic operations266773 -Node: cp invocation267393 -Node: dd invocation285251 -Node: install invocation300707 -Node: mv invocation306965 -Node: rm invocation311947 -Node: shred invocation316615 -Node: Special file types325658 -Node: link invocation327175 -Node: ln invocation328432 -Node: mkdir invocation337293 -Node: mkfifo invocation340067 -Node: mknod invocation341533 -Node: readlink invocation344062 -Node: rmdir invocation346483 -Node: unlink invocation347800 -Node: Changing file attributes348794 -Node: chown invocation349610 -Node: chgrp invocation356188 -Node: chmod invocation359614 -Node: touch invocation362494 -Node: Disk usage370171 -Node: df invocation370832 -Node: du invocation379946 -Node: stat invocation391031 -Node: sync invocation397070 -Node: truncate invocation398054 -Node: Printing text399994 -Node: echo invocation400368 -Node: printf invocation403092 -Node: yes invocation408828 -Node: Conditions409480 -Node: false invocation410075 -Node: true invocation411160 -Node: test invocation412489 -Node: File type tests414626 -Node: Access permission tests415545 -Node: File characteristic tests416461 -Node: String tests417245 -Node: Numeric tests418015 -Node: Connectives for test418850 -Node: expr invocation419218 -Node: String expressions421730 -Node: Numeric expressions424435 -Node: Relations for expr425143 -Node: Examples of expr426372 -Node: Redirection427121 -Node: tee invocation427582 -Node: File name manipulation432496 -Node: basename invocation433071 -Node: dirname invocation435290 -Node: pathchk invocation437107 -Node: mktemp invocation438918 -Node: realpath invocation444736 -Node: Working context447864 -Node: pwd invocation448508 -Node: stty invocation449927 -Node: Control452754 -Node: Input453830 -Node: Output455584 -Node: Local457002 -Node: Combination458731 -Node: Characters461127 -Node: Special462783 -Node: printenv invocation464530 -Node: tty invocation465541 -Node: User information466270 -Node: id invocation466905 -Node: logname invocation469408 -Node: whoami invocation470065 -Node: groups invocation470572 -Node: users invocation471807 -Node: who invocation472792 -Node: System context475935 -Node: date invocation476600 -Node: Time conversion specifiers478374 -Node: Date conversion specifiers481028 -Node: Literal conversion specifiers484332 -Node: Padding and other flags484704 -Node: Setting the time486972 -Node: Options for date488135 -Node: Examples of date492678 -Ref: %s-examples494169 -Node: arch invocation497390 -Node: nproc invocation497851 -Node: uname invocation498980 -Node: hostname invocation501676 -Node: hostid invocation502305 -Node: uptime invocation503038 -Node: SELinux context504184 -Node: chcon invocation504559 -Node: runcon invocation506964 -Node: Modified command invocation508501 -Node: chroot invocation509193 -Ref: chroot invocation-Footnote-1512506 -Node: env invocation512816 -Node: nice invocation517238 -Node: nohup invocation521185 -Node: stdbuf invocation523564 -Node: timeout invocation526212 -Node: Process control528779 -Node: kill invocation529002 -Node: Delaying532196 -Node: sleep invocation532393 -Node: Numeric operations533548 -Node: factor invocation533880 -Node: seq invocation535674 -Node: File permissions539760 -Node: Mode Structure540452 -Node: Symbolic Modes544176 -Node: Setting Permissions545290 -Node: Copying Permissions547956 -Node: Changing Special Mode Bits548826 -Node: Conditional Executability550708 -Node: Multiple Changes551260 -Node: Umask and Protection552933 -Node: Numeric Modes554078 -Node: Operator Numeric Modes556247 -Node: Directory Setuid and Setgid557307 -Node: Date input formats560162 -Node: General date syntax562604 -Node: Calendar date items565731 -Node: Time of day items567804 -Node: Time zone items570104 -Node: Combined date and time of day items571405 -Node: Day of week items572274 -Node: Relative items in date strings573358 -Node: Pure numbers in date strings576264 -Node: Seconds since the Epoch577253 -Node: Specifying time zone rules578918 -Node: Authors of parse_datetime581386 -Ref: Authors of get_date581577 -Node: Opening the software toolbox582576 -Node: Toolbox introduction583370 -Node: I/O redirection586114 -Node: The who command588995 -Node: The cut command589920 -Node: The sort command591022 -Node: The uniq command591740 -Node: Putting the tools together592455 -Ref: Putting the tools together-Footnote-1604673 -Node: GNU Free Documentation License604747 -Node: Concept index630119 +Node: Top8458 +Node: Introduction22547 +Node: Common options24106 +Node: Exit status27543 +Node: Backup options28359 +Node: Block size30405 +Node: Floating point35741 +Node: Signal specifications37351 +Node: Disambiguating names and IDs39521 +Ref: Disambiguating names and IDs-Footnote-141138 +Node: Random sources41208 +Node: Target directory43217 +Node: Trailing slashes46867 +Node: Traversing symlinks47906 +Node: Treating / specially49038 +Node: Special built-in utilities50672 +Node: Standards conformance51867 +Node: Multi-call invocation53508 +Node: Output of entire files54070 +Node: cat invocation54671 +Node: tac invocation56613 +Node: nl invocation57920 +Node: od invocation61982 +Node: base64 invocation69711 +Node: Formatting file contents71121 +Node: fmt invocation71572 +Node: pr invocation74554 +Node: fold invocation86831 +Node: Output of parts of files88346 +Node: head invocation88843 +Node: tail invocation91191 +Node: split invocation101302 +Node: csplit invocation109273 +Node: Summarizing files114504 +Node: wc invocation115152 +Node: sum invocation118479 +Node: cksum invocation119945 +Node: md5sum invocation121125 +Node: sha1sum invocation127189 +Node: sha2 utilities127981 +Node: Operating on sorted files128643 +Node: sort invocation129230 +Ref: sort invocation-Footnote-1154372 +Node: shuf invocation154982 +Node: uniq invocation158183 +Node: comm invocation164246 +Node: ptx invocation166749 +Node: General options in ptx169583 +Node: Charset selection in ptx170183 +Node: Input processing in ptx171096 +Node: Output formatting in ptx176629 +Node: Compatibility in ptx183465 +Node: tsort invocation186848 +Node: tsort background190052 +Node: Operating on fields191760 +Node: cut invocation192122 +Node: paste invocation196221 +Node: join invocation197934 +Node: Operating on characters204990 +Node: tr invocation205413 +Node: Character sets207180 +Node: Translating211928 +Node: Squeezing214086 +Node: expand invocation217292 +Node: unexpand invocation218816 +Node: Directory listing220689 +Node: ls invocation221187 +Ref: ls invocation-Footnote-1223322 +Node: Which files are listed223566 +Node: What information is listed227576 +Node: Sorting the output237202 +Node: Details about version sort239669 +Node: General output formatting241478 +Node: Formatting file timestamps246864 +Node: Formatting the file names252403 +Node: dir invocation255463 +Node: vdir invocation255890 +Node: dircolors invocation256315 +Node: Basic operations258121 +Node: cp invocation258741 +Node: dd invocation276711 +Node: install invocation293051 +Node: mv invocation299309 +Node: rm invocation304291 +Node: shred invocation308965 +Node: Special file types318008 +Node: link invocation319525 +Node: ln invocation320782 +Node: mkdir invocation329644 +Node: mkfifo invocation332418 +Node: mknod invocation333885 +Node: readlink invocation336415 +Node: rmdir invocation338836 +Node: unlink invocation340153 +Node: Changing file attributes341147 +Node: chown invocation341963 +Node: chgrp invocation348541 +Node: chmod invocation351967 +Node: touch invocation354847 +Node: Disk usage362524 +Node: df invocation363205 +Node: du invocation373042 +Node: stat invocation384146 +Node: sync invocation390740 +Node: truncate invocation392911 +Node: Printing text394849 +Node: echo invocation395223 +Node: printf invocation397947 +Node: yes invocation403683 +Node: Conditions404335 +Node: false invocation404930 +Node: true invocation406015 +Node: test invocation407344 +Node: File type tests409481 +Node: Access permission tests410400 +Node: File characteristic tests411316 +Node: String tests412100 +Node: Numeric tests412870 +Node: Connectives for test413705 +Node: expr invocation414073 +Node: String expressions416585 +Node: Numeric expressions419290 +Node: Relations for expr419998 +Node: Examples of expr421227 +Node: Redirection421976 +Node: tee invocation422437 +Node: File name manipulation428314 +Node: basename invocation428889 +Node: dirname invocation431108 +Node: pathchk invocation432925 +Node: mktemp invocation434736 +Node: realpath invocation440554 +Node: Working context443682 +Node: pwd invocation444326 +Node: stty invocation445745 +Node: Control448730 +Node: Input449806 +Node: Output451560 +Node: Local452978 +Node: Combination454942 +Node: Characters457354 +Node: Special459181 +Node: printenv invocation460928 +Node: tty invocation461939 +Node: User information462668 +Node: id invocation463303 +Node: logname invocation465806 +Node: whoami invocation466463 +Node: groups invocation466970 +Node: users invocation468205 +Node: who invocation469385 +Node: System context472721 +Node: date invocation473386 +Node: Time conversion specifiers475160 +Node: Date conversion specifiers477814 +Node: Literal conversion specifiers481118 +Node: Padding and other flags481490 +Node: Setting the time483758 +Node: Options for date484921 +Node: Examples of date489464 +Ref: %s-examples490955 +Node: arch invocation494176 +Node: nproc invocation494735 +Node: uname invocation495864 +Node: hostname invocation498560 +Node: hostid invocation499390 +Node: uptime invocation500263 +Node: SELinux context501743 +Node: chcon invocation502118 +Node: runcon invocation504523 +Node: Modified command invocation506060 +Node: chroot invocation506752 +Ref: chroot invocation-Footnote-1510646 +Node: env invocation511163 +Node: nice invocation515585 +Node: nohup invocation519702 +Node: stdbuf invocation522204 +Node: timeout invocation525049 +Node: Process control527849 +Node: kill invocation528072 +Node: Delaying531266 +Node: sleep invocation531463 +Node: Numeric operations532618 +Node: factor invocation533003 +Node: numfmt invocation534800 +Node: seq invocation546023 +Node: File permissions550109 +Node: Mode Structure550801 +Node: Symbolic Modes554525 +Node: Setting Permissions555639 +Node: Copying Permissions558305 +Node: Changing Special Mode Bits559175 +Node: Conditional Executability561057 +Node: Multiple Changes561609 +Node: Umask and Protection563282 +Node: Numeric Modes564427 +Node: Operator Numeric Modes566596 +Node: Directory Setuid and Setgid567656 +Node: Date input formats570511 +Node: General date syntax572953 +Node: Calendar date items576080 +Node: Time of day items578153 +Node: Time zone items580453 +Node: Combined date and time of day items581754 +Node: Day of week items582623 +Node: Relative items in date strings583707 +Node: Pure numbers in date strings586613 +Node: Seconds since the Epoch587602 +Node: Specifying time zone rules589267 +Node: Authors of parse_datetime591735 +Ref: Authors of get_date591926 +Node: Opening the software toolbox592925 +Node: Toolbox introduction593719 +Node: I/O redirection596463 +Node: The who command599344 +Node: The cut command600269 +Node: The sort command601371 +Node: The uniq command602089 +Node: Putting the tools together602804 +Ref: Putting the tools together-Footnote-1615022 +Node: GNU Free Documentation License615096 +Node: Concept index640469  End Tag Table diff --git a/doc/coreutils.texi b/doc/coreutils.texi index 19a523d8..58084139 100644 --- a/doc/coreutils.texi +++ b/doc/coreutils.texi @@ -47,7 +47,7 @@ * chroot: (coreutils)chroot invocation. Specify the root directory. * cksum: (coreutils)cksum invocation. Print POSIX CRC checksum. * comm: (coreutils)comm invocation. Compare sorted files by line. -* coreutils: (coreutils)coreutils invocation. Multi-call program. +* coreutils: (coreutils)Multi-call invocation. Multi-call program. * cp: (coreutils)cp invocation. Copy files. * csplit: (coreutils)csplit invocation. Split by context. * cut: (coreutils)cut invocation. Print selected parts of lines. @@ -114,7 +114,7 @@ * stdbuf: (coreutils)stdbuf invocation. Modify stdio buffering. * stty: (coreutils)stty invocation. Print/change terminal settings. * sum: (coreutils)sum invocation. Print traditional checksum. -* sync: (coreutils)sync invocation. Synchronize memory and disk. +* sync: (coreutils)sync invocation. Synchronize memory to disk. * tac: (coreutils)tac invocation. Reverse files. * tail: (coreutils)tail invocation. Output the last part of files. * tee: (coreutils)tee invocation. Redirect to multiple files. @@ -143,7 +143,7 @@ This manual documents version @value{VERSION} of the GNU core utilities, including the standard programs for text and file manipulation. -Copyright @copyright{} 1994-2014 Free Software Foundation, Inc. +Copyright @copyright{} 1994-2015 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -206,7 +206,7 @@ Free Documentation License''. * Modified command invocation:: chroot env nice nohup stdbuf timeout * Process control:: kill * Delaying:: sleep -* Numeric operations:: factor seq +* Numeric operations:: factor numfmt seq * File permissions:: Access modes * Date input formats:: Specifying date strings * Opening the software toolbox:: The software tools philosophy @@ -230,7 +230,7 @@ Common Options * Traversing symlinks:: Traversing symlinks to directories * Treating / specially:: Treating / specially * Standards conformance:: Standards conformance -* coreutils invocation:: Multi-call binary invocation +* Multi-call invocation:: Multi-call program invocation Output of entire files @@ -243,7 +243,6 @@ 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 @@ -346,7 +345,7 @@ Disk usage * df invocation:: Report file system disk space usage * du invocation:: Estimate file space usage * stat invocation:: Report file or file system status -* sync invocation:: Synchronize data on disk with memory +* sync invocation:: Synchronize cached writes to persistent storage * truncate invocation:: Shrink or extend the size of a file Printing text @@ -461,6 +460,7 @@ Delaying Numeric operations * factor invocation:: Print prime factors +* numfmt invocation:: Reformat numbers * seq invocation:: Print numeric sequences File permissions @@ -752,11 +752,10 @@ operands even if they begin with @samp{-}. For example, @samp{sort -- @cindex standard input @cindex standard output A single @samp{-} operand is not really an option, though it looks like one. It -stands for standard input, or for standard output if that is clear from -the context. For example, @samp{sort -} reads from standard input, -and is equivalent to plain @samp{sort}, and @samp{tee -} writes an -extra copy of its input to standard output. Unless otherwise -specified, @samp{-} can appear as any operand that requires a file +stands for a file operand, and some tools treat it as standard input, or as +standard output if that is clear from the context. For example, @samp{sort -} +reads from standard input, and is equivalent to plain @samp{sort}. Unless +otherwise specified, a @samp{-} can appear as any operand that requires a file name. @menu @@ -773,7 +772,7 @@ name. * Treating / specially:: --preserve-root and --no-preserve-root. * Special built-in utilities:: @command{break}, @command{:}, @dots{} * Standards conformance:: Conformance to the POSIX standard. -* coreutils invocation:: Multi-call binary invocation. +* Multi-call invocation:: Multi-call program invocation. @end menu @@ -935,7 +934,8 @@ A block size specification can be a positive integer specifying the number of bytes per block, or it can be @code{human-readable} or @code{si} to select a human-readable format. Integers may be followed by suffixes that are upward compatible with the -@uref{http://www.bipm.org/en/si/si_brochure/chapter3/prefixes.html, SI prefixes} +@uref{http://www.bipm.org/en/publications/si-brochure/chapter3.html, +SI prefixes} for decimal multiples and with the @uref{http://physics.nist.gov/cuu/Units/binary.html, ISO/IEC 80000-13 (formerly IEC 60027-2) prefixes} for binary multiples. @@ -1069,11 +1069,14 @@ Commands that accept floating point numbers as options, operands or input use the standard C functions @code{strtod} and @code{strtold} to convert from text to floating point numbers. These floating point numbers therefore can use scientific notation like @code{1.0e-34} and -@code{-10e100}. Modern C implementations also accept hexadecimal -floating point numbers such as @code{-0x.ep-3}, which stands for -@minus{}14/16 times @math{2^-3}, which equals @minus{}0.109375. The -@env{LC_NUMERIC} locale determines the decimal-point character. -@xref{Parsing of Floats,,, libc, The GNU C Library Reference Manual}. +@code{-10e100}. Commands that parse floating point also understand +case-insensitive @code{inf}, @code{infinity}, and @code{NaN}, although +whether such values are useful depends on the command in question. +Modern C implementations also accept hexadecimal floating point +numbers such as @code{-0x.ep-3}, which stands for @minus{}14/16 times +@math{2^-3}, which equals @minus{}0.109375. The @env{LC_NUMERIC} +locale determines the decimal-point character. @xref{Parsing of +Floats,,, libc, The GNU C Library Reference Manual}. @node Signal specifications @section Signal specifications @@ -1213,7 +1216,7 @@ sometimes need random data to do their work. For example, @samp{sort -R} must choose a hash function at random, and it needs random data to make this selection. -By default these commands use an internal pseudorandom generator +By default these commands use an internal pseudo-random generator initialized by a small amount of entropy, but can be directed to use an external source with the @option{--random-source=@var{file}} option. An error is reported if @var{file} does not contain enough bytes. @@ -1223,7 +1226,7 @@ source of random data. Typically, this device gathers environmental noise from device drivers and other sources into an entropy pool, and uses the pool to generate random bits. If the pool is short of data, the device reuses the internal pool to produce more bits, using a -cryptographically secure pseudorandom number generator. But be aware +cryptographically secure pseudo-random number generator. But be aware that this device is not designed for bulk random data generation and is relatively slow. @@ -1236,6 +1239,21 @@ operating system. To reproduce the results of an earlier invocation of a command, you can save some random data into a file and then use that file as the random source in earlier and later invocations of the command. +@cindex random seed +Rather than depending on a file, one can generate a reproducible +arbitrary amount of pseudo-random data given a seed value, using +for example: + +@example +get_seeded_random() +@{ + seed="$1" + openssl enc -aes-256-ctr -pass pass:"$seed" -nosalt \ + /dev/null +@} + +shuf -i1-100 --random-source=<(get_seeded_random 42) +@end example @node Target directory @section Target directory @@ -1497,22 +1515,28 @@ that assumes an older version of POSIX and uses @samp{sort +1} or @samp{tail +10}, you can work around any compatibility problems by setting @samp{_POSIX2_VERSION=199209} in your environment. -@node coreutils invocation -@section @command{coreutils}: Multi-call binary +@c This node is named "Multi-call invocation", not the usual +@c "coreutils invocation", so that shell commands like +@c 'info coreutils "touch invocation"' work as expected. +@node Multi-call invocation +@section @command{coreutils}: Multi-call program @pindex multicall @cindex combined -@cindex calling combined multi-call binary +@cindex calling combined multi-call program -@command{coreutils} invokes an individual utility, either -implicitly selected by the last component of @samp{argv[0]}, -or by explicitly calling @command{coreutils} with the +The @command{coreutils} command invokes an individual utility, either +implicitly selected by the last component of the name used to invoke +@command{coreutils}, or explicitly with the @option{--coreutils-prog} option. Synopsis: @example coreutils @option{--coreutils-prog=PROGRAM} @dots{} @end example +The @command{coreutils} command is not installed by default, so +portable scripts should not rely on its existence. + @node Output of entire files @chapter Output of entire files @@ -2183,7 +2207,6 @@ 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 @@ -2293,518 +2316,196 @@ leaving the code unchanged. @exitstatus -@node numfmt invocation -@section @command{numfmt}: Reformat numbers +@node pr invocation +@section @command{pr}: Paginate or columnate files for printing -@pindex numfmt +@pindex pr +@cindex printing, preparing files for +@cindex multicolumn output, generating +@cindex merging files in parallel -@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}). +@command{pr} writes each @var{file} (@samp{-} means standard input), or +standard input if none are given, to standard output, paginating and +optionally outputting in multicolumn format; optionally merges all +@var{file}s, printing all in parallel, one per column. Synopsis: @example -numfmt [@var{option}]@dots{} [@var{number}] +pr [@var{option}]@dots{} [@var{file}]@dots{} @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 +@vindex LC_MESSAGES +By default, a 5-line header is printed at each page: two blank lines; +a line with the date, the file name, and the page count; and two more +blank lines. A footer of five blank lines is also printed. +The default @var{page_length} is 66 +lines. The default number of text lines is therefore 56. +The text line of the header takes the form +@samp{@var{date} @var{string} @var{page}}, with spaces inserted around +@var{string} so that the line takes up the full @var{page_width}. Here, +@var{date} is the date (see the @option{-D} or @option{--date-format} +option for details), @var{string} is the centered header string, and +@var{page} identifies the page number. The @env{LC_MESSAGES} locale +category affects the spelling of @var{page}; in the default C locale, it +is @samp{Page @var{number}} where @var{number} is the decimal page +number. -See @option{--invalid} for additional information regarding exit status. +Form feeds in the input cause page breaks in the output. Multiple form +feeds produce empty pages. -@subsection General options +Columns are of equal width, separated by an optional string (default +is @samp{space}). For multicolumn output, lines will always be truncated to +@var{page_width} (default 72), unless you use the @option{-J} option. +For single +column output no line truncation occurs by default. Use @option{-W} option to +truncate lines in that case. 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 +@var{first_page}[:@var{last_page}] +@itemx --pages=@var{first_page}[:@var{last_page}] +@c The two following @opindex lines evoke warnings because they contain ':' +@c The 'info' spec does not permit that. If we use those lines, we end +@c up with truncated index entries that don't work. +@c @opindex +@var{first_page}[:@var{last_page}] +@c @opindex --pages=@var{first_page}[:@var{last_page}] +@opindex +@var{page_range} +@opindex --pages=@var{page_range} +Begin printing with page @var{first_page} and stop with @var{last_page}. +Missing @samp{:@var{last_page}} implies end of file. While estimating +the number of skipped pages each form feed in the input file results +in a new page. Page counting with and without @samp{+@var{first_page}} +is identical. By default, counting starts with the first page of input +file (not first page printed). Line numbering may be altered by @option{-N} +option. -@item --field=@var{n} -@opindex --field -Convert the number in input field @var{n} (default: 1). +@item -@var{column} +@itemx --columns=@var{column} +@opindex -@var{column} +@opindex --columns +@cindex down columns +With each single @var{file}, produce @var{column} columns of output +(default is 1) and print columns down, unless @option{-a} is used. The +column width is automatically decreased as @var{column} increases; unless +you use the @option{-W/-w} option to increase @var{page_width} as well. +This option might well cause some lines to be truncated. The number of +lines in the columns on each page are balanced. The options @option{-e} +and @option{-i} are on for multiple text-column output. Together with +@option{-J} option column alignment and line truncation is turned off. +Lines of full length are joined in a free field format and @option{-S} +option may set field separators. @option{-@var{column}} may not be used +with @option{-m} option. -@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{-}, @samp{0}, or width -modifiers. The @samp{'} modifier will enable @option{--grouping}, the @samp{-} -modifier will enable left-aligned @option{--padding} and the width modifier will -enable right-aligned @option{--padding}. The @samp{0} width modifier -(without the @samp{-} modifier) will generate leading zeros on the number, -up to the specified width. +@item -a +@itemx --across +@opindex -a +@opindex --across +@cindex across columns +With each single @var{file}, print columns across rather than down. The +@option{-@var{column}} option must be given with @var{column} greater than one. +If a line is too long to fit in a column, it is truncated. -@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 -c +@itemx --show-control-chars +@opindex -c +@opindex --show-control-chars +Print control characters using hat notation (e.g., @samp{^G}); print +other nonprinting characters in octal backslash notation. By default, +nonprinting characters are not changed. -@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 -d +@itemx --double-space +@opindex -d +@opindex --double-space +@cindex double spacing +Double space the output. -@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 -D @var{format} +@itemx --date-format=@var{format} +@cindex time formats +@cindex formatting times +Format header dates using @var{format}, using the same conventions as +for the command @samp{date +@var{format}}. @xref{date invocation}. +Except for directives, which start with +@samp{%}, characters in @var{format} are printed unchanged. You can use +this option to specify an arbitrary string in place of the header date, +e.g., @option{--date-format="Monday morning"}. -@item --header[=@var{n}] -@opindex --header -@opindex --header=N -Print the first @var{n} (default: 1) lines without any conversion. +@vindex POSIXLY_CORRECT +@vindex LC_TIME +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 POSIX +locale, the default is @samp{%b %e %H:%M %Y} (for example, +@samp{Dec@ @ 4 23:59 2001}. -@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. +@vindex TZ +Time stamps are listed according to the time zone rules specified by +the @env{TZ} 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}. -@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 -e[@var{in-tabchar}[@var{in-tabwidth}]] +@itemx --expand-tabs[=@var{in-tabchar}[@var{in-tabwidth}]] +@opindex -e +@opindex --expand-tabs +@cindex input tabs +Expand @var{tab}s to spaces on input. Optional argument @var{in-tabchar} is +the input tab character (default is the TAB character). Second optional +argument @var{in-tabwidth} is the input tab character's width (default +is 8). -@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 -f +@itemx -F +@itemx --form-feed +@opindex -F +@opindex -f +@opindex --form-feed +Use a form feed instead of newlines to separate output pages. This does +not alter the default page length of 66 lines. -@item --suffix=@var{suffix} -@opindex --suffix -Add @samp{SUFFIX} to the output numbers, and accept optional @samp{SUFFIX} in -input numbers. +@item -h @var{header} +@itemx --header=@var{header} +@opindex -h +@opindex --header +Replace the file name in the header with the centered string @var{header}. +When using the shell, @var{header} should be quoted and should be +separated from @option{-h} by a space. -@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 -i[@var{out-tabchar}[@var{out-tabwidth}]] +@itemx --output-tabs[=@var{out-tabchar}[@var{out-tabwidth}]] +@opindex -i +@opindex --output-tabs +@cindex output tabs +Replace spaces with @var{tab}s on output. Optional argument @var{out-tabchar} +is the output tab character (default is the TAB character). Second optional +argument @var{out-tabwidth} is the output tab character's width (default +is 8). -@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}). +@item -J +@itemx --join-lines +@opindex -J +@opindex --join-lines +Merge lines of full length. Used together with the column options +@option{-@var{column}}, @option{-a -@var{column}} or @option{-m}. Turns off +@option{-W/-w} line truncation; +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 (POSIX-compliant) options @option{-w} and +@option{-s} along with the three column options. -@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 -$ numfmt --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 - -@pindex pr -@cindex printing, preparing files for -@cindex multicolumn output, generating -@cindex merging files in parallel - -@command{pr} writes each @var{file} (@samp{-} means standard input), or -standard input if none are given, to standard output, paginating and -optionally outputting in multicolumn format; optionally merges all -@var{file}s, printing all in parallel, one per column. Synopsis: - -@example -pr [@var{option}]@dots{} [@var{file}]@dots{} -@end example - -@vindex LC_MESSAGES -By default, a 5-line header is printed at each page: two blank lines; -a line with the date, the file name, and the page count; and two more -blank lines. A footer of five blank lines is also printed. -The default @var{page_length} is 66 -lines. The default number of text lines is therefore 56. -The text line of the header takes the form -@samp{@var{date} @var{string} @var{page}}, with spaces inserted around -@var{string} so that the line takes up the full @var{page_width}. Here, -@var{date} is the date (see the @option{-D} or @option{--date-format} -option for details), @var{string} is the centered header string, and -@var{page} identifies the page number. The @env{LC_MESSAGES} locale -category affects the spelling of @var{page}; in the default C locale, it -is @samp{Page @var{number}} where @var{number} is the decimal page -number. - -Form feeds in the input cause page breaks in the output. Multiple form -feeds produce empty pages. - -Columns are of equal width, separated by an optional string (default -is @samp{space}). For multicolumn output, lines will always be truncated to -@var{page_width} (default 72), unless you use the @option{-J} option. -For single -column output no line truncation occurs by default. Use @option{-W} option to -truncate lines in that case. - -The program accepts the following options. Also see @ref{Common options}. - -@table @samp - -@item +@var{first_page}[:@var{last_page}] -@itemx --pages=@var{first_page}[:@var{last_page}] -@c The two following @opindex lines evoke warnings because they contain ':' -@c The 'info' spec does not permit that. If we use those lines, we end -@c up with truncated index entries that don't work. -@c @opindex +@var{first_page}[:@var{last_page}] -@c @opindex --pages=@var{first_page}[:@var{last_page}] -@opindex +@var{page_range} -@opindex --pages=@var{page_range} -Begin printing with page @var{first_page} and stop with @var{last_page}. -Missing @samp{:@var{last_page}} implies end of file. While estimating -the number of skipped pages each form feed in the input file results -in a new page. Page counting with and without @samp{+@var{first_page}} -is identical. By default, counting starts with the first page of input -file (not first page printed). Line numbering may be altered by @option{-N} -option. - -@item -@var{column} -@itemx --columns=@var{column} -@opindex -@var{column} -@opindex --columns -@cindex down columns -With each single @var{file}, produce @var{column} columns of output -(default is 1) and print columns down, unless @option{-a} is used. The -column width is automatically decreased as @var{column} increases; unless -you use the @option{-W/-w} option to increase @var{page_width} as well. -This option might well cause some lines to be truncated. The number of -lines in the columns on each page are balanced. The options @option{-e} -and @option{-i} are on for multiple text-column output. Together with -@option{-J} option column alignment and line truncation is turned off. -Lines of full length are joined in a free field format and @option{-S} -option may set field separators. @option{-@var{column}} may not be used -with @option{-m} option. - -@item -a -@itemx --across -@opindex -a -@opindex --across -@cindex across columns -With each single @var{file}, print columns across rather than down. The -@option{-@var{column}} option must be given with @var{column} greater than one. -If a line is too long to fit in a column, it is truncated. - -@item -c -@itemx --show-control-chars -@opindex -c -@opindex --show-control-chars -Print control characters using hat notation (e.g., @samp{^G}); print -other nonprinting characters in octal backslash notation. By default, -nonprinting characters are not changed. - -@item -d -@itemx --double-space -@opindex -d -@opindex --double-space -@cindex double spacing -Double space the output. - -@item -D @var{format} -@itemx --date-format=@var{format} -@cindex time formats -@cindex formatting times -Format header dates using @var{format}, using the same conventions as -for the command @samp{date +@var{format}}. @xref{date invocation}. -Except for directives, which start with -@samp{%}, characters in @var{format} are printed unchanged. You can use -this option to specify an arbitrary string in place of the header date, -e.g., @option{--date-format="Monday morning"}. - -@vindex POSIXLY_CORRECT -@vindex LC_TIME -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 POSIX -locale, the default is @samp{%b %e %H:%M %Y} (for example, -@samp{Dec@ @ 4 23:59 2001}. - -@vindex TZ -Time stamps are listed according to the time zone rules specified by -the @env{TZ} 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}. - -@item -e[@var{in-tabchar}[@var{in-tabwidth}]] -@itemx --expand-tabs[=@var{in-tabchar}[@var{in-tabwidth}]] -@opindex -e -@opindex --expand-tabs -@cindex input tabs -Expand @var{tab}s to spaces on input. Optional argument @var{in-tabchar} is -the input tab character (default is the TAB character). Second optional -argument @var{in-tabwidth} is the input tab character's width (default -is 8). - -@item -f -@itemx -F -@itemx --form-feed -@opindex -F -@opindex -f -@opindex --form-feed -Use a form feed instead of newlines to separate output pages. This does -not alter the default page length of 66 lines. - -@item -h @var{header} -@itemx --header=@var{header} -@opindex -h -@opindex --header -Replace the file name in the header with the centered string @var{header}. -When using the shell, @var{header} should be quoted and should be -separated from @option{-h} by a space. - -@item -i[@var{out-tabchar}[@var{out-tabwidth}]] -@itemx --output-tabs[=@var{out-tabchar}[@var{out-tabwidth}]] -@opindex -i -@opindex --output-tabs -@cindex output tabs -Replace spaces with @var{tab}s on output. Optional argument @var{out-tabchar} -is the output tab character (default is the TAB character). Second optional -argument @var{out-tabwidth} is the output tab character's width (default -is 8). - -@item -J -@itemx --join-lines -@opindex -J -@opindex --join-lines -Merge lines of full length. Used together with the column options -@option{-@var{column}}, @option{-a -@var{column}} or @option{-m}. Turns off -@option{-W/-w} line truncation; -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 (POSIX-compliant) options @option{-w} and -@option{-s} along with the three column options. - - -@item -l @var{page_length} -@itemx --length=@var{page_length} -@opindex -l -@opindex --length -Set the page length to @var{page_length} (default 66) lines, including -the lines of the header [and the footer]. If @var{page_length} is less -than or equal to 10, the header and footer are omitted, as if the -@option{-t} option had been given. +@item -l @var{page_length} +@itemx --length=@var{page_length} +@opindex -l +@opindex --length +Set the page length to @var{page_length} (default 66) lines, including +the lines of the header [and the footer]. If @var{page_length} is less +than or equal to 10, the header and footer are omitted, as if the +@option{-t} option had been given. @item -m @itemx --merge @@ -3385,6 +3086,8 @@ The program accepts the following options. Also see @ref{Common options}. @opindex -l @opindex --lines Put @var{lines} lines of @var{input} into each output file. +If @option{--separator} is specified, then @var{lines} determines +the number of records. For compatibility @command{split} also supports an obsolete option syntax @option{-@var{lines}}. New scripts should use @@ -3402,9 +3105,11 @@ Put @var{size} bytes of @var{input} into each output file. @opindex -C @opindex --line-bytes Put into each output file as many complete lines of @var{input} as -possible without exceeding @var{size} bytes. Individual lines longer than -@var{size} bytes are broken into multiple files. +possible without exceeding @var{size} bytes. Individual lines or records +longer than @var{size} bytes are broken into multiple files. @var{size} has the same format as for the @option{--bytes} option. +If @option{--separator} is specified, then @var{lines} determines +the number of records. @item --filter=@var{command} @opindex --filter @@ -3435,7 +3140,7 @@ Split @var{input} to @var{chunks} output files where @var{chunks} may be: @example @var{n} generate @var{n} files based on current size of @var{input} @var{k}/@var{n} only output @var{k}th of @var{n} to stdout -l/@var{n} generate @var{n} files without splitting lines +l/@var{n} generate @var{n} files without splitting lines or records l/@var{k}/@var{n} likewise but only output @var{k}th of @var{n} to stdout r/@var{n} like @samp{l} but use round robin distribution r/@var{k}/@var{n} likewise but only output @var{k}th of @var{n} to stdout @@ -3452,10 +3157,10 @@ or the @var{input} is truncated. For @samp{l} mode, chunks are approximately @var{input} size / @var{n}. The @var{input} is partitioned into @var{n} equal sized portions, with the last assigned any excess. If a line @emph{starts} within a partition -it is written completely to the corresponding file. Since lines +it is written completely to the corresponding file. Since lines or records are not split even if they overlap a partition, the files written can be larger or smaller than the partition size, and even empty -if a line is so long as to completely overlap the partition. +if a line/record is so long as to completely overlap the partition. For @samp{r} mode, the size of @var{input} is irrelevant, and so can be a pipe for example. @@ -3476,9 +3181,14 @@ specified, will auto increase the length by 2 as required. @opindex --numeric-suffixes Use digits in suffixes rather than lower-case letters. The numerical suffix counts from @var{from} if specified, 0 otherwise. -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}. + +@var{from} is used to either set the initial suffix for a single run, +or to set the suffix offset for independently split inputs, and consequently +the auto suffix length expansion described above is disabled. Therefore +you may also want to use option @option{-a} to allow suffixes beyond @samp{99}. +Note if option @option{--number} is specified and the number of files is less +than @var{from}, a single run is assumed and the minimum suffix length +required is automatically determined. @item --additional-suffix=@var{suffix} @opindex --additional-suffix @@ -3495,6 +3205,17 @@ than the number requested, or if a line is so long as to completely span a chunk. The output file sequence numbers, always run consecutively even when this option is specified. +@item -t @var{separator} +@itemx --separator=@var{separator} +@opindex -t +@opindex --separator +@cindex line separator character +@cindex record separator character +Use character @var{separator} as the record separator instead of the default +newline character (ASCII LF). +To specify ASCII NUL as the separator, use the two-character string @samp{\0}, +e.g., @samp{split -t '\0'}. + @item -u @itemx --unbuffered @opindex -u @@ -3681,7 +3402,7 @@ Do not remove output files when errors are encountered. @item --suppress-matched @opindex --suppress-matched Do not output lines matching the specified @var{pattern}. -I.E. suppress the boundary line from the start of the second +I.e., suppress the boundary line from the start of the second and subsequent splits. @item -z @@ -3877,7 +3598,10 @@ Print only the newline counts. @itemx --max-line-length @opindex -L @opindex --max-line-length -Print only the maximum line lengths. +Print only the maximum display widths. +Tabs are set at every 8th column. +Display widths of wide characters are considered. +Non-printable characters are given 0 width. @macro filesZeroFromOption{cmd,withTotalOption,subListOutput} @item --files0-from=@var{file} @@ -4032,8 +3756,11 @@ consistent. Synopsis: md5sum [@var{option}]@dots{} [@var{file}]@dots{} @end example -For each @var{file}, @samp{md5sum} outputs the MD5 checksum, a flag -indicating binary or text input mode, and the file name. +For each @var{file}, @samp{md5sum} outputs by default, the MD5 checksum, +a space, a flag indicating binary or text input mode, and the file name. +Binary mode is indicated with @samp{*}, text mode with @samp{ } (space). +Binary mode is the default on systems where it's significant, +otherwise text mode is the default. If @var{file} contains a backslash or newline, the line is started with a backslash, and each problematic character in the file name is escaped with a backslash, making the output @@ -4064,9 +3791,11 @@ Read file names and checksum information (not data) from each whether the checksums match the contents of the named files. The input to this mode of @command{md5sum} is usually the output of a prior, checksum-generating run of @samp{md5sum}. -Each valid line of input consists of an MD5 checksum, a binary/text -flag, and then a file name. -Binary mode is indicated with @samp{*}, text with @samp{ } (space). +Three input formats are supported. Either the default output +format described above, the @option{--tag} output format, +or the BSD reversed mode format which is similar to the default mode, +but doesn't use a character to distinguish binary and text modes. +@sp 1 For each such line, @command{md5sum} reads the named file and computes its MD5 checksum. Then, if the computed message digest does not match the one on the line with the file name, the file is noted as having @@ -4197,7 +3926,8 @@ The commands @command{sha224sum}, @command{sha256sum}, @command{sha384sum} and @command{sha512sum} compute checksums of various lengths (respectively 224, 256, 384 and 512 bits), collectively known as the SHA-2 hashes. The usage and options of -these commands are precisely the same as for @command{md5sum}. +these commands are precisely the same as for @command{md5sum} +and @command{sha1sum}. @xref{md5sum invocation}. Note: The SHA384 and SHA512 digests are considerably slower to @@ -7537,7 +7267,8 @@ These options affect the appearance of the overall output. @opindex --format @opindex single-column @r{output of files} List one file per line. This is the default for @command{ls} when standard -output is not a terminal. +output is not a terminal. See also the @option{-b} and @option{-q} options +to suppress direct output of newline characters within a file name. @item -C @itemx --format=vertical @@ -7952,6 +7683,8 @@ and special characters are represented by backslash escape sequences. -b}; that is, by default files are listed in long format and special characters are represented by backslash escape sequences. +@xref{ls invocation, @command{ls}}. + @node dircolors invocation @section @command{dircolors}: Color setup for @command{ls} @@ -8327,9 +8060,11 @@ Using @option{--preserve} with no @var{attribute_list} is equivalent to @option{--preserve=mode,ownership,timestamps}. In the absence of this option, the permissions of existing destination -files are unchanged, while each new file is created with the -mode bits of the corresponding source file, minus the bits set in the -umask and minus the set-user-ID and set-group-ID bits. +files are unchanged. Each new file is created with the mode of the +corresponding source file minus the set-user-ID, set-group-ID, and +sticky bits as the create mode; the operating system then applies either +the umask or a default ACL, possibly resulting in a more restrictive +file mode. @xref{File permissions}. @item --no-preserve=@var{attribute_list} @@ -8397,7 +8132,7 @@ then report the failure for each file and exit with a failure status. @item auto If the copy-on-write operation is not supported then fall back -to the standard copy behaviour. +to the standard copy behavior. @end table This option is overridden by the @option{--link}, @option{--symbolic-link} @@ -8619,24 +8354,32 @@ will ensure that @samp{count=} corresponds to complete input blocks rather than the traditional POSIX specified behavior of counting input read operations. -@item status=@var{which} +@item status=@var{level} @opindex status 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. +Specifying @var{level} will adjust the amount of information printed, +with the last @var{level} specified taking precedence. @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 or warning messages to stderr. Error messages are output as normal. +@item noxfer +@opindex noxfer @r{dd status=} +Do not print the final transfer rate and volume statistics +that normally make up the last status line. + +@item progress +@opindex progress @r{dd status=} +Print the transfer rate and volume statistics on stderr, +when processing each input block. Statistics are output +on a single line at most once every second, but updates +can be delayed when waiting on I/O. + @end table @item conv=@var{conversion}[,@var{conversion}]@dots{} @@ -8804,7 +8547,7 @@ same time. @cindex direct I/O Use direct I/O for data, avoiding the buffer cache. Note that the kernel may impose restrictions on read or write buffer sizes. -For example, with an ext4 destination file system and a linux-based kernel, +For example, with an ext4 destination file system and a Linux-based kernel, using @samp{oflag=direct} will cause writes to fail with @code{EINVAL} if the output buffer size is not a multiple of 512. @@ -8989,25 +8732,41 @@ occur on disk based devices): dd conv=noerror,sync iflag=fullblock /mnt/rescue.img @end example -Sending an @samp{INFO} signal to a running @command{dd} -process makes it print I/O statistics to standard error -and then resume copying. In the example below, -@command{dd} is run in the background to copy 10 million blocks. +Sending an @samp{INFO} signal (or @samp{USR1} signal where that is unavailable) +to a running @command{dd} process makes it print I/O statistics to +standard error and then resume copying. In the example below, +@command{dd} is run in the background to copy 5GB of data. The @command{kill} command makes it output intermediate I/O statistics, and when @command{dd} completes normally or is killed by the @code{SIGINT} signal, it outputs the final statistics. @example -$ dd if=/dev/zero of=/dev/null count=10MB & pid=$! -$ kill -s INFO $pid; wait $pid -3385223+0 records in -3385223+0 records out -1733234176 bytes (1.7 GB) copied, 6.42173 seconds, 270 MB/s -10000000+0 records in -10000000+0 records out -5120000000 bytes (5.1 GB) copied, 18.913 seconds, 271 MB/s +# Ignore the signal so we never inadvertently terminate the dd child. +# Note this is not needed when SIGINFO is available. +trap '' USR1 + +# Run dd with the fullblock iflag to avoid short reads +# which can be triggered by reception of signals. +dd iflag=fullblock if=/dev/zero of=/dev/null count=5000000 bs=1000 & pid=$! + +# Output stats every half second +until ! kill -s USR1 $pid 2>/dev/null; do sleep .5; done +@end example + +The above script will output in the following format + +@example +859+0 records in +859+0 records out +4295000000 bytes (4.3 GB) copied, 0.539934 s, 8.0 GB/s +1000+0 records in +1000+0 records out +5000000000 bytes (5.0 GB) copied, 0.630785 s, 7.9 GB/s @end example +Note also the @samp{status=progress} option which periodically updates +the last line of the transfer statistics above. + @vindex POSIXLY_CORRECT On systems lacking the @samp{INFO} signal @command{dd} responds to the @samp{USR1} signal instead, unless the @env{POSIXLY_CORRECT} @@ -9496,7 +9255,7 @@ rm ./-f @opindex - @r{and Unix @command{rm}} The Unix @command{rm} program's use of a single @samp{-} for this purpose -predates the development of the getopt standard syntax. +predates the development of the @code{getopt} standard syntax. @exitstatus @@ -10004,7 +9763,7 @@ ln -srv /a/file /tmp @end smallexample Relative symbolic links are generated based on their canonicalized -containing directory, and canonicalized targets. I.E. all symbolic +containing directory, and canonicalized targets. I.e., all symbolic links in these file names will be resolved. @xref{realpath invocation}, which gives greater control over relative file name generation, as demonstrated in the following example: @@ -10176,7 +9935,7 @@ to communicate. One process opens the FIFO file for writing, and another for reading, after which data can flow as with the usual anonymous pipe in shells or elsewhere. -The program accepts the following option. Also see @ref{Common options}. +The program accepts the following options. Also see @ref{Common options}. @table @samp @@ -10254,7 +10013,7 @@ If a major or minor device number begins with @samp{0x} or @samp{0X}, it is interpreted as hexadecimal; otherwise, if it begins with @samp{0}, as octal; otherwise, as decimal. -The program accepts the following option. Also see @ref{Common options}. +The program accepts the following options. Also see @ref{Common options}. @table @samp @@ -11138,7 +10897,7 @@ file status information, and write buffers to disk. * df invocation:: Report file system disk space usage. * du invocation:: Estimate file space usage. * stat invocation:: Report file or file system status. -* sync invocation:: Synchronize memory and disk. +* sync invocation:: Synchronize cached writes to persistent storage. * truncate invocation:: Shrink or extend the size of a file. @end menu @@ -11192,11 +10951,15 @@ The program accepts the following options. Also see @ref{Common options}. @itemx --all @opindex -a @opindex --all -@cindex automounter file systems @cindex ignore file systems -Include in the listing dummy file systems, which -are omitted by default. Such file systems are typically special-purpose -pseudo-file-systems, such as automounter entries. +Include in the listing dummy, duplicate, or inaccessible file systems, which +are omitted by default. Dummy file systems are typically special purpose +pseudo file systems such as @samp{/proc}, with no associated storage. +Duplicate file systems are local or remote file systems that are mounted +at separate locations in the local file hierarchy, or bind mounted locations. +Inaccessible file systems are those which are mounted but subsequently +over-mounted by another file system at that point, or otherwise inaccessible +due to permissions of the mount point etc. @item -B @var{size} @itemx --block-size=@var{size} @@ -11206,19 +10969,6 @@ 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. -@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 @@ -11306,7 +11056,7 @@ The mount point. 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 +The definition of the @var{field_list} can even be split among several @option{--output} uses. @example @@ -11359,6 +11109,21 @@ some systems (notably SunOS), doing this yields more up to date results, but in general this option makes @command{df} much slower, especially when there are many or very busy file systems. +@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. If no arguments are specified +df will try harder to elide file systems insignificant to the total +available space, by suppressing duplicate remote file systems. + +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. + @item -t @var{fstype} @itemx --type=@var{fstype} @opindex -t @@ -11430,6 +11195,9 @@ Ignored; for compatibility with System V versions of @command{df}. @end table +@command{df} is installed only on systems that have usable mount tables, +so portable scripts should not rely on its existence. + @exitstatus Failure includes the case where no output is generated, so you can inspect the exit status of a command like @samp{df -t ext3 -t reiserfs @@ -11449,7 +11217,7 @@ or @option{-x} is used together with a file name argument. @cindex file space usage @cindex disk usage for files -@command{du} reports the amount of disk space used by the specified files +@command{du} reports the amount of disk space used by the set of specified files and for each subdirectory (of directory arguments). Synopsis: @example @@ -11464,7 +11232,7 @@ Non-integer quantities are rounded up to the next higher unit. If two or more hard links point to the same file, only one of the hard links is counted. The @var{file} argument order affects which links are counted, and changing the argument order may change the numbers -that @command{du} outputs. +and entries that @command{du} outputs. The program accepts the following options. Also see @ref{Common options}. @@ -11845,6 +11613,20 @@ $ stat --printf='%d:%i\n' / /usr @cindex terse output Print the information in terse form, suitable for parsing by other programs. +The output of the following commands are identical and the @option{--format} +also identifies the items printed (in fuller form) in the default format. +Note the format string would include another @samp{%C} at the end with an +active SELinux security context. +@example +$ stat --format="%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %W %o" ... +$ stat --terse ... +@end example + +The same illustrating terse output in @option{--file-system} mode: +@example +$ stat -f --format="%n %i %l %t %s %S %b %f %a %c %d" ... +$ stat -f --terse ... +@end example @end table The valid @var{format} directives for files with @option{--format} and @@ -11957,28 +11739,60 @@ with @env{TZ}, libc, The GNU C Library Reference Manual}. @node sync invocation -@section @command{sync}: Synchronize data on disk with memory +@section @command{sync}: Synchronize cached writes to persistent storage @pindex sync @cindex synchronize disk and memory +@cindex Synchronize cached writes to persistent storage + +@command{sync} synchronizes in memory files or file systems to persistent +storage. Synopsis: + +@example +sync [@var{option}] [@var{file}]@dots{} +@end example @cindex superblock, writing @cindex inodes, written buffered @command{sync} writes any data buffered in memory out to disk. This can include (but is not limited to) modified superblocks, modified inodes, and delayed reads and writes. This must be implemented by the kernel; -The @command{sync} program does nothing but exercise the @code{sync} system -call. +The @command{sync} program does nothing but exercise the @code{sync}, +@code{syncfs}, @code{fsync}, and @code{fdatasync} system calls. @cindex crashes and corruption The kernel keeps data in memory to avoid doing (relatively slow) disk reads and writes. This improves performance, but if the computer crashes, data may be lost or the file system corrupted as a -result. The @command{sync} command ensures everything in memory -is written to disk. +result. The @command{sync} command instructs the kernel to write +data in memory to persistent storage. + +If any argument is specified then only those files will be +synchronized using the fsync(2) syscall by default. -Any arguments are ignored, except for a lone @option{--help} or -@option{--version} (@pxref{Common options}). +If at least one file is specified, it is possible to change the +synchronization method with the following options. Also see +@ref{Common options}. + +@table @samp +@item -d +@itemx --data +@opindex --data +Use fdatasync(2) to sync only the data for the file, +and any metadata required to maintain file system consistency. + +@item -f +@itemx --file-system +@opindex --file-system +Synchronize all the I/O waiting for the file systems that contain the file, +using the syscall syncfs(2). Note you would usually @emph{not} specify +this option if passing a device node like @samp{/dev/sda} for example, +as that would sync the containing file system rather than the referenced one. +Note also that depending on the system, passing individual device nodes or files +may have different sync characteristics than using no arguments. +I.e., arguments passed to fsync(2) may provide greater guarantees through +write barriers, than a global sync(2) used when no arguments are provided. +@end table @exitstatus @@ -12036,7 +11850,7 @@ Set or adjust the size of each @var{file} according to @var{size}. @multiplierSuffixesNoBlocks{size} @var{size} may also be prefixed by one of the following to adjust -the size of each @var{file} based on their current size: +the size of each @var{file} based on its current size: @example @samp{+} => extend by @samp{-} => reduce by @@ -13052,9 +12866,11 @@ If a file being written to does not already exist, it is created. If a file being written to already exists, the data it previously contained is overwritten unless the @option{-a} option is used. -A @var{file} of @samp{-} causes @command{tee} to send another copy of -input to standard output, but this is typically not that useful as the -copies are interleaved. +In previous versions of GNU coreutils (v5.3.0 - v8.23), a @var{file} of @samp{-} +caused @command{tee} to send another copy of input to standard output. +However, as the interleaved output was not very useful, @command{tee} now +conforms to POSIX which explicitly mandates it to treat @samp{-} as a file +with such name. The program accepts the following options. Also see @ref{Common options}. @@ -13072,6 +12888,32 @@ them. @opindex --ignore-interrupts Ignore interrupt signals. +@item -p +@itemx --output-error[=@var{mode}] +@opindex -p +@opindex --output-error +Select the behavior with errors on the outputs, +where @var{mode} is one of the following: + +@table @samp +@item warn +Warn on error opening or writing any output, including pipes. +Writing is continued to still open files/pipes. +Exit status indicates failure if any output has an error. + +@item warn-nopipe +Warn on error opening or writing any output, except pipes. +Writing is continued to still open files/pipes. +Exit status indicates failure if any non pipe output had an error. +This is the default @var{mode} when not specified. + +@item exit +Exit on error opening or writing any output, including pipes. + +@item exit-nopipe +Exit on error opening or writing any output, except pipes. +@end table + @end table The @command{tee} command is useful when you happen to be transferring a large @@ -13837,6 +13679,10 @@ 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. +@command{stty} is installed only on platforms with the POSIX terminal +interface, so portable scripts should not rely on its existence on +non-POSIX platforms. + @exitstatus @menu @@ -14189,6 +14035,14 @@ the line as indicated by the @code{echoprt} and @code{echoe} settings, instead of by the @code{echoctl} and @code{echok} settings. Non-POSIX@. May be negated. + +@item extproc +@opindex extproc +Enable @samp{LINEMODE}, which is used to avoid echoing +each character over high latency links. See also +@uref{ftp://ftp.rfc-editor.org/in-notes/rfc1116.txt, Internet RFC 1116}. +Non-POSIX@. +May be negated. @end table @@ -14227,11 +14081,11 @@ Same as: @c This is too long to write inline. @example -cread -ignbrk brkint -inlcr -igncr icrnl -ixoff --iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr --onocr -onlret -ofill -ofdel nl0 cr0 tab0 bs0 vt0 -ff0 isig icanon iexten echo echoe echok -echonl --noflsh -xcase -tostop -echoprt echoctl echoke +cread -ignbrk brkint -inlcr -igncr icrnl +icanon iexten echo echoe echok -echonl -noflsh +-ixoff -iutf8 -iuclc -ixany imaxbel -xcase -olcuc -ocrnl +opost -ofill onlcr -onocr -onlret nl0 cr0 tab0 bs0 vt0 ff0 +isig -tostop -ofdel -echoprt echoctl echoke -extproc @end example @noindent @@ -14250,8 +14104,8 @@ Same as: @example -ignbrk -brkint -ignpar -parmrk -inpck -istrip --inlcr -igncr -icrnl -ixon -ixoff -iuclc -ixany --imaxbel -opost -isig -icanon -xcase min 1 time 0 +-inlcr -igncr -icrnl -ixon -ixoff -icanon -opost +-isig -iuclc -ixany -imaxbel -xcase min 1 time 0 @end example @noindent @@ -14350,10 +14204,19 @@ End the line. @opindex eol2 Alternate character to end the line. Non-POSIX. +@item discard +@opindex discard +@opindex flush +Alternate character to toggle discarding of output. Non-POSIX. + @item swtch @opindex swtch Switch to a different shell layer. Non-POSIX. +@item status +@opindex status +Send an info signal. Not currently supported on Linux. Non-POSIX. + @item start @opindex start Restart the output after stopping it. @@ -14756,6 +14619,10 @@ that file instead. A common choice is @file{/var/log/wtmp}. The only options are @option{--help} and @option{--version}. @xref{Common options}. +The @command{users} command is installed only on platforms with the +POSIX @code{} include file or equivalent, so portable scripts +should not rely on its existence on non-POSIX platforms. + @exitstatus @@ -14904,6 +14771,10 @@ After each login name print a character indicating the user's message status: @end table +The @command{who} command is installed only on platforms with the +POSIX @code{} include file or equivalent, so portable scripts +should not rely on its existence on non-POSIX platforms. + @exitstatus @@ -15637,6 +15508,9 @@ arch [@var{option}] The program accepts the @ref{Common options} only. +@command{arch} is not installed by default, so portable scripts should +not rely on its existence. + @exitstatus @@ -15828,6 +15702,10 @@ hostname [@var{name}] The only options are @option{--help} and @option{--version}. @xref{Common options}. +@command{hostname} is not installed by default, and other packages +also supply a @command{hostname} command, so portable scripts should +not rely on its existence or on the exact behavior documented above. + @exitstatus @@ -15853,6 +15731,10 @@ On that system, the 32-bit quantity happens to be closely related to the system's Internet address, but that isn't always the case. +@command{hostid} is installed only on systems that have the +@code{gethostid} function, so portable scripts should not rely on its +existence. + @exitstatus @node uptime invocation @@ -15886,6 +15768,13 @@ also include processes in the uninterruptible sleep state (that is, those processes which are waiting for disk I/O). The Linux kernel includes uninterruptible processes. +@command{uptime} is installed only on platforms with infrastructure +for obtaining the boot time, and other packages also supply an +@command{uptime} command, so portable scripts should not rely on its +existence or on the exact behavior documented above. + +@exitstatus + @node SELinux context @chapter SELinux context @@ -16110,7 +15999,10 @@ On many systems, only the super-user can do this.@footnote{However, some systems (e.g., FreeBSD) can be configured to allow certain regular users to use the @code{chroot} system call, and hence to run this program. Also, on Cygwin, anyone can run the @command{chroot} command, because the -underlying function is non-privileged due to lack of support in MS-Windows.} +underlying function is non-privileged due to lack of support in MS-Windows. +Furthermore, the @command{chroot} command avoids the @code{chroot} system call +when @var{newroot} is identical to the old @file{/} directory for consistency +with systems where this is allowed for non-privileged users.}. Synopses: @example @@ -16120,10 +16012,11 @@ chroot @var{option} Ordinarily, file names are looked up starting at the root of the directory structure, i.e., @file{/}. @command{chroot} changes the root to -the directory @var{newroot} (which must exist) and then runs -@var{command} with optional @var{args}. If @var{command} is not -specified, the default is the value of the @env{SHELL} environment -variable or @command{/bin/sh} if not set, invoked with the @option{-i} option. +the directory @var{newroot} (which must exist), then changes the working +directory to @file{/}, and finally runs @var{command} with optional @var{args}. +If @var{command} is not specified, the default is the value of the @env{SHELL} +environment variable or @command{/bin/sh} if not set, invoked with the +@option{-i} option. @var{command} must not be a special built-in utility (@pxref{Special built-in utilities}). @@ -16132,6 +16025,14 @@ Options must precede operands. @table @samp +@item --groups=@var{groups} +@opindex --groups +Use this option to override the supplementary @var{groups} to be +used by the new process. +The items in the list (names or numeric IDs) must be separated by commas. +Use @samp{--groups=''} to disable the supplementary group look-up +implicit in the @option{--userspec} option. + @item --userspec=@var{user}[:@var{group}] @opindex --userspec By default, @var{command} is run with the same credentials @@ -16142,14 +16043,14 @@ If a @var{user} is specified then the supplementary groups are set according to the system defined list for that user, unless overridden with the @option{--groups} option. -@item --groups=@var{groups} -@opindex --groups -Use this option to override the supplementary @var{groups} to be -used by the new process. -The items in the list (names or numeric IDs) must be separated by commas. -Use @samp{--groups=''} to disable the supplementary group look-up -implicit in the @option{--userspec} option. - +@item --skip-chdir +@opindex --skip-chdir +Use this option to not change the working directory to @file{/} after changing +the root directory to @var{newroot}, i.e., inside the chroot. +This option is only permitted when @var{newroot} is the old @file{/} directory, +and therefore is mostly useful together with the @option{--groups} and +@option{--userspec} options to retain the previous working directory. + @end table The user and group name look-up performed by the @option{--userspec} @@ -16187,6 +16088,10 @@ files to the required positions under your intended new root directory. Finally, if the executable requires any other files (e.g., data, state, device files), copy them into place, too. +@command{chroot} is installed only on systems that have the +@code{chroot} function, so portable scripts should not rely on its +existence. + @cindex exit status of @command{chroot} Exit status: @@ -16383,7 +16288,7 @@ lets applications determine the order in which threads are scheduled to run. Unlike a priority, a niceness is merely advice to the scheduler, which the scheduler is free to ignore. Also, as a point of terminology, POSIX defines the behavior of @command{nice} in -terms of a @dfn{nice value}, which is the nonnegative difference +terms of a @dfn{nice value}, which is the non-negative difference between a niceness and the minimum niceness. Though @command{nice} conforms to POSIX, its documentation and diagnostics use the term ``niceness'' for compatibility with historical practice. @@ -16415,6 +16320,10 @@ option syntax @option{-@var{adjustment}}. New scripts should use @end table +@command{nice} is installed only on systems that have the POSIX +@code{setpriority} function, so portable scripts should not rely on +its existence on non-POSIX platforms. + @cindex exit status of @command{nice} Exit status: @@ -16492,12 +16401,13 @@ out. Synopsis: nohup @var{command} [@var{arg}]@dots{} @end example -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 GNU -extension; programs intended to be portable to non-GNU hosts -should use @samp{nohup @var{command} [@var{arg}]@dots{} /dev/null} instead. @flindex nohup.out If standard output is a terminal, the command's standard output is appended @@ -16626,6 +16536,11 @@ Specify the size of the buffer to use in fully buffered mode. @end table +@command{stdbuf} is installed only on platforms that use the +Executable and Linkable Format (ELF) and support the +@code{constructor} attribute, so portable scripts should not rely on +its existence. + @cindex exit status of @command{stdbuf} Exit status: @@ -16662,7 +16577,7 @@ Options must precede operands. @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. +managed @var{command} supports running for an indeterminate amount of time. @item --foreground @opindex --foreground @@ -16679,7 +16594,10 @@ from the terminal (like Ctrl-C for example) @end enumerate Note in this mode of operation, any children of @var{command} -will not be timed out. +will not be timed out. Also SIGCONT will not be sent to @var{command}, +as it's generally not needed with foreground processes, and can +cause intermittent signal delivery issues with programs that are monitors +themselves (like GDB for example). @item -k @var{duration} @itemx --kill-after=@var{duration} @@ -16796,142 +16714,480 @@ table of signal numbers, names, and descriptions. This form of the @command{kill} command succeeds if all @var{signal} arguments are valid and if there is no output error. -The @command{kill} command also supports the @option{--help} and -@option{--version} options. @xref{Common options}. +The @command{kill} command also supports the @option{--help} and +@option{--version} options. @xref{Common options}. + +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 +@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 +signal names and numbers. + +@node Delaying +@chapter Delaying + +@cindex delaying commands +@cindex commands for delaying + +@c Perhaps @command{wait} or other commands should be described here also? + +@menu +* sleep invocation:: Delay for a specified time. +@end menu + + +@node sleep invocation +@section @command{sleep}: Delay for a specified time + +@pindex sleep +@cindex delay for a specified time + +@command{sleep} pauses for an amount of time specified by the sum of +the values of the command line arguments. +Synopsis: + +@example +sleep @var{number}[smhd]@dots{} +@end example + +@cindex time units +Each argument is a number followed by an optional unit; the default +is seconds. The units are: + +@table @samp +@item s +seconds +@item m +minutes +@item h +hours +@item d +days +@end table + +Historical implementations of @command{sleep} have required that +@var{number} be an integer, and only accepted a single argument +without a suffix. However, GNU @command{sleep} accepts +arbitrary floating point numbers. @xref{Floating point}. + +The only options are @option{--help} and @option{--version}. @xref{Common +options}. + +@c sleep is a shell built-in at least with Solaris 11's /bin/sh +@mayConflictWithShellBuiltIn{sleep} + +@exitstatus + + +@node Numeric operations +@chapter Numeric operations + +@cindex numeric operations +These programs do numerically-related operations. + +@menu +* factor invocation:: Show factors of numbers. +* numfmt invocation:: Reformat numbers. +* seq invocation:: Print sequences of numbers. +@end menu + + +@node factor invocation +@section @command{factor}: Print prime factors + +@pindex factor +@cindex prime factors + +@command{factor} prints prime factors. Synopses: + +@example +factor [@var{number}]@dots{} +factor @var{option} +@end example + +If no @var{number} is specified on the command line, @command{factor} reads +numbers from standard input, delimited by newlines, tabs, or spaces. + +The @command{factor} command supports only a small number of options: + +@table @samp +@item --help +Print a short help on standard output, then exit without further +processing. + +@item --version +Print the program version on standard output, then exit without further +processing. +@end table + +Factoring the product of the eighth and ninth Mersenne primes +takes about 30 milliseconds of CPU time on a 2.2 GHz Athlon. + +@example +M8=$(echo 2^31-1|bc) +M9=$(echo 2^61-1|bc) +n=$(echo "$M8 * $M9" | bc) +/usr/bin/time -f %U factor $n +4951760154835678088235319297: 2147483647 2305843009213693951 +0.03 +@end example + +Similarly, factoring the eighth Fermat number @math{2^{256}+1} takes +about 20 seconds on the same machine. + +Factoring large numbers is, in general, hard. The Pollard Rho +algorithm used by @command{factor} is particularly effective for +numbers with relatively small factors. If you wish to factor large +numbers which do not have small factors (for example, numbers which +are the product of two large primes), other methods are far better. + +If @command{factor} is built without using GNU MP, only +single-precision arithmetic is available, and so large numbers +(typically @math{2^{64}} and above) will not be supported. The single-precision +code uses an algorithm which is designed for factoring smaller +numbers. + +@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{fields} +@opindex --field +Convert the number in input field @var{fields} (default: 1). +@var{fields} supports @command{cut} style field ranges: + +@example +N N'th field, counted from 1 +N- from N'th field, to end of line +N-M from N'th to M'th field (inclusive) +-M from first to M'th field (inclusive) +- all fields +@end example + + +@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{-}, @samp{0}, width +or precision 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}. The @samp{0} width +modifier (without the @samp{-} modifier) will generate leading zeros on the +number, up to the specified width. A precision specification like @samp{%.1f} +will override the precision determined from the input data or set due to +@option{--to} option auto scaling. + +@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}). +Suffixes are handled as with @samp{--from=auto}. + +@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-unit=1000}). +Suffixes are handled as with @samp{--from=auto}. + +@end table -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 -@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 -signal names and numbers. +@subsection Possible @var{unit}s: -@node Delaying -@chapter Delaying +The following are the possible @var{unit} options with @option{--from=UNITS} and +@option{--to=UNITS}: -@cindex delaying commands -@cindex commands for delaying +@table @var -@c Perhaps @command{wait} or other commands should be described here also? +@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. -@menu -* sleep invocation:: Delay for a specified time. -@end menu +@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 -@node sleep invocation -@section @command{sleep}: Delay for a specified time +@item iec +Auto-scale numbers according to the @emph{International Electrotechnical +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: -@pindex sleep -@cindex delay for a specified time +@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 -@command{sleep} pauses for an amount of time specified by the sum of -the values of the command line arguments. -Synopsis: +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 Electrotechnical +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 -sleep @var{number}[smhd]@dots{} +@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 -@cindex time units -Each argument is a number followed by an optional unit; the default -is seconds. The units are: +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. -@table @samp -@item s -seconds -@item m -minutes -@item h -hours -@item d -days -@end table +@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. -Historical implementations of @command{sleep} have required that -@var{number} be an integer, and only accepted a single argument -without a suffix. However, GNU @command{sleep} accepts -arbitrary floating point numbers. @xref{Floating point}. +@end table -The only options are @option{--help} and @option{--version}. @xref{Common -options}. +@subsection Examples of using @command{numfmt} -@c sleep is a shell built-in at least with Solaris 11's /bin/sh -@mayConflictWithShellBuiltIn{sleep} +Converting a single number from/to @emph{human} representation: +@example +$ numfmt --to=si 500000 +500K -@exitstatus +$ numfmt --to=iec 500000 +489K +$ numfmt --to=iec-i 500000 +489Ki -@node Numeric operations -@chapter Numeric operations +$ numfmt --from=si 1M +1000000 -@cindex numeric operations -These programs do numerically-related operations. +$ numfmt --from=iec 1M +1048576 -@menu -* factor invocation:: Show factors of numbers. -* seq invocation:: Print sequences of numbers. -@end menu +# 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): -@node factor invocation -@section @command{factor}: Print prime factors +@example +$ numfmt --from=si --to=iec 1T +932G +@end example -@pindex factor -@cindex prime factors -@command{factor} prints prime factors. Synopses: +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 -factor [@var{number}]@dots{} -factor @var{option} +# 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 -If no @var{number} is specified on the command line, @command{factor} reads -numbers from standard input, delimited by newlines, tabs, or spaces. -The @command{factor} command supports only a small number of options: +Output can be tweaked using @option{--padding} or @option{--format}: -@table @samp -@item --help -Print a short help on standard output, then exit without further -processing. +@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 -@item --version -Print the program version on standard output, then exit without further -processing. -@end table +# 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 -Factoring the product of the eighth and ninth Mersenne primes -takes about 30 milliseconds of CPU time on a 2.2 GHz Athlon. +# 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 -@example -M8=$(echo 2^31-1|bc) -M9=$(echo 2^61-1|bc) -n=$(echo "$M8 * $M9" | bc) -/usr/bin/time -f %U factor $n -4951760154835678088235319297: 2147483647 2305843009213693951 -0.03 +# 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 -Similarly, factoring the eighth Fermat number @math{2^{256}+1} takes -about 20 seconds on the same machine. +With locales that support grouping digits, using @option{--grouping} or +@option{--format} enables grouping. In @samp{POSIX} locale, grouping is +silently ignored: -Factoring large numbers is, in general, hard. The Pollard Rho -algorithm used by @command{factor} is particularly effective for -numbers with relatively small factors. If you wish to factor large -numbers which do not have small factors (for example, numbers which -are the product of two large primes), other methods are far better. +@example +$ LC_ALL=C numfmt --from=iec --grouping 2G +2147483648 -If @command{factor} is built without using GNU MP, only -single-precision arithmetic is available, and so large numbers -(typically @math{2^{64}} and above) will not be supported. The single-precision -code uses an algorithm which is designed for factoring smaller -numbers. +$ LC_ALL=en_US.utf8 numfmt --from=iec --grouping 2G +2,147,483,648 -@exitstatus +$ 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 seq invocation diff --git a/doc/local.mk b/doc/local.mk index 7f8553dc..a7d2411e 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -1,7 +1,7 @@ # Make coreutils documentation. -*-Makefile-*- # This is included by the top-level Makefile.am. -# Copyright (C) 1995-2014 Free Software Foundation, Inc. +# Copyright (C) 1995-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/doc/parse-datetime.texi b/doc/parse-datetime.texi index 7fa3c9ec..34e9ede5 100644 --- a/doc/parse-datetime.texi +++ b/doc/parse-datetime.texi @@ -1,11 +1,11 @@ @c GNU date syntax documentation -@c Copyright (C) 1994-2006, 2009-2014 Free Software Foundation, Inc. +@c Copyright (C) 1994-2006, 2009-2015 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 @c any later version published by the Free Software Foundation; with no -@c Invariant Sections, with no Front-Cover Texts, and with no Back-Cover +@c Invariant Sections, no Front-Cover Texts, and no Back-Cover @c Texts. A copy of the license is included in the ``GNU Free @c Documentation License'' file as part of this distribution. diff --git a/doc/perm.texi b/doc/perm.texi index 0bccc639..a0b68e2f 100644 --- a/doc/perm.texi +++ b/doc/perm.texi @@ -1,6 +1,6 @@ @c File mode bits -@c Copyright (C) 1994-2014 Free Software Foundation, Inc. +@c Copyright (C) 1994-2015 Free Software Foundation, Inc. @c Permission is granted to copy, distribute and/or modify this document @c under the terms of the GNU Free Documentation License, Version 1.3 or diff --git a/doc/stamp-vti b/doc/stamp-vti index c8d95f1e..8592673f 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 13 July 2014 -@set UPDATED-MONTH July 2014 -@set EDITION 8.23 -@set VERSION 8.23 +@set UPDATED 26 June 2015 +@set UPDATED-MONTH June 2015 +@set EDITION 8.24 +@set VERSION 8.24 diff --git a/doc/version.texi b/doc/version.texi index c8d95f1e..8592673f 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 13 July 2014 -@set UPDATED-MONTH July 2014 -@set EDITION 8.23 -@set VERSION 8.23 +@set UPDATED 26 June 2015 +@set UPDATED-MONTH June 2015 +@set EDITION 8.24 +@set VERSION 8.24 diff --git a/gnulib-tests/Makefile.in b/gnulib-tests/Makefile.in index 1047bc75..0d4979f6 100644 --- a/gnulib-tests/Makefile.in +++ b/gnulib-tests/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,7 @@ @SET_MAKE@ -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -39,7 +39,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -101,20 +111,16 @@ 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 -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 \ - test-set-mode-acl-2.sh test-copy-acl.sh test-copy-acl-1.sh \ - test-copy-acl-2.sh test-alignof$(EXEEXT) \ +TESTS = test-accept$(EXEEXT) test-set-mode-acl.sh \ + test-set-mode-acl-1.sh test-set-mode-acl-2.sh test-copy-acl.sh \ + test-copy-acl-1.sh test-copy-acl-2.sh test-alignof$(EXEEXT) \ test-alloca-opt$(EXEEXT) test-areadlink$(EXEEXT) \ test-areadlink-with-size$(EXEEXT) test-areadlinkat$(EXEEXT) \ test-argmatch$(EXEEXT) test-argv-iter$(EXEEXT) \ - test-arpa_inet$(EXEEXT) test-base64$(EXEEXT) test-binary-io.sh \ - test-bind$(EXEEXT) test-bitrotate$(EXEEXT) test-btowc1.sh \ - test-btowc2.sh test-c-ctype$(EXEEXT) test-c-strcase.sh \ + test-arpa_inet$(EXEEXT) test-array_list$(EXEEXT) \ + test-base64$(EXEEXT) test-binary-io.sh test-bind$(EXEEXT) \ + test-bitrotate$(EXEEXT) test-btowc1.sh test-btowc2.sh \ + test-c-ctype$(EXEEXT) test-c-strcase.sh \ test-calloc-gnu$(EXEEXT) test-canonicalize$(EXEEXT) \ test-chdir$(EXEEXT) test-chown$(EXEEXT) test-cloexec$(EXEEXT) \ test-close$(EXEEXT) test-closein.sh test-connect$(EXEEXT) \ @@ -132,37 +138,40 @@ TESTS = test-accept$(EXEEXT) test-file-has-acl.sh \ test-fdatasync$(EXEEXT) test-fdopen$(EXEEXT) \ test-fdopendir$(EXEEXT) test-fdutimensat$(EXEEXT) \ test-fflush$(EXEEXT) test-fflush2.sh test-fgetc$(EXEEXT) \ - test-filenamecat$(EXEEXT) test-filevercmp$(EXEEXT) \ - test-float$(EXEEXT) test-fnmatch$(EXEEXT) \ - test-fopen-safer$(EXEEXT) test-fopen$(EXEEXT) test-fpending.sh \ - test-fpurge$(EXEEXT) test-fputc$(EXEEXT) test-fread$(EXEEXT) \ - test-freadahead.sh test-freading$(EXEEXT) test-freadptr.sh \ - test-freadptr2.sh test-freadseek.sh \ - test-freopen-safer$(EXEEXT) test-freopen$(EXEEXT) \ - test-frexp-nolibm$(EXEEXT) test-frexpl-nolibm$(EXEEXT) \ - test-fseek.sh test-fseek2.sh test-fseeko.sh test-fseeko2.sh \ - test-fseeko3.sh test-fseeko4.sh test-fseterr$(EXEEXT) \ - test-fstat$(EXEEXT) test-fstatat$(EXEEXT) test-fsync$(EXEEXT) \ - test-ftell.sh test-ftell2.sh test-ftell3$(EXEEXT) \ - test-ftello.sh test-ftello2.sh test-ftello3$(EXEEXT) \ - test-ftello4.sh test-ftruncate.sh test-futimens$(EXEEXT) \ - test-fwrite$(EXEEXT) test-getaddrinfo$(EXEEXT) \ - test-getcwd-lgpl$(EXEEXT) test-getcwd.sh \ - test-getdelim$(EXEEXT) test-getdtablesize$(EXEEXT) \ - test-getgroups$(EXEEXT) test-gethostname$(EXEEXT) \ - test-getline$(EXEEXT) test-getloadavg$(EXEEXT) \ - test-getlogin$(EXEEXT) test-getndelim2$(EXEEXT) \ - test-getopt$(EXEEXT) test-gettimeofday$(EXEEXT) \ - test-hash$(EXEEXT) test-i-ring$(EXEEXT) test-iconv-h$(EXEEXT) \ - test-iconv$(EXEEXT) test-ignore-value$(EXEEXT) \ - test-inet_ntop$(EXEEXT) test-inet_pton$(EXEEXT) \ - test-ino-map$(EXEEXT) test-intprops$(EXEEXT) \ - test-inttostr$(EXEEXT) test-inttypes$(EXEEXT) \ - test-ioctl$(EXEEXT) test-isatty$(EXEEXT) test-isblank$(EXEEXT) \ + test-file-has-acl.sh test-file-has-acl-1.sh \ + test-file-has-acl-2.sh test-filenamecat$(EXEEXT) \ + test-filevercmp$(EXEEXT) test-float$(EXEEXT) \ + test-fnmatch$(EXEEXT) test-fopen-safer$(EXEEXT) \ + test-fopen$(EXEEXT) test-fpending.sh test-fpurge$(EXEEXT) \ + test-fputc$(EXEEXT) test-fread$(EXEEXT) test-freadahead.sh \ + test-freading$(EXEEXT) test-freadptr.sh test-freadptr2.sh \ + test-freadseek.sh test-freopen-safer$(EXEEXT) \ + test-freopen$(EXEEXT) test-frexp-nolibm$(EXEEXT) \ + test-frexpl-nolibm$(EXEEXT) test-fseek.sh test-fseek2.sh \ + test-fseeko.sh test-fseeko2.sh test-fseeko3.sh test-fseeko4.sh \ + test-fseterr$(EXEEXT) test-fstat$(EXEEXT) \ + test-fstatat$(EXEEXT) test-fsync$(EXEEXT) test-ftell.sh \ + test-ftell2.sh test-ftell3$(EXEEXT) test-ftello.sh \ + test-ftello2.sh test-ftello3$(EXEEXT) test-ftello4.sh \ + test-ftruncate.sh test-futimens$(EXEEXT) test-fwrite$(EXEEXT) \ + test-getaddrinfo$(EXEEXT) test-getcwd-lgpl$(EXEEXT) \ + test-getcwd.sh test-getdelim$(EXEEXT) \ + test-getdtablesize$(EXEEXT) test-getgroups$(EXEEXT) \ + test-gethostname$(EXEEXT) test-getline$(EXEEXT) \ + test-getloadavg$(EXEEXT) test-getlogin$(EXEEXT) \ + test-getndelim2$(EXEEXT) test-getopt$(EXEEXT) \ + test-gettimeofday$(EXEEXT) test-hash$(EXEEXT) \ + test-i-ring$(EXEEXT) test-iconv-h$(EXEEXT) test-iconv$(EXEEXT) \ + test-ignore-value$(EXEEXT) test-inet_ntop$(EXEEXT) \ + test-inet_pton$(EXEEXT) test-ino-map$(EXEEXT) \ + test-intprops$(EXEEXT) test-inttostr$(EXEEXT) \ + test-inttypes$(EXEEXT) test-ioctl$(EXEEXT) \ + test-isatty$(EXEEXT) test-isblank$(EXEEXT) \ test-isnand-nolibm$(EXEEXT) test-isnanf-nolibm$(EXEEXT) \ test-isnanl-nolibm$(EXEEXT) test-iswblank$(EXEEXT) \ test-langinfo$(EXEEXT) test-lchown$(EXEEXT) test-link$(EXEEXT) \ - test-linkat$(EXEEXT) test-listen$(EXEEXT) test-locale$(EXEEXT) \ + test-linkat$(EXEEXT) test-linked_list$(EXEEXT) \ + test-listen$(EXEEXT) test-locale$(EXEEXT) \ test-localeconv$(EXEEXT) test-localename$(EXEEXT) \ test-lock$(EXEEXT) test-lseek.sh test-lstat$(EXEEXT) \ test-malloc-gnu$(EXEEXT) test-malloca$(EXEEXT) \ @@ -236,13 +245,13 @@ TESTS = test-accept$(EXEEXT) test-file-has-acl.sh \ test-xvasprintf$(EXEEXT) test-yesno.sh XFAIL_TESTS = noinst_PROGRAMS = -check_PROGRAMS = test-accept$(EXEEXT) test-file-has-acl$(EXEEXT) \ - test-set-mode-acl$(EXEEXT) test-copy-acl$(EXEEXT) \ - test-sameacls$(EXEEXT) test-alignof$(EXEEXT) \ - test-alloca-opt$(EXEEXT) test-areadlink$(EXEEXT) \ - test-areadlink-with-size$(EXEEXT) test-areadlinkat$(EXEEXT) \ - test-argmatch$(EXEEXT) test-argv-iter$(EXEEXT) \ - test-arpa_inet$(EXEEXT) test-base64$(EXEEXT) \ +check_PROGRAMS = test-accept$(EXEEXT) test-set-mode-acl$(EXEEXT) \ + test-copy-acl$(EXEEXT) test-sameacls$(EXEEXT) \ + test-alignof$(EXEEXT) test-alloca-opt$(EXEEXT) \ + test-areadlink$(EXEEXT) test-areadlink-with-size$(EXEEXT) \ + test-areadlinkat$(EXEEXT) test-argmatch$(EXEEXT) \ + test-argv-iter$(EXEEXT) test-arpa_inet$(EXEEXT) \ + test-array_list$(EXEEXT) test-base64$(EXEEXT) \ test-binary-io$(EXEEXT) test-bind$(EXEEXT) \ test-bitrotate$(EXEEXT) test-btowc$(EXEEXT) \ test-c-ctype$(EXEEXT) test-c-strcasecmp$(EXEEXT) \ @@ -262,11 +271,11 @@ check_PROGRAMS = test-accept$(EXEEXT) test-file-has-acl$(EXEEXT) \ test-fdatasync$(EXEEXT) test-fdopen$(EXEEXT) \ test-fdopendir$(EXEEXT) test-fdutimensat$(EXEEXT) \ test-fflush$(EXEEXT) test-fflush2$(EXEEXT) test-fgetc$(EXEEXT) \ - test-filenamecat$(EXEEXT) test-filevercmp$(EXEEXT) \ - test-float$(EXEEXT) test-fnmatch$(EXEEXT) \ - test-fopen-safer$(EXEEXT) test-fopen$(EXEEXT) \ - test-fpending$(EXEEXT) test-fpurge$(EXEEXT) \ - test-fputc$(EXEEXT) test-fread$(EXEEXT) \ + test-file-has-acl$(EXEEXT) test-filenamecat$(EXEEXT) \ + test-filevercmp$(EXEEXT) test-float$(EXEEXT) \ + test-fnmatch$(EXEEXT) test-fopen-safer$(EXEEXT) \ + test-fopen$(EXEEXT) test-fpending$(EXEEXT) \ + test-fpurge$(EXEEXT) test-fputc$(EXEEXT) test-fread$(EXEEXT) \ test-freadahead$(EXEEXT) test-freading$(EXEEXT) \ test-freadptr$(EXEEXT) test-freadptr2$(EXEEXT) \ test-freadseek$(EXEEXT) test-freopen-safer$(EXEEXT) \ @@ -294,7 +303,8 @@ check_PROGRAMS = test-accept$(EXEEXT) test-file-has-acl$(EXEEXT) \ test-isnand-nolibm$(EXEEXT) test-isnanf-nolibm$(EXEEXT) \ test-isnanl-nolibm$(EXEEXT) test-iswblank$(EXEEXT) \ test-langinfo$(EXEEXT) test-lchown$(EXEEXT) test-link$(EXEEXT) \ - test-linkat$(EXEEXT) test-listen$(EXEEXT) test-locale$(EXEEXT) \ + test-linkat$(EXEEXT) test-linked_list$(EXEEXT) \ + test-listen$(EXEEXT) test-locale$(EXEEXT) \ test-localeconv$(EXEEXT) test-localename$(EXEEXT) \ test-lock$(EXEEXT) test-lseek$(EXEEXT) test-lstat$(EXEEXT) \ test-malloc-gnu$(EXEEXT) test-malloca$(EXEEXT) \ @@ -485,15 +495,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.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/po.m4 \ - $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/posixtm.m4 \ - $(top_srcdir)/m4/posixver.m4 $(top_srcdir)/m4/prereq.m4 \ - $(top_srcdir)/m4/printf-frexp.m4 \ + $(top_srcdir)/m4/nproc.m4 $(top_srcdir)/m4/obstack.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/po.m4 $(top_srcdir)/m4/posix-shell.m4 \ + $(top_srcdir)/m4/posixtm.m4 $(top_srcdir)/m4/posixver.m4 \ + $(top_srcdir)/m4/prereq.m4 $(top_srcdir)/m4/printf-frexp.m4 \ $(top_srcdir)/m4/printf-frexpl.m4 $(top_srcdir)/m4/printf.m4 \ $(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/pthread.m4 $(top_srcdir)/m4/putenv.m4 \ @@ -578,6 +588,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/cu-progs.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/lib/config.h CONFIG_CLEAN_FILES = @@ -590,8 +602,9 @@ am__v_AR_1 = libtests_a_AR = $(AR) $(ARFLAGS) am__DEPENDENCIES_1 = am__dirstamp = $(am__leading_dot)dirstamp -am_libtests_a_OBJECTS = binary-io.$(OBJEXT) localename.$(OBJEXT) \ - glthread/thread.$(OBJEXT) unlinkdir.$(OBJEXT) +am_libtests_a_OBJECTS = gl_array_list.$(OBJEXT) binary-io.$(OBJEXT) \ + localename.$(OBJEXT) glthread/thread.$(OBJEXT) \ + unlinkdir.$(OBJEXT) libtests_a_OBJECTS = $(am_libtests_a_OBJECTS) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \ "$(DESTDIR)$(man1dir)" @@ -637,6 +650,11 @@ test_arpa_inet_OBJECTS = test-arpa_inet.$(OBJEXT) test_arpa_inet_LDADD = $(LDADD) test_arpa_inet_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \ libtests.a $(am__DEPENDENCIES_1) +test_array_list_SOURCES = test-array_list.c +test_array_list_OBJECTS = test-array_list.$(OBJEXT) +test_array_list_LDADD = $(LDADD) +test_array_list_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \ + libtests.a $(am__DEPENDENCIES_1) test_base64_SOURCES = test-base64.c test_base64_OBJECTS = test-base64.$(OBJEXT) test_base64_LDADD = $(LDADD) @@ -1160,6 +1178,11 @@ test_link_DEPENDENCIES = $(am__DEPENDENCIES_2) test_linkat_SOURCES = test-linkat.c test_linkat_OBJECTS = test-linkat.$(OBJEXT) test_linkat_DEPENDENCIES = $(am__DEPENDENCIES_2) +test_linked_list_SOURCES = test-linked_list.c +test_linked_list_OBJECTS = test-linked_list.$(OBJEXT) +test_linked_list_LDADD = $(LDADD) +test_linked_list_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \ + libtests.a $(am__DEPENDENCIES_1) test_listen_SOURCES = test-listen.c test_listen_OBJECTS = test-listen.$(OBJEXT) test_listen_DEPENDENCIES = $(am__DEPENDENCIES_2) @@ -1859,16 +1882,16 @@ 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 \ test-argmatch.c test-argv-iter.c test-arpa_inet.c \ - test-base64.c test-binary-io.c test-bind.c test-bitrotate.c \ - test-btowc.c test-c-ctype.c test-c-strcasecmp.c \ - test-c-strncasecmp.c test-calloc-gnu.c test-canonicalize.c \ - test-chdir.c test-chown.c test-cloexec.c test-close.c \ - test-closein.c test-connect.c test-copy-acl.c test-ctype.c \ - test-di-set.c test-dirent.c test-dirent-safer.c test-dirname.c \ - test-dup.c test-dup-safer.c test-dup2.c test-environ.c \ - test-errno.c test-exclude.c test-faccessat.c test-fadvise.c \ - test-fchdir.c test-fchmodat.c test-fchownat.c test-fclose.c \ - test-fcntl.c test-fcntl-h.c test-fcntl-safer.c \ + test-array_list.c test-base64.c test-binary-io.c test-bind.c \ + test-bitrotate.c test-btowc.c test-c-ctype.c \ + test-c-strcasecmp.c test-c-strncasecmp.c test-calloc-gnu.c \ + test-canonicalize.c test-chdir.c test-chown.c test-cloexec.c \ + test-close.c test-closein.c test-connect.c test-copy-acl.c \ + test-ctype.c test-di-set.c test-dirent.c test-dirent-safer.c \ + test-dirname.c test-dup.c test-dup-safer.c test-dup2.c \ + test-environ.c test-errno.c test-exclude.c test-faccessat.c \ + test-fadvise.c test-fchdir.c test-fchmodat.c test-fchownat.c \ + test-fclose.c test-fcntl.c test-fcntl-h.c test-fcntl-safer.c \ test-fdatasync.c test-fdopen.c test-fdopendir.c \ test-fdutimensat.c test-fflush.c test-fflush2.c test-fgetc.c \ test-file-has-acl.c test-filenamecat.c test-filevercmp.c \ @@ -1892,15 +1915,16 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \ test-isatty.c test-isblank.c test-isnand-nolibm.c \ test-isnanf-nolibm.c test-isnanl-nolibm.c test-iswblank.c \ test-langinfo.c test-lchown.c test-link.c test-linkat.c \ - test-listen.c test-locale.c test-localeconv.c \ - test-localename.c test-lock.c test-lseek.c test-lstat.c \ - test-malloc-gnu.c test-malloca.c test-math.c test-mbrtowc.c \ - test-mbrtowc-w32.c test-mbsalign.c test-mbscasecmp.c \ - test-mbsinit.c test-mbsrtowcs.c test-mbsstr1.c test-mbsstr2.c \ - test-mbsstr3.c test-md5.c test-memcasecmp.c test-memchr.c \ - test-memchr2.c test-memcoll.c test-memrchr.c test-mkdir.c \ - test-mkfifo.c test-mknod.c test-nanosleep.c test-netdb.c \ - test-netinet_in.c test-nl_langinfo.c test-open.c test-openat.c \ + test-linked_list.c test-listen.c test-locale.c \ + test-localeconv.c test-localename.c test-lock.c test-lseek.c \ + test-lstat.c test-malloc-gnu.c test-malloca.c test-math.c \ + test-mbrtowc.c test-mbrtowc-w32.c test-mbsalign.c \ + test-mbscasecmp.c test-mbsinit.c test-mbsrtowcs.c \ + test-mbsstr1.c test-mbsstr2.c test-mbsstr3.c test-md5.c \ + test-memcasecmp.c test-memchr.c test-memchr2.c test-memcoll.c \ + test-memrchr.c test-mkdir.c test-mkfifo.c test-mknod.c \ + test-nanosleep.c test-netdb.c test-netinet_in.c \ + test-nl_langinfo.c test-open.c test-openat.c \ test-openat-safer.c test-parse-datetime.c test-pathmax.c \ test-perror.c test-perror2.c test-pipe.c test-posixtm.c \ test-printf-frexp.c test-printf-frexpl.c test-priv-set.c \ @@ -1940,16 +1964,16 @@ DIST_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 \ test-argmatch.c test-argv-iter.c test-arpa_inet.c \ - test-base64.c test-binary-io.c test-bind.c test-bitrotate.c \ - test-btowc.c test-c-ctype.c test-c-strcasecmp.c \ - test-c-strncasecmp.c test-calloc-gnu.c test-canonicalize.c \ - test-chdir.c test-chown.c test-cloexec.c test-close.c \ - test-closein.c test-connect.c test-copy-acl.c test-ctype.c \ - test-di-set.c test-dirent.c test-dirent-safer.c test-dirname.c \ - test-dup.c test-dup-safer.c test-dup2.c test-environ.c \ - test-errno.c test-exclude.c test-faccessat.c test-fadvise.c \ - test-fchdir.c test-fchmodat.c test-fchownat.c test-fclose.c \ - test-fcntl.c test-fcntl-h.c test-fcntl-safer.c \ + test-array_list.c test-base64.c test-binary-io.c test-bind.c \ + test-bitrotate.c test-btowc.c test-c-ctype.c \ + test-c-strcasecmp.c test-c-strncasecmp.c test-calloc-gnu.c \ + test-canonicalize.c test-chdir.c test-chown.c test-cloexec.c \ + test-close.c test-closein.c test-connect.c test-copy-acl.c \ + test-ctype.c test-di-set.c test-dirent.c test-dirent-safer.c \ + test-dirname.c test-dup.c test-dup-safer.c test-dup2.c \ + test-environ.c test-errno.c test-exclude.c test-faccessat.c \ + test-fadvise.c test-fchdir.c test-fchmodat.c test-fchownat.c \ + test-fclose.c test-fcntl.c test-fcntl-h.c test-fcntl-safer.c \ test-fdatasync.c test-fdopen.c test-fdopendir.c \ test-fdutimensat.c test-fflush.c test-fflush2.c test-fgetc.c \ test-file-has-acl.c test-filenamecat.c test-filevercmp.c \ @@ -1973,15 +1997,16 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \ test-isatty.c test-isblank.c test-isnand-nolibm.c \ test-isnanf-nolibm.c test-isnanl-nolibm.c test-iswblank.c \ test-langinfo.c test-lchown.c test-link.c test-linkat.c \ - test-listen.c test-locale.c test-localeconv.c \ - test-localename.c test-lock.c test-lseek.c test-lstat.c \ - test-malloc-gnu.c test-malloca.c test-math.c test-mbrtowc.c \ - test-mbrtowc-w32.c test-mbsalign.c test-mbscasecmp.c \ - test-mbsinit.c test-mbsrtowcs.c test-mbsstr1.c test-mbsstr2.c \ - test-mbsstr3.c test-md5.c test-memcasecmp.c test-memchr.c \ - test-memchr2.c test-memcoll.c test-memrchr.c test-mkdir.c \ - test-mkfifo.c test-mknod.c test-nanosleep.c test-netdb.c \ - test-netinet_in.c test-nl_langinfo.c test-open.c test-openat.c \ + test-linked_list.c test-listen.c test-locale.c \ + test-localeconv.c test-localename.c test-lock.c test-lseek.c \ + test-lstat.c test-malloc-gnu.c test-malloca.c test-math.c \ + test-mbrtowc.c test-mbrtowc-w32.c test-mbsalign.c \ + test-mbscasecmp.c test-mbsinit.c test-mbsrtowcs.c \ + test-mbsstr1.c test-mbsstr2.c test-mbsstr3.c test-md5.c \ + test-memcasecmp.c test-memchr.c test-memchr2.c test-memcoll.c \ + test-memrchr.c test-mkdir.c test-mkfifo.c test-mknod.c \ + test-nanosleep.c test-netdb.c test-netinet_in.c \ + test-nl_langinfo.c test-open.c test-openat.c \ test-openat-safer.c test-parse-datetime.c test-pathmax.c \ test-perror.c test-perror2.c test-pipe.c test-posixtm.c \ test-printf-frexp.c test-printf-frexpl.c test-priv-set.c \ @@ -2265,6 +2290,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gnulib.mk \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -2573,6 +2601,7 @@ GNULIB_PUTCHAR = @GNULIB_PUTCHAR@ GNULIB_PUTENV = @GNULIB_PUTENV@ GNULIB_PUTS = @GNULIB_PUTS@ GNULIB_PWRITE = @GNULIB_PWRITE@ +GNULIB_QSORT_R = @GNULIB_QSORT_R@ GNULIB_RAISE = @GNULIB_RAISE@ GNULIB_RANDOM = @GNULIB_RANDOM@ GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ @@ -2906,6 +2935,7 @@ HAVE_LOGF = @HAVE_LOGF@ HAVE_LOGL = @HAVE_LOGL@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ +HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ HAVE_MBSINIT = @HAVE_MBSINIT@ @@ -3119,6 +3149,7 @@ LIB_EACCESS = @LIB_EACCESS@ LIB_FDATASYNC = @LIB_FDATASYNC@ LIB_GETHRXTIME = @LIB_GETHRXTIME@ LIB_GMP = @LIB_GMP@ +LIB_HAS_ACL = @LIB_HAS_ACL@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ LIB_NVPAIR = @LIB_NVPAIR@ LIB_PTHREAD = @LIB_PTHREAD@ @@ -3387,10 +3418,12 @@ REPLACE_PTSNAME = @REPLACE_PTSNAME@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_PWRITE = @REPLACE_PWRITE@ +REPLACE_QSORT_R = @REPLACE_QSORT_R@ REPLACE_RAISE = @REPLACE_RAISE@ REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ REPLACE_READ = @REPLACE_READ@ REPLACE_READLINK = @REPLACE_READLINK@ +REPLACE_READLINKAT = @REPLACE_READLINKAT@ REPLACE_REALLOC = @REPLACE_REALLOC@ REPLACE_REALPATH = @REPLACE_REALPATH@ REPLACE_REMAINDER = @REPLACE_REMAINDER@ @@ -3433,6 +3466,7 @@ REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ +REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ @@ -3481,6 +3515,7 @@ 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_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ 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@ @@ -3566,9 +3601,9 @@ SUBDIRS = . TESTS_ENVIRONMENT = EXEEXT='@EXEEXT@' srcdir='$(srcdir)' \ USE_ACL=$(USE_ACL) LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_FR='@LOCALE_FR@' \ - LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_FR='@LOCALE_FR@' \ - LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_JA='@LOCALE_JA@' \ - LOCALE_ZH_CN='@LOCALE_ZH_CN@' \ + LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' USE_ACL=$(USE_ACL) \ + LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ + LOCALE_JA='@LOCALE_JA@' LOCALE_ZH_CN='@LOCALE_ZH_CN@' \ LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_JA='@LOCALE_JA@' \ @@ -3596,51 +3631,52 @@ check_LIBRARIES = libtests.a # your project does not use "gettext --intl", and some compilers # complain about -I options applied to nonexistent directories. EXTRA_DIST = accept.c w32sock.h test-accept.c signature.h macros.h \ - test-file-has-acl.sh test-file-has-acl-1.sh \ - test-file-has-acl-2.sh test-set-mode-acl.sh \ - test-set-mode-acl-1.sh test-set-mode-acl-2.sh test-copy-acl.sh \ - test-copy-acl-1.sh test-copy-acl-2.sh test-file-has-acl.c \ - test-set-mode-acl.c test-copy-acl.c test-sameacls.c macros.h \ - test-alignof.c test-alloca-opt.c test-areadlink.h \ - test-areadlink.c macros.h test-areadlink.h \ + test-set-mode-acl.sh test-set-mode-acl-1.sh \ + test-set-mode-acl-2.sh test-copy-acl.sh test-copy-acl-1.sh \ + test-copy-acl-2.sh test-set-mode-acl.c test-copy-acl.c \ + test-sameacls.c macros.h test-alignof.c test-alloca-opt.c \ + test-areadlink.h test-areadlink.c macros.h test-areadlink.h \ test-areadlink-with-size.c macros.h test-areadlink.h \ test-areadlinkat.c macros.h test-argmatch.c macros.h \ - test-argv-iter.c macros.h test-arpa_inet.c test-base64.c \ - macros.h test-binary-io.sh test-binary-io.c macros.h bind.c \ - w32sock.h test-bind.c signature.h macros.h test-bitrotate.c \ - macros.h test-btowc1.sh test-btowc2.sh test-btowc.c \ - signature.h macros.h test-c-ctype.c macros.h test-c-strcase.sh \ - test-c-strcasecmp.c test-c-strncasecmp.c macros.h \ - test-calloc-gnu.c test-canonicalize.c macros.h test-chdir.c \ - signature.h macros.h nap.h test-chown.h test-chown.c \ - signature.h macros.h test-cloexec.c macros.h test-close.c \ - signature.h macros.h test-closein.sh test-closein.c connect.c \ - w32sock.h test-connect.c signature.h macros.h test-md5.c \ - test-sha1.c test-ctype.c test-di-set.c macros.h \ - test-dirent-safer.c macros.h test-dirent.c test-dirname.c \ - test-dup.c signature.h macros.h test-dup2.c signature.h \ - macros.h test-environ.c test-errno.c test-exclude.c \ - test-exclude1.sh test-exclude2.sh test-exclude3.sh \ - test-exclude4.sh test-exclude5.sh test-exclude6.sh \ - test-exclude7.sh test-exclude8.sh test-faccessat.c signature.h \ - macros.h test-fadvise.c test-fchdir.c signature.h macros.h \ - test-fchmodat.c signature.h macros.h nap.h test-chown.h \ - test-lchown.h test-fchownat.c signature.h macros.h \ - test-fclose.c test-fcntl-h.c test-open.h test-fcntl-safer.c \ - macros.h test-fcntl.c signature.h macros.h test-fdatasync.c \ - signature.h macros.h test-fdopen.c signature.h macros.h \ - test-fdopendir.c signature.h macros.h nap.h test-futimens.h \ - test-lutimens.h test-utimens.h test-utimens-common.h \ - test-fdutimensat.c macros.h test-fflush.c test-fflush2.sh \ - test-fflush2.c signature.h macros.h test-fgetc.c signature.h \ - macros.h test-filenamecat.c test-filevercmp.c macros.h \ - test-float.c macros.h test-fnmatch.c signature.h macros.h \ - test-fopen.h test-fopen-safer.c macros.h test-fopen.h \ - test-fopen.c signature.h macros.h test-fpending.c \ - test-fpending.sh macros.h test-fpurge.c macros.h test-fputc.c \ - signature.h macros.h test-fread.c signature.h macros.h \ - test-freadahead.c test-freadahead.sh macros.h test-freading.c \ - macros.h test-freadptr.c test-freadptr.sh test-freadptr2.c \ + test-argv-iter.c macros.h test-arpa_inet.c test-array_list.c \ + macros.h test-base64.c macros.h test-binary-io.sh \ + test-binary-io.c macros.h bind.c w32sock.h test-bind.c \ + signature.h macros.h test-bitrotate.c macros.h test-btowc1.sh \ + test-btowc2.sh test-btowc.c signature.h macros.h \ + test-c-ctype.c macros.h test-c-strcase.sh test-c-strcasecmp.c \ + test-c-strncasecmp.c macros.h test-calloc-gnu.c \ + test-canonicalize.c macros.h test-chdir.c signature.h macros.h \ + nap.h test-chown.h test-chown.c signature.h macros.h \ + test-cloexec.c macros.h test-close.c signature.h macros.h \ + test-closein.sh test-closein.c connect.c w32sock.h \ + test-connect.c signature.h macros.h test-md5.c test-sha1.c \ + test-ctype.c test-di-set.c macros.h test-dirent-safer.c \ + macros.h test-dirent.c test-dirname.c test-dup.c signature.h \ + macros.h test-dup2.c signature.h macros.h test-environ.c \ + test-errno.c test-exclude.c test-exclude1.sh test-exclude2.sh \ + test-exclude3.sh test-exclude4.sh test-exclude5.sh \ + test-exclude6.sh test-exclude7.sh test-exclude8.sh \ + test-faccessat.c signature.h macros.h test-fadvise.c \ + test-fchdir.c signature.h macros.h test-fchmodat.c signature.h \ + macros.h nap.h test-chown.h test-lchown.h test-fchownat.c \ + signature.h macros.h test-fclose.c test-fcntl-h.c test-open.h \ + test-fcntl-safer.c macros.h test-fcntl.c signature.h macros.h \ + test-fdatasync.c signature.h macros.h test-fdopen.c \ + signature.h macros.h test-fdopendir.c signature.h macros.h \ + nap.h test-futimens.h test-lutimens.h test-utimens.h \ + test-utimens-common.h test-fdutimensat.c macros.h \ + test-fflush.c test-fflush2.sh test-fflush2.c signature.h \ + macros.h test-fgetc.c signature.h macros.h \ + test-file-has-acl.sh test-file-has-acl-1.sh \ + test-file-has-acl-2.sh test-file-has-acl.c macros.h \ + test-filenamecat.c test-filevercmp.c macros.h test-float.c \ + macros.h test-fnmatch.c signature.h macros.h test-fopen.h \ + test-fopen-safer.c macros.h test-fopen.h test-fopen.c \ + signature.h macros.h test-fpending.c test-fpending.sh macros.h \ + test-fpurge.c macros.h test-fputc.c signature.h macros.h \ + test-fread.c signature.h macros.h test-freadahead.c \ + test-freadahead.sh macros.h test-freading.c macros.h \ + test-freadptr.c test-freadptr.sh test-freadptr2.c \ test-freadptr2.sh macros.h test-freadseek.c test-freadseek.sh \ macros.h test-freopen-safer.c macros.h test-freopen.c \ signature.h macros.h test-frexp.c test-frexp.h minus-zero.h \ @@ -3682,24 +3718,25 @@ EXTRA_DIST = accept.c w32sock.h test-accept.c signature.h macros.h \ infinity.h nan.h macros.h test-iswblank.c macros.h \ test-langinfo.c nap.h test-lchown.h test-lchown.c signature.h \ macros.h test-link.h test-link.c signature.h macros.h \ - test-link.h test-linkat.c signature.h macros.h listen.c \ - w32sock.h test-listen.c signature.h macros.h test-locale.c \ - test-localeconv.c signature.h macros.h localename.h \ - test-localename.c macros.h test-lock.c test-lseek.c \ - test-lseek.sh signature.h macros.h test-lstat.h test-lstat.c \ - signature.h macros.h test-malloc-gnu.c test-malloca.c \ - test-math.c macros.h test-mbrtowc1.sh test-mbrtowc2.sh \ - test-mbrtowc3.sh test-mbrtowc4.sh test-mbrtowc.c \ - test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \ - test-mbrtowc-w32-3.sh test-mbrtowc-w32-4.sh \ - test-mbrtowc-w32-5.sh test-mbrtowc-w32.c signature.h macros.h \ - test-mbsalign.c macros.h test-mbscasecmp.sh test-mbscasecmp.c \ - macros.h test-mbsinit.sh test-mbsinit.c signature.h macros.h \ - test-mbsrtowcs1.sh test-mbsrtowcs2.sh test-mbsrtowcs3.sh \ - test-mbsrtowcs4.sh test-mbsrtowcs.c signature.h macros.h \ - test-mbsstr1.c test-mbsstr2.sh test-mbsstr2.c test-mbsstr3.sh \ - test-mbsstr3.c macros.h test-memcasecmp.c zerosize-ptr.h \ - macros.h test-memchr.c zerosize-ptr.h signature.h macros.h \ + test-link.h test-linkat.c signature.h macros.h \ + test-linked_list.c macros.h listen.c w32sock.h test-listen.c \ + signature.h macros.h test-locale.c test-localeconv.c \ + signature.h macros.h localename.h test-localename.c macros.h \ + test-lock.c test-lseek.c test-lseek.sh signature.h macros.h \ + test-lstat.h test-lstat.c signature.h macros.h \ + test-malloc-gnu.c test-malloca.c test-math.c macros.h \ + test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \ + test-mbrtowc4.sh test-mbrtowc.c test-mbrtowc-w32-1.sh \ + test-mbrtowc-w32-2.sh test-mbrtowc-w32-3.sh \ + test-mbrtowc-w32-4.sh test-mbrtowc-w32-5.sh test-mbrtowc-w32.c \ + signature.h macros.h test-mbsalign.c macros.h \ + test-mbscasecmp.sh test-mbscasecmp.c macros.h test-mbsinit.sh \ + test-mbsinit.c signature.h macros.h test-mbsrtowcs1.sh \ + test-mbsrtowcs2.sh test-mbsrtowcs3.sh test-mbsrtowcs4.sh \ + test-mbsrtowcs.c signature.h macros.h test-mbsstr1.c \ + test-mbsstr2.sh test-mbsstr2.c test-mbsstr3.sh test-mbsstr3.c \ + macros.h test-memcasecmp.c zerosize-ptr.h macros.h \ + test-memchr.c zerosize-ptr.h signature.h macros.h \ test-memchr2.c zerosize-ptr.h macros.h test-memcoll.c macros.h \ test-memrchr.c zerosize-ptr.h signature.h macros.h \ test-mkdir.h test-mkdir.c signature.h macros.h test-mkfifo.h \ @@ -3828,9 +3865,9 @@ AM_CPPFLAGS = \ -I../lib -I$(srcdir)/../lib LDADD = libtests.a ../lib/libcoreutils.a libtests.a $(LIBTESTS_LIBDEPS) -libtests_a_SOURCES = binary-io.h binary-io.c localename.c \ - glthread/thread.h glthread/thread.c unlinkdir.c \ - glthread/yield.h +libtests_a_SOURCES = gl_array_list.h gl_array_list.c binary-io.h \ + binary-io.c localename.c glthread/thread.h glthread/thread.c \ + unlinkdir.c glthread/yield.h libtests_a_LIBADD = $(gltests_LIBOBJS) libtests_a_DEPENDENCIES = $(gltests_LIBOBJS) EXTRA_libtests_a_SOURCES = accept.c bind.c connect.c inet_pton.c \ @@ -3838,7 +3875,6 @@ EXTRA_libtests_a_SOURCES = accept.c bind.c connect.c inet_pton.c \ socket.c strerror_r.c at-func.c symlinkat.c wctob.c wctomb.c AM_LIBTOOLFLAGS = --preserve-dup-deps test_accept_LDADD = $(LDADD) @LIBSOCKET@ -test_file_has_acl_LDADD = $(LDADD) $(LIB_ACL) test_set_mode_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ test_sameacls_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ @@ -3865,6 +3901,7 @@ test_fdopendir_LDADD = $(LDADD) @LIBINTL@ test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) \ $(LIB_NANOSLEEP) @LIBINTL@ +test_file_has_acl_LDADD = $(LDADD) $(LIB_HAS_ACL) test_filenamecat_LDADD = $(LDADD) @LIBINTL@ test_frexp_nolibm_SOURCES = test-frexp.c randomd.c test_frexpl_nolibm_SOURCES = test-frexpl.c randoml.c @@ -3978,7 +4015,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/gnulib.mk $(am__configur echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign gnulib-tests/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign gnulib-tests/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -3987,7 +4023,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status 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: +$(srcdir)/gnulib.mk $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -4143,6 +4179,10 @@ test-arpa_inet$(EXEEXT): $(test_arpa_inet_OBJECTS) $(test_arpa_inet_DEPENDENCIES @rm -f test-arpa_inet$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_arpa_inet_OBJECTS) $(test_arpa_inet_LDADD) $(LIBS) +test-array_list$(EXEEXT): $(test_array_list_OBJECTS) $(test_array_list_DEPENDENCIES) $(EXTRA_test_array_list_DEPENDENCIES) + @rm -f test-array_list$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_array_list_OBJECTS) $(test_array_list_LDADD) $(LIBS) + test-base64$(EXEEXT): $(test_base64_OBJECTS) $(test_base64_DEPENDENCIES) $(EXTRA_test_base64_DEPENDENCIES) @rm -f test-base64$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_base64_OBJECTS) $(test_base64_LDADD) $(LIBS) @@ -4603,6 +4643,10 @@ test-linkat$(EXEEXT): $(test_linkat_OBJECTS) $(test_linkat_DEPENDENCIES) $(EXTRA @rm -f test-linkat$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_linkat_OBJECTS) $(test_linkat_LDADD) $(LIBS) +test-linked_list$(EXEEXT): $(test_linked_list_OBJECTS) $(test_linked_list_DEPENDENCIES) $(EXTRA_test_linked_list_DEPENDENCIES) + @rm -f test-linked_list$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_linked_list_OBJECTS) $(test_linked_list_LDADD) $(LIBS) + test-listen$(EXEEXT): $(test_listen_OBJECTS) $(test_listen_DEPENDENCIES) $(EXTRA_test_listen_DEPENDENCIES) @rm -f test-listen$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_listen_OBJECTS) $(test_listen_LDADD) $(LIBS) @@ -5233,6 +5277,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binary-io.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bind.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connect.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gl_array_list.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet_pton.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioctl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listen.Po@am__quote@ @@ -5255,6 +5300,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-argmatch.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-argv-iter.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-arpa_inet.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-array_list.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-base64.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-binary-io.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-bind.Po@am__quote@ @@ -5370,6 +5416,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-lchown.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-link.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-linkat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-linked_list.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-listen.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-locale.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-localeconv.Po@am__quote@ @@ -5752,7 +5799,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -5870,27 +5917,6 @@ test-accept.log: test-accept$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -test-file-has-acl.sh.log: test-file-has-acl.sh - @p='test-file-has-acl.sh'; \ - b='test-file-has-acl.sh'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test-file-has-acl-1.sh.log: test-file-has-acl-1.sh - @p='test-file-has-acl-1.sh'; \ - b='test-file-has-acl-1.sh'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -test-file-has-acl-2.sh.log: test-file-has-acl-2.sh - @p='test-file-has-acl-2.sh'; \ - b='test-file-has-acl-2.sh'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) test-set-mode-acl.sh.log: test-set-mode-acl.sh @p='test-set-mode-acl.sh'; \ b='test-set-mode-acl.sh'; \ @@ -5989,6 +6015,13 @@ test-arpa_inet.log: test-arpa_inet$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +test-array_list.log: test-array_list$(EXEEXT) + @p='test-array_list$(EXEEXT)'; \ + b='test-array_list'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) test-base64.log: test-base64$(EXEEXT) @p='test-base64$(EXEEXT)'; \ b='test-base64'; \ @@ -6346,6 +6379,27 @@ test-fgetc.log: test-fgetc$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +test-file-has-acl.sh.log: test-file-has-acl.sh + @p='test-file-has-acl.sh'; \ + b='test-file-has-acl.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-file-has-acl-1.sh.log: test-file-has-acl-1.sh + @p='test-file-has-acl-1.sh'; \ + b='test-file-has-acl-1.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-file-has-acl-2.sh.log: test-file-has-acl-2.sh + @p='test-file-has-acl-2.sh'; \ + b='test-file-has-acl-2.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) test-filenamecat.log: test-filenamecat$(EXEEXT) @p='test-filenamecat$(EXEEXT)'; \ b='test-filenamecat'; \ @@ -6864,6 +6918,13 @@ test-linkat.log: test-linkat$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +test-linked_list.log: test-linked_list$(EXEEXT) + @p='test-linked_list$(EXEEXT)'; \ + b='test-linked_list'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) test-listen.log: test-listen$(EXEEXT) @p='test-listen$(EXEEXT)'; \ b='test-listen'; \ @@ -8228,6 +8289,8 @@ uninstall-man: uninstall-man1 uninstall uninstall-am uninstall-binPROGRAMS uninstall-man \ uninstall-man1 uninstall-pkglibexecPROGRAMS +.PRECIOUS: Makefile + # The arg-nonnull.h that gets inserted into generated .h files is the same as # build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut # off. diff --git a/gnulib-tests/accept.c b/gnulib-tests/accept.c index 38ef59dc..5e2a62e2 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you 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 c8ee073d..bbbe458d 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/binary-io.h b/gnulib-tests/binary-io.h index 7928f8c1..f5b66c79 100644 --- a/gnulib-tests/binary-io.h +++ b/gnulib-tests/binary-io.h @@ -1,5 +1,5 @@ /* Binary mode I/O. - Copyright (C) 2001, 2003, 2005, 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2005, 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/bind.c b/gnulib-tests/bind.c index aa5d344a..0c024f7f 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you 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 86712783..465a731d 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/gl_array_list.c b/gnulib-tests/gl_array_list.c new file mode 100644 index 00000000..6224f400 --- /dev/null +++ b/gnulib-tests/gl_array_list.c @@ -0,0 +1,680 @@ +/* Sequential list data type implemented by an array. + Copyright (C) 2006-2015 Free Software Foundation, Inc. + Written by Bruno Haible , 2006. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +/* Specification. */ +#include "gl_array_list.h" + +#include +/* Get memcpy. */ +#include + +/* Checked size_t computations. */ +#include "xsize.h" + +#ifndef uintptr_t +# define uintptr_t unsigned long +#endif + +/* -------------------------- gl_list_t Data Type -------------------------- */ + +/* Concrete gl_list_impl type, valid for this file only. */ +struct gl_list_impl +{ + struct gl_list_impl_base base; + /* An array of ALLOCATED elements, of which the first COUNT are used. + 0 <= COUNT <= ALLOCATED. */ + const void **elements; + size_t count; + size_t allocated; +}; + +/* struct gl_list_node_impl doesn't exist here. The pointers are actually + indices + 1. */ +#define INDEX_TO_NODE(index) (gl_list_node_t)(uintptr_t)(size_t)((index) + 1) +#define NODE_TO_INDEX(node) ((uintptr_t)(node) - 1) + +static gl_list_t +gl_array_nx_create_empty (gl_list_implementation_t implementation, + gl_listelement_equals_fn equals_fn, + gl_listelement_hashcode_fn hashcode_fn, + gl_listelement_dispose_fn dispose_fn, + bool allow_duplicates) +{ + struct gl_list_impl *list = + (struct gl_list_impl *) malloc (sizeof (struct gl_list_impl)); + + if (list == NULL) + return NULL; + + list->base.vtable = implementation; + list->base.equals_fn = equals_fn; + list->base.hashcode_fn = hashcode_fn; + list->base.dispose_fn = dispose_fn; + list->base.allow_duplicates = allow_duplicates; + list->elements = NULL; + list->count = 0; + list->allocated = 0; + + return list; +} + +static gl_list_t +gl_array_nx_create (gl_list_implementation_t implementation, + gl_listelement_equals_fn equals_fn, + gl_listelement_hashcode_fn hashcode_fn, + gl_listelement_dispose_fn dispose_fn, + bool allow_duplicates, + size_t count, const void **contents) +{ + struct gl_list_impl *list = + (struct gl_list_impl *) malloc (sizeof (struct gl_list_impl)); + + if (list == NULL) + return NULL; + + list->base.vtable = implementation; + list->base.equals_fn = equals_fn; + list->base.hashcode_fn = hashcode_fn; + list->base.dispose_fn = dispose_fn; + list->base.allow_duplicates = allow_duplicates; + if (count > 0) + { + if (size_overflow_p (xtimes (count, sizeof (const void *)))) + goto fail; + list->elements = (const void **) malloc (count * sizeof (const void *)); + if (list->elements == NULL) + goto fail; + memcpy (list->elements, contents, count * sizeof (const void *)); + } + else + list->elements = NULL; + list->count = count; + list->allocated = count; + + return list; + + fail: + free (list); + return NULL; +} + +static size_t +gl_array_size (gl_list_t list) +{ + return list->count; +} + +static const void * _GL_ATTRIBUTE_PURE +gl_array_node_value (gl_list_t list, gl_list_node_t node) +{ + uintptr_t index = NODE_TO_INDEX (node); + if (!(index < list->count)) + /* Invalid argument. */ + abort (); + return list->elements[index]; +} + +static int +gl_array_node_nx_set_value (gl_list_t list, gl_list_node_t node, + const void *elt) +{ + uintptr_t index = NODE_TO_INDEX (node); + if (!(index < list->count)) + /* Invalid argument. */ + abort (); + list->elements[index] = elt; + return 0; +} + +static gl_list_node_t _GL_ATTRIBUTE_PURE +gl_array_next_node (gl_list_t list, gl_list_node_t node) +{ + uintptr_t index = NODE_TO_INDEX (node); + if (!(index < list->count)) + /* Invalid argument. */ + abort (); + index++; + if (index < list->count) + return INDEX_TO_NODE (index); + else + return NULL; +} + +static gl_list_node_t _GL_ATTRIBUTE_PURE +gl_array_previous_node (gl_list_t list, gl_list_node_t node) +{ + uintptr_t index = NODE_TO_INDEX (node); + if (!(index < list->count)) + /* Invalid argument. */ + abort (); + if (index > 0) + return INDEX_TO_NODE (index - 1); + else + return NULL; +} + +static const void * _GL_ATTRIBUTE_PURE +gl_array_get_at (gl_list_t list, size_t position) +{ + size_t count = list->count; + + if (!(position < count)) + /* Invalid argument. */ + abort (); + return list->elements[position]; +} + +static gl_list_node_t +gl_array_nx_set_at (gl_list_t list, size_t position, const void *elt) +{ + size_t count = list->count; + + if (!(position < count)) + /* Invalid argument. */ + abort (); + list->elements[position] = elt; + return INDEX_TO_NODE (position); +} + +static size_t +gl_array_indexof_from_to (gl_list_t list, size_t start_index, size_t end_index, + const void *elt) +{ + size_t count = list->count; + + if (!(start_index <= end_index && end_index <= count)) + /* Invalid arguments. */ + abort (); + + if (start_index < end_index) + { + gl_listelement_equals_fn equals = list->base.equals_fn; + if (equals != NULL) + { + size_t i; + + for (i = start_index;;) + { + if (equals (elt, list->elements[i])) + return i; + i++; + if (i == end_index) + break; + } + } + else + { + size_t i; + + for (i = start_index;;) + { + if (elt == list->elements[i]) + return i; + i++; + if (i == end_index) + break; + } + } + } + return (size_t)(-1); +} + +static gl_list_node_t +gl_array_search_from_to (gl_list_t list, size_t start_index, size_t end_index, + const void *elt) +{ + size_t index = gl_array_indexof_from_to (list, start_index, end_index, elt); + return INDEX_TO_NODE (index); +} + +/* Ensure that list->allocated > list->count. + Return 0 upon success, -1 upon out-of-memory. */ +static int +grow (gl_list_t list) +{ + size_t new_allocated; + size_t memory_size; + const void **memory; + + new_allocated = xtimes (list->allocated, 2); + new_allocated = xsum (new_allocated, 1); + memory_size = xtimes (new_allocated, sizeof (const void *)); + if (size_overflow_p (memory_size)) + /* Overflow, would lead to out of memory. */ + return -1; + memory = (const void **) realloc (list->elements, memory_size); + if (memory == NULL) + /* Out of memory. */ + return -1; + list->elements = memory; + list->allocated = new_allocated; + return 0; +} + +static gl_list_node_t +gl_array_nx_add_first (gl_list_t list, const void *elt) +{ + size_t count = list->count; + const void **elements; + size_t i; + + if (count == list->allocated) + if (grow (list) < 0) + return NULL; + elements = list->elements; + for (i = count; i > 0; i--) + elements[i] = elements[i - 1]; + elements[0] = elt; + list->count = count + 1; + return INDEX_TO_NODE (0); +} + +static gl_list_node_t +gl_array_nx_add_last (gl_list_t list, const void *elt) +{ + size_t count = list->count; + + if (count == list->allocated) + if (grow (list) < 0) + return NULL; + list->elements[count] = elt; + list->count = count + 1; + return INDEX_TO_NODE (count); +} + +static gl_list_node_t +gl_array_nx_add_before (gl_list_t list, gl_list_node_t node, const void *elt) +{ + size_t count = list->count; + uintptr_t index = NODE_TO_INDEX (node); + size_t position; + const void **elements; + size_t i; + + if (!(index < count)) + /* Invalid argument. */ + abort (); + position = index; + if (count == list->allocated) + if (grow (list) < 0) + return NULL; + elements = list->elements; + for (i = count; i > position; i--) + elements[i] = elements[i - 1]; + elements[position] = elt; + list->count = count + 1; + return INDEX_TO_NODE (position); +} + +static gl_list_node_t +gl_array_nx_add_after (gl_list_t list, gl_list_node_t node, const void *elt) +{ + size_t count = list->count; + uintptr_t index = NODE_TO_INDEX (node); + size_t position; + const void **elements; + size_t i; + + if (!(index < count)) + /* Invalid argument. */ + abort (); + position = index + 1; + if (count == list->allocated) + if (grow (list) < 0) + return NULL; + elements = list->elements; + for (i = count; i > position; i--) + elements[i] = elements[i - 1]; + elements[position] = elt; + list->count = count + 1; + return INDEX_TO_NODE (position); +} + +static gl_list_node_t +gl_array_nx_add_at (gl_list_t list, size_t position, const void *elt) +{ + size_t count = list->count; + const void **elements; + size_t i; + + if (!(position <= count)) + /* Invalid argument. */ + abort (); + if (count == list->allocated) + if (grow (list) < 0) + return NULL; + elements = list->elements; + for (i = count; i > position; i--) + elements[i] = elements[i - 1]; + elements[position] = elt; + list->count = count + 1; + return INDEX_TO_NODE (position); +} + +static bool +gl_array_remove_node (gl_list_t list, gl_list_node_t node) +{ + size_t count = list->count; + uintptr_t index = NODE_TO_INDEX (node); + size_t position; + const void **elements; + size_t i; + + if (!(index < count)) + /* Invalid argument. */ + abort (); + position = index; + elements = list->elements; + if (list->base.dispose_fn != NULL) + list->base.dispose_fn (elements[position]); + for (i = position + 1; i < count; i++) + elements[i - 1] = elements[i]; + list->count = count - 1; + return true; +} + +static bool +gl_array_remove_at (gl_list_t list, size_t position) +{ + size_t count = list->count; + const void **elements; + size_t i; + + if (!(position < count)) + /* Invalid argument. */ + abort (); + elements = list->elements; + if (list->base.dispose_fn != NULL) + list->base.dispose_fn (elements[position]); + for (i = position + 1; i < count; i++) + elements[i - 1] = elements[i]; + list->count = count - 1; + return true; +} + +static bool +gl_array_remove (gl_list_t list, const void *elt) +{ + size_t position = gl_array_indexof_from_to (list, 0, list->count, elt); + if (position == (size_t)(-1)) + return false; + else + return gl_array_remove_at (list, position); +} + +static void +gl_array_list_free (gl_list_t list) +{ + if (list->elements != NULL) + { + if (list->base.dispose_fn != NULL) + { + size_t count = list->count; + + if (count > 0) + { + gl_listelement_dispose_fn dispose = list->base.dispose_fn; + const void **elements = list->elements; + + do + dispose (*elements++); + while (--count > 0); + } + } + free (list->elements); + } + free (list); +} + +/* --------------------- gl_list_iterator_t Data Type --------------------- */ + +static gl_list_iterator_t +gl_array_iterator (gl_list_t list) +{ + gl_list_iterator_t result; + + result.vtable = list->base.vtable; + result.list = list; + result.count = list->count; + result.p = list->elements + 0; + result.q = list->elements + list->count; +#ifdef lint + result.i = 0; + result.j = 0; +#endif + + return result; +} + +static gl_list_iterator_t +gl_array_iterator_from_to (gl_list_t list, size_t start_index, size_t end_index) +{ + gl_list_iterator_t result; + + if (!(start_index <= end_index && end_index <= list->count)) + /* Invalid arguments. */ + abort (); + result.vtable = list->base.vtable; + result.list = list; + result.count = list->count; + result.p = list->elements + start_index; + result.q = list->elements + end_index; +#ifdef lint + result.i = 0; + result.j = 0; +#endif + + return result; +} + +static bool +gl_array_iterator_next (gl_list_iterator_t *iterator, + const void **eltp, gl_list_node_t *nodep) +{ + gl_list_t list = iterator->list; + if (iterator->count != list->count) + { + if (iterator->count != list->count + 1) + /* Concurrent modifications were done on the list. */ + abort (); + /* The last returned element was removed. */ + iterator->count--; + iterator->p = (const void **) iterator->p - 1; + iterator->q = (const void **) iterator->q - 1; + } + if (iterator->p < iterator->q) + { + const void **p = (const void **) iterator->p; + *eltp = *p; + if (nodep != NULL) + *nodep = INDEX_TO_NODE (p - list->elements); + iterator->p = p + 1; + return true; + } + else + return false; +} + +static void +gl_array_iterator_free (gl_list_iterator_t *iterator) +{ +} + +/* ---------------------- Sorted gl_list_t Data Type ---------------------- */ + +static size_t +gl_array_sortedlist_indexof_from_to (gl_list_t list, + gl_listelement_compar_fn compar, + size_t low, size_t high, + const void *elt) +{ + if (!(low <= high && high <= list->count)) + /* Invalid arguments. */ + abort (); + if (low < high) + { + /* At each loop iteration, low < high; for indices < low the values + are smaller than ELT; for indices >= high the values are greater + than ELT. So, if the element occurs in the list, it is at + low <= position < high. */ + do + { + size_t mid = low + (high - low) / 2; /* low <= mid < high */ + int cmp = compar (list->elements[mid], elt); + + if (cmp < 0) + low = mid + 1; + else if (cmp > 0) + high = mid; + else /* cmp == 0 */ + { + /* We have an element equal to ELT at index MID. But we need + the minimal such index. */ + high = mid; + /* At each loop iteration, low <= high and + compar (list->elements[high], elt) == 0, + and we know that the first occurrence of the element is at + low <= position <= high. */ + while (low < high) + { + size_t mid2 = low + (high - low) / 2; /* low <= mid2 < high */ + int cmp2 = compar (list->elements[mid2], elt); + + if (cmp2 < 0) + low = mid2 + 1; + else if (cmp2 > 0) + /* The list was not sorted. */ + abort (); + else /* cmp2 == 0 */ + { + if (mid2 == low) + break; + high = mid2 - 1; + } + } + return low; + } + } + while (low < high); + /* Here low == high. */ + } + return (size_t)(-1); +} + +static size_t +gl_array_sortedlist_indexof (gl_list_t list, gl_listelement_compar_fn compar, + const void *elt) +{ + return gl_array_sortedlist_indexof_from_to (list, compar, 0, list->count, + elt); +} + +static gl_list_node_t +gl_array_sortedlist_search_from_to (gl_list_t list, + gl_listelement_compar_fn compar, + size_t low, size_t high, + const void *elt) +{ + size_t index = + gl_array_sortedlist_indexof_from_to (list, compar, low, high, elt); + return INDEX_TO_NODE (index); +} + +static gl_list_node_t +gl_array_sortedlist_search (gl_list_t list, gl_listelement_compar_fn compar, + const void *elt) +{ + size_t index = + gl_array_sortedlist_indexof_from_to (list, compar, 0, list->count, elt); + return INDEX_TO_NODE (index); +} + +static gl_list_node_t +gl_array_sortedlist_nx_add (gl_list_t list, gl_listelement_compar_fn compar, + const void *elt) +{ + size_t count = list->count; + size_t low = 0; + size_t high = count; + + /* At each loop iteration, low <= high; for indices < low the values are + smaller than ELT; for indices >= high the values are greater than ELT. */ + while (low < high) + { + size_t mid = low + (high - low) / 2; /* low <= mid < high */ + int cmp = compar (list->elements[mid], elt); + + if (cmp < 0) + low = mid + 1; + else if (cmp > 0) + high = mid; + else /* cmp == 0 */ + { + low = mid; + break; + } + } + return gl_array_nx_add_at (list, low, elt); +} + +static bool +gl_array_sortedlist_remove (gl_list_t list, gl_listelement_compar_fn compar, + const void *elt) +{ + size_t index = gl_array_sortedlist_indexof (list, compar, elt); + if (index == (size_t)(-1)) + return false; + else + return gl_array_remove_at (list, index); +} + + +const struct gl_list_implementation gl_array_list_implementation = + { + gl_array_nx_create_empty, + gl_array_nx_create, + gl_array_size, + gl_array_node_value, + gl_array_node_nx_set_value, + gl_array_next_node, + gl_array_previous_node, + gl_array_get_at, + gl_array_nx_set_at, + gl_array_search_from_to, + gl_array_indexof_from_to, + gl_array_nx_add_first, + gl_array_nx_add_last, + gl_array_nx_add_before, + gl_array_nx_add_after, + gl_array_nx_add_at, + gl_array_remove_node, + gl_array_remove_at, + gl_array_remove, + gl_array_list_free, + gl_array_iterator, + gl_array_iterator_from_to, + gl_array_iterator_next, + gl_array_iterator_free, + gl_array_sortedlist_search, + gl_array_sortedlist_search_from_to, + gl_array_sortedlist_indexof, + gl_array_sortedlist_indexof_from_to, + gl_array_sortedlist_nx_add, + gl_array_sortedlist_remove + }; diff --git a/gnulib-tests/gl_array_list.h b/gnulib-tests/gl_array_list.h new file mode 100644 index 00000000..b07abce2 --- /dev/null +++ b/gnulib-tests/gl_array_list.h @@ -0,0 +1,34 @@ +/* Sequential list data type implemented by an array. + Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. + Written by Bruno Haible , 2006. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef _GL_ARRAY_LIST_H +#define _GL_ARRAY_LIST_H + +#include "gl_list.h" + +#ifdef __cplusplus +extern "C" { +#endif + +extern const struct gl_list_implementation gl_array_list_implementation; +#define GL_ARRAY_LIST &gl_array_list_implementation + +#ifdef __cplusplus +} +#endif + +#endif /* _GL_ARRAY_LIST_H */ diff --git a/gnulib-tests/glthread/thread.c b/gnulib-tests/glthread/thread.c index cec0b7c8..d3829ce9 100644 --- a/gnulib-tests/glthread/thread.c +++ b/gnulib-tests/glthread/thread.c @@ -1,5 +1,5 @@ /* Creating and controlling threads. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/glthread/thread.h b/gnulib-tests/glthread/thread.h index 509db6b3..28174377 100644 --- a/gnulib-tests/glthread/thread.h +++ b/gnulib-tests/glthread/thread.h @@ -1,5 +1,5 @@ /* Creating and controlling threads. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This program is free software; you 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/yield.h b/gnulib-tests/glthread/yield.h index b9292247..b18db5bc 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This program is free software; you 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 7f8ac240..3b51533c 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 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 @@ -79,16 +79,14 @@ EXTRA_DIST += test-accept.c signature.h macros.h ## begin gnulib module acl-tests TESTS += \ - 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 test-set-mode-acl-2.sh \ test-copy-acl.sh test-copy-acl-1.sh test-copy-acl-2.sh TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL) -check_PROGRAMS += test-file-has-acl test-set-mode-acl test-copy-acl test-sameacls -test_file_has_acl_LDADD = $(LDADD) $(LIB_ACL) +check_PROGRAMS += test-set-mode-acl test-copy-acl test-sameacls test_set_mode_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ test_sameacls_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ -EXTRA_DIST += 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 test-set-mode-acl-2.sh test-copy-acl.sh test-copy-acl-1.sh test-copy-acl-2.sh test-file-has-acl.c test-set-mode-acl.c test-copy-acl.c test-sameacls.c macros.h +EXTRA_DIST += test-set-mode-acl.sh test-set-mode-acl-1.sh test-set-mode-acl-2.sh test-copy-acl.sh test-copy-acl-1.sh test-copy-acl-2.sh test-set-mode-acl.c test-copy-acl.c test-sameacls.c macros.h ## end gnulib module acl-tests @@ -161,6 +159,21 @@ EXTRA_DIST += test-arpa_inet.c ## end gnulib module arpa_inet-tests +## begin gnulib module array-list + +libtests_a_SOURCES += gl_array_list.h gl_array_list.c + +## end gnulib module array-list + +## begin gnulib module array-list-tests + +TESTS += test-array_list +check_PROGRAMS += test-array_list + +EXTRA_DIST += test-array_list.c macros.h + +## end gnulib module array-list-tests + ## begin gnulib module base64-tests TESTS += test-base64 @@ -558,6 +571,17 @@ EXTRA_DIST += test-fgetc.c signature.h macros.h ## end gnulib module fgetc-tests +## begin gnulib module file-has-acl-tests + +TESTS += \ + test-file-has-acl.sh test-file-has-acl-1.sh test-file-has-acl-2.sh +TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL) +check_PROGRAMS += test-file-has-acl +test_file_has_acl_LDADD = $(LDADD) $(LIB_HAS_ACL) +EXTRA_DIST += test-file-has-acl.sh test-file-has-acl-1.sh test-file-has-acl-2.sh test-file-has-acl.c macros.h + +## end gnulib module file-has-acl-tests + ## begin gnulib module filenamecat-tests TESTS += test-filenamecat @@ -1138,6 +1162,14 @@ EXTRA_DIST += test-link.h test-linkat.c signature.h macros.h ## end gnulib module linkat-tests +## begin gnulib module linked-list-tests + +TESTS += test-linked_list +check_PROGRAMS += test-linked_list +EXTRA_DIST += test-linked_list.c macros.h + +## end gnulib module linked-list-tests + ## begin gnulib module listen diff --git a/gnulib-tests/inet_pton.c b/gnulib-tests/inet_pton.c index e9703a79..40ddc181 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc. This program is free software: you 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 ec9dba45..45c30bde 100644 --- a/gnulib-tests/infinity.h +++ b/gnulib-tests/infinity.h @@ -1,5 +1,5 @@ /* Macros for infinity. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you 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 fbd293d6..d3662061 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -93,6 +93,27 @@ skip_ () { warn_ "$ME_: skipped test: $@"; Exit 77; } fatal_ () { warn_ "$ME_: hard error: $@"; Exit 99; } framework_failure_ () { warn_ "$ME_: set-up failure: $@"; Exit 99; } +# This is used to simplify checking of the return value +# which is useful when ensuring a command fails as desired. +# I.e., just doing `command ... &&fail=1` will not catch +# a segfault in command for example. With this helper you +# instead check an explicit exit code like +# returns_ 1 command ... || fail +returns_ () { + # Disable tracing so it doesn't interfere with stderr of the wrapped command + { set +x; } 2>/dev/null + + local exp_exit="$1" + shift + "$@" + test $? -eq $exp_exit && ret_=0 || ret_=1 + + if test "$VERBOSE" = yes && test "$gl_set_x_corrupts_stderr_" = false; then + set -x + fi + { return $ret_; } 2>/dev/null +} + # Sanitize this shell to POSIX mode, if possible. DUALCASE=1; export DUALCASE if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -129,6 +150,7 @@ fi # ? - not ok gl_shell_test_script_=' test $(echo y) = y || exit 1 +f_local_() { local v=1; }; f_local_ || exit 1 score_=10 if test "$VERBOSE" = yes; then test -n "$( (exec 3>&1; set -x; P=1 true 2>&3) 2> /dev/null)" && score_=9 diff --git a/gnulib-tests/ioctl.c b/gnulib-tests/ioctl.c index 89afb4ea..fbff5171 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you 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 40b6b50c..c4ae950b 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you 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 52d545a0..35b6de40 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-2014 Free Software Foundation, Inc. + Copyright (C) 1995-2015 Free Software Foundation, Inc. This 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,6 +42,10 @@ # if !defined IN_LIBINTL # include "glthread/lock.h" # endif +# if defined __sun +/* Solaris >= 12. */ +extern char * getlocalename_l(int, locale_t); +# endif #endif #if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE @@ -55,11 +59,15 @@ #if defined _WIN32 || defined __WIN32__ # define WINDOWS_NATIVE +# if !defined IN_LIBINTL +# include "glthread/lock.h" +# endif #endif #if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */ # define WIN32_LEAN_AND_MEAN # include +# include /* List of language codes, sorted by value: 0x01 LANG_ARABIC 0x02 LANG_BULGARIAN @@ -1124,6 +1132,9 @@ # ifndef LOCALE_SNAME # define LOCALE_SNAME 0x5c # endif +# ifndef LOCALE_NAME_MAX_LENGTH +# define LOCALE_NAME_MAX_LENGTH 85 +# endif #endif @@ -2502,10 +2513,82 @@ gl_locale_name_from_win32_LCID (LCID lcid) return gl_locale_name_from_win32_LANGID (langid); } +# ifdef WINDOWS_NATIVE + +/* Two variables to interface between get_lcid and the EnumLocales + callback function below. */ +static LCID found_lcid; +static char lname[LC_MAX * (LOCALE_NAME_MAX_LENGTH + 1) + 1]; + +/* Callback function for EnumLocales. */ +static BOOL CALLBACK +enum_locales_fn (LPTSTR locale_num_str) +{ + char *endp; + char locval[2 * LOCALE_NAME_MAX_LENGTH + 1 + 1]; + LCID try_lcid = strtoul (locale_num_str, &endp, 16); + + if (GetLocaleInfo (try_lcid, LOCALE_SENGLANGUAGE, + locval, LOCALE_NAME_MAX_LENGTH)) + { + strcat (locval, "_"); + if (GetLocaleInfo (try_lcid, LOCALE_SENGCOUNTRY, + locval + strlen (locval), LOCALE_NAME_MAX_LENGTH)) + { + size_t locval_len = strlen (locval); + + if (strncmp (locval, lname, locval_len) == 0 + && (lname[locval_len] == '.' + || lname[locval_len] == '\0')) + { + found_lcid = try_lcid; + return FALSE; + } + } + } + return TRUE; +} + +/* This lock protects the get_lcid against multiple simultaneous calls. */ +gl_lock_define_initialized(static, get_lcid_lock) + +/* Return the Locale ID (LCID) number given the locale's name, a + string, in LOCALE_NAME. This works by enumerating all the locales + supported by the system, until we find one whose name matches + LOCALE_NAME. */ +static LCID +get_lcid (const char *locale_name) +{ + /* A simple cache. */ + static LCID last_lcid; + static char last_locale[1000]; + + /* Lock while looking for an LCID, to protect access to static + variables: last_lcid, last_locale, found_lcid, and lname. */ + gl_lock_lock (get_lcid_lock); + if (last_lcid > 0 && strcmp (locale_name, last_locale) == 0) + { + gl_lock_unlock (get_lcid_lock); + return last_lcid; + } + strncpy (lname, locale_name, sizeof (lname) - 1); + lname[sizeof (lname) - 1] = '\0'; + found_lcid = 0; + EnumSystemLocales (enum_locales_fn, LCID_SUPPORTED); + if (found_lcid > 0) + { + last_lcid = found_lcid; + strcpy (last_locale, locale_name); + } + gl_lock_unlock (get_lcid_lock); + return found_lcid; +} + +# endif #endif -#if HAVE_USELOCALE /* glibc or Mac OS X */ +#if HAVE_USELOCALE /* glibc, Solaris >= 12 or Mac OS X */ /* Simple hash set of strings. We don't want to drag in lots of hash table code here. */ @@ -2644,6 +2727,11 @@ gl_locale_name_thread_unsafe (int category, const char *categoryname) return ""; } return querylocale (mask, thread_locale); +# elif defined __sun + /* Solaris >= 12. */ + return getlocalename_l (category, thread_locale); +# elif defined __ANDROID__ + return MB_CUR_MAX == 4 ? "C.UTF-8" : "C"; # endif } } @@ -2660,6 +2748,27 @@ gl_locale_name_thread (int category, const char *categoryname) const char *name = gl_locale_name_thread_unsafe (category, categoryname); if (name != NULL) return struniq (name); +#elif defined WINDOWS_NATIVE + if (LC_MIN <= category && category <= LC_MAX) + { + char *locname = setlocale (category, NULL); + LCID lcid = 0; + + /* If CATEGORY is LC_ALL, the result might be a semi-colon + separated list of locales. We need only one, so we take the + one corresponding to LC_CTYPE, as the most important for + character translations. */ + if (strchr (locname, ';')) + locname = setlocale (LC_CTYPE, NULL); + + /* Convert locale name to LCID. We don't want to use + LocaleNameToLCID because (a) it is only available since Vista, + and (b) it doesn't accept locale names returned by 'setlocale'. */ + lcid = get_lcid (locname); + + if (lcid > 0) + return gl_locale_name_from_win32_LCID (lcid); + } #endif return NULL; } diff --git a/gnulib-tests/localename.h b/gnulib-tests/localename.h index 861e6e9e..13c126d5 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you 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 0d7e3780..b6fdd1ca 100644 --- a/gnulib-tests/macros.h +++ b/gnulib-tests/macros.h @@ -1,5 +1,5 @@ /* Common macros used by gnulib tests. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This program is free software: you 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 be65edc8..79291ee3 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/nan.h b/gnulib-tests/nan.h index 9da3684e..9f6819c3 100644 --- a/gnulib-tests/nan.h +++ b/gnulib-tests/nan.h @@ -1,5 +1,5 @@ /* Macros for not-a-number. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you 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 cc596d0d..940cbf27 100644 --- a/gnulib-tests/nap.h +++ b/gnulib-tests/nap.h @@ -1,5 +1,5 @@ /* Assist in file system timestamp tests. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/perror.c b/gnulib-tests/perror.c index c0548c93..70340fbe 100644 --- a/gnulib-tests/perror.c +++ b/gnulib-tests/perror.c @@ -1,5 +1,5 @@ /* Print a message describing error code. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. Written by Bruno Haible and Simon Josefsson. This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/randomd.c b/gnulib-tests/randomd.c index 85cd981a..96424286 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-2014 Free Software Foundation, Inc. + Copyright (C) 2012-2015 Free Software Foundation, Inc. This program is free software: you 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 42f51e26..219278ac 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-2014 Free Software Foundation, Inc. + Copyright (C) 2012-2015 Free Software Foundation, Inc. This program is free software: you 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 3009d2cb..a7a1233c 100644 --- a/gnulib-tests/setlocale.c +++ b/gnulib-tests/setlocale.c @@ -1,5 +1,5 @@ /* Set the current locale. - Copyright (C) 2009, 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2009, 2011-2015 Free Software Foundation, Inc. This program is free software: you 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 08afdae2..1f15bb4e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you 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 0ae64e7e..0a6cf915 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you 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 2d86b7e0..b86ec6ff 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 5707e7f8..7a43521e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you 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 4aa96cbb..0f109475 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This 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,11 @@ #if (__GLIBC__ >= 2 || defined __UCLIBC__ || defined __CYGWIN__) && HAVE___XPG_STRERROR_R /* glibc >= 2.3.4, cygwin >= 1.7.9 */ # define USE_XPG_STRERROR_R 1 -extern int __xpg_strerror_r (int errnum, char *buf, size_t buflen); +extern +#ifdef __cplusplus +"C" +#endif +int __xpg_strerror_r (int errnum, char *buf, size_t buflen); #elif HAVE_DECL_STRERROR_R && !(__GLIBC__ >= 2 || defined __UCLIBC__ || defined __CYGWIN__) @@ -63,6 +67,10 @@ extern int __xpg_strerror_r (int errnum, char *buf, size_t buflen); # include # endif +#ifdef __cplusplus +extern "C" { +#endif + /* Get sys_nerr, sys_errlist on HP-UX (otherwise only declared in C++ mode). Get sys_nerr, sys_errlist on IRIX (otherwise only declared with _SGIAPI). */ # if defined __hpux || defined __sgi @@ -75,6 +83,10 @@ extern char *sys_errlist[]; extern int sys_nerr; # endif +#ifdef __cplusplus +} +#endif + # else # include "glthread/lock.h" diff --git a/gnulib-tests/symlinkat.c b/gnulib-tests/symlinkat.c index 26a88f9d..84d55847 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,13 +19,33 @@ #include #include +#include -#if !HAVE_SYMLINK +#if HAVE_SYMLINKAT +# undef symlinkat + +#include +#include + +/* Create a symlink, but reject trailing slash. */ +int +rpl_symlinkat (char const *contents, int fd, char const *name) +{ + size_t len = strlen (name); + if (len && name[len - 1] == '/') + { + struct stat st; + if (fstatat (fd, name, &st, 0) == 0) + errno = EEXIST; + return -1; + } + return symlinkat (contents, fd, name); +} + +#elif !HAVE_SYMLINK /* Mingw lacks symlink, and it is more efficient to provide a trivial wrapper than to go through at-func.c to call rpl_symlink. */ -# include - int symlinkat (char const *path1 _GL_UNUSED, int fd _GL_UNUSED, char const *path2 _GL_UNUSED) diff --git a/gnulib-tests/test-accept.c b/gnulib-tests/test-accept.c index 58d796a9..2fc921bc 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-alignof.c b/gnulib-tests/test-alignof.c index c2d2a8df..a04d69b4 100644 --- a/gnulib-tests/test-alignof.c +++ b/gnulib-tests/test-alignof.c @@ -1,5 +1,5 @@ /* Test of . - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 3d8acc45..c189cc66 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-areadlink-with-size.c b/gnulib-tests/test-areadlink-with-size.c index 6aaff67a..d0e93c3a 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 b487d447..682c03b8 100644 --- a/gnulib-tests/test-areadlink.c +++ b/gnulib-tests/test-areadlink.c @@ -1,5 +1,5 @@ /* Tests of areadlink. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 61bce294..a93c9eb5 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 b1c8b263..1d95a476 100644 --- a/gnulib-tests/test-areadlinkat.c +++ b/gnulib-tests/test-areadlinkat.c @@ -1,5 +1,5 @@ /* Tests of areadlinkat. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 735cb767..e6802b78 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-2014 Free Software Foundation, Inc. + Copyright (C) 1990, 1998-1999, 2001-2015 Free Software Foundation, Inc. This program is free software: you can 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 203fb1ae..4f95a6fb 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 df67608b..48cf88f6 100644 --- a/gnulib-tests/test-arpa_inet.c +++ b/gnulib-tests/test-arpa_inet.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-array_list.c b/gnulib-tests/test-array_list.c new file mode 100644 index 00000000..a2aca725 --- /dev/null +++ b/gnulib-tests/test-array_list.c @@ -0,0 +1,329 @@ +/* Test of sequential list data type implementation. + Copyright (C) 2006-2015 Free Software Foundation, Inc. + Written by Bruno Haible , 2007. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +#include "gl_array_list.h" + +#include + +#include "progname.h" +#include "macros.h" + +static const char *objects[15] = + { + "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o" + }; + +#define RANDOM(n) (rand () % (n)) +#define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] + +static void +check_equals (gl_list_t list1, gl_list_t list2) +{ + size_t n, i; + + n = gl_list_size (list1); + ASSERT (n == gl_list_size (list2)); + for (i = 0; i < n; i++) + { + ASSERT (gl_list_get_at (list1, i) == gl_list_get_at (list2, i)); + } +} + +int +main (int argc, char *argv[]) +{ + gl_list_t list1, list2; + + set_program_name (argv[0]); + + /* Allow the user to provide a non-default random seed on the command line. */ + if (argc > 1) + srand (atoi (argv[1])); + + { + size_t initial_size = RANDOM (50); + const void **contents = + (const void **) malloc (initial_size * sizeof (const void *)); + size_t i; + unsigned int repeat; + + for (i = 0; i < initial_size; i++) + contents[i] = RANDOM_OBJECT (); + + /* Create list1. */ + list1 = gl_list_nx_create (GL_ARRAY_LIST, NULL, NULL, NULL, true, + initial_size, contents); + ASSERT (list1 != NULL); + /* Create list2. */ + list2 = gl_list_nx_create_empty (GL_ARRAY_LIST, NULL, NULL, NULL, true); + ASSERT (list2 != NULL); + for (i = 0; i < initial_size; i++) + ASSERT (gl_list_nx_add_last (list2, contents[i]) != NULL); + + check_equals (list1, list2); + + for (repeat = 0; repeat < 10000; repeat++) + { + unsigned int operation = RANDOM (16); + switch (operation) + { + case 0: + if (gl_list_size (list1) > 0) + { + size_t index = RANDOM (gl_list_size (list1)); + const char *obj = RANDOM_OBJECT (); + gl_list_node_t node1, node2; + + node1 = gl_list_nx_set_at (list1, index, obj); + ASSERT (node1 != NULL); + ASSERT (gl_list_get_at (list1, index) == obj); + ASSERT (gl_list_node_value (list1, node1) == obj); + + node2 = gl_list_nx_set_at (list2, index, obj); + ASSERT (node2 != NULL); + ASSERT (gl_list_get_at (list2, index) == obj); + ASSERT (gl_list_node_value (list2, node2) == obj); + + if (index > 0) + { + ASSERT (gl_list_node_value (list1, gl_list_previous_node (list1, node1)) + == gl_list_get_at (list1, index - 1)); + } + if (index + 1 < gl_list_size (list1)) + { + ASSERT (gl_list_node_value (list1, gl_list_next_node (list1, node1)) + == gl_list_get_at (list1, index + 1)); + } + } + break; + case 1: + { + const char *obj = RANDOM_OBJECT (); + gl_list_node_t node1, node2; + node1 = gl_list_search (list1, obj); + node2 = gl_list_search (list2, obj); + if (node1 == NULL) + { + ASSERT (node2 == NULL); + } + else + { + ASSERT (node2 != NULL); + ASSERT (gl_list_node_value (list1, node1) == obj); + ASSERT (gl_list_node_value (list2, node2) == obj); + } + } + break; + case 2: + { + const char *obj = RANDOM_OBJECT (); + size_t index1, index2; + index1 = gl_list_indexof (list1, obj); + index2 = gl_list_indexof (list2, obj); + if (index1 == (size_t)(-1)) + { + ASSERT (index2 == (size_t)(-1)); + } + else + { + ASSERT (index2 != (size_t)(-1)); + ASSERT (gl_list_get_at (list1, index1) == obj); + ASSERT (gl_list_get_at (list2, index2) == obj); + ASSERT (index2 == index1); + } + } + break; + case 3: /* add 1 element */ + { + const char *obj = RANDOM_OBJECT (); + gl_list_node_t node1, node2; + node1 = gl_list_nx_add_first (list1, obj); + ASSERT (node1 != NULL); + node2 = gl_list_nx_add_first (list2, obj); + ASSERT (node2 != NULL); + ASSERT (gl_list_node_value (list1, node1) == obj); + ASSERT (gl_list_node_value (list2, node2) == obj); + ASSERT (gl_list_get_at (list1, 0) == obj); + ASSERT (gl_list_get_at (list2, 0) == obj); + } + break; + case 4: /* add 1 element */ + { + const char *obj = RANDOM_OBJECT (); + gl_list_node_t node1, node2; + node1 = gl_list_nx_add_last (list1, obj); + ASSERT (node1 != NULL); + node2 = gl_list_nx_add_last (list2, obj); + ASSERT (node2 != NULL); + ASSERT (gl_list_node_value (list1, node1) == obj); + ASSERT (gl_list_node_value (list2, node2) == obj); + ASSERT (gl_list_get_at (list1, gl_list_size (list1) - 1) == obj); + ASSERT (gl_list_get_at (list2, gl_list_size (list2) - 1) == obj); + } + break; + case 5: /* add 3 elements */ + { + const char *obj0 = RANDOM_OBJECT (); + const char *obj1 = RANDOM_OBJECT (); + const char *obj2 = RANDOM_OBJECT (); + gl_list_node_t node1, node2; + node1 = gl_list_nx_add_first (list1, obj2); + ASSERT (node1 != NULL); + node1 = gl_list_nx_add_before (list1, node1, obj0); + ASSERT (node1 != NULL); + node1 = gl_list_nx_add_after (list1, node1, obj1); + ASSERT (node1 != NULL); + node2 = gl_list_nx_add_first (list2, obj2); + ASSERT (node2 != NULL); + node2 = gl_list_nx_add_before (list2, node2, obj0); + ASSERT (node2 != NULL); + node2 = gl_list_nx_add_after (list2, node2, obj1); + ASSERT (node2 != NULL); + ASSERT (gl_list_node_value (list1, node1) == obj1); + ASSERT (gl_list_node_value (list2, node2) == obj1); + ASSERT (gl_list_get_at (list1, 0) == obj0); + ASSERT (gl_list_get_at (list1, 1) == obj1); + ASSERT (gl_list_get_at (list1, 2) == obj2); + ASSERT (gl_list_get_at (list2, 0) == obj0); + ASSERT (gl_list_get_at (list2, 1) == obj1); + ASSERT (gl_list_get_at (list2, 2) == obj2); + } + break; + case 6: /* add 1 element */ + { + size_t index = RANDOM (gl_list_size (list1) + 1); + const char *obj = RANDOM_OBJECT (); + gl_list_node_t node1, node2; + node1 = gl_list_nx_add_at (list1, index, obj); + ASSERT (node1 != NULL); + node2 = gl_list_nx_add_at (list2, index, obj); + ASSERT (node2 != NULL); + ASSERT (gl_list_get_at (list1, index) == obj); + ASSERT (gl_list_node_value (list1, node1) == obj); + ASSERT (gl_list_get_at (list2, index) == obj); + ASSERT (gl_list_node_value (list2, node2) == obj); + if (index > 0) + { + ASSERT (gl_list_node_value (list1, gl_list_previous_node (list1, node1)) + == gl_list_get_at (list1, index - 1)); + } + if (index + 1 < gl_list_size (list1)) + { + ASSERT (gl_list_node_value (list1, gl_list_next_node (list1, node1)) + == gl_list_get_at (list1, index + 1)); + } + } + break; + case 7: case 8: /* remove 1 element */ + if (gl_list_size (list1) > 0) + { + size_t n = gl_list_size (list1); + const char *obj = gl_list_get_at (list1, RANDOM (n)); + gl_list_node_t node1, node2; + node1 = gl_list_search (list1, obj); + node2 = gl_list_search (list2, obj); + ASSERT (node1 != NULL); + ASSERT (node2 != NULL); + ASSERT (gl_list_remove_node (list1, node1)); + ASSERT (gl_list_remove_node (list2, node2)); + ASSERT (gl_list_size (list1) == n - 1); + } + break; + case 9: case 10: /* remove 1 element */ + if (gl_list_size (list1) > 0) + { + size_t n = gl_list_size (list1); + size_t index = RANDOM (n); + ASSERT (gl_list_remove_at (list1, index)); + ASSERT (gl_list_remove_at (list2, index)); + ASSERT (gl_list_size (list1) == n - 1); + } + break; + case 11: case 12: /* remove 1 element */ + if (gl_list_size (list1) > 0) + { + size_t n = gl_list_size (list1); + const char *obj = gl_list_get_at (list1, RANDOM (n)); + ASSERT (gl_list_remove (list1, obj)); + ASSERT (gl_list_remove (list2, obj)); + ASSERT (gl_list_size (list1) == n - 1); + } + break; + case 13: + if (gl_list_size (list1) > 0) + { + size_t n = gl_list_size (list1); + const char *obj = "xyzzy"; + ASSERT (!gl_list_remove (list1, obj)); + ASSERT (!gl_list_remove (list2, obj)); + ASSERT (gl_list_size (list1) == n); + } + break; + case 14: + { + size_t n = gl_list_size (list1); + gl_list_iterator_t iter1, iter2; + const void *elt; + iter1 = gl_list_iterator (list1); + iter2 = gl_list_iterator (list2); + for (i = 0; i < n; i++) + { + ASSERT (gl_list_iterator_next (&iter1, &elt, NULL)); + ASSERT (gl_list_get_at (list1, i) == elt); + ASSERT (gl_list_iterator_next (&iter2, &elt, NULL)); + ASSERT (gl_list_get_at (list2, i) == elt); + } + ASSERT (!gl_list_iterator_next (&iter1, &elt, NULL)); + ASSERT (!gl_list_iterator_next (&iter2, &elt, NULL)); + gl_list_iterator_free (&iter1); + gl_list_iterator_free (&iter2); + } + break; + case 15: + { + size_t end = RANDOM (gl_list_size (list1) + 1); + size_t start = RANDOM (end + 1); + gl_list_iterator_t iter1, iter2; + const void *elt; + iter1 = gl_list_iterator_from_to (list1, start, end); + iter2 = gl_list_iterator_from_to (list2, start, end); + for (i = start; i < end; i++) + { + ASSERT (gl_list_iterator_next (&iter1, &elt, NULL)); + ASSERT (gl_list_get_at (list1, i) == elt); + ASSERT (gl_list_iterator_next (&iter2, &elt, NULL)); + ASSERT (gl_list_get_at (list2, i) == elt); + } + ASSERT (!gl_list_iterator_next (&iter1, &elt, NULL)); + ASSERT (!gl_list_iterator_next (&iter2, &elt, NULL)); + gl_list_iterator_free (&iter1); + gl_list_iterator_free (&iter2); + } + break; + } + check_equals (list1, list2); + } + + gl_list_free (list1); + gl_list_free (list2); + free (contents); + } + + return 0; +} diff --git a/gnulib-tests/test-base64.c b/gnulib-tests/test-base64.c index 1f730133..a02dd7a0 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-2014 Free Software Foundation, Inc. + Copyright (C) 2004, 2008-2015 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 1b29fbd5..9c3f8f21 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-bind.c b/gnulib-tests/test-bind.c index 4eeb59e2..d62fb394 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-bitrotate.c b/gnulib-tests/test-bitrotate.c index c8545a21..f3828fa6 100644 --- a/gnulib-tests/test-bitrotate.c +++ b/gnulib-tests/test-bitrotate.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 b9df2f0c..be34739b 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 80bf7033..81fe936e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 03088ffd..f7f6b43a 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 0fba0e5c..4027b5b9 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 c8dc9312..8454c8fd 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you can 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 6da94e62..a1d2fce1 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 e17b6606..48c2334e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can 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 00891e0d..007026c4 100644 --- a/gnulib-tests/test-chown.c +++ b/gnulib-tests/test-chown.c @@ -1,5 +1,5 @@ /* Tests of chown. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 7f703ebb..f6b88cc3 100644 --- a/gnulib-tests/test-chown.h +++ b/gnulib-tests/test-chown.h @@ -1,5 +1,5 @@ /* Tests of chown. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 116953dc..c4feebac 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 44bce54a..457a7bc6 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-closein.c b/gnulib-tests/test-closein.c index b177cf00..946a5b1c 100644 --- a/gnulib-tests/test-closein.c +++ b/gnulib-tests/test-closein.c @@ -1,5 +1,5 @@ /* Test of closein module. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software; you can 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 6142429a..a0830086 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-copy-acl.c b/gnulib-tests/test-copy-acl.c index 82b5abf9..1c5227fd 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-ctype.c b/gnulib-tests/test-ctype.c index 8c79cd26..58750e15 100644 --- a/gnulib-tests/test-ctype.c +++ b/gnulib-tests/test-ctype.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 f2e7a00b..5f0c1694 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you can 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 859194c5..e0e2b029 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 7905a2ab..243b92bc 100644 --- a/gnulib-tests/test-dirent.c +++ b/gnulib-tests/test-dirent.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 1c6ee574..49a94ea9 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc. This 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,7 +150,7 @@ main (void) { ok = false; printf ("dir_name '%s': got '%s' len %d," - " expected '%s' len %ld\n", + " expected '%s' len %lu\n", t->name, dir, dirlen, t->dir, (unsigned long) strlen (t->dir)); } @@ -167,7 +167,7 @@ main (void) { ok = false; printf ("base_name '%s': got '%s' len %d," - " expected '%s' len %ld\n", + " expected '%s' len %lu\n", t->name, base, baselen, t->base, (unsigned long) strlen (t->base)); } diff --git a/gnulib-tests/test-dup-safer.c b/gnulib-tests/test-dup-safer.c index d11891e7..7f6427cd 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 905275c8..b7b768e2 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-dup2.c b/gnulib-tests/test-dup2.c index c7cb9656..be475eaa 100644 --- a/gnulib-tests/test-dup2.c +++ b/gnulib-tests/test-dup2.c @@ -1,5 +1,5 @@ /* Test duplicating file descriptors. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-environ.c b/gnulib-tests/test-environ.c index 46a2eab1..e4616dac 100644 --- a/gnulib-tests/test-environ.c +++ b/gnulib-tests/test-environ.c @@ -1,5 +1,5 @@ /* Test of environ variable. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 495242ba..fab35d0d 100644 --- a/gnulib-tests/test-errno.c +++ b/gnulib-tests/test-errno.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-exclude.c b/gnulib-tests/test-exclude.c index 277f05db..c2195703 100644 --- a/gnulib-tests/test-exclude.c +++ b/gnulib-tests/test-exclude.c @@ -1,5 +1,5 @@ /* Test suite for exclude. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 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 41fa46e2..e1e54c49 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 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 349a7051..1c9ffe13 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 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 35f0ded3..2cbd87cd 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 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 22f4d324..6f23d265 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 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 5bcf28d2..1dded6a5 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 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 0c0db9f6..8a4afed9 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 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 67efb8ac..cea207c2 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 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 c88f6ad7..142ced17 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 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 400d4481..375ff969 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-fadvise.c b/gnulib-tests/test-fadvise.c index 0ccacefc..68a79d2a 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you can 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 b771223e..dec7612e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-fchmodat.c b/gnulib-tests/test-fchmodat.c index a63b7644..68c3b831 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-fchownat.c b/gnulib-tests/test-fchownat.c index f64180d1..d83016e6 100644 --- a/gnulib-tests/test-fchownat.c +++ b/gnulib-tests/test-fchownat.c @@ -1,5 +1,5 @@ /* Tests of fchownat. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-fclose.c b/gnulib-tests/test-fclose.c index cebfcebb..794bd78b 100644 --- a/gnulib-tests/test-fclose.c +++ b/gnulib-tests/test-fclose.c @@ -1,5 +1,5 @@ /* Test of fclose module. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-fcntl-h.c b/gnulib-tests/test-fcntl-h.c index a86214ee..e177b3e6 100644 --- a/gnulib-tests/test-fcntl-h.c +++ b/gnulib-tests/test-fcntl-h.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -111,7 +111,7 @@ main (void) #if O_RSYNC && O_RSYNC != O_DSYNC case O_RSYNC: #endif -#if O_SYNC && O_SYNC != O_RSYNC +#if O_SYNC && O_SYNC != O_DSYNC && O_SYNC != O_RSYNC case O_SYNC: #endif #if O_TTY_INIT diff --git a/gnulib-tests/test-fcntl-safer.c b/gnulib-tests/test-fcntl-safer.c index f58f5b8d..e0712da2 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 23d74d84..fed914be 100644 --- a/gnulib-tests/test-fcntl.c +++ b/gnulib-tests/test-fcntl.c @@ -1,5 +1,5 @@ /* Test of fcntl(2). - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 5d5a6b9a..8dac8e6b 100644 --- a/gnulib-tests/test-fdatasync.c +++ b/gnulib-tests/test-fdatasync.c @@ -1,5 +1,5 @@ /* Test of fdatasync() function. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-fdopen.c b/gnulib-tests/test-fdopen.c index 743511ec..c4e03552 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-fdopendir.c b/gnulib-tests/test-fdopendir.c index d780b621..8fd43824 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This 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,11 +64,15 @@ main (int argc _GL_UNUSED, char *argv[]) fd = open (".", O_RDONLY); ASSERT (0 <= fd); d = fdopendir (fd); - /* We know that fd is now out of our reach, but it is not specified - whether it is closed now or at the closedir. We also can't - guarantee whether dirfd returns fd, some other descriptor, or - -1. */ ASSERT (d); + /* fdopendir should not close fd. */ + ASSERT (dup2 (fd, fd) == fd); + + /* Don't test dirfd here. dirfd (d) must return fd on current POSIX + platforms, but on pre-2008 platforms or on non-POSIX platforms + dirfd (fd) might return some other descriptor, or -1, and gnulib + does not work around this porting problem. */ + ASSERT (closedir (d) == 0); /* Now we can guarantee that fd must be closed. */ errno = 0; diff --git a/gnulib-tests/test-fdutimensat.c b/gnulib-tests/test-fdutimensat.c index 81ce3f5d..b74ff48b 100644 --- a/gnulib-tests/test-fdutimensat.c +++ b/gnulib-tests/test-fdutimensat.c @@ -1,5 +1,5 @@ /* Tests of fdutimensat. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 6af23635..c357cb4e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-fflush2.c b/gnulib-tests/test-fflush2.c index d73309d4..2233a5d2 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 2534d4bf..63e1e4a2 100644 --- a/gnulib-tests/test-fgetc.c +++ b/gnulib-tests/test-fgetc.c @@ -1,5 +1,5 @@ /* Test of fgetc() function. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-file-has-acl.c b/gnulib-tests/test-file-has-acl.c index f0de2ceb..0f33e0c6 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-filenamecat.c b/gnulib-tests/test-filenamecat.c index 1485c0b2..1ccf2994 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-2014 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 c207cdc2..337a3e12 100644 --- a/gnulib-tests/test-filevercmp.c +++ b/gnulib-tests/test-filevercmp.c @@ -1,5 +1,5 @@ /* Test of filevercmp() function. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software; you can 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 28a67bb8..8b621336 100644 --- a/gnulib-tests/test-float.c +++ b/gnulib-tests/test-float.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can 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 de94559c..970b2846 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 36f865a6..0bcbd9b0 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 e1cb1231..7b5d70cc 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 f87bb2ea..4747dc6f 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 fc16be47..69b31f66 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-2014 Free Software Foundation, Inc. + Copyright (C) 2004, 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 d5d0e724..38c29419 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 3f5d15b9..7793ba4c 100644 --- a/gnulib-tests/test-fpurge.c +++ b/gnulib-tests/test-fpurge.c @@ -1,5 +1,5 @@ /* Test of fpurge() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 befb5825..41ae0965 100644 --- a/gnulib-tests/test-fputc.c +++ b/gnulib-tests/test-fputc.c @@ -1,5 +1,5 @@ /* Test of fputc() function. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-fread.c b/gnulib-tests/test-fread.c index 72b93a9b..41cea56c 100644 --- a/gnulib-tests/test-fread.c +++ b/gnulib-tests/test-fread.c @@ -1,5 +1,5 @@ /* Test of fread() function. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-freadahead.c b/gnulib-tests/test-freadahead.c index f50c54e4..fd3bab97 100644 --- a/gnulib-tests/test-freadahead.c +++ b/gnulib-tests/test-freadahead.c @@ -1,5 +1,5 @@ /* Test of freadahead() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 7ca26ed6..62989a4d 100644 --- a/gnulib-tests/test-freading.c +++ b/gnulib-tests/test-freading.c @@ -1,5 +1,5 @@ /* Test of freading() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 e639d289..f7921329 100644 --- a/gnulib-tests/test-freadptr.c +++ b/gnulib-tests/test-freadptr.c @@ -1,5 +1,5 @@ /* Test of freadptr() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 2868248b..200ff5f4 100644 --- a/gnulib-tests/test-freadptr2.c +++ b/gnulib-tests/test-freadptr2.c @@ -1,5 +1,5 @@ /* Test of freadptr() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 3903f577..d97b2e2e 100644 --- a/gnulib-tests/test-freadseek.c +++ b/gnulib-tests/test-freadseek.c @@ -1,5 +1,5 @@ /* Test of freadseek() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 941dd559..6a119a3e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 a98530c9..5c43c1f3 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-frexp.c b/gnulib-tests/test-frexp.c index f7a10f5b..de626d0e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 1cdc6de2..5456b673 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-2014 Free Software Foundation, Inc. + Copyright (C) 2012-2015 Free Software Foundation, Inc. This program is free software: you can 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 b897e669..fc2a4de0 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 81ebb1cc..9aa5bc76 100644 --- a/gnulib-tests/test-fseek.c +++ b/gnulib-tests/test-fseek.c @@ -1,5 +1,5 @@ /* Test of fseek() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 ae9ccef5..01e19626 100644 --- a/gnulib-tests/test-fseeko.c +++ b/gnulib-tests/test-fseeko.c @@ -1,5 +1,5 @@ /* Test of fseeko() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 e92c9a12..b50a623c 100644 --- a/gnulib-tests/test-fseeko3.c +++ b/gnulib-tests/test-fseeko3.c @@ -1,5 +1,5 @@ /* Test of fseeko() function. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can 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 6559ad96..49da854e 100644 --- a/gnulib-tests/test-fseeko4.c +++ b/gnulib-tests/test-fseeko4.c @@ -1,5 +1,5 @@ /* Test of fseeko() function. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-fseterr.c b/gnulib-tests/test-fseterr.c index 7ea9fcb9..c499cb9d 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 9b793c96..7f393638 100644 --- a/gnulib-tests/test-fstat.c +++ b/gnulib-tests/test-fstat.c @@ -1,5 +1,5 @@ /* Tests of fstat() function. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-fstatat.c b/gnulib-tests/test-fstatat.c index 2b1acb7d..385e831d 100644 --- a/gnulib-tests/test-fstatat.c +++ b/gnulib-tests/test-fstatat.c @@ -1,5 +1,5 @@ /* Tests of fstatat. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-fsync.c b/gnulib-tests/test-fsync.c index 44f92bbe..eb78e558 100644 --- a/gnulib-tests/test-fsync.c +++ b/gnulib-tests/test-fsync.c @@ -1,5 +1,5 @@ /* Test of fsync() function. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-ftell.c b/gnulib-tests/test-ftell.c index 2b7120d8..28532268 100644 --- a/gnulib-tests/test-ftell.c +++ b/gnulib-tests/test-ftell.c @@ -1,5 +1,5 @@ /* Test of ftell() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 918c9e44..8a95e1c3 100644 --- a/gnulib-tests/test-ftell3.c +++ b/gnulib-tests/test-ftell3.c @@ -1,5 +1,5 @@ /* Test of ftell() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 6f3597bf..b9b5c969 100644 --- a/gnulib-tests/test-ftello.c +++ b/gnulib-tests/test-ftello.c @@ -1,5 +1,5 @@ /* Test of ftello() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 6918432b..67b46711 100644 --- a/gnulib-tests/test-ftello3.c +++ b/gnulib-tests/test-ftello3.c @@ -1,5 +1,5 @@ /* Test of ftello() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 ef9e74b2..68e64593 100644 --- a/gnulib-tests/test-ftello4.c +++ b/gnulib-tests/test-ftello4.c @@ -1,5 +1,5 @@ /* Test of ftello() function. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-ftruncate.c b/gnulib-tests/test-ftruncate.c index ae15411f..4dd7390d 100644 --- a/gnulib-tests/test-ftruncate.c +++ b/gnulib-tests/test-ftruncate.c @@ -1,5 +1,5 @@ /* Test truncating a file. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-futimens.c b/gnulib-tests/test-futimens.c index 0ae781a7..f63e2e5a 100644 --- a/gnulib-tests/test-futimens.c +++ b/gnulib-tests/test-futimens.c @@ -1,5 +1,5 @@ /* Tests of futimens. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 ffb0e552..fa362d23 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-fwrite.c b/gnulib-tests/test-fwrite.c index e51b2ab0..df4114ce 100644 --- a/gnulib-tests/test-fwrite.c +++ b/gnulib-tests/test-fwrite.c @@ -1,5 +1,5 @@ /* Test of fwrite() function. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-getaddrinfo.c b/gnulib-tests/test-getaddrinfo.c index acf9cd66..0cfb1f1a 100644 --- a/gnulib-tests/test-getaddrinfo.c +++ b/gnulib-tests/test-getaddrinfo.c @@ -1,6 +1,6 @@ /* Test the getaddrinfo module. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -116,11 +116,11 @@ simple (char const *host, char const *service) { void *ai_addr = ai->ai_addr; struct sockaddr_in *sock_addr = ai_addr; - dbgprintf ("\tflags %x\n", ai->ai_flags); - dbgprintf ("\tfamily %x\n", ai->ai_family); - dbgprintf ("\tsocktype %x\n", ai->ai_socktype); - dbgprintf ("\tprotocol %x\n", ai->ai_protocol); - dbgprintf ("\taddrlen %ld: ", (unsigned long) ai->ai_addrlen); + dbgprintf ("\tflags %x\n", ai->ai_flags + 0u); + dbgprintf ("\tfamily %x\n", ai->ai_family + 0u); + dbgprintf ("\tsocktype %x\n", ai->ai_socktype + 0u); + dbgprintf ("\tprotocol %x\n", ai->ai_protocol + 0u); + dbgprintf ("\taddrlen %lu: ", (unsigned long) ai->ai_addrlen); dbgprintf ("\tFound %s\n", inet_ntop (ai->ai_family, &sock_addr->sin_addr, diff --git a/gnulib-tests/test-getcwd-lgpl.c b/gnulib-tests/test-getcwd-lgpl.c index 371c8df6..de1728b6 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 2ddcd206..756f932f 100644 --- a/gnulib-tests/test-getcwd.c +++ b/gnulib-tests/test-getcwd.c @@ -1,5 +1,5 @@ /* Test of getcwd() function. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -153,7 +153,13 @@ test_long_name (void) while (1) { +# ifdef HAVE_GETCWD_SHORTER + /* On OS/X <= 10.9 for example, we're restricted to shorter paths + as lstat() doesn't support more than PATH_MAX. */ + size_t dotdot_max = PATH_MAX * 2; +# else size_t dotdot_max = PATH_MAX * (DIR_NAME_SIZE / DOTDOTSLASH_LEN); +# endif char *c = NULL; cwd_len += DIR_NAME_SIZE; @@ -202,7 +208,7 @@ test_long_name (void) fail = 6; break; } - if (AT_FDCWD || errno == ERANGE || errno == ENOENT) + if (HAVE_OPENAT_SUPPORT || errno == ERANGE || errno == ENOENT) { fail = 7; break; diff --git a/gnulib-tests/test-getdelim.c b/gnulib-tests/test-getdelim.c index 76aba827..bbcc3cde 100644 --- a/gnulib-tests/test-getdelim.c +++ b/gnulib-tests/test-getdelim.c @@ -1,5 +1,5 @@ /* Test of getdelim() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software; you can 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 86a0b4f0..a0325af0 100644 --- a/gnulib-tests/test-getdtablesize.c +++ b/gnulib-tests/test-getdtablesize.c @@ -1,5 +1,5 @@ /* Test of getdtablesize() function. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 0608b608..f86c12cf 100644 --- a/gnulib-tests/test-getgroups.c +++ b/gnulib-tests/test-getgroups.c @@ -1,5 +1,5 @@ /* Tests of getgroups. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 a6f3fdad..35c1aff0 100644 --- a/gnulib-tests/test-gethostname.c +++ b/gnulib-tests/test-gethostname.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2014 Free Software Foundation, Inc. + * Copyright (C) 2008-2015 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 4dbc485e..238742cf 100644 --- a/gnulib-tests/test-getline.c +++ b/gnulib-tests/test-getline.c @@ -1,5 +1,5 @@ /* Test of getline() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software; you can 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 37661c26..e17c3942 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can 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 e18469e8..3f1aeb08 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This 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,9 +84,9 @@ main (void) pwd = getpwuid (stat_buf.st_uid); if (! pwd) { - fprintf (stderr, "Skipping test: no name found for uid %d\n", - stat_buf.st_uid); - return 77; + long int uid = stat_buf.st_uid; + fprintf (stderr, "Skipping test: no name found for uid %ld\n", uid); + return 77; } ASSERT (strcmp (pwd->pw_name, buf) == 0); diff --git a/gnulib-tests/test-getndelim2.c b/gnulib-tests/test-getndelim2.c index 4b46efc9..3ffbff9b 100644 --- a/gnulib-tests/test-getndelim2.c +++ b/gnulib-tests/test-getndelim2.c @@ -1,5 +1,5 @@ /* Test of getndelim2() function. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -103,7 +103,7 @@ main (void) { int i; for (i = 0; i < 16; i++) - fprintf (f, "%500x%c", i, i % 2 ? '\n' : '\r'); + fprintf (f, "%500x%c", i + 0u, i % 2 ? '\n' : '\r'); } rewind (f); { diff --git a/gnulib-tests/test-getopt.c b/gnulib-tests/test-getopt.c index 152efeab..a0ae340c 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 c982d570..caaaa31f 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 07ea4a28..1094f3c1 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 5abb872a..3b15f129 100644 --- a/gnulib-tests/test-gettimeofday.c +++ b/gnulib-tests/test-gettimeofday.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc. + * Copyright (C) 2005, 2007, 2009-2015 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 dc80924d..161f3cf6 100644 --- a/gnulib-tests/test-hash.c +++ b/gnulib-tests/test-hash.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014 Free Software Foundation, Inc. + * Copyright (C) 2009-2015 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 fe64991a..ee2ac1ae 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This program is free software: you can 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 e72e3739..5b688d9b 100644 --- a/gnulib-tests/test-iconv-h.c +++ b/gnulib-tests/test-iconv-h.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 3c1b1933..ed715bda 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 3533d7ca..fc98860a 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can 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 eca86e72..78ff63c5 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 e85da225..0e360211 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 be447b33..0875a75b 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 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 83020cb7..4bc66841 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you can 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 97553e76..06df5a7c 100644 --- a/gnulib-tests/test-intprops.c +++ b/gnulib-tests/test-intprops.c @@ -1,5 +1,5 @@ /* Test intprops.h. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can 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 ea5b2956..cb71b2b8 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This 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,10 +28,6 @@ #include "macros.h" #define STREQ(a, b) (strcmp (a, b) == 0) -#define FMT(T) (TYPE_SIGNED (T) ? "%jd" : "%ju") -#define CAST_VAL(T,V) (TYPE_SIGNED (T) ? (intmax_t) (V) : (uintmax_t) (V)) -#define V_min(T) (CAST_VAL (T, TYPE_MINIMUM (T))) -#define V_max(T) (CAST_VAL (T, TYPE_MAXIMUM (T))) #define IS_TIGHT(T) (_GL_SIGNED_TYPE_OR_EXPR (T) == TYPE_SIGNED (T)) #define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9) @@ -49,11 +45,19 @@ char const *p; \ ASSERT (buf); \ *buf = '\0'; \ - ASSERT (snprintf (ref, sizeof ref, FMT (T), V_min (T)) < sizeof ref); \ + ASSERT \ + ((TYPE_SIGNED (T) \ + ? snprintf (ref, sizeof ref, "%jd", (intmax_t) TYPE_MINIMUM (T)) \ + : snprintf (ref, sizeof ref, "%ju", (uintmax_t) TYPE_MINIMUM (T))) \ + < sizeof ref); \ ASSERT (STREQ ((p = Fn (TYPE_MINIMUM (T), buf)), ref)); \ /* Ensure that INT_BUFSIZE_BOUND is tight for signed types. */ \ ASSERT (! TYPE_SIGNED (T) || (p == buf && *p == '-')); \ - ASSERT (snprintf (ref, sizeof ref, FMT (T), V_max (T)) < sizeof ref); \ + ASSERT \ + ((TYPE_SIGNED (T) \ + ? snprintf (ref, sizeof ref, "%jd", (intmax_t) TYPE_MAXIMUM (T)) \ + : snprintf (ref, sizeof ref, "%ju", (uintmax_t) TYPE_MAXIMUM (T))) \ + < sizeof ref); \ ASSERT (STREQ ((p = Fn (TYPE_MAXIMUM (T), buf)), ref)); \ /* For unsigned types, the bound is not always tight. */ \ ASSERT (! IS_TIGHT (T) || TYPE_SIGNED (T) \ diff --git a/gnulib-tests/test-inttypes.c b/gnulib-tests/test-inttypes.c index 35deeab5..7fa18b23 100644 --- a/gnulib-tests/test-inttypes.c +++ b/gnulib-tests/test-inttypes.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 8f31b68c..f34f856b 100644 --- a/gnulib-tests/test-ioctl.c +++ b/gnulib-tests/test-ioctl.c @@ -1,5 +1,5 @@ /* Test of ioctl() function. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-isatty.c b/gnulib-tests/test-isatty.c index de7be60b..ae1e8daa 100644 --- a/gnulib-tests/test-isatty.c +++ b/gnulib-tests/test-isatty.c @@ -1,5 +1,5 @@ /* Test isatty() function. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-isblank.c b/gnulib-tests/test-isblank.c index 3f4a0413..51d8d13e 100644 --- a/gnulib-tests/test-isblank.c +++ b/gnulib-tests/test-isblank.c @@ -1,5 +1,5 @@ /* Test of isblank() function. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 d7b6405b..984d1848 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 c6d216ef..06fc1837 100644 --- a/gnulib-tests/test-isnand.h +++ b/gnulib-tests/test-isnand.h @@ -1,5 +1,5 @@ /* Test of isnand() substitute. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 222bde75..7f70eb52 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 463ac7e4..cf51f12c 100644 --- a/gnulib-tests/test-isnanf.h +++ b/gnulib-tests/test-isnanf.h @@ -1,5 +1,5 @@ /* Test of isnanf() substitute. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 15a32c58..63ea5a9a 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 015b0864..2e65afae 100644 --- a/gnulib-tests/test-isnanl.h +++ b/gnulib-tests/test-isnanl.h @@ -1,5 +1,5 @@ /* Test of isnanl() substitute. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -80,7 +80,7 @@ main () # ifdef WORDS_BIGENDIAN # define LDBL80_WORDS(exponent,manthi,mantlo) \ { ((unsigned int) (exponent) << 16) | ((unsigned int) (manthi) >> 16), \ - ((unsigned int) (manthi) << 16) | (unsigned int) (mantlo) >> 16), \ + ((unsigned int) (manthi) << 16) | ((unsigned int) (mantlo) >> 16), \ (unsigned int) (mantlo) << 16 \ } # else @@ -98,37 +98,31 @@ main () { LDBL80_WORDS (0xFFFF, 0x83333333, 0x00000000) }; ASSERT (isnanl (x.value)); } - /* The isnanl function should recognize Pseudo-NaNs, Pseudo-Infinities, - Pseudo-Zeroes, Unnormalized Numbers, and Pseudo-Denormals, as defined in - Intel IA-64 Architecture Software Developer's Manual, Volume 1: - Application Architecture. - Table 5-2 "Floating-Point Register Encodings" - Figure 5-6 "Memory to Floating-Point Register Data Translation" - */ + /* isnanl should return something for noncanonical values. */ { /* Pseudo-NaN. */ static memory_long_double x = { LDBL80_WORDS (0xFFFF, 0x40000001, 0x00000000) }; - ASSERT (isnanl (x.value)); + ASSERT (isnanl (x.value) || !isnanl (x.value)); } { /* Pseudo-Infinity. */ static memory_long_double x = { LDBL80_WORDS (0xFFFF, 0x00000000, 0x00000000) }; - ASSERT (isnanl (x.value)); + ASSERT (isnanl (x.value) || !isnanl (x.value)); } { /* Pseudo-Zero. */ static memory_long_double x = { LDBL80_WORDS (0x4004, 0x00000000, 0x00000000) }; - ASSERT (isnanl (x.value)); + ASSERT (isnanl (x.value) || !isnanl (x.value)); } { /* Unnormalized number. */ static memory_long_double x = { LDBL80_WORDS (0x4000, 0x63333333, 0x00000000) }; - ASSERT (isnanl (x.value)); + ASSERT (isnanl (x.value) || !isnanl (x.value)); } { /* Pseudo-Denormal. */ static memory_long_double x = { LDBL80_WORDS (0x0000, 0x83333333, 0x00000000) }; - ASSERT (isnanl (x.value)); + ASSERT (isnanl (x.value) || !isnanl (x.value)); } #endif diff --git a/gnulib-tests/test-iswblank.c b/gnulib-tests/test-iswblank.c index 68ede5c7..f1fbe414 100644 --- a/gnulib-tests/test-iswblank.c +++ b/gnulib-tests/test-iswblank.c @@ -1,5 +1,5 @@ /* Test of iswblank() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 f4aa5b8c..b038ca3f 100644 --- a/gnulib-tests/test-langinfo.c +++ b/gnulib-tests/test-langinfo.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 13c2f4da..35c8a52f 100644 --- a/gnulib-tests/test-lchown.c +++ b/gnulib-tests/test-lchown.c @@ -1,5 +1,5 @@ /* Tests of lchown. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 329b6dee..fa0a8e3d 100644 --- a/gnulib-tests/test-lchown.h +++ b/gnulib-tests/test-lchown.h @@ -1,5 +1,5 @@ /* Tests of lchown. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 42749eb7..f89f9107 100644 --- a/gnulib-tests/test-link.c +++ b/gnulib-tests/test-link.c @@ -1,5 +1,5 @@ /* Test of link() function. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 7540e619..fdb3533a 100644 --- a/gnulib-tests/test-link.h +++ b/gnulib-tests/test-link.h @@ -1,5 +1,5 @@ /* Test of link() function. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 e17434e4..b5383374 100644 --- a/gnulib-tests/test-linkat.c +++ b/gnulib-tests/test-linkat.c @@ -1,5 +1,5 @@ /* Tests of linkat. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-linked_list.c b/gnulib-tests/test-linked_list.c new file mode 100644 index 00000000..12d5a6f1 --- /dev/null +++ b/gnulib-tests/test-linked_list.c @@ -0,0 +1,411 @@ +/* Test of sequential list data type implementation. + Copyright (C) 2006-2015 Free Software Foundation, Inc. + Written by Bruno Haible , 2006. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +#include "gl_linked_list.h" + +#include + +#include "gl_array_list.h" +#include "progname.h" +#include "macros.h" + +static const char *objects[15] = + { + "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o" + }; + +#define RANDOM(n) (rand () % (n)) +#define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))] + +static void +check_equals (gl_list_t list1, gl_list_t list2) +{ + size_t n, i; + + n = gl_list_size (list1); + ASSERT (n == gl_list_size (list2)); + for (i = 0; i < n; i++) + { + ASSERT (gl_list_get_at (list1, i) == gl_list_get_at (list2, i)); + } +} + +static void +check_all (gl_list_t list1, gl_list_t list2, gl_list_t list3) +{ + check_equals (list1, list2); + check_equals (list1, list3); +} + +int +main (int argc, char *argv[]) +{ + gl_list_t list1, list2, list3; + + set_program_name (argv[0]); + + /* Allow the user to provide a non-default random seed on the command line. */ + if (argc > 1) + srand (atoi (argv[1])); + + { + size_t initial_size = RANDOM (50); + const void **contents = + (const void **) malloc (initial_size * sizeof (const void *)); + size_t i; + unsigned int repeat; + + for (i = 0; i < initial_size; i++) + contents[i] = RANDOM_OBJECT (); + + /* Create list1. */ + list1 = gl_list_nx_create (GL_ARRAY_LIST, NULL, NULL, NULL, true, + initial_size, contents); + ASSERT (list1 != NULL); + /* Create list2. */ + list2 = gl_list_nx_create_empty (GL_LINKED_LIST, NULL, NULL, NULL, true); + ASSERT (list2 != NULL); + for (i = 0; i < initial_size; i++) + ASSERT (gl_list_nx_add_last (list2, contents[i]) != NULL); + + /* Create list3. */ + list3 = gl_list_nx_create (GL_LINKED_LIST, NULL, NULL, NULL, true, + initial_size, contents); + ASSERT (list3 != NULL); + + check_all (list1, list2, list3); + + for (repeat = 0; repeat < 10000; repeat++) + { + unsigned int operation = RANDOM (16); + switch (operation) + { + case 0: + if (gl_list_size (list1) > 0) + { + size_t index = RANDOM (gl_list_size (list1)); + const char *obj = RANDOM_OBJECT (); + gl_list_node_t node1, node2, node3; + + node1 = gl_list_nx_set_at (list1, index, obj); + ASSERT (node1 != NULL); + ASSERT (gl_list_get_at (list1, index) == obj); + ASSERT (gl_list_node_value (list1, node1) == obj); + + node2 = gl_list_nx_set_at (list2, index, obj); + ASSERT (node2 != NULL); + ASSERT (gl_list_get_at (list2, index) == obj); + ASSERT (gl_list_node_value (list2, node2) == obj); + + node3 = gl_list_nx_set_at (list3, index, obj); + ASSERT (node3 != NULL); + ASSERT (gl_list_get_at (list3, index) == obj); + ASSERT (gl_list_node_value (list3, node3) == obj); + + if (index > 0) + { + ASSERT (gl_list_node_value (list1, gl_list_previous_node (list1, node1)) + == gl_list_get_at (list1, index - 1)); + ASSERT (gl_list_node_value (list2, gl_list_previous_node (list3, node3)) + == gl_list_get_at (list2, index - 1)); + ASSERT (gl_list_node_value (list3, gl_list_previous_node (list3, node3)) + == gl_list_get_at (list2, index - 1)); + } + if (index + 1 < gl_list_size (list1)) + { + ASSERT (gl_list_node_value (list1, gl_list_next_node (list1, node1)) + == gl_list_get_at (list1, index + 1)); + ASSERT (gl_list_node_value (list2, gl_list_next_node (list3, node3)) + == gl_list_get_at (list2, index + 1)); + ASSERT (gl_list_node_value (list3, gl_list_next_node (list3, node3)) + == gl_list_get_at (list2, index + 1)); + } + } + break; + case 1: + { + const char *obj = RANDOM_OBJECT (); + gl_list_node_t node1, node2, node3; + node1 = gl_list_search (list1, obj); + node2 = gl_list_search (list2, obj); + node3 = gl_list_search (list3, obj); + if (node1 == NULL) + { + ASSERT (node2 == NULL); + ASSERT (node3 == NULL); + } + else + { + ASSERT (node2 != NULL); + ASSERT (node3 != NULL); + ASSERT (gl_list_node_value (list1, node1) == obj); + ASSERT (gl_list_node_value (list2, node2) == obj); + ASSERT (gl_list_node_value (list3, node3) == obj); + } + } + break; + case 2: + { + const char *obj = RANDOM_OBJECT (); + size_t index1, index2, index3; + index1 = gl_list_indexof (list1, obj); + index2 = gl_list_indexof (list2, obj); + index3 = gl_list_indexof (list3, obj); + if (index1 == (size_t)(-1)) + { + ASSERT (index2 == (size_t)(-1)); + ASSERT (index3 == (size_t)(-1)); + } + else + { + ASSERT (index2 != (size_t)(-1)); + ASSERT (index3 != (size_t)(-1)); + ASSERT (gl_list_get_at (list1, index1) == obj); + ASSERT (gl_list_get_at (list2, index2) == obj); + ASSERT (gl_list_get_at (list3, index3) == obj); + ASSERT (index2 == index1); + ASSERT (index3 == index1); + } + } + break; + case 3: /* add 1 element */ + { + const char *obj = RANDOM_OBJECT (); + gl_list_node_t node1, node2, node3; + node1 = gl_list_nx_add_first (list1, obj); + ASSERT (node1 != NULL); + node2 = gl_list_nx_add_first (list2, obj); + ASSERT (node2 != NULL); + node3 = gl_list_nx_add_first (list3, obj); + ASSERT (node3 != NULL); + ASSERT (gl_list_node_value (list1, node1) == obj); + ASSERT (gl_list_node_value (list2, node2) == obj); + ASSERT (gl_list_node_value (list3, node3) == obj); + ASSERT (gl_list_get_at (list1, 0) == obj); + ASSERT (gl_list_get_at (list2, 0) == obj); + ASSERT (gl_list_get_at (list3, 0) == obj); + } + break; + case 4: /* add 1 element */ + { + const char *obj = RANDOM_OBJECT (); + gl_list_node_t node1, node2, node3; + node1 = gl_list_nx_add_last (list1, obj); + ASSERT (node1 != NULL); + node2 = gl_list_nx_add_last (list2, obj); + ASSERT (node2 != NULL); + node3 = gl_list_nx_add_last (list3, obj); + ASSERT (node3 != NULL); + ASSERT (gl_list_node_value (list1, node1) == obj); + ASSERT (gl_list_node_value (list2, node2) == obj); + ASSERT (gl_list_node_value (list3, node3) == obj); + ASSERT (gl_list_get_at (list1, gl_list_size (list1) - 1) == obj); + ASSERT (gl_list_get_at (list2, gl_list_size (list2) - 1) == obj); + ASSERT (gl_list_get_at (list3, gl_list_size (list3) - 1) == obj); + } + break; + case 5: /* add 3 elements */ + { + const char *obj0 = RANDOM_OBJECT (); + const char *obj1 = RANDOM_OBJECT (); + const char *obj2 = RANDOM_OBJECT (); + gl_list_node_t node1, node2, node3; + node1 = gl_list_nx_add_first (list1, obj2); + ASSERT (node1 != NULL); + node1 = gl_list_nx_add_before (list1, node1, obj0); + ASSERT (node1 != NULL); + node1 = gl_list_nx_add_after (list1, node1, obj1); + ASSERT (node1 != NULL); + node2 = gl_list_nx_add_first (list2, obj2); + ASSERT (node2 != NULL); + node2 = gl_list_nx_add_before (list2, node2, obj0); + ASSERT (node2 != NULL); + node2 = gl_list_nx_add_after (list2, node2, obj1); + ASSERT (node2 != NULL); + node3 = gl_list_nx_add_first (list3, obj2); + ASSERT (node3 != NULL); + node3 = gl_list_nx_add_before (list3, node3, obj0); + ASSERT (node3 != NULL); + node3 = gl_list_nx_add_after (list3, node3, obj1); + ASSERT (node3 != NULL); + ASSERT (gl_list_node_value (list1, node1) == obj1); + ASSERT (gl_list_node_value (list2, node2) == obj1); + ASSERT (gl_list_node_value (list3, node3) == obj1); + ASSERT (gl_list_get_at (list1, 0) == obj0); + ASSERT (gl_list_get_at (list1, 1) == obj1); + ASSERT (gl_list_get_at (list1, 2) == obj2); + ASSERT (gl_list_get_at (list2, 0) == obj0); + ASSERT (gl_list_get_at (list2, 1) == obj1); + ASSERT (gl_list_get_at (list2, 2) == obj2); + ASSERT (gl_list_get_at (list3, 0) == obj0); + ASSERT (gl_list_get_at (list3, 1) == obj1); + ASSERT (gl_list_get_at (list3, 2) == obj2); + } + break; + case 6: /* add 1 element */ + { + size_t index = RANDOM (gl_list_size (list1) + 1); + const char *obj = RANDOM_OBJECT (); + gl_list_node_t node1, node2, node3; + node1 = gl_list_nx_add_at (list1, index, obj); + ASSERT (node1 != NULL); + node2 = gl_list_nx_add_at (list2, index, obj); + ASSERT (node2 != NULL); + node3 = gl_list_nx_add_at (list3, index, obj); + ASSERT (node3 != NULL); + ASSERT (gl_list_get_at (list1, index) == obj); + ASSERT (gl_list_node_value (list1, node1) == obj); + ASSERT (gl_list_get_at (list2, index) == obj); + ASSERT (gl_list_node_value (list2, node2) == obj); + ASSERT (gl_list_get_at (list3, index) == obj); + ASSERT (gl_list_node_value (list3, node3) == obj); + if (index > 0) + { + ASSERT (gl_list_node_value (list1, gl_list_previous_node (list1, node1)) + == gl_list_get_at (list1, index - 1)); + ASSERT (gl_list_node_value (list2, gl_list_previous_node (list3, node3)) + == gl_list_get_at (list2, index - 1)); + ASSERT (gl_list_node_value (list3, gl_list_previous_node (list3, node3)) + == gl_list_get_at (list2, index - 1)); + } + if (index + 1 < gl_list_size (list1)) + { + ASSERT (gl_list_node_value (list1, gl_list_next_node (list1, node1)) + == gl_list_get_at (list1, index + 1)); + ASSERT (gl_list_node_value (list2, gl_list_next_node (list3, node3)) + == gl_list_get_at (list2, index + 1)); + ASSERT (gl_list_node_value (list3, gl_list_next_node (list3, node3)) + == gl_list_get_at (list2, index + 1)); + } + } + break; + case 7: case 8: /* remove 1 element */ + if (gl_list_size (list1) > 0) + { + size_t n = gl_list_size (list1); + const char *obj = gl_list_get_at (list1, RANDOM (n)); + gl_list_node_t node1, node2, node3; + node1 = gl_list_search (list1, obj); + node2 = gl_list_search (list2, obj); + node3 = gl_list_search (list3, obj); + ASSERT (node1 != NULL); + ASSERT (node2 != NULL); + ASSERT (node3 != NULL); + ASSERT (gl_list_remove_node (list1, node1)); + ASSERT (gl_list_remove_node (list2, node2)); + ASSERT (gl_list_remove_node (list3, node3)); + ASSERT (gl_list_size (list1) == n - 1); + } + break; + case 9: case 10: /* remove 1 element */ + if (gl_list_size (list1) > 0) + { + size_t n = gl_list_size (list1); + size_t index = RANDOM (n); + ASSERT (gl_list_remove_at (list1, index)); + ASSERT (gl_list_remove_at (list2, index)); + ASSERT (gl_list_remove_at (list3, index)); + ASSERT (gl_list_size (list1) == n - 1); + } + break; + case 11: case 12: /* remove 1 element */ + if (gl_list_size (list1) > 0) + { + size_t n = gl_list_size (list1); + const char *obj = gl_list_get_at (list1, RANDOM (n)); + ASSERT (gl_list_remove (list1, obj)); + ASSERT (gl_list_remove (list2, obj)); + ASSERT (gl_list_remove (list3, obj)); + ASSERT (gl_list_size (list1) == n - 1); + } + break; + case 13: + if (gl_list_size (list1) > 0) + { + size_t n = gl_list_size (list1); + const char *obj = "xyzzy"; + ASSERT (!gl_list_remove (list1, obj)); + ASSERT (!gl_list_remove (list2, obj)); + ASSERT (!gl_list_remove (list3, obj)); + ASSERT (gl_list_size (list1) == n); + } + break; + case 14: + { + size_t n = gl_list_size (list1); + gl_list_iterator_t iter1, iter2, iter3; + const void *elt; + iter1 = gl_list_iterator (list1); + iter2 = gl_list_iterator (list2); + iter3 = gl_list_iterator (list3); + for (i = 0; i < n; i++) + { + ASSERT (gl_list_iterator_next (&iter1, &elt, NULL)); + ASSERT (gl_list_get_at (list1, i) == elt); + ASSERT (gl_list_iterator_next (&iter2, &elt, NULL)); + ASSERT (gl_list_get_at (list2, i) == elt); + ASSERT (gl_list_iterator_next (&iter3, &elt, NULL)); + ASSERT (gl_list_get_at (list3, i) == elt); + } + ASSERT (!gl_list_iterator_next (&iter1, &elt, NULL)); + ASSERT (!gl_list_iterator_next (&iter2, &elt, NULL)); + ASSERT (!gl_list_iterator_next (&iter3, &elt, NULL)); + gl_list_iterator_free (&iter1); + gl_list_iterator_free (&iter2); + gl_list_iterator_free (&iter3); + } + break; + case 15: + { + size_t end = RANDOM (gl_list_size (list1) + 1); + size_t start = RANDOM (end + 1); + gl_list_iterator_t iter1, iter2, iter3; + const void *elt; + iter1 = gl_list_iterator_from_to (list1, start, end); + iter2 = gl_list_iterator_from_to (list2, start, end); + iter3 = gl_list_iterator_from_to (list3, start, end); + for (i = start; i < end; i++) + { + ASSERT (gl_list_iterator_next (&iter1, &elt, NULL)); + ASSERT (gl_list_get_at (list1, i) == elt); + ASSERT (gl_list_iterator_next (&iter2, &elt, NULL)); + ASSERT (gl_list_get_at (list2, i) == elt); + ASSERT (gl_list_iterator_next (&iter3, &elt, NULL)); + ASSERT (gl_list_get_at (list3, i) == elt); + } + ASSERT (!gl_list_iterator_next (&iter1, &elt, NULL)); + ASSERT (!gl_list_iterator_next (&iter2, &elt, NULL)); + ASSERT (!gl_list_iterator_next (&iter3, &elt, NULL)); + gl_list_iterator_free (&iter1); + gl_list_iterator_free (&iter2); + gl_list_iterator_free (&iter3); + } + break; + } + check_all (list1, list2, list3); + } + + gl_list_free (list1); + gl_list_free (list2); + gl_list_free (list3); + free (contents); + } + + return 0; +} diff --git a/gnulib-tests/test-listen.c b/gnulib-tests/test-listen.c index f2e6c06a..c0c70822 100644 --- a/gnulib-tests/test-listen.c +++ b/gnulib-tests/test-listen.c @@ -1,5 +1,5 @@ /* Test listen() function. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-locale.c b/gnulib-tests/test-locale.c index cf4e6e81..5383cff4 100644 --- a/gnulib-tests/test-locale.c +++ b/gnulib-tests/test-locale.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This 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,11 +33,6 @@ int a[] = LC_TIME }; -#if HAVE_NEWLOCALE -/* Check that the locale_t type and the LC_GLOBAL_LOCALE macro are defined. */ -locale_t b = LC_GLOBAL_LOCALE; -#endif - /* Check that the 'struct lconv' type is defined. */ struct lconv l; int ls; @@ -49,6 +44,12 @@ verify (sizeof NULL == sizeof (void *)); int main () { +#if HAVE_NEWLOCALE + /* Check that the locale_t type and the LC_GLOBAL_LOCALE macro are defined. */ + locale_t b = LC_GLOBAL_LOCALE; + (void) b; +#endif + /* Check that 'struct lconv' has the ISO C and POSIX specified members. */ ls += sizeof (*l.decimal_point); ls += sizeof (*l.thousands_sep); diff --git a/gnulib-tests/test-localeconv.c b/gnulib-tests/test-localeconv.c index 9cd22af8..35260732 100644 --- a/gnulib-tests/test-localeconv.c +++ b/gnulib-tests/test-localeconv.c @@ -1,5 +1,5 @@ /* Test of localeconv() function. - Copyright (C) 2012-2014 Free Software Foundation, Inc. + Copyright (C) 2012-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-localename.c b/gnulib-tests/test-localename.c index df6c1d66..b5dd742f 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-lock.c b/gnulib-tests/test-lock.c index fd2ed266..a992f646 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 fc37ec2d..c5e91882 100644 --- a/gnulib-tests/test-lseek.c +++ b/gnulib-tests/test-lseek.c @@ -1,5 +1,5 @@ /* Test of lseek() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-lstat.c b/gnulib-tests/test-lstat.c index eab2ad4d..0e7597e8 100644 --- a/gnulib-tests/test-lstat.c +++ b/gnulib-tests/test-lstat.c @@ -1,5 +1,5 @@ /* Test of lstat() function. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 45ca3bfa..d5ba7a8f 100644 --- a/gnulib-tests/test-lstat.h +++ b/gnulib-tests/test-lstat.h @@ -1,5 +1,5 @@ /* Test of lstat() function. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 89734975..be5e4b78 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 773dee51..e85909e0 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you can 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 6f94d0d0..717ede0a 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-math.c b/gnulib-tests/test-math.c index f3975eed..7ac8b9a6 100644 --- a/gnulib-tests/test-math.c +++ b/gnulib-tests/test-math.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 06f07aa2..efb1dddb 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 e8cdea07..d24b93e7 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 80d34596..4a4cef2f 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-mbscasecmp.c b/gnulib-tests/test-mbscasecmp.c index 278265be..ade3267f 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 56548db5..98db1f19 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 079fa4c1..cb394f51 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 1e6f7e01..b00d5334 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 2565128c..6a80ebb5 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 e4d9a6d0..4f56bf30 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 b86cca85..68278b1b 100644 --- a/gnulib-tests/test-md5.c +++ b/gnulib-tests/test-md5.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc. + * Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc. * Written by Simon Josefsson * * This program is free software: you can redistribute it and/or modify @@ -42,10 +42,10 @@ main (void) size_t i; printf ("expected:\n"); for (i = 0; i < MD5_DIGEST_SIZE; i++) - printf ("%02x ", out1[i] & 0xFF); + printf ("%02x ", out1[i] & 0xFFu); printf ("\ncomputed:\n"); for (i = 0; i < MD5_DIGEST_SIZE; i++) - printf ("%02x ", buf[i] & 0xFF); + printf ("%02x ", buf[i] & 0xFFu); printf ("\n"); return 1; } @@ -55,10 +55,10 @@ main (void) size_t i; printf ("expected:\n"); for (i = 0; i < MD5_DIGEST_SIZE; i++) - printf ("%02x ", out2[i] & 0xFF); + printf ("%02x ", out2[i] & 0xFFu); printf ("\ncomputed:\n"); for (i = 0; i < MD5_DIGEST_SIZE; i++) - printf ("%02x ", buf[i] & 0xFF); + printf ("%02x ", buf[i] & 0xFFu); printf ("\n"); return 1; } diff --git a/gnulib-tests/test-memcasecmp.c b/gnulib-tests/test-memcasecmp.c index 0aa204cc..1ce52ff2 100644 --- a/gnulib-tests/test-memcasecmp.c +++ b/gnulib-tests/test-memcasecmp.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2014 Free Software Foundation, Inc. + * Copyright (C) 2008-2015 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 223c8e77..bc1acf9f 100644 --- a/gnulib-tests/test-memchr.c +++ b/gnulib-tests/test-memchr.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2014 Free Software Foundation, Inc. + * Copyright (C) 2008-2015 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 dc131c30..7aa3b74f 100644 --- a/gnulib-tests/test-memchr2.c +++ b/gnulib-tests/test-memchr2.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2014 Free Software Foundation, Inc. + * Copyright (C) 2008-2015 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 31f3e1cc..9a8320c8 100644 --- a/gnulib-tests/test-memcoll.c +++ b/gnulib-tests/test-memcoll.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2014 Free Software Foundation, Inc. + * Copyright (C) 2008-2015 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 16f0f805..8c887c7e 100644 --- a/gnulib-tests/test-memrchr.c +++ b/gnulib-tests/test-memrchr.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2014 Free Software Foundation, Inc. + * Copyright (C) 2008-2015 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 c7ffef19..84dacb07 100644 --- a/gnulib-tests/test-mkdir.c +++ b/gnulib-tests/test-mkdir.c @@ -1,5 +1,5 @@ /* Tests of mkdir. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 e6660b0f..5a6451d1 100644 --- a/gnulib-tests/test-mkdir.h +++ b/gnulib-tests/test-mkdir.h @@ -1,5 +1,5 @@ /* Test of mkdir() function. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 ee5565b4..c6eef27c 100644 --- a/gnulib-tests/test-mkfifo.c +++ b/gnulib-tests/test-mkfifo.c @@ -1,5 +1,5 @@ /* Tests of mkfifo. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 792160f0..b834d008 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 187a17c4..9e28be87 100644 --- a/gnulib-tests/test-mknod.c +++ b/gnulib-tests/test-mknod.c @@ -1,5 +1,5 @@ /* Tests of mknod. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 b775b85d..230e11d0 100644 --- a/gnulib-tests/test-nanosleep.c +++ b/gnulib-tests/test-nanosleep.c @@ -1,5 +1,5 @@ /* Test of nanosleep() function. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 574abbe6..97abfd27 100644 --- a/gnulib-tests/test-netdb.c +++ b/gnulib-tests/test-netdb.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007-2008, 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2008, 2010-2015 Free Software Foundation, Inc. This program is free software: you can 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 5a9754a3..ae1634f6 100644 --- a/gnulib-tests/test-netinet_in.c +++ b/gnulib-tests/test-netinet_in.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 06a4c9d0..45da9d06 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 985d9015..d169e22d 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 d7bd5afc..2fbcd17a 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,8 +21,10 @@ around a glibc bug whereby 'open' cannot be used as a function pointer when _FORTIFY_SOURCE is positive. */ -#ifndef __always_inline -#define __always_inline +#if __GLIBC__ && defined __always_inline +# define ALWAYS_INLINE __always_inline +#else +# define ALWAYS_INLINE #endif /* This file is designed to test both open(n,buf[,mode]) and @@ -31,7 +33,7 @@ appropriate headers are already included. If PRINT, warn before skipping symlink tests with status 77. */ -static __always_inline int +static ALWAYS_INLINE int test_open (int (*func) (char const *, int, ...), bool print) { int fd; diff --git a/gnulib-tests/test-openat-safer.c b/gnulib-tests/test-openat-safer.c index 9544b8b1..4c277598 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 ed505079..233f822d 100644 --- a/gnulib-tests/test-openat.c +++ b/gnulib-tests/test-openat.c @@ -1,5 +1,5 @@ /* Test that openat works. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-parse-datetime.c b/gnulib-tests/test-parse-datetime.c index 25385ca7..5449e788 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-pathmax.c b/gnulib-tests/test-pathmax.c index 8bc7dbcc..14eb1eeb 100644 --- a/gnulib-tests/test-pathmax.c +++ b/gnulib-tests/test-pathmax.c @@ -1,5 +1,5 @@ /* Test of "pathmax.h". - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can 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 c003faad..08fc3066 100644 --- a/gnulib-tests/test-perror.c +++ b/gnulib-tests/test-perror.c @@ -1,5 +1,5 @@ /* Test of perror() function. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software; you can 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 7e981264..94cedfee 100644 --- a/gnulib-tests/test-perror2.c +++ b/gnulib-tests/test-perror2.c @@ -1,5 +1,5 @@ /* Test of perror() function. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software; you can 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 c951d1d0..6524a3ed 100644 --- a/gnulib-tests/test-pipe.c +++ b/gnulib-tests/test-pipe.c @@ -1,5 +1,5 @@ /* Test of pipe. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software; you can 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 0f9c8bc6..3f688e06 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-printf-frexp.c b/gnulib-tests/test-printf-frexp.c index 57d57b73..fc2bf566 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 95801dae..ba9540d7 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 b6446368..069b76cd 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 bcbc84ab..578614a9 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 08aadc1f..b579af73 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software; you can 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 5fa7233c..e1bb659e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software; you can 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 bfe4352e..7456a90a 100644 --- a/gnulib-tests/test-raise.c +++ b/gnulib-tests/test-raise.c @@ -1,5 +1,5 @@ /* Test raising a signal. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-rand-isaac.c b/gnulib-tests/test-rand-isaac.c index beead718..7cc530e5 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-read-file.c b/gnulib-tests/test-read-file.c index fff96ecd..f8b160f5 100644 --- a/gnulib-tests/test-read-file.c +++ b/gnulib-tests/test-read-file.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2007, 2010-2014 Free Software Foundation, Inc. + * Copyright (C) 2006-2007, 2010-2015 Free Software Foundation, Inc. * Written by Simon Josefsson * * This program is free software: you can redistribute it and/or modify @@ -57,7 +57,8 @@ main (void) /* FILE1 is a regular file or a symlink to a regular file. */ if (len != statbuf.st_size) { - fprintf (stderr, "Read %ld from %s...\n", (unsigned long) len, FILE1); + fprintf (stderr, "Read %lu from %s...\n", + (unsigned long) len, FILE1); err = 1; } } @@ -98,7 +99,8 @@ main (void) is not a regular file. */ if (len != 0) { - fprintf (stderr, "Read %ld from %s...\n", (unsigned long) len, FILE2); + fprintf (stderr, "Read %lu from %s...\n", + (unsigned long) len, FILE2); err = 1; } free (out); diff --git a/gnulib-tests/test-read.c b/gnulib-tests/test-read.c index 541e4b9d..892a6175 100644 --- a/gnulib-tests/test-read.c +++ b/gnulib-tests/test-read.c @@ -1,5 +1,5 @@ /* Test the read() function. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-readlink.c b/gnulib-tests/test-readlink.c index e6adbe5d..42401088 100644 --- a/gnulib-tests/test-readlink.c +++ b/gnulib-tests/test-readlink.c @@ -1,5 +1,5 @@ /* Tests of readlink. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 33039de4..ad34c558 100644 --- a/gnulib-tests/test-readlink.h +++ b/gnulib-tests/test-readlink.h @@ -1,5 +1,5 @@ /* Tests of readlink. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 c1d3753a..10e75ba9 100644 --- a/gnulib-tests/test-readlinkat.c +++ b/gnulib-tests/test-readlinkat.c @@ -1,5 +1,5 @@ /* Tests of readlinkat. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-readtokens.c b/gnulib-tests/test-readtokens.c index e7068f75..110b9795 100644 --- a/gnulib-tests/test-readtokens.c +++ b/gnulib-tests/test-readtokens.c @@ -1,5 +1,5 @@ /* Test the readtokens module. - Copyright (C) 2012-2014 Free Software Foundation, Inc. + Copyright (C) 2012-2015 Free Software Foundation, Inc. This program is free software: you can 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 1969ce25..d87dfe52 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-regex.c b/gnulib-tests/test-regex.c index cac028b8..46027973 100644 --- a/gnulib-tests/test-regex.c +++ b/gnulib-tests/test-regex.c @@ -1,5 +1,5 @@ /* Test regular expressions - Copyright 1996-2001, 2003-2014 Free Software Foundation, Inc. + Copyright 1996-2001, 2003-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-remove.c b/gnulib-tests/test-remove.c index 53c9be08..ca877f03 100644 --- a/gnulib-tests/test-remove.c +++ b/gnulib-tests/test-remove.c @@ -1,5 +1,5 @@ /* Tests of remove. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 b2608299..6020d65a 100644 --- a/gnulib-tests/test-rename.c +++ b/gnulib-tests/test-rename.c @@ -1,5 +1,5 @@ /* Test of rename() function. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 2bc610fc..5e60fc98 100644 --- a/gnulib-tests/test-rename.h +++ b/gnulib-tests/test-rename.h @@ -1,5 +1,5 @@ /* Test of rename() function. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 4903a57d..52cfa428 100644 --- a/gnulib-tests/test-rmdir.c +++ b/gnulib-tests/test-rmdir.c @@ -1,5 +1,5 @@ /* Tests of rmdir. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 daaa4150..9c83a107 100644 --- a/gnulib-tests/test-rmdir.h +++ b/gnulib-tests/test-rmdir.h @@ -1,5 +1,5 @@ /* Tests of rmdir. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 70e15c2d..bea6d3ee 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-sched.c b/gnulib-tests/test-sched.c index f4429096..d6f57529 100644 --- a/gnulib-tests/test-sched.c +++ b/gnulib-tests/test-sched.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 ae9e83cc..19621136 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 8b242a21..043c4f67 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 ef7389a8..d578c1b7 100644 --- a/gnulib-tests/test-select.c +++ b/gnulib-tests/test-select.c @@ -1,5 +1,5 @@ /* Test of select() substitute. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 adf1dd4e..ef0c87a2 100644 --- a/gnulib-tests/test-select.h +++ b/gnulib-tests/test-select.h @@ -1,5 +1,5 @@ /* Test of select() substitute. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-set-mode-acl.c b/gnulib-tests/test-set-mode-acl.c index 61f1975e..a282e259 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-setenv.c b/gnulib-tests/test-setenv.c index 548e4fba..a7ef4886 100644 --- a/gnulib-tests/test-setenv.c +++ b/gnulib-tests/test-setenv.c @@ -1,5 +1,5 @@ /* Tests of setenv. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 0434d7bb..6e0ef9d0 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can 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 2f52fe0b..1bd8a5c9 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can 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 ebf50a50..6e1da720 100644 --- a/gnulib-tests/test-setsockopt.c +++ b/gnulib-tests/test-setsockopt.c @@ -1,5 +1,5 @@ /* Test setsockopt() function. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-sha1.c b/gnulib-tests/test-sha1.c index 9a3e3cbe..6f2b608e 100644 --- a/gnulib-tests/test-sha1.c +++ b/gnulib-tests/test-sha1.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc. + * Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc. * Written by Simon Josefsson * * This program is free software: you can redistribute it and/or modify @@ -36,10 +36,10 @@ main (void) size_t i; printf ("expected:\n"); for (i = 0; i < SHA1_DIGEST_SIZE; i++) - printf ("%02x ", out1[i] & 0xFF); + printf ("%02x ", out1[i] & 0xFFu); printf ("\ncomputed:\n"); for (i = 0; i < SHA1_DIGEST_SIZE; i++) - printf ("%02x ", buf[i] & 0xFF); + printf ("%02x ", buf[i] & 0xFFu); printf ("\n"); return 1; } diff --git a/gnulib-tests/test-sigaction.c b/gnulib-tests/test-sigaction.c index 0fa1c262..ec0f0516 100644 --- a/gnulib-tests/test-sigaction.c +++ b/gnulib-tests/test-sigaction.c @@ -1,5 +1,5 @@ /* Test of sigaction() function. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 3bc94821..836e1c81 100644 --- a/gnulib-tests/test-signal-h.c +++ b/gnulib-tests/test-signal-h.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 584bf4f9..80e9a08b 100644 --- a/gnulib-tests/test-signbit.c +++ b/gnulib-tests/test-signbit.c @@ -1,5 +1,5 @@ /* Test of signbit() substitute. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 c6c771ea..c88e180a 100644 --- a/gnulib-tests/test-sigprocmask.c +++ b/gnulib-tests/test-sigprocmask.c @@ -1,5 +1,5 @@ /* Test of sigprocmask. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-sleep.c b/gnulib-tests/test-sleep.c index 9b93fef3..fba2f462 100644 --- a/gnulib-tests/test-sleep.c +++ b/gnulib-tests/test-sleep.c @@ -1,5 +1,5 @@ /* Test of sleep() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 38d9935c..c14a2c1b 100644 --- a/gnulib-tests/test-snprintf.c +++ b/gnulib-tests/test-snprintf.c @@ -1,5 +1,5 @@ /* Test of snprintf() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 35f1bf28..551f061d 100644 --- a/gnulib-tests/test-sockets.c +++ b/gnulib-tests/test-sockets.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2014 Free Software Foundation, Inc. + * Copyright (C) 2008-2015 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-stat-time.c b/gnulib-tests/test-stat-time.c index c39aa00e..8bb136d3 100644 --- a/gnulib-tests/test-stat-time.c +++ b/gnulib-tests/test-stat-time.c @@ -1,5 +1,5 @@ /* Test of . - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 9ed462a3..c6af3762 100644 --- a/gnulib-tests/test-stat.c +++ b/gnulib-tests/test-stat.c @@ -1,5 +1,5 @@ /* Tests of stat. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 6cfc958d..c37fe6d2 100644 --- a/gnulib-tests/test-stat.h +++ b/gnulib-tests/test-stat.h @@ -1,5 +1,5 @@ /* Tests of stat. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-statat.c b/gnulib-tests/test-statat.c index e7b04be7..2a8d9532 100644 --- a/gnulib-tests/test-statat.c +++ b/gnulib-tests/test-statat.c @@ -1,5 +1,5 @@ /* Tests of statat and lstatat. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-stdalign.c b/gnulib-tests/test-stdalign.c index 81efd540..68b9ef15 100644 --- a/gnulib-tests/test-stdalign.c +++ b/gnulib-tests/test-stdalign.c @@ -1,5 +1,5 @@ /* Test of . - Copyright 2009-2014 Free Software Foundation, Inc. + Copyright 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 efa83246..1da25d07 100644 --- a/gnulib-tests/test-stdbool.c +++ b/gnulib-tests/test-stdbool.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2002-2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 d5d887eb..aa6ae549 100644 --- a/gnulib-tests/test-stddef.c +++ b/gnulib-tests/test-stddef.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,13 +19,14 @@ #include #include - +#include #include "verify.h" /* Check that appropriate types are defined. */ wchar_t a = 'c'; ptrdiff_t b = 1; size_t c = 2; +max_align_t x; /* Check that NULL can be passed through varargs as a pointer type, per POSIX 2008. */ @@ -45,6 +46,26 @@ verify (sizeof (offsetof (struct d, e)) == sizeof (size_t)); verify (offsetof (struct d, e) < -1); /* Must be unsigned. */ verify (offsetof (struct d, f) == 1); +/* Check max_align_t's alignment. */ +verify (alignof (double) <= alignof (max_align_t)); +verify (alignof (int) <= alignof (max_align_t)); +verify (alignof (long double) <= alignof (max_align_t)); +verify (alignof (long int) <= alignof (max_align_t)); +verify (alignof (ptrdiff_t) <= alignof (max_align_t)); +verify (alignof (size_t) <= alignof (max_align_t)); +verify (alignof (wchar_t) <= alignof (max_align_t)); +verify (alignof (struct d) <= alignof (max_align_t)); +#if defined __GNUC__ || defined __IBM__ALIGNOF__ +verify (__alignof__ (double) <= __alignof__ (max_align_t)); +verify (__alignof__ (int) <= __alignof__ (max_align_t)); +verify (__alignof__ (long double) <= __alignof__ (max_align_t)); +verify (__alignof__ (long int) <= __alignof__ (max_align_t)); +verify (__alignof__ (ptrdiff_t) <= __alignof__ (max_align_t)); +verify (__alignof__ (size_t) <= __alignof__ (max_align_t)); +verify (__alignof__ (wchar_t) <= __alignof__ (max_align_t)); +verify (__alignof__ (struct d) <= __alignof__ (max_align_t)); +#endif + int main (void) { diff --git a/gnulib-tests/test-stdint.c b/gnulib-tests/test-stdint.c index 008b517d..8d54db2e 100644 --- a/gnulib-tests/test-stdint.c +++ b/gnulib-tests/test-stdint.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This program is free software: you can 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 d3f0e6b1..cbec2a6f 100644 --- a/gnulib-tests/test-stdio.c +++ b/gnulib-tests/test-stdio.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 a2743e46..b2da7ecc 100644 --- a/gnulib-tests/test-stdlib.c +++ b/gnulib-tests/test-stdlib.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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.c b/gnulib-tests/test-strerror.c index 8e2ed7c2..755ffba6 100644 --- a/gnulib-tests/test-strerror.c +++ b/gnulib-tests/test-strerror.c @@ -1,5 +1,5 @@ /* Test of strerror() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software; you can 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 9e1f0bef..11f4830b 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software; you can 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 9a558d8f..c98ad641 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can 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 fd29a091..fc9b2005 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 d890c8b5..647d3b9b 100644 --- a/gnulib-tests/test-string.c +++ b/gnulib-tests/test-string.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-strncat.c b/gnulib-tests/test-strncat.c index 1262b989..c3467ac9 100644 --- a/gnulib-tests/test-strncat.c +++ b/gnulib-tests/test-strncat.c @@ -1,5 +1,5 @@ /* Test of strncat() function. - Copyright (C) 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you can 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 8a2089ec..19e41cff 100644 --- a/gnulib-tests/test-strnlen.c +++ b/gnulib-tests/test-strnlen.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2014 Free Software Foundation, Inc. + * Copyright (C) 2010-2015 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 4194c3db..53304418 100644 --- a/gnulib-tests/test-strsignal.c +++ b/gnulib-tests/test-strsignal.c @@ -1,5 +1,5 @@ /* Test of strsignal() function. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software; you can 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 07794b4d..d2e09515 100644 --- a/gnulib-tests/test-strtod.c +++ b/gnulib-tests/test-strtod.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2014 Free Software Foundation, Inc. + * Copyright (C) 2008-2015 Free Software Foundation, Inc. * Written by Eric Blake * * This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-strtoimax.c b/gnulib-tests/test-strtoimax.c index 1ff5711d..cf733ffa 100644 --- a/gnulib-tests/test-strtoimax.c +++ b/gnulib-tests/test-strtoimax.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2014 Free Software Foundation, Inc. + * Copyright (C) 2011-2015 Free Software Foundation, Inc. * * This program is free software: you can 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 a4043ce8..794ef885 100644 --- a/gnulib-tests/test-strtoll.c +++ b/gnulib-tests/test-strtoll.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2014 Free Software Foundation, Inc. + * Copyright (C) 2011-2015 Free Software Foundation, Inc. * * This program is free software: you can 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 53729b13..6d176284 100644 --- a/gnulib-tests/test-strtoull.c +++ b/gnulib-tests/test-strtoull.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2014 Free Software Foundation, Inc. + * Copyright (C) 2011-2015 Free Software Foundation, Inc. * * This program is free software: you can 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 77f490fd..c472a9bd 100644 --- a/gnulib-tests/test-strtoumax.c +++ b/gnulib-tests/test-strtoumax.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2014 Free Software Foundation, Inc. + * Copyright (C) 2011-2015 Free Software Foundation, Inc. * * This program is free software: you can 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 78d46c23..7a633918 100644 --- a/gnulib-tests/test-symlink.c +++ b/gnulib-tests/test-symlink.c @@ -1,5 +1,5 @@ /* Tests of symlink. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 eb11cf69..4dc741a0 100644 --- a/gnulib-tests/test-symlink.h +++ b/gnulib-tests/test-symlink.h @@ -1,5 +1,5 @@ /* Tests of symlink. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 75181ce9..0ec13f85 100644 --- a/gnulib-tests/test-symlinkat.c +++ b/gnulib-tests/test-symlinkat.c @@ -1,5 +1,5 @@ /* Tests of symlinkat. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-sys_ioctl.c b/gnulib-tests/test-sys_ioctl.c index bd2a5af3..a0779c81 100644 --- a/gnulib-tests/test-sys_ioctl.c +++ b/gnulib-tests/test-sys_ioctl.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 531ff803..e5083f56 100644 --- a/gnulib-tests/test-sys_resource.c +++ b/gnulib-tests/test-sys_resource.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2012-2014 Free Software Foundation, Inc. + Copyright (C) 2012-2015 Free Software Foundation, Inc. This program is free software: you can 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 2e4f7c10..e9b4b7cf 100644 --- a/gnulib-tests/test-sys_select.c +++ b/gnulib-tests/test-sys_select.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 8316f9ae..8d8528b1 100644 --- a/gnulib-tests/test-sys_socket.c +++ b/gnulib-tests/test-sys_socket.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 c6a67f7f..e4194a13 100644 --- a/gnulib-tests/test-sys_stat.c +++ b/gnulib-tests/test-sys_stat.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-sys_time.c b/gnulib-tests/test-sys_time.c index ea12c63d..653ff467 100644 --- a/gnulib-tests/test-sys_time.c +++ b/gnulib-tests/test-sys_time.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 ddcb6d29..1ef3b903 100644 --- a/gnulib-tests/test-sys_types.c +++ b/gnulib-tests/test-sys_types.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can 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 4f53cae9..3878c96a 100644 --- a/gnulib-tests/test-sys_uio.c +++ b/gnulib-tests/test-sys_uio.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can 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 10221bc4..3a7da7f7 100644 --- a/gnulib-tests/test-sys_utsname.c +++ b/gnulib-tests/test-sys_utsname.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 daf6f282..3382fdf5 100644 --- a/gnulib-tests/test-sys_wait.c +++ b/gnulib-tests/test-sys_wait.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 ed20219f..e4a79b54 100644 --- a/gnulib-tests/test-sys_wait.h +++ b/gnulib-tests/test-sys_wait.h @@ -1,5 +1,5 @@ /* Test of macros shared between and . - Copyright (C) 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you can 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 a6b38120..f782d38f 100644 --- a/gnulib-tests/test-termios.c +++ b/gnulib-tests/test-termios.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you can 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 12ba79d9..c6dbc7b3 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can 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 3629a82c..1d2d05e0 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can 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 cb39c3bb..25bdcf0a 100644 --- a/gnulib-tests/test-time.c +++ b/gnulib-tests/test-time.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-tls.c b/gnulib-tests/test-tls.c index 9eb0b139..bee567ed 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-u64.c b/gnulib-tests/test-u64.c index b70bef67..4b77a7fd 100644 --- a/gnulib-tests/test-u64.c +++ b/gnulib-tests/test-u64.c @@ -1,5 +1,5 @@ /* Test of - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 c474754d..8a01a820 100644 --- a/gnulib-tests/test-uname.c +++ b/gnulib-tests/test-uname.c @@ -1,5 +1,5 @@ /* Test of system information. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 6d3fa00f..930b5e21 100644 --- a/gnulib-tests/test-unistd.c +++ b/gnulib-tests/test-unistd.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 05c93ca4..bfb53124 100644 --- a/gnulib-tests/test-unlink.c +++ b/gnulib-tests/test-unlink.c @@ -1,5 +1,5 @@ /* Tests of unlink. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 3b5adff0..f843f4d9 100644 --- a/gnulib-tests/test-unlink.h +++ b/gnulib-tests/test-unlink.h @@ -1,5 +1,5 @@ /* Tests of unlink. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 1cfa0340..e21427ac 100644 --- a/gnulib-tests/test-unlinkat.c +++ b/gnulib-tests/test-unlinkat.c @@ -1,5 +1,5 @@ /* Tests of unlinkat. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-unsetenv.c b/gnulib-tests/test-unsetenv.c index 50600a90..235e1858 100644 --- a/gnulib-tests/test-unsetenv.c +++ b/gnulib-tests/test-unsetenv.c @@ -1,5 +1,5 @@ /* Tests of unsetenv. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 759a9372..c9398e3b 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This file is part of the GNUlib Library. # # This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-userspec.c b/gnulib-tests/test-userspec.c index 437049c4..638aa92e 100644 --- a/gnulib-tests/test-userspec.c +++ b/gnulib-tests/test-userspec.c @@ -1,5 +1,5 @@ /* Test userspec.c - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This 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,30 +45,30 @@ struct test static struct test T[] = { - { "", -1, -1, "", "", NULL}, - { ":", -1, -1, "", "", NULL}, - { "0:0", 0, 0, "", "", NULL}, - { ":1", -1, 1, "", "", NULL}, - { "1", 1, -1, "", "", NULL}, - { ":+0", -1, 0, "", "", NULL}, - { "22:42", 22, 42, "", "", NULL}, + { "", -1, -1, "", "", NULL}, + { ":", -1, -1, "", "", NULL}, + { "+0:+0", 0, 0, "", "", NULL}, + { ":+1", -1, 1, "", "", NULL}, + { "+1", 1, -1, "", "", NULL}, + { ":+0", -1, 0, "", "", NULL}, + { "+22:+42", 22, 42, "", "", NULL}, /* (uint32_t)-1 should be invalid everywhere */ - { "4294967295:4294967295", 0, 0, NULL, NULL, "invalid user"}, + { "+4294967295:+4294967295", 0, 0, NULL, NULL, "invalid user"}, /* likewise, but with only the group being invalid */ - { "0:4294967295", 0, 0, NULL, NULL, "invalid group"}, - { ":4294967295", 0, 0, NULL, NULL, "invalid group"}, + { "+0:+4294967295", 0, 0, NULL, NULL, "invalid group"}, + { ":+4294967295", 0, 0, NULL, NULL, "invalid group"}, /* and only the user being invalid */ - { "4294967295:0", 0, 0, NULL, NULL, "invalid user"}, + { "+4294967295:+0", 0, 0, NULL, NULL, "invalid user"}, /* and using 2^32 */ - { "4294967296:4294967296", 0, 0, NULL, NULL, "invalid user"}, - { "0:4294967296", 0, 0, NULL, NULL, "invalid group"}, - { ":4294967296", 0, 0, NULL, NULL, "invalid group"}, - { "4294967296:0", 0, 0, NULL, NULL, "invalid user"}, + { "+4294967296:+4294967296", 0, 0, NULL, NULL, "invalid user"}, + { "+0:+4294967296", 0, 0, NULL, NULL, "invalid group"}, + { ":+4294967296", 0, 0, NULL, NULL, "invalid group"}, + { "+4294967296:+0", 0, 0, NULL, NULL, "invalid user"}, /* numeric user and no group is invalid */ - { "4294967295:", 0, 0, NULL, NULL, "invalid spec"}, - { "4294967296:", 0, 0, NULL, NULL, "invalid spec"}, - { "1:", 0, 0, NULL, NULL, "invalid spec"}, - { "+0:", 0, 0, NULL, NULL, "invalid spec"}, + { "+4294967295:", 0, 0, NULL, NULL, "invalid spec"}, + { "+4294967296:", 0, 0, NULL, NULL, "invalid spec"}, + { "+1:", 0, 0, NULL, NULL, "invalid spec"}, + { "+0:", 0, 0, NULL, NULL, "invalid spec"}, /* "username:" must expand to UID:GID where GID is username's login group */ /* Add an entry like the following to the table, if possible. diff --git a/gnulib-tests/test-utimens-common.h b/gnulib-tests/test-utimens-common.h index ff1b92b7..c04d8dd9 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-utimens.c b/gnulib-tests/test-utimens.c index 04ffe72c..7b72ef3f 100644 --- a/gnulib-tests/test-utimens.c +++ b/gnulib-tests/test-utimens.c @@ -1,5 +1,5 @@ /* Tests of utimens. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 fd696a0d..82009fa5 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 cdc18b95..174cc58e 100644 --- a/gnulib-tests/test-utimensat.c +++ b/gnulib-tests/test-utimensat.c @@ -1,5 +1,5 @@ /* Tests of utimensat. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-vasnprintf.c b/gnulib-tests/test-vasnprintf.c index 2cbad5dc..8ff59006 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 6a28cffb..585d3a3f 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -46,7 +46,7 @@ have_minus_zero () #ifdef WORDS_BIGENDIAN # define LDBL80_WORDS(exponent,manthi,mantlo) \ { ((unsigned int) (exponent) << 16) | ((unsigned int) (manthi) >> 16), \ - ((unsigned int) (manthi) << 16) | (unsigned int) (mantlo) >> 16), \ + ((unsigned int) (manthi) << 16) | ((unsigned int) (mantlo) >> 16), \ (unsigned int) (mantlo) << 16 \ } #else @@ -570,13 +570,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) ASSERT (retval == strlen (result)); free (result); } - /* The isnanl function should recognize Pseudo-NaNs, Pseudo-Infinities, - Pseudo-Zeroes, Unnormalized Numbers, and Pseudo-Denormals, as defined in - Intel IA-64 Architecture Software Developer's Manual, Volume 1: - Application Architecture. - Table 5-2 "Floating-Point Register Encodings" - Figure 5-6 "Memory to Floating-Point Register Data Translation" - */ + /* asprintf should print something for noncanonical values. */ { /* Pseudo-NaN. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0xFFFF, 0x40000001, 0x00000000) }; @@ -584,10 +578,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%La %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } { /* Pseudo-Infinity. */ @@ -597,10 +589,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%La %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } { /* Pseudo-Zero. */ @@ -610,10 +600,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%La %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } { /* Unnormalized number. */ @@ -623,10 +611,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%La %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } { /* Pseudo-Denormal. */ @@ -636,10 +622,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%La %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } #endif @@ -1384,13 +1368,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) ASSERT (retval == strlen (result)); free (result); } - /* The isnanl function should recognize Pseudo-NaNs, Pseudo-Infinities, - Pseudo-Zeroes, Unnormalized Numbers, and Pseudo-Denormals, as defined in - Intel IA-64 Architecture Software Developer's Manual, Volume 1: - Application Architecture. - Table 5-2 "Floating-Point Register Encodings" - Figure 5-6 "Memory to Floating-Point Register Data Translation" - */ + /* asprintf should print something for noncanonical values. */ { /* Pseudo-NaN. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0xFFFF, 0x40000001, 0x00000000) }; @@ -1398,10 +1376,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Lf %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } { /* Pseudo-Infinity. */ @@ -1411,10 +1387,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Lf %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } { /* Pseudo-Zero. */ @@ -1424,10 +1398,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Lf %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } { /* Unnormalized number. */ @@ -1437,10 +1409,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Lf %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } { /* Pseudo-Denormal. */ @@ -1450,10 +1420,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Lf %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } #endif @@ -2406,13 +2374,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) ASSERT (retval == strlen (result)); free (result); } - /* The isnanl function should recognize Pseudo-NaNs, Pseudo-Infinities, - Pseudo-Zeroes, Unnormalized Numbers, and Pseudo-Denormals, as defined in - Intel IA-64 Architecture Software Developer's Manual, Volume 1: - Application Architecture. - Table 5-2 "Floating-Point Register Encodings" - Figure 5-6 "Memory to Floating-Point Register Data Translation" - */ + /* asprintf should print something for noncanonical values. */ { /* Pseudo-NaN. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0xFFFF, 0x40000001, 0x00000000) }; @@ -2420,10 +2382,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Le %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } { /* Pseudo-Infinity. */ @@ -2433,10 +2393,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Le %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } { /* Pseudo-Zero. */ @@ -2446,10 +2404,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Le %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } { /* Unnormalized number. */ @@ -2459,10 +2415,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Le %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } { /* Pseudo-Denormal. */ @@ -2472,10 +2426,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Le %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } #endif @@ -3160,13 +3112,7 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) ASSERT (retval == strlen (result)); free (result); } - /* The isnanl function should recognize Pseudo-NaNs, Pseudo-Infinities, - Pseudo-Zeroes, Unnormalized Numbers, and Pseudo-Denormals, as defined in - Intel IA-64 Architecture Software Developer's Manual, Volume 1: - Application Architecture. - Table 5-2 "Floating-Point Register Encodings" - Figure 5-6 "Memory to Floating-Point Register Data Translation" - */ + /* asprintf should print something for noncanonical values. */ { /* Pseudo-NaN. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0xFFFF, 0x40000001, 0x00000000) }; @@ -3174,10 +3120,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Lg %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } { /* Pseudo-Infinity. */ @@ -3187,10 +3131,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Lg %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } { /* Pseudo-Zero. */ @@ -3200,10 +3142,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Lg %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } { /* Unnormalized number. */ @@ -3213,10 +3153,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Lg %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } { /* Pseudo-Denormal. */ @@ -3226,10 +3164,8 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) int retval = my_asprintf (&result, "%Lg %d", x.value, 33, 44, 55); ASSERT (result != NULL); - ASSERT (strlen (result) >= 3 + 3 - && strisnan (result, 0, strlen (result) - 3, 0) - && strcmp (result + strlen (result) - 3, " 33") == 0); ASSERT (retval == strlen (result)); + ASSERT (3 < retval && strcmp (result + retval - 3, " 33") == 0); free (result); } #endif diff --git a/gnulib-tests/test-vasprintf.c b/gnulib-tests/test-vasprintf.c index 9bfffbdc..b3042759 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 51d35604..a2a237f0 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 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 b31f99a5..2882d328 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 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 2a41eb11..640dc426 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 d94f63f8..1f202e83 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 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 c41f7ac5..0ad212b7 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 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 c55c6eda..ab970916 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 78f3cf7c..66c717d3 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 d9807ec7..e857ab5d 100644 --- a/gnulib-tests/test-wchar.c +++ b/gnulib-tests/test-wchar.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 793bbce9..d8bcf750 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 5b14050c..902a4e19 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can 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 904a1851..7466e595 100644 --- a/gnulib-tests/test-wctype-h.c +++ b/gnulib-tests/test-wctype-h.c @@ -1,5 +1,5 @@ /* Test of substitute. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 d571a791..9fad7852 100644 --- a/gnulib-tests/test-wcwidth.c +++ b/gnulib-tests/test-wcwidth.c @@ -1,5 +1,5 @@ /* Test of wcwidth() function. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 a722429d..6c1ea0c0 100644 --- a/gnulib-tests/test-write.c +++ b/gnulib-tests/test-write.c @@ -1,5 +1,5 @@ /* Test the write() function. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-xalloc-die.c b/gnulib-tests/test-xalloc-die.c index baf79242..16d8636a 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can 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 cf2ad40a..76cdecde 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 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 e9e56972..6501e427 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 87dfbf64..bc8a700a 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 c3670cc7..990e1dbe 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-2014 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 1998-2001, 2003-2015 Free Software Foundation, Inc. This program is free software: you can 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 45da3e48..9e33844b 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can 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 22c45f2f..038065b5 100644 --- a/gnulib-tests/test-yesno.c +++ b/gnulib-tests/test-yesno.c @@ -1,5 +1,5 @@ /* Test of yesno module. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software; you can 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.sh b/gnulib-tests/test-yesno.sh index 9d195413..8bc50a88 100755 --- a/gnulib-tests/test-yesno.sh +++ b/gnulib-tests/test-yesno.sh @@ -49,6 +49,14 @@ echo yes | test-yesno 2 > out1.tmp || fail=1 LC_ALL=C tr -d "$cr" < out1.tmp > out.tmp || fail=1 cmp xout.tmp out.tmp || fail=1 +# Test for behavior with no EOL at EOF +cat < xout.tmp +Y +EOF +printf y | test-yesno 1 > out1.tmp || fail=1 +LC_ALL=C tr -d "$cr" < out1.tmp > out.tmp || fail=1 +cmp xout.tmp out.tmp || fail=1 + # Test for behavior on EOF cat < xout.tmp N diff --git a/gnulib-tests/unistr/test-strncat.h b/gnulib-tests/unistr/test-strncat.h index 30935b3f..fc4494e2 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you 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 a5511301..7f02e8b8 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you 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 cec9216e..f586f04d 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you 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 21e0db67..6b1e7acb 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you 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 9e9cea22..0ef99637 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you 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.sh b/gnulib-tests/uniwidth/test-uc_width2.sh index 9307f33b..1463d345 100755 --- a/gnulib-tests/uniwidth/test-uc_width2.sh +++ b/gnulib-tests/uniwidth/test-uc_width2.sh @@ -28,10 +28,12 @@ cat > uc_width.ok <<\EOF 05C6 A 05C7 0 05C8..05FF A -0600..0603 0 -0604..060F A +0600..0605 0 +0606..060F A 0610..061A 0 -061B..064A A +061B A +061C 0 +061D..064A A 064B..065F 0 0660..066F A 0670 0 @@ -63,8 +65,8 @@ cat > uc_width.ok <<\EOF 0829..082D 0 082E..0858 A 0859..085B 0 -085C..08FF A -0900..0902 0 +085C..08E2 A +08E3..0902 0 0903..0939 A 093A 0 093B A @@ -135,7 +137,9 @@ cat > uc_width.ok <<\EOF 0BC0 0 0BC1..0BCC A 0BCD 0 -0BCE..0C3D A +0BCE..0BFF A +0C00 0 +0C01..0C3D A 0C3E..0C40 0 0C41..0C45 A 0C46..0C48 0 @@ -145,13 +149,17 @@ cat > uc_width.ok <<\EOF 0C55..0C56 0 0C57..0C61 A 0C62..0C63 0 -0C64..0CBB A +0C64..0C80 A +0C81 0 +0C82..0CBB A 0CBC 0 0CBD..0CCB A 0CCC..0CCD 0 0CCE..0CE1 A 0CE2..0CE3 0 -0CE4..0D40 A +0CE4..0D00 A +0D01 0 +0D02..0D40 A 0D41..0D44 0 0D45..0D4C A 0D4D 0 @@ -242,8 +250,8 @@ cat > uc_width.ok <<\EOF 17D4..17DC A 17DD 0 17DE..180A A -180B..180D 0 -180E..18A8 A +180B..180E 0 +180F..18A8 A 18A9 0 18AA..191F A 1920..1922 0 @@ -255,7 +263,9 @@ cat > uc_width.ok <<\EOF 1939..193B 0 193C..1A16 A 1A17..1A18 0 -1A19..1A55 A +1A19..1A1A A +1A1B 0 +1A1C..1A55 A 1A56 0 1A57 A 1A58..1A5E 0 @@ -269,7 +279,9 @@ cat > uc_width.ok <<\EOF 1A73..1A7C 0 1A7D..1A7E A 1A7F 0 -1A80..1AFF A +1A80..1AAF A +1AB0..1ABE 0 +1ABF..1AFF A 1B00..1B03 0 1B04..1B33 A 1B34 0 @@ -287,7 +299,9 @@ cat > uc_width.ok <<\EOF 1BA2..1BA5 0 1BA6..1BA7 A 1BA8..1BA9 0 -1BAA..1BE5 A +1BAA A +1BAB..1BAD 0 +1BAE..1BE5 A 1BE6 0 1BE7 A 1BE8..1BE9 0 @@ -307,9 +321,13 @@ cat > uc_width.ok <<\EOF 1CE2..1CE8 0 1CE9..1CEC A 1CED 0 -1CEE..1DBF A -1DC0..1DE6 0 -1DE7..1DFB A +1CEE..1CF3 A +1CF4 0 +1CF5..1CF7 A +1CF8..1CF9 0 +1CFA..1DBF A +1DC0..1DF5 0 +1DF6..1DFB A 1DFC..1DFF 0 1E00..200A A 200B..200F 0 @@ -317,8 +335,8 @@ cat > uc_width.ok <<\EOF 202A..202E 0 202F..205F A 2060..2064 0 -2065..2069 A -206A..206F 0 +2065 A +2066..206F 0 2070..20A8 A 20A9 1 20AA..20CF A @@ -333,8 +351,8 @@ cat > uc_width.ok <<\EOF 2DE0..2DFF 0 2E00..2E7F A 2E80..3029 2 -302A..302F 0 -3030..303E 2 +302A..302D 0 +302E..303E 2 303F A 3040..3098 2 3099..309A 0 @@ -343,9 +361,11 @@ cat > uc_width.ok <<\EOF 4E00..A4CF 2 A4D0..A66E A A66F..A672 0 -A673..A67B A -A67C..A67D 0 -A67E..A6EF A +A673 A +A674..A67D 0 +A67E..A69D A +A69E..A69F 0 +A6A0..A6EF A A6F0..A6F1 0 A6F2..A801 A A802 0 @@ -371,7 +391,9 @@ A9B4..A9B5 A A9B6..A9B9 0 A9BA..A9BB A A9BC 0 -A9BD..AA28 A +A9BD..A9E4 A +A9E5 0 +A9E6..AA28 A AA29..AA2E 0 AA2F..AA30 A AA31..AA32 0 @@ -381,7 +403,9 @@ AA37..AA42 A AA43 0 AA44..AA4B A AA4C 0 -AA4D..AAAF A +AA4D..AA7B A +AA7C 0 +AA7D..AAAF A AAB0 0 AAB1 A AAB2..AAB4 0 @@ -391,7 +415,11 @@ AAB9..AABD A AABE..AABF 0 AAC0 A AAC1 0 -AAC2..ABE4 A +AAC2..AAEB A +AAEC..AAED 0 +AAEE..AAF5 A +AAF6 0 +AAF7..ABE4 A ABE5 0 ABE6..ABE7 A ABE8 0 @@ -406,8 +434,7 @@ FB1E 0 FB1F..FDFF A FE00..FE0F 0 FE10..FE1F 2 -FE20..FE26 0 -FE27..FE2F A +FE20..FE2F 0 FE30..FE6F 2 FE70..FEFE A FEFF 0 @@ -418,7 +445,11 @@ FFE7..FFF8 1 FFF9..FFFB 0 FFFC..101FC 1 101FD 0 -101FE..10A00 1 +101FE..102DF 1 +102E0 0 +102E1..10375 1 +10376..1037A 0 +1037B..10A00 1 10A01..10A03 0 10A04 1 10A05..10A06 0 @@ -428,19 +459,101 @@ FFFC..101FC 1 10A38..10A3A 0 10A3B..10A3E 1 10A3F 0 -10A40..11000 1 +10A40..10AE4 1 +10AE5..10AE6 0 +10AE7..11000 1 11001 0 11002..11037 1 11038..11046 0 -11047..1107F 1 -11080..11081 0 +11047..1107E 1 +1107F..11081 0 11082..110B2 1 110B3..110B6 0 110B7..110B8 1 110B9..110BA 0 110BB..110BC 1 110BD 0 -110BE..1D166 1 +110BE..110FF 1 +11100..11102 0 +11103..11126 1 +11127..1112B 0 +1112C 1 +1112D..11134 0 +11135..11172 1 +11173 0 +11174..1117F 1 +11180..11181 0 +11182..111B5 1 +111B6..111BE 0 +111BF..111C9 1 +111CA..111CC 0 +111CD..1122E 1 +1122F..11231 0 +11232..11233 1 +11234 0 +11235 1 +11236..11237 0 +11238..112DE 1 +112DF 0 +112E0..112E2 1 +112E3..112EA 0 +112EB..112FF 1 +11300..11301 0 +11302..1133B 1 +1133C 0 +1133D..1133F 1 +11340 0 +11341..11365 1 +11366..1136C 0 +1136D..1136F 1 +11370..11374 0 +11375..114B2 1 +114B3..114B8 0 +114B9 1 +114BA 0 +114BB..114BE 1 +114BF..114C0 0 +114C1 1 +114C2..114C3 0 +114C4..115B1 1 +115B2..115B5 0 +115B6..115BB 1 +115BC..115BD 0 +115BE 1 +115BF..115C0 0 +115C1..115DB 1 +115DC..115DD 0 +115DE..11632 1 +11633..1163A 0 +1163B..1163C 1 +1163D 0 +1163E 1 +1163F..11640 0 +11641..116AA 1 +116AB 0 +116AC 1 +116AD 0 +116AE..116AF 1 +116B0..116B5 0 +116B6 1 +116B7 0 +116B8..1171C 1 +1171D..1171F 0 +11720..11721 1 +11722..11725 0 +11726 1 +11727..1172B 0 +1172C..16AEF 1 +16AF0..16AF4 0 +16AF5..16B2F 1 +16B30..16B36 0 +16B37..16F8E 1 +16F8F..16F92 0 +16F93..1BC9C 1 +1BC9D..1BC9E 0 +1BC9F 1 +1BCA0..1BCA3 0 +1BCA4..1D166 1 1D167..1D169 0 1D16A..1D172 1 1D173..1D182 0 @@ -450,7 +563,21 @@ FFFC..101FC 1 1D1AA..1D1AD 0 1D1AE..1D241 1 1D242..1D244 0 -1D245..1FFFF 1 +1D245..1D9FF 1 +1DA00..1DA36 0 +1DA37..1DA3A 1 +1DA3B..1DA6C 0 +1DA6D..1DA74 1 +1DA75 0 +1DA76..1DA83 1 +1DA84 0 +1DA85..1DA9A 1 +1DA9B..1DA9F 0 +1DAA0 1 +1DAA1..1DAAF 0 +1DAB0..1E8CF 1 +1E8D0..1E8D6 0 +1E8D7..1FFFF 1 20000..3FFFF 2 40000..E0000 1 E0001 0 diff --git a/gnulib-tests/unlinkdir.c b/gnulib-tests/unlinkdir.c index 157b3c4a..976b9123 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/unlinkdir.h b/gnulib-tests/unlinkdir.h index 5563131b..9a9f5fb3 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/w32sock.h b/gnulib-tests/w32sock.h index b921b1bc..dace9cf7 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you 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 d87d1804..3ff6c7b7 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 0fa170eb..41217d52 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 b3595a4d..8022aa84 100644 --- a/gnulib-tests/wctomb.c +++ b/gnulib-tests/wctomb.c @@ -1,5 +1,5 @@ /* Convert wide character to multibyte character. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 db30f4b1..76418aa5 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/init.cfg b/init.cfg index 725ee121..3beba5a9 100644 --- a/init.cfg +++ b/init.cfg @@ -1,6 +1,6 @@ # This file is sourced by init.sh, *before* its initialization. -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This 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,7 @@ is_local_dir_() require_mount_list_() { local mount_list_fail='cannot read table of mounted file systems' - df 2>&1 | grep -F "$mount_list_fail" >/dev/null && + df --local 2>&1 | grep -F "$mount_list_fail" >/dev/null && skip_ "$mount_list_fail" } @@ -400,7 +400,8 @@ nonroot_has_perm_() require_built_ chroot local rm_version=$( - chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" rm --version | + chroot --skip-chdir --user=$NON_ROOT_USERNAME / env PATH="$PATH" \ + rm --version | sed -n '1s/.* //p' ) case ":$rm_version:" in @@ -520,7 +521,7 @@ gcc_shared_() local out=$2 shift 2 || return 1 - $CC -Wall -shared --std=gnu99 -fPIC -ldl -O2 $* "$in" -o "$out" + $CC -Wall -shared --std=gnu99 -fPIC -O2 $* "$in" -o "$out" -ldl } # There are a myriad of ways to build shared libs, diff --git a/lib/ChangeLog-2007 b/lib/ChangeLog-2007 index f9bd37ff..8e6f1765 100644 --- a/lib/ChangeLog-2007 +++ b/lib/ChangeLog-2007 @@ -8746,7 +8746,7 @@ ----- - Copyright (C) 2000-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice diff --git a/lib/acl-errno-valid.c b/lib/acl-errno-valid.c index 3287382e..a64d3d3b 100644 --- a/lib/acl-errno-valid.c +++ b/lib/acl-errno-valid.c @@ -1,6 +1,6 @@ /* Test whether ACLs are well supported on this system. - Copyright 2013-2014 Free Software Foundation, Inc. + Copyright 2013-2015 Free Software Foundation, Inc. This program is free software: 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-internal.c b/lib/acl-internal.c new file mode 100644 index 00000000..1a2f8c44 --- /dev/null +++ b/lib/acl-internal.c @@ -0,0 +1,500 @@ +/* Test whether a file has a nontrivial access control list. + + Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible. */ + +#include + +#include "acl.h" + +#include "acl-internal.h" + +#if USE_ACL && HAVE_ACL_GET_FILE + +# 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. */ +int +acl_extended_nontrivial (acl_t acl) +{ + /* acl is non-trivial if it is non-empty. */ + return (acl_entries (acl) > 0); +} + +# else /* Linux, FreeBSD, IRIX, Tru64 */ + +/* ACL is an ACL, from a file, stored as type ACL_TYPE_ACCESS. + Return 1 if the given ACL is non-trivial. + Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. + Return -1 and set errno upon failure to determine it. */ +int +acl_access_nontrivial (acl_t acl) +{ + /* acl is non-trivial if it has some entries other than for "user::", + "group::", and "other::". Normally these three should be present + at least, allowing us to write + return (3 < acl_entries (acl)); + but the following code is more robust. */ +# if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD */ + + acl_entry_t ace; + int got_one; + + for (got_one = acl_get_entry (acl, ACL_FIRST_ENTRY, &ace); + got_one > 0; + got_one = acl_get_entry (acl, ACL_NEXT_ENTRY, &ace)) + { + acl_tag_t tag; + if (acl_get_tag_type (ace, &tag) < 0) + return -1; + if (!(tag == ACL_USER_OBJ || tag == ACL_GROUP_OBJ || tag == ACL_OTHER)) + return 1; + } + return got_one; + +# elif HAVE_ACL_TO_SHORT_TEXT /* IRIX */ + /* Don't use acl_get_entry: it is undocumented. */ + + int count = acl->acl_cnt; + int i; + + for (i = 0; i < count; i++) + { + acl_entry_t ace = &acl->acl_entry[i]; + acl_tag_t tag = ace->ae_tag; + + if (!(tag == ACL_USER_OBJ || tag == ACL_GROUP_OBJ + || tag == ACL_OTHER_OBJ)) + return 1; + } + return 0; + +# elif HAVE_ACL_FREE_TEXT /* Tru64 */ + /* Don't use acl_get_entry: it takes only one argument and does not work. */ + + int count = acl->acl_num; + acl_entry_t ace; + + for (ace = acl->acl_first; count > 0; ace = ace->next, count--) + { + acl_tag_t tag; + acl_perm_t perm; + + tag = ace->entry->acl_type; + if (!(tag == ACL_USER_OBJ || tag == ACL_GROUP_OBJ || tag == ACL_OTHER)) + return 1; + + perm = ace->entry->acl_perm; + /* On Tru64, perm can also contain non-standard bits such as + PERM_INSERT, PERM_DELETE, PERM_MODIFY, PERM_LOOKUP, ... */ + if ((perm & ~(ACL_READ | ACL_WRITE | ACL_EXECUTE)) != 0) + return 1; + } + return 0; + +# else + + errno = ENOSYS; + return -1; +# endif +} + +# endif + +#elif USE_ACL && HAVE_FACL && defined GETACL /* Solaris, Cygwin, not HP-UX */ + +/* Test an ACL retrieved with GETACL. + Return 1 if the given ACL, consisting of COUNT entries, is non-trivial. + Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */ +int +acl_nontrivial (int count, aclent_t *entries) +{ + int i; + + for (i = 0; i < count; i++) + { + aclent_t *ace = &entries[i]; + + /* Note: If ace->a_type = USER_OBJ, ace->a_id is the st_uid from stat(). + If ace->a_type = GROUP_OBJ, ace->a_id is the st_gid from stat(). + We don't need to check ace->a_id in these cases. */ + if (!(ace->a_type == USER_OBJ + || ace->a_type == GROUP_OBJ + || ace->a_type == OTHER_OBJ + /* Note: Cygwin does not return a CLASS_OBJ ("mask:") entry + sometimes. */ + || ace->a_type == CLASS_OBJ)) + return 1; + } + return 0; +} + +# ifdef ACE_GETACL + +/* A shortcut for a bitmask. */ +# define NEW_ACE_WRITEA_DATA (NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA) + +/* Test an ACL retrieved with ACE_GETACL. + Return 1 if the given ACL, consisting of COUNT entries, is non-trivial. + Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */ +int +acl_ace_nontrivial (int count, ace_t *entries) +{ + int i; + + /* The flags in the ace_t structure changed in a binary incompatible way + when ACL_NO_TRIVIAL etc. were introduced in version 1.15. + How to distinguish the two conventions at runtime? + In the old convention, usually three ACEs have a_flags = ACE_OWNER / + ACE_GROUP / ACE_OTHER, in the range 0x0100..0x0400. In the new + convention, these values are not used. */ + int old_convention = 0; + + for (i = 0; i < count; i++) + if (entries[i].a_flags & (OLD_ACE_OWNER | OLD_ACE_GROUP | OLD_ACE_OTHER)) + { + old_convention = 1; + break; + } + + if (old_convention) + /* Running on Solaris 10. */ + for (i = 0; i < count; i++) + { + ace_t *ace = &entries[i]; + + /* Note: + If ace->a_flags = ACE_OWNER, ace->a_who is the st_uid from stat(). + If ace->a_flags = ACE_GROUP, ace->a_who is the st_gid from stat(). + We don't need to check ace->a_who in these cases. */ + if (!(ace->a_type == OLD_ALLOW + && (ace->a_flags == OLD_ACE_OWNER + || ace->a_flags == OLD_ACE_GROUP + || ace->a_flags == OLD_ACE_OTHER))) + return 1; + } + else + { + /* Running on Solaris 10 (newer version) or Solaris 11. */ + unsigned int access_masks[6] = + { + 0, /* owner@ deny */ + 0, /* owner@ allow */ + 0, /* group@ deny */ + 0, /* group@ allow */ + 0, /* everyone@ deny */ + 0 /* everyone@ allow */ + }; + + for (i = 0; i < count; i++) + { + ace_t *ace = &entries[i]; + unsigned int index1; + unsigned int index2; + + if (ace->a_type == NEW_ACE_ACCESS_ALLOWED_ACE_TYPE) + index1 = 1; + else if (ace->a_type == NEW_ACE_ACCESS_DENIED_ACE_TYPE) + index1 = 0; + else + return 1; + + if (ace->a_flags == NEW_ACE_OWNER) + index2 = 0; + else if (ace->a_flags == (NEW_ACE_GROUP | NEW_ACE_IDENTIFIER_GROUP)) + index2 = 2; + else if (ace->a_flags == NEW_ACE_EVERYONE) + index2 = 4; + else + return 1; + + access_masks[index1 + index2] |= ace->a_access_mask; + } + + /* The same bit shouldn't be both allowed and denied. */ + if (access_masks[0] & access_masks[1]) + return 1; + if (access_masks[2] & access_masks[3]) + return 1; + if (access_masks[4] & access_masks[5]) + return 1; + + /* Check minimum masks. */ + if ((NEW_ACE_WRITE_NAMED_ATTRS + | NEW_ACE_WRITE_ATTRIBUTES + | NEW_ACE_WRITE_ACL + | NEW_ACE_WRITE_OWNER) + & ~ access_masks[1]) + return 1; + access_masks[1] &= ~(NEW_ACE_WRITE_NAMED_ATTRS + | NEW_ACE_WRITE_ATTRIBUTES + | NEW_ACE_WRITE_ACL + | NEW_ACE_WRITE_OWNER); + if ((NEW_ACE_READ_NAMED_ATTRS + | NEW_ACE_READ_ATTRIBUTES + | NEW_ACE_READ_ACL + | NEW_ACE_SYNCHRONIZE) + & ~ access_masks[5]) + return 1; + access_masks[5] &= ~(NEW_ACE_READ_NAMED_ATTRS + | NEW_ACE_READ_ATTRIBUTES + | NEW_ACE_READ_ACL + | NEW_ACE_SYNCHRONIZE); + + /* Check the allowed or denied bits. */ + switch ((access_masks[0] | access_masks[1]) + & ~(NEW_ACE_READ_NAMED_ATTRS + | NEW_ACE_READ_ATTRIBUTES + | NEW_ACE_READ_ACL + | NEW_ACE_SYNCHRONIZE)) + { + case 0: + case NEW_ACE_READ_DATA: + case NEW_ACE_WRITEA_DATA: + case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA: + case NEW_ACE_EXECUTE: + case NEW_ACE_READ_DATA | NEW_ACE_EXECUTE: + case NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE: + case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE: + break; + default: + return 1; + } + switch ((access_masks[2] | access_masks[3]) + & ~(NEW_ACE_READ_NAMED_ATTRS + | NEW_ACE_READ_ATTRIBUTES + | NEW_ACE_READ_ACL + | NEW_ACE_SYNCHRONIZE)) + { + case 0: + case NEW_ACE_READ_DATA: + case NEW_ACE_WRITEA_DATA: + case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA: + case NEW_ACE_EXECUTE: + case NEW_ACE_READ_DATA | NEW_ACE_EXECUTE: + case NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE: + case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE: + break; + default: + return 1; + } + switch ((access_masks[4] | access_masks[5]) + & ~(NEW_ACE_WRITE_NAMED_ATTRS + | NEW_ACE_WRITE_ATTRIBUTES + | NEW_ACE_WRITE_ACL + | NEW_ACE_WRITE_OWNER)) + { + case 0: + case NEW_ACE_READ_DATA: + case NEW_ACE_WRITEA_DATA: + case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA: + case NEW_ACE_EXECUTE: + case NEW_ACE_READ_DATA | NEW_ACE_EXECUTE: + case NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE: + case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE: + break; + default: + return 1; + } + + /* Check that the NEW_ACE_WRITE_DATA and NEW_ACE_APPEND_DATA bits are + either both allowed or both denied. */ + if (((access_masks[0] & NEW_ACE_WRITE_DATA) != 0) + != ((access_masks[0] & NEW_ACE_APPEND_DATA) != 0)) + return 1; + if (((access_masks[2] & NEW_ACE_WRITE_DATA) != 0) + != ((access_masks[2] & NEW_ACE_APPEND_DATA) != 0)) + return 1; + if (((access_masks[4] & NEW_ACE_WRITE_DATA) != 0) + != ((access_masks[4] & NEW_ACE_APPEND_DATA) != 0)) + return 1; + } + + return 0; +} + +# endif + +#elif USE_ACL && HAVE_GETACL /* HP-UX */ + +/* Return 1 if the given ACL is non-trivial. + Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */ +int +acl_nontrivial (int count, struct acl_entry *entries) +{ + int i; + + if (count > 3) + return 1; + + for (i = 0; i < count; i++) + { + struct acl_entry *ace = &entries[i]; + + if (ace->uid != ACL_NSUSER && ace->gid != ACL_NSGROUP) + return 1; + } + return 0; +} + +# if HAVE_ACLV_H /* HP-UX >= 11.11 */ + +/* Return 1 if the given ACL is non-trivial. + Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */ +int +aclv_nontrivial (int count, struct acl *entries) +{ + int i; + + for (i = 0; i < count; i++) + { + struct acl *ace = &entries[i]; + + /* Note: If ace->a_type = USER_OBJ, ace->a_id is the st_uid from stat(). + If ace->a_type = GROUP_OBJ, ace->a_id is the st_gid from stat(). + We don't need to check ace->a_id in these cases. */ + if (!(ace->a_type == USER_OBJ /* no need to check ace->a_id here */ + || ace->a_type == GROUP_OBJ /* no need to check ace->a_id here */ + || ace->a_type == CLASS_OBJ + || ace->a_type == OTHER_OBJ)) + return 1; + } + return 0; +} + +# endif + +#elif USE_ACL && (HAVE_ACLX_GET || HAVE_STATACL) /* AIX */ + +/* Return 1 if the given ACL is non-trivial. + Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */ +int +acl_nontrivial (struct acl *a) +{ + /* The normal way to iterate through an ACL is like this: + struct acl_entry *ace; + for (ace = a->acl_ext; ace != acl_last (a); ace = acl_nxt (ace)) + { + struct ace_id *aei; + switch (ace->ace_type) + { + case ACC_PERMIT: + case ACC_DENY: + case ACC_SPECIFY: + ...; + } + for (aei = ace->ace_id; aei != id_last (ace); aei = id_nxt (aei)) + ... + } + */ + return (acl_last (a) != a->acl_ext ? 1 : 0); +} + +# if HAVE_ACLX_GET && defined ACL_AIX_WIP /* newer AIX */ + +/* Return 1 if the given ACL is non-trivial. + Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */ +int +acl_nfs4_nontrivial (nfs4_acl_int_t *a) +{ +# if 1 /* let's try this first */ + return (a->aclEntryN > 0 ? 1 : 0); +# else + int count = a->aclEntryN; + int i; + + for (i = 0; i < count; i++) + { + nfs4_ace_int_t *ace = &a->aclEntry[i]; + + if (!((ace->flags & ACE4_ID_SPECIAL) != 0 + && (ace->aceWho.special_whoid == ACE4_WHO_OWNER + || ace->aceWho.special_whoid == ACE4_WHO_GROUP + || ace->aceWho.special_whoid == ACE4_WHO_EVERYONE) + && ace->aceType == ACE4_ACCESS_ALLOWED_ACE_TYPE + && ace->aceFlags == 0 + && (ace->aceMask & ~(ACE4_READ_DATA | ACE4_LIST_DIRECTORY + | ACE4_WRITE_DATA | ACE4_ADD_FILE + | ACE4_EXECUTE)) == 0)) + return 1; + } + return 0; +# endif +} + +# endif + +#elif USE_ACL && HAVE_ACLSORT /* NonStop Kernel */ + +/* Test an ACL retrieved with ACL_GET. + Return 1 if the given ACL, consisting of COUNT entries, is non-trivial. + Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */ +int +acl_nontrivial (int count, struct acl *entries) +{ + int i; + + for (i = 0; i < count; i++) + { + struct acl *ace = &entries[i]; + + /* Note: If ace->a_type = USER_OBJ, ace->a_id is the st_uid from stat(). + If ace->a_type = GROUP_OBJ, ace->a_id is the st_gid from stat(). + We don't need to check ace->a_id in these cases. */ + if (!(ace->a_type == USER_OBJ /* no need to check ace->a_id here */ + || ace->a_type == GROUP_OBJ /* no need to check ace->a_id here */ + || ace->a_type == CLASS_OBJ + || ace->a_type == OTHER_OBJ)) + return 1; + } + return 0; +} + +#endif + +void +free_permission_context (struct permission_context *ctx) +{ +#ifdef USE_ACL +# if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */ + if (ctx->acl) + acl_free (ctx->acl); +# if !HAVE_ACL_TYPE_EXTENDED + if (ctx->default_acl) + acl_free (ctx->default_acl); +# endif + +# elif defined GETACL /* Solaris, Cygwin */ + free (ctx->entries); +# ifdef ACE_GETACL + free (ctx->ace_entries); +# endif + +# elif HAVE_GETACL /* HP-UX */ + +# if HAVE_ACLV_H +# endif + +# elif HAVE_STATACL /* older AIX */ + +# elif HAVE_ACLSORT /* NonStop Kernel */ + +# endif +#endif +} diff --git a/lib/acl-internal.h b/lib/acl-internal.h index b2380068..4f042adc 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc. This 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,18 +127,13 @@ rpl_acl_set_fd (int fd, acl_t acl) # define acl_extended_file(name) (-1) # endif -/* Linux-specific */ -# ifndef HAVE_ACL_FROM_MODE -# define HAVE_ACL_FROM_MODE false -# define acl_from_mode(mode) (NULL) +# if ! defined HAVE_ACL_FROM_MODE && ! defined HAVE_ACL_FROM_TEXT +# define acl_from_mode (NULL) # endif -/* 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. */ +/* 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 /* Mac OS X, IRIX */ # define MODE_INSIDE_ACL 0 -# else -# define MODE_INSIDE_ACL 1 # endif /* Return the number of entries in ACL. @@ -164,12 +159,9 @@ extern int acl_access_nontrivial (acl_t); # elif HAVE_FACL && defined GETACL /* Solaris, Cygwin, not HP-UX */ -/* 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. */ +/* Set to 0 if a file's mode is stored independently from the ACL. */ # if defined __CYGWIN__ /* Cygwin */ # define MODE_INSIDE_ACL 0 -# else /* Solaris */ -# define MODE_INSIDE_ACL 1 # endif /* Return 1 if the given ACL is non-trivial. @@ -220,7 +212,7 @@ extern int acl_ace_nontrivial (int count, ace_t *entries) _GL_ATTRIBUTE_PURE; /* Return 1 if the given ACL is non-trivial. Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */ -extern int acl_nontrivial (int count, struct acl_entry *entries, struct stat *sb); +extern int acl_nontrivial (int count, struct acl_entry *entries); # if HAVE_ACLV_H /* HP-UX >= 11.11 */ @@ -248,6 +240,57 @@ extern int acl_nontrivial (int count, struct acl *entries); # endif +/* Set to 1 if a file's mode is implicit by the ACL. */ +# ifndef MODE_INSIDE_ACL +# define MODE_INSIDE_ACL 1 +# endif + +#endif + +struct permission_context { + mode_t mode; +#ifdef USE_ACL +# if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */ + acl_t acl; +# if !HAVE_ACL_TYPE_EXTENDED + acl_t default_acl; +# endif + bool acls_not_supported; + +# elif defined GETACL /* Solaris, Cygwin */ + int count; + aclent_t *entries; +# ifdef ACE_GETACL + int ace_count; + ace_t *ace_entries; +# endif + +# elif HAVE_GETACL /* HP-UX */ + struct acl_entry entries[NACLENTRIES]; + int count; +# if HAVE_ACLV_H + struct acl aclv_entries[NACLVENTRIES]; + int aclv_count; +# endif + +# elif HAVE_STATACL /* older AIX */ + union { struct acl a; char room[4096]; } u; + bool have_u; + +# elif HAVE_ACLSORT /* NonStop Kernel */ + struct acl entries[NACLENTRIES]; + int count; + +# endif +#endif +}; + +int get_permissions (const char *, int, mode_t, struct permission_context *); +int set_permissions (struct permission_context *, const char *, int); +void free_permission_context (struct permission_context *) +#if ! (defined USE_ACL && (HAVE_ACL_GET_FILE || defined GETACL)) + _GL_ATTRIBUTE_CONST #endif + ; _GL_INLINE_HEADER_END diff --git a/lib/acl.h b/lib/acl.h index f67e350d..88ea08d8 100644 --- a/lib/acl.h +++ b/lib/acl.h @@ -1,6 +1,6 @@ /* acl.c - access control lists - Copyright (C) 2002, 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2002, 2008-2015 Free Software Foundation, Inc. This program is free software: 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 39d6b28f..936a1318 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/alignof.h b/lib/alignof.h index 9d161dfb..be53fa50 100644 --- a/lib/alignof.h +++ b/lib/alignof.h @@ -1,5 +1,5 @@ /* Determine alignment of types. - Copyright (C) 2003-2004, 2006, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2004, 2006, 2009-2015 Free Software Foundation, Inc. This program is free software; 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 5de9aaab..906fe923 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-2014 Free Software Foundation, + Copyright (C) 1995, 1999, 2001-2004, 2006-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it diff --git a/lib/allocator.h b/lib/allocator.h index 0904b321..c7c851f9 100644 --- a/lib/allocator.h +++ b/lib/allocator.h @@ -1,6 +1,6 @@ /* Memory allocators such as malloc+free. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: 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 011a31fa..fb1e2158 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001, 2006, 2008-2015 Free Software Foundation, Inc. This program is free software: 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 161d4743..e3a8c503 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 b4b856c5..248cc6bb 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 59abb37c..d9e0fa14 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-2014 Free Software Foundation, + Copyright (C) 2001, 2003-2004, 2007, 2009-2015 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 9e1a9597..b639056a 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 f56ab55f..0e452bd1 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-2014 Free Software + Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2015 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 09645db6..bbbfe64d 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-2014 Free Software + Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2015 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 f0704a47..4c06e7b2 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: 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 f2cf77d3..083b8267 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: 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 b8c2e18b..4cad48f7 100644 --- a/lib/arpa_inet.in.h +++ b/lib/arpa_inet.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2015 Free Software Foundation, Inc. This program is free software; 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 0c62197f..d6776caa 100644 --- a/lib/asnprintf.c +++ b/lib/asnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006, 2009-2015 Free Software Foundation, Inc. This program is free software; 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 9a69ac48..06ae3dd7 100644 --- a/lib/asprintf.c +++ b/lib/asprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2014 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/lib/assure.h b/lib/assure.h new file mode 100644 index 00000000..f44f380b --- /dev/null +++ b/lib/assure.h @@ -0,0 +1,37 @@ +/* Run-time assert-like macros. + + Copyright (C) 2014-2015 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Written by Paul Eggert. */ + +#ifndef _GL_ASSURE_H +#define _GL_ASSURE_H + +#include + +/* Check E's value at runtime, and report an error and abort if not. + However, do nothng if NDEBUG is defined. + + Unlike standard 'assert', this macro always compiles E even when NDEBUG + is defined, so as to catch typos and avoid some GCC warnings. */ + +#ifdef NDEBUG +# define assure(E) ((void) (0 && (E))) +#else +# define assure(E) assert (E) +#endif + +#endif diff --git a/lib/at-func.c b/lib/at-func.c index c8ee073d..bbbe458d 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/at-func2.c b/lib/at-func2.c index b4d6067a..32a64ff2 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 2ad030f8..824c9d08 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-2014 Free Software Foundation, Inc. + Copyright (C) 1990-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 e2034c77..678b996a 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-2014 Free Software + Copyright (C) 1990-1992, 1997-1999, 2003-2004, 2009-2015 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 c7f7ac58..291d58f6 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-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2001, 2004-2006, 2009-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/base64.h b/lib/base64.h index f550cccf..ab57d526 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-2014 Free Software Foundation, Inc. + Copyright (C) 2004-2006, 2009-2015 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/lib/basename-lgpl.c b/lib/basename-lgpl.c index cec50e93..aae1280f 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-2014 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2015 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 67d9420a..faebe761 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-2014 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/bitrotate.h b/lib/bitrotate.h index 9ec0b47b..1665e996 100644 --- a/lib/bitrotate.h +++ b/lib/bitrotate.h @@ -1,5 +1,5 @@ /* bitrotate.h - Rotate bits in integers - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/btowc.c b/lib/btowc.c index b06ca2e4..2e32deec 100644 --- a/lib/btowc.c +++ b/lib/btowc.c @@ -1,5 +1,5 @@ /* Convert unibyte character to wide character. - Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 d27e1564..65abfd9c 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 Free Software Foundation, Inc. This program is free software: 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 48c64783..1fb5fe67 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-2014 Free Software Foundation, Inc. + Copyright 2000-2003, 2006, 2009-2015 Free Software Foundation, Inc. This program is free software; 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 b4652776..47644731 100644 --- a/lib/c-ctype.h +++ b/lib/c-ctype.h @@ -5,7 +5,7 @@ functions' behaviour depends on the current locale set via setlocale. - Copyright (C) 2000-2003, 2006, 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2006, 2008-2015 Free Software Foundation, Inc. This program is free software; 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 8e660441..f25bcca2 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-2014 Free Software + Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2015 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 b9b26a4c..6deb6d12 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-2014 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2015 Free Software Foundation, Inc. This program is free software; 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 5139a30b..ffd05a23 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2015 Free Software Foundation, Inc. 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 972eb800..b98e3683 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-2014 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2015 Free Software Foundation, Inc. This program is free software; 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 c1c771c5..11439895 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-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2004, 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/c-strtod.h b/lib/c-strtod.h index 2460668b..b80254d2 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-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2004, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 6fbca8b9..52601b86 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-2014 Free Software Foundation, Inc. + Copyright (C) 2004-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 862a7010..ade4aa69 100644 --- a/lib/canon-host.c +++ b/lib/canon-host.c @@ -1,6 +1,6 @@ /* Host name canonicalization - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. Written by Derek Price . diff --git a/lib/canon-host.h b/lib/canon-host.h index 5f564817..9fc6e9e5 100644 --- a/lib/canon-host.h +++ b/lib/canon-host.h @@ -1,6 +1,6 @@ /* Host name canonicalization - Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc. Written by Derek Price diff --git a/lib/canonicalize.c b/lib/canonicalize.c index 2b94ebc0..397ac762 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-2014 Free Software Foundation, Inc. + Copyright (C) 1996-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/canonicalize.h b/lib/canonicalize.h index 5fac1191..236cba56 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-2014 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 b36fea28..f2f5da23 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-2014 Free Software Foundation, + Copyright (C) 2001, 2003-2004, 2007, 2009-2015 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 704f8159..4eb9fccc 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: 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 5b1b18fc..ecc025a8 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-2014 Free Software Foundation, Inc. + Copyright (C) 2004-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,7 +20,6 @@ #include "chdir-long.h" -#include #include #include #include @@ -28,6 +27,8 @@ #include #include +#include "assure.h" + #ifndef PATH_MAX # error "compile this file only if your system defines PATH_MAX" #endif @@ -60,7 +61,7 @@ cdb_free (struct cd_buf const *cdb) if (0 <= cdb->fd) { bool close_fail = close (cdb->fd); - assert (! close_fail); + assure (! close_fail); } } @@ -122,8 +123,8 @@ chdir_long (char *dir) /* If DIR is the empty string, then the chdir above must have failed and set errno to ENOENT. */ - assert (0 < len); - assert (PATH_MAX <= len); + assure (0 < len); + assure (PATH_MAX <= len); /* Count leading slashes. */ n_leading_slash = strspn (dir, "/"); @@ -158,8 +159,8 @@ chdir_long (char *dir) dir += n_leading_slash; } - assert (*dir != '/'); - assert (dir <= dir_end); + assure (*dir != '/'); + assure (dir <= dir_end); while (PATH_MAX <= dir_end - dir) { @@ -175,7 +176,7 @@ chdir_long (char *dir) } *slash = '\0'; - assert (slash - dir < PATH_MAX); + assure (slash - dir < PATH_MAX); err = cdb_advance_fd (&cdb, dir); *slash = '/'; if (err != 0) diff --git a/lib/chdir-long.h b/lib/chdir-long.h index 4b5b9404..81dacc39 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-2014 Free Software Foundation, Inc. + Copyright (C) 2004-2005, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/chown.c b/lib/chown.c index 691cebe4..11238ebd 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-2014 Free Software Foundation, Inc. + Copyright (C) 1997, 2004-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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.c b/lib/cloexec.c index 48a0c973..29d1a38a 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-2014 Free Software Foundation, Inc. + Copyright (C) 1991, 2004-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 6c442dca..ef5bacc2 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-2014 Free Software Foundation, Inc. + Copyright (C) 2004, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 87921d42..6e3d8658 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-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2004, 2006-2015 Free Software Foundation, Inc. This program is free software: 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 d7dcb3f1..54d1f71b 100644 --- a/lib/close.c +++ b/lib/close.c @@ -1,5 +1,5 @@ /* close replacement. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: 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 940c6f9f..f80843f9 100644 --- a/lib/closedir.c +++ b/lib/closedir.c @@ -1,5 +1,5 @@ /* Stop reading the entries of a directory. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This program is free software: 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 5b2c9150..54426070 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 1c01156f..a465d2b2 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 674db787..761d7151 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-2014 Free Software Foundation, + Copyright (C) 1998-2002, 2004, 2006, 2008-2015 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 28d80ea5..87cea5b1 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-2014 Free Software + Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2015 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 289bc44e..f06d7e9f 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2004, 2006-2015 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -348,12 +348,10 @@ case "$os" in #echo "sun_eu_greek ?" # what is this? echo "UTF-8 UTF-8" ;; - freebsd* | os2*) + freebsd*) # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore # localcharset.c falls back to using the full locale name # from the environment variables. - # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just - # reuse FreeBSD's locale data for OS/2. echo "C ASCII" echo "US-ASCII ASCII" for l in la_LN lt_LN; do diff --git a/lib/config.hin b/lib/config.hin index ce408318..919ee502 100644 --- a/lib/config.hin +++ b/lib/config.hin @@ -179,6 +179,10 @@ declaration of the second argument to gettimeofday. */ #undef GETTIMEOFDAY_TIMEZONE +/* Define to 1 if getxattr works with XATTR_NAME_POSIX_ACL_ACCESS and + XATTR_NAME_POSIX_ACL_DEFAULT. */ +#undef GETXATTR_WITH_POSIX_ACLS + /* Define to a C preprocessor expression that evaluates to 1 or 0, depending whether the gnulib module areadlinkat shall be considered present. */ #undef GNULIB_AREADLINKAT @@ -274,6 +278,10 @@ /* enable some gnulib portability checks */ #undef GNULIB_PORTCHECK +/* Define to 1 if printf and friends should be labeled with attribute + "__gnu_printf__" instead of "__printf__" */ +#undef GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU + /* Define to a C preprocessor expression that evaluates to 1 or 0, depending whether the gnulib module pthread shall be considered present. */ #undef GNULIB_PTHREAD @@ -1037,6 +1045,10 @@ don't. */ #undef HAVE_DECL_GETDELIM +/* Define to 1 if you have the declaration of `getdtablesize', and to 0 if you + don't. */ +#undef HAVE_DECL_GETDTABLESIZE + /* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. */ #undef HAVE_DECL_GETENV @@ -1301,6 +1313,9 @@ /* Define to 1 if you have the `facl' function. */ #undef HAVE_FACL +/* Define to 1 if you have the `fallocate' function. */ +#undef HAVE_FALLOCATE + /* Define to 1 if you have the `fchdir' function. */ #undef HAVE_FCHDIR @@ -1335,6 +1350,9 @@ /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK +/* whether fpsetprec is present and required */ +#undef HAVE_FPSETPREC + /* Define to 1 if you have the `fpurge' function. */ #undef HAVE_FPURGE @@ -1383,6 +1401,10 @@ /* Define to 1 if you have the `getattrat' function. */ #undef HAVE_GETATTRAT +/* Define to 1 if getcwd works, but with shorter paths than is generally + tested with the replacement. */ +#undef HAVE_GETCWD_SHORTER + /* Define to 1 if you have the `getdelim' function. */ #undef HAVE_GETDELIM @@ -1593,6 +1615,9 @@ /* Define to 1 if you have the `linkat' function. */ #undef HAVE_LINKAT +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_FALLOC_H + /* Define to 1 if you have the `listmntent' function. */ #undef HAVE_LISTMNTENT @@ -1726,7 +1751,7 @@ /* Define to 1 if you have the `nl_langinfo' function. */ #undef HAVE_NL_LANGINFO -/* Define to 1 if libc includes obstacks. */ +/* Define to 1 if the system has obstacks that work with any size object. */ #undef HAVE_OBSTACK /* Define to 1 if you have the `openat' function. */ @@ -2175,6 +2200,9 @@ /* Define to 1 if you have the `sync' function. */ #undef HAVE_SYNC +/* Define to 1 if you have the `syncfs' function. */ +#undef HAVE_SYNCFS + /* Define to 1 if you have the `sysctl' function. */ #undef HAVE_SYSCTL @@ -2521,6 +2549,9 @@ /* Define as the word index where to find the sign of 'long double'. */ #undef LDBL_SIGNBIT_WORD +/* Define to 1 if linkat can create hardlinks to symlinks */ +#undef LINKAT_SYMLINK_NOTSUP + /* Define to 1 if linkat fails to recognize a trailing slash. */ #undef LINKAT_TRAILING_SLASH_BUG @@ -2942,6 +2973,10 @@ #ifndef _GNU_SOURCE # undef _GNU_SOURCE #endif +/* Use GNU style printf and scanf. */ +#ifndef __USE_MINGW_ANSI_STDIO +# undef __USE_MINGW_ANSI_STDIO +#endif /* Enable threading extensions on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS @@ -3083,13 +3118,28 @@ 'reference to static identifier "f" in extern inline function'. This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16. - Suppress the use of extern inline on problematic Apple configurations. - OS X 10.8 and earlier mishandle it; see, e.g., - . + Suppress extern inline (with or without __attribute__ ((__gnu_inline__))) + on configurations that mistakenly use 'static inline' to implement + functions or macros in standard C headers like . For example, + if isdigit is mistakenly implemented via a static inline function, + a program containing an extern inline function that calls isdigit + may not work since the C standard prohibits extern inline functions + from calling static functions. This bug is known to occur on: + + OS X 10.8 and earlier; see: + http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html + + DragonFly; see + http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log + + FreeBSD; see: + http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html + OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and for clang but remains for g++; see . - Perhaps Apple will fix this some day. */ -#if (defined __APPLE__ \ + Assume DragonFly and FreeBSD will be similar. */ +#if (((defined __APPLE__ && defined __MACH__) \ + || defined __DragonFly__ || defined __FreeBSD__) \ && (defined __header_inline \ ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ && ! defined __clang__) \ @@ -3097,19 +3147,19 @@ && (defined __GNUC__ || defined __cplusplus)) \ || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ && defined __GNUC__ && ! defined __cplusplus)))) -# define _GL_EXTERN_INLINE_APPLE_BUG +# define _GL_EXTERN_INLINE_STDHEADER_BUG #endif #if ((__GNUC__ \ ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ : (199901L <= __STDC_VERSION__ \ && !defined __HP_cc \ && !(defined __SUNPRO_C && __STDC__))) \ - && !defined _GL_EXTERN_INLINE_APPLE_BUG) + && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) # define _GL_INLINE inline # define _GL_EXTERN_INLINE extern inline # define _GL_EXTERN_INLINE_IN_USE #elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ - && !defined _GL_EXTERN_INLINE_APPLE_BUG) + && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) # if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) @@ -3123,17 +3173,19 @@ # define _GL_EXTERN_INLINE static _GL_UNUSED #endif -#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) +/* In GCC 4.6 (inclusive) to 5.1 (exclusive), + suppress bogus "no previous prototype for 'FOO'" + and "no previous declaration for 'FOO'" diagnostics, + when FOO is an inline function in the header; see + and + . */ +#if __GNUC__ == 4 && 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 - /* Suppress GCC's bogus "no previous prototype for 'FOO'" - and "no previous declaration for 'FOO'" diagnostics, - when FOO is an inline function in the header; see - . */ # define _GL_INLINE_HEADER_BEGIN \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ diff --git a/lib/copy-acl.c b/lib/copy-acl.c index eebb359b..49679eb9 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/creat-safer.c b/lib/creat-safer.c index 984857b8..5645d31b 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 6d292d85..def19e94 100644 --- a/lib/ctype.in.h +++ b/lib/ctype.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 , for platforms on which it is incomplete. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software; 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 f7b3d078..a198b091 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-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2006, 2009-2015 Free Software Foundation, Inc. This 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,15 +19,15 @@ #include +#include "cycle-check.h" + #include #include #include -#include #include - #include -#include "cycle-check.h" +#include "assure.h" #define CC_MAGIC 9827862 @@ -57,7 +57,7 @@ cycle_check_init (struct cycle_check_state *state) bool cycle_check (struct cycle_check_state *state, struct stat const *sb) { - assert (state->magic == CC_MAGIC); + assure (state->magic == CC_MAGIC); /* If the current directory ever happens to be the same as the one we last recorded for the cycle detection, diff --git a/lib/cycle-check.h b/lib/cycle-check.h index 7649606a..9756658d 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-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2004, 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 fa21d2dd..ee58c777 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-2014 Free Software Foundation, Inc. + Copyright 2009-2015 Free Software Foundation, Inc. This program is free software: 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 f3b6c1dd..dab6c972 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-2014 Free Software Foundation, + Copyright (C) 1990-1993, 2000, 2006, 2009-2015 Free Software Foundation, Inc. François Pinard , 1988. diff --git a/lib/diacrit.h b/lib/diacrit.h index 3002c434..b7f025fd 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-2014 Free Software Foundation, Inc. + Copyright (C) 1990-1993, 2009-2015 Free Software Foundation, Inc. François Pinard , 1988. All this file is a temporary hack, waiting for locales in GNU. diff --git a/lib/dirchownmod.c b/lib/dirchownmod.c index 45cb2d2d..f2cbda04 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This program is free software: 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 d7c51bac..aa3f4929 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This 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,3 +21,4 @@ #undef opendir #define opendir opendir_safer +#define GNULIB_defined_opendir 1 diff --git a/lib/dirent-private.h b/lib/dirent-private.h index 83531a16..aa01f602 100644 --- a/lib/dirent-private.h +++ b/lib/dirent-private.h @@ -1,5 +1,5 @@ /* Private details of the DIR type. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: 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 8cc75d8d..da62b2e3 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: 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 4822d6b2..154d2689 100644 --- a/lib/dirent.in.h +++ b/lib/dirent.in.h @@ -1,5 +1,5 @@ /* A GNU-like . - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This 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 @@ typedef struct gl_directory DIR; # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef opendir # define opendir rpl_opendir +# define GNULIB_defined_opendir 1 # endif _GL_FUNCDECL_RPL (opendir, DIR *, (const char *dir_name) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (opendir, DIR *, (const char *dir_name)); @@ -128,6 +129,7 @@ _GL_WARN_ON_USE (rewinddir, "rewinddir is not portable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef closedir # define closedir rpl_closedir +# define GNULIB_defined_closedir 1 # endif _GL_FUNCDECL_RPL (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (closedir, int, (DIR *dirp)); diff --git a/lib/dirfd.c b/lib/dirfd.c index 4d37928c..c91f8e55 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001, 2006, 2008-2015 Free Software Foundation, Inc. This program is free software: 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 d4a69730..98391356 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-2014 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2015 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 94f1a36a..c22be314 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-2014 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2015 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 a1b70093..55021ec5 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-2014 Free Software Foundation, + Copyright (C) 1998, 2001, 2003-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -31,6 +31,10 @@ # define DOUBLE_SLASH_IS_DISTINCT_ROOT 0 # endif +#ifdef __cplusplus +extern "C" { +#endif + # if GNULIB_DIRNAME char *base_name (char const *file); char *dir_name (char const *file); @@ -43,4 +47,8 @@ char *last_component (char const *file) _GL_ATTRIBUTE_PURE; bool strip_trailing_slashes (char *file); +#ifdef __cplusplus +} /* extern "C" */ +#endif + #endif /* not DIRNAME_H_ */ diff --git a/lib/dosname.h b/lib/dosname.h index b92adfac..893baf6c 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-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2004-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 57a0cee2..c28d219f 100644 --- a/lib/dtotimespec.c +++ b/lib/dtotimespec.c @@ -1,6 +1,6 @@ /* Convert double to timespec. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: 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 2d860fbc..f4610eec 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001, 2004-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 8df3cdab..c6436cd9 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001, 2004-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 c813df62..20f04534 100644 --- a/lib/dup.c +++ b/lib/dup.c @@ -1,6 +1,6 @@ /* Duplicate an open file descriptor. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/dup2.c b/lib/dup2.c index 7de68054..0e13214c 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-2014 Free Software Foundation, Inc. + Copyright (C) 1999, 2004-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/errno.in.h b/lib/errno.in.h index 832afc8f..affbb979 100644 --- a/lib/errno.in.h +++ b/lib/errno.in.h @@ -1,6 +1,6 @@ /* A POSIX-like . - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/error.c b/lib/error.c index 7b99cd73..0ac76951 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-2014 Free Software Foundation, Inc. + Copyright (C) 1990-1998, 2000-2007, 2009-2015 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 @@ -75,7 +75,7 @@ extern void __error (int status, int errnum, const char *message, ...) extern void __error_at_line (int status, int errnum, const char *file_name, unsigned int line_number, const char *message, ...) - __attribute__ ((__format__ (__printf__, 5, 6)));; + __attribute__ ((__format__ (__printf__, 5, 6))); # define error __error # define error_at_line __error_at_line @@ -379,10 +379,10 @@ error_at_line (int status, int errnum, const char *file_name, } #if _LIBC - __fxprintf (NULL, file_name != NULL ? "%s:%d: " : " ", + __fxprintf (NULL, file_name != NULL ? "%s:%u: " : " ", file_name, line_number); #else - fprintf (stderr, file_name != NULL ? "%s:%d: " : " ", + fprintf (stderr, file_name != NULL ? "%s:%u: " : " ", file_name, line_number); #endif diff --git a/lib/error.h b/lib/error.h index 4aaafb36..eb4fb701 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-2014 Free Software Foundation, + Copyright (C) 1995-1997, 2003, 2006, 2008-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -31,6 +31,16 @@ # define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ #endif +/* On mingw, the flavor of printf depends on whether the extensions module + * is in use; the check for determines the witness macro. */ +#ifndef _GL_ATTRIBUTE_SPEC_PRINTF +# if GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU +# define _GL_ATTRIBUTE_SPEC_PRINTF __gnu_printf__ +# else +# define _GL_ATTRIBUTE_SPEC_PRINTF __printf__ +# endif +#endif + #ifdef __cplusplus extern "C" { #endif @@ -40,11 +50,11 @@ extern "C" { If STATUS is nonzero, terminate the program with 'exit (STATUS)'. */ extern void error (int __status, int __errnum, const char *__format, ...) - _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 4)); + _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF, 3, 4)); extern void error_at_line (int __status, int __errnum, const char *__fname, unsigned int __lineno, const char *__format, ...) - _GL_ATTRIBUTE_FORMAT ((__printf__, 5, 6)); + _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF, 5, 6)); /* If NULL, error will flush stdout, then print on stderr the program name, a colon and a space. Otherwise, error will call this diff --git a/lib/euidaccess.c b/lib/euidaccess.c index 363e6fe2..c7e6cfb7 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-2014 Free + Copyright (C) 1990-1991, 1995, 1998, 2000, 2003-2006, 2008-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/exclude.c b/lib/exclude.c index 14b59b70..20dedf7e 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-2014 Free Software + Copyright (C) 1992-1994, 1997, 1999-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -392,7 +392,7 @@ exclude_fnmatch (char const *pattern, char const *f, int options) return matched; } -bool +static bool exclude_patopts (struct patopts const *opts, char const *f) { int options = opts->options; diff --git a/lib/exclude.h b/lib/exclude.h index 95552186..b522d35f 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-2014 Free + Copyright (C) 1992-1994, 1997, 1999, 2001-2003, 2005-2006, 2009-2015 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 609afc5a..8035b895 100644 --- a/lib/exitfail.c +++ b/lib/exitfail.c @@ -1,6 +1,6 @@ /* Failure exit status - Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 66807d51..62d0ac5d 100644 --- a/lib/exitfail.h +++ b/lib/exitfail.h @@ -1,6 +1,6 @@ /* Failure exit status - Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 44a38ae6..5bd7ecfd 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/fadvise.c b/lib/fadvise.c index a4bc96f4..8f65fc46 100644 --- a/lib/fadvise.c +++ b/lib/fadvise.c @@ -1,5 +1,5 @@ /* Declare an access pattern hint for files. - Copyright (C) 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: 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 11ecd8f0..ed4c4529 100644 --- a/lib/fadvise.h +++ b/lib/fadvise.h @@ -1,5 +1,5 @@ /* Declare an access pattern hint for files. - Copyright (C) 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/fchdir.c b/lib/fchdir.c index 5d713773..944d1bdf 100644 --- a/lib/fchdir.c +++ b/lib/fchdir.c @@ -1,5 +1,5 @@ /* fchdir replacement. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,7 +19,6 @@ /* Specification. */ #include -#include #include #include #include @@ -29,6 +28,7 @@ #include #include +#include "assure.h" #include "dosname.h" #include "filenamecat.h" @@ -132,7 +132,7 @@ _gl_register_fd (int fd, const char *filename) { struct stat statbuf; - assert (0 <= fd); + assure (0 <= fd); if (REPLACE_OPEN_DIRECTORY || (fstat (fd, &statbuf) == 0 && S_ISDIR (statbuf.st_mode))) { @@ -156,7 +156,7 @@ _gl_register_fd (int fd, const char *filename) int _gl_register_dup (int oldfd, int newfd) { - assert (0 <= oldfd && 0 <= newfd && oldfd != newfd); + assure (0 <= oldfd && 0 <= newfd && oldfd != newfd); if (oldfd < dirs_allocated && dirs[oldfd].name) { /* Duplicated a directory; must ensure newfd is allocated. */ diff --git a/lib/fchmodat.c b/lib/fchmodat.c index 8b0bbb32..c09d02d0 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 65ced30b..3bf5daa1 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 d238ab18..1df51e6d 100644 --- a/lib/fclose.c +++ b/lib/fclose.c @@ -1,5 +1,5 @@ /* fclose replacement. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: 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 37be26c3..c158db54 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 73b7ad78..9585c56f 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 54f74860..23b73e97 100644 --- a/lib/fcntl.c +++ b/lib/fcntl.c @@ -1,6 +1,6 @@ /* Provide file descriptor control. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This 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,8 +89,25 @@ dupfd (int oldfd, int newfd, int flags) inherit, /* InheritHandle */ DUPLICATE_SAME_ACCESS)) /* Options */ { - /* TODO: Translate GetLastError () into errno. */ - errno = EMFILE; + switch (GetLastError ()) + { + case ERROR_TOO_MANY_OPEN_FILES: + errno = EMFILE; + break; + case ERROR_INVALID_HANDLE: + case ERROR_INVALID_TARGET_HANDLE: + case ERROR_DIRECT_ACCESS_HANDLE: + errno = EBADF; + break; + case ERROR_INVALID_PARAMETER: + case ERROR_INVALID_FUNCTION: + case ERROR_INVALID_ACCESS: + errno = EINVAL; + break; + default: + errno = EACCES; + break; + } result = -1; break; } @@ -98,7 +115,6 @@ dupfd (int oldfd, int newfd, int flags) if (duplicated_fd < 0) { CloseHandle (new_handle); - errno = EMFILE; result = -1; break; } diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h index e23b4b2b..e2880185 100644 --- a/lib/fcntl.in.h +++ b/lib/fcntl.in.h @@ -1,6 +1,6 @@ /* Like , but with non-working flags defined to 0. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This 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 @@ extern "C" { ... } block, which leads to errors in C++ mode with the overridden from gnulib. These errors are known to be gone with g++ version >= 4.3. */ -#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) +#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))) # include #endif #@INCLUDE_NEXT@ @NEXT_FCNTL_H@ @@ -53,7 +53,7 @@ extern "C" { ... } block, which leads to errors in C++ mode with the overridden from gnulib. These errors are known to be gone with g++ version >= 4.3. */ -#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) +#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))) # include #endif /* The include_next requires a split double-inclusion guard. */ diff --git a/lib/fd-hook.c b/lib/fd-hook.c index 0171cc60..b1488c4c 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 1aa264eb..bdb9aefe 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. 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 1fba807b..153db41b 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This program is free software: 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 7245a32d..0085ed09 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This program is free software: 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 17011000..b24861dd 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 148f735d..6c1fb2b6 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 688543f8..bbc30396 100644 --- a/lib/fdatasync.c +++ b/lib/fdatasync.c @@ -1,6 +1,6 @@ /* Emulate fdatasync on platforms that lack it. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 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 eded1a67..b72c0e8f 100644 --- a/lib/fdopen.c +++ b/lib/fdopen.c @@ -1,5 +1,5 @@ /* Open a stream with a given file descriptor. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: 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 b6c94a09..837a8219 100644 --- a/lib/fdopendir.c +++ b/lib/fdopendir.c @@ -1,5 +1,5 @@ /* provide a replacement fdopendir function - Copyright (C) 2004-2014 Free Software Foundation, Inc. + Copyright (C) 2004-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -93,7 +93,7 @@ fdopendir (int fd) That way, barring race conditions, fd_clone_opendir returns a stream whose file descriptor is FD. - If REPLACE_CHDIR or CWD is null, use opendir ("/proc/self/fd/...", + If REPLACE_FCHDIR or CWD is null, use opendir ("/proc/self/fd/...", falling back on fchdir metadata. Otherwise, CWD is a saved version of the working directory; use fchdir/opendir(".")/restore_cwd(CWD). */ static DIR * @@ -156,7 +156,16 @@ fd_clone_opendir (int fd, struct saved_cwd const *cwd) if (! dir && EXPECTED_ERRNO (saved_errno)) { char const *name = _gl_directory_name (fd); - return (name ? opendir (name) : NULL); + DIR *dp = name ? opendir (name) : NULL; + + /* The caller has done an elaborate dance to arrange for opendir to + consume just the right file descriptor. If dirfd returns -1, + though, we're on a system like mingw where opendir does not + consume a file descriptor. Consume it via 'dup' instead. */ + if (dp && dirfd (dp) < 0) + dup (fd); + + return dp; } # endif errno = saved_errno; diff --git a/lib/fdutimensat.c b/lib/fdutimensat.c index fafa0a4d..739507b5 100644 --- a/lib/fdutimensat.c +++ b/lib/fdutimensat.c @@ -1,6 +1,6 @@ /* Set file access and modification times. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program 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 dc9fbcd4..5ae3e417 100644 --- a/lib/fflush.c +++ b/lib/fflush.c @@ -1,5 +1,5 @@ /* fflush.c -- allow flushing input streams - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -50,7 +50,8 @@ clear_ungetc_buffer_preserving_position (FILE *fp) static void clear_ungetc_buffer (FILE *fp) { -# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ +# if defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ if (HASUB (fp)) { fp_->_p += fp_->_r; @@ -73,7 +74,8 @@ clear_ungetc_buffer (FILE *fp) #if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) -# if (defined __sferror || defined __DragonFly__) && defined __SNPT /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ +# if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT +/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ static int disable_seek_optimization (FILE *fp) @@ -95,7 +97,8 @@ 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, Mac OS X, Cygwin */ +# if defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ # if defined __CYGWIN__ /* fp_->_offset is typed as an integer. */ fp_->_offset = pos; @@ -195,7 +198,8 @@ rpl_fflush (FILE *stream) return result; } -# if (defined __sferror || defined __DragonFly__) && defined __SNPT /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ +# if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ { /* 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 5104a41e..8488b7e6 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc. This 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,465 +29,49 @@ #include "acl-internal.h" +#if GETXATTR_WITH_POSIX_ACLS +# include +# include +#endif -#if USE_ACL && HAVE_ACL_GET_FILE - -# 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. */ -int -acl_extended_nontrivial (acl_t acl) -{ - /* acl is non-trivial if it is non-empty. */ - return (acl_entries (acl) > 0); -} - -# else /* Linux, FreeBSD, IRIX, Tru64 */ +/* Return 1 if NAME has a nontrivial access control list, + 0 if ACLs are not supported, or if NAME has no or only a base ACL, + and -1 (setting errno) on error. Note callers can determine + if ACLs are not supported as errno is set in that case also. + SB must be set to the stat buffer of NAME, + obtained through stat() or lstat(). */ -/* ACL is an ACL, from a file, stored as type ACL_TYPE_ACCESS. - Return 1 if the given ACL is non-trivial. - Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. - Return -1 and set errno upon failure to determine it. */ int -acl_access_nontrivial (acl_t acl) +file_has_acl (char const *name, struct stat const *sb) { - /* acl is non-trivial if it has some entries other than for "user::", - "group::", and "other::". Normally these three should be present - at least, allowing us to write - return (3 < acl_entries (acl)); - but the following code is more robust. */ -# if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD */ - - acl_entry_t ace; - int got_one; - - for (got_one = acl_get_entry (acl, ACL_FIRST_ENTRY, &ace); - got_one > 0; - got_one = acl_get_entry (acl, ACL_NEXT_ENTRY, &ace)) +#if USE_ACL + if (! S_ISLNK (sb->st_mode)) { - acl_tag_t tag; - if (acl_get_tag_type (ace, &tag) < 0) - return -1; - if (!(tag == ACL_USER_OBJ || tag == ACL_GROUP_OBJ || tag == ACL_OTHER)) - return 1; - } - return got_one; -# elif HAVE_ACL_TO_SHORT_TEXT /* IRIX */ - /* Don't use acl_get_entry: it is undocumented. */ +# if GETXATTR_WITH_POSIX_ACLS - int count = acl->acl_cnt; - int i; - - for (i = 0; i < count; i++) - { - acl_entry_t ace = &acl->acl_entry[i]; - acl_tag_t tag = ace->ae_tag; + ssize_t ret; - if (!(tag == ACL_USER_OBJ || tag == ACL_GROUP_OBJ - || tag == ACL_OTHER_OBJ)) + ret = getxattr (name, XATTR_NAME_POSIX_ACL_ACCESS, NULL, 0); + if (ret < 0 && errno == ENODATA) + ret = 0; + else if (ret > 0) return 1; - } - return 0; - -# elif HAVE_ACL_FREE_TEXT /* Tru64 */ - /* Don't use acl_get_entry: it takes only one argument and does not work. */ - - int count = acl->acl_num; - acl_entry_t ace; - for (ace = acl->acl_first; count > 0; ace = ace->next, count--) - { - acl_tag_t tag; - acl_perm_t perm; - - tag = ace->entry->acl_type; - if (!(tag == ACL_USER_OBJ || tag == ACL_GROUP_OBJ || tag == ACL_OTHER)) - return 1; - - perm = ace->entry->acl_perm; - /* On Tru64, perm can also contain non-standard bits such as - PERM_INSERT, PERM_DELETE, PERM_MODIFY, PERM_LOOKUP, ... */ - if ((perm & ~(ACL_READ | ACL_WRITE | ACL_EXECUTE)) != 0) - return 1; - } - return 0; - -# else - - errno = ENOSYS; - return -1; -# endif -} - -# endif - - -#elif USE_ACL && HAVE_FACL && defined GETACL /* Solaris, Cygwin, not HP-UX */ - -/* Test an ACL retrieved with GETACL. - Return 1 if the given ACL, consisting of COUNT entries, is non-trivial. - Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */ -int -acl_nontrivial (int count, aclent_t *entries) -{ - int i; - - for (i = 0; i < count; i++) - { - aclent_t *ace = &entries[i]; - - /* Note: If ace->a_type = USER_OBJ, ace->a_id is the st_uid from stat(). - If ace->a_type = GROUP_OBJ, ace->a_id is the st_gid from stat(). - We don't need to check ace->a_id in these cases. */ - if (!(ace->a_type == USER_OBJ - || ace->a_type == GROUP_OBJ - || ace->a_type == OTHER_OBJ - /* Note: Cygwin does not return a CLASS_OBJ ("mask:") entry - sometimes. */ - || ace->a_type == CLASS_OBJ)) - return 1; - } - return 0; -} - -# ifdef ACE_GETACL - -/* A shortcut for a bitmask. */ -# define NEW_ACE_WRITEA_DATA (NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA) - -/* Test an ACL retrieved with ACE_GETACL. - Return 1 if the given ACL, consisting of COUNT entries, is non-trivial. - Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */ -int -acl_ace_nontrivial (int count, ace_t *entries) -{ - int i; - - /* The flags in the ace_t structure changed in a binary incompatible way - when ACL_NO_TRIVIAL etc. were introduced in version 1.15. - How to distinguish the two conventions at runtime? - In the old convention, usually three ACEs have a_flags = ACE_OWNER / - ACE_GROUP / ACE_OTHER, in the range 0x0100..0x0400. In the new - convention, these values are not used. */ - int old_convention = 0; - - for (i = 0; i < count; i++) - if (entries[i].a_flags & (OLD_ACE_OWNER | OLD_ACE_GROUP | OLD_ACE_OTHER)) - { - old_convention = 1; - break; - } - - if (old_convention) - /* Running on Solaris 10. */ - for (i = 0; i < count; i++) - { - ace_t *ace = &entries[i]; - - /* Note: - If ace->a_flags = ACE_OWNER, ace->a_who is the st_uid from stat(). - If ace->a_flags = ACE_GROUP, ace->a_who is the st_gid from stat(). - We don't need to check ace->a_who in these cases. */ - if (!(ace->a_type == OLD_ALLOW - && (ace->a_flags == OLD_ACE_OWNER - || ace->a_flags == OLD_ACE_GROUP - || ace->a_flags == OLD_ACE_OTHER))) - return 1; - } - else - { - /* Running on Solaris 10 (newer version) or Solaris 11. */ - unsigned int access_masks[6] = - { - 0, /* owner@ deny */ - 0, /* owner@ allow */ - 0, /* group@ deny */ - 0, /* group@ allow */ - 0, /* everyone@ deny */ - 0 /* everyone@ allow */ - }; - - for (i = 0; i < count; i++) + if (ret == 0 && S_ISDIR (sb->st_mode)) { - ace_t *ace = &entries[i]; - unsigned int index1; - unsigned int index2; - - if (ace->a_type == NEW_ACE_ACCESS_ALLOWED_ACE_TYPE) - index1 = 1; - else if (ace->a_type == NEW_ACE_ACCESS_DENIED_ACE_TYPE) - index1 = 0; - else + ret = getxattr (name, XATTR_NAME_POSIX_ACL_DEFAULT, NULL, 0); + if (ret < 0 && errno == ENODATA) + ret = 0; + else if (ret > 0) return 1; - - if (ace->a_flags == NEW_ACE_OWNER) - index2 = 0; - else if (ace->a_flags == (NEW_ACE_GROUP | NEW_ACE_IDENTIFIER_GROUP)) - index2 = 2; - else if (ace->a_flags == NEW_ACE_EVERYONE) - index2 = 4; - else - return 1; - - access_masks[index1 + index2] |= ace->a_access_mask; - } - - /* The same bit shouldn't be both allowed and denied. */ - if (access_masks[0] & access_masks[1]) - return 1; - if (access_masks[2] & access_masks[3]) - return 1; - if (access_masks[4] & access_masks[5]) - return 1; - - /* Check minimum masks. */ - if ((NEW_ACE_WRITE_NAMED_ATTRS - | NEW_ACE_WRITE_ATTRIBUTES - | NEW_ACE_WRITE_ACL - | NEW_ACE_WRITE_OWNER) - & ~ access_masks[1]) - return 1; - access_masks[1] &= ~(NEW_ACE_WRITE_NAMED_ATTRS - | NEW_ACE_WRITE_ATTRIBUTES - | NEW_ACE_WRITE_ACL - | NEW_ACE_WRITE_OWNER); - if ((NEW_ACE_READ_NAMED_ATTRS - | NEW_ACE_READ_ATTRIBUTES - | NEW_ACE_READ_ACL - | NEW_ACE_SYNCHRONIZE) - & ~ access_masks[5]) - return 1; - access_masks[5] &= ~(NEW_ACE_READ_NAMED_ATTRS - | NEW_ACE_READ_ATTRIBUTES - | NEW_ACE_READ_ACL - | NEW_ACE_SYNCHRONIZE); - - /* Check the allowed or denied bits. */ - switch ((access_masks[0] | access_masks[1]) - & ~(NEW_ACE_READ_NAMED_ATTRS - | NEW_ACE_READ_ATTRIBUTES - | NEW_ACE_READ_ACL - | NEW_ACE_SYNCHRONIZE)) - { - case 0: - case NEW_ACE_READ_DATA: - case NEW_ACE_WRITEA_DATA: - case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA: - case NEW_ACE_EXECUTE: - case NEW_ACE_READ_DATA | NEW_ACE_EXECUTE: - case NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE: - case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE: - break; - default: - return 1; - } - switch ((access_masks[2] | access_masks[3]) - & ~(NEW_ACE_READ_NAMED_ATTRS - | NEW_ACE_READ_ATTRIBUTES - | NEW_ACE_READ_ACL - | NEW_ACE_SYNCHRONIZE)) - { - case 0: - case NEW_ACE_READ_DATA: - case NEW_ACE_WRITEA_DATA: - case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA: - case NEW_ACE_EXECUTE: - case NEW_ACE_READ_DATA | NEW_ACE_EXECUTE: - case NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE: - case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE: - break; - default: - return 1; - } - switch ((access_masks[4] | access_masks[5]) - & ~(NEW_ACE_WRITE_NAMED_ATTRS - | NEW_ACE_WRITE_ATTRIBUTES - | NEW_ACE_WRITE_ACL - | NEW_ACE_WRITE_OWNER)) - { - case 0: - case NEW_ACE_READ_DATA: - case NEW_ACE_WRITEA_DATA: - case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA: - case NEW_ACE_EXECUTE: - case NEW_ACE_READ_DATA | NEW_ACE_EXECUTE: - case NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE: - case NEW_ACE_READ_DATA | NEW_ACE_WRITEA_DATA | NEW_ACE_EXECUTE: - break; - default: - return 1; } - /* Check that the NEW_ACE_WRITE_DATA and NEW_ACE_APPEND_DATA bits are - either both allowed or both denied. */ - if (((access_masks[0] & NEW_ACE_WRITE_DATA) != 0) - != ((access_masks[0] & NEW_ACE_APPEND_DATA) != 0)) - return 1; - if (((access_masks[2] & NEW_ACE_WRITE_DATA) != 0) - != ((access_masks[2] & NEW_ACE_APPEND_DATA) != 0)) - return 1; - if (((access_masks[4] & NEW_ACE_WRITE_DATA) != 0) - != ((access_masks[4] & NEW_ACE_APPEND_DATA) != 0)) - return 1; - } - - return 0; -} - -# endif - -#elif USE_ACL && HAVE_GETACL /* HP-UX */ - -/* Return 1 if the given ACL is non-trivial. - Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */ -int -acl_nontrivial (int count, struct acl_entry *entries, struct stat *sb) -{ - int i; - - for (i = 0; i < count; i++) - { - struct acl_entry *ace = &entries[i]; - - if (!((ace->uid == sb->st_uid && ace->gid == ACL_NSGROUP) - || (ace->uid == ACL_NSUSER && ace->gid == sb->st_gid) - || (ace->uid == ACL_NSUSER && ace->gid == ACL_NSGROUP))) - return 1; - } - return 0; -} - -# if HAVE_ACLV_H /* HP-UX >= 11.11 */ - -/* Return 1 if the given ACL is non-trivial. - Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */ -int -aclv_nontrivial (int count, struct acl *entries) -{ - int i; - - for (i = 0; i < count; i++) - { - struct acl *ace = &entries[i]; - - /* Note: If ace->a_type = USER_OBJ, ace->a_id is the st_uid from stat(). - If ace->a_type = GROUP_OBJ, ace->a_id is the st_gid from stat(). - We don't need to check ace->a_id in these cases. */ - if (!(ace->a_type == USER_OBJ /* no need to check ace->a_id here */ - || ace->a_type == GROUP_OBJ /* no need to check ace->a_id here */ - || ace->a_type == CLASS_OBJ - || ace->a_type == OTHER_OBJ)) - return 1; - } - return 0; -} - -# endif - -#elif USE_ACL && (HAVE_ACLX_GET || HAVE_STATACL) /* AIX */ - -/* Return 1 if the given ACL is non-trivial. - Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */ -int -acl_nontrivial (struct acl *a) -{ - /* The normal way to iterate through an ACL is like this: - struct acl_entry *ace; - for (ace = a->acl_ext; ace != acl_last (a); ace = acl_nxt (ace)) - { - struct ace_id *aei; - switch (ace->ace_type) - { - case ACC_PERMIT: - case ACC_DENY: - case ACC_SPECIFY: - ...; - } - for (aei = ace->ace_id; aei != id_last (ace); aei = id_nxt (aei)) - ... - } - */ - return (acl_last (a) != a->acl_ext ? 1 : 0); -} - -# if HAVE_ACLX_GET && defined ACL_AIX_WIP /* newer AIX */ - -/* Return 1 if the given ACL is non-trivial. - Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */ -int -acl_nfs4_nontrivial (nfs4_acl_int_t *a) -{ -# if 1 /* let's try this first */ - return (a->aclEntryN > 0 ? 1 : 0); -# else - int count = a->aclEntryN; - int i; - - for (i = 0; i < count; i++) - { - nfs4_ace_int_t *ace = &a->aclEntry[i]; - - if (!((ace->flags & ACE4_ID_SPECIAL) != 0 - && (ace->aceWho.special_whoid == ACE4_WHO_OWNER - || ace->aceWho.special_whoid == ACE4_WHO_GROUP - || ace->aceWho.special_whoid == ACE4_WHO_EVERYONE) - && ace->aceType == ACE4_ACCESS_ALLOWED_ACE_TYPE - && ace->aceFlags == 0 - && (ace->aceMask & ~(ACE4_READ_DATA | ACE4_LIST_DIRECTORY - | ACE4_WRITE_DATA | ACE4_ADD_FILE - | ACE4_EXECUTE)) == 0)) - return 1; - } - return 0; -# endif -} - -# endif - -#elif USE_ACL && HAVE_ACLSORT /* NonStop Kernel */ - -/* Test an ACL retrieved with ACL_GET. - Return 1 if the given ACL, consisting of COUNT entries, is non-trivial. - Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */ -int -acl_nontrivial (int count, struct acl *entries) -{ - int i; - - for (i = 0; i < count; i++) - { - struct acl *ace = &entries[i]; - - /* Note: If ace->a_type = USER_OBJ, ace->a_id is the st_uid from stat(). - If ace->a_type = GROUP_OBJ, ace->a_id is the st_gid from stat(). - We don't need to check ace->a_id in these cases. */ - if (!(ace->a_type == USER_OBJ /* no need to check ace->a_id here */ - || ace->a_type == GROUP_OBJ /* no need to check ace->a_id here */ - || ace->a_type == CLASS_OBJ - || ace->a_type == OTHER_OBJ)) - return 1; - } - return 0; -} - -#endif - - -/* Return 1 if NAME has a nontrivial access control list, 0 if NAME - only has no or a base access control list, and -1 (setting errno) - on error. SB must be set to the stat buffer of NAME, obtained - through stat() or lstat(). */ + if (ret < 0) + return - acl_errno_valid (errno); + return ret; -int -file_has_acl (char const *name, struct stat const *sb) -{ -#if USE_ACL - if (! S_ISLNK (sb->st_mode)) - { -# if HAVE_ACL_GET_FILE +# elif HAVE_ACL_GET_FILE /* POSIX 1003.1e (draft 17 -- abandoned) specific version. */ /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */ @@ -873,7 +457,7 @@ file_has_acl (char const *name, struct stat const *sb) union { struct acl a; char room[4096]; } u; - if (statacl (name, STX_NORMAL, &u.a, sizeof (u)) < 0) + if (statacl ((char *) name, STX_NORMAL, &u.a, sizeof (u)) < 0) return -1; return acl_nontrivial (&u.a); diff --git a/lib/file-set.c b/lib/file-set.c index c3130d98..1cf2f0c3 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 bf3026f3..b58845fe 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-2014 Free Software + Copyright (C) 1993-1994, 2001-2002, 2004-2006, 2009-2015 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 ff99a9d7..7cfc8a18 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-2014 Free Software + Copyright (C) 1993-1994, 2001-2002, 2004-2005, 2009-2015 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 6de113b2..27f49c04 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-2014 Free Software + Copyright (C) 1990, 1997-1999, 2004-2006, 2009-2015 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 3e2f8c03..3b19507f 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-2014 Free + Copyright (C) 1985, 1990, 1993, 1998-2000, 2004, 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/filemode.h b/lib/filemode.h index c51e6a3a..ff0460a5 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-2014 Free Software Foundation, + Copyright (C) 1998-1999, 2003, 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/filename.h b/lib/filename.h index 96dbaaa7..45769931 100644 --- a/lib/filename.h +++ b/lib/filename.h @@ -1,5 +1,5 @@ /* Basic filename support macros. - Copyright (C) 2001-2004, 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2007-2015 Free Software Foundation, Inc. This program is free software: 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 e817f97c..a359a516 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-2014 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 64c27f20..34ad6921 100644 --- a/lib/filenamecat.c +++ b/lib/filenamecat.c @@ -1,6 +1,6 @@ /* Concatenate two arbitrary file names. - Copyright (C) 1996-2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 b33dce84..62f81b00 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-2014 Free Software + Copyright (C) 1996-1997, 2003, 2005, 2007, 2009-2015 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 f09205ac..80e4547c 100644 --- a/lib/filevercmp.c +++ b/lib/filevercmp.c @@ -1,7 +1,7 @@ /* Copyright (C) 1995 Ian Jackson Copyright (C) 2001 Anthony Towns - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/filevercmp.h b/lib/filevercmp.h index 72785cd6..050e7c9b 100644 --- a/lib/filevercmp.h +++ b/lib/filevercmp.h @@ -1,7 +1,7 @@ /* Copyright (C) 1995 Ian Jackson Copyright (C) 2001 Anthony Towns - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This 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,6 +37,6 @@ PREFIX VER2 SUFFIX) < 0. This function is intended to be a replacement for strverscmp. */ -int filevercmp (const char *s1, const char *s2); +int filevercmp (const char *s1, const char *s2) _GL_ATTRIBUTE_PURE; #endif /* FILEVERCMP_H */ diff --git a/lib/float+.h b/lib/float+.h index 5ff15110..e6aaa922 100644 --- a/lib/float+.h +++ b/lib/float+.h @@ -1,5 +1,5 @@ /* Supplemental information about the floating-point formats. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2007. This program is free software; you can redistribute it and/or modify diff --git a/lib/float.c b/lib/float.c index b7c321dd..dac9f88e 100644 --- a/lib/float.c +++ b/lib/float.c @@ -1,5 +1,5 @@ /* Auxiliary definitions for . - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 db809f8f..3bb38264 100644 --- a/lib/float.in.h +++ b/lib/float.in.h @@ -1,6 +1,6 @@ /* A correct . - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: 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 4246d822..f4a9e7c6 100644 --- a/lib/fnmatch.c +++ b/lib/fnmatch.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1993, 1996-2007, 2009-2014 Free Software Foundation, Inc. +/* Copyright (C) 1991-1993, 1996-2007, 2009-2015 Free Software Foundation, Inc. This program is free software; 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 d4cea656..eb5815a0 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-2014 Free +/* Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2015 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 4c6000fa..61778bdd 100644 --- a/lib/fnmatch_loop.c +++ b/lib/fnmatch_loop.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1993, 1996-2006, 2009-2014 Free Software Foundation, Inc. +/* Copyright (C) 1991-1993, 1996-2006, 2009-2015 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 3c9e286a..c3a4f6dd 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001, 2004-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 8fead5a8..139ede28 100644 --- a/lib/fopen.c +++ b/lib/fopen.c @@ -1,5 +1,5 @@ /* Open a stream to a file. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/fpending.c b/lib/fpending.c index 31aba1ad..c4b4a519 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-2014 Free Software Foundation, + Copyright (C) 2000, 2004, 2006-2007, 2009-2015 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 dd607fe2..5a1b2ad9 100644 --- a/lib/fpending.h +++ b/lib/fpending.h @@ -1,6 +1,6 @@ /* Declare __fpending. - Copyright (C) 2000, 2003, 2005-2006, 2009-2014 Free Software Foundation, + Copyright (C) 2000, 2003, 2005-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/fprintftime.h b/lib/fprintftime.h index 9b367cd6..0034fc8d 100644 --- a/lib/fprintftime.h +++ b/lib/fprintftime.h @@ -1,6 +1,6 @@ /* Generate time strings directly to the output. */ -/* Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc. +/* Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 9170c27f..cedd5b42 100644 --- a/lib/fpucw.h +++ b/lib/fpucw.h @@ -1,5 +1,5 @@ /* Manipulating the FPU control word. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2007. This program is free software: you can redistribute it and/or modify diff --git a/lib/fpurge.c b/lib/fpurge.c index 54a27225..f313b221 100644 --- a/lib/fpurge.c +++ b/lib/fpurge.c @@ -1,5 +1,5 @@ /* Flushing buffers of a FILE stream. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -43,7 +43,8 @@ fpurge (FILE *fp) extern int fpurge (FILE *); # endif int result = fpurge (fp); -# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ +# if defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ if (result == 0) /* Correct the invariants that fpurge broke. on BSD systems says: @@ -71,7 +72,8 @@ fpurge (FILE *fp) fp->_IO_save_base = NULL; } return 0; -# elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ +# elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ 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 01b08108..094daabf 100644 --- a/lib/freadahead.c +++ b/lib/freadahead.c @@ -1,5 +1,5 @@ /* Retrieve information about a FILE stream. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This 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,8 @@ 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, Mac OS X, Cygwin */ +#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ if ((fp_->_flags & __SWR) != 0 || fp_->_r < 0) return 0; # if defined __DragonFly__ diff --git a/lib/freadahead.h b/lib/freadahead.h index 85c16b99..b6e7d2ff 100644 --- a/lib/freadahead.h +++ b/lib/freadahead.h @@ -1,5 +1,5 @@ /* Retrieve information about a FILE stream. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/freading.c b/lib/freading.c index dee43256..0512b190 100644 --- a/lib/freading.c +++ b/lib/freading.c @@ -1,5 +1,5 @@ /* Retrieve information about a FILE stream. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This 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,8 @@ 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, Mac OS X, Cygwin */ +# elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ 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 3d1c7b2c..f295e9da 100644 --- a/lib/freading.h +++ b/lib/freading.h @@ -1,5 +1,5 @@ /* Retrieve information about a FILE stream. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/freadptr.c b/lib/freadptr.c index 26c66ede..818c7ee6 100644 --- a/lib/freadptr.c +++ b/lib/freadptr.c @@ -1,5 +1,5 @@ /* Retrieve information about a FILE stream. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This 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,8 @@ 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, Mac OS X, Cygwin */ +#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ if ((fp_->_flags & __SWR) != 0 || fp_->_r < 0) return NULL; size = fp_->_r; diff --git a/lib/freadptr.h b/lib/freadptr.h index 45fb93fd..8651e943 100644 --- a/lib/freadptr.h +++ b/lib/freadptr.h @@ -1,5 +1,5 @@ /* Retrieve information about a FILE stream. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/freadseek.c b/lib/freadseek.c index 5301794b..43a80cbe 100644 --- a/lib/freadseek.c +++ b/lib/freadseek.c @@ -1,5 +1,5 @@ /* Skipping input from a FILE stream. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This 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,8 @@ freadptrinc (FILE *fp, size_t increment) __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, Mac OS X, Cygwin */ +#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ fp_->_p += increment; fp_->_r -= increment; #elif defined __EMX__ /* emx+gcc */ diff --git a/lib/freadseek.h b/lib/freadseek.h index 84ce3508..0518a597 100644 --- a/lib/freadseek.h +++ b/lib/freadseek.h @@ -1,5 +1,5 @@ /* Skipping input from a FILE stream. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: 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 714dc1df..2759b516 100644 --- a/lib/freopen-safer.c +++ b/lib/freopen-safer.c @@ -1,6 +1,6 @@ /* Invoke freopen, but avoid some glitches. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: 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 384eba64..7ceef765 100644 --- a/lib/freopen.c +++ b/lib/freopen.c @@ -1,5 +1,5 @@ /* Open a stream to a file. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This 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 #undef __need_FILE +#include + static FILE * orig_freopen (const char *filename, const char *mode, FILE *stream) { @@ -42,10 +44,24 @@ orig_freopen (const char *filename, const char *mode, FILE *stream) FILE * rpl_freopen (const char *filename, const char *mode, FILE *stream) { + FILE *result; + #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ if (filename != NULL && strcmp (filename, "/dev/null") == 0) filename = "NUL"; #endif - return orig_freopen (filename, mode, stream); + /* Clear errno to check the success of freopen() with it */ + errno = 0; + + result = orig_freopen (filename, mode, stream); + +#ifdef __KLIBC__ + /* On OS/2 kLIBC, freopen() returns NULL even if it is successful + if filename is NULL. */ + if (!filename && !result && !errno) + result = stream; +#endif + + return result; } diff --git a/lib/frexp.c b/lib/frexp.c index 17ddcef8..776bd53c 100644 --- a/lib/frexp.c +++ b/lib/frexp.c @@ -1,5 +1,5 @@ /* Split a double into fraction and mantissa. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: 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 78e1c704..e09cc108 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 f778145c..0d2e3067 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 e56ad0bc..1c65d2a8 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This 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,8 @@ 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, Mac OS X, Cygwin */ +#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ # if defined __SL64 && defined __SCLE /* Cygwin */ if ((fp->_flags & __SL64) == 0) { @@ -115,7 +116,8 @@ 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, Mac OS X, Cygwin */ +#if defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ fp_->_flags &= ~__SOFF; #endif return -1; @@ -124,8 +126,9 @@ 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, Mac OS X, Cygwin */ -# if defined __CYGWIN__ +#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ +# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) /* fp_->_offset is typed as an integer. */ fp_->_offset = pos; # else diff --git a/lib/fseterr.c b/lib/fseterr.c index 1e212e42..a35daa73 100644 --- a/lib/fseterr.c +++ b/lib/fseterr.c @@ -1,5 +1,5 @@ /* Set the error indicator of a stream. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This 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,8 @@ 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, Mac OS X, Cygwin */ +#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ fp_->_flags |= __SERR; #elif defined __EMX__ /* emx+gcc */ fp->_flags |= _IOERR; diff --git a/lib/fseterr.h b/lib/fseterr.h index 81672fb9..a3a4dbcc 100644 --- a/lib/fseterr.h +++ b/lib/fseterr.h @@ -1,5 +1,5 @@ /* Set the error indicator of a stream. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/fstat.c b/lib/fstat.c index ffcda9f5..7a0521fa 100644 --- a/lib/fstat.c +++ b/lib/fstat.c @@ -1,5 +1,5 @@ /* fstat() replacement. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/fstatat.c b/lib/fstatat.c index 44e32668..6a9e8623 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/fsusage.c b/lib/fsusage.c index 5bfc9cd0..905c39fd 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-2014 Free Software + Copyright (C) 1991-1992, 1996, 1998-1999, 2002-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/fsusage.h b/lib/fsusage.h index c1ce2811..b45e706a 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-2014 Free Software + Copyright (C) 1991-1992, 1997, 2003-2006, 2009-2015 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 b09a8e64..b51d654d 100644 --- a/lib/fsync.c +++ b/lib/fsync.c @@ -7,7 +7,7 @@ Written by Richard W.M. Jones - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 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 d5cbccd7..7f11eb3c 100644 --- a/lib/ftell.c +++ b/lib/ftell.c @@ -1,5 +1,5 @@ /* An ftell() function that works around platform bugs. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: 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 ee4f7dc0..d6f221a6 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 7780d008..5cdaedf4 100644 --- a/lib/ftoastr.c +++ b/lib/ftoastr.c @@ -1,6 +1,6 @@ /* floating point to accurate string - Copyright (C) 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: 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 26cad736..970c3b1c 100644 --- a/lib/ftoastr.h +++ b/lib/ftoastr.h @@ -1,6 +1,6 @@ /* floating point to accurate string - Copyright (C) 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: 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 d7a5f203..b3ac8027 100644 --- a/lib/ftruncate.c +++ b/lib/ftruncate.c @@ -1,5 +1,5 @@ /* ftruncate emulations for native Windows. - Copyright (C) 1992-2014 Free Software Foundation, Inc. + Copyright (C) 1992-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/fts-cycle.c b/lib/fts-cycle.c index 95da56e2..7c96bc66 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-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2006, 2009-2015 Free Software Foundation, Inc. Written by Jim Meyering. diff --git a/lib/fts.c b/lib/fts.c index 500e92c6..a2f65eb8 100644 --- a/lib/fts.c +++ b/lib/fts.c @@ -1,6 +1,6 @@ /* Traverse a file hierarchy. - Copyright (C) 2004-2014 Free Software Foundation, Inc. + Copyright (C) 2004-2015 Free Software Foundation, Inc. This 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,6 +62,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #endif #include #include +#include #include #include #include @@ -189,7 +190,7 @@ enum Fts_stat #endif #ifdef NDEBUG -# define fts_assert(expr) ((void) 0) +# define fts_assert(expr) ((void) (0 && (expr))) #else # define fts_assert(expr) \ do \ @@ -1079,9 +1080,6 @@ cd_dot_dot: } } else if (p->fts_flags & FTS_SYMFOLLOW) { if (FCHDIR(sp, p->fts_symfd)) { - int saved_errno = errno; - (void)close(p->fts_symfd); - __set_errno (saved_errno); p->fts_errno = errno; SET(FTS_STOP); } @@ -1091,9 +1089,15 @@ cd_dot_dot: p->fts_errno = errno; SET(FTS_STOP); } - p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP; - if (p->fts_errno == 0) - LEAVE_DIR (sp, p, "3"); + + /* If the directory causes a cycle, preserve the FTS_DC flag and keep + the corresponding dev/ino pair in the hash table. It is going to be + removed when leaving the original directory. */ + if (p->fts_info != FTS_DC) { + p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP; + if (p->fts_errno == 0) + LEAVE_DIR (sp, p, "3"); + } return ISSET(FTS_STOP) ? NULL : p; } @@ -1293,6 +1297,7 @@ fts_build (register FTS *sp, int type) int dir_fd; FTSENT *cur = sp->fts_cur; bool continue_readdir = !!cur->fts_dirp; + size_t max_entries; /* When cur->fts_dirp is non-NULL, that means we should continue calling readdir on that existing DIR* pointer @@ -1354,8 +1359,7 @@ fts_build (register FTS *sp, int type) function. But when no such function is specified, we can read entries in batches that are large enough to help us with inode- sorting, yet not so large that we risk exhausting memory. */ - size_t max_entries = (sp->fts_compar == NULL - ? FTS_MAX_READDIR_ENTRIES : SIZE_MAX); + max_entries = sp->fts_compar ? SIZE_MAX : FTS_MAX_READDIR_ENTRIES; /* * Nlinks is the number of possible entries of type directory in the @@ -1902,7 +1906,13 @@ fts_alloc (FTS *sp, const char *name, register size_t namelen) * The file name is a variable length array. Allocate the FTSENT * structure and the file name in one chunk. */ - len = sizeof(FTSENT) + namelen; + len = offsetof(FTSENT, fts_name) + namelen + 1; + /* Round the allocation up so it has the same alignment as FTSENT, + so that trailing padding may be referenced by direct access + to the flexible array members, without triggering undefined behavior + by accessing bytes beyond the heap allocation. This implicit access + was seen for example with ISDOT() and GCC 5.1.1 at -O2. */ + len = (len + alignof(FTSENT) - 1) & ~(alignof(FTSENT) - 1); if ((p = malloc(len)) == NULL) return (NULL); diff --git a/lib/fts_.h b/lib/fts_.h index 63d4b742..b9a3f12c 100644 --- a/lib/fts_.h +++ b/lib/fts_.h @@ -1,6 +1,6 @@ /* Traverse a file hierarchy. - Copyright (C) 2004-2014 Free Software Foundation, Inc. + Copyright (C) 2004-2015 Free Software Foundation, Inc. This 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,13 @@ # ifdef _LIBC # include +# if __STDC_VERSION__ < 199901L +# define __FLEXIBLE_ARRAY_MEMBER 1 +# else +# define __FLEXIBLE_ARRAY_MEMBER +# endif # else +# define __FLEXIBLE_ARRAY_MEMBER FLEXIBLE_ARRAY_MEMBER # undef __THROW # define __THROW # undef __BEGIN_DECLS @@ -243,7 +249,7 @@ typedef struct _ftsent { unsigned short int fts_instr; /* fts_set() instructions */ struct stat fts_statp[1]; /* stat(2) information */ - char fts_name[1]; /* file name */ + char fts_name[__FLEXIBLE_ARRAY_MEMBER]; /* file name */ } FTSENT; #ifndef __GNUC_PREREQ diff --git a/lib/full-read.c b/lib/full-read.c index 31b600bb..e8bfe7a2 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 5eadd158..8ed6581c 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,7 +13,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, read to the Free Software Foundation, along with this program. If not, see . */ #include diff --git a/lib/full-write.c b/lib/full-write.c index b8036772..027f77ad 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-2014 Free Software Foundation, Inc. + Copyright (C) 1993-1994, 1997-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 589f6e1b..b32b53d9 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 96c0b73e..b729babb 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: 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 9c393880..6ed4bb79 100644 --- a/lib/gai_strerror.c +++ b/lib/gai_strerror.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 2001-2002, 2004-2006, 2008-2014 Free Software +/* Copyright (C) 1997, 2001-2002, 2004-2006, 2008-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Philip Blundell , 1997. diff --git a/lib/get-permissions.c b/lib/get-permissions.c new file mode 100644 index 00000000..6c6618df --- /dev/null +++ b/lib/get-permissions.c @@ -0,0 +1,285 @@ +/* get-permissions.c - get permissions of a file + + Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible. */ + +#include + +#include +#include "acl.h" + +#include "acl-internal.h" + +/* Read the permissions of a file into CTX. If DESC is a valid file descriptor, + use file descriptor operations, else use filename based operations on NAME. + MODE is the file mode obtained from a previous stat call. + Return 0 if successful. Return -1 and set errno upon failure. */ + +int +get_permissions (const char *name, int desc, mode_t mode, + struct permission_context *ctx) +{ + memset (ctx, 0, sizeof *ctx); + ctx->mode = mode; + +#if USE_ACL && HAVE_ACL_GET_FILE + /* POSIX 1003.1e (draft 17 -- abandoned) specific version. */ + /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */ +# if !HAVE_ACL_TYPE_EXTENDED + /* Linux, FreeBSD, IRIX, Tru64 */ + + if (HAVE_ACL_GET_FD && desc != -1) + ctx->acl = acl_get_fd (desc); + else + ctx->acl = acl_get_file (name, ACL_TYPE_ACCESS); + if (ctx->acl == NULL) + return acl_errno_valid (errno) ? -1 : 0; + + /* With POSIX ACLs, a file cannot have "no" acl; a file without + extended permissions has a "minimal" acl which is equivalent to the + file mode. */ + + if (S_ISDIR (mode)) + { + ctx->default_acl = acl_get_file (name, ACL_TYPE_DEFAULT); + if (ctx->default_acl == NULL) + return -1; + } + +# else /* HAVE_ACL_TYPE_EXTENDED */ + /* Mac OS X */ + + /* On Mac OS X, acl_get_file (name, ACL_TYPE_ACCESS) + and acl_get_file (name, ACL_TYPE_DEFAULT) + always return NULL / EINVAL. You have to use + acl_get_file (name, ACL_TYPE_EXTENDED) + or acl_get_fd (open (name, ...)) + to retrieve an ACL. + On the other hand, + acl_set_file (name, ACL_TYPE_ACCESS, acl) + and acl_set_file (name, ACL_TYPE_DEFAULT, acl) + have the same effect as + acl_set_file (name, ACL_TYPE_EXTENDED, acl): + Each of these calls sets the file's ACL. */ + + if (HAVE_ACL_GET_FD && desc != -1) + ctx->acl = acl_get_fd (desc); + else + ctx->acl = acl_get_file (name, ACL_TYPE_EXTENDED); + if (ctx->acl == NULL) + return acl_errno_valid (errno) ? -1 : 0; + +# endif + +#elif USE_ACL && defined GETACL /* Solaris, Cygwin, not HP-UX */ + + /* Solaris 2.5 through Solaris 10, Cygwin, and contemporaneous versions + of Unixware. The acl() call returns the access and default ACL both + at once. */ +# ifdef ACE_GETACL + /* Solaris also has a different variant of ACLs, used in ZFS and NFSv4 + file systems (whereas the other ones are used in UFS file systems). + There is an API + pathconf (name, _PC_ACL_ENABLED) + fpathconf (desc, _PC_ACL_ENABLED) + that allows to determine which of the two kinds of ACLs is supported + for the given file. But some file systems may implement this call + incorrectly, so better not use it. + When fetching the source ACL, we simply fetch both ACL types. + When setting the destination ACL, we try either ACL types, assuming + that the kernel will translate the ACL from one form to the other. + (See in + the description of ENOTSUP.) */ + for (;;) + { + int ret; + + if (desc != -1) + ret = facl (desc, ACE_GETACLCNT, 0, NULL); + else + ret = acl (name, ACE_GETACLCNT, 0, NULL); + if (ret < 0) + { + if (errno == ENOSYS || errno == EINVAL) + ret = 0; + else + return -1; + } + ctx->ace_count = ret; + + if (ctx->ace_count == 0) + break; + + ctx->ace_entries = (ace_t *) malloc (ctx->ace_count * sizeof (ace_t)); + if (ctx->ace_entries == NULL) + { + errno = ENOMEM; + return -1; + } + + if (desc != -1) + ret = facl (desc, ACE_GETACL, ctx->ace_count, ctx->ace_entries); + else + ret = acl (name, ACE_GETACL, ctx->ace_count, ctx->ace_entries); + if (ret < 0) + { + if (errno == ENOSYS || errno == EINVAL) + { + free (ctx->ace_entries); + ctx->ace_entries = NULL; + ctx->ace_count = 0; + break; + } + else + return -1; + } + if (ret <= ctx->ace_count) + { + ctx->ace_count = ret; + break; + } + /* Huh? The number of ACL entries has increased since the last call. + Repeat. */ + free (ctx->ace_entries); + ctx->ace_entries = NULL; + } +# endif + + for (;;) + { + int ret; + + if (desc != -1) + ret = facl (desc, GETACLCNT, 0, NULL); + else + ret = acl (name, GETACLCNT, 0, NULL); + if (ret < 0) + { + if (errno == ENOSYS || errno == ENOTSUP || errno == EOPNOTSUPP) + ret = 0; + else + return -1; + } + ctx->count = ret; + + if (ctx->count == 0) + break; + + ctx->entries = (aclent_t *) malloc (ctx->count * sizeof (aclent_t)); + if (ctx->entries == NULL) + { + errno = ENOMEM; + return -1; + } + + if (desc != -1) + ret = facl (desc, GETACL, ctx->count, ctx->entries); + else + ret = acl (name, GETACL, ctx->count, ctx->entries); + if (ret < 0) + { + if (errno == ENOSYS || errno == ENOTSUP || errno == EOPNOTSUPP) + { + free (ctx->entries); + ctx->entries = NULL; + ctx->count = 0; + break; + } + else + return -1; + } + if (ret <= ctx->count) + { + ctx->count = ret; + break; + } + /* Huh? The number of ACL entries has increased since the last call. + Repeat. */ + free (ctx->entries); + ctx->entries = NULL; + } + +#elif USE_ACL && HAVE_GETACL /* HP-UX */ + + { + int ret; + + if (desc != -1) + ret = fgetacl (desc, NACLENTRIES, ctx->entries); + else + ret = getacl (name, NACLENTRIES, ctx->entries); + if (ret < 0) + { + if (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP) + ret = 0; + else + return -1; + } + else if (ret > NACLENTRIES) + /* If NACLENTRIES cannot be trusted, use dynamic memory allocation. */ + abort (); + ctx->count = ret; + +# if HAVE_ACLV_H + ret = acl ((char *) name, ACL_GET, NACLVENTRIES, ctx->aclv_entries); + if (ret < 0) + { + if (errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL) + ret = 0; + else + return -2; + } + else if (ret > NACLVENTRIES) + /* If NACLVENTRIES cannot be trusted, use dynamic memory allocation. */ + abort (); + ctx->aclv_count = ret; +# endif + } + +#elif USE_ACL && HAVE_ACLX_GET && ACL_AIX_WIP /* AIX */ + + /* TODO (see set_permissions). */ + +#elif USE_ACL && HAVE_STATACL /* older AIX */ + + { + int ret; + if (desc != -1) + ret = fstatacl (desc, STX_NORMAL, &ctx->u.a, sizeof ctx->u); + else + ret = statacl ((char *) name, STX_NORMAL, &ctx->u.a, sizeof ctx->u); + if (ret == 0) + ctx->have_u = true; + } + +#elif USE_ACL && HAVE_ACLSORT /* NonStop Kernel */ + + { + int ret = acl ((char *) name, ACL_GET, NACLENTRIES, ctx->entries); + if (ret < 0) + return -1; + else if (ret > NACLENTRIES) + /* If NACLENTRIES cannot be trusted, use dynamic memory allocation. */ + abort (); + ctx->count = ret; + } + +#endif + + return 0; + +} diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c index eef7a0c4..d80974c6 100644 --- a/lib/getaddrinfo.c +++ b/lib/getaddrinfo.c @@ -1,5 +1,5 @@ /* Get address information (partial implementation). - Copyright (C) 1997, 2001-2002, 2004-2014 Free Software Foundation, Inc. + Copyright (C) 1997, 2001-2002, 2004-2015 Free Software Foundation, Inc. Contributed by Simon Josefsson . This program is free software; you can redistribute it and/or modify diff --git a/lib/getcwd-lgpl.c b/lib/getcwd-lgpl.c index 044c0000..1e17e193 100644 --- a/lib/getcwd-lgpl.c +++ b/lib/getcwd-lgpl.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2014 Free Software Foundation, Inc. +/* Copyright (C) 2011-2015 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 1a013f47..db5279db 100644 --- a/lib/getcwd.c +++ b/lib/getcwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1999, 2004-2014 Free Software Foundation, Inc. +/* Copyright (C) 1991-1999, 2004-2015 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 @@ -93,8 +93,12 @@ FIXME - if the kernel ever adds support for multi-thread safety for avoiding standard fds, then we should use opendir_safer and openat_safer. */ -#undef opendir -#undef closedir +#ifdef GNULIB_defined_opendir +# undef opendir +#endif +#ifdef GNULIB_defined_closedir +# undef closedir +#endif /* Get the name of the current working directory, and put it in SIZE bytes of BUF. Returns NULL if the directory couldn't be determined or diff --git a/lib/getdelim.c b/lib/getdelim.c index e5714baf..88258e55 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-2014 Free Software + Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2015 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 946738cd..03eb7ef1 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -84,24 +84,38 @@ getdtablesize (void) return dtablesize; } -#elif HAVE_GETDTABLESIZE +#else +# include # include -# undef getdtablesize + +# ifndef RLIM_SAVED_CUR +# define RLIM_SAVED_CUR RLIM_INFINITY +# endif +# ifndef RLIM_SAVED_MAX +# define RLIM_SAVED_MAX RLIM_INFINITY +# endif + +# ifdef __CYGWIN__ + /* Cygwin 1.7.25 auto-increases the RLIMIT_NOFILE soft limit until it + hits the compile-time constant hard limit of 3200. We might as + well just report the hard limit. */ +# define rlim_cur rlim_max +# endif int -rpl_getdtablesize(void) +getdtablesize (void) { - /* To date, this replacement is only compiled for Cygwin 1.7.25, - which auto-increased the RLIMIT_NOFILE soft limit until it - hits the compile-time constant hard limit of 3200. Although - that version of cygwin supported a child process inheriting - a smaller soft limit, the smaller limit is not enforced, so - we might as well just report the hard limit. */ struct rlimit lim; - if (!getrlimit (RLIMIT_NOFILE, &lim) && lim.rlim_max != RLIM_INFINITY) - return lim.rlim_max; - return getdtablesize (); + + if (getrlimit (RLIMIT_NOFILE, &lim) == 0 + && 0 <= lim.rlim_cur && lim.rlim_cur <= INT_MAX + && lim.rlim_cur != RLIM_INFINITY + && lim.rlim_cur != RLIM_SAVED_CUR + && lim.rlim_cur != RLIM_SAVED_MAX) + return lim.rlim_cur; + + return INT_MAX; } #endif diff --git a/lib/getfilecon.c b/lib/getfilecon.c index 2aa489e5..ef6adc8d 100644 --- a/lib/getfilecon.c +++ b/lib/getfilecon.c @@ -1,5 +1,5 @@ /* wrap getfilecon, lgetfilecon, and fgetfilecon - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -57,6 +57,7 @@ map_to_failure (int ret, security_context_t *con) if (ret == 10 && strcmp (*con, "unlabeled") == 0) { freecon (*con); + *con = NULL; errno = ENODATA; return -1; } diff --git a/lib/getgroups.c b/lib/getgroups.c index 91a340f3..5563dfb4 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-2014 Free Software Foundation, Inc. + Copyright (C) 1996, 1999, 2003, 2006-2015 Free Software Foundation, Inc. This program is free software: 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 785fd715..665a04db 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-2014 Free Software Foundation, Inc. + Copyright (C) 1992, 2003, 2006, 2008-2015 Free Software Foundation, Inc. This program is free software: 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 788ef56e..efbb132a 100644 --- a/lib/gethrxtime.c +++ b/lib/gethrxtime.c @@ -1,6 +1,6 @@ /* gethrxtime -- get high resolution real time - Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/gethrxtime.h b/lib/gethrxtime.h index 87dcdcf8..51ece313 100644 --- a/lib/gethrxtime.h +++ b/lib/gethrxtime.h @@ -1,6 +1,6 @@ /* gethrxtime -- get high resolution real time - Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/getline.c b/lib/getline.c index 5282e80f..811c773d 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, 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 cdba5259..0cbca265 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-2014 Free Software + Copyright (C) 1985-1989, 1991-1995, 1997, 1999-2000, 2003-2015 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with gnulib. diff --git a/lib/getlogin.c b/lib/getlogin.c index 3737d36c..61f7fcad 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: 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 d19e55c8..d47409bf 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-2014 Free + Copyright (C) 1993, 1996-1998, 2000, 2003-2004, 2006, 2008-2015 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 badf7836..d9e803e6 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-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2004, 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 7d950af1..212cbf73 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-2014 Free Software + Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -487,7 +487,20 @@ _getopt_internal_r (int argc, char **argv, const char *optstring, const struct option *p; struct option_list *next; } *ambig_list = NULL; +#ifdef _LIBC +/* malloc() not used for _LIBC to simplify failure messages. */ +# define free_option_list(l) +#else +# define free_option_list(l) \ + while (l != NULL) \ + { \ + struct option_list *pn = l->next; \ + free (l); \ + l = pn; \ + } +#endif int exact = 0; + int ambig = 0; int indfound = -1; int option_index; @@ -514,22 +527,37 @@ _getopt_internal_r (int argc, char **argv, const char *optstring, pfound = p; indfound = option_index; } + else if (ambig) + ; /* Taking simpler path to handling ambiguities. */ else if (long_only || pfound->has_arg != p->has_arg || pfound->flag != p->flag || pfound->val != p->val) { /* Second or later nonexact match found. */ +#ifdef _LIBC + struct option_list *newp = alloca (sizeof (*newp)); +#else struct option_list *newp = malloc (sizeof (*newp)); - newp->p = p; - newp->next = ambig_list; - ambig_list = newp; + if (newp == NULL) + { + free_option_list (ambig_list); + ambig_list = NULL; + ambig = 1; /* Use simpler fallback message. */ + } + else +#endif + { + newp->p = p; + newp->next = ambig_list; + ambig_list = newp; + } } } - if (ambig_list != NULL && !exact) + if ((ambig || ambig_list) && !exact) { - if (print_errors) + if (print_errors && ambig_list) { struct option_list first; first.p = pfound; @@ -585,18 +613,20 @@ _getopt_internal_r (int argc, char **argv, const char *optstring, fputc ('\n', stderr); #endif } + else if (print_errors && ambig) + { + fprintf (stderr, + _("%s: option '%s' is ambiguous\n"), + argv[0], argv[d->optind]); + } d->__nextchar += strlen (d->__nextchar); d->optind++; d->optopt = 0; + free_option_list (ambig_list); return '?'; } - while (ambig_list != NULL) - { - struct option_list *pn = ambig_list->next; - free (ambig_list); - ambig_list = pn; - } + free_option_list (ambig_list); if (pfound != NULL) { diff --git a/lib/getopt.in.h b/lib/getopt.in.h index 7ab99fb8..9248f76e 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-2014 Free Software + Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/getopt1.c b/lib/getopt1.c index a184865e..2b1feb6e 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-2014 Free Software + Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2015 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 24ed672e..e893a6e1 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-2014 Free Software + Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/getpagesize.c b/lib/getpagesize.c index 86e12710..10e9c187 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 1fee36ba..5b82cfca 100644 --- a/lib/getpass.c +++ b/lib/getpass.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. +/* Copyright (C) 1992-2001, 2003-2007, 2009-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -85,7 +85,9 @@ getpass (const char *prompt) { FILE *tty; FILE *in, *out; +# if HAVE_TCGETATTR struct termios s, t; +# endif bool tty_changed = false; static char *buf; static size_t bufsize; diff --git a/lib/getpass.h b/lib/getpass.h index 1e03cbd7..7c51fc2f 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-2014 Free Software Foundation, Inc. + Copyright (C) 2004, 2009-2015 Free Software Foundation, Inc. Contributed by Simon Josefsson , 2004. This program is free software; you can redistribute it and/or modify diff --git a/lib/gettext.h b/lib/gettext.h index c7d6fd34..599a14ec 100644 --- a/lib/gettext.h +++ b/lib/gettext.h @@ -1,5 +1,5 @@ /* Convenience header for conditional use of GNU . - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2014 Free Software + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/lib/gettime.c b/lib/gettime.c index 1b4ca8d2..1c47e3b2 100644 --- a/lib/gettime.c +++ b/lib/gettime.c @@ -1,6 +1,6 @@ /* gettime -- get the system clock - Copyright (C) 2002, 2004-2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2002, 2004-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 8b2058e8..e0e2e696 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2007, 2009-2015 Free Software Foundation, Inc. This program is free software; 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 d6634baf..7c6d34c9 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-2014 Free Software Foundation, Inc. + Copyright (C) 1990-1991, 1998-2000, 2003-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,10 +27,13 @@ #include #include -#if !HAVE_GRP_H +#if !HAVE_GRP_H || defined __ANDROID__ /* Mingw lacks all things related to group management. The best we - can do is fail with ENOSYS. */ + can do is fail with ENOSYS. + + Bionic declares e.g. getgrent() in but it isn't actually + defined in the library. */ int getugroups (int maxcount _GL_UNUSED, diff --git a/lib/getugroups.h b/lib/getugroups.h index 4a5a5e86..25a6462e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 ba5c5484..abc1f78a 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-2014 Free Software + Copyright (C) 1991, 1997, 2000-2001, 2003-2006, 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/gl_anylinked_list1.h b/lib/gl_anylinked_list1.h new file mode 100644 index 00000000..aa336e30 --- /dev/null +++ b/lib/gl_anylinked_list1.h @@ -0,0 +1,48 @@ +/* Sequential list data type implemented by a linked list. + Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. + Written by Bruno Haible , 2006. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Common code of gl_linked_list.c and gl_linkedhash_list.c. */ + +/* -------------------------- gl_list_t Data Type -------------------------- */ + +/* Concrete list node implementation, valid for this file only. */ +struct gl_list_node_impl +{ +#if WITH_HASHTABLE + struct gl_hash_entry h; /* hash table entry fields; must be first */ +#endif + struct gl_list_node_impl *next; + struct gl_list_node_impl *prev; + const void *value; +}; + +/* Concrete gl_list_impl type, valid for this file only. */ +struct gl_list_impl +{ + struct gl_list_impl_base base; +#if WITH_HASHTABLE + /* A hash table: managed as an array of collision lists. */ + struct gl_hash_entry **table; + size_t table_size; +#endif + /* A circular list anchored at root. + The first node is = root.next, the last node is = root.prev. + The root's value is unused. */ + struct gl_list_node_impl root; + /* Number of list nodes, excluding the root. */ + size_t count; +}; diff --git a/lib/gl_anylinked_list2.h b/lib/gl_anylinked_list2.h new file mode 100644 index 00000000..5ba28064 --- /dev/null +++ b/lib/gl_anylinked_list2.h @@ -0,0 +1,1195 @@ +/* Sequential list data type implemented by a linked list. + Copyright (C) 2006-2015 Free Software Foundation, Inc. + Written by Bruno Haible , 2006. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Common code of gl_linked_list.c and gl_linkedhash_list.c. */ + +/* If the symbol SIGNAL_SAFE_LIST is defined, the code is compiled in such + a way that a gl_list_t data structure may be used from within a signal + handler. The operations allowed in the signal handler are: + gl_list_iterator, gl_list_iterator_next, gl_list_iterator_free. + The list and node fields that are therefore accessed from the signal handler + are: + list->root, node->next, node->value. + We are careful to make modifications to these fields only in an order + that maintains the consistency of the list data structure at any moment, + and we use 'volatile' assignments to prevent the compiler from reordering + such assignments. */ +#ifdef SIGNAL_SAFE_LIST +# define ASYNCSAFE(type) *(volatile type *)& +#else +# define ASYNCSAFE(type) +#endif + +/* -------------------------- gl_list_t Data Type -------------------------- */ + +static gl_list_t +gl_linked_nx_create_empty (gl_list_implementation_t implementation, + gl_listelement_equals_fn equals_fn, + gl_listelement_hashcode_fn hashcode_fn, + gl_listelement_dispose_fn dispose_fn, + bool allow_duplicates) +{ + struct gl_list_impl *list = + (struct gl_list_impl *) malloc (sizeof (struct gl_list_impl)); + + if (list == NULL) + return NULL; + + list->base.vtable = implementation; + list->base.equals_fn = equals_fn; + list->base.hashcode_fn = hashcode_fn; + list->base.dispose_fn = dispose_fn; + list->base.allow_duplicates = allow_duplicates; +#if WITH_HASHTABLE + list->table_size = 11; + list->table = + (gl_hash_entry_t *) calloc (list->table_size, sizeof (gl_hash_entry_t)); + if (list->table == NULL) + goto fail; +#endif + list->root.next = &list->root; + list->root.prev = &list->root; + list->count = 0; + + return list; + +#if WITH_HASHTABLE + fail: + free (list); + return NULL; +#endif +} + +static gl_list_t +gl_linked_nx_create (gl_list_implementation_t implementation, + gl_listelement_equals_fn equals_fn, + gl_listelement_hashcode_fn hashcode_fn, + gl_listelement_dispose_fn dispose_fn, + bool allow_duplicates, + size_t count, const void **contents) +{ + struct gl_list_impl *list = + (struct gl_list_impl *) malloc (sizeof (struct gl_list_impl)); + gl_list_node_t tail; + + if (list == NULL) + return NULL; + + list->base.vtable = implementation; + list->base.equals_fn = equals_fn; + list->base.hashcode_fn = hashcode_fn; + list->base.dispose_fn = dispose_fn; + list->base.allow_duplicates = allow_duplicates; +#if WITH_HASHTABLE + { + size_t estimate = xsum (count, count / 2); /* 1.5 * count */ + if (estimate < 10) + estimate = 10; + list->table_size = next_prime (estimate); + if (size_overflow_p (xtimes (list->table_size, sizeof (gl_hash_entry_t)))) + goto fail1; + list->table = + (gl_hash_entry_t *) calloc (list->table_size, sizeof (gl_hash_entry_t)); + if (list->table == NULL) + goto fail1; + } +#endif + list->count = count; + tail = &list->root; + for (; count > 0; contents++, count--) + { + gl_list_node_t node = + (struct gl_list_node_impl *) malloc (sizeof (struct gl_list_node_impl)); + + if (node == NULL) + goto fail2; + + node->value = *contents; +#if WITH_HASHTABLE + node->h.hashcode = + (list->base.hashcode_fn != NULL + ? list->base.hashcode_fn (node->value) + : (size_t)(uintptr_t) node->value); + + /* Add node to the hash table. */ + if (add_to_bucket (list, node) < 0) + { + free (node); + goto fail2; + } +#endif + + /* Add node to the list. */ + node->prev = tail; + tail->next = node; + tail = node; + } + tail->next = &list->root; + list->root.prev = tail; + + return list; + + fail2: + { + gl_list_node_t node; + + for (node = tail; node != &list->root; ) + { + gl_list_node_t prev = node->prev; + + free (node); + node = prev; + } + } +#if WITH_HASHTABLE + free (list->table); + fail1: +#endif + free (list); + return NULL; +} + +static size_t _GL_ATTRIBUTE_PURE +gl_linked_size (gl_list_t list) +{ + return list->count; +} + +static const void * _GL_ATTRIBUTE_PURE +gl_linked_node_value (gl_list_t list, gl_list_node_t node) +{ + return node->value; +} + +static int +gl_linked_node_nx_set_value (gl_list_t list, gl_list_node_t node, + const void *elt) +{ +#if WITH_HASHTABLE + if (elt != node->value) + { + size_t new_hashcode = + (list->base.hashcode_fn != NULL + ? list->base.hashcode_fn (elt) + : (size_t)(uintptr_t) elt); + + if (new_hashcode != node->h.hashcode) + { + remove_from_bucket (list, node); + node->value = elt; + node->h.hashcode = new_hashcode; + if (add_to_bucket (list, node) < 0) + { + /* Out of memory. We removed node from a bucket but cannot add + it to another bucket. In order to avoid inconsistencies, we + must remove node entirely from the list. */ + gl_list_node_t before_removed = node->prev; + gl_list_node_t after_removed = node->next; + ASYNCSAFE(gl_list_node_t) before_removed->next = after_removed; + after_removed->prev = before_removed; + list->count--; + free (node); + return -1; + } + } + else + node->value = elt; + } +#else + node->value = elt; +#endif + return 0; +} + +static gl_list_node_t _GL_ATTRIBUTE_PURE +gl_linked_next_node (gl_list_t list, gl_list_node_t node) +{ + return (node->next != &list->root ? node->next : NULL); +} + +static gl_list_node_t _GL_ATTRIBUTE_PURE +gl_linked_previous_node (gl_list_t list, gl_list_node_t node) +{ + return (node->prev != &list->root ? node->prev : NULL); +} + +static const void * _GL_ATTRIBUTE_PURE +gl_linked_get_at (gl_list_t list, size_t position) +{ + size_t count = list->count; + gl_list_node_t node; + + if (!(position < count)) + /* Invalid argument. */ + abort (); + /* Here we know count > 0. */ + if (position <= ((count - 1) / 2)) + { + node = list->root.next; + for (; position > 0; position--) + node = node->next; + } + else + { + position = count - 1 - position; + node = list->root.prev; + for (; position > 0; position--) + node = node->prev; + } + return node->value; +} + +static gl_list_node_t +gl_linked_nx_set_at (gl_list_t list, size_t position, const void *elt) +{ + size_t count = list->count; + gl_list_node_t node; + + if (!(position < count)) + /* Invalid argument. */ + abort (); + /* Here we know count > 0. */ + if (position <= ((count - 1) / 2)) + { + node = list->root.next; + for (; position > 0; position--) + node = node->next; + } + else + { + position = count - 1 - position; + node = list->root.prev; + for (; position > 0; position--) + node = node->prev; + } +#if WITH_HASHTABLE + if (elt != node->value) + { + size_t new_hashcode = + (list->base.hashcode_fn != NULL + ? list->base.hashcode_fn (elt) + : (size_t)(uintptr_t) elt); + + if (new_hashcode != node->h.hashcode) + { + remove_from_bucket (list, node); + node->value = elt; + node->h.hashcode = new_hashcode; + if (add_to_bucket (list, node) < 0) + { + /* Out of memory. We removed node from a bucket but cannot add + it to another bucket. In order to avoid inconsistencies, we + must remove node entirely from the list. */ + gl_list_node_t before_removed = node->prev; + gl_list_node_t after_removed = node->next; + ASYNCSAFE(gl_list_node_t) before_removed->next = after_removed; + after_removed->prev = before_removed; + list->count--; + free (node); + return NULL; + } + } + else + node->value = elt; + } +#else + node->value = elt; +#endif + return node; +} + +static gl_list_node_t _GL_ATTRIBUTE_PURE +gl_linked_search_from_to (gl_list_t list, size_t start_index, size_t end_index, + const void *elt) +{ + size_t count = list->count; + + if (!(start_index <= end_index && end_index <= count)) + /* Invalid arguments. */ + abort (); + { +#if WITH_HASHTABLE + size_t hashcode = + (list->base.hashcode_fn != NULL + ? list->base.hashcode_fn (elt) + : (size_t)(uintptr_t) elt); + size_t bucket = hashcode % list->table_size; + gl_listelement_equals_fn equals = list->base.equals_fn; + + if (!list->base.allow_duplicates) + { + /* Look for the first match in the hash bucket. */ + gl_list_node_t found = NULL; + gl_list_node_t node; + + for (node = (gl_list_node_t) list->table[bucket]; + node != NULL; + node = (gl_list_node_t) node->h.hash_next) + if (node->h.hashcode == hashcode + && (equals != NULL + ? equals (elt, node->value) + : elt == node->value)) + { + found = node; + break; + } + if (start_index > 0) + /* Look whether found's index is < start_index. */ + for (node = list->root.next; ; node = node->next) + { + if (node == found) + return NULL; + if (--start_index == 0) + break; + } + if (end_index < count) + /* Look whether found's index is >= end_index. */ + { + end_index = count - end_index; + for (node = list->root.prev; ; node = node->prev) + { + if (node == found) + return NULL; + if (--end_index == 0) + break; + } + } + return found; + } + else + { + /* Look whether there is more than one match in the hash bucket. */ + bool multiple_matches = false; + gl_list_node_t first_match = NULL; + gl_list_node_t node; + + for (node = (gl_list_node_t) list->table[bucket]; + node != NULL; + node = (gl_list_node_t) node->h.hash_next) + if (node->h.hashcode == hashcode + && (equals != NULL + ? equals (elt, node->value) + : elt == node->value)) + { + if (first_match == NULL) + first_match = node; + else + { + multiple_matches = true; + break; + } + } + if (multiple_matches) + { + /* We need the match with the smallest index. But we don't have + a fast mapping node -> index. So we have to walk the list. */ + end_index -= start_index; + node = list->root.next; + for (; start_index > 0; start_index--) + node = node->next; + + for (; + end_index > 0; + node = node->next, end_index--) + if (node->h.hashcode == hashcode + && (equals != NULL + ? equals (elt, node->value) + : elt == node->value)) + return node; + /* The matches must have all been at indices < start_index or + >= end_index. */ + return NULL; + } + else + { + if (start_index > 0) + /* Look whether first_match's index is < start_index. */ + for (node = list->root.next; node != &list->root; node = node->next) + { + if (node == first_match) + return NULL; + if (--start_index == 0) + break; + } + if (end_index < list->count) + /* Look whether first_match's index is >= end_index. */ + { + end_index = list->count - end_index; + for (node = list->root.prev; ; node = node->prev) + { + if (node == first_match) + return NULL; + if (--end_index == 0) + break; + } + } + return first_match; + } + } +#else + gl_listelement_equals_fn equals = list->base.equals_fn; + gl_list_node_t node = list->root.next; + + end_index -= start_index; + for (; start_index > 0; start_index--) + node = node->next; + + if (equals != NULL) + { + for (; end_index > 0; node = node->next, end_index--) + if (equals (elt, node->value)) + return node; + } + else + { + for (; end_index > 0; node = node->next, end_index--) + if (elt == node->value) + return node; + } + return NULL; +#endif + } +} + +static size_t _GL_ATTRIBUTE_PURE +gl_linked_indexof_from_to (gl_list_t list, size_t start_index, size_t end_index, + const void *elt) +{ + size_t count = list->count; + + if (!(start_index <= end_index && end_index <= count)) + /* Invalid arguments. */ + abort (); + { +#if WITH_HASHTABLE + /* Here the hash table doesn't help much. It only allows us to minimize + the number of equals() calls, by looking up first the node and then + its index. */ + size_t hashcode = + (list->base.hashcode_fn != NULL + ? list->base.hashcode_fn (elt) + : (size_t)(uintptr_t) elt); + size_t bucket = hashcode % list->table_size; + gl_listelement_equals_fn equals = list->base.equals_fn; + gl_list_node_t node; + + /* First step: Look up the node. */ + if (!list->base.allow_duplicates) + { + /* Look for the first match in the hash bucket. */ + for (node = (gl_list_node_t) list->table[bucket]; + node != NULL; + node = (gl_list_node_t) node->h.hash_next) + if (node->h.hashcode == hashcode + && (equals != NULL + ? equals (elt, node->value) + : elt == node->value)) + break; + } + else + { + /* Look whether there is more than one match in the hash bucket. */ + bool multiple_matches = false; + gl_list_node_t first_match = NULL; + + for (node = (gl_list_node_t) list->table[bucket]; + node != NULL; + node = (gl_list_node_t) node->h.hash_next) + if (node->h.hashcode == hashcode + && (equals != NULL + ? equals (elt, node->value) + : elt == node->value)) + { + if (first_match == NULL) + first_match = node; + else + { + multiple_matches = true; + break; + } + } + if (multiple_matches) + { + /* We need the match with the smallest index. But we don't have + a fast mapping node -> index. So we have to walk the list. */ + size_t index; + + index = start_index; + node = list->root.next; + for (; start_index > 0; start_index--) + node = node->next; + + for (; + index < end_index; + node = node->next, index++) + if (node->h.hashcode == hashcode + && (equals != NULL + ? equals (elt, node->value) + : elt == node->value)) + return index; + /* The matches must have all been at indices < start_index or + >= end_index. */ + return (size_t)(-1); + } + node = first_match; + } + + /* Second step: Look up the index of the node. */ + if (node == NULL) + return (size_t)(-1); + else + { + size_t index = 0; + + for (; node->prev != &list->root; node = node->prev) + index++; + + if (index >= start_index && index < end_index) + return index; + else + return (size_t)(-1); + } +#else + gl_listelement_equals_fn equals = list->base.equals_fn; + size_t index = start_index; + gl_list_node_t node = list->root.next; + + for (; start_index > 0; start_index--) + node = node->next; + + if (equals != NULL) + { + for (; + index < end_index; + node = node->next, index++) + if (equals (elt, node->value)) + return index; + } + else + { + for (; + index < end_index; + node = node->next, index++) + if (elt == node->value) + return index; + } + return (size_t)(-1); +#endif + } +} + +static gl_list_node_t +gl_linked_nx_add_first (gl_list_t list, const void *elt) +{ + gl_list_node_t node = + (struct gl_list_node_impl *) malloc (sizeof (struct gl_list_node_impl)); + + if (node == NULL) + return NULL; + + ASYNCSAFE(const void *) node->value = elt; +#if WITH_HASHTABLE + node->h.hashcode = + (list->base.hashcode_fn != NULL + ? list->base.hashcode_fn (node->value) + : (size_t)(uintptr_t) node->value); + + /* Add node to the hash table. */ + if (add_to_bucket (list, node) < 0) + { + free (node); + return NULL; + } +#endif + + /* Add node to the list. */ + node->prev = &list->root; + ASYNCSAFE(gl_list_node_t) node->next = list->root.next; + node->next->prev = node; + ASYNCSAFE(gl_list_node_t) list->root.next = node; + list->count++; + +#if WITH_HASHTABLE + hash_resize_after_add (list); +#endif + + return node; +} + +static gl_list_node_t +gl_linked_nx_add_last (gl_list_t list, const void *elt) +{ + gl_list_node_t node = + (struct gl_list_node_impl *) malloc (sizeof (struct gl_list_node_impl)); + + if (node == NULL) + return NULL; + + ASYNCSAFE(const void *) node->value = elt; +#if WITH_HASHTABLE + node->h.hashcode = + (list->base.hashcode_fn != NULL + ? list->base.hashcode_fn (node->value) + : (size_t)(uintptr_t) node->value); + + /* Add node to the hash table. */ + if (add_to_bucket (list, node) < 0) + { + free (node); + return NULL; + } +#endif + + /* Add node to the list. */ + ASYNCSAFE(gl_list_node_t) node->next = &list->root; + node->prev = list->root.prev; + ASYNCSAFE(gl_list_node_t) node->prev->next = node; + list->root.prev = node; + list->count++; + +#if WITH_HASHTABLE + hash_resize_after_add (list); +#endif + + return node; +} + +static gl_list_node_t +gl_linked_nx_add_before (gl_list_t list, gl_list_node_t node, const void *elt) +{ + gl_list_node_t new_node = + (struct gl_list_node_impl *) malloc (sizeof (struct gl_list_node_impl)); + + if (new_node == NULL) + return NULL; + + ASYNCSAFE(const void *) new_node->value = elt; +#if WITH_HASHTABLE + new_node->h.hashcode = + (list->base.hashcode_fn != NULL + ? list->base.hashcode_fn (new_node->value) + : (size_t)(uintptr_t) new_node->value); + + /* Add new_node to the hash table. */ + if (add_to_bucket (list, new_node) < 0) + { + free (new_node); + return NULL; + } +#endif + + /* Add new_node to the list. */ + ASYNCSAFE(gl_list_node_t) new_node->next = node; + new_node->prev = node->prev; + ASYNCSAFE(gl_list_node_t) new_node->prev->next = new_node; + node->prev = new_node; + list->count++; + +#if WITH_HASHTABLE + hash_resize_after_add (list); +#endif + + return new_node; +} + +static gl_list_node_t +gl_linked_nx_add_after (gl_list_t list, gl_list_node_t node, const void *elt) +{ + gl_list_node_t new_node = + (struct gl_list_node_impl *) malloc (sizeof (struct gl_list_node_impl)); + + if (new_node == NULL) + return NULL; + + ASYNCSAFE(const void *) new_node->value = elt; +#if WITH_HASHTABLE + new_node->h.hashcode = + (list->base.hashcode_fn != NULL + ? list->base.hashcode_fn (new_node->value) + : (size_t)(uintptr_t) new_node->value); + + /* Add new_node to the hash table. */ + if (add_to_bucket (list, new_node) < 0) + { + free (new_node); + return NULL; + } +#endif + + /* Add new_node to the list. */ + new_node->prev = node; + ASYNCSAFE(gl_list_node_t) new_node->next = node->next; + new_node->next->prev = new_node; + ASYNCSAFE(gl_list_node_t) node->next = new_node; + list->count++; + +#if WITH_HASHTABLE + hash_resize_after_add (list); +#endif + + return new_node; +} + +static gl_list_node_t +gl_linked_nx_add_at (gl_list_t list, size_t position, const void *elt) +{ + size_t count = list->count; + gl_list_node_t new_node; + + if (!(position <= count)) + /* Invalid argument. */ + abort (); + + new_node = (struct gl_list_node_impl *) malloc (sizeof (struct gl_list_node_impl)); + if (new_node == NULL) + return NULL; + + ASYNCSAFE(const void *) new_node->value = elt; +#if WITH_HASHTABLE + new_node->h.hashcode = + (list->base.hashcode_fn != NULL + ? list->base.hashcode_fn (new_node->value) + : (size_t)(uintptr_t) new_node->value); + + /* Add new_node to the hash table. */ + if (add_to_bucket (list, new_node) < 0) + { + free (new_node); + return NULL; + } +#endif + + /* Add new_node to the list. */ + if (position <= (count / 2)) + { + gl_list_node_t node; + + node = &list->root; + for (; position > 0; position--) + node = node->next; + new_node->prev = node; + ASYNCSAFE(gl_list_node_t) new_node->next = node->next; + new_node->next->prev = new_node; + ASYNCSAFE(gl_list_node_t) node->next = new_node; + } + else + { + gl_list_node_t node; + + position = count - position; + node = &list->root; + for (; position > 0; position--) + node = node->prev; + ASYNCSAFE(gl_list_node_t) new_node->next = node; + new_node->prev = node->prev; + ASYNCSAFE(gl_list_node_t) new_node->prev->next = new_node; + node->prev = new_node; + } + list->count++; + +#if WITH_HASHTABLE + hash_resize_after_add (list); +#endif + + return new_node; +} + +static bool +gl_linked_remove_node (gl_list_t list, gl_list_node_t node) +{ + gl_list_node_t prev; + gl_list_node_t next; + +#if WITH_HASHTABLE + /* Remove node from the hash table. */ + remove_from_bucket (list, node); +#endif + + /* Remove node from the list. */ + prev = node->prev; + next = node->next; + + ASYNCSAFE(gl_list_node_t) prev->next = next; + next->prev = prev; + list->count--; + + if (list->base.dispose_fn != NULL) + list->base.dispose_fn (node->value); + free (node); + return true; +} + +static bool +gl_linked_remove_at (gl_list_t list, size_t position) +{ + size_t count = list->count; + gl_list_node_t removed_node; + + if (!(position < count)) + /* Invalid argument. */ + abort (); + /* Here we know count > 0. */ + if (position <= ((count - 1) / 2)) + { + gl_list_node_t node; + gl_list_node_t after_removed; + + node = &list->root; + for (; position > 0; position--) + node = node->next; + removed_node = node->next; + after_removed = node->next->next; + ASYNCSAFE(gl_list_node_t) node->next = after_removed; + after_removed->prev = node; + } + else + { + gl_list_node_t node; + gl_list_node_t before_removed; + + position = count - 1 - position; + node = &list->root; + for (; position > 0; position--) + node = node->prev; + removed_node = node->prev; + before_removed = node->prev->prev; + node->prev = before_removed; + ASYNCSAFE(gl_list_node_t) before_removed->next = node; + } +#if WITH_HASHTABLE + remove_from_bucket (list, removed_node); +#endif + list->count--; + + if (list->base.dispose_fn != NULL) + list->base.dispose_fn (removed_node->value); + free (removed_node); + return true; +} + +static bool +gl_linked_remove (gl_list_t list, const void *elt) +{ + gl_list_node_t node = gl_linked_search_from_to (list, 0, list->count, elt); + + if (node != NULL) + return gl_linked_remove_node (list, node); + else + return false; +} + +static void +gl_linked_list_free (gl_list_t list) +{ + gl_listelement_dispose_fn dispose = list->base.dispose_fn; + gl_list_node_t node; + + for (node = list->root.next; node != &list->root; ) + { + gl_list_node_t next = node->next; + if (dispose != NULL) + dispose (node->value); + free (node); + node = next; + } +#if WITH_HASHTABLE + free (list->table); +#endif + free (list); +} + +/* --------------------- gl_list_iterator_t Data Type --------------------- */ + +static gl_list_iterator_t +gl_linked_iterator (gl_list_t list) +{ + gl_list_iterator_t result; + + result.vtable = list->base.vtable; + result.list = list; + result.p = list->root.next; + result.q = &list->root; +#ifdef lint + result.i = 0; + result.j = 0; + result.count = 0; +#endif + + return result; +} + +static gl_list_iterator_t +gl_linked_iterator_from_to (gl_list_t list, + size_t start_index, size_t end_index) +{ + gl_list_iterator_t result; + size_t n1, n2, n3; + + if (!(start_index <= end_index && end_index <= list->count)) + /* Invalid arguments. */ + abort (); + result.vtable = list->base.vtable; + result.list = list; + n1 = start_index; + n2 = end_index - start_index; + n3 = list->count - end_index; + /* Find the maximum among n1, n2, n3, so as to reduce the number of + loop iterations to n1 + n2 + n3 - max(n1,n2,n3). */ + if (n1 > n2 && n1 > n3) + { + /* n1 is the maximum, use n2 and n3. */ + gl_list_node_t node; + size_t i; + + node = &list->root; + for (i = n3; i > 0; i--) + node = node->prev; + result.q = node; + for (i = n2; i > 0; i--) + node = node->prev; + result.p = node; + } + else if (n2 > n3) + { + /* n2 is the maximum, use n1 and n3. */ + gl_list_node_t node; + size_t i; + + node = list->root.next; + for (i = n1; i > 0; i--) + node = node->next; + result.p = node; + + node = &list->root; + for (i = n3; i > 0; i--) + node = node->prev; + result.q = node; + } + else + { + /* n3 is the maximum, use n1 and n2. */ + gl_list_node_t node; + size_t i; + + node = list->root.next; + for (i = n1; i > 0; i--) + node = node->next; + result.p = node; + for (i = n2; i > 0; i--) + node = node->next; + result.q = node; + } + +#ifdef lint + result.i = 0; + result.j = 0; + result.count = 0; +#endif + + return result; +} + +static bool +gl_linked_iterator_next (gl_list_iterator_t *iterator, + const void **eltp, gl_list_node_t *nodep) +{ + if (iterator->p != iterator->q) + { + gl_list_node_t node = (gl_list_node_t) iterator->p; + *eltp = node->value; + if (nodep != NULL) + *nodep = node; + iterator->p = node->next; + return true; + } + else + return false; +} + +static void +gl_linked_iterator_free (gl_list_iterator_t *iterator) +{ +} + +/* ---------------------- Sorted gl_list_t Data Type ---------------------- */ + +static gl_list_node_t _GL_ATTRIBUTE_PURE +gl_linked_sortedlist_search (gl_list_t list, gl_listelement_compar_fn compar, + const void *elt) +{ + gl_list_node_t node; + + for (node = list->root.next; node != &list->root; node = node->next) + { + int cmp = compar (node->value, elt); + + if (cmp > 0) + break; + if (cmp == 0) + return node; + } + return NULL; +} + +static gl_list_node_t _GL_ATTRIBUTE_PURE +gl_linked_sortedlist_search_from_to (gl_list_t list, + gl_listelement_compar_fn compar, + size_t low, size_t high, + const void *elt) +{ + size_t count = list->count; + + if (!(low <= high && high <= list->count)) + /* Invalid arguments. */ + abort (); + + high -= low; + if (high > 0) + { + /* Here we know low < count. */ + size_t position = low; + gl_list_node_t node; + + if (position <= ((count - 1) / 2)) + { + node = list->root.next; + for (; position > 0; position--) + node = node->next; + } + else + { + position = count - 1 - position; + node = list->root.prev; + for (; position > 0; position--) + node = node->prev; + } + + do + { + int cmp = compar (node->value, elt); + + if (cmp > 0) + break; + if (cmp == 0) + return node; + node = node->next; + } + while (--high > 0); + } + return NULL; +} + +static size_t _GL_ATTRIBUTE_PURE +gl_linked_sortedlist_indexof (gl_list_t list, gl_listelement_compar_fn compar, + const void *elt) +{ + gl_list_node_t node; + size_t index; + + for (node = list->root.next, index = 0; + node != &list->root; + node = node->next, index++) + { + int cmp = compar (node->value, elt); + + if (cmp > 0) + break; + if (cmp == 0) + return index; + } + return (size_t)(-1); +} + +static size_t _GL_ATTRIBUTE_PURE +gl_linked_sortedlist_indexof_from_to (gl_list_t list, + gl_listelement_compar_fn compar, + size_t low, size_t high, + const void *elt) +{ + size_t count = list->count; + + if (!(low <= high && high <= list->count)) + /* Invalid arguments. */ + abort (); + + high -= low; + if (high > 0) + { + /* Here we know low < count. */ + size_t index = low; + size_t position = low; + gl_list_node_t node; + + if (position <= ((count - 1) / 2)) + { + node = list->root.next; + for (; position > 0; position--) + node = node->next; + } + else + { + position = count - 1 - position; + node = list->root.prev; + for (; position > 0; position--) + node = node->prev; + } + + do + { + int cmp = compar (node->value, elt); + + if (cmp > 0) + break; + if (cmp == 0) + return index; + node = node->next; + index++; + } + while (--high > 0); + } + return (size_t)(-1); +} + +static gl_list_node_t +gl_linked_sortedlist_nx_add (gl_list_t list, gl_listelement_compar_fn compar, + const void *elt) +{ + gl_list_node_t node; + + for (node = list->root.next; node != &list->root; node = node->next) + if (compar (node->value, elt) >= 0) + return gl_linked_nx_add_before (list, node, elt); + return gl_linked_nx_add_last (list, elt); +} + +static bool +gl_linked_sortedlist_remove (gl_list_t list, gl_listelement_compar_fn compar, + const void *elt) +{ + gl_list_node_t node; + + for (node = list->root.next; node != &list->root; node = node->next) + { + int cmp = compar (node->value, elt); + + if (cmp > 0) + break; + if (cmp == 0) + return gl_linked_remove_node (list, node); + } + return false; +} diff --git a/lib/gl_linked_list.c b/lib/gl_linked_list.c new file mode 100644 index 00000000..b83e1644 --- /dev/null +++ b/lib/gl_linked_list.c @@ -0,0 +1,64 @@ +/* Sequential list data type implemented by a linked list. + Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc. + Written by Bruno Haible , 2006. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +/* Specification. */ +#include "gl_linked_list.h" + +#include + +/* -------------------------- gl_list_t Data Type -------------------------- */ + +/* Generic linked list code. */ +#include "gl_anylinked_list1.h" +#include "gl_anylinked_list2.h" + + +const struct gl_list_implementation gl_linked_list_implementation = + { + gl_linked_nx_create_empty, + gl_linked_nx_create, + gl_linked_size, + gl_linked_node_value, + gl_linked_node_nx_set_value, + gl_linked_next_node, + gl_linked_previous_node, + gl_linked_get_at, + gl_linked_nx_set_at, + gl_linked_search_from_to, + gl_linked_indexof_from_to, + gl_linked_nx_add_first, + gl_linked_nx_add_last, + gl_linked_nx_add_before, + gl_linked_nx_add_after, + gl_linked_nx_add_at, + gl_linked_remove_node, + gl_linked_remove_at, + gl_linked_remove, + gl_linked_list_free, + gl_linked_iterator, + gl_linked_iterator_from_to, + gl_linked_iterator_next, + gl_linked_iterator_free, + gl_linked_sortedlist_search, + gl_linked_sortedlist_search_from_to, + gl_linked_sortedlist_indexof, + gl_linked_sortedlist_indexof_from_to, + gl_linked_sortedlist_nx_add, + gl_linked_sortedlist_remove + }; diff --git a/lib/gl_linked_list.h b/lib/gl_linked_list.h new file mode 100644 index 00000000..a7b7eec8 --- /dev/null +++ b/lib/gl_linked_list.h @@ -0,0 +1,34 @@ +/* Sequential list data type implemented by a linked list. + Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. + Written by Bruno Haible , 2006. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef _GL_LINKED_LIST_H +#define _GL_LINKED_LIST_H + +#include "gl_list.h" + +#ifdef __cplusplus +extern "C" { +#endif + +extern const struct gl_list_implementation gl_linked_list_implementation; +#define GL_LINKED_LIST &gl_linked_list_implementation + +#ifdef __cplusplus +} +#endif + +#endif /* _GL_LINKED_LIST_H */ diff --git a/lib/gl_list.c b/lib/gl_list.c new file mode 100644 index 00000000..87932980 --- /dev/null +++ b/lib/gl_list.c @@ -0,0 +1,3 @@ +#include +#define GL_LIST_INLINE _GL_EXTERN_INLINE +#include "gl_list.h" diff --git a/lib/gl_list.h b/lib/gl_list.h new file mode 100644 index 00000000..916f57f7 --- /dev/null +++ b/lib/gl_list.h @@ -0,0 +1,841 @@ +/* Abstract sequential list data type. + Copyright (C) 2006-2015 Free Software Foundation, Inc. + Written by Bruno Haible , 2006. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef _GL_LIST_H +#define _GL_LIST_H + +#include +#include + +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif +_GL_INLINE_HEADER_BEGIN +#ifndef GL_LIST_INLINE +# define GL_LIST_INLINE _GL_INLINE +#endif + +#ifdef __cplusplus +extern "C" { +#endif + + +/* gl_list is an abstract list data type. It can contain any number of + objects ('void *' or 'const void *' pointers) in any given order. + Duplicates are allowed, but can optionally be forbidden. + + There are several implementations of this list datatype, optimized for + different operations or for memory. You can start using the simplest list + implementation, GL_ARRAY_LIST, and switch to a different implementation + later, when you realize which operations are performed the most frequently. + The API of the different implementations is exactly the same; when + switching to a different implementation, you only have to change the + gl_list_create call. + + The implementations are: + GL_ARRAY_LIST a growable array + GL_CARRAY_LIST a growable circular array + GL_LINKED_LIST a linked list + GL_AVLTREE_LIST a binary tree (AVL tree) + GL_RBTREE_LIST a binary tree (red-black tree) + GL_LINKEDHASH_LIST a hash table with a linked list + GL_AVLTREEHASH_LIST a hash table with a binary tree (AVL tree) + GL_RBTREEHASH_LIST a hash table with a binary tree (red-black tree) + + The memory consumption is asymptotically the same: O(1) for every object + in the list. When looking more closely at the average memory consumed + for an object, GL_ARRAY_LIST is the most compact representation, and + GL_LINKEDHASH_LIST and GL_TREEHASH_LIST need more memory. + + The guaranteed average performance of the operations is, for a list of + n elements: + + Operation ARRAY LINKED TREE LINKEDHASH TREEHASH + CARRAY with|without with|without + duplicates duplicates + + gl_list_size O(1) O(1) O(1) O(1) O(1) + gl_list_node_value O(1) O(1) O(1) O(1) O(1) + gl_list_node_set_value O(1) O(1) O(1) O(1) O((log n)²)/O(1) + gl_list_next_node O(1) O(1) O(log n) O(1) O(log n) + gl_list_previous_node O(1) O(1) O(log n) O(1) O(log n) + gl_list_get_at O(1) O(n) O(log n) O(n) O(log n) + gl_list_set_at O(1) O(n) O(log n) O(n) O((log n)²)/O(log n) + gl_list_search O(n) O(n) O(n) O(n)/O(1) O(log n)/O(1) + gl_list_search_from O(n) O(n) O(n) O(n)/O(1) O((log n)²)/O(log n) + gl_list_search_from_to O(n) O(n) O(n) O(n)/O(1) O((log n)²)/O(log n) + gl_list_indexof O(n) O(n) O(n) O(n) O(log n) + gl_list_indexof_from O(n) O(n) O(n) O(n) O((log n)²)/O(log n) + gl_list_indexof_from_to O(n) O(n) O(n) O(n) O((log n)²)/O(log n) + gl_list_add_first O(n)/O(1) O(1) O(log n) O(1) O((log n)²)/O(log n) + gl_list_add_last O(1) O(1) O(log n) O(1) O((log n)²)/O(log n) + gl_list_add_before O(n) O(1) O(log n) O(1) O((log n)²)/O(log n) + gl_list_add_after O(n) O(1) O(log n) O(1) O((log n)²)/O(log n) + gl_list_add_at O(n) O(n) O(log n) O(n) O((log n)²)/O(log n) + gl_list_remove_node O(n) O(1) O(log n) O(n)/O(1) O((log n)²)/O(log n) + gl_list_remove_at O(n) O(n) O(log n) O(n) O((log n)²)/O(log n) + gl_list_remove O(n) O(n) O(n) O(n)/O(1) O((log n)²)/O(log n) + gl_list_iterator O(1) O(1) O(log n) O(1) O(log n) + gl_list_iterator_from_to O(1) O(n) O(log n) O(n) O(log n) + gl_list_iterator_next O(1) O(1) O(log n) O(1) O(log n) + gl_sortedlist_search O(log n) O(n) O(log n) O(n) O(log n) + gl_sortedlist_search_from O(log n) O(n) O(log n) O(n) O(log n) + gl_sortedlist_indexof O(log n) O(n) O(log n) O(n) O(log n) + gl_sortedlist_indexof_fro O(log n) O(n) O(log n) O(n) O(log n) + gl_sortedlist_add O(n) O(n) O(log n) O(n) O((log n)²)/O(log n) + gl_sortedlist_remove O(n) O(n) O(log n) O(n) O((log n)²)/O(log n) + */ + +/* -------------------------- gl_list_t Data Type -------------------------- */ + +/* Type of function used to compare two elements. + NULL denotes pointer comparison. */ +typedef bool (*gl_listelement_equals_fn) (const void *elt1, const void *elt2); + +/* Type of function used to compute a hash code. + NULL denotes a function that depends only on the pointer itself. */ +typedef size_t (*gl_listelement_hashcode_fn) (const void *elt); + +/* Type of function used to dispose an element once it's removed from a list. + NULL denotes a no-op. */ +typedef void (*gl_listelement_dispose_fn) (const void *elt); + +struct gl_list_impl; +/* Type representing an entire list. */ +typedef struct gl_list_impl * gl_list_t; + +struct gl_list_node_impl; +/* Type representing the position of an element in the list, in a way that + is more adapted to the list implementation than a plain index. + Note: It is invalidated by insertions and removals! */ +typedef struct gl_list_node_impl * gl_list_node_t; + +struct gl_list_implementation; +/* Type representing a list datatype implementation. */ +typedef const struct gl_list_implementation * gl_list_implementation_t; + +#if 0 /* Unless otherwise specified, these are defined inline below. */ + +/* Create an empty list. + IMPLEMENTATION is one of GL_ARRAY_LIST, GL_CARRAY_LIST, GL_LINKED_LIST, + GL_AVLTREE_LIST, GL_RBTREE_LIST, GL_LINKEDHASH_LIST, GL_AVLTREEHASH_LIST, + GL_RBTREEHASH_LIST. + EQUALS_FN is an element comparison function or NULL. + HASHCODE_FN is an element hash code function or NULL. + DISPOSE_FN is an element disposal function or NULL. + ALLOW_DUPLICATES is false if duplicate elements shall not be allowed in + the list. The implementation may verify this at runtime. */ +/* declared in gl_xlist.h */ +extern gl_list_t gl_list_create_empty (gl_list_implementation_t implementation, + gl_listelement_equals_fn equals_fn, + gl_listelement_hashcode_fn hashcode_fn, + gl_listelement_dispose_fn dispose_fn, + bool allow_duplicates); +/* Likewise. Return NULL upon out-of-memory. */ +extern gl_list_t gl_list_nx_create_empty (gl_list_implementation_t implementation, + gl_listelement_equals_fn equals_fn, + gl_listelement_hashcode_fn hashcode_fn, + gl_listelement_dispose_fn dispose_fn, + bool allow_duplicates); + +/* Create a list with given contents. + IMPLEMENTATION is one of GL_ARRAY_LIST, GL_CARRAY_LIST, GL_LINKED_LIST, + GL_AVLTREE_LIST, GL_RBTREE_LIST, GL_LINKEDHASH_LIST, GL_AVLTREEHASH_LIST, + GL_RBTREEHASH_LIST. + EQUALS_FN is an element comparison function or NULL. + HASHCODE_FN is an element hash code function or NULL. + DISPOSE_FN is an element disposal function or NULL. + ALLOW_DUPLICATES is false if duplicate elements shall not be allowed in + the list. The implementation may verify this at runtime. + COUNT is the number of initial elements. + CONTENTS[0..COUNT-1] is the initial contents. */ +/* declared in gl_xlist.h */ +extern gl_list_t gl_list_create (gl_list_implementation_t implementation, + gl_listelement_equals_fn equals_fn, + gl_listelement_hashcode_fn hashcode_fn, + gl_listelement_dispose_fn dispose_fn, + bool allow_duplicates, + size_t count, const void **contents); +/* Likewise. Return NULL upon out-of-memory. */ +extern gl_list_t gl_list_nx_create (gl_list_implementation_t implementation, + gl_listelement_equals_fn equals_fn, + gl_listelement_hashcode_fn hashcode_fn, + gl_listelement_dispose_fn dispose_fn, + bool allow_duplicates, + size_t count, const void **contents); + +/* Return the current number of elements in a list. */ +extern size_t gl_list_size (gl_list_t list); + +/* Return the element value represented by a list node. */ +extern const void * gl_list_node_value (gl_list_t list, gl_list_node_t node); + +/* Replace the element value represented by a list node. */ +/* declared in gl_xlist.h */ +extern void gl_list_node_set_value (gl_list_t list, gl_list_node_t node, + const void *elt); +/* Likewise. Return 0 upon success, -1 upon out-of-memory. */ +extern int gl_list_node_nx_set_value (gl_list_t list, gl_list_node_t node, + const void *elt) +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + __attribute__ ((__warn_unused_result__)) +#endif + ; + +/* Return the node immediately after the given node in the list, or NULL + if the given node is the last (rightmost) one in the list. */ +extern gl_list_node_t gl_list_next_node (gl_list_t list, gl_list_node_t node); + +/* Return the node immediately before the given node in the list, or NULL + if the given node is the first (leftmost) one in the list. */ +extern gl_list_node_t gl_list_previous_node (gl_list_t list, gl_list_node_t node); + +/* Return the element at a given position in the list. + POSITION must be >= 0 and < gl_list_size (list). */ +extern const void * gl_list_get_at (gl_list_t list, size_t position); + +/* Replace the element at a given position in the list. + POSITION must be >= 0 and < gl_list_size (list). + Return its node. */ +/* declared in gl_xlist.h */ +extern gl_list_node_t gl_list_set_at (gl_list_t list, size_t position, + const void *elt); +/* Likewise. Return NULL upon out-of-memory. */ +extern gl_list_node_t gl_list_nx_set_at (gl_list_t list, size_t position, + const void *elt) +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + __attribute__ ((__warn_unused_result__)) +#endif + ; + +/* Search whether an element is already in the list. + Return its node if found, or NULL if not present in the list. */ +extern gl_list_node_t gl_list_search (gl_list_t list, const void *elt); + +/* Search whether an element is already in the list, + at a position >= START_INDEX. + Return its node if found, or NULL if not present in the list. */ +extern gl_list_node_t gl_list_search_from (gl_list_t list, size_t start_index, + const void *elt); + +/* Search whether an element is already in the list, + at a position >= START_INDEX and < END_INDEX. + Return its node if found, or NULL if not present in the list. */ +extern gl_list_node_t gl_list_search_from_to (gl_list_t list, + size_t start_index, + size_t end_index, + const void *elt); + +/* Search whether an element is already in the list. + Return its position if found, or (size_t)(-1) if not present in the list. */ +extern size_t gl_list_indexof (gl_list_t list, const void *elt); + +/* Search whether an element is already in the list, + at a position >= START_INDEX. + Return its position if found, or (size_t)(-1) if not present in the list. */ +extern size_t gl_list_indexof_from (gl_list_t list, size_t start_index, + const void *elt); + +/* Search whether an element is already in the list, + at a position >= START_INDEX and < END_INDEX. + Return its position if found, or (size_t)(-1) if not present in the list. */ +extern size_t gl_list_indexof_from_to (gl_list_t list, + size_t start_index, size_t end_index, + const void *elt); + +/* Add an element as the first element of the list. + Return its node. */ +/* declared in gl_xlist.h */ +extern gl_list_node_t gl_list_add_first (gl_list_t list, const void *elt); +/* Likewise. Return NULL upon out-of-memory. */ +extern gl_list_node_t gl_list_nx_add_first (gl_list_t list, const void *elt) +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + __attribute__ ((__warn_unused_result__)) +#endif + ; + +/* Add an element as the last element of the list. + Return its node. */ +/* declared in gl_xlist.h */ +extern gl_list_node_t gl_list_add_last (gl_list_t list, const void *elt); +/* Likewise. Return NULL upon out-of-memory. */ +extern gl_list_node_t gl_list_nx_add_last (gl_list_t list, const void *elt) +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + __attribute__ ((__warn_unused_result__)) +#endif + ; + +/* Add an element before a given element node of the list. + Return its node. */ +/* declared in gl_xlist.h */ +extern gl_list_node_t gl_list_add_before (gl_list_t list, gl_list_node_t node, + const void *elt); +/* Likewise. Return NULL upon out-of-memory. */ +extern gl_list_node_t gl_list_nx_add_before (gl_list_t list, + gl_list_node_t node, + const void *elt) +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + __attribute__ ((__warn_unused_result__)) +#endif + ; + +/* Add an element after a given element node of the list. + Return its node. */ +/* declared in gl_xlist.h */ +extern gl_list_node_t gl_list_add_after (gl_list_t list, gl_list_node_t node, + const void *elt); +/* Likewise. Return NULL upon out-of-memory. */ +extern gl_list_node_t gl_list_nx_add_after (gl_list_t list, gl_list_node_t node, + const void *elt) +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + __attribute__ ((__warn_unused_result__)) +#endif + ; + +/* Add an element at a given position in the list. + POSITION must be >= 0 and <= gl_list_size (list). */ +/* declared in gl_xlist.h */ +extern gl_list_node_t gl_list_add_at (gl_list_t list, size_t position, + const void *elt); +/* Likewise. Return NULL upon out-of-memory. */ +extern gl_list_node_t gl_list_nx_add_at (gl_list_t list, size_t position, + const void *elt) +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + __attribute__ ((__warn_unused_result__)) +#endif + ; + +/* Remove an element from the list. + Return true. */ +extern bool gl_list_remove_node (gl_list_t list, gl_list_node_t node); + +/* Remove an element at a given position from the list. + POSITION must be >= 0 and < gl_list_size (list). + Return true. */ +extern bool gl_list_remove_at (gl_list_t list, size_t position); + +/* Search and remove an element from the list. + Return true if it was found and removed. */ +extern bool gl_list_remove (gl_list_t list, const void *elt); + +/* Free an entire list. + (But this call does not free the elements of the list.) */ +extern void gl_list_free (gl_list_t list); + +#endif /* End of inline and gl_xlist.h-defined functions. */ + +/* --------------------- gl_list_iterator_t Data Type --------------------- */ + +/* Functions for iterating through a list. */ + +/* Type of an iterator that traverses a list. + This is a fixed-size struct, so that creation of an iterator doesn't need + memory allocation on the heap. */ +typedef struct +{ + /* For fast dispatch of gl_list_iterator_next. */ + const struct gl_list_implementation *vtable; + /* For detecting whether the last returned element was removed. */ + gl_list_t list; + size_t count; + /* Other, implementation-private fields. */ + void *p; void *q; + size_t i; size_t j; +} gl_list_iterator_t; + +#if 0 /* These are defined inline below. */ + +/* Create an iterator traversing a list. + The list contents must not be modified while the iterator is in use, + except for replacing or removing the last returned element. */ +extern gl_list_iterator_t gl_list_iterator (gl_list_t list); + +/* Create an iterator traversing the element with indices i, + start_index <= i < end_index, of a list. + The list contents must not be modified while the iterator is in use, + except for replacing or removing the last returned element. */ +extern gl_list_iterator_t gl_list_iterator_from_to (gl_list_t list, + size_t start_index, + size_t end_index); + +/* If there is a next element, store the next element in *ELTP, store its + node in *NODEP if NODEP is non-NULL, advance the iterator and return true. + Otherwise, return false. */ +extern bool gl_list_iterator_next (gl_list_iterator_t *iterator, + const void **eltp, gl_list_node_t *nodep); + +/* Free an iterator. */ +extern void gl_list_iterator_free (gl_list_iterator_t *iterator); + +#endif /* End of inline functions. */ + +/* ---------------------- Sorted gl_list_t Data Type ---------------------- */ + +/* The following functions are for lists without duplicates where the + order is given by a sort criterion. */ + +/* Type of function used to compare two elements. Same as for qsort(). + NULL denotes pointer comparison. */ +typedef int (*gl_listelement_compar_fn) (const void *elt1, const void *elt2); + +#if 0 /* Unless otherwise specified, these are defined inline below. */ + +/* Search whether an element is already in the list. + The list is assumed to be sorted with COMPAR. + Return its node if found, or NULL if not present in the list. + If the list contains several copies of ELT, the node of the leftmost one is + returned. */ +extern gl_list_node_t gl_sortedlist_search (gl_list_t list, + gl_listelement_compar_fn compar, + const void *elt); + +/* Search whether an element is already in the list. + The list is assumed to be sorted with COMPAR. + Only list elements with indices >= START_INDEX and < END_INDEX are + considered; the implementation uses these bounds to minimize the number + of COMPAR invocations. + Return its node if found, or NULL if not present in the list. + If the list contains several copies of ELT, the node of the leftmost one is + returned. */ +extern gl_list_node_t gl_sortedlist_search_from_to (gl_list_t list, + gl_listelement_compar_fn compar, + size_t start_index, + size_t end_index, + const void *elt); + +/* Search whether an element is already in the list. + The list is assumed to be sorted with COMPAR. + Return its position if found, or (size_t)(-1) if not present in the list. + If the list contains several copies of ELT, the position of the leftmost one + is returned. */ +extern size_t gl_sortedlist_indexof (gl_list_t list, + gl_listelement_compar_fn compar, + const void *elt); + +/* Search whether an element is already in the list. + The list is assumed to be sorted with COMPAR. + Only list elements with indices >= START_INDEX and < END_INDEX are + considered; the implementation uses these bounds to minimize the number + of COMPAR invocations. + Return its position if found, or (size_t)(-1) if not present in the list. + If the list contains several copies of ELT, the position of the leftmost one + is returned. */ +extern size_t gl_sortedlist_indexof_from_to (gl_list_t list, + gl_listelement_compar_fn compar, + size_t start_index, + size_t end_index, + const void *elt); + +/* Add an element at the appropriate position in the list. + The list is assumed to be sorted with COMPAR. + Return its node. */ +/* declared in gl_xlist.h */ +extern gl_list_node_t gl_sortedlist_add (gl_list_t list, + gl_listelement_compar_fn compar, + const void *elt); +/* Likewise. Return NULL upon out-of-memory. */ +extern gl_list_node_t gl_sortedlist_nx_add (gl_list_t list, + gl_listelement_compar_fn compar, + const void *elt) +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + __attribute__ ((__warn_unused_result__)) +#endif + ; + +/* Search and remove an element from the list. + The list is assumed to be sorted with COMPAR. + Return true if it was found and removed. + If the list contains several copies of ELT, only the leftmost one is + removed. */ +extern bool gl_sortedlist_remove (gl_list_t list, + gl_listelement_compar_fn compar, + const void *elt); + +#endif /* End of inline and gl_xlist.h-defined functions. */ + +/* ------------------------ Implementation Details ------------------------ */ + +struct gl_list_implementation +{ + /* gl_list_t functions. */ + gl_list_t (*nx_create_empty) (gl_list_implementation_t implementation, + gl_listelement_equals_fn equals_fn, + gl_listelement_hashcode_fn hashcode_fn, + gl_listelement_dispose_fn dispose_fn, + bool allow_duplicates); + gl_list_t (*nx_create) (gl_list_implementation_t implementation, + gl_listelement_equals_fn equals_fn, + gl_listelement_hashcode_fn hashcode_fn, + gl_listelement_dispose_fn dispose_fn, + bool allow_duplicates, + size_t count, const void **contents); + size_t (*size) (gl_list_t list); + const void * (*node_value) (gl_list_t list, gl_list_node_t node); + int (*node_nx_set_value) (gl_list_t list, gl_list_node_t node, + const void *elt); + gl_list_node_t (*next_node) (gl_list_t list, gl_list_node_t node); + gl_list_node_t (*previous_node) (gl_list_t list, gl_list_node_t node); + const void * (*get_at) (gl_list_t list, size_t position); + gl_list_node_t (*nx_set_at) (gl_list_t list, size_t position, + const void *elt); + gl_list_node_t (*search_from_to) (gl_list_t list, size_t start_index, + size_t end_index, const void *elt); + size_t (*indexof_from_to) (gl_list_t list, size_t start_index, + size_t end_index, const void *elt); + gl_list_node_t (*nx_add_first) (gl_list_t list, const void *elt); + gl_list_node_t (*nx_add_last) (gl_list_t list, const void *elt); + gl_list_node_t (*nx_add_before) (gl_list_t list, gl_list_node_t node, + const void *elt); + gl_list_node_t (*nx_add_after) (gl_list_t list, gl_list_node_t node, + const void *elt); + gl_list_node_t (*nx_add_at) (gl_list_t list, size_t position, + const void *elt); + bool (*remove_node) (gl_list_t list, gl_list_node_t node); + bool (*remove_at) (gl_list_t list, size_t position); + bool (*remove_elt) (gl_list_t list, const void *elt); + void (*list_free) (gl_list_t list); + /* gl_list_iterator_t functions. */ + gl_list_iterator_t (*iterator) (gl_list_t list); + gl_list_iterator_t (*iterator_from_to) (gl_list_t list, + size_t start_index, + size_t end_index); + bool (*iterator_next) (gl_list_iterator_t *iterator, + const void **eltp, gl_list_node_t *nodep); + void (*iterator_free) (gl_list_iterator_t *iterator); + /* Sorted gl_list_t functions. */ + gl_list_node_t (*sortedlist_search) (gl_list_t list, + gl_listelement_compar_fn compar, + const void *elt); + gl_list_node_t (*sortedlist_search_from_to) (gl_list_t list, + gl_listelement_compar_fn compar, + size_t start_index, + size_t end_index, + const void *elt); + size_t (*sortedlist_indexof) (gl_list_t list, + gl_listelement_compar_fn compar, + const void *elt); + size_t (*sortedlist_indexof_from_to) (gl_list_t list, + gl_listelement_compar_fn compar, + size_t start_index, size_t end_index, + const void *elt); + gl_list_node_t (*sortedlist_nx_add) (gl_list_t list, + gl_listelement_compar_fn compar, + const void *elt); + bool (*sortedlist_remove) (gl_list_t list, + gl_listelement_compar_fn compar, + const void *elt); +}; + +struct gl_list_impl_base +{ + const struct gl_list_implementation *vtable; + gl_listelement_equals_fn equals_fn; + gl_listelement_hashcode_fn hashcode_fn; + gl_listelement_dispose_fn dispose_fn; + bool allow_duplicates; +}; + +/* Define all functions of this file as accesses to the + struct gl_list_implementation. */ + +GL_LIST_INLINE gl_list_t +gl_list_nx_create_empty (gl_list_implementation_t implementation, + gl_listelement_equals_fn equals_fn, + gl_listelement_hashcode_fn hashcode_fn, + gl_listelement_dispose_fn dispose_fn, + bool allow_duplicates) +{ + return implementation->nx_create_empty (implementation, equals_fn, + hashcode_fn, dispose_fn, + allow_duplicates); +} + +GL_LIST_INLINE gl_list_t +gl_list_nx_create (gl_list_implementation_t implementation, + gl_listelement_equals_fn equals_fn, + gl_listelement_hashcode_fn hashcode_fn, + gl_listelement_dispose_fn dispose_fn, + bool allow_duplicates, + size_t count, const void **contents) +{ + return implementation->nx_create (implementation, equals_fn, hashcode_fn, + dispose_fn, allow_duplicates, count, + contents); +} + +GL_LIST_INLINE size_t +gl_list_size (gl_list_t list) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->size (list); +} + +GL_LIST_INLINE const void * +gl_list_node_value (gl_list_t list, gl_list_node_t node) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->node_value (list, node); +} + +GL_LIST_INLINE int +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + __attribute__ ((__warn_unused_result__)) +#endif +gl_list_node_nx_set_value (gl_list_t list, gl_list_node_t node, + const void *elt) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->node_nx_set_value (list, node, elt); +} + +GL_LIST_INLINE gl_list_node_t +gl_list_next_node (gl_list_t list, gl_list_node_t node) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->next_node (list, node); +} + +GL_LIST_INLINE gl_list_node_t +gl_list_previous_node (gl_list_t list, gl_list_node_t node) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->previous_node (list, node); +} + +GL_LIST_INLINE const void * +gl_list_get_at (gl_list_t list, size_t position) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->get_at (list, position); +} + +GL_LIST_INLINE gl_list_node_t +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + __attribute__ ((__warn_unused_result__)) +#endif +gl_list_nx_set_at (gl_list_t list, size_t position, const void *elt) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->nx_set_at (list, position, elt); +} + +GL_LIST_INLINE gl_list_node_t +gl_list_search (gl_list_t list, const void *elt) +{ + size_t size = ((const struct gl_list_impl_base *) list)->vtable->size (list); + return ((const struct gl_list_impl_base *) list)->vtable + ->search_from_to (list, 0, size, elt); +} + +GL_LIST_INLINE gl_list_node_t +gl_list_search_from (gl_list_t list, size_t start_index, const void *elt) +{ + size_t size = ((const struct gl_list_impl_base *) list)->vtable->size (list); + return ((const struct gl_list_impl_base *) list)->vtable + ->search_from_to (list, start_index, size, elt); +} + +GL_LIST_INLINE gl_list_node_t +gl_list_search_from_to (gl_list_t list, size_t start_index, size_t end_index, + const void *elt) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->search_from_to (list, start_index, end_index, elt); +} + +GL_LIST_INLINE size_t +gl_list_indexof (gl_list_t list, const void *elt) +{ + size_t size = ((const struct gl_list_impl_base *) list)->vtable->size (list); + return ((const struct gl_list_impl_base *) list)->vtable + ->indexof_from_to (list, 0, size, elt); +} + +GL_LIST_INLINE size_t +gl_list_indexof_from (gl_list_t list, size_t start_index, const void *elt) +{ + size_t size = ((const struct gl_list_impl_base *) list)->vtable->size (list); + return ((const struct gl_list_impl_base *) list)->vtable + ->indexof_from_to (list, start_index, size, elt); +} + +GL_LIST_INLINE size_t +gl_list_indexof_from_to (gl_list_t list, size_t start_index, size_t end_index, + const void *elt) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->indexof_from_to (list, start_index, end_index, elt); +} + +GL_LIST_INLINE gl_list_node_t +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + __attribute__ ((__warn_unused_result__)) +#endif +gl_list_nx_add_first (gl_list_t list, const void *elt) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->nx_add_first (list, elt); +} + +GL_LIST_INLINE gl_list_node_t +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + __attribute__ ((__warn_unused_result__)) +#endif +gl_list_nx_add_last (gl_list_t list, const void *elt) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->nx_add_last (list, elt); +} + +GL_LIST_INLINE gl_list_node_t +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + __attribute__ ((__warn_unused_result__)) +#endif +gl_list_nx_add_before (gl_list_t list, gl_list_node_t node, const void *elt) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->nx_add_before (list, node, elt); +} + +GL_LIST_INLINE gl_list_node_t +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + __attribute__ ((__warn_unused_result__)) +#endif +gl_list_nx_add_after (gl_list_t list, gl_list_node_t node, const void *elt) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->nx_add_after (list, node, elt); +} + +GL_LIST_INLINE gl_list_node_t +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + __attribute__ ((__warn_unused_result__)) +#endif +gl_list_nx_add_at (gl_list_t list, size_t position, const void *elt) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->nx_add_at (list, position, elt); +} + +GL_LIST_INLINE bool +gl_list_remove_node (gl_list_t list, gl_list_node_t node) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->remove_node (list, node); +} + +GL_LIST_INLINE bool +gl_list_remove_at (gl_list_t list, size_t position) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->remove_at (list, position); +} + +GL_LIST_INLINE bool +gl_list_remove (gl_list_t list, const void *elt) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->remove_elt (list, elt); +} + +GL_LIST_INLINE void +gl_list_free (gl_list_t list) +{ + ((const struct gl_list_impl_base *) list)->vtable->list_free (list); +} + +GL_LIST_INLINE gl_list_iterator_t +gl_list_iterator (gl_list_t list) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->iterator (list); +} + +GL_LIST_INLINE gl_list_iterator_t +gl_list_iterator_from_to (gl_list_t list, size_t start_index, size_t end_index) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->iterator_from_to (list, start_index, end_index); +} + +GL_LIST_INLINE bool +gl_list_iterator_next (gl_list_iterator_t *iterator, + const void **eltp, gl_list_node_t *nodep) +{ + return iterator->vtable->iterator_next (iterator, eltp, nodep); +} + +GL_LIST_INLINE void +gl_list_iterator_free (gl_list_iterator_t *iterator) +{ + iterator->vtable->iterator_free (iterator); +} + +GL_LIST_INLINE gl_list_node_t +gl_sortedlist_search (gl_list_t list, gl_listelement_compar_fn compar, const void *elt) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->sortedlist_search (list, compar, elt); +} + +GL_LIST_INLINE gl_list_node_t +gl_sortedlist_search_from_to (gl_list_t list, gl_listelement_compar_fn compar, size_t start_index, size_t end_index, const void *elt) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->sortedlist_search_from_to (list, compar, start_index, end_index, + elt); +} + +GL_LIST_INLINE size_t +gl_sortedlist_indexof (gl_list_t list, gl_listelement_compar_fn compar, const void *elt) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->sortedlist_indexof (list, compar, elt); +} + +GL_LIST_INLINE size_t +gl_sortedlist_indexof_from_to (gl_list_t list, gl_listelement_compar_fn compar, size_t start_index, size_t end_index, const void *elt) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->sortedlist_indexof_from_to (list, compar, start_index, end_index, + elt); +} + +GL_LIST_INLINE gl_list_node_t +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + __attribute__ ((__warn_unused_result__)) +#endif +gl_sortedlist_nx_add (gl_list_t list, gl_listelement_compar_fn compar, const void *elt) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->sortedlist_nx_add (list, compar, elt); +} + +GL_LIST_INLINE bool +gl_sortedlist_remove (gl_list_t list, gl_listelement_compar_fn compar, const void *elt) +{ + return ((const struct gl_list_impl_base *) list)->vtable + ->sortedlist_remove (list, compar, elt); +} + +#ifdef __cplusplus +} +#endif + +_GL_INLINE_HEADER_END + +#endif /* _GL_LIST_H */ diff --git a/lib/gl_openssl.h b/lib/gl_openssl.h index 24144215..697cd855 100644 --- a/lib/gl_openssl.h +++ b/lib/gl_openssl.h @@ -1,6 +1,6 @@ /* gl_openssl.h -- wrap openssl crypto hash routines in gnulib interface - Copyright (C) 2013-2014 Free Software Foundation, Inc. + Copyright (C) 2013-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/gl_xlist.c b/lib/gl_xlist.c new file mode 100644 index 00000000..fe3c8933 --- /dev/null +++ b/lib/gl_xlist.c @@ -0,0 +1,3 @@ +#include +#define GL_XLIST_INLINE _GL_EXTERN_INLINE +#include "gl_xlist.h" diff --git a/lib/gl_xlist.h b/lib/gl_xlist.h new file mode 100644 index 00000000..7ea62c1c --- /dev/null +++ b/lib/gl_xlist.h @@ -0,0 +1,177 @@ +/* Abstract sequential list data type, with out-of-memory checking. + Copyright (C) 2009-2015 Free Software Foundation, Inc. + Written by Bruno Haible , 2009. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef _GL_XLIST_H +#define _GL_XLIST_H + +#include "gl_list.h" +#include "xalloc.h" + +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif +_GL_INLINE_HEADER_BEGIN +#ifndef GL_XLIST_INLINE +# define GL_XLIST_INLINE _GL_INLINE +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* These functions are thin wrappers around the corresponding functions with + _nx_ infix from gl_list.h. Upon out-of-memory, they invoke xalloc_die (), + instead of returning an error indicator. */ +#if 0 /* These are defined inline below. */ +extern gl_list_t gl_list_create_empty (gl_list_implementation_t implementation, + gl_listelement_equals_fn equals_fn, + gl_listelement_hashcode_fn hashcode_fn, + gl_listelement_dispose_fn dispose_fn, + bool allow_duplicates); +extern gl_list_t gl_list_create (gl_list_implementation_t implementation, + gl_listelement_equals_fn equals_fn, + gl_listelement_hashcode_fn hashcode_fn, + gl_listelement_dispose_fn dispose_fn, + bool allow_duplicates, + size_t count, const void **contents); +extern void gl_list_node_set_value (gl_list_t list, gl_list_node_t node, + const void *elt); +extern gl_list_node_t gl_list_set_at (gl_list_t list, size_t position, + const void *elt); +extern gl_list_node_t gl_list_add_first (gl_list_t list, const void *elt); +extern gl_list_node_t gl_list_add_last (gl_list_t list, const void *elt); +extern gl_list_node_t gl_list_add_before (gl_list_t list, gl_list_node_t node, + const void *elt); +extern gl_list_node_t gl_list_add_after (gl_list_t list, gl_list_node_t node, + const void *elt); +extern gl_list_node_t gl_list_add_at (gl_list_t list, size_t position, + const void *elt); +extern gl_list_node_t gl_sortedlist_add (gl_list_t list, + gl_listelement_compar_fn compar, + const void *elt); +#endif + +GL_XLIST_INLINE gl_list_t +gl_list_create_empty (gl_list_implementation_t implementation, + gl_listelement_equals_fn equals_fn, + gl_listelement_hashcode_fn hashcode_fn, + gl_listelement_dispose_fn dispose_fn, + bool allow_duplicates) +{ + gl_list_t result = + gl_list_nx_create_empty (implementation, equals_fn, hashcode_fn, dispose_fn, + allow_duplicates); + if (result == NULL) + xalloc_die (); + return result; +} + +GL_XLIST_INLINE gl_list_t +gl_list_create (gl_list_implementation_t implementation, + gl_listelement_equals_fn equals_fn, + gl_listelement_hashcode_fn hashcode_fn, + gl_listelement_dispose_fn dispose_fn, + bool allow_duplicates, + size_t count, const void **contents) +{ + gl_list_t result = + gl_list_nx_create (implementation, equals_fn, hashcode_fn, dispose_fn, + allow_duplicates, count, contents); + if (result == NULL) + xalloc_die (); + return result; +} + +GL_XLIST_INLINE void +gl_list_node_set_value (gl_list_t list, gl_list_node_t node, const void *elt) +{ + int result = gl_list_node_nx_set_value (list, node, elt); + if (result < 0) + xalloc_die (); +} + +GL_XLIST_INLINE gl_list_node_t +gl_list_set_at (gl_list_t list, size_t position, const void *elt) +{ + gl_list_node_t result = gl_list_nx_set_at (list, position, elt); + if (result == NULL) + xalloc_die (); + return result; +} + +GL_XLIST_INLINE gl_list_node_t +gl_list_add_first (gl_list_t list, const void *elt) +{ + gl_list_node_t result = gl_list_nx_add_first (list, elt); + if (result == NULL) + xalloc_die (); + return result; +} + +GL_XLIST_INLINE gl_list_node_t +gl_list_add_last (gl_list_t list, const void *elt) +{ + gl_list_node_t result = gl_list_nx_add_last (list, elt); + if (result == NULL) + xalloc_die (); + return result; +} + +GL_XLIST_INLINE gl_list_node_t +gl_list_add_before (gl_list_t list, gl_list_node_t node, const void *elt) +{ + gl_list_node_t result = gl_list_nx_add_before (list, node, elt); + if (result == NULL) + xalloc_die (); + return result; +} + +GL_XLIST_INLINE gl_list_node_t +gl_list_add_after (gl_list_t list, gl_list_node_t node, const void *elt) +{ + gl_list_node_t result = gl_list_nx_add_after (list, node, elt); + if (result == NULL) + xalloc_die (); + return result; +} + +GL_XLIST_INLINE gl_list_node_t +gl_list_add_at (gl_list_t list, size_t position, const void *elt) +{ + gl_list_node_t result = gl_list_nx_add_at (list, position, elt); + if (result == NULL) + xalloc_die (); + return result; +} + +GL_XLIST_INLINE gl_list_node_t +gl_sortedlist_add (gl_list_t list, gl_listelement_compar_fn compar, + const void *elt) +{ + gl_list_node_t result = gl_sortedlist_nx_add (list, compar, elt); + if (result == NULL) + xalloc_die (); + return result; +} + +#ifdef __cplusplus +} +#endif + +_GL_INLINE_HEADER_END + +#endif /* _GL_XLIST_H */ diff --git a/lib/glthread/lock.c b/lib/glthread/lock.c index 33c15a0d..b64132ab 100644 --- a/lib/glthread/lock.c +++ b/lib/glthread/lock.c @@ -1,5 +1,5 @@ /* Locking in multithreaded situations. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/glthread/lock.h b/lib/glthread/lock.h index 36096c4b..cf3d0d95 100644 --- a/lib/glthread/lock.h +++ b/lib/glthread/lock.h @@ -1,5 +1,5 @@ /* Locking in multithreaded situations. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This program is free software; 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 26870de2..f01d351c 100644 --- a/lib/glthread/threadlib.c +++ b/lib/glthread/threadlib.c @@ -1,5 +1,5 @@ /* Multithreading primitives. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This program is free software; 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 971c72ab..f1c0cd71 100644 --- a/lib/glthread/tls.c +++ b/lib/glthread/tls.c @@ -1,5 +1,5 @@ /* Thread-local storage in multithreaded situations. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This program is free software: 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 c0a56e49..cf53a2bd 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2007-2015 Free Software Foundation, Inc. This program is free software: 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 e1d74db7..2bff8c69 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libcoreutils --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=build-aux --with-tests --avoid=canonicalize-lgpl --avoid=dummy --makefile-name=gnulib.mk --no-conditional-dependencies --no-libtool --macro-prefix=gl acl alignof alloca announce-gen areadlink-with-size argmatch argv-iter assert autobuild backupfile base64 buffer-lcm c-strcase c-strtod c-strtold calloc-gnu canon-host canonicalize chown cloexec closein closeout config-h configmake crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 cycle-check d-ino d-type di-set diacrit dirfd dirname do-release-commit-and-tag dtoastr dup2 environ error euidaccess exclude exitfail faccessat fadvise fchdir fchmodat fchownat fclose fcntl fcntl-safer fd-reopen fdatasync fdl fdopen fdutimensat file-type fileblocks filemode filenamecat filevercmp fnmatch-gnu fopen-safer fprintftime freopen freopen-safer fseeko fstatat fsusage fsync ftello ftoastr ftruncate fts full-read full-write getgroups gethrxtime getline getloadavg getlogin getndelim2 getopt-gnu getpagesize getpass-gnu gettext-h gettime gettimeofday getugroups getusershell git-version-gen gitlog-to-changelog gnu-make gnu-web-doc-update gnumakefile gnupload group-member hard-locale hash hash-pjw heap host-os human idcache ignore-value inttostr inttypes isapipe isatty isblank largefile lchmod lchown ldtoastr lib-ignore linebuffer link link-follow linkat long-options lstat maintainer-makefile malloc-gnu manywarnings mbrlen mbrtowc mbsalign mbswidth memcasecmp memchr memcmp2 mempcpy memrchr mgetgroups mkancesdirs mkdir mkdir-p mkfifo mknod mkstemp mktime modechange mountlist mpsort netinet_in non-recursive-gnulib-prefix-hack nproc obstack parse-datetime pathmax perl physmem pipe-posix posix-shell posixtm posixver priv-set progname propername pthread putenv quote quotearg randint randperm read-file readlink readtokens readtokens0 readutmp realloc-gnu regex remove rename rmdir root-dev-ino rpmatch safe-read same save-cwd savedir savewd selinux-at settime sig2str sigaction smack ssize_t stat-macros stat-size stat-time statat stdbool stdlib-safer stpcpy stpncpy strdup-posix strftime strncat strnumcmp strpbrk strsignal strtod strtoimax strtoumax symlink sys_ioctl sys_resource sys_stat sys_wait termios timer-time timespec tzset uname unicodeio unistd-safer unlink-busy unlinkat unlocked-io unsetenv update-copyright uptime useless-if-before-free userspec utimecmp utimens vasprintf-posix vc-list-files verify verror version-etc-fsf wcswidth wcwidth winsz-ioctl winsz-termios write-any-file xalloc xfreopen xfts xgetcwd xgetgroups xgethostname xmemcoll xnanosleep xprintf xprintf-posix xreadlink xstrtod xstrtoimax xstrtol xstrtold xstrtoumax yesno +# 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-has-acl 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 linked-list long-options lstat maintainer-makefile malloc-gnu manywarnings mbrlen mbrtowc mbsalign mbswidth memcasecmp memchr memcmp2 mempcpy memrchr mgetgroups mkancesdirs mkdir mkdir-p mkfifo mknod mkstemp mktime modechange mountlist mpsort netinet_in non-recursive-gnulib-prefix-hack nproc obstack parse-datetime pathmax perl physmem pipe-posix posix-shell posixtm posixver priv-set progname propername pthread putenv quote quotearg randint randperm read-file readlink readtokens readtokens0 readutmp realloc-gnu regex remove rename rmdir root-dev-ino rpmatch safe-read same save-cwd savedir savewd selinux-at setenv settime sig2str sigaction smack ssize_t stat-macros stat-size stat-time statat stdbool stdlib-safer stpcpy stpncpy strdup-posix strftime strncat strnumcmp strpbrk strsignal strtod strtoimax strtoumax symlink sys_ioctl sys_resource sys_stat sys_wait tempname 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 xdectoint xfreopen xfts xgetcwd xgetgroups xgethostname xlist xmemcoll xnanosleep xprintf xprintf-posix xreadlink xstrtod xstrtoimax xstrtol xstrtold xstrtoumax yesno MOSTLYCLEANFILES += lib/core lib/*.stackdump @@ -48,6 +48,16 @@ lib_libcoreutils_a_SOURCES += lib/copy-acl.c lib/set-acl.c ## end gnulib module acl +## begin gnulib module acl-permissions + +lib_libcoreutils_a_SOURCES += lib/acl-errno-valid.c lib/acl-internal.c lib/get-permissions.c lib/set-permissions.c + +EXTRA_DIST += lib/acl-internal.h lib/acl.h lib/acl_entries.c + +EXTRA_lib_libcoreutils_a_SOURCES += lib/acl_entries.c + +## end gnulib module acl-permissions + ## begin gnulib module alignof @@ -180,6 +190,13 @@ EXTRA_DIST += lib/arpa_inet.in.h ## end gnulib module arpa_inet +## begin gnulib module assure + + +EXTRA_DIST += lib/assure.h + +## end gnulib module assure + ## begin gnulib module at-internal @@ -870,6 +887,12 @@ EXTRA_lib_libcoreutils_a_SOURCES += lib/fflush.c ## end gnulib module fflush +## begin gnulib module file-has-acl + +lib_libcoreutils_a_SOURCES += lib/file-has-acl.c + +## end gnulib module file-has-acl + ## begin gnulib module file-set lib_libcoreutils_a_SOURCES += lib/file-set.c @@ -1664,12 +1687,7 @@ EXTRA_DIST += lib/intprops.h ## begin gnulib module inttostr -lib_libcoreutils_a_SOURCES += \ - lib/imaxtostr.c \ - lib/inttostr.c \ - lib/offtostr.c \ - lib/uinttostr.c \ - lib/umaxtostr.c +lib_libcoreutils_a_SOURCES += lib/imaxtostr.c lib/inttostr.c lib/offtostr.c lib/uinttostr.c lib/umaxtostr.c EXTRA_DIST += lib/anytostr.c lib/inttostr.h @@ -1861,6 +1879,18 @@ EXTRA_lib_libcoreutils_a_SOURCES += lib/at-func2.c lib/linkat.c ## end gnulib module linkat +## begin gnulib module linked-list + +lib_libcoreutils_a_SOURCES += lib/gl_linked_list.h lib/gl_linked_list.c lib/gl_anylinked_list1.h lib/gl_anylinked_list2.h + +## end gnulib module linked-list + +## begin gnulib module list + +lib_libcoreutils_a_SOURCES += lib/gl_list.h lib/gl_list.c + +## end gnulib module list + ## begin gnulib module localcharset lib_libcoreutils_a_SOURCES += lib/localcharset.h lib/localcharset.c @@ -2908,15 +2938,17 @@ EXTRA_lib_libcoreutils_a_SOURCES += lib/putenv.c ## end gnulib module putenv -## begin gnulib module qacl +## begin gnulib module qcopy-acl -lib_libcoreutils_a_SOURCES += lib/acl-errno-valid.c lib/file-has-acl.c lib/qcopy-acl.c lib/qset-acl.c +lib_libcoreutils_a_SOURCES += lib/qcopy-acl.c -EXTRA_DIST += lib/acl-internal.h lib/acl.h lib/acl_entries.c +## end gnulib module qcopy-acl -EXTRA_lib_libcoreutils_a_SOURCES += lib/acl_entries.c +## begin gnulib module qset-acl -## end gnulib module qacl +lib_libcoreutils_a_SOURCES += lib/qset-acl.c + +## end gnulib module qset-acl ## begin gnulib module quote @@ -3624,6 +3656,7 @@ lib/stddef.h: lib/stddef.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_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ + -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ < $(top_srcdir)/lib/stddef.in.h; \ @@ -3850,6 +3883,7 @@ lib/stdlib.h: lib/stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -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_QSORT_R''@/$(GNULIB_QSORT_R)/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' \ @@ -3901,6 +3935,7 @@ lib/stdlib.h: lib/stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -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_QSORT_R''@|$(REPLACE_QSORT_R)|g' \ -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ @@ -4650,6 +4685,7 @@ lib/time.h: lib/time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -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 's|@''UNISTD_H_DEFINES_STRUCT_TIMESPEC''@|$(UNISTD_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)' \ @@ -4847,9 +4883,11 @@ lib/unistd.h: lib/unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_N -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ + -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|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_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \ -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ @@ -5325,6 +5363,16 @@ EXTRA_DIST += lib/xalloc-oversized.h ## end gnulib module xalloc-oversized +## begin gnulib module xdectoint + +lib_libcoreutils_a_SOURCES += lib/xdectoimax.c lib/xdectoumax.c + +EXTRA_DIST += lib/xdectoint.c lib/xdectoint.h + +EXTRA_lib_libcoreutils_a_SOURCES += lib/xdectoint.c + +## end gnulib module xdectoint + ## begin gnulib module xfreopen lib_libcoreutils_a_SOURCES += lib/xfreopen.c lib/xfreopen.h @@ -5357,6 +5405,12 @@ lib_libcoreutils_a_SOURCES += lib/xgethostname.h lib/xgethostname.c ## end gnulib module xgethostname +## begin gnulib module xlist + +lib_libcoreutils_a_SOURCES += lib/gl_xlist.h lib/gl_xlist.c + +## end gnulib module xlist + ## begin gnulib module xmemcoll lib_libcoreutils_a_SOURCES += lib/xmemcoll.h lib/xmemcoll.c diff --git a/lib/group-member.c b/lib/group-member.c index e869dca9..23074e4f 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-2014 Free Software + Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/hard-locale.c b/lib/hard-locale.c index 93c53866..b1802d0d 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-2014 Free Software + Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2015 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 ee9dd43a..c45eeca9 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-2014 Free Software Foundation, Inc. + Copyright (C) 1999, 2003-2004, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 18f9f01b..b2e02512 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 e6456134..f4b005c1 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 d305fbf5..c3b6d9f5 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 d312a264..4f27d5c8 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -1,6 +1,6 @@ /* hash - hashing table processing. - Copyright (C) 1998-2004, 2006-2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2004, 2006-2007, 2009-2015 Free Software Foundation, Inc. Written by Jim Meyering, 1992. @@ -1116,14 +1116,6 @@ hash_insert_if_absent (Hash_table *table, void const *entry, return 1; } -/* hash_insert0 is the deprecated name for hash_insert_if_absent. - . */ -int -hash_insert0 (Hash_table *table, void const *entry, void const **matched_ent) -{ - return hash_insert_if_absent (table, entry, matched_ent); -} - /* If ENTRY matches an entry already in the hash table, return the pointer to the entry from the table. Otherwise, insert ENTRY and return ENTRY. Return NULL if the storage required for insertion cannot be allocated. diff --git a/lib/hash.h b/lib/hash.h index 9994f5f6..1e90c31a 100644 --- a/lib/hash.h +++ b/lib/hash.h @@ -1,5 +1,5 @@ /* hash - hashing table processing. - Copyright (C) 1998-1999, 2001, 2003, 2009-2014 Free Software Foundation, + Copyright (C) 1998-1999, 2001, 2003, 2009-2015 Free Software Foundation, Inc. Written by Jim Meyering , 1998. @@ -96,10 +96,6 @@ void hash_free (Hash_table *); bool hash_rehash (Hash_table *, size_t) _GL_ATTRIBUTE_WUR; void *hash_insert (Hash_table *, const void *) _GL_ATTRIBUTE_WUR; -/* Deprecate this interface. It has been renamed to hash_insert_if_absent. */ -int hash_insert0 (Hash_table *table, /* FIXME: remove in 2013 */ - const void *entry, - const void **matched_ent) _GL_ATTRIBUTE_DEPRECATED; int hash_insert_if_absent (Hash_table *table, const void *entry, const void **matched_ent); void *hash_delete (Hash_table *, const void *); diff --git a/lib/heap.c b/lib/heap.c index 75bd071a..cee179f8 100644 --- a/lib/heap.c +++ b/lib/heap.c @@ -1,6 +1,6 @@ /* Barebones heap implementation supporting only insert and pop. - Copyright (C) 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: 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 02dc2ac6..4752421c 100644 --- a/lib/heap.h +++ b/lib/heap.h @@ -1,6 +1,6 @@ /* Barebones heap implementation supporting only insert and pop. - Copyright (C) 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: 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 ab6b30d2..7863f9c7 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-2014 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 2cb1c9e7..464787f0 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-2014 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 4173a03f..9a8a0afb 100644 --- a/lib/i-ring.c +++ b/lib/i-ring.c @@ -1,5 +1,5 @@ /* a simple ring buffer - Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 7d993fa4..f1832574 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 b5a427be..28c13c59 100644 --- a/lib/iconv.c +++ b/lib/iconv.c @@ -1,5 +1,5 @@ /* Character set conversion. - Copyright (C) 1999-2001, 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2001, 2007, 2009-2015 Free Software Foundation, Inc. This program is free software; 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 d0e98360..94ab8065 100644 --- a/lib/iconv.in.h +++ b/lib/iconv.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software; 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 d66c1155..59e0aca6 100644 --- a/lib/iconv_close.c +++ b/lib/iconv_close.c @@ -1,5 +1,5 @@ /* Character set conversion. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/iconv_open.c b/lib/iconv_open.c index 37ce9ce2..09d042d1 100644 --- a/lib/iconv_open.c +++ b/lib/iconv_open.c @@ -1,5 +1,5 @@ /* Character set conversion. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software; 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 8c921bfe..378fe2d9 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-2014 Free + Copyright (C) 1985, 1988-1990, 1997-1998, 2003, 2005-2007, 2009-2015 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 4dd0946d..68521edb 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c index c0258687..79bbf139 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2015 Free Software Foundation, Inc. This program is free software; 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 2171279f..16c1a415 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-2014 Free Software Foundation, Inc. + Copyright 2009-2015 Free Software Foundation, Inc. This program is free software: 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 d0bb7a6f..f85ccade 100644 --- a/lib/intprops.h +++ b/lib/intprops.h @@ -1,6 +1,6 @@ /* intprops.h -- properties of integer types - Copyright (C) 2001-2005, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2005, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 ff58c2b6..77818dd5 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 4b2a13be..78846f69 100644 --- a/lib/inttypes.in.h +++ b/lib/inttypes.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2014 Free Software Foundation, Inc. +/* Copyright (C) 2006-2015 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Derek Price. This file is part of gnulib. @@ -51,6 +51,10 @@ #endif /* Get CHAR_BIT. */ #include +/* On mingw, __USE_MINGW_ANSI_STDIO only works if is also included */ +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# include +#endif #if !(INT_MIN == INT32_MIN && INT_MAX == INT32_MAX) # error "This file assumes that 'int' has exactly 32 bits. Please report your platform and compiler to ." diff --git a/lib/isapipe.c b/lib/isapipe.c index b59e2359..fe7c2f7d 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc. This program is free software: 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 7180eadd..f7b552bf 100644 --- a/lib/isatty.c +++ b/lib/isatty.c @@ -1,5 +1,5 @@ /* isatty() replacement. - Copyright (C) 2012-2014 Free Software Foundation, Inc. + Copyright (C) 2012-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/isblank.c b/lib/isblank.c index 4e0aed1d..ac871ef1 100644 --- a/lib/isblank.c +++ b/lib/isblank.c @@ -1,6 +1,6 @@ /* Test whether a character is a blank. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: 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 878c1804..5eb11d9a 100644 --- a/lib/isnan.c +++ b/lib/isnan.c @@ -1,5 +1,5 @@ /* Test for NaN that does not need libm. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: 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 cee7eec0..ca3a87af 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: 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 318c3595..3fd803b9 100644 --- a/lib/isnand.c +++ b/lib/isnand.c @@ -1,5 +1,5 @@ /* Test for NaN that does not need libm. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: 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 41c2ef30..1e8d75a4 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: 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 583a607e..7fc5da2b 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 371de004..22d536d5 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: 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 4575e4c3..8f05eb73 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 9c1672fb..94be1159 100644 --- a/lib/iswblank.c +++ b/lib/iswblank.c @@ -1,5 +1,5 @@ /* Test wide character for being blank. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software; 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 937f4805..1eee03e3 100644 --- a/lib/itold.c +++ b/lib/itold.c @@ -1,5 +1,5 @@ /* Replacement for 'int' to 'long double' conversion routine. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 338ffb6a..04fd5354 100644 --- a/lib/langinfo.in.h +++ b/lib/langinfo.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around . - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software; 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 647b0a8a..7f5f6026 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-2014 Free Software + Copyright (C) 1998-1999, 2002, 2004, 2006-2007, 2009-2015 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 d1582fe3..5452e81d 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-2014 + Copyright (C) 1986, 1991, 1998-1999, 2001, 2003-2004, 2006-2007, 2009-2015 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 740d5c41..dc57b14a 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-2014 Free + Copyright (C) 1986, 1991, 1998-1999, 2002-2003, 2007, 2009-2015 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 80f4f097..4151ea32 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software; 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 6ee30fb4..4bdbae67 100644 --- a/lib/linkat.c +++ b/lib/linkat.c @@ -1,5 +1,5 @@ /* Create a hard link relative to open directories. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -43,7 +43,7 @@ # endif #endif -#if !HAVE_LINKAT +#if !HAVE_LINKAT || LINKAT_SYMLINK_NOTSUP /* Create a link. If FILE1 is a symlink, either create a hardlink to that symlink, or fake it by creating an identical symlink. */ @@ -195,6 +195,10 @@ solaris_optimized_link_follow (char const *file1, char const *file2) # endif +#endif /* !HAVE_LINKAT || LINKAT_SYMLINK_NOTSUP */ + +#if !HAVE_LINKAT + /* Create a link to FILE1, in the directory open on descriptor FD1, to FILE2, in the directory open on descriptor FD2. If FILE1 is a symlink, FLAG controls whether to dereference FILE1 first. If possible, do it without @@ -321,7 +325,17 @@ rpl_linkat (int fd1, char const *file1, int fd2, char const *file2, int flag) # endif if (!flag) - return linkat (fd1, file1, fd2, file2, flag); + { + int result = linkat (fd1, file1, fd2, file2, flag); +# if LINKAT_SYMLINK_NOTSUP + /* OS X 10.10 has linkat() but it doesn't support + hardlinks to symlinks. Fallback to our emulation + in that case. */ + if (result == -1 && (errno == ENOTSUP || errno == EOPNOTSUPP)) + return at_func2 (fd1, file1, fd2, file2, link_immediate); +# endif + return result; + } /* Cache the information on whether the system call really works. */ { diff --git a/lib/localcharset.c b/lib/localcharset.c index a9288673..1f02aa59 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-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2006, 2008-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -34,6 +34,7 @@ #if defined _WIN32 || defined __WIN32__ # define WINDOWS_NATIVE +# include #endif #if defined __EMX__ @@ -127,7 +128,7 @@ get_charset_aliases (void) cp = charset_aliases; if (cp == NULL) { -#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__) +#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2) const char *dir; const char *base = "charset.alias"; char *file_name; @@ -341,6 +342,36 @@ get_charset_aliases (void) "CP54936" "\0" "GB18030" "\0" "CP65001" "\0" "UTF-8" "\0"; # endif +# if defined OS2 + /* To avoid the troubles of installing a separate file in the same + directory as the DLL and of retrieving the DLL's directory at + runtime, simply inline the aliases here. */ + + /* The list of encodings is taken from "List of OS/2 Codepages" + by Alex Taylor: + . + See also "IBM Globalization - Code page identifiers": + . */ + cp = "CP813" "\0" "ISO-8859-7" "\0" + "CP878" "\0" "KOI8-R" "\0" + "CP819" "\0" "ISO-8859-1" "\0" + "CP912" "\0" "ISO-8859-2" "\0" + "CP913" "\0" "ISO-8859-3" "\0" + "CP914" "\0" "ISO-8859-4" "\0" + "CP915" "\0" "ISO-8859-5" "\0" + "CP916" "\0" "ISO-8859-8" "\0" + "CP920" "\0" "ISO-8859-9" "\0" + "CP921" "\0" "ISO-8859-13" "\0" + "CP923" "\0" "ISO-8859-15" "\0" + "CP954" "\0" "EUC-JP" "\0" + "CP964" "\0" "EUC-TW" "\0" + "CP970" "\0" "EUC-KR" "\0" + "CP1089" "\0" "ISO-8859-6" "\0" + "CP1208" "\0" "UTF-8" "\0" + "CP1381" "\0" "GB2312" "\0" + "CP1386" "\0" "GBK" "\0" + "CP3372" "\0" "EUC-JP" "\0"; +# endif #endif charset_aliases = cp; @@ -461,14 +492,34 @@ locale_charset (void) static char buf[2 + 10 + 1]; - /* The Windows API has a function returning the locale's codepage as a - number: GetACP(). - When the output goes to a console window, it needs to be provided in - GetOEMCP() encoding if the console is using a raster font, or in - GetConsoleOutputCP() encoding if it is using a TrueType font. - But in GUI programs and for output sent to files and pipes, GetACP() - encoding is the best bet. */ - sprintf (buf, "CP%u", GetACP ()); + /* The Windows API has a function returning the locale's codepage as + a number, but the value doesn't change according to what the + 'setlocale' call specified. So we use it as a last resort, in + case the string returned by 'setlocale' doesn't specify the + codepage. */ + char *current_locale = setlocale (LC_ALL, NULL); + char *pdot; + + /* If they set different locales for different categories, + 'setlocale' will return a semi-colon separated list of locale + values. To make sure we use the correct one, we choose LC_CTYPE. */ + if (strchr (current_locale, ';')) + current_locale = setlocale (LC_CTYPE, NULL); + + pdot = strrchr (current_locale, '.'); + if (pdot) + sprintf (buf, "CP%s", pdot + 1); + else + { + /* The Windows API has a function returning the locale's codepage as a + number: GetACP(). + When the output goes to a console window, it needs to be provided in + GetOEMCP() encoding if the console is using a raster font, or in + GetConsoleOutputCP() encoding if it is using a TrueType font. + But in GUI programs and for output sent to files and pipes, GetACP() + encoding is the best bet. */ + sprintf (buf, "CP%u", GetACP ()); + } codeset = buf; #elif defined OS2 @@ -478,6 +529,8 @@ locale_charset (void) ULONG cp[3]; ULONG cplen; + codeset = NULL; + /* Allow user to override the codeset, as set in the operating system, with standard language environment variables. */ locale = getenv ("LC_ALL"); @@ -509,10 +562,12 @@ locale_charset (void) } } - /* Resolve through the charset.alias file. */ - codeset = locale; + /* For the POSIX locale, don't use the system's codepage. */ + if (strcmp (locale, "C") == 0 || strcmp (locale, "POSIX") == 0) + codeset = ""; } - else + + if (codeset == NULL) { /* OS/2 has a function returning the locale's codepage as a number. */ if (DosQueryCp (sizeof (cp), cp, &cplen)) diff --git a/lib/localcharset.h b/lib/localcharset.h index 9011d580..c5e6d463 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-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2009-2015 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 10cc44b1..05e974df 100644 --- a/lib/locale.in.h +++ b/lib/locale.in.h @@ -1,5 +1,5 @@ /* A POSIX . - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/localeconv.c b/lib/localeconv.c index 014e739c..8f2d0840 100644 --- a/lib/localeconv.c +++ b/lib/localeconv.c @@ -1,5 +1,5 @@ /* Query locale dependent information for formatting numbers. - Copyright (C) 2012-2014 Free Software Foundation, Inc. + Copyright (C) 2012-2015 Free Software Foundation, Inc. This program is free software: 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 fa7d1cd7..d1e98f20 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-2014 Free Software + Copyright (C) 1993-1994, 1998-2000, 2002-2006, 2009-2015 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 a44ae2e8..78f00ae9 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-2014 Free Software + Copyright (C) 1993-1994, 1998-1999, 2003, 2009-2015 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 f19b41b1..fdec6cdf 100644 --- a/lib/lseek.c +++ b/lib/lseek.c @@ -1,5 +1,5 @@ /* An lseek() function that detects pipes. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software; 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 f70fd435..31dee138 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-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2006, 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/malloc.c b/lib/malloc.c index bc81c54d..00800a28 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-2014 Free Software Foundation, Inc. + Copyright (C) 1997-1998, 2006-2007, 2009-2015 Free Software Foundation, Inc. This program is free software; 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 370551c5..198a96ce 100644 --- a/lib/malloca.c +++ b/lib/malloca.c @@ -1,5 +1,5 @@ /* Safe automatic memory allocation. - Copyright (C) 2003, 2006-2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software; you can redistribute it and/or modify diff --git a/lib/malloca.h b/lib/malloca.h index 5071e46f..7a4190cf 100644 --- a/lib/malloca.h +++ b/lib/malloca.h @@ -1,5 +1,5 @@ /* Safe automatic memory allocation. - Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software; you can redistribute it and/or modify diff --git a/lib/math.in.h b/lib/math.in.h index 9d73c5e5..62a089ab 100644 --- a/lib/math.in.h +++ b/lib/math.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 2002-2003, 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/mbchar.c b/lib/mbchar.c index 7d5bfcc1..ae9b7eb9 100644 --- a/lib/mbchar.c +++ b/lib/mbchar.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2006, 2009-2014 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/mbchar.h b/lib/mbchar.h index 700174c5..fcdefaf0 100644 --- a/lib/mbchar.h +++ b/lib/mbchar.h @@ -1,5 +1,5 @@ /* Multibyte character data type. - Copyright (C) 2001, 2005-2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2001, 2005-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/mbiter.h b/lib/mbiter.h index 32fff8cf..ccc1d195 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001, 2005, 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/mbrlen.c b/lib/mbrlen.c index 5f180ba2..b6334f29 100644 --- a/lib/mbrlen.c +++ b/lib/mbrlen.c @@ -1,5 +1,5 @@ /* Recognize multibyte character. - Copyright (C) 1999-2000, 2008-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2008-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbrtowc.c b/lib/mbrtowc.c index 5743f437..e49d55b3 100644 --- a/lib/mbrtowc.c +++ b/lib/mbrtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2005-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbsalign.c b/lib/mbsalign.c index fe0e6408..69bd524e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/mbsalign.h b/lib/mbsalign.h index b3aa0fbf..a8597090 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/mbscasecmp.c b/lib/mbscasecmp.c index d52448fe..9288fb29 100644 --- a/lib/mbscasecmp.c +++ b/lib/mbscasecmp.c @@ -1,5 +1,5 @@ /* Case-insensitive string comparison function. - Copyright (C) 1998-1999, 2005-2014 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2005, based on earlier glibc code. diff --git a/lib/mbsinit.c b/lib/mbsinit.c index df4bcd18..4effdd80 100644 --- a/lib/mbsinit.c +++ b/lib/mbsinit.c @@ -1,5 +1,5 @@ /* Test for initial conversion state. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbslen.c b/lib/mbslen.c index 74c6ec12..011f821d 100644 --- a/lib/mbslen.c +++ b/lib/mbslen.c @@ -1,5 +1,5 @@ /* Counting the multibyte characters in a string. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 d42af012..a0f42717 100644 --- a/lib/mbsrtowcs-impl.h +++ b/lib/mbsrtowcs-impl.h @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 2a7019aa..522eb690 100644 --- a/lib/mbsrtowcs-state.c +++ b/lib/mbsrtowcs-state.c @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbsrtowcs.c b/lib/mbsrtowcs.c index 136ec343..c37eba72 100644 --- a/lib/mbsrtowcs.c +++ b/lib/mbsrtowcs.c @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbsstr.c b/lib/mbsstr.c index 1ae9fe42..a38f3013 100644 --- a/lib/mbsstr.c +++ b/lib/mbsstr.c @@ -1,5 +1,5 @@ /* Searching in a string. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2005. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbswidth.c b/lib/mbswidth.c index d39067a4..75ca79a8 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-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This program is free software: 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 ab7c1503..f5b0fc3e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2004, 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 3cc70b0e..5c60478a 100644 --- a/lib/mbtowc-impl.h +++ b/lib/mbtowc-impl.h @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbtowc.c b/lib/mbtowc.c index 93a74454..e58053d1 100644 --- a/lib/mbtowc.c +++ b/lib/mbtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbuiter.h b/lib/mbuiter.h index 1702f14c..acdec297 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001, 2005, 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/md5.c b/lib/md5.c index ece24ac9..30525dc8 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-2014 Free Software + Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/md5.h b/lib/md5.h index 1d6974ae..43add999 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-2014 Free Software + Copyright (C) 1995-1997, 1999-2001, 2004-2006, 2008-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/memcasecmp.c b/lib/memcasecmp.c index c24039a4..fab7f697 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-2014 Free Software + Copyright (C) 1996-1997, 2000, 2003, 2006, 2009-2015 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 8b53c302..7e440e93 100644 --- a/lib/memcasecmp.h +++ b/lib/memcasecmp.h @@ -1,6 +1,6 @@ /* Case-insensitive buffer comparator. - Copyright (C) 1996, 1998, 2003, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 1996, 1998, 2003, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 6709f6ea..f74cc9af 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-2014 +/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2015 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 3d79f2a2..d7468d9d 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-2014 +/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2015 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 220c2b54..d49c6e8d 100644 --- a/lib/memchr2.h +++ b/lib/memchr2.h @@ -1,5 +1,5 @@ /* Scan memory for the first of two bytes. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: 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 a31ed5b5..91a8b3dd 100644 --- a/lib/memcmp2.c +++ b/lib/memcmp2.c @@ -1,5 +1,5 @@ /* Compare two memory areas with possibly different lengths. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. 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 e346b389..3dd51382 100644 --- a/lib/memcmp2.h +++ b/lib/memcmp2.h @@ -1,5 +1,5 @@ /* Compare two memory areas with possibly different lengths. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. 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 51321048..0dfff3bd 100644 --- a/lib/memcoll.c +++ b/lib/memcoll.c @@ -1,6 +1,6 @@ /* Locale-specific memory comparison. - Copyright (C) 1999, 2002-2004, 2006, 2009-2014 Free Software Foundation, + Copyright (C) 1999, 2002-2004, 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/memcoll.h b/lib/memcoll.h index 7f193b85..722479a7 100644 --- a/lib/memcoll.h +++ b/lib/memcoll.h @@ -1,6 +1,6 @@ /* Locale-specific memory comparison. - Copyright (C) 1999, 2003, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 1999, 2003, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 ff83ee11..e9f2e34f 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-2014 Free Software Foundation, Inc. + Copyright (C) 2003, 2007, 2009-2015 Free Software Foundation, Inc. This program is free software; 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 742a0c9b..3827208d 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-2014 Free Software + Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2015 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 9d302e74..6acb0191 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,6 +33,12 @@ #include "getugroups.h" #include "xalloc-oversized.h" +/* Work around an incompatibility of OS X 10.11: getgrouplist + accepts int *, not gid_t *, and int and gid_t differ in sign. */ +#if 4 < __GNUC__ + (3 <= __GNUC_MINOR__) +# pragma GCC diagnostic ignored "-Wpointer-sign" +#endif + static gid_t * realloc_groupbuf (gid_t *g, size_t num) { diff --git a/lib/mgetgroups.h b/lib/mgetgroups.h index 8ccac074..51f2ea54 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 0638b194..91ed694a 100644 --- a/lib/mkancesdirs.c +++ b/lib/mkancesdirs.c @@ -1,6 +1,6 @@ /* Make a file's ancestor directories. - Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 188fa3a4..e55b1ddf 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-2014 Free Software + Copyright (C) 1990, 1997-2000, 2002-2007, 2009-2015 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 c6d37aa9..a85c5e9c 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-2014 Free Software + Copyright (C) 1994-1997, 2000, 2003-2006, 2009-2015 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 481bbf37..37de12e3 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2006, 2008-2015 Free Software Foundation, Inc. This program is free software: 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 a04b2252..ae4b9309 100644 --- a/lib/mkfifo.c +++ b/lib/mkfifo.c @@ -1,5 +1,5 @@ /* Create a named fifo. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: 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 c738e591..86a7c39d 100644 --- a/lib/mknod.c +++ b/lib/mknod.c @@ -1,5 +1,5 @@ /* Create a device inode. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: 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 03a205f3..7d350403 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 ce9c6db8..f9096a8f 100644 --- a/lib/mkstemp.c +++ b/lib/mkstemp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2014 Free Software +/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2015 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 48b3a40f..580bc8ed 100644 --- a/lib/mktime.c +++ b/lib/mktime.c @@ -1,5 +1,5 @@ /* Convert a 'struct tm' to a time_t value. - Copyright (C) 1993-2014 Free Software Foundation, Inc. + Copyright (C) 1993-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Paul Eggert . diff --git a/lib/modechange.c b/lib/modechange.c index 412fe1d2..9f707546 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-2014 Free Software + Copyright (C) 1989-1990, 1997-1999, 2001, 2003-2006, 2009-2015 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 e969ba97..db80ddf2 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-2014 Free Software + Copyright (C) 1989-1990, 1997, 2003-2006, 2009-2015 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 b3be011a..6f04f555 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-2014 Free Software Foundation, Inc. + Copyright (C) 1991-1992, 1997-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -58,6 +58,7 @@ #ifdef MOUNTED_GETMNTENT1 /* 4.3BSD, SunOS, HP-UX, Dynix, Irix. */ # include +# include # if !defined MOUNTED # if defined _PATH_MOUNTED /* GNU libc */ # define MOUNTED _PATH_MOUNTED @@ -151,8 +152,12 @@ /* The results of opendir() in this file are not used with dirfd and fchdir, therefore save some unnecessary work in fchdir.c. */ -#undef opendir -#undef closedir +#ifdef GNULIB_defined_opendir +# undef opendir +#endif +#ifdef GNULIB_defined_closedir +# undef closedir +#endif #define ME_DUMMY_0(Fs_name, Fs_type) \ (strcmp (Fs_type, "autofs") == 0 \ @@ -177,10 +182,9 @@ 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) \ +# define ME_DUMMY(Fs_name, Fs_type, Bind) \ (ME_DUMMY_0 (Fs_name, Fs_type) \ - || (strcmp (Fs_type, "none") == 0 \ - && !hasmntopt (Fs_ent, "bind"))) + || (strcmp (Fs_type, "none") == 0 && !Bind)) #else # define ME_DUMMY(Fs_name, Fs_type) \ (ME_DUMMY_0 (Fs_name, Fs_type) || strcmp (Fs_type, "none") == 0) @@ -383,6 +387,34 @@ dev_from_mount_options (char const *mount_options) #endif +#if defined MOUNTED_GETMNTENT1 && defined __linux__ + +/* Unescape the paths in mount tables. + STR is updated in place. */ + +static void +unescape_tab (char *str) +{ + size_t i, j = 0; + size_t len = strlen (str) + 1; + for (i = 0; i < len; i++) + { + if (str[i] == '\\' && (i + 4 < len) + && str[i + 1] >= '0' && str[i + 1] <= '3' + && str[i + 2] >= '0' && str[i + 2] <= '7' + && str[i + 3] >= '0' && str[i + 3] <= '7') + { + str[j++] = (str[i + 1] - '0') * 64 + + (str[i + 2] - '0') * 8 + + (str[i + 3] - '0'); + i += 3; + } + else + str[j++] = str[i]; + } +} +#endif + /* Return a list of the currently mounted file systems, or NULL on error. Add each entry to the tail of the list so that they stay in order. If NEED_FS_TYPE is true, ensure that the file system type fields in @@ -429,32 +461,125 @@ read_file_system_list (bool need_fs_type) #ifdef MOUNTED_GETMNTENT1 /* GNU/Linux, 4.3BSD, SunOS, HP-UX, Dynix, Irix. */ { - struct mntent *mnt; - char const *table = MOUNTED; FILE *fp; - fp = setmntent (table, "r"); - if (fp == NULL) - return NULL; - - while ((mnt = getmntent (fp))) +#ifdef __linux__ + /* Try parsing mountinfo first, as that make device IDs available. + Note we could use libmount routines to simplify this parsing a little + (and that code is in previous versions of this function), however + libmount depends on libselinux which pulls in many dependencies. */ + char const *mountinfo = "/proc/self/mountinfo"; + fp = fopen (mountinfo, "r"); + if (fp != NULL) { - me = xmalloc (sizeof *me); - me->me_devname = xstrdup (mnt->mnt_fsname); - 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, mnt); - me->me_remote = ME_REMOTE (me->me_devname, me->me_type); - me->me_dev = dev_from_mount_options (mnt->mnt_opts); + char *line = NULL; + size_t buf_size = 0; - /* Add to the linked list. */ - *mtail = me; - mtail = &me->me_next; + while (getline (&line, &buf_size, fp) != -1) + { + unsigned int devmaj, devmin; + int target_s, target_e, type_s, type_e, source_s, source_e; + char test; + char *dash; + int rc; + + rc = sscanf(line, "%*u " /* id - discarded */ + "%*u " /* parent - discarded */ + "%u:%u " /* dev major:minor */ + "%*s " /* mountroot - discarded */ + "%n%*s%n" /* target, start and end */ + "%c", /* more data... */ + &devmaj, &devmin, + &target_s, &target_e, + &test); + if (rc != 3 && rc != 5) /* 5 if %n included in count. */ + continue; + + /* skip optional fields, terminated by " - " */ + dash = strstr (line + target_e, " - "); + if (! dash) + continue; + + rc = sscanf(dash, " - " + "%n%*s%n " /* FS type, start and end */ + "%n%*s%n " /* source, start and end */ + "%c", /* more data... */ + &type_s, &type_e, + &source_s, &source_e, + &test); + if (rc != 1 && rc != 5) /* 5 if %n included in count. */ + continue; + + /* manipulate the sub-strings in place. */ + line[target_e] = '\0'; + dash[type_e] = '\0'; + dash[source_e] = '\0'; + unescape_tab (dash + source_s); + unescape_tab (line + target_s); + + me = xmalloc (sizeof *me); + + me->me_devname = xstrdup (dash + source_s); + me->me_mountdir = xstrdup (line + target_s); + me->me_type = xstrdup (dash + type_s); + me->me_type_malloced = 1; + me->me_dev = makedev (devmaj, devmin); + /* we pass "false" for the "Bind" option as that's only + significant when the Fs_type is "none" which will not be + the case when parsing "/proc/self/mountinfo", and only + applies for static /etc/mtab files. */ + me->me_dummy = ME_DUMMY (me->me_devname, me->me_type, false); + me->me_remote = ME_REMOTE (me->me_devname, me->me_type); + + /* Add to the linked list. */ + *mtail = me; + mtail = &me->me_next; + } + + free (line); + + if (ferror (fp)) + { + int saved_errno = errno; + fclose (fp); + errno = saved_errno; + goto free_then_fail; + } + + if (fclose (fp) == EOF) + goto free_then_fail; } + else /* fallback to /proc/self/mounts (/etc/mtab). */ +#endif /* __linux __ */ + { + struct mntent *mnt; + char const *table = MOUNTED; - if (endmntent (fp) == 0) - goto free_then_fail; + fp = setmntent (table, "r"); + if (fp == NULL) + return NULL; + + while ((mnt = getmntent (fp))) + { + bool bind = hasmntopt (mnt, "bind"); + + me = xmalloc (sizeof *me); + me->me_devname = xstrdup (mnt->mnt_fsname); + 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, bind); + me->me_remote = ME_REMOTE (me->me_devname, me->me_type); + me->me_dev = dev_from_mount_options (mnt->mnt_opts); + + /* Add to the linked list. */ + *mtail = me; + mtail = &me->me_next; + } + + if (endmntent (fp) == 0) + goto free_then_fail; + } } #endif /* MOUNTED_GETMNTENT1. */ @@ -845,18 +970,20 @@ read_file_system_list (bool need_fs_type) #ifdef MOUNTED_VMOUNT /* AIX. */ { int bufsize; - char *entries, *thisent; + void *entries; + char *thisent; struct vmount *vmp; int n_entries; int i; /* Ask how many bytes to allocate for the mounted file system info. */ - if (mntctl (MCTL_QUERY, sizeof bufsize, (struct vmount *) &bufsize) != 0) + entries = &bufsize; + if (mntctl (MCTL_QUERY, sizeof bufsize, entries) != 0) return NULL; entries = xmalloc (bufsize); /* Get the list of mounted file systems. */ - n_entries = mntctl (MCTL_QUERY, bufsize, (struct vmount *) entries); + n_entries = mntctl (MCTL_QUERY, bufsize, entries); if (n_entries < 0) { int saved_errno = errno; @@ -955,7 +1082,7 @@ read_file_system_list (bool need_fs_type) return mount_list; - free_then_fail: + free_then_fail: _GL_UNUSED_LABEL { int saved_errno = errno; *mtail = NULL; diff --git a/lib/mountlist.h b/lib/mountlist.h index 1e4dfae8..735776b0 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-2014 Free Software + Copyright (C) 1991-1992, 1998, 2000-2005, 2009-2015 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 08a8b3da..858001f9 100644 --- a/lib/mpsort.c +++ b/lib/mpsort.c @@ -1,6 +1,6 @@ /* Sort a vector of pointers to data. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 f83827fb..a1f1dc0e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software; 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 a0ef540f..8b07269a 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software; 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 b1e5f0c9..90cf8014 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software; 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 0d4dea58..67b151e6 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software; 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 d0b12e7a..3060db09 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-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002, 2004-2015 Free Software Foundation, Inc. This program is free software: 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 bb9d34ab..33948b36 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 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 f0129dfe..1a0d2597 100644 --- a/lib/netinet_in.in.h +++ b/lib/netinet_in.in.h @@ -1,5 +1,5 @@ /* Substitute for . - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software; 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 1ab551d0..79b0406e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: 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 cadf959b..562bb58c 100644 --- a/lib/nproc.c +++ b/lib/nproc.c @@ -1,6 +1,6 @@ /* Detect the number of processors. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/nproc.h b/lib/nproc.h index 0cf65839..3dbd6494 100644 --- a/lib/nproc.h +++ b/lib/nproc.h @@ -1,6 +1,6 @@ /* Detect the number of processors. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software; 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 2db87b35..dd6e1f70 100644 --- a/lib/obstack.c +++ b/lib/obstack.c @@ -1,5 +1,5 @@ /* obstack.c - subroutines used implicitly by object stack macros - Copyright (C) 1988-2014 Free Software Foundation, Inc. + Copyright (C) 1988-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -19,16 +19,14 @@ #ifdef _LIBC # include -# include #else # include # include "obstack.h" #endif -/* NOTE BEFORE MODIFYING THIS FILE: This version number must be - incremented whenever callers compiled using an old obstack.h can no - longer properly call the functions in this obstack.c. */ -#define OBSTACK_INTERFACE_VERSION 1 +/* NOTE BEFORE MODIFYING THIS FILE: _OBSTACK_INTERFACE_VERSION in + obstack.h must be incremented whenever callers compiled using an old + obstack.h can no longer properly call the functions in this file. */ /* Comment out all this code if we are using the GNU C Library, and are not actually compiling the library itself, and the installed library @@ -38,113 +36,78 @@ (especially if it is a shared library). Rather than having every GNU program understand 'configure --with-gnu-libc' and omit the object files, it is simpler to just do this in the source for each such file. */ - -#include /* Random thing to get __GNU_LIBRARY__. */ #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 # include -# if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION -# define ELIDE_CODE +# if (_GNU_OBSTACK_INTERFACE_VERSION == _OBSTACK_INTERFACE_VERSION \ + || (_GNU_OBSTACK_INTERFACE_VERSION == 1 \ + && _OBSTACK_INTERFACE_VERSION == 2 \ + && defined SIZEOF_INT && defined SIZEOF_SIZE_T \ + && SIZEOF_INT == SIZEOF_SIZE_T)) +# define _OBSTACK_ELIDE_CODE # endif #endif -#include - -#ifndef ELIDE_CODE - - -# include - -/* Determine default alignment. */ -union fooround -{ - uintmax_t i; - long double d; - void *p; -}; -struct fooalign -{ - char c; - union fooround u; -}; -/* If malloc were really smart, it would round addresses to DEFAULT_ALIGNMENT. - But in fact it might be less smart and round addresses to as much as - DEFAULT_ROUNDING. So we prepare for it to do that. */ -enum -{ - DEFAULT_ALIGNMENT = offsetof (struct fooalign, u), - DEFAULT_ROUNDING = sizeof (union fooround) -}; - -/* When we copy a long block of data, this is the unit to do it with. - On some machines, copying successive ints does not work; - in such a case, redefine COPYING_UNIT to 'long' (if that works) - or 'char' as a last resort. */ -# ifndef COPYING_UNIT -# define COPYING_UNIT int +#ifndef _OBSTACK_ELIDE_CODE +/* If GCC, or if an oddball (testing?) host that #defines __alignof__, + use the already-supplied __alignof__. Otherwise, this must be Gnulib + (as glibc assumes GCC); defer to Gnulib's alignof_type. */ +# if !defined __GNUC__ && !defined __alignof__ +# include +# define __alignof__(type) alignof_type (type) # endif - - -/* The functions allocating more room by calling 'obstack_chunk_alloc' - jump to the handler pointed to by 'obstack_alloc_failed_handler'. - This can be set to a user defined function which should either - abort gracefully or use longjump - but shouldn't return. This - variable by default points to the internal function - 'print_and_abort'. */ -static _Noreturn void print_and_abort (void); -void (*obstack_alloc_failed_handler) (void) = print_and_abort; - -/* Exit value used when 'print_and_abort' is used. */ # include -# ifdef _LIBC -int obstack_exit_failure = EXIT_FAILURE; -# else -# include "exitfail.h" -# define obstack_exit_failure exit_failure -# endif +# include -# ifdef _LIBC -# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4) -/* A looong time ago (before 1994, anyway; we're not sure) this global variable - was used by non-GNU-C macros to avoid multiple evaluation. The GNU C - library still exports it because somebody might use it. */ -struct obstack *_obstack_compat = 0; -compat_symbol (libc, _obstack_compat, _obstack, GLIBC_2_0); -# endif +# ifndef MAX +# define MAX(a,b) ((a) > (b) ? (a) : (b)) # endif -/* Define a macro that either calls functions with the traditional malloc/free - calling interface, or calls functions with the mmalloc/mfree interface - (that adds an extra first argument), based on the state of use_extra_arg. - For free, do not use ?:, since some compilers, like the MIPS compilers, - do not allow (expr) ? void : void. */ +/* Determine default alignment. */ -# define CALL_CHUNKFUN(h, size) \ - (((h)->use_extra_arg) \ - ? (*(h)->chunkfun)((h)->extra_arg, (size)) \ - : (*(struct _obstack_chunk *(*)(long))(h)->chunkfun)((size))) +/* If malloc were really smart, it would round addresses to DEFAULT_ALIGNMENT. + But in fact it might be less smart and round addresses to as much as + DEFAULT_ROUNDING. So we prepare for it to do that. + + DEFAULT_ALIGNMENT cannot be an enum constant; see gnulib's alignof.h. */ +#define DEFAULT_ALIGNMENT MAX (__alignof__ (long double), \ + MAX (__alignof__ (uintmax_t), \ + __alignof__ (void *))) +#define DEFAULT_ROUNDING MAX (sizeof (long double), \ + MAX (sizeof (uintmax_t), \ + sizeof (void *))) + +/* Call functions with either the traditional malloc/free calling + interface, or the mmalloc/mfree interface (that adds an extra first + argument), based on the value of use_extra_arg. */ + +static void * +call_chunkfun (struct obstack *h, size_t size) +{ + if (h->use_extra_arg) + return h->chunkfun.extra (h->extra_arg, size); + else + return h->chunkfun.plain (size); +} -# define CALL_FREEFUN(h, old_chunk) \ - do { \ - if ((h)->use_extra_arg) \ - (*(h)->freefun)((h)->extra_arg, (old_chunk)); \ - else \ - (*(void (*)(void *))(h)->freefun)((old_chunk)); \ - } while (0) +static void +call_freefun (struct obstack *h, void *old_chunk) +{ + if (h->use_extra_arg) + h->freefun.extra (h->extra_arg, old_chunk); + else + h->freefun.plain (old_chunk); +} /* Initialize an obstack H for use. Specify chunk size SIZE (0 means default). Objects start on multiples of ALIGNMENT (0 means use default). - CHUNKFUN is the function to use to allocate chunks, - and FREEFUN the function to free them. Return nonzero if successful, calls obstack_alloc_failed_handler if allocation fails. */ -int -_obstack_begin (struct obstack *h, - int size, int alignment, - void *(*chunkfun) (long), - void (*freefun) (void *)) +static int +_obstack_begin_worker (struct obstack *h, + _OBSTACK_SIZE_T size, _OBSTACK_SIZE_T alignment) { struct _obstack_chunk *chunk; /* points to new chunk */ @@ -167,19 +130,15 @@ _obstack_begin (struct obstack *h, size = 4096 - extra; } - h->chunkfun = (struct _obstack_chunk * (*) (void *, long)) chunkfun; - h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun; h->chunk_size = size; h->alignment_mask = alignment - 1; - h->use_extra_arg = 0; - chunk = h->chunk = CALL_CHUNKFUN (h, h->chunk_size); + chunk = h->chunk = call_chunkfun (h, h->chunk_size); if (!chunk) (*obstack_alloc_failed_handler) (); h->next_free = h->object_base = __PTR_ALIGN ((char *) chunk, chunk->contents, alignment - 1); - h->chunk_limit = chunk->limit - = (char *) chunk + h->chunk_size; + h->chunk_limit = chunk->limit = (char *) chunk + h->chunk_size; chunk->prev = 0; /* The initial chunk now contains no empty object. */ h->maybe_empty_object = 0; @@ -188,51 +147,29 @@ _obstack_begin (struct obstack *h, } int -_obstack_begin_1 (struct obstack *h, int size, int alignment, - void *(*chunkfun) (void *, long), +_obstack_begin (struct obstack *h, + _OBSTACK_SIZE_T size, _OBSTACK_SIZE_T alignment, + void *(*chunkfun) (size_t), + void (*freefun) (void *)) +{ + h->chunkfun.plain = chunkfun; + h->freefun.plain = freefun; + h->use_extra_arg = 0; + return _obstack_begin_worker (h, size, alignment); +} + +int +_obstack_begin_1 (struct obstack *h, + _OBSTACK_SIZE_T size, _OBSTACK_SIZE_T alignment, + void *(*chunkfun) (void *, size_t), void (*freefun) (void *, void *), void *arg) { - struct _obstack_chunk *chunk; /* points to new chunk */ - - if (alignment == 0) - alignment = DEFAULT_ALIGNMENT; - if (size == 0) - /* Default size is what GNU malloc can fit in a 4096-byte block. */ - { - /* 12 is sizeof (mhead) and 4 is EXTRA from GNU malloc. - Use the values for range checking, because if range checking is off, - the extra bytes won't be missed terribly, but if range checking is on - and we used a larger request, a whole extra 4096 bytes would be - allocated. - - These number are irrelevant to the new GNU malloc. I suspect it is - less sensitive to the size of the request. */ - int extra = ((((12 + DEFAULT_ROUNDING - 1) & ~(DEFAULT_ROUNDING - 1)) - + 4 + DEFAULT_ROUNDING - 1) - & ~(DEFAULT_ROUNDING - 1)); - size = 4096 - extra; - } - - h->chunkfun = (struct _obstack_chunk * (*)(void *,long)) chunkfun; - h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun; - h->chunk_size = size; - h->alignment_mask = alignment - 1; + h->chunkfun.extra = chunkfun; + h->freefun.extra = freefun; h->extra_arg = arg; h->use_extra_arg = 1; - - chunk = h->chunk = CALL_CHUNKFUN (h, h->chunk_size); - if (!chunk) - (*obstack_alloc_failed_handler) (); - h->next_free = h->object_base = __PTR_ALIGN ((char *) chunk, chunk->contents, - alignment - 1); - h->chunk_limit = chunk->limit - = (char *) chunk + h->chunk_size; - chunk->prev = 0; - /* The initial chunk now contains no empty object. */ - h->maybe_empty_object = 0; - h->alloc_failed = 0; - return 1; + return _obstack_begin_worker (h, size, alignment); } /* Allocate a new current chunk for the obstack *H @@ -242,23 +179,25 @@ _obstack_begin_1 (struct obstack *h, int size, int alignment, to the beginning of the new one. */ void -_obstack_newchunk (struct obstack *h, int length) +_obstack_newchunk (struct obstack *h, _OBSTACK_SIZE_T length) { struct _obstack_chunk *old_chunk = h->chunk; - struct _obstack_chunk *new_chunk; - long new_size; - long obj_size = h->next_free - h->object_base; - long i; - long already; + struct _obstack_chunk *new_chunk = 0; + size_t obj_size = h->next_free - h->object_base; char *object_base; /* Compute size for new chunk. */ - new_size = (obj_size + length) + (obj_size >> 3) + h->alignment_mask + 100; + size_t sum1 = obj_size + length; + size_t sum2 = sum1 + h->alignment_mask; + size_t new_size = sum2 + (obj_size >> 3) + 100; + if (new_size < sum2) + new_size = sum2; if (new_size < h->chunk_size) new_size = h->chunk_size; /* Allocate and initialize the new chunk. */ - new_chunk = CALL_CHUNKFUN (h, new_size); + if (obj_size <= sum1 && sum1 <= sum2) + new_chunk = call_chunkfun (h, new_size); if (!new_chunk) (*obstack_alloc_failed_handler)(); h->chunk = new_chunk; @@ -269,25 +208,8 @@ _obstack_newchunk (struct obstack *h, int length) object_base = __PTR_ALIGN ((char *) new_chunk, new_chunk->contents, h->alignment_mask); - /* Move the existing object to the new chunk. - Word at a time is fast and is safe if the object - is sufficiently aligned. */ - if (h->alignment_mask + 1 >= DEFAULT_ALIGNMENT) - { - for (i = obj_size / sizeof (COPYING_UNIT) - 1; - i >= 0; i--) - ((COPYING_UNIT *) object_base)[i] - = ((COPYING_UNIT *) h->object_base)[i]; - /* We used to copy the odd few remaining bytes as one extra COPYING_UNIT, - but that can cross a page boundary on a machine - which does not do strict alignment for COPYING_UNITS. */ - already = obj_size / sizeof (COPYING_UNIT) * sizeof (COPYING_UNIT); - } - else - already = 0; - /* Copy remaining bytes one by one. */ - for (i = already; i < obj_size; i++) - object_base[i] = h->object_base[i]; + /* Move the existing object to the new chunk. */ + memcpy (object_base, h->object_base, obj_size); /* If the object just copied was the only data in OLD_CHUNK, free that chunk and remove it from the chain. @@ -298,7 +220,7 @@ _obstack_newchunk (struct obstack *h, int length) h->alignment_mask))) { new_chunk->prev = old_chunk->prev; - CALL_FREEFUN (h, old_chunk); + call_freefun (h, old_chunk); } h->object_base = object_base; @@ -306,9 +228,6 @@ _obstack_newchunk (struct obstack *h, int length) /* The new chunk certainly contains no empty object yet. */ h->maybe_empty_object = 0; } -# ifdef _LIBC -libc_hidden_def (_obstack_newchunk) -# endif /* Return nonzero if object OBJ has been allocated from obstack H. This is here for debugging. @@ -339,10 +258,8 @@ _obstack_allocated_p (struct obstack *h, void *obj) /* Free objects in obstack H, including OBJ and everything allocate more recently than OBJ. If OBJ is zero, free everything in H. */ -# undef obstack_free - void -__obstack_free (struct obstack *h, void *obj) +_obstack_free (struct obstack *h, void *obj) { struct _obstack_chunk *lp; /* below addr of any objects in this chunk */ struct _obstack_chunk *plp; /* point to previous chunk if any */ @@ -354,7 +271,7 @@ __obstack_free (struct obstack *h, void *obj) while (lp != 0 && ((void *) lp >= obj || (void *) (lp)->limit < obj)) { plp = lp->prev; - CALL_FREEFUN (h, lp); + call_freefun (h, lp); lp = plp; /* If we switch chunks, we can't tell whether the new current chunk contains an empty object, so assume that it may. */ @@ -371,17 +288,11 @@ __obstack_free (struct obstack *h, void *obj) abort (); } -# ifdef _LIBC -/* Older versions of libc used a function _obstack_free intended to be - called by non-GCC compilers. */ -strong_alias (obstack_free, _obstack_free) -# endif - -int +_OBSTACK_SIZE_T _obstack_memory_used (struct obstack *h) { struct _obstack_chunk *lp; - int nbytes = 0; + _OBSTACK_SIZE_T nbytes = 0; for (lp = h->chunk; lp != 0; lp = lp->prev) { @@ -390,19 +301,30 @@ _obstack_memory_used (struct obstack *h) return nbytes; } +# ifndef _OBSTACK_NO_ERROR_HANDLER /* Define the error handler. */ -# ifdef _LIBC -# include -# else -# include "gettext.h" -# endif -# ifndef _ -# define _(msgid) gettext (msgid) -# endif +# include -# ifdef _LIBC -# include -# endif +/* Exit value used when 'print_and_abort' is used. */ +# ifdef _LIBC +int obstack_exit_failure = EXIT_FAILURE; +# else +# include "exitfail.h" +# define obstack_exit_failure exit_failure +# endif + +# ifdef _LIBC +# include +# else +# include "gettext.h" +# endif +# ifndef _ +# define _(msgid) gettext (msgid) +# endif + +# ifdef _LIBC +# include +# endif static _Noreturn void print_and_abort (void) @@ -412,12 +334,20 @@ print_and_abort (void) happen because the "memory exhausted" message appears in other places like this and the translation should be reused instead of creating a very similar string which requires a separate translation. */ -# ifdef _LIBC +# ifdef _LIBC (void) __fxprintf (NULL, "%s\n", _("memory exhausted")); -# else +# else fprintf (stderr, "%s\n", _("memory exhausted")); -# endif +# endif exit (obstack_exit_failure); } -#endif /* !ELIDE_CODE */ +/* The functions allocating more room by calling 'obstack_chunk_alloc' + jump to the handler pointed to by 'obstack_alloc_failed_handler'. + This can be set to a user defined function which should either + abort gracefully or use longjump - but shouldn't return. This + variable by default points to the internal function + 'print_and_abort'. */ +void (*obstack_alloc_failed_handler) (void) = print_and_abort; +# endif /* !_OBSTACK_NO_ERROR_HANDLER */ +#endif /* !_OBSTACK_ELIDE_CODE */ diff --git a/lib/obstack.h b/lib/obstack.h index ebaa622f..2b7d13b7 100644 --- a/lib/obstack.h +++ b/lib/obstack.h @@ -1,5 +1,5 @@ /* obstack.h - object stack macros - Copyright (C) 1988-2014 Free Software Foundation, Inc. + Copyright (C) 1988-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -104,16 +104,24 @@ #ifndef _OBSTACK_H #define _OBSTACK_H 1 -/* We need the type of a pointer subtraction. If __PTRDIFF_TYPE__ is - defined, as with GNU C, use that; that way we don't pollute the - namespace with 's symbols. Otherwise, include - and use ptrdiff_t. */ +#ifndef _OBSTACK_INTERFACE_VERSION +# define _OBSTACK_INTERFACE_VERSION 2 +#endif + +#include /* For size_t and ptrdiff_t. */ +#include /* For __GNU_LIBRARY__, and memcpy. */ -#ifdef __PTRDIFF_TYPE__ -# define PTR_INT_TYPE __PTRDIFF_TYPE__ +#if _OBSTACK_INTERFACE_VERSION == 1 +/* For binary compatibility with obstack version 1, which used "int" + and "long" for these two types. */ +# define _OBSTACK_SIZE_T unsigned int +# define _CHUNK_SIZE_T unsigned long +# define _OBSTACK_CAST(type, expr) ((type) (expr)) #else -# include -# define PTR_INT_TYPE ptrdiff_t +/* Version 2 with sane types, especially for 64-bit hosts. */ +# define _OBSTACK_SIZE_T size_t +# define _CHUNK_SIZE_T size_t +# define _OBSTACK_CAST(type, expr) (expr) #endif /* If B is the base of an object addressed by P, return the result of @@ -122,19 +130,17 @@ #define __BPTR_ALIGN(B, P, A) ((B) + (((P) - (B) + (A)) & ~(A))) -/* Similar to _BPTR_ALIGN (B, P, A), except optimize the common case +/* Similar to __BPTR_ALIGN (B, P, A), except optimize the common case where pointers can be converted to integers, aligned as integers, - and converted back again. If PTR_INT_TYPE is narrower than a + and converted back again. If ptrdiff_t is narrower than a pointer (e.g., the AS/400), play it safe and compute the alignment relative to B. Otherwise, use the faster strategy of computing the alignment relative to 0. */ #define __PTR_ALIGN(B, P, A) \ - __BPTR_ALIGN (sizeof (PTR_INT_TYPE) < sizeof (void *) ? (B) : (char *) 0, \ + __BPTR_ALIGN (sizeof (ptrdiff_t) < sizeof (void *) ? (B) : (char *) 0, \ P, A) -#include - #ifndef __attribute_pure__ # define __attribute_pure__ _GL_ATTRIBUTE_PURE #endif @@ -152,22 +158,30 @@ struct _obstack_chunk /* Lives at front of each chunk. */ struct obstack /* control current object in current chunk */ { - long chunk_size; /* preferred size to allocate chunks in */ + _CHUNK_SIZE_T chunk_size; /* preferred size to allocate chunks in */ struct _obstack_chunk *chunk; /* address of current struct obstack_chunk */ char *object_base; /* address of object we are building */ char *next_free; /* where to add next char to current object */ char *chunk_limit; /* address of char after current chunk */ union { - PTR_INT_TYPE tempint; - void *tempptr; + _OBSTACK_SIZE_T i; + void *p; } temp; /* Temporary for some macros. */ - int alignment_mask; /* Mask of alignment for each object. */ - /* These prototypes vary based on 'use_extra_arg', and we use - casts to the prototypeless function type in all assignments, - but having prototypes here quiets -Wstrict-prototypes. */ - struct _obstack_chunk *(*chunkfun) (void *, long); - void (*freefun) (void *, struct _obstack_chunk *); + _OBSTACK_SIZE_T alignment_mask; /* Mask of alignment for each object. */ + + /* These prototypes vary based on 'use_extra_arg'. */ + union + { + void *(*plain) (size_t); + void *(*extra) (void *, size_t); + } chunkfun; + union + { + void (*plain) (void *); + void (*extra) (void *, void *); + } freefun; + void *extra_arg; /* first arg for chunk alloc/dealloc funcs */ unsigned use_extra_arg : 1; /* chunk alloc/dealloc funcs take extra arg */ unsigned maybe_empty_object : 1; /* There is a possibility that the current @@ -181,20 +195,17 @@ struct obstack /* control current object in current chunk */ /* Declare the external functions we use; they are in obstack.c. */ -extern void _obstack_newchunk (struct obstack *, int); -extern int _obstack_begin (struct obstack *, int, int, - void *(*)(long), void (*)(void *)); -extern int _obstack_begin_1 (struct obstack *, int, int, - void *(*)(void *, long), - void (*)(void *, void *), void *); -extern int _obstack_memory_used (struct obstack *) __attribute_pure__; - -/* The default name of the function for freeing a chunk is 'obstack_free', - but gnulib users can override this by defining '__obstack_free'. */ -#ifndef __obstack_free -# define __obstack_free obstack_free -#endif -extern void __obstack_free (struct obstack *, void *); +extern void _obstack_newchunk (struct obstack *, _OBSTACK_SIZE_T); +extern void _obstack_free (struct obstack *, void *); +extern int _obstack_begin (struct obstack *, + _OBSTACK_SIZE_T, _OBSTACK_SIZE_T, + void *(*) (size_t), void (*) (void *)); +extern int _obstack_begin_1 (struct obstack *, + _OBSTACK_SIZE_T, _OBSTACK_SIZE_T, + void *(*) (void *, size_t), + void (*) (void *, void *), void *); +extern _OBSTACK_SIZE_T _obstack_memory_used (struct obstack *) + __attribute_pure__; /* Error handler called when 'obstack_chunk_alloc' failed to allocate @@ -218,7 +229,7 @@ extern int obstack_exit_failure; /* Pointer to next byte not yet allocated in current chunk. */ -#define obstack_next_free(h) ((h)->next_free) +#define obstack_next_free(h) ((void *) (h)->next_free) /* Mask specifying low bits that should be clear in address of an object. */ @@ -227,38 +238,38 @@ extern int obstack_exit_failure; /* To prevent prototype warnings provide complete argument list. */ #define obstack_init(h) \ _obstack_begin ((h), 0, 0, \ - (void *(*)(long))obstack_chunk_alloc, \ - (void (*)(void *))obstack_chunk_free) + _OBSTACK_CAST (void *(*) (size_t), obstack_chunk_alloc), \ + _OBSTACK_CAST (void (*) (void *), obstack_chunk_free)) #define obstack_begin(h, size) \ _obstack_begin ((h), (size), 0, \ - (void *(*)(long))obstack_chunk_alloc, \ - (void (*)(void *))obstack_chunk_free) + _OBSTACK_CAST (void *(*) (size_t), obstack_chunk_alloc), \ + _OBSTACK_CAST (void (*) (void *), obstack_chunk_free)) -#define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \ +#define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \ _obstack_begin ((h), (size), (alignment), \ - (void *(*)(long))(chunkfun), \ - (void (*)(void *))(freefun)) + _OBSTACK_CAST (void *(*) (size_t), chunkfun), \ + _OBSTACK_CAST (void (*) (void *), freefun)) #define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \ _obstack_begin_1 ((h), (size), (alignment), \ - (void *(*)(void *, long))(chunkfun), \ - (void (*)(void *, void *))(freefun), (arg)) + _OBSTACK_CAST (void *(*) (void *, size_t), chunkfun), \ + _OBSTACK_CAST (void (*) (void *, void *), freefun), arg) -#define obstack_chunkfun(h, newchunkfun) \ - ((h)->chunkfun = (struct _obstack_chunk *(*)(void *, long))(newchunkfun)) +#define obstack_chunkfun(h, newchunkfun) \ + ((void) ((h)->chunkfun.extra = (void *(*) (void *, size_t)) (newchunkfun))) -#define obstack_freefun(h, newfreefun) \ - ((h)->freefun = (void (*)(void *, struct _obstack_chunk *))(newfreefun)) +#define obstack_freefun(h, newfreefun) \ + ((void) ((h)->freefun.extra = (void *(*) (void *, void *)) (newfreefun))) -#define obstack_1grow_fast(h, achar) (*((h)->next_free)++ = (achar)) +#define obstack_1grow_fast(h, achar) ((void) (*((h)->next_free)++ = (achar))) -#define obstack_blank_fast(h, n) ((h)->next_free += (n)) +#define obstack_blank_fast(h, n) ((void) ((h)->next_free += (n))) #define obstack_memory_used(h) _obstack_memory_used (h) #if defined __GNUC__ -# if ! (2 < __GNUC__ + (8 <= __GNUC_MINOR__)) +# if !defined __GNUC_MINOR__ || __GNUC__ * 1000 + __GNUC_MINOR__ < 2008 # define __extension__ # endif @@ -270,18 +281,20 @@ extern int obstack_exit_failure; # define obstack_object_size(OBSTACK) \ __extension__ \ ({ struct obstack const *__o = (OBSTACK); \ - (unsigned) (__o->next_free - __o->object_base); }) + (_OBSTACK_SIZE_T) (__o->next_free - __o->object_base); }) +/* The local variable is named __o1 to avoid a shadowed variable + warning when invoked from other obstack macros. */ # define obstack_room(OBSTACK) \ __extension__ \ - ({ struct obstack const *__o = (OBSTACK); \ - (unsigned) (__o->chunk_limit - __o->next_free); }) + ({ struct obstack const *__o1 = (OBSTACK); \ + (_OBSTACK_SIZE_T) (__o1->chunk_limit - __o1->next_free); }) # define obstack_make_room(OBSTACK, length) \ __extension__ \ ({ struct obstack *__o = (OBSTACK); \ - int __len = (length); \ - if (__o->chunk_limit - __o->next_free < __len) \ + _OBSTACK_SIZE_T __len = (length); \ + if (obstack_room (__o) < __len) \ _obstack_newchunk (__o, __len); \ (void) 0; }) @@ -296,8 +309,8 @@ extern int obstack_exit_failure; # define obstack_grow(OBSTACK, where, length) \ __extension__ \ ({ struct obstack *__o = (OBSTACK); \ - int __len = (length); \ - if (__o->next_free + __len > __o->chunk_limit) \ + _OBSTACK_SIZE_T __len = (length); \ + if (obstack_room (__o) < __len) \ _obstack_newchunk (__o, __len); \ memcpy (__o->next_free, where, __len); \ __o->next_free += __len; \ @@ -306,8 +319,8 @@ extern int obstack_exit_failure; # define obstack_grow0(OBSTACK, where, length) \ __extension__ \ ({ struct obstack *__o = (OBSTACK); \ - int __len = (length); \ - if (__o->next_free + __len + 1 > __o->chunk_limit) \ + _OBSTACK_SIZE_T __len = (length); \ + if (obstack_room (__o) < __len + 1) \ _obstack_newchunk (__o, __len + 1); \ memcpy (__o->next_free, where, __len); \ __o->next_free += __len; \ @@ -317,10 +330,9 @@ extern int obstack_exit_failure; # define obstack_1grow(OBSTACK, datum) \ __extension__ \ ({ struct obstack *__o = (OBSTACK); \ - if (__o->next_free + 1 > __o->chunk_limit) \ + if (obstack_room (__o) < 1) \ _obstack_newchunk (__o, 1); \ - obstack_1grow_fast (__o, datum); \ - (void) 0; }) + obstack_1grow_fast (__o, datum); }) /* These assume that the obstack alignment is good enough for pointers or ints, and that the data added so far to the current object @@ -329,14 +341,14 @@ extern int obstack_exit_failure; # define obstack_ptr_grow(OBSTACK, datum) \ __extension__ \ ({ struct obstack *__o = (OBSTACK); \ - if (__o->next_free + sizeof (void *) > __o->chunk_limit) \ + if (obstack_room (__o) < sizeof (void *)) \ _obstack_newchunk (__o, sizeof (void *)); \ - obstack_ptr_grow_fast (__o, datum); }) \ + obstack_ptr_grow_fast (__o, datum); }) # define obstack_int_grow(OBSTACK, datum) \ __extension__ \ ({ struct obstack *__o = (OBSTACK); \ - if (__o->next_free + sizeof (int) > __o->chunk_limit) \ + if (obstack_room (__o) < sizeof (int)) \ _obstack_newchunk (__o, sizeof (int)); \ obstack_int_grow_fast (__o, datum); }) @@ -359,11 +371,10 @@ extern int obstack_exit_failure; # define obstack_blank(OBSTACK, length) \ __extension__ \ ({ struct obstack *__o = (OBSTACK); \ - int __len = (length); \ - if (__o->chunk_limit - __o->next_free < __len) \ + _OBSTACK_SIZE_T __len = (length); \ + if (obstack_room (__o) < __len) \ _obstack_newchunk (__o, __len); \ - obstack_blank_fast (__o, __len); \ - (void) 0; }) + obstack_blank_fast (__o, __len); }) # define obstack_alloc(OBSTACK, length) \ __extension__ \ @@ -383,8 +394,8 @@ extern int obstack_exit_failure; obstack_grow0 (__h, (where), (length)); \ obstack_finish (__h); }) -/* The local variable is named __o1 to avoid a name conflict - when obstack_blank is called. */ +/* The local variable is named __o1 to avoid a shadowed variable + warning when invoked from other obstack macros, typically obstack_free. */ # define obstack_finish(OBSTACK) \ __extension__ \ ({ struct obstack *__o1 = (OBSTACK); \ @@ -394,8 +405,8 @@ extern int obstack_exit_failure; __o1->next_free \ = __PTR_ALIGN (__o1->object_base, __o1->next_free, \ __o1->alignment_mask); \ - if (__o1->next_free - (char *) __o1->chunk \ - > __o1->chunk_limit - (char *) __o1->chunk) \ + if ((size_t) (__o1->next_free - (char *) __o1->chunk) \ + > (size_t) (__o1->chunk_limit - (char *) __o1->chunk)) \ __o1->next_free = __o1->chunk_limit; \ __o1->object_base = __o1->next_free; \ __value; }) @@ -403,20 +414,21 @@ extern int obstack_exit_failure; # define obstack_free(OBSTACK, OBJ) \ __extension__ \ ({ struct obstack *__o = (OBSTACK); \ - void *__obj = (OBJ); \ + void *__obj = (void *) (OBJ); \ if (__obj > (void *) __o->chunk && __obj < (void *) __o->chunk_limit) \ __o->next_free = __o->object_base = (char *) __obj; \ - else (__obstack_free) (__o, __obj); }) + else \ + _obstack_free (__o, __obj); }) #else /* not __GNUC__ */ -# define obstack_object_size(h) \ - (unsigned) ((h)->next_free - (h)->object_base) +# define obstack_object_size(h) \ + ((_OBSTACK_SIZE_T) ((h)->next_free - (h)->object_base)) # define obstack_room(h) \ - (unsigned) ((h)->chunk_limit - (h)->next_free) + ((_OBSTACK_SIZE_T) ((h)->chunk_limit - (h)->next_free)) -# define obstack_empty_p(h) \ +# define obstack_empty_p(h) \ ((h)->chunk->prev == 0 \ && (h)->next_free == __PTR_ALIGN ((char *) (h)->chunk, \ (h)->chunk->contents, \ @@ -429,51 +441,56 @@ extern int obstack_exit_failure; but some compilers won't accept it. */ # define obstack_make_room(h, length) \ - ((h)->temp.tempint = (length), \ - (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit) \ - ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0)) + ((h)->temp.i = (length), \ + ((obstack_room (h) < (h)->temp.i) \ + ? (_obstack_newchunk (h, (h)->temp.i), 0) : 0), \ + (void) 0) # define obstack_grow(h, where, length) \ - ((h)->temp.tempint = (length), \ - (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit) \ - ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0), \ - memcpy ((h)->next_free, where, (h)->temp.tempint), \ - (h)->next_free += (h)->temp.tempint) + ((h)->temp.i = (length), \ + ((obstack_room (h) < (h)->temp.i) \ + ? (_obstack_newchunk ((h), (h)->temp.i), 0) : 0), \ + memcpy ((h)->next_free, where, (h)->temp.i), \ + (h)->next_free += (h)->temp.i, \ + (void) 0) # define obstack_grow0(h, where, length) \ - ((h)->temp.tempint = (length), \ - (((h)->next_free + (h)->temp.tempint + 1 > (h)->chunk_limit) \ - ? (_obstack_newchunk ((h), (h)->temp.tempint + 1), 0) : 0), \ - memcpy ((h)->next_free, where, (h)->temp.tempint), \ - (h)->next_free += (h)->temp.tempint, \ - *((h)->next_free)++ = 0) + ((h)->temp.i = (length), \ + ((obstack_room (h) < (h)->temp.i + 1) \ + ? (_obstack_newchunk ((h), (h)->temp.i + 1), 0) : 0), \ + memcpy ((h)->next_free, where, (h)->temp.i), \ + (h)->next_free += (h)->temp.i, \ + *((h)->next_free)++ = 0, \ + (void) 0) # define obstack_1grow(h, datum) \ - ((((h)->next_free + 1 > (h)->chunk_limit) \ + (((obstack_room (h) < 1) \ ? (_obstack_newchunk ((h), 1), 0) : 0), \ obstack_1grow_fast (h, datum)) # define obstack_ptr_grow(h, datum) \ - ((((h)->next_free + sizeof (char *) > (h)->chunk_limit) \ + (((obstack_room (h) < sizeof (char *)) \ ? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0), \ obstack_ptr_grow_fast (h, datum)) # define obstack_int_grow(h, datum) \ - ((((h)->next_free + sizeof (int) > (h)->chunk_limit) \ + (((obstack_room (h) < sizeof (int)) \ ? (_obstack_newchunk ((h), sizeof (int)), 0) : 0), \ obstack_int_grow_fast (h, datum)) # define obstack_ptr_grow_fast(h, aptr) \ - (((const void **) ((h)->next_free += sizeof (void *)))[-1] = (aptr)) + (((const void **) ((h)->next_free += sizeof (void *)))[-1] = (aptr), \ + (void) 0) # define obstack_int_grow_fast(h, aint) \ - (((int *) ((h)->next_free += sizeof (int)))[-1] = (aint)) + (((int *) ((h)->next_free += sizeof (int)))[-1] = (aint), \ + (void) 0) # define obstack_blank(h, length) \ - ((h)->temp.tempint = (length), \ - (((h)->chunk_limit - (h)->next_free < (h)->temp.tempint) \ - ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0), \ - obstack_blank_fast (h, (h)->temp.tempint)) + ((h)->temp.i = (length), \ + ((obstack_room (h) < (h)->temp.i) \ + ? (_obstack_newchunk ((h), (h)->temp.i), 0) : 0), \ + obstack_blank_fast (h, (h)->temp.i)) # define obstack_alloc(h, length) \ (obstack_blank ((h), (length)), obstack_finish ((h))) @@ -488,23 +505,22 @@ extern int obstack_exit_failure; (((h)->next_free == (h)->object_base \ ? (((h)->maybe_empty_object = 1), 0) \ : 0), \ - (h)->temp.tempptr = (h)->object_base, \ + (h)->temp.p = (h)->object_base, \ (h)->next_free \ = __PTR_ALIGN ((h)->object_base, (h)->next_free, \ (h)->alignment_mask), \ - (((h)->next_free - (char *) (h)->chunk \ - > (h)->chunk_limit - (char *) (h)->chunk) \ + (((size_t) ((h)->next_free - (char *) (h)->chunk) \ + > (size_t) ((h)->chunk_limit - (char *) (h)->chunk)) \ ? ((h)->next_free = (h)->chunk_limit) : 0), \ (h)->object_base = (h)->next_free, \ - (h)->temp.tempptr) + (h)->temp.p) # define obstack_free(h, obj) \ - ((h)->temp.tempint = (char *) (obj) - (char *) (h)->chunk, \ - ((((h)->temp.tempint > 0 \ - && (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk)) \ - ? (void) ((h)->next_free = (h)->object_base \ - = (h)->temp.tempint + (char *) (h)->chunk) \ - : (__obstack_free) (h, (h)->temp.tempint + (char *) (h)->chunk))) + ((h)->temp.p = (void *) (obj), \ + (((h)->temp.p > (void *) (h)->chunk \ + && (h)->temp.p < (void *) (h)->chunk_limit) \ + ? (void) ((h)->next_free = (h)->object_base = (char *) (h)->temp.p) \ + : _obstack_free ((h), (h)->temp.p))) #endif /* not __GNUC__ */ @@ -512,4 +528,4 @@ extern int obstack_exit_failure; } /* C++ */ #endif -#endif /* obstack.h */ +#endif /* _OBSTACK_H */ diff --git a/lib/open-safer.c b/lib/open-safer.c index 91d69230..267b5cf3 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2015 Free Software Foundation, Inc. This program is free software: 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 d6f8e0df..95c78114 100644 --- a/lib/open.c +++ b/lib/open.c @@ -1,5 +1,5 @@ /* Open a descriptor to a file. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/openat-die.c b/lib/openat-die.c index 02f1fd7d..4accca0b 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,7 +30,7 @@ #include "gettext.h" #define _(msgid) gettext (msgid) -void +_Noreturn void openat_save_fail (int errnum) { #ifndef GNULIB_LIBPOSIX @@ -49,7 +49,7 @@ openat_save_fail (int errnum) during an openat emulation. The caller must ensure that fd 2 is not a just-opened fd, even when openat_safer is not in use. */ -void +_Noreturn void openat_restore_fail (int errnum) { #ifndef GNULIB_LIBPOSIX diff --git a/lib/openat-priv.h b/lib/openat-priv.h index 326c739e..f5a36905 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 7b40bb8f..4e1d3419 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 d0dc2d70..f2401bcd 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2015 Free Software Foundation, Inc. This program is free software: 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 9d2f7d49..d1de8b9e 100644 --- a/lib/openat.c +++ b/lib/openat.c @@ -1,5 +1,5 @@ /* provide a replacement openat function - Copyright (C) 2004-2014 Free Software Foundation, Inc. + Copyright (C) 2004-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/openat.h b/lib/openat.h index 29e23a54..f148adfa 100644 --- a/lib/openat.h +++ b/lib/openat.h @@ -1,5 +1,5 @@ /* provide a replacement openat function - Copyright (C) 2004-2006, 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2004-2006, 2008-2015 Free Software Foundation, Inc. This program is free software: 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-safer.c b/lib/opendir-safer.c index e31da884..9bbcda85 100644 --- a/lib/opendir-safer.c +++ b/lib/opendir-safer.c @@ -1,6 +1,6 @@ /* Invoke opendir, but avoid some glitches. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: 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 c67f2e5a..9f531103 100644 --- a/lib/opendir.c +++ b/lib/opendir.c @@ -1,5 +1,5 @@ /* Start reading the entries of a directory. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This program is free software: 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 009b204b..7e01766a 100644 --- a/lib/parse-datetime.c +++ b/lib/parse-datetime.c @@ -1,19 +1,19 @@ -/* A Bison parser, made by GNU Bison 2.7. */ +/* A Bison parser, made by GNU Bison 3.0.2. */ /* Bison implementation for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. - + + Copyright (C) 1984, 1989-1990, 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 . */ @@ -26,7 +26,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 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.7" +#define YYBISON_VERSION "3.0.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -62,12 +62,11 @@ /* Copy the first part of user declarations. */ -/* Line 371 of yacc.c */ -#line 1 "./lib/parse-datetime.y" +#line 1 "./lib/parse-datetime.y" /* yacc.c:339 */ /* Parse a string into an internal time stamp. - Copyright (C) 1999-2000, 2002-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -349,14 +348,13 @@ set_hhmmss (parser_control *pc, long int hour, long int minutes, } -/* Line 371 of yacc.c */ -#line 354 "parse-datetime.c" +#line 352 "parse-datetime.c" /* yacc.c:339 */ -# ifndef YY_NULL +# ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULL nullptr +# define YY_NULLPTR nullptr # else -# define YY_NULL 0 +# define YY_NULLPTR 0 # endif # endif @@ -369,7 +367,7 @@ set_hhmmss (parser_control *pc, long int hour, long int minutes, #endif -/* Enabling traces. */ +/* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 0 #endif @@ -377,33 +375,32 @@ set_hhmmss (parser_control *pc, long int hour, long int minutes, extern int yydebug; #endif -/* Tokens. */ +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - tAGO = 258, - tDST = 259, - tYEAR_UNIT = 260, - tMONTH_UNIT = 261, - tHOUR_UNIT = 262, - tMINUTE_UNIT = 263, - tSEC_UNIT = 264, - tDAY_UNIT = 265, - tDAY_SHIFT = 266, - tDAY = 267, - tDAYZONE = 268, - tLOCAL_ZONE = 269, - tMERIDIAN = 270, - tMONTH = 271, - tORDINAL = 272, - tZONE = 273, - tSNUMBER = 274, - tUNUMBER = 275, - tSDECIMAL_NUMBER = 276, - tUDECIMAL_NUMBER = 277 - }; + enum yytokentype + { + tAGO = 258, + tDST = 259, + tYEAR_UNIT = 260, + tMONTH_UNIT = 261, + tHOUR_UNIT = 262, + tMINUTE_UNIT = 263, + tSEC_UNIT = 264, + tDAY_UNIT = 265, + tDAY_SHIFT = 266, + tDAY = 267, + tDAYZONE = 268, + tLOCAL_ZONE = 269, + tMERIDIAN = 270, + tMONTH = 271, + tORDINAL = 272, + tZONE = 273, + tSNUMBER = 274, + tUNUMBER = 275, + tSDECIMAL_NUMBER = 276, + tUDECIMAL_NUMBER = 277 + }; #endif /* Tokens. */ #define tAGO 258 @@ -427,49 +424,33 @@ extern int yydebug; #define tSDECIMAL_NUMBER 276 #define tUDECIMAL_NUMBER 277 - - +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE +typedef union YYSTYPE YYSTYPE; +union YYSTYPE { -/* Line 387 of yacc.c */ -#line 297 "./lib/parse-datetime.y" +#line 297 "./lib/parse-datetime.y" /* yacc.c:355 */ long int intval; textint textintval; struct timespec timespec; relative_time rel; - -/* Line 387 of yacc.c */ -#line 446 "parse-datetime.c" -} YYSTYPE; +#line 440 "parse-datetime.c" /* yacc.c:355 */ +}; # define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus + int yyparse (parser_control *pc); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ /* Copy the second part of user declarations. */ -/* Line 390 of yacc.c */ -#line 473 "parse-datetime.c" +#line 454 "parse-datetime.c" /* yacc.c:358 */ #ifdef short # undef short @@ -483,11 +464,8 @@ typedef unsigned char yytype_uint8; #ifdef YYTYPE_INT8 typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; #else -typedef short int yytype_int8; +typedef signed char yytype_int8; #endif #ifdef YYTYPE_UINT16 @@ -507,8 +485,7 @@ typedef short int yytype_int16; # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# elif ! defined YYSIZE_T # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else @@ -530,6 +507,33 @@ typedef short int yytype_int16; # endif #endif +#ifndef YY_ATTRIBUTE +# if (defined __GNUC__ \ + && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ + || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C +# define YY_ATTRIBUTE(Spec) __attribute__(Spec) +# else +# define YY_ATTRIBUTE(Spec) /* empty */ +# endif +#endif + +#ifndef YY_ATTRIBUTE_PURE +# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +#endif + +#ifndef YY_ATTRIBUTE_UNUSED +# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) +#endif + +#if !defined _Noreturn \ + && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) +# if defined _MSC_VER && 1200 <= _MSC_VER +# define _Noreturn __declspec (noreturn) +# else +# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) +# endif +#endif + /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ # define YYUSE(E) ((void) (E)) @@ -537,24 +541,26 @@ typedef short int yytype_int16; # define YYUSE(E) /* empty */ #endif -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(N) (N) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int yyi) +#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") #else -static int -YYID (yyi) - int yyi; +# define YY_INITIAL_VALUE(Value) Value #endif -{ - return yyi; -} +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ #endif + #if ! defined yyoverflow || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -572,8 +578,7 @@ YYID (yyi) # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS # include /* INFRINGES ON USER NAME SPACE */ /* Use EXIT_SUCCESS as a witness for stdlib.h. */ # ifndef EXIT_SUCCESS @@ -585,8 +590,8 @@ YYID (yyi) # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) + /* Pacify GCC's 'empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely @@ -602,7 +607,7 @@ YYID (yyi) # endif # if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) + && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 @@ -610,15 +615,13 @@ YYID (yyi) # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined malloc && ! defined EXIT_SUCCESS 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__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined free && ! defined EXIT_SUCCESS void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif @@ -628,7 +631,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 @@ -653,16 +656,16 @@ union yyalloc 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); \ - } \ - while (YYID (0)) +# 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 (0) #endif @@ -681,7 +684,7 @@ union yyalloc for (yyi = 0; yyi < (Count); yyi++) \ (Dst)[yyi] = (Src)[yyi]; \ } \ - while (YYID (0)) + while (0) # endif # endif #endif /* !YYCOPY_NEEDED */ @@ -697,17 +700,19 @@ union yyalloc #define YYNNTS 26 /* YYNRULES -- Number of rules. */ #define YYNRULES 91 -/* YYNRULES -- Number of states. */ +/* YYNSTATES -- Number of states. */ #define YYNSTATES 114 -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned + by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 #define YYMAXUTOK 277 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, without out-of-bounds checking. */ static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -741,54 +746,7 @@ static const yytype_uint8 yytranslate[] = }; #if YYDEBUG -/* 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. */ + /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { 0, 324, 324, 325, 329, 336, 338, 342, 344, 346, @@ -818,13 +776,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", YY_NULLPTR }; #endif # ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ +/* YYTOKNUM[NUM] -- (External) token number corresponding to the + (internal) symbol number NUM (which must be that of a token). */ static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, @@ -833,66 +791,18 @@ static const yytype_uint16 yytoknum[] = }; # endif -/* 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 -}; +#define YYPACT_NINF -93 -/* 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 yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-93))) -/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. - Performed when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ -static const yytype_uint8 yydefact[] = -{ - 5, 0, 0, 2, 3, 85, 87, 84, 86, 4, - 82, 83, 1, 56, 59, 65, 68, 73, 62, 81, - 37, 35, 28, 0, 0, 30, 0, 88, 0, 0, - 31, 6, 7, 16, 8, 21, 9, 10, 12, 11, - 49, 13, 52, 74, 53, 14, 15, 38, 29, 0, - 45, 54, 57, 63, 66, 69, 60, 39, 36, 90, - 32, 75, 76, 78, 79, 80, 77, 55, 58, 64, - 67, 70, 61, 40, 18, 47, 90, 0, 0, 22, - 89, 71, 72, 33, 0, 51, 44, 0, 0, 34, - 43, 48, 50, 27, 25, 41, 0, 17, 46, 91, - 19, 90, 0, 23, 26, 0, 0, 25, 42, 25, - 20, 24, 0, 25 -}; +#define YYTABLE_NINF -1 -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = -{ - -1, 2, 3, 4, 31, 32, 33, 34, 35, 103, - 104, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 9, 10, 11, 45, 46, 93 -}; +#define yytable_value_is_error(Yytable_value) \ + 0 -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -#define YYPACT_NINF -93 + /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ static const yytype_int8 yypact[] = { 38, 27, 77, -93, 46, -93, -93, -93, -93, -93, @@ -909,7 +819,26 @@ static const yytype_int8 yypact[] = -93, -93, 69, 91 }; -/* YYPGOTO[NTERM-NUM]. */ + /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not 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, + 82, 83, 1, 56, 59, 65, 68, 73, 62, 81, + 37, 35, 28, 0, 0, 30, 0, 88, 0, 0, + 31, 6, 7, 16, 8, 21, 9, 10, 12, 11, + 49, 13, 52, 74, 53, 14, 15, 38, 29, 0, + 45, 54, 57, 63, 66, 69, 60, 39, 36, 90, + 32, 75, 76, 78, 79, 80, 77, 55, 58, 64, + 67, 70, 61, 40, 18, 47, 90, 0, 0, 22, + 89, 71, 72, 33, 0, 51, 44, 0, 0, 34, + 43, 48, 50, 27, 25, 41, 0, 17, 46, 91, + 19, 90, 0, 23, 26, 0, 0, 25, 42, 25, + 20, 24, 0, 25 +}; + + /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { -93, -93, -93, -93, -93, -93, -93, -93, 20, -68, @@ -917,10 +846,17 @@ static const yytype_int8 yypgoto[] = -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 YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -1 + /* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int8 yydefgoto[] = +{ + -1, 2, 3, 4, 31, 32, 33, 34, 35, 103, + 104, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 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 whose + number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint8 yytable[] = { 79, 67, 68, 69, 70, 71, 72, 58, 73, 100, @@ -937,12 +873,6 @@ static const yytype_uint8 yytable[] = 101, 0, 88 }; -#define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-93))) - -#define yytable_value_is_error(Yytable_value) \ - YYID (0) - static const yytype_int8 yycheck[] = { 27, 5, 6, 7, 8, 9, 10, 4, 12, 15, @@ -959,8 +889,8 @@ static const yytype_int8 yycheck[] = 19, -1, 25 }; -/* YYSTOS[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, @@ -977,30 +907,46 @@ static const yytype_uint8 yystos[] = 15, 37, 25, 50 }; -#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 - - -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. However, - YYFAIL appears to be in use. Nevertheless, it is formally deprecated - in Bison 2.4.2's NEWS entry, where a plan to phase it out is - discussed. */ - -#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 - some users do, and we want to make it easy for users to remove - YYFAIL uses, which will produce warnings from Bison 2.5. */ -#endif + /* 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 on the 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 YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + #define YYRECOVERING() (!!yyerrstatus) @@ -1017,27 +963,15 @@ do \ else \ { \ yyerror (pc, YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) + YYERROR; \ + } \ +while (0) /* Error token number */ -#define YYTERROR 1 -#define YYERRCODE 256 +#define YYTERROR 1 +#define YYERRCODE 256 -/* This macro is provided for backward compatibility. */ -#ifndef YY_LOCATION_PRINT -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -#endif - - -/* YYLEX -- calling `yylex' with the right arguments. */ -#ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, YYLEX_PARAM) -#else -# define YYLEX yylex (&yylval, pc) -#endif /* Enable debugging if requested. */ #if YYDEBUG @@ -1047,58 +981,47 @@ while (YYID (0)) # define YYFPRINTF fprintf # endif -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (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"); \ - } \ -} while (YYID (0)) +/* This macro is provided for backward compatibility. */ +#ifndef YY_LOCATION_PRINT +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +#endif -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +# 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 (0) + + +/*----------------------------------------. +| Print this symbol's value on YYOUTPUT. | +`----------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, parser_control *pc) -#else -static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep, pc) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; - parser_control *pc; -#endif { FILE *yyo = yyoutput; YYUSE (yyo); + 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; - } + YYUSE (yytype); } @@ -1106,23 +1029,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, pc) | Print this symbol on YYOUTPUT. | `--------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, parser_control *pc) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep, pc) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; - parser_control *pc; -#endif { - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + YYFPRINTF (yyoutput, "%s %s (", + yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); yy_symbol_value_print (yyoutput, yytype, yyvaluep, pc); YYFPRINTF (yyoutput, ")"); @@ -1133,16 +1044,8 @@ yy_symbol_print (yyoutput, yytype, yyvaluep, pc) | TOP (included). | `------------------------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) -#else -static void -yy_stack_print (yybottom, yytop) - yytype_int16 *yybottom; - yytype_int16 *yytop; -#endif { YYFPRINTF (stderr, "Stack now"); for (; yybottom <= yytop; yybottom++) @@ -1153,50 +1056,42 @@ yy_stack_print (yybottom, yytop) YYFPRINTF (stderr, "\n"); } -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule, parser_control *pc) -#else -static void -yy_reduce_print (yyvsp, yyrule, pc) - YYSTYPE *yyvsp; - int yyrule; - parser_control *pc; -#endif +yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, parser_control *pc) { + 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, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - , pc); + yy_symbol_print (stderr, + yystos[yyssp[yyi + 1 - yynrhs]], + &(yyvsp[(yyi + 1) - (yynrhs)]) + , pc); YYFPRINTF (stderr, "\n"); } } -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, Rule, pc); \ -} while (YYID (0)) +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyssp, yyvsp, Rule, pc); \ +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ @@ -1210,7 +1105,7 @@ int yydebug; /* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH +#ifndef YYINITDEPTH # define YYINITDEPTH 200 #endif @@ -1233,15 +1128,8 @@ int yydebug; # define yystrlen strlen # else /* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static YYSIZE_T yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif { YYSIZE_T yylen; for (yylen = 0; yystr[yylen]; yylen++) @@ -1257,16 +1145,8 @@ yystrlen (yystr) # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static char * yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif { char *yyd = yydest; const char *yys = yysrc; @@ -1296,27 +1176,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: ; } @@ -1339,11 +1219,11 @@ static int yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yytype_int16 *yyssp, int yytoken) { - YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); + YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); YYSIZE_T yysize = yysize0; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ - const char *yyformat = YY_NULL; + const char *yyformat = YY_NULLPTR; /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; /* Number of reported tokens (one for the "unexpected", one per @@ -1351,10 +1231,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, int yycount = 0; /* There are many possibilities here to consider: - - Assume YYFAIL is not used. It's too flawed to consider. See - - 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 @@ -1404,7 +1280,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, } yyarg[yycount++] = yytname[yyx]; { - YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) return 2; @@ -1471,33 +1347,18 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, | Release the memory associated to this symbol. | `-----------------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, parser_control *pc) -#else -static void -yydestruct (yymsg, yytype, yyvaluep, pc) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; - parser_control *pc; -#endif { YYUSE (yyvaluep); YYUSE (pc); - if (!yymsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) - { - - default: - break; - } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YYUSE (yytype); + YY_IGNORE_MAYBE_UNINITIALIZED_END } @@ -1507,56 +1368,18 @@ yydestruct (yymsg, yytype, yyvaluep, pc) | yyparse. | `----------*/ -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) int yyparse (parser_control *pc) -#else -int -yyparse (pc) - parser_control *pc; -#endif -#endif { /* The lookahead symbol. */ int yychar; -#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ -/* Suppress an incorrect diagnostic about yylval being uninitialized. */ -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ - _Pragma ("GCC diagnostic push") \ - _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ - _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") -# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ - _Pragma ("GCC diagnostic pop") -#else +/* The semantic value of the lookahead symbol. */ /* Default value used for initialization, for pacifying older GCCs or non-GCC compilers. */ -static YYSTYPE yyval_default; -# define YY_INITIAL_VALUE(Value) = Value -#endif -#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_END -#endif -#ifndef YY_INITIAL_VALUE -# define YY_INITIAL_VALUE(Value) /* Nothing. */ -#endif - -/* The semantic value of the lookahead symbol. */ -YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); +YY_INITIAL_VALUE (static YYSTYPE yyval_default;) +YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); /* Number of syntax errors so far. */ int yynerrs; @@ -1566,8 +1389,8 @@ YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); int yyerrstatus; /* The stacks and their tools: - `yyss': related to states. - `yyvs': related to semantic values. + 'yyss': related to states. + 'yyvs': related to semantic values. Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ @@ -1635,23 +1458,23 @@ YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); #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 @@ -1659,22 +1482,22 @@ YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); # 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 */ @@ -1683,10 +1506,10 @@ YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); 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)); @@ -1715,7 +1538,7 @@ yybackup: if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; + yychar = yylex (&yylval, pc); } if (yychar <= YYEOF) @@ -1780,7 +1603,7 @@ yyreduce: yylen = yyr2[yyn]; /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. + '$$ = $1'. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison @@ -1794,541 +1617,540 @@ yyreduce: switch (yyn) { case 4: -/* Line 1792 of yacc.c */ -#line 330 "./lib/parse-datetime.y" +#line 330 "./lib/parse-datetime.y" /* yacc.c:1646 */ { - pc->seconds = (yyvsp[(2) - (2)].timespec); + pc->seconds = (yyvsp[0].timespec); pc->timespec_seen = true; } +#line 1626 "parse-datetime.c" /* yacc.c:1646 */ break; case 7: -/* Line 1792 of yacc.c */ -#line 343 "./lib/parse-datetime.y" +#line 343 "./lib/parse-datetime.y" /* yacc.c:1646 */ { pc->times_seen++; pc->dates_seen++; } +#line 1632 "parse-datetime.c" /* yacc.c:1646 */ break; case 8: -/* Line 1792 of yacc.c */ -#line 345 "./lib/parse-datetime.y" +#line 345 "./lib/parse-datetime.y" /* yacc.c:1646 */ { pc->times_seen++; } +#line 1638 "parse-datetime.c" /* yacc.c:1646 */ break; case 9: -/* Line 1792 of yacc.c */ -#line 347 "./lib/parse-datetime.y" +#line 347 "./lib/parse-datetime.y" /* yacc.c:1646 */ { pc->local_zones_seen++; } +#line 1644 "parse-datetime.c" /* yacc.c:1646 */ break; case 10: -/* Line 1792 of yacc.c */ -#line 349 "./lib/parse-datetime.y" +#line 349 "./lib/parse-datetime.y" /* yacc.c:1646 */ { pc->zones_seen++; } +#line 1650 "parse-datetime.c" /* yacc.c:1646 */ break; case 11: -/* Line 1792 of yacc.c */ -#line 351 "./lib/parse-datetime.y" +#line 351 "./lib/parse-datetime.y" /* yacc.c:1646 */ { pc->dates_seen++; } +#line 1656 "parse-datetime.c" /* yacc.c:1646 */ break; case 12: -/* Line 1792 of yacc.c */ -#line 353 "./lib/parse-datetime.y" +#line 353 "./lib/parse-datetime.y" /* yacc.c:1646 */ { pc->days_seen++; } +#line 1662 "parse-datetime.c" /* yacc.c:1646 */ break; case 18: -/* Line 1792 of yacc.c */ -#line 369 "./lib/parse-datetime.y" +#line 369 "./lib/parse-datetime.y" /* yacc.c:1646 */ { - set_hhmmss (pc, (yyvsp[(1) - (2)].textintval).value, 0, 0, 0); - pc->meridian = (yyvsp[(2) - (2)].intval); + set_hhmmss (pc, (yyvsp[-1].textintval).value, 0, 0, 0); + pc->meridian = (yyvsp[0].intval); } +#line 1671 "parse-datetime.c" /* yacc.c:1646 */ break; case 19: -/* Line 1792 of yacc.c */ -#line 374 "./lib/parse-datetime.y" +#line 374 "./lib/parse-datetime.y" /* yacc.c:1646 */ { - set_hhmmss (pc, (yyvsp[(1) - (4)].textintval).value, (yyvsp[(3) - (4)].textintval).value, 0, 0); - pc->meridian = (yyvsp[(4) - (4)].intval); + set_hhmmss (pc, (yyvsp[-3].textintval).value, (yyvsp[-1].textintval).value, 0, 0); + pc->meridian = (yyvsp[0].intval); } +#line 1680 "parse-datetime.c" /* yacc.c:1646 */ break; case 20: -/* Line 1792 of yacc.c */ -#line 379 "./lib/parse-datetime.y" +#line 379 "./lib/parse-datetime.y" /* yacc.c:1646 */ { - 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); + 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); } +#line 1689 "parse-datetime.c" /* yacc.c:1646 */ break; case 22: -/* Line 1792 of yacc.c */ -#line 388 "./lib/parse-datetime.y" +#line 388 "./lib/parse-datetime.y" /* yacc.c:1646 */ { - set_hhmmss (pc, (yyvsp[(1) - (2)].textintval).value, 0, 0, 0); + set_hhmmss (pc, (yyvsp[-1].textintval).value, 0, 0, 0); pc->meridian = MER24; } +#line 1698 "parse-datetime.c" /* yacc.c:1646 */ break; case 23: -/* Line 1792 of yacc.c */ -#line 393 "./lib/parse-datetime.y" +#line 393 "./lib/parse-datetime.y" /* yacc.c:1646 */ { - set_hhmmss (pc, (yyvsp[(1) - (4)].textintval).value, (yyvsp[(3) - (4)].textintval).value, 0, 0); + set_hhmmss (pc, (yyvsp[-3].textintval).value, (yyvsp[-1].textintval).value, 0, 0); pc->meridian = MER24; } +#line 1707 "parse-datetime.c" /* yacc.c:1646 */ break; case 24: -/* Line 1792 of yacc.c */ -#line 398 "./lib/parse-datetime.y" +#line 398 "./lib/parse-datetime.y" /* yacc.c:1646 */ { - 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); + set_hhmmss (pc, (yyvsp[-5].textintval).value, (yyvsp[-3].textintval).value, (yyvsp[-1].timespec).tv_sec, (yyvsp[-1].timespec).tv_nsec); pc->meridian = MER24; } +#line 1716 "parse-datetime.c" /* yacc.c:1646 */ break; case 27: -/* Line 1792 of yacc.c */ -#line 411 "./lib/parse-datetime.y" +#line 411 "./lib/parse-datetime.y" /* yacc.c:1646 */ { pc->zones_seen++; - pc->time_zone = time_zone_hhmm (pc, (yyvsp[(1) - (2)].textintval), (yyvsp[(2) - (2)].intval)); + pc->time_zone = time_zone_hhmm (pc, (yyvsp[-1].textintval), (yyvsp[0].intval)); } +#line 1725 "parse-datetime.c" /* yacc.c:1646 */ break; case 28: -/* Line 1792 of yacc.c */ -#line 419 "./lib/parse-datetime.y" +#line 419 "./lib/parse-datetime.y" /* yacc.c:1646 */ { - pc->local_isdst = (yyvsp[(1) - (1)].intval); - pc->dsts_seen += (0 < (yyvsp[(1) - (1)].intval)); + pc->local_isdst = (yyvsp[0].intval); + pc->dsts_seen += (0 < (yyvsp[0].intval)); } +#line 1734 "parse-datetime.c" /* yacc.c:1646 */ break; case 29: -/* Line 1792 of yacc.c */ -#line 424 "./lib/parse-datetime.y" +#line 424 "./lib/parse-datetime.y" /* yacc.c:1646 */ { pc->local_isdst = 1; - pc->dsts_seen += (0 < (yyvsp[(1) - (2)].intval)) + 1; + pc->dsts_seen += (0 < (yyvsp[-1].intval)) + 1; } +#line 1743 "parse-datetime.c" /* yacc.c:1646 */ break; case 30: -/* Line 1792 of yacc.c */ -#line 434 "./lib/parse-datetime.y" - { pc->time_zone = (yyvsp[(1) - (1)].intval); } +#line 434 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { pc->time_zone = (yyvsp[0].intval); } +#line 1749 "parse-datetime.c" /* yacc.c:1646 */ break; case 31: -/* Line 1792 of yacc.c */ -#line 436 "./lib/parse-datetime.y" +#line 436 "./lib/parse-datetime.y" /* yacc.c:1646 */ { pc->time_zone = HOUR(7); } +#line 1755 "parse-datetime.c" /* yacc.c:1646 */ break; case 32: -/* Line 1792 of yacc.c */ -#line 438 "./lib/parse-datetime.y" - { pc->time_zone = (yyvsp[(1) - (2)].intval); - apply_relative_time (pc, (yyvsp[(2) - (2)].rel), 1); } +#line 438 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { pc->time_zone = (yyvsp[-1].intval); + apply_relative_time (pc, (yyvsp[0].rel), 1); } +#line 1762 "parse-datetime.c" /* yacc.c:1646 */ break; case 33: -/* Line 1792 of yacc.c */ -#line 441 "./lib/parse-datetime.y" +#line 441 "./lib/parse-datetime.y" /* yacc.c:1646 */ { pc->time_zone = HOUR(7); - apply_relative_time (pc, (yyvsp[(2) - (2)].rel), 1); } + apply_relative_time (pc, (yyvsp[0].rel), 1); } +#line 1769 "parse-datetime.c" /* yacc.c:1646 */ break; case 34: -/* Line 1792 of yacc.c */ -#line 444 "./lib/parse-datetime.y" - { pc->time_zone = (yyvsp[(1) - (3)].intval) + time_zone_hhmm (pc, (yyvsp[(2) - (3)].textintval), (yyvsp[(3) - (3)].intval)); } +#line 444 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { pc->time_zone = (yyvsp[-2].intval) + time_zone_hhmm (pc, (yyvsp[-1].textintval), (yyvsp[0].intval)); } +#line 1775 "parse-datetime.c" /* yacc.c:1646 */ break; case 35: -/* Line 1792 of yacc.c */ -#line 446 "./lib/parse-datetime.y" - { pc->time_zone = (yyvsp[(1) - (1)].intval) + 60; } +#line 446 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { pc->time_zone = (yyvsp[0].intval) + 60; } +#line 1781 "parse-datetime.c" /* yacc.c:1646 */ break; case 36: -/* Line 1792 of yacc.c */ -#line 448 "./lib/parse-datetime.y" - { pc->time_zone = (yyvsp[(1) - (2)].intval) + 60; } +#line 448 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { pc->time_zone = (yyvsp[-1].intval) + 60; } +#line 1787 "parse-datetime.c" /* yacc.c:1646 */ break; case 37: -/* Line 1792 of yacc.c */ -#line 453 "./lib/parse-datetime.y" +#line 453 "./lib/parse-datetime.y" /* yacc.c:1646 */ { pc->day_ordinal = 0; - pc->day_number = (yyvsp[(1) - (1)].intval); + pc->day_number = (yyvsp[0].intval); } +#line 1796 "parse-datetime.c" /* yacc.c:1646 */ break; case 38: -/* Line 1792 of yacc.c */ -#line 458 "./lib/parse-datetime.y" +#line 458 "./lib/parse-datetime.y" /* yacc.c:1646 */ { pc->day_ordinal = 0; - pc->day_number = (yyvsp[(1) - (2)].intval); + pc->day_number = (yyvsp[-1].intval); } +#line 1805 "parse-datetime.c" /* yacc.c:1646 */ break; case 39: -/* Line 1792 of yacc.c */ -#line 463 "./lib/parse-datetime.y" +#line 463 "./lib/parse-datetime.y" /* yacc.c:1646 */ { - pc->day_ordinal = (yyvsp[(1) - (2)].intval); - pc->day_number = (yyvsp[(2) - (2)].intval); + pc->day_ordinal = (yyvsp[-1].intval); + pc->day_number = (yyvsp[0].intval); } +#line 1814 "parse-datetime.c" /* yacc.c:1646 */ break; case 40: -/* Line 1792 of yacc.c */ -#line 468 "./lib/parse-datetime.y" +#line 468 "./lib/parse-datetime.y" /* yacc.c:1646 */ { - pc->day_ordinal = (yyvsp[(1) - (2)].textintval).value; - pc->day_number = (yyvsp[(2) - (2)].intval); + pc->day_ordinal = (yyvsp[-1].textintval).value; + pc->day_number = (yyvsp[0].intval); } +#line 1823 "parse-datetime.c" /* yacc.c:1646 */ break; case 41: -/* Line 1792 of yacc.c */ -#line 476 "./lib/parse-datetime.y" +#line 476 "./lib/parse-datetime.y" /* yacc.c:1646 */ { - pc->month = (yyvsp[(1) - (3)].textintval).value; - pc->day = (yyvsp[(3) - (3)].textintval).value; + pc->month = (yyvsp[-2].textintval).value; + pc->day = (yyvsp[0].textintval).value; } +#line 1832 "parse-datetime.c" /* yacc.c:1646 */ break; case 42: -/* Line 1792 of yacc.c */ -#line 481 "./lib/parse-datetime.y" +#line 481 "./lib/parse-datetime.y" /* yacc.c:1646 */ { /* 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[(1) - (5)].textintval).digits) + if (4 <= (yyvsp[-4].textintval).digits) { - pc->year = (yyvsp[(1) - (5)].textintval); - pc->month = (yyvsp[(3) - (5)].textintval).value; - pc->day = (yyvsp[(5) - (5)].textintval).value; + pc->year = (yyvsp[-4].textintval); + pc->month = (yyvsp[-2].textintval).value; + pc->day = (yyvsp[0].textintval).value; } else { - pc->month = (yyvsp[(1) - (5)].textintval).value; - pc->day = (yyvsp[(3) - (5)].textintval).value; - pc->year = (yyvsp[(5) - (5)].textintval); + pc->month = (yyvsp[-4].textintval).value; + pc->day = (yyvsp[-2].textintval).value; + pc->year = (yyvsp[0].textintval); } } +#line 1856 "parse-datetime.c" /* yacc.c:1646 */ break; case 43: -/* Line 1792 of yacc.c */ -#line 501 "./lib/parse-datetime.y" +#line 501 "./lib/parse-datetime.y" /* yacc.c:1646 */ { /* e.g. 17-JUN-1992. */ - 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; + 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; } +#line 1868 "parse-datetime.c" /* yacc.c:1646 */ break; case 44: -/* Line 1792 of yacc.c */ -#line 509 "./lib/parse-datetime.y" +#line 509 "./lib/parse-datetime.y" /* yacc.c:1646 */ { /* e.g. JUN-17-1992. */ - 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; + 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; } +#line 1880 "parse-datetime.c" /* yacc.c:1646 */ break; case 45: -/* Line 1792 of yacc.c */ -#line 517 "./lib/parse-datetime.y" +#line 517 "./lib/parse-datetime.y" /* yacc.c:1646 */ { - pc->month = (yyvsp[(1) - (2)].intval); - pc->day = (yyvsp[(2) - (2)].textintval).value; + pc->month = (yyvsp[-1].intval); + pc->day = (yyvsp[0].textintval).value; } +#line 1889 "parse-datetime.c" /* yacc.c:1646 */ break; case 46: -/* Line 1792 of yacc.c */ -#line 522 "./lib/parse-datetime.y" +#line 522 "./lib/parse-datetime.y" /* yacc.c:1646 */ { - pc->month = (yyvsp[(1) - (4)].intval); - pc->day = (yyvsp[(2) - (4)].textintval).value; - pc->year = (yyvsp[(4) - (4)].textintval); + pc->month = (yyvsp[-3].intval); + pc->day = (yyvsp[-2].textintval).value; + pc->year = (yyvsp[0].textintval); } +#line 1899 "parse-datetime.c" /* yacc.c:1646 */ break; case 47: -/* Line 1792 of yacc.c */ -#line 528 "./lib/parse-datetime.y" +#line 528 "./lib/parse-datetime.y" /* yacc.c:1646 */ { - pc->day = (yyvsp[(1) - (2)].textintval).value; - pc->month = (yyvsp[(2) - (2)].intval); + pc->day = (yyvsp[-1].textintval).value; + pc->month = (yyvsp[0].intval); } +#line 1908 "parse-datetime.c" /* yacc.c:1646 */ break; case 48: -/* Line 1792 of yacc.c */ -#line 533 "./lib/parse-datetime.y" +#line 533 "./lib/parse-datetime.y" /* yacc.c:1646 */ { - pc->day = (yyvsp[(1) - (3)].textintval).value; - pc->month = (yyvsp[(2) - (3)].intval); - pc->year = (yyvsp[(3) - (3)].textintval); + pc->day = (yyvsp[-2].textintval).value; + pc->month = (yyvsp[-1].intval); + pc->year = (yyvsp[0].textintval); } +#line 1918 "parse-datetime.c" /* yacc.c:1646 */ break; case 50: -/* Line 1792 of yacc.c */ -#line 543 "./lib/parse-datetime.y" +#line 543 "./lib/parse-datetime.y" /* yacc.c:1646 */ { /* ISO 8601 format. YYYY-MM-DD. */ - pc->year = (yyvsp[(1) - (3)].textintval); - pc->month = -(yyvsp[(2) - (3)].textintval).value; - pc->day = -(yyvsp[(3) - (3)].textintval).value; + pc->year = (yyvsp[-2].textintval); + pc->month = -(yyvsp[-1].textintval).value; + pc->day = -(yyvsp[0].textintval).value; } +#line 1929 "parse-datetime.c" /* yacc.c:1646 */ break; case 51: -/* Line 1792 of yacc.c */ -#line 553 "./lib/parse-datetime.y" - { apply_relative_time (pc, (yyvsp[(1) - (2)].rel), (yyvsp[(2) - (2)].intval)); } +#line 553 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { apply_relative_time (pc, (yyvsp[-1].rel), (yyvsp[0].intval)); } +#line 1935 "parse-datetime.c" /* yacc.c:1646 */ break; case 52: -/* Line 1792 of yacc.c */ -#line 555 "./lib/parse-datetime.y" - { apply_relative_time (pc, (yyvsp[(1) - (1)].rel), 1); } +#line 555 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { apply_relative_time (pc, (yyvsp[0].rel), 1); } +#line 1941 "parse-datetime.c" /* yacc.c:1646 */ break; case 53: -/* Line 1792 of yacc.c */ -#line 557 "./lib/parse-datetime.y" - { apply_relative_time (pc, (yyvsp[(1) - (1)].rel), 1); } +#line 557 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { apply_relative_time (pc, (yyvsp[0].rel), 1); } +#line 1947 "parse-datetime.c" /* yacc.c:1646 */ break; case 54: -/* Line 1792 of yacc.c */ -#line 562 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[(1) - (2)].intval); } +#line 562 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[-1].intval); } +#line 1953 "parse-datetime.c" /* yacc.c:1646 */ break; case 55: -/* Line 1792 of yacc.c */ -#line 564 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[(1) - (2)].textintval).value; } +#line 564 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[-1].textintval).value; } +#line 1959 "parse-datetime.c" /* yacc.c:1646 */ break; case 56: -/* Line 1792 of yacc.c */ -#line 566 "./lib/parse-datetime.y" +#line 566 "./lib/parse-datetime.y" /* yacc.c:1646 */ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = 1; } +#line 1965 "parse-datetime.c" /* yacc.c:1646 */ break; case 57: -/* Line 1792 of yacc.c */ -#line 568 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[(1) - (2)].intval); } +#line 568 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[-1].intval); } +#line 1971 "parse-datetime.c" /* yacc.c:1646 */ break; case 58: -/* Line 1792 of yacc.c */ -#line 570 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[(1) - (2)].textintval).value; } +#line 570 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[-1].textintval).value; } +#line 1977 "parse-datetime.c" /* yacc.c:1646 */ break; case 59: -/* Line 1792 of yacc.c */ -#line 572 "./lib/parse-datetime.y" +#line 572 "./lib/parse-datetime.y" /* yacc.c:1646 */ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = 1; } +#line 1983 "parse-datetime.c" /* yacc.c:1646 */ break; case 60: -/* Line 1792 of yacc.c */ -#line 574 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (2)].intval) * (yyvsp[(2) - (2)].intval); } +#line 574 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[-1].intval) * (yyvsp[0].intval); } +#line 1989 "parse-datetime.c" /* yacc.c:1646 */ break; case 61: -/* Line 1792 of yacc.c */ -#line 576 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); } +#line 576 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[-1].textintval).value * (yyvsp[0].intval); } +#line 1995 "parse-datetime.c" /* yacc.c:1646 */ break; case 62: -/* Line 1792 of yacc.c */ -#line 578 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (1)].intval); } +#line 578 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[0].intval); } +#line 2001 "parse-datetime.c" /* yacc.c:1646 */ break; case 63: -/* Line 1792 of yacc.c */ -#line 580 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[(1) - (2)].intval); } +#line 580 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[-1].intval); } +#line 2007 "parse-datetime.c" /* yacc.c:1646 */ break; case 64: -/* Line 1792 of yacc.c */ -#line 582 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[(1) - (2)].textintval).value; } +#line 582 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[-1].textintval).value; } +#line 2013 "parse-datetime.c" /* yacc.c:1646 */ break; case 65: -/* Line 1792 of yacc.c */ -#line 584 "./lib/parse-datetime.y" +#line 584 "./lib/parse-datetime.y" /* yacc.c:1646 */ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = 1; } +#line 2019 "parse-datetime.c" /* yacc.c:1646 */ break; case 66: -/* Line 1792 of yacc.c */ -#line 586 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[(1) - (2)].intval); } +#line 586 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[-1].intval); } +#line 2025 "parse-datetime.c" /* yacc.c:1646 */ break; case 67: -/* Line 1792 of yacc.c */ -#line 588 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[(1) - (2)].textintval).value; } +#line 588 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[-1].textintval).value; } +#line 2031 "parse-datetime.c" /* yacc.c:1646 */ break; case 68: -/* Line 1792 of yacc.c */ -#line 590 "./lib/parse-datetime.y" +#line 590 "./lib/parse-datetime.y" /* yacc.c:1646 */ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = 1; } +#line 2037 "parse-datetime.c" /* yacc.c:1646 */ break; case 69: -/* Line 1792 of yacc.c */ -#line 592 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].intval); } +#line 592 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].intval); } +#line 2043 "parse-datetime.c" /* yacc.c:1646 */ break; case 70: -/* Line 1792 of yacc.c */ -#line 594 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].textintval).value; } +#line 594 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].textintval).value; } +#line 2049 "parse-datetime.c" /* yacc.c:1646 */ break; case 71: -/* Line 1792 of yacc.c */ -#line 596 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].timespec).tv_sec; (yyval.rel).ns = (yyvsp[(1) - (2)].timespec).tv_nsec; } +#line 596 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].timespec).tv_sec; (yyval.rel).ns = (yyvsp[-1].timespec).tv_nsec; } +#line 2055 "parse-datetime.c" /* yacc.c:1646 */ break; case 72: -/* Line 1792 of yacc.c */ -#line 598 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].timespec).tv_sec; (yyval.rel).ns = (yyvsp[(1) - (2)].timespec).tv_nsec; } +#line 598 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].timespec).tv_sec; (yyval.rel).ns = (yyvsp[-1].timespec).tv_nsec; } +#line 2061 "parse-datetime.c" /* yacc.c:1646 */ break; case 73: -/* Line 1792 of yacc.c */ -#line 600 "./lib/parse-datetime.y" +#line 600 "./lib/parse-datetime.y" /* yacc.c:1646 */ { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 1; } +#line 2067 "parse-datetime.c" /* yacc.c:1646 */ break; case 75: -/* Line 1792 of yacc.c */ -#line 606 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[(1) - (2)].textintval).value; } +#line 606 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[-1].textintval).value; } +#line 2073 "parse-datetime.c" /* yacc.c:1646 */ break; case 76: -/* Line 1792 of yacc.c */ -#line 608 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[(1) - (2)].textintval).value; } +#line 608 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[-1].textintval).value; } +#line 2079 "parse-datetime.c" /* yacc.c:1646 */ break; case 77: -/* Line 1792 of yacc.c */ -#line 610 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); } +#line 610 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[-1].textintval).value * (yyvsp[0].intval); } +#line 2085 "parse-datetime.c" /* yacc.c:1646 */ break; case 78: -/* Line 1792 of yacc.c */ -#line 612 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[(1) - (2)].textintval).value; } +#line 612 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[-1].textintval).value; } +#line 2091 "parse-datetime.c" /* yacc.c:1646 */ break; case 79: -/* Line 1792 of yacc.c */ -#line 614 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[(1) - (2)].textintval).value; } +#line 614 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[-1].textintval).value; } +#line 2097 "parse-datetime.c" /* yacc.c:1646 */ break; case 80: -/* Line 1792 of yacc.c */ -#line 616 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].textintval).value; } +#line 616 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].textintval).value; } +#line 2103 "parse-datetime.c" /* yacc.c:1646 */ break; case 81: -/* Line 1792 of yacc.c */ -#line 621 "./lib/parse-datetime.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (1)].intval); } +#line 621 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[0].intval); } +#line 2109 "parse-datetime.c" /* yacc.c:1646 */ break; case 85: -/* Line 1792 of yacc.c */ -#line 629 "./lib/parse-datetime.y" - { (yyval.timespec).tv_sec = (yyvsp[(1) - (1)].textintval).value; (yyval.timespec).tv_nsec = 0; } +#line 629 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.timespec).tv_sec = (yyvsp[0].textintval).value; (yyval.timespec).tv_nsec = 0; } +#line 2115 "parse-datetime.c" /* yacc.c:1646 */ break; case 87: -/* Line 1792 of yacc.c */ -#line 635 "./lib/parse-datetime.y" - { (yyval.timespec).tv_sec = (yyvsp[(1) - (1)].textintval).value; (yyval.timespec).tv_nsec = 0; } +#line 635 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.timespec).tv_sec = (yyvsp[0].textintval).value; (yyval.timespec).tv_nsec = 0; } +#line 2121 "parse-datetime.c" /* yacc.c:1646 */ break; case 88: -/* Line 1792 of yacc.c */ -#line 640 "./lib/parse-datetime.y" - { digits_to_date_time (pc, (yyvsp[(1) - (1)].textintval)); } +#line 640 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { digits_to_date_time (pc, (yyvsp[0].textintval)); } +#line 2127 "parse-datetime.c" /* yacc.c:1646 */ break; case 89: -/* Line 1792 of yacc.c */ -#line 645 "./lib/parse-datetime.y" +#line 645 "./lib/parse-datetime.y" /* yacc.c:1646 */ { /* 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) - (2)].textintval)); - apply_relative_time (pc, (yyvsp[(2) - (2)].rel), 1); + digits_to_date_time (pc, (yyvsp[-1].textintval)); + apply_relative_time (pc, (yyvsp[0].rel), 1); } +#line 2138 "parse-datetime.c" /* yacc.c:1646 */ break; case 90: -/* Line 1792 of yacc.c */ -#line 655 "./lib/parse-datetime.y" +#line 655 "./lib/parse-datetime.y" /* yacc.c:1646 */ { (yyval.intval) = -1; } +#line 2144 "parse-datetime.c" /* yacc.c:1646 */ break; case 91: -/* Line 1792 of yacc.c */ -#line 657 "./lib/parse-datetime.y" - { (yyval.intval) = (yyvsp[(2) - (2)].textintval).value; } +#line 657 "./lib/parse-datetime.y" /* yacc.c:1646 */ + { (yyval.intval) = (yyvsp[0].textintval).value; } +#line 2150 "parse-datetime.c" /* yacc.c:1646 */ break; -/* Line 1792 of yacc.c */ -#line 2332 "parse-datetime.c" +#line 2154 "parse-datetime.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2350,7 +2172,7 @@ yyreduce: *++yyvsp = yyval; - /* Now `shift' the result of the reduction. Determine what state + /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -2365,9 +2187,9 @@ yyreduce: goto yynewstate; -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ +/*--------------------------------------. +| yyerrlab -- here on detecting error. | +`--------------------------------------*/ yyerrlab: /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ @@ -2418,20 +2240,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 @@ -2450,7 +2272,7 @@ yyerrorlab: if (/*CONSTCOND*/ 0) goto yyerrorlab; - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); yylen = 0; @@ -2463,29 +2285,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; - } - } + { + 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); @@ -2536,14 +2358,14 @@ yyreturn: yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval, pc); } - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp, pc); + yystos[*yyssp], yyvsp, pc); YYPOPSTACK (1); } #ifndef yyoverflow @@ -2554,13 +2376,9 @@ yyreturn: if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); #endif - /* Make sure YYID is used. */ - return YYID (yyresult); + return yyresult; } - - -/* Line 2055 of yacc.c */ -#line 660 "./lib/parse-datetime.y" +#line 660 "./lib/parse-datetime.y" /* yacc.c:1906 */ static table const meridian_table[] = @@ -2935,7 +2753,7 @@ lookup_word (parser_control const *pc, char *word) } static int -yylex (YYSTYPE *lvalp, parser_control *pc) +yylex (union YYSTYPE *lvalp, parser_control *pc) { unsigned char c; size_t count; @@ -3065,7 +2883,7 @@ yylex (YYSTYPE *lvalp, parser_control *pc) do { - if (p - buff < sizeof buff - 1) + if (p < buff + sizeof buff - 1) *p++ = c; c = *++pc->input; } diff --git a/lib/parse-datetime.h b/lib/parse-datetime.h index 9c9bb93f..443edb94 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-2014 Free Software + Copyright (C) 1995, 1997-1998, 2003-2004, 2007, 2009-2015 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 0ba0a525..1b1fec75 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-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1031,7 +1031,7 @@ lookup_word (parser_control const *pc, char *word) } static int -yylex (YYSTYPE *lvalp, parser_control *pc) +yylex (union YYSTYPE *lvalp, parser_control *pc) { unsigned char c; size_t count; @@ -1161,7 +1161,7 @@ yylex (YYSTYPE *lvalp, parser_control *pc) do { - if (p - buff < sizeof buff - 1) + if (p < buff + sizeof buff - 1) *p++ = c; c = *++pc->input; } diff --git a/lib/pathmax.h b/lib/pathmax.h index 33fc3553..2f3b64f4 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-2014 Free Software + Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2015 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 d0989aa8..1906cab6 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-2014 Free Software + Copyright (C) 2000-2001, 2003, 2005-2006, 2009-2015 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 ab67e0ca..8df242aa 100644 --- a/lib/physmem.h +++ b/lib/physmem.h @@ -1,6 +1,6 @@ /* Calculate the size of physical memory. - Copyright (C) 2000, 2003, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2000, 2003, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 70fb40f8..91b0fe77 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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.c b/lib/pipe.c index 4db9041c..a1220af6 100644 --- a/lib/pipe.c +++ b/lib/pipe.c @@ -1,5 +1,5 @@ /* Create a pipe. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software; 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 2fe81ab6..ebb21807 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-2014 Free Software Foundation, Inc. + Copyright (C) 1989-1991, 1998, 2000-2015 Free Software Foundation, Inc. This 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 @@ */ -static int +static bool year (struct tm *tm, const int *digit_pair, size_t n, unsigned int syntax_bits) { switch (n) @@ -70,14 +70,14 @@ year (struct tm *tm, const int *digit_pair, size_t n, unsigned int syntax_bits) if (digit_pair[0] <= 68) { if (syntax_bits & PDS_PRE_2000) - return 1; + return false; tm->tm_year += 100; } break; case 2: if (! (syntax_bits & PDS_CENTURY)) - return 1; + return false; tm->tm_year = digit_pair[0] * 100 + digit_pair[1] - 1900; break; @@ -90,7 +90,7 @@ year (struct tm *tm, const int *digit_pair, size_t n, unsigned int syntax_bits) time (&now); tmp = localtime (&now); if (! tmp) - return 1; + return false; tm->tm_year = tmp->tm_year; } break; @@ -99,10 +99,10 @@ year (struct tm *tm, const int *digit_pair, size_t n, unsigned int syntax_bits) abort (); } - return 0; + return true; } -static int +static bool posix_time_parse (struct tm *tm, const char *s, unsigned int syntax_bits) { const char *dot = NULL; @@ -111,25 +111,25 @@ posix_time_parse (struct tm *tm, const char *s, unsigned int syntax_bits) size_t i; size_t s_len = strlen (s); - size_t len = (((syntax_bits & PDS_SECONDS) && (dot = strchr (s, '.'))) - ? (size_t) (dot - s) - : s_len); + size_t len = s_len; - if (len != 8 && len != 10 && len != 12) - return 1; - - if (dot) + if (syntax_bits & PDS_SECONDS) { - if (!(syntax_bits & PDS_SECONDS)) - return 1; - - if (s_len - len != 3) - return 1; + dot = strchr (s, '.'); + if (dot) + { + len = dot - s; + if (s_len - len != 3) + return false; + } } + if (! (8 <= len && len <= 12 && len % 2 == 0)) + return false; + for (i = 0; i < len; i++) if (!ISDIGIT (s[i])) - return 1; + return false; len /= 2; for (i = 0; i < len; i++) @@ -138,8 +138,8 @@ posix_time_parse (struct tm *tm, const char *s, unsigned int syntax_bits) p = pair; if (syntax_bits & PDS_LEADING_YEAR) { - if (year (tm, p, len - 4, syntax_bits)) - return 1; + if (! year (tm, p, len - 4, syntax_bits)) + return false; p += len - 4; len = 4; } @@ -154,28 +154,19 @@ posix_time_parse (struct tm *tm, const char *s, unsigned int syntax_bits) /* Handle any trailing year. */ if (syntax_bits & PDS_TRAILING_YEAR) { - if (year (tm, p, len, syntax_bits)) - return 1; + if (! year (tm, p, len, syntax_bits)) + return false; } /* Handle seconds. */ if (!dot) - { - tm->tm_sec = 0; - } + tm->tm_sec = 0; + else if (ISDIGIT (dot[1]) && ISDIGIT (dot[2])) + tm->tm_sec = 10 * (dot[1] - '0') + dot[2] - '0'; else - { - int seconds; - - ++dot; - if (!ISDIGIT (dot[0]) || !ISDIGIT (dot[1])) - return 1; - seconds = 10 * (dot[0] - '0') + dot[1] - '0'; - - tm->tm_sec = seconds; - } + return false; - return 0; + return true; } /* Parse a POSIX-style date, returning true if successful. */ @@ -188,7 +179,7 @@ posixtime (time_t *p, const char *s, unsigned int syntax_bits) struct tm const *tm; time_t t; - if (posix_time_parse (&tm0, s, syntax_bits)) + if (! posix_time_parse (&tm0, s, syntax_bits)) return false; tm1 = tm0; @@ -207,7 +198,9 @@ posixtime (time_t *p, const char *s, unsigned int syntax_bits) } /* Reject dates like "September 31" and times like "25:61". - Do not reject times that specify "60" as the number of seconds. */ + However, allow a seconds count of 60 even in time zones that do + not support leap seconds, treating it as the following second; + POSIX requires this. */ if ((tm0.tm_year ^ tm->tm_year) | (tm0.tm_mon ^ tm->tm_mon) | (tm0.tm_mday ^ tm->tm_mday) diff --git a/lib/posixtm.h b/lib/posixtm.h index 56680ec4..d063dfd2 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-2014 Free Software Foundation, Inc. + Copyright (C) 1998, 2003, 2005, 2007-2015 Free Software Foundation, Inc. This program is free software: 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 a3bff114..0625bc10 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 39cd0a4f..da17efbd 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-2014 Free Software + Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2015 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 9364eed5..387976cc 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-2014 Free Software + Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2015 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 39ec0938..5a7301fe 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 2c46eca2..7f21ba22 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 00e7a67d..024f5a5d 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 29825e86..890fd504 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 131d0f00..40d0a226 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-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-2003, 2006-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/printf-parse.h b/lib/printf-parse.h index 2651195f..fda6704f 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-2014 Free Software + Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2015 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 08843606..6ea070ac 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/priv-set.h b/lib/priv-set.h index ff5877c1..b71d4180 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/progname.c b/lib/progname.c index 2919be99..fe93bcaf 100644 --- a/lib/progname.c +++ b/lib/progname.c @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify diff --git a/lib/progname.h b/lib/progname.h index fa15871d..d1e034f9 100644 --- a/lib/progname.h +++ b/lib/progname.h @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2001-2004, 2006, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006, 2009-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify diff --git a/lib/propername.c b/lib/propername.c index 54a6adaf..293e7e31 100644 --- a/lib/propername.c +++ b/lib/propername.c @@ -1,5 +1,5 @@ /* Localization of proper names. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2006. This program is free software: you can redistribute it and/or modify diff --git a/lib/propername.h b/lib/propername.h index 7e3de0fc..9034d35b 100644 --- a/lib/propername.h +++ b/lib/propername.h @@ -1,5 +1,5 @@ /* Localization of proper names. - Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2006. This program is free software: you can redistribute it and/or modify @@ -26,12 +26,12 @@ have in common? A non-ASCII name. This causes trouble in the --version output. The simple - "solution", unfortunately mutilates the name. + "solution" unfortunately mutilates the name. - $ du --version| grep Granlund + $ du --version | grep Granlund Écrit par Torbjorn Granlund, David MacKenzie, Paul Eggert et Jim Meyering. - $ ptx --version| grep Pinard + $ ptx --version | grep Pinard Écrit par F. Pinard. What is desirable, is to print the full name if the output character set @@ -51,11 +51,11 @@ output will look like this: () - To use the 'propername' module is done in three simple steps: + To use the 'propername' module requires three simple steps: 1) Add it to the list of gnulib modules to import, - 2) Change the arguments of version_etc, from + 2) Change the arguments of version_etc(), from "Paul Eggert" to proper_name ("Paul Eggert") diff --git a/lib/pthread.in.h b/lib/pthread.in.h index 9d263953..5825e8cd 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/putenv.c b/lib/putenv.c index b9f50792..925bb2f4 100644 --- a/lib/putenv.c +++ b/lib/putenv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2014 Free Software +/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2015 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C diff --git a/lib/qcopy-acl.c b/lib/qcopy-acl.c index 4e53b633..c4507424 100644 --- a/lib/qcopy-acl.c +++ b/lib/qcopy-acl.c @@ -1,6 +1,6 @@ /* copy-acl.c - copy access control list from one file to another file - Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc. This 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,545 +39,13 @@ int qcopy_acl (const char *src_name, int source_desc, const char *dst_name, int dest_desc, mode_t mode) { -#if USE_ACL && HAVE_ACL_GET_FILE - /* POSIX 1003.1e (draft 17 -- abandoned) specific version. */ - /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */ -# if !HAVE_ACL_TYPE_EXTENDED - /* Linux, FreeBSD, IRIX, Tru64 */ - - acl_t acl; - int ret; - - if (HAVE_ACL_GET_FD && source_desc != -1) - acl = acl_get_fd (source_desc); - else - acl = acl_get_file (src_name, ACL_TYPE_ACCESS); - if (acl == NULL) - { - if (! acl_errno_valid (errno)) - return qset_acl (dst_name, dest_desc, mode); - else - return -2; - } - - if (HAVE_ACL_SET_FD && dest_desc != -1) - ret = acl_set_fd (dest_desc, acl); - else - ret = acl_set_file (dst_name, ACL_TYPE_ACCESS, acl); - if (ret != 0) - { - int saved_errno = errno; - - if (! acl_errno_valid (errno) && !acl_access_nontrivial (acl)) - { - acl_free (acl); - return chmod_or_fchmod (dst_name, dest_desc, mode); - } - else - { - acl_free (acl); - chmod_or_fchmod (dst_name, dest_desc, mode); - errno = saved_errno; - return -1; - } - } - else - acl_free (acl); - - if (!MODE_INSIDE_ACL || (mode & (S_ISUID | S_ISGID | S_ISVTX))) - { - /* We did not call chmod so far, and either the mode and the ACL are - separate or special bits are to be set which don't fit into ACLs. */ - - if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0) - return -1; - } - - if (S_ISDIR (mode)) - { - acl = acl_get_file (src_name, ACL_TYPE_DEFAULT); - if (acl == NULL) - return -2; - - if (acl_set_file (dst_name, ACL_TYPE_DEFAULT, acl)) - { - int saved_errno = errno; - - acl_free (acl); - errno = saved_errno; - return -1; - } - else - acl_free (acl); - } - return 0; - -# else /* HAVE_ACL_TYPE_EXTENDED */ - /* Mac OS X */ - - /* On Mac OS X, acl_get_file (name, ACL_TYPE_ACCESS) - and acl_get_file (name, ACL_TYPE_DEFAULT) - always return NULL / EINVAL. You have to use - acl_get_file (name, ACL_TYPE_EXTENDED) - or acl_get_fd (open (name, ...)) - to retrieve an ACL. - On the other hand, - acl_set_file (name, ACL_TYPE_ACCESS, acl) - and acl_set_file (name, ACL_TYPE_DEFAULT, acl) - have the same effect as - acl_set_file (name, ACL_TYPE_EXTENDED, acl): - Each of these calls sets the file's ACL. */ - - acl_t acl; + struct permission_context ctx; int ret; - if (HAVE_ACL_GET_FD && source_desc != -1) - acl = acl_get_fd (source_desc); - else - acl = acl_get_file (src_name, ACL_TYPE_EXTENDED); - if (acl == NULL) - { - if (!acl_errno_valid (errno)) - return qset_acl (dst_name, dest_desc, mode); - else - return -2; - } - - if (HAVE_ACL_SET_FD && dest_desc != -1) - ret = acl_set_fd (dest_desc, acl); - else - ret = acl_set_file (dst_name, ACL_TYPE_EXTENDED, acl); + ret = get_permissions (src_name, source_desc, mode, &ctx); if (ret != 0) - { - int saved_errno = errno; - - if (!acl_errno_valid (saved_errno) && !acl_extended_nontrivial (acl)) - { - acl_free (acl); - return chmod_or_fchmod (dst_name, dest_desc, mode); - } - else - { - acl_free (acl); - chmod_or_fchmod (dst_name, dest_desc, mode); - errno = saved_errno; - return -1; - } - } - else - acl_free (acl); - - /* Since !MODE_INSIDE_ACL, we have to call chmod explicitly. */ - return chmod_or_fchmod (dst_name, dest_desc, mode); - -# endif - -#elif USE_ACL && defined GETACL /* Solaris, Cygwin, not HP-UX */ - - /* Solaris 2.5 through Solaris 10, Cygwin, and contemporaneous versions - of Unixware. The acl() call returns the access and default ACL both - at once. */ -# ifdef ACE_GETACL - int ace_count; - ace_t *ace_entries; -# endif - int count; - aclent_t *entries; - int did_chmod; - int saved_errno; - int ret; - -# ifdef ACE_GETACL - /* Solaris also has a different variant of ACLs, used in ZFS and NFSv4 - file systems (whereas the other ones are used in UFS file systems). - There is an API - pathconf (name, _PC_ACL_ENABLED) - fpathconf (desc, _PC_ACL_ENABLED) - that allows to determine which of the two kinds of ACLs is supported - for the given file. But some file systems may implement this call - incorrectly, so better not use it. - When fetching the source ACL, we simply fetch both ACL types. - When setting the destination ACL, we try either ACL types, assuming - that the kernel will translate the ACL from one form to the other. - (See in - the description of ENOTSUP.) */ - for (;;) - { - ace_count = (source_desc != -1 - ? facl (source_desc, ACE_GETACLCNT, 0, NULL) - : acl (src_name, ACE_GETACLCNT, 0, NULL)); - - if (ace_count < 0) - { - if (errno == ENOSYS || errno == EINVAL) - { - ace_count = 0; - ace_entries = NULL; - break; - } - else - return -2; - } - - if (ace_count == 0) - { - ace_entries = NULL; - break; - } - - ace_entries = (ace_t *) malloc (ace_count * sizeof (ace_t)); - if (ace_entries == NULL) - { - errno = ENOMEM; - return -2; - } - - ret = (source_desc != -1 - ? facl (source_desc, ACE_GETACL, ace_count, ace_entries) - : acl (src_name, ACE_GETACL, ace_count, ace_entries)); - if (ret < 0) - { - free (ace_entries); - if (errno == ENOSYS || errno == EINVAL) - { - ace_count = 0; - ace_entries = NULL; - break; - } - else - return -2; - } - if (ret == ace_count) - break; - /* Huh? The number of ACL entries changed since the last call. - Repeat. */ - } -# endif - - for (;;) - { - count = (source_desc != -1 - ? facl (source_desc, GETACLCNT, 0, NULL) - : acl (src_name, GETACLCNT, 0, NULL)); - - if (count < 0) - { - if (errno == ENOSYS || errno == ENOTSUP || errno == EOPNOTSUPP) - { - count = 0; - entries = NULL; - break; - } - else - return -2; - } - - if (count == 0) - { - entries = NULL; - break; - } - - entries = (aclent_t *) malloc (count * sizeof (aclent_t)); - if (entries == NULL) - { - errno = ENOMEM; - return -2; - } - - if ((source_desc != -1 - ? facl (source_desc, GETACL, count, entries) - : acl (src_name, GETACL, count, entries)) - == count) - break; - /* Huh? The number of ACL entries changed since the last call. - Repeat. */ - } - - /* Is there an ACL of either kind? */ -# ifdef ACE_GETACL - if (ace_count == 0) -# endif - if (count == 0) - return qset_acl (dst_name, dest_desc, mode); - - did_chmod = 0; /* set to 1 once the mode bits in 0777 have been set */ - saved_errno = 0; /* the first non-ignorable error code */ - - if (!MODE_INSIDE_ACL) - { - /* On Cygwin, it is necessary to call chmod before acl, because - chmod can change the contents of the ACL (in ways that don't - change the allowed accesses, but still visible). */ - if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0) - saved_errno = errno; - did_chmod = 1; - } - - /* If both ace_entries and entries are available, try SETACL before - ACE_SETACL, because SETACL cannot fail with ENOTSUP whereas ACE_SETACL - can. */ - - if (count > 0) - { - ret = (dest_desc != -1 - ? facl (dest_desc, SETACL, count, entries) - : acl (dst_name, SETACL, count, entries)); - if (ret < 0 && saved_errno == 0) - { - saved_errno = errno; - if ((errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL) - && !acl_nontrivial (count, entries)) - saved_errno = 0; - } - else - did_chmod = 1; - } - free (entries); - -# ifdef ACE_GETACL - if (ace_count > 0) - { - ret = (dest_desc != -1 - ? facl (dest_desc, ACE_SETACL, ace_count, ace_entries) - : acl (dst_name, ACE_SETACL, ace_count, ace_entries)); - if (ret < 0 && saved_errno == 0) - { - saved_errno = errno; - if ((errno == ENOSYS || errno == EINVAL || errno == ENOTSUP) - && !acl_ace_nontrivial (ace_count, ace_entries)) - saved_errno = 0; - } - } - free (ace_entries); -# endif - - if (MODE_INSIDE_ACL - && did_chmod <= ((mode & (S_ISUID | S_ISGID | S_ISVTX)) ? 1 : 0)) - { - /* We did not call chmod so far, and either the mode and the ACL are - separate or special bits are to be set which don't fit into ACLs. */ - - if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0) - { - if (saved_errno == 0) - saved_errno = errno; - } - } - - if (saved_errno) - { - errno = saved_errno; - return -1; - } - return 0; - -#elif USE_ACL && HAVE_GETACL /* HP-UX */ - - struct acl_entry entries[NACLENTRIES]; - int count; -# if HAVE_ACLV_H - struct acl aclv_entries[NACLVENTRIES]; - int aclv_count; -# endif - int did_chmod; - int saved_errno; - int ret; - - count = (source_desc != -1 - ? fgetacl (source_desc, NACLENTRIES, entries) - : getacl (src_name, NACLENTRIES, entries)); - - if (count < 0) - { - if (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP) - count = 0; - else - return -2; - } - else if (count > 0) - { - if (count > NACLENTRIES) - /* If NACLENTRIES cannot be trusted, use dynamic memory allocation. */ - abort (); - } - -# if HAVE_ACLV_H - aclv_count = acl ((char *) src_name, ACL_GET, NACLVENTRIES, aclv_entries); - - if (aclv_count < 0) - { - if (errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL) - count = 0; - else - return -2; - } - else if (aclv_count > 0) - { - if (aclv_count > NACLVENTRIES) - /* If NACLVENTRIES cannot be trusted, use dynamic memory allocation. */ - abort (); - } -# endif - - if (count == 0) -# if HAVE_ACLV_H - if (aclv_count == 0) -# endif - return qset_acl (dst_name, dest_desc, mode); - - did_chmod = 0; /* set to 1 once the mode bits in 0777 have been set */ - saved_errno = 0; /* the first non-ignorable error code */ - - if (count > 0) - { - ret = (dest_desc != -1 - ? fsetacl (dest_desc, count, entries) - : setacl (dst_name, count, entries)); - if (ret < 0 && saved_errno == 0) - { - saved_errno = errno; - if (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP) - { - struct stat source_statbuf; - - if ((source_desc != -1 - ? fstat (source_desc, &source_statbuf) - : stat (src_name, &source_statbuf)) == 0) - { - if (!acl_nontrivial (count, entries, &source_statbuf)) - saved_errno = 0; - } - else - saved_errno = errno; - } - } - else - did_chmod = 1; - } - -# if HAVE_ACLV_H - if (aclv_count > 0) - { - ret = acl ((char *) dst_name, ACL_SET, aclv_count, aclv_entries); - if (ret < 0 && saved_errno == 0) - { - saved_errno = errno; - if (errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL) - { - if (!aclv_nontrivial (aclv_count, aclv_entries)) - saved_errno = 0; - } - } - else - did_chmod = 1; - } -# endif - - if (did_chmod <= ((mode & (S_ISUID | S_ISGID | S_ISVTX)) ? 1 : 0)) - { - /* We did not call chmod so far, and special bits are to be set which - don't fit into ACLs. */ - - if (chmod_or_fchmod (dst_name, dest_desc, mode) != 0) - { - if (saved_errno == 0) - saved_errno = errno; - } - } - - if (saved_errno) - { - errno = saved_errno; - return -1; - } - return 0; - -#elif USE_ACL && HAVE_ACLX_GET && 0 /* AIX */ - - /* TODO */ - -#elif USE_ACL && HAVE_STATACL /* older AIX */ - - union { struct acl a; char room[4096]; } u; - int ret; - - if ((source_desc != -1 - ? fstatacl (source_desc, STX_NORMAL, &u.a, sizeof (u)) - : statacl (src_name, STX_NORMAL, &u.a, sizeof (u))) - < 0) return -2; - - ret = (dest_desc != -1 - ? fchacl (dest_desc, &u.a, u.a.acl_len) - : chacl (dst_name, &u.a, u.a.acl_len)); - if (ret < 0) - { - int saved_errno = errno; - - chmod_or_fchmod (dst_name, dest_desc, mode); - errno = saved_errno; - return -1; - } - - /* No need to call chmod_or_fchmod at this point, since the mode bits - S_ISUID, S_ISGID, S_ISVTX are also stored in the ACL. */ - - return 0; - -#elif USE_ACL && HAVE_ACLSORT /* NonStop Kernel */ - - struct acl entries[NACLENTRIES]; - int count; - int ret; - - count = acl ((char *) src_name, ACL_GET, NACLENTRIES, entries); - - if (count < 0) - { - if (0) - count = 0; - else - return -2; - } - else if (count > 0) - { - if (count > NACLENTRIES) - /* If NACLENTRIES cannot be trusted, use dynamic memory allocation. */ - abort (); - } - - if (count == 0) - return qset_acl (dst_name, dest_desc, mode); - - ret = acl ((char *) dst_name, ACL_SET, count, entries); - if (ret < 0) - { - int saved_errno = errno; - - if (0) - { - if (!acl_nontrivial (count, entries)) - return chmod_or_fchmod (dst_name, dest_desc, mode); - } - - chmod_or_fchmod (dst_name, dest_desc, mode); - errno = saved_errno; - return -1; - } - - if (mode & (S_ISUID | S_ISGID | S_ISVTX)) - { - /* We did not call chmod so far, and either the mode and the ACL are - separate or special bits are to be set which don't fit into ACLs. */ - - return chmod_or_fchmod (dst_name, dest_desc, mode); - } - return 0; - -#else - - return qset_acl (dst_name, dest_desc, mode); - -#endif + ret = set_permissions (&ctx, dst_name, dest_desc); + free_permission_context (&ctx); + return ret; } diff --git a/lib/qset-acl.c b/lib/qset-acl.c index 7d9af573..1ebec22f 100644 --- a/lib/qset-acl.c +++ b/lib/qset-acl.c @@ -1,6 +1,6 @@ /* qset-acl.c - set access control list equivalent to a mode - Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc. This 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,26 +21,12 @@ #define ACL_INTERNAL_INLINE _GL_EXTERN_INLINE +#include #include "acl.h" #include "acl-internal.h" -/* If DESC is a valid file descriptor use fchmod to change the - file's mode to MODE on systems that have fchmod. On systems - that don't have fchmod and if DESC is invalid, use chmod on - NAME instead. - Return 0 if successful. Return -1 and set errno upon failure. */ - -int -chmod_or_fchmod (const char *name, int desc, mode_t mode) -{ - if (HAVE_FCHMOD && desc != -1) - return fchmod (desc, mode); - else - return chmod (name, mode); -} - /* Set the access control lists of a file. If DESC is a valid file descriptor, use file descriptor operations where available, else use filename based operations on NAME. If access control lists are not @@ -52,625 +38,12 @@ chmod_or_fchmod (const char *name, int desc, mode_t mode) int 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, Mac OS X, IRIX, Tru64 */ -# if !HAVE_ACL_TYPE_EXTENDED - /* Linux, FreeBSD, IRIX, Tru64 */ - - /* We must also have acl_from_text and acl_delete_def_file. - (acl_delete_def_file could be emulated with acl_init followed - by acl_set_file, but acl_set_file with an empty acl is - unspecified.) */ - -# ifndef HAVE_ACL_FROM_TEXT -# error Must have acl_from_text (see POSIX 1003.1e draft 17). -# endif -# ifndef HAVE_ACL_DELETE_DEF_FILE -# error Must have acl_delete_def_file (see POSIX 1003.1e draft 17). -# endif - - acl_t acl; - int ret; - - if (HAVE_ACL_FROM_MODE) /* Linux */ - { - acl = acl_from_mode (mode); - if (!acl) - return -1; - } - else /* FreeBSD, IRIX, Tru64 */ - { - /* If we were to create the ACL using the functions acl_init(), - acl_create_entry(), acl_set_tag_type(), acl_set_qualifier(), - acl_get_permset(), acl_clear_perm[s](), acl_add_perm(), we - would need to create a qualifier. I don't know how to do this. - So create it using acl_from_text(). */ - -# if HAVE_ACL_FREE_TEXT /* Tru64 */ - char acl_text[] = "u::---,g::---,o::---,"; -# else /* FreeBSD, IRIX */ - char acl_text[] = "u::---,g::---,o::---"; -# endif - - if (mode & S_IRUSR) acl_text[ 3] = 'r'; - if (mode & S_IWUSR) acl_text[ 4] = 'w'; - if (mode & S_IXUSR) acl_text[ 5] = 'x'; - if (mode & S_IRGRP) acl_text[10] = 'r'; - if (mode & S_IWGRP) acl_text[11] = 'w'; - if (mode & S_IXGRP) acl_text[12] = 'x'; - if (mode & S_IROTH) acl_text[17] = 'r'; - if (mode & S_IWOTH) acl_text[18] = 'w'; - if (mode & S_IXOTH) acl_text[19] = 'x'; - - acl = acl_from_text (acl_text); - if (!acl) - return -1; - } - if (HAVE_ACL_SET_FD && desc != -1) - ret = acl_set_fd (desc, acl); - else - ret = acl_set_file (name, ACL_TYPE_ACCESS, acl); - if (ret != 0) - { - int saved_errno = errno; - acl_free (acl); - if (! acl_errno_valid (errno)) - return chmod_or_fchmod (name, desc, mode); - errno = saved_errno; - return -1; - } - else - acl_free (acl); - - if (S_ISDIR (mode) && acl_delete_def_file (name)) - return -1; - - if (!MODE_INSIDE_ACL || (mode & (S_ISUID | S_ISGID | S_ISVTX))) - { - /* We did not call chmod so far, and either the mode and the ACL are - separate or special bits are to be set which don't fit into ACLs. */ - return chmod_or_fchmod (name, desc, mode); - } - return 0; - -# else /* HAVE_ACL_TYPE_EXTENDED */ - /* Mac OS X */ - - /* On Mac OS X, acl_get_file (name, ACL_TYPE_ACCESS) - and acl_get_file (name, ACL_TYPE_DEFAULT) - always return NULL / EINVAL. You have to use - acl_get_file (name, ACL_TYPE_EXTENDED) - or acl_get_fd (open (name, ...)) - to retrieve an ACL. - On the other hand, - acl_set_file (name, ACL_TYPE_ACCESS, acl) - and acl_set_file (name, ACL_TYPE_DEFAULT, acl) - have the same effect as - acl_set_file (name, ACL_TYPE_EXTENDED, acl): - Each of these calls sets the file's ACL. */ - - acl_t acl; + struct permission_context ctx; int ret; - /* Remove the ACL if the file has ACLs. */ - if (HAVE_ACL_GET_FD && desc != -1) - acl = acl_get_fd (desc); - else - acl = acl_get_file (name, ACL_TYPE_EXTENDED); - if (acl) - { - acl_free (acl); - - acl = acl_init (0); - if (acl) - { - if (HAVE_ACL_SET_FD && desc != -1) - ret = acl_set_fd (desc, acl); - else - ret = acl_set_file (name, ACL_TYPE_EXTENDED, acl); - if (ret != 0) - { - int saved_errno = errno; - acl_free (acl); - if (! acl_errno_valid (saved_errno)) - return chmod_or_fchmod (name, desc, mode); - errno = saved_errno; - return -1; - } - acl_free (acl); - } - } - - /* Since !MODE_INSIDE_ACL, we have to call chmod explicitly. */ - return chmod_or_fchmod (name, desc, mode); -# endif - -# elif HAVE_FACL && defined GETACL /* Solaris, Cygwin, not HP-UX */ - - int done_setacl = 0; - -# ifdef ACE_GETACL - /* Solaris also has a different variant of ACLs, used in ZFS and NFSv4 - file systems (whereas the other ones are used in UFS file systems). */ - - /* The flags in the ace_t structure changed in a binary incompatible way - when ACL_NO_TRIVIAL etc. were introduced in version 1.15. - How to distinguish the two conventions at runtime? - We fetch the existing ACL. In the old convention, usually three ACEs have - a_flags = ACE_OWNER / ACE_GROUP / ACE_OTHER, in the range 0x0100..0x0400. - In the new convention, these values are not used. */ - int convention; - - { - /* Initially, try to read the entries into a stack-allocated buffer. - Use malloc if it does not fit. */ - enum - { - alloc_init = 4000 / sizeof (ace_t), /* >= 3 */ - alloc_max = MIN (INT_MAX, SIZE_MAX / sizeof (ace_t)) - }; - ace_t buf[alloc_init]; - size_t alloc = alloc_init; - ace_t *entries = buf; - ace_t *malloced = NULL; - int count; - - for (;;) - { - count = (desc != -1 - ? facl (desc, ACE_GETACL, alloc, entries) - : acl (name, ACE_GETACL, alloc, entries)); - if (count < 0 && errno == ENOSPC) - { - /* Increase the size of the buffer. */ - free (malloced); - if (alloc > alloc_max / 2) - { - errno = ENOMEM; - return -1; - } - alloc = 2 * alloc; /* <= alloc_max */ - entries = malloced = (ace_t *) malloc (alloc * sizeof (ace_t)); - if (entries == NULL) - { - errno = ENOMEM; - return -1; - } - continue; - } - break; - } - - if (count <= 0) - convention = -1; - else - { - int i; - - convention = 0; - for (i = 0; i < count; i++) - if (entries[i].a_flags & (OLD_ACE_OWNER | OLD_ACE_GROUP | OLD_ACE_OTHER)) - { - convention = 1; - break; - } - } - free (malloced); - } - - if (convention >= 0) - { - ace_t entries[6]; - int count; - int ret; - - if (convention) - { - /* Running on Solaris 10. */ - entries[0].a_type = OLD_ALLOW; - entries[0].a_flags = OLD_ACE_OWNER; - entries[0].a_who = 0; /* irrelevant */ - entries[0].a_access_mask = (mode >> 6) & 7; - entries[1].a_type = OLD_ALLOW; - entries[1].a_flags = OLD_ACE_GROUP; - entries[1].a_who = 0; /* irrelevant */ - entries[1].a_access_mask = (mode >> 3) & 7; - entries[2].a_type = OLD_ALLOW; - entries[2].a_flags = OLD_ACE_OTHER; - entries[2].a_who = 0; - entries[2].a_access_mask = mode & 7; - count = 3; - } - else - { - /* Running on Solaris 10 (newer version) or Solaris 11. - The details here were found through "/bin/ls -lvd somefiles". */ - entries[0].a_type = NEW_ACE_ACCESS_DENIED_ACE_TYPE; - entries[0].a_flags = NEW_ACE_OWNER; - entries[0].a_who = 0; /* irrelevant */ - entries[0].a_access_mask = 0; - entries[1].a_type = NEW_ACE_ACCESS_ALLOWED_ACE_TYPE; - entries[1].a_flags = NEW_ACE_OWNER; - entries[1].a_who = 0; /* irrelevant */ - entries[1].a_access_mask = NEW_ACE_WRITE_NAMED_ATTRS - | NEW_ACE_WRITE_ATTRIBUTES - | NEW_ACE_WRITE_ACL - | NEW_ACE_WRITE_OWNER; - if (mode & 0400) - entries[1].a_access_mask |= NEW_ACE_READ_DATA; - else - entries[0].a_access_mask |= NEW_ACE_READ_DATA; - if (mode & 0200) - entries[1].a_access_mask |= NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA; - else - entries[0].a_access_mask |= NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA; - if (mode & 0100) - entries[1].a_access_mask |= NEW_ACE_EXECUTE; - else - entries[0].a_access_mask |= NEW_ACE_EXECUTE; - entries[2].a_type = NEW_ACE_ACCESS_DENIED_ACE_TYPE; - entries[2].a_flags = NEW_ACE_GROUP | NEW_ACE_IDENTIFIER_GROUP; - entries[2].a_who = 0; /* irrelevant */ - entries[2].a_access_mask = 0; - entries[3].a_type = NEW_ACE_ACCESS_ALLOWED_ACE_TYPE; - entries[3].a_flags = NEW_ACE_GROUP | NEW_ACE_IDENTIFIER_GROUP; - entries[3].a_who = 0; /* irrelevant */ - entries[3].a_access_mask = 0; - if (mode & 0040) - entries[3].a_access_mask |= NEW_ACE_READ_DATA; - else - entries[2].a_access_mask |= NEW_ACE_READ_DATA; - if (mode & 0020) - entries[3].a_access_mask |= NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA; - else - entries[2].a_access_mask |= NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA; - if (mode & 0010) - entries[3].a_access_mask |= NEW_ACE_EXECUTE; - else - entries[2].a_access_mask |= NEW_ACE_EXECUTE; - entries[4].a_type = NEW_ACE_ACCESS_DENIED_ACE_TYPE; - entries[4].a_flags = NEW_ACE_EVERYONE; - entries[4].a_who = 0; - entries[4].a_access_mask = NEW_ACE_WRITE_NAMED_ATTRS - | NEW_ACE_WRITE_ATTRIBUTES - | NEW_ACE_WRITE_ACL - | NEW_ACE_WRITE_OWNER; - entries[5].a_type = NEW_ACE_ACCESS_ALLOWED_ACE_TYPE; - entries[5].a_flags = NEW_ACE_EVERYONE; - entries[5].a_who = 0; - entries[5].a_access_mask = NEW_ACE_READ_NAMED_ATTRS - | NEW_ACE_READ_ATTRIBUTES - | NEW_ACE_READ_ACL - | NEW_ACE_SYNCHRONIZE; - if (mode & 0004) - entries[5].a_access_mask |= NEW_ACE_READ_DATA; - else - entries[4].a_access_mask |= NEW_ACE_READ_DATA; - if (mode & 0002) - entries[5].a_access_mask |= NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA; - else - entries[4].a_access_mask |= NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA; - if (mode & 0001) - entries[5].a_access_mask |= NEW_ACE_EXECUTE; - else - entries[4].a_access_mask |= NEW_ACE_EXECUTE; - count = 6; - } - if (desc != -1) - ret = facl (desc, ACE_SETACL, count, entries); - else - ret = acl (name, ACE_SETACL, count, entries); - if (ret < 0 && errno != EINVAL && errno != ENOTSUP) - { - if (errno == ENOSYS) - return chmod_or_fchmod (name, desc, mode); - return -1; - } - if (ret == 0) - done_setacl = 1; - } -# endif - - if (!done_setacl) - { - aclent_t entries[3]; - int ret; - - entries[0].a_type = USER_OBJ; - entries[0].a_id = 0; /* irrelevant */ - entries[0].a_perm = (mode >> 6) & 7; - entries[1].a_type = GROUP_OBJ; - entries[1].a_id = 0; /* irrelevant */ - entries[1].a_perm = (mode >> 3) & 7; - entries[2].a_type = OTHER_OBJ; - entries[2].a_id = 0; - entries[2].a_perm = mode & 7; - - if (desc != -1) - ret = facl (desc, SETACL, - sizeof (entries) / sizeof (aclent_t), entries); - else - ret = acl (name, SETACL, - sizeof (entries) / sizeof (aclent_t), entries); - if (ret < 0) - { - if (errno == ENOSYS || errno == EOPNOTSUPP) - return chmod_or_fchmod (name, desc, mode); - return -1; - } - } - - if (!MODE_INSIDE_ACL || (mode & (S_ISUID | S_ISGID | S_ISVTX))) - { - /* We did not call chmod so far, so the special bits have not yet - been set. */ - return chmod_or_fchmod (name, desc, mode); - } - return 0; - -# elif HAVE_GETACL /* HP-UX */ - - struct stat statbuf; - int ret; - - if (desc != -1) - ret = fstat (desc, &statbuf); - else - ret = stat (name, &statbuf); - if (ret < 0) - return -1; - - { - struct acl_entry entries[3]; - - entries[0].uid = statbuf.st_uid; - entries[0].gid = ACL_NSGROUP; - entries[0].mode = (mode >> 6) & 7; - entries[1].uid = ACL_NSUSER; - entries[1].gid = statbuf.st_gid; - entries[1].mode = (mode >> 3) & 7; - entries[2].uid = ACL_NSUSER; - entries[2].gid = ACL_NSGROUP; - entries[2].mode = mode & 7; - - if (desc != -1) - ret = fsetacl (desc, sizeof (entries) / sizeof (struct acl_entry), entries); - else - ret = setacl (name, sizeof (entries) / sizeof (struct acl_entry), entries); - } - if (ret < 0) - { - if (!(errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP)) - return -1; - -# if HAVE_ACLV_H /* HP-UX >= 11.11 */ - { - struct acl entries[4]; - - entries[0].a_type = USER_OBJ; - entries[0].a_id = 0; /* irrelevant */ - entries[0].a_perm = (mode >> 6) & 7; - entries[1].a_type = GROUP_OBJ; - entries[1].a_id = 0; /* irrelevant */ - entries[1].a_perm = (mode >> 3) & 7; - entries[2].a_type = CLASS_OBJ; - entries[2].a_id = 0; - entries[2].a_perm = (mode >> 3) & 7; - entries[3].a_type = OTHER_OBJ; - entries[3].a_id = 0; - entries[3].a_perm = mode & 7; - - ret = aclsort (sizeof (entries) / sizeof (struct acl), 1, entries); - if (ret > 0) - abort (); - if (ret < 0) - { - if (0) - return chmod_or_fchmod (name, desc, mode); - return -1; - } - - ret = acl ((char *) name, ACL_SET, - sizeof (entries) / sizeof (struct acl), entries); - if (ret < 0) - { - if (errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL) - return chmod_or_fchmod (name, desc, mode); - return -1; - } - } -# else - return chmod_or_fchmod (name, desc, mode); -# endif - } - - if (mode & (S_ISUID | S_ISGID | S_ISVTX)) - { - /* We did not call chmod so far, so the special bits have not yet - been set. */ - return chmod_or_fchmod (name, desc, mode); - } - return 0; - -# elif HAVE_ACLX_GET && defined ACL_AIX_WIP /* AIX */ - - acl_type_list_t types; - size_t types_size = sizeof (types); - acl_type_t type; - - if (aclx_gettypes (name, &types, &types_size) < 0 - || types.num_entries == 0) - return chmod_or_fchmod (name, desc, mode); - - /* XXX Do we need to clear all types of ACLs for the given file, or is it - sufficient to clear the first one? */ - type = types.entries[0]; - if (type.u64 == ACL_AIXC) - { - union { struct acl a; char room[128]; } u; - int ret; - - u.a.acl_len = (char *) &u.a.acl_ext[0] - (char *) &u.a; /* no entries */ - u.a.acl_mode = mode & ~(S_IXACL | 0777); - u.a.u_access = (mode >> 6) & 7; - u.a.g_access = (mode >> 3) & 7; - u.a.o_access = mode & 7; - - if (desc != -1) - ret = aclx_fput (desc, SET_ACL | SET_MODE_S_BITS, - type, &u.a, u.a.acl_len, mode); - else - ret = aclx_put (name, SET_ACL | SET_MODE_S_BITS, - type, &u.a, u.a.acl_len, mode); - if (!(ret < 0 && errno == ENOSYS)) - return ret; - } - else if (type.u64 == ACL_NFS4) - { - union { nfs4_acl_int_t a; char room[128]; } u; - nfs4_ace_int_t *ace; - int ret; - - u.a.aclVersion = NFS4_ACL_INT_STRUCT_VERSION; - u.a.aclEntryN = 0; - ace = &u.a.aclEntry[0]; - { - ace->flags = ACE4_ID_SPECIAL; - ace->aceWho.special_whoid = ACE4_WHO_OWNER; - ace->aceType = ACE4_ACCESS_ALLOWED_ACE_TYPE; - ace->aceFlags = 0; - ace->aceMask = - (mode & 0400 ? ACE4_READ_DATA | ACE4_LIST_DIRECTORY : 0) - | (mode & 0200 - ? ACE4_WRITE_DATA | ACE4_ADD_FILE | ACE4_APPEND_DATA - | ACE4_ADD_SUBDIRECTORY - : 0) - | (mode & 0100 ? ACE4_EXECUTE : 0); - ace->aceWhoString[0] = '\0'; - ace->entryLen = (char *) &ace->aceWhoString[4] - (char *) ace; - ace = (nfs4_ace_int_t *) (char *) &ace->aceWhoString[4]; - u.a.aclEntryN++; - } - { - ace->flags = ACE4_ID_SPECIAL; - ace->aceWho.special_whoid = ACE4_WHO_GROUP; - ace->aceType = ACE4_ACCESS_ALLOWED_ACE_TYPE; - ace->aceFlags = 0; - ace->aceMask = - (mode & 0040 ? ACE4_READ_DATA | ACE4_LIST_DIRECTORY : 0) - | (mode & 0020 - ? ACE4_WRITE_DATA | ACE4_ADD_FILE | ACE4_APPEND_DATA - | ACE4_ADD_SUBDIRECTORY - : 0) - | (mode & 0010 ? ACE4_EXECUTE : 0); - ace->aceWhoString[0] = '\0'; - ace->entryLen = (char *) &ace->aceWhoString[4] - (char *) ace; - ace = (nfs4_ace_int_t *) (char *) &ace->aceWhoString[4]; - u.a.aclEntryN++; - } - { - ace->flags = ACE4_ID_SPECIAL; - ace->aceWho.special_whoid = ACE4_WHO_EVERYONE; - ace->aceType = ACE4_ACCESS_ALLOWED_ACE_TYPE; - ace->aceFlags = 0; - ace->aceMask = - (mode & 0004 ? ACE4_READ_DATA | ACE4_LIST_DIRECTORY : 0) - | (mode & 0002 - ? ACE4_WRITE_DATA | ACE4_ADD_FILE | ACE4_APPEND_DATA - | ACE4_ADD_SUBDIRECTORY - : 0) - | (mode & 0001 ? ACE4_EXECUTE : 0); - ace->aceWhoString[0] = '\0'; - ace->entryLen = (char *) &ace->aceWhoString[4] - (char *) ace; - ace = (nfs4_ace_int_t *) (char *) &ace->aceWhoString[4]; - u.a.aclEntryN++; - } - u.a.aclLength = (char *) ace - (char *) &u.a; - - if (desc != -1) - ret = aclx_fput (desc, SET_ACL | SET_MODE_S_BITS, - type, &u.a, u.a.aclLength, mode); - else - ret = aclx_put (name, SET_ACL | SET_MODE_S_BITS, - type, &u.a, u.a.aclLength, mode); - if (!(ret < 0 && errno == ENOSYS)) - return ret; - } - - return chmod_or_fchmod (name, desc, mode); - -# elif HAVE_STATACL /* older AIX */ - - union { struct acl a; char room[128]; } u; - int ret; - - u.a.acl_len = (char *) &u.a.acl_ext[0] - (char *) &u.a; /* no entries */ - u.a.acl_mode = mode & ~(S_IXACL | 0777); - u.a.u_access = (mode >> 6) & 7; - u.a.g_access = (mode >> 3) & 7; - u.a.o_access = mode & 7; - - if (desc != -1) - ret = fchacl (desc, &u.a, u.a.acl_len); - else - ret = chacl (name, &u.a, u.a.acl_len); - - if (ret < 0 && errno == ENOSYS) - return chmod_or_fchmod (name, desc, mode); - + memset (&ctx, 0, sizeof ctx); + ctx.mode = mode; + ret = set_permissions (&ctx, name, desc); + free_permission_context (&ctx); return ret; - -# elif HAVE_ACLSORT /* NonStop Kernel */ - - struct acl entries[4]; - int ret; - - entries[0].a_type = USER_OBJ; - entries[0].a_id = 0; /* irrelevant */ - entries[0].a_perm = (mode >> 6) & 7; - entries[1].a_type = GROUP_OBJ; - entries[1].a_id = 0; /* irrelevant */ - entries[1].a_perm = (mode >> 3) & 7; - entries[2].a_type = CLASS_OBJ; - entries[2].a_id = 0; - entries[2].a_perm = (mode >> 3) & 7; - entries[3].a_type = OTHER_OBJ; - entries[3].a_id = 0; - entries[3].a_perm = mode & 7; - - ret = aclsort (sizeof (entries) / sizeof (struct acl), 1, entries); - if (ret > 0) - abort (); - if (ret < 0) - { - if (0) - return chmod_or_fchmod (name, desc, mode); - return -1; - } - - ret = acl ((char *) name, ACL_SET, - sizeof (entries) / sizeof (struct acl), entries); - if (ret < 0) - { - if (0) - return chmod_or_fchmod (name, desc, mode); - return -1; - } - - if (mode & (S_ISUID | S_ISGID | S_ISVTX)) - { - /* We did not call chmod so far, so the special bits have not yet - been set. */ - return chmod_or_fchmod (name, desc, mode); - } - return 0; - -# else /* Unknown flavor of ACLs */ - return chmod_or_fchmod (name, desc, mode); -# endif -#else /* !USE_ACL */ - return chmod_or_fchmod (name, desc, mode); -#endif } diff --git a/lib/quote.h b/lib/quote.h index fb338a77..28c05fdd 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-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2001, 2003, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/quotearg.c b/lib/quotearg.c index bef7b98b..9f916592 100644 --- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -1,6 +1,6 @@ /* quotearg.c - quote arguments for output - Copyright (C) 1998-2002, 2004-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2004-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/quotearg.h b/lib/quotearg.h index da29d7b5..d0ccd8be 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-2014 Free Software Foundation, + Copyright (C) 1998-2002, 2004, 2006, 2008-2015 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 cf58a7e9..d6ba2a17 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/rand-isaac.c b/lib/rand-isaac.c index c03242f6..b698ea80 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-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2015 Free Software Foundation, Inc. Copyright (C) 1997, 1998, 1999 Colin Plumb. This program is free software: you can redistribute it and/or modify @@ -35,6 +35,18 @@ #include "rand-isaac.h" #include +#include + +/* If the platform supports unaligned access, + then don't have -fsanitize=undefined warn about it. */ +#undef ATTRIBUTE_NO_WARN_SANITIZE_UNDEFINED +#if !_STRING_ARCH_unaligned \ + || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9) +# define ATTRIBUTE_NO_WARN_SANITIZE_UNDEFINED /* empty */ +#else +# define ATTRIBUTE_NO_WARN_SANITIZE_UNDEFINED \ + __attribute__ ((__no_sanitize_undefined__)) +#endif /* The minimum of two sizes A and B. */ static inline size_t @@ -81,7 +93,7 @@ ind (isaac_word const *m, isaac_word x) } /* Use and update *S to generate random data to fill RESULT. */ -void +void ATTRIBUTE_NO_WARN_SANITIZE_UNDEFINED isaac_refill (struct isaac_state *s, isaac_word result[ISAAC_WORDS]) { /* Caches of S->a and S->b. */ @@ -96,7 +108,7 @@ isaac_refill (struct isaac_state *s, isaac_word result[ISAAC_WORDS]) /* The central step. S->m is the whole state array, while M is a pointer to the current word. OFF is the offset from M to the - word ISAAC_WORDS/2 words away in the SM array, i.e. +/- + word ISAAC_WORDS/2 words away in the SM array, i.e., +/- ISAAC_WORDS/2. A and B are state variables, and R the result. This updates A, B, M[I], and R[I]. */ #define ISAAC_STEP(i, off, mix) \ diff --git a/lib/rand-isaac.h b/lib/rand-isaac.h index a34a0a73..5f0c8646 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-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2015 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 1e5e0a0c..240fd240 100644 --- a/lib/randint.c +++ b/lib/randint.c @@ -1,6 +1,6 @@ /* Generate random integers. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This program is free software: 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 151edfdc..d6728c2e 100644 --- a/lib/randint.h +++ b/lib/randint.h @@ -1,6 +1,6 @@ /* Generate random integers. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This program is free software: 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 1be13511..41ea4c1a 100644 --- a/lib/randperm.c +++ b/lib/randperm.c @@ -1,6 +1,6 @@ /* Generate random permutations. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This program is free software: 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 a073cab2..5efbd4fe 100644 --- a/lib/randread.c +++ b/lib/randread.c @@ -1,6 +1,6 @@ /* Generate buffers of random data. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This 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 @@ randread_error (void const *file_name) { if (file_name) error (exit_failure, errno, - _(errno == 0 ? "%s: end of file" : "%s: read error"), + errno == 0 ? _("%s: end of file") : _("%s: read error"), quotearg_colon (file_name)); abort (); } diff --git a/lib/randread.h b/lib/randread.h index 7223c9d2..c6ffc79c 100644 --- a/lib/randread.h +++ b/lib/randread.h @@ -1,6 +1,6 @@ /* Generate buffers of random data. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This program is free software: 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 45f66900..f17c5994 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2015 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 f458b482..b869c5ce 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2015 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 d125b51a..3d8eefa8 100644 --- a/lib/read.c +++ b/lib/read.c @@ -1,5 +1,5 @@ /* POSIX compatible read() function. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/readdir.c b/lib/readdir.c index b74aebe0..8646aac4 100644 --- a/lib/readdir.c +++ b/lib/readdir.c @@ -1,5 +1,5 @@ /* Read the next entry of a directory. - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: 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 4c496395..965c3e25 100644 --- a/lib/readlink.c +++ b/lib/readlink.c @@ -1,5 +1,5 @@ /* Stub for readlink(). - Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 c8a60500..c91cf0e8 100644 --- a/lib/readlinkat.c +++ b/lib/readlinkat.c @@ -1,5 +1,5 @@ /* Read a symlink relative to an open directory. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,7 +18,37 @@ #include +#include #include +#include +#include + +#if HAVE_READLINKAT + +# undef readlinkat + +ssize_t +rpl_readlinkat (int fd, char const *file, char *buf, size_t len) +{ +# if READLINK_TRAILING_SLASH_BUG + size_t file_len = strlen (file); + if (file_len && file[file_len - 1] == '/') + { + /* Even if FILE without the slash is a symlink to a directory, + both lstat() and stat() must resolve the trailing slash to + the directory rather than the symlink. We can therefore + safely use stat() to distinguish between EINVAL and + ENOTDIR/ENOENT, avoiding extra overhead of rpl_lstat(). */ + struct stat st; + if (stat (file, &st) == 0) + errno = EINVAL; + return -1; + } +# endif /* READLINK_TRAILING_SLASH_BUG */ + return readlinkat (fd, file, buf, len); +} + +#else /* Gnulib provides a readlink stub for mingw; use it for distinction between EINVAL and ENOENT, rather than always failing with ENOSYS. */ @@ -34,14 +64,16 @@ then readlink/restore_cwd. If either the save_cwd or the restore_cwd fails, then give a diagnostic and exit nonzero. */ -#define AT_FUNC_NAME readlinkat -#define AT_FUNC_F1 readlink -#define AT_FUNC_POST_FILE_PARAM_DECLS , char *buf, size_t len -#define AT_FUNC_POST_FILE_ARGS , buf, len -#define AT_FUNC_RESULT ssize_t -#include "at-func.c" -#undef AT_FUNC_NAME -#undef AT_FUNC_F1 -#undef AT_FUNC_POST_FILE_PARAM_DECLS -#undef AT_FUNC_POST_FILE_ARGS -#undef AT_FUNC_RESULT +# define AT_FUNC_NAME readlinkat +# define AT_FUNC_F1 readlink +# define AT_FUNC_POST_FILE_PARAM_DECLS , char *buf, size_t len +# define AT_FUNC_POST_FILE_ARGS , buf, len +# define AT_FUNC_RESULT ssize_t +# include "at-func.c" +# undef AT_FUNC_NAME +# undef AT_FUNC_F1 +# undef AT_FUNC_POST_FILE_PARAM_DECLS +# undef AT_FUNC_POST_FILE_ARGS +# undef AT_FUNC_RESULT + +#endif diff --git a/lib/readtokens.c b/lib/readtokens.c index fbed2ca7..c46adccb 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-2014 Free Software + Copyright (C) 1990-1991, 1999-2004, 2006, 2009-2015 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 e03d3311..ca283af3 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-2014 Free Software + Copyright (C) 1990-1991, 1999, 2001-2004, 2009-2015 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 3ced091e..d9ede92b 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-2014 Free Software Foundation, Inc. + Copyright (C) 2004, 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 cb51f9f9..b60912de 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-2014 Free Software Foundation, Inc. + Copyright (C) 2004, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 a90290b6..10050037 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-2014 Free Software Foundation, Inc. + Copyright (C) 1992-2001, 2003-2006, 2009-2015 Free Software Foundation, Inc. This 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 @@ read_utmp (char const *file, size_t *n_entries, STRUCT_UTMP **utmp_buf, Solaris' utmpname returns 1 upon success -- which is contrary to what the GNU libc version does. In addition, older GNU libc versions are actually void. */ - UTMP_NAME_FUNCTION (file); + UTMP_NAME_FUNCTION ((char *) file); SET_UTMP_ENT (); diff --git a/lib/readutmp.h b/lib/readutmp.h index 0c5623c2..481eead2 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-2014 Free Software Foundation, Inc. + Copyright (C) 1992-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -47,6 +47,8 @@ # define END_UTMP_ENT endutxent # ifdef HAVE_UTMPXNAME # define UTMP_NAME_FUNCTION utmpxname +# elif defined UTXDB_ACTIVE +# define UTMP_NAME_FUNCTION(x) setutxdb (UTXDB_ACTIVE, x) # endif # if HAVE_STRUCT_UTMPX_UT_EXIT_E_TERMINATION diff --git a/lib/realloc.c b/lib/realloc.c index 8dfcfbe5..068b081f 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-2014 Free Software + Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2015 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 0e140229..6cbe5b54 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc. # # This program is free software; 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 2dbcf7b2..f50cf0aa 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc. # # This program is free software; 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 a9640922..fc042fba 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . diff --git a/lib/regex.c b/lib/regex.c index 95beb6fb..6d0ae882 100644 --- a/lib/regex.c +++ b/lib/regex.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . diff --git a/lib/regex.h b/lib/regex.h index 70f2126c..0f0f3699 100644 --- a/lib/regex.h +++ b/lib/regex.h @@ -1,6 +1,6 @@ /* Definitions for data structures and routines for the regular expression library. - Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2014 Free Software + Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/regex_internal.c b/lib/regex_internal.c index 3186b793..07352078 100644 --- a/lib/regex_internal.c +++ b/lib/regex_internal.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -679,7 +679,7 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags) pstr->valid_len - offset); pstr->valid_len -= offset; pstr->valid_raw_len -= offset; -#if DEBUG +#if defined DEBUG && DEBUG assert (pstr->valid_len > 0); #endif } @@ -938,7 +938,7 @@ re_string_context_at (const re_string_t *input, Idx idx, int eflags) Idx wc_idx = idx; while(input->wcs[wc_idx] == WEOF) { -#ifdef DEBUG +#if defined DEBUG && DEBUG /* It must not happen. */ assert (REG_VALID_INDEX (wc_idx)); #endif diff --git a/lib/regex_internal.h b/lib/regex_internal.h index a35ccb72..2612912f 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . diff --git a/lib/regexec.c b/lib/regexec.c index fc05e925..48a4a762 100644 --- a/lib/regexec.c +++ b/lib/regexec.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . diff --git a/lib/remove.c b/lib/remove.c index 15d762dd..bdba7de4 100644 --- a/lib/remove.c +++ b/lib/remove.c @@ -1,5 +1,5 @@ /* Remove a file or directory. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: 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 608f8387..43be743d 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 d201ffa0..8e3b4dd9 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: 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 ec7a586f..ae21d541 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-2014 Free Software + Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2015 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 3a4ec67c..86629323 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-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2015 Free Software Foundation, Inc. This program is free software: 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 60232083..e6bf35e3 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-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/root-uid.h b/lib/root-uid.h index 39e3c995..d263f4da 100644 --- a/lib/root-uid.h +++ b/lib/root-uid.h @@ -1,6 +1,6 @@ /* The user ID that always has appropriate privileges in the POSIX sense. - Copyright 2012-2014 Free Software Foundation, Inc. + Copyright 2012-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/rpmatch.c b/lib/rpmatch.c index 44810820..b2416047 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-2014 Free Software + Copyright (C) 1996, 1998, 2000, 2002-2003, 2006-2015 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 c9b8828a..dbb63380 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-2014 Free Software + Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2015 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 aba8bdb3..b5d408ac 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002, 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/safe-write.c b/lib/safe-write.c index bf72dd4d..4c178f52 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 ae186572..86a32b2a 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/same-inode.h b/lib/same-inode.h index 584f6065..ecc3049d 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 5c00e8a3..515d81a8 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-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2000, 2002-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 5f5c0059..ee313c58 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-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2000, 2003-2004, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 7aafacd4..159d8a89 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-2014 Free Software + Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2015 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 6b84e460..890f7fba 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-2014 Free Software Foundation, + Copyright (C) 1995, 1997-1998, 2003, 2009-2015 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 111d84be..61b0fa3c 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-2014 Free Software + Copyright (C) 1990, 1997-2001, 2003-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -161,7 +161,8 @@ streamsavedir (DIR *dirp, enum savedir_option option) { size_t i; - qsort (entries, entries_used, sizeof *entries, cmp); + if (entries_used) + qsort (entries, entries_used, sizeof *entries, cmp); name_space = xmalloc (used + 1); used = 0; for (i = 0; i < entries_used; i++) diff --git a/lib/savedir.h b/lib/savedir.h index aff4ad99..70588aa8 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-2014 Free Software + Copyright (C) 1997, 1999, 2001, 2003, 2005, 2009-2015 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 88c5feff..16f56a8e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2009-2015 Free Software Foundation, Inc. This 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,6 @@ #include "savewd.h" -#include #include #include #include @@ -33,6 +32,7 @@ #include #include +#include "assure.h" #include "dosname.h" #include "fcntl-safer.h" @@ -88,7 +88,7 @@ savewd_save (struct savewd *wd) break; default: - assert (false); + assure (false); } return false; @@ -144,11 +144,11 @@ savewd_chdir (struct savewd *wd, char const *dir, int options, break; case FORKING_STATE: - assert (wd->val.child == 0); + assure (wd->val.child == 0); break; default: - assert (false); + assure (false); } } } @@ -205,7 +205,7 @@ savewd_restore (struct savewd *wd, int status) { int child_status; while (waitpid (child, &child_status, 0) < 0) - assert (errno == EINTR); + assure (errno == EINTR); wd->val.child = -1; if (! WIFEXITED (child_status)) raise (WTERMSIG (child_status)); @@ -215,7 +215,7 @@ savewd_restore (struct savewd *wd, int status) break; default: - assert (false); + assure (false); } return 0; @@ -236,11 +236,11 @@ savewd_finish (struct savewd *wd) break; case FORKING_STATE: - assert (wd->val.child < 0); + assure (wd->val.child < 0); break; default: - assert (false); + assure (false); } wd->state = FINAL_STATE; diff --git a/lib/savewd.h b/lib/savewd.h index cd0817b7..bb442b33 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. This 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 @@ 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. */ -SAVEWD_INLINE int +SAVEWD_INLINE int _GL_ATTRIBUTE_PURE savewd_errno (struct savewd const *wd) { return (wd->state == ERROR_STATE ? wd->val.errnum : 0); diff --git a/lib/sched.in.h b/lib/sched.in.h index edebf810..92d6a4ff 100644 --- a/lib/sched.in.h +++ b/lib/sched.in.h @@ -1,5 +1,5 @@ /* Replacement for platforms that lack it. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This 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,13 @@ and Mac OS X 10.5. */ #include +#ifdef __KLIBC__ + +/* On OS/2 kLIBC, struct sched_param is in spawn.h */ +# include + +#endif + #if !@HAVE_STRUCT_SCHED_PARAM@ # if !GNULIB_defined_struct_sched_param diff --git a/lib/se-selinux.in.h b/lib/se-selinux.in.h index 5eb92a20..5d8f9504 100644 --- a/lib/se-selinux.in.h +++ b/lib/se-selinux.in.h @@ -1,5 +1,5 @@ /* Replacement for platforms that lack it. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/secure_getenv.c b/lib/secure_getenv.c index 32819e6d..31aad1fd 100644 --- a/lib/secure_getenv.c +++ b/lib/secure_getenv.c @@ -1,6 +1,6 @@ /* Look up an environment variable more securely. - Copyright 2013-2014 Free Software Foundation, Inc. + Copyright 2013-2015 Free Software Foundation, Inc. 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/select.c b/lib/select.c index 81af82cd..90193152 100644 --- a/lib/select.c +++ b/lib/select.c @@ -1,7 +1,7 @@ /* Emulation for select(2) Contributed by Paolo Bonzini. - Copyright 2008-2014 Free Software Foundation, Inc. + Copyright 2008-2015 Free Software Foundation, Inc. This file is part of gnulib. diff --git a/lib/selinux-at.c b/lib/selinux-at.c index d2032c07..fbbbf5d3 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 e65687e8..93340eec 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/set-acl.c b/lib/set-acl.c index 9807f107..da31750e 100644 --- a/lib/set-acl.c +++ b/lib/set-acl.c @@ -1,6 +1,6 @@ /* set-acl.c - set access control list equivalent to a mode - Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc. This program is free software: 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-permissions.c b/lib/set-permissions.c new file mode 100644 index 00000000..8569a20a --- /dev/null +++ b/lib/set-permissions.c @@ -0,0 +1,833 @@ +/* set-permissions.c - set permissions of a file + + Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible. */ + +#include + +#include "acl.h" + +#include "acl-internal.h" + +#if USE_ACL +# if ! defined HAVE_ACL_FROM_MODE && defined HAVE_ACL_FROM_TEXT /* FreeBSD, IRIX, Tru64 */ +static acl_t +acl_from_mode (mode_t mode) +{ +# if HAVE_ACL_FREE_TEXT /* Tru64 */ + char acl_text[] = "u::---,g::---,o::---,"; +# else /* FreeBSD, IRIX */ + char acl_text[] = "u::---,g::---,o::---"; +# endif + + if (mode & S_IRUSR) acl_text[ 3] = 'r'; + if (mode & S_IWUSR) acl_text[ 4] = 'w'; + if (mode & S_IXUSR) acl_text[ 5] = 'x'; + if (mode & S_IRGRP) acl_text[10] = 'r'; + if (mode & S_IWGRP) acl_text[11] = 'w'; + if (mode & S_IXGRP) acl_text[12] = 'x'; + if (mode & S_IROTH) acl_text[17] = 'r'; + if (mode & S_IWOTH) acl_text[18] = 'w'; + if (mode & S_IXOTH) acl_text[19] = 'x'; + + return acl_from_text (acl_text); +} +# endif + +# if HAVE_FACL && defined GETACL /* Solaris, Cygwin, not HP-UX */ +static int +set_acls_from_mode (const char *name, int desc, mode_t mode, bool *must_chmod) +{ +# ifdef ACE_GETACL + /* Solaris also has a different variant of ACLs, used in ZFS and NFSv4 + file systems (whereas the other ones are used in UFS file systems). */ + + /* The flags in the ace_t structure changed in a binary incompatible way + when ACL_NO_TRIVIAL etc. were introduced in version 1.15. + How to distinguish the two conventions at runtime? + We fetch the existing ACL. In the old convention, usually three ACEs have + a_flags = ACE_OWNER / ACE_GROUP / ACE_OTHER, in the range 0x0100..0x0400. + In the new convention, these values are not used. */ + int convention; + + { + /* Initially, try to read the entries into a stack-allocated buffer. + Use malloc if it does not fit. */ + enum + { + alloc_init = 4000 / sizeof (ace_t), /* >= 3 */ + alloc_max = MIN (INT_MAX, SIZE_MAX / sizeof (ace_t)) + }; + ace_t buf[alloc_init]; + size_t alloc = alloc_init; + ace_t *entries = buf; + ace_t *malloced = NULL; + int count; + + for (;;) + { + count = (desc != -1 + ? facl (desc, ACE_GETACL, alloc, entries) + : acl (name, ACE_GETACL, alloc, entries)); + if (count < 0 && errno == ENOSPC) + { + /* Increase the size of the buffer. */ + free (malloced); + if (alloc > alloc_max / 2) + { + errno = ENOMEM; + return -1; + } + alloc = 2 * alloc; /* <= alloc_max */ + entries = malloced = (ace_t *) malloc (alloc * sizeof (ace_t)); + if (entries == NULL) + { + errno = ENOMEM; + return -1; + } + continue; + } + break; + } + + if (count <= 0) + convention = -1; + else + { + int i; + + convention = 0; + for (i = 0; i < count; i++) + if (entries[i].a_flags & (OLD_ACE_OWNER | OLD_ACE_GROUP | OLD_ACE_OTHER)) + { + convention = 1; + break; + } + } + free (malloced); + } + + if (convention >= 0) + { + ace_t entries[6]; + int count; + int ret; + + if (convention) + { + /* Running on Solaris 10. */ + entries[0].a_type = OLD_ALLOW; + entries[0].a_flags = OLD_ACE_OWNER; + entries[0].a_who = 0; /* irrelevant */ + entries[0].a_access_mask = (mode >> 6) & 7; + entries[1].a_type = OLD_ALLOW; + entries[1].a_flags = OLD_ACE_GROUP; + entries[1].a_who = 0; /* irrelevant */ + entries[1].a_access_mask = (mode >> 3) & 7; + entries[2].a_type = OLD_ALLOW; + entries[2].a_flags = OLD_ACE_OTHER; + entries[2].a_who = 0; + entries[2].a_access_mask = mode & 7; + count = 3; + } + else + { + /* Running on Solaris 10 (newer version) or Solaris 11. + The details here were found through "/bin/ls -lvd somefiles". */ + entries[0].a_type = NEW_ACE_ACCESS_DENIED_ACE_TYPE; + entries[0].a_flags = NEW_ACE_OWNER; + entries[0].a_who = 0; /* irrelevant */ + entries[0].a_access_mask = 0; + entries[1].a_type = NEW_ACE_ACCESS_ALLOWED_ACE_TYPE; + entries[1].a_flags = NEW_ACE_OWNER; + entries[1].a_who = 0; /* irrelevant */ + entries[1].a_access_mask = NEW_ACE_WRITE_NAMED_ATTRS + | NEW_ACE_WRITE_ATTRIBUTES + | NEW_ACE_WRITE_ACL + | NEW_ACE_WRITE_OWNER; + if (mode & 0400) + entries[1].a_access_mask |= NEW_ACE_READ_DATA; + else + entries[0].a_access_mask |= NEW_ACE_READ_DATA; + if (mode & 0200) + entries[1].a_access_mask |= NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA; + else + entries[0].a_access_mask |= NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA; + if (mode & 0100) + entries[1].a_access_mask |= NEW_ACE_EXECUTE; + else + entries[0].a_access_mask |= NEW_ACE_EXECUTE; + entries[2].a_type = NEW_ACE_ACCESS_DENIED_ACE_TYPE; + entries[2].a_flags = NEW_ACE_GROUP | NEW_ACE_IDENTIFIER_GROUP; + entries[2].a_who = 0; /* irrelevant */ + entries[2].a_access_mask = 0; + entries[3].a_type = NEW_ACE_ACCESS_ALLOWED_ACE_TYPE; + entries[3].a_flags = NEW_ACE_GROUP | NEW_ACE_IDENTIFIER_GROUP; + entries[3].a_who = 0; /* irrelevant */ + entries[3].a_access_mask = 0; + if (mode & 0040) + entries[3].a_access_mask |= NEW_ACE_READ_DATA; + else + entries[2].a_access_mask |= NEW_ACE_READ_DATA; + if (mode & 0020) + entries[3].a_access_mask |= NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA; + else + entries[2].a_access_mask |= NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA; + if (mode & 0010) + entries[3].a_access_mask |= NEW_ACE_EXECUTE; + else + entries[2].a_access_mask |= NEW_ACE_EXECUTE; + entries[4].a_type = NEW_ACE_ACCESS_DENIED_ACE_TYPE; + entries[4].a_flags = NEW_ACE_EVERYONE; + entries[4].a_who = 0; + entries[4].a_access_mask = NEW_ACE_WRITE_NAMED_ATTRS + | NEW_ACE_WRITE_ATTRIBUTES + | NEW_ACE_WRITE_ACL + | NEW_ACE_WRITE_OWNER; + entries[5].a_type = NEW_ACE_ACCESS_ALLOWED_ACE_TYPE; + entries[5].a_flags = NEW_ACE_EVERYONE; + entries[5].a_who = 0; + entries[5].a_access_mask = NEW_ACE_READ_NAMED_ATTRS + | NEW_ACE_READ_ATTRIBUTES + | NEW_ACE_READ_ACL + | NEW_ACE_SYNCHRONIZE; + if (mode & 0004) + entries[5].a_access_mask |= NEW_ACE_READ_DATA; + else + entries[4].a_access_mask |= NEW_ACE_READ_DATA; + if (mode & 0002) + entries[5].a_access_mask |= NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA; + else + entries[4].a_access_mask |= NEW_ACE_WRITE_DATA | NEW_ACE_APPEND_DATA; + if (mode & 0001) + entries[5].a_access_mask |= NEW_ACE_EXECUTE; + else + entries[4].a_access_mask |= NEW_ACE_EXECUTE; + count = 6; + } + if (desc != -1) + ret = facl (desc, ACE_SETACL, count, entries); + else + ret = acl (name, ACE_SETACL, count, entries); + if (ret < 0 && errno != EINVAL && errno != ENOTSUP) + { + if (errno == ENOSYS) + { + *must_chmod = true; + return 0; + } + return -1; + } + if (ret == 0) + return 0; + } +# endif + + { + aclent_t entries[3]; + int ret; + + entries[0].a_type = USER_OBJ; + entries[0].a_id = 0; /* irrelevant */ + entries[0].a_perm = (mode >> 6) & 7; + entries[1].a_type = GROUP_OBJ; + entries[1].a_id = 0; /* irrelevant */ + entries[1].a_perm = (mode >> 3) & 7; + entries[2].a_type = OTHER_OBJ; + entries[2].a_id = 0; + entries[2].a_perm = mode & 7; + + if (desc != -1) + ret = facl (desc, SETACL, + sizeof (entries) / sizeof (aclent_t), entries); + else + ret = acl (name, SETACL, + sizeof (entries) / sizeof (aclent_t), entries); + if (ret < 0) + { + if (errno == ENOSYS || errno == EOPNOTSUPP) + { + *must_chmod = true; + return 0; + } + return -1; + } + } +} + +#elif HAVE_GETACL /* HP-UX */ +static int +context_acl_from_mode (struct permission_context *ctx, const char *name, int desc) +{ + struct stat statbuf; + int ret; + + if (desc != -1) + ret = fstat (desc, &statbuf); + else + ret = stat (name, &statbuf); + if (ret < 0) + return -1; + + ctx->entries[0].uid = statbuf.st_uid; + ctx->entries[0].gid = ACL_NSGROUP; + ctx->entries[0].mode = (mode >> 6) & 7; + ctx->entries[1].uid = ACL_NSUSER; + ctx->entries[1].gid = statbuf.st_gid; + ctx->entries[1].mode = (mode >> 3) & 7; + ctx->entries[2].uid = ACL_NSUSER; + ctx->entries[2].gid = ACL_NSGROUP; + ctx->entries[2].mode = mode & 7; + ctx->count = 3; + return 0; +} + +# if HAVE_ACLV_H /* HP-UX >= 11.11 */ +static int +context_aclv_from_mode (struct permission_context *ctx) +{ + int ret; + + ctx->aclv_entries[0].a_type = USER_OBJ; + ctx->aclv_entries[0].a_id = 0; /* irrelevant */ + ctx->aclv_entries[0].a_perm = (mode >> 6) & 7; + ctx->aclv_entries[1].a_type = GROUP_OBJ; + ctx->aclv_entries[1].a_id = 0; /* irrelevant */ + ctx->aclv_entries[1].a_perm = (mode >> 3) & 7; + ctx->aclv_entries[2].a_type = CLASS_OBJ; + ctx->aclv_entries[2].a_id = 0; + ctx->aclv_entries[2].a_perm = (mode >> 3) & 7; + ctx->aclv_entries[3].a_type = OTHER_OBJ; + ctx->aclv_entries[3].a_id = 0; + ctx->aclv_entries[3].a_perm = mode & 7; + ctx->aclv_count = 4; + + ret = aclsort (sizeof (entries) / sizeof (struct acl), 1, entries); + if (ret > 0) + abort (); + return ret; +} +#endif + +# elif HAVE_ACLX_GET && defined ACL_AIX_WIP /* AIX */ +static int +set_acls_from_mode (const char *name, int desc, mode_t mode, bool *must_chmod) +{ + acl_type_list_t types; + size_t types_size = sizeof (types); + acl_type_t type; + + if (aclx_gettypes (name, &types, &types_size) < 0 + || types.num_entries == 0) + { + *must_chmod = true; + return 0; + } + + /* XXX Do we need to clear all types of ACLs for the given file, or is it + sufficient to clear the first one? */ + type = types.entries[0]; + if (type.u64 == ACL_AIXC) + { + union { struct acl a; char room[128]; } u; + int ret; + + u.a.acl_len = (char *) &u.a.acl_ext[0] - (char *) &u.a; /* no entries */ + u.a.acl_mode = mode & ~(S_IXACL | 0777); + u.a.u_access = (mode >> 6) & 7; + u.a.g_access = (mode >> 3) & 7; + u.a.o_access = mode & 7; + + if (desc != -1) + ret = aclx_fput (desc, SET_ACL | SET_MODE_S_BITS, + type, &u.a, u.a.acl_len, mode); + else + ret = aclx_put (name, SET_ACL | SET_MODE_S_BITS, + type, &u.a, u.a.acl_len, mode); + if (!(ret < 0 && errno == ENOSYS)) + return ret; + } + else if (type.u64 == ACL_NFS4) + { + union { nfs4_acl_int_t a; char room[128]; } u; + nfs4_ace_int_t *ace; + int ret; + + u.a.aclVersion = NFS4_ACL_INT_STRUCT_VERSION; + u.a.aclEntryN = 0; + ace = &u.a.aclEntry[0]; + { + ace->flags = ACE4_ID_SPECIAL; + ace->aceWho.special_whoid = ACE4_WHO_OWNER; + ace->aceType = ACE4_ACCESS_ALLOWED_ACE_TYPE; + ace->aceFlags = 0; + ace->aceMask = + (mode & 0400 ? ACE4_READ_DATA | ACE4_LIST_DIRECTORY : 0) + | (mode & 0200 + ? ACE4_WRITE_DATA | ACE4_ADD_FILE | ACE4_APPEND_DATA + | ACE4_ADD_SUBDIRECTORY + : 0) + | (mode & 0100 ? ACE4_EXECUTE : 0); + ace->aceWhoString[0] = '\0'; + ace->entryLen = (char *) &ace->aceWhoString[4] - (char *) ace; + ace = (nfs4_ace_int_t *) (char *) &ace->aceWhoString[4]; + u.a.aclEntryN++; + } + { + ace->flags = ACE4_ID_SPECIAL; + ace->aceWho.special_whoid = ACE4_WHO_GROUP; + ace->aceType = ACE4_ACCESS_ALLOWED_ACE_TYPE; + ace->aceFlags = 0; + ace->aceMask = + (mode & 0040 ? ACE4_READ_DATA | ACE4_LIST_DIRECTORY : 0) + | (mode & 0020 + ? ACE4_WRITE_DATA | ACE4_ADD_FILE | ACE4_APPEND_DATA + | ACE4_ADD_SUBDIRECTORY + : 0) + | (mode & 0010 ? ACE4_EXECUTE : 0); + ace->aceWhoString[0] = '\0'; + ace->entryLen = (char *) &ace->aceWhoString[4] - (char *) ace; + ace = (nfs4_ace_int_t *) (char *) &ace->aceWhoString[4]; + u.a.aclEntryN++; + } + { + ace->flags = ACE4_ID_SPECIAL; + ace->aceWho.special_whoid = ACE4_WHO_EVERYONE; + ace->aceType = ACE4_ACCESS_ALLOWED_ACE_TYPE; + ace->aceFlags = 0; + ace->aceMask = + (mode & 0004 ? ACE4_READ_DATA | ACE4_LIST_DIRECTORY : 0) + | (mode & 0002 + ? ACE4_WRITE_DATA | ACE4_ADD_FILE | ACE4_APPEND_DATA + | ACE4_ADD_SUBDIRECTORY + : 0) + | (mode & 0001 ? ACE4_EXECUTE : 0); + ace->aceWhoString[0] = '\0'; + ace->entryLen = (char *) &ace->aceWhoString[4] - (char *) ace; + ace = (nfs4_ace_int_t *) (char *) &ace->aceWhoString[4]; + u.a.aclEntryN++; + } + u.a.aclLength = (char *) ace - (char *) &u.a; + + if (desc != -1) + ret = aclx_fput (desc, SET_ACL | SET_MODE_S_BITS, + type, &u.a, u.a.aclLength, mode); + else + ret = aclx_put (name, SET_ACL | SET_MODE_S_BITS, + type, &u.a, u.a.aclLength, mode); + if (!(ret < 0 && errno == ENOSYS)) + return ret; + } + + *must_chmod = true; + return 0; +} + +# elif HAVE_STATACL /* older AIX */ +static int +context_acl_from_mode (struct permission_context *ctx) +{ + ctx->u.a.acl_len = (char *) &ctx->u.a.acl_ext[0] - (char *) &ctx->u.a; /* no entries */ + ctx->u.a.acl_mode = ctx->mode & ~(S_IXACL | 0777); + ctx->u.a.u_access = (ctx->mode >> 6) & 7; + ctx->u.a.g_access = (ctx->mode >> 3) & 7; + ctx->u.a.o_access = ctx->mode & 7; + ctx->have_u = true; + return 0; +} + +# elif HAVE_ACLSORT /* NonStop Kernel */ +static int +context_acl_from_mode (struct permission_context *ctx) +{ + int ret; + + ctx->entries[0].a_type = USER_OBJ; + ctx->entries[0].a_id = 0; /* irrelevant */ + ctx->entries[0].a_perm = (mode >> 6) & 7; + ctx->entries[1].a_type = GROUP_OBJ; + ctx->entries[1].a_id = 0; /* irrelevant */ + ctx->entries[1].a_perm = (mode >> 3) & 7; + ctx->entries[2].a_type = CLASS_OBJ; + ctx->entries[2].a_id = 0; + ctx->entries[2].a_perm = (mode >> 3) & 7; + ctx->entries[3].a_type = OTHER_OBJ; + ctx->entries[3].a_id = 0; + ctx->entries[3].a_perm = mode & 7; + ctx->count = 4; + + ret = aclsort (sizeof (entries) / sizeof (struct acl), 1, entries); + if (ret > 0) + abort (); + return ret; +} +# endif + +static int +set_acls (struct permission_context *ctx, const char *name, int desc, + int from_mode, bool *must_chmod, bool *acls_set) +{ + int ret = 0; + +#if HAVE_ACL_GET_FILE + /* POSIX 1003.1e (draft 17 -- abandoned) specific version. */ + /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */ +# if !HAVE_ACL_TYPE_EXTENDED + /* Linux, FreeBSD, IRIX, Tru64 */ + +# ifndef HAVE_ACL_FROM_TEXT +# error Must have acl_from_text (see POSIX 1003.1e draft 17). +# endif +# ifndef HAVE_ACL_DELETE_DEF_FILE +# error Must have acl_delete_def_file (see POSIX 1003.1e draft 17). +# endif + + if (! ctx->acls_not_supported) + { + if (ret == 0 && from_mode) + { + if (ctx->acl) + acl_free (ctx->acl); + ctx->acl = acl_from_mode (ctx->mode); + if (ctx->acl == NULL) + ret = -1; + } + + if (ret == 0 && ctx->acl) + { + if (HAVE_ACL_SET_FD && desc != -1) + ret = acl_set_fd (desc, ctx->acl); + else + ret = acl_set_file (name, ACL_TYPE_ACCESS, ctx->acl); + if (ret != 0) + { + if (! acl_errno_valid (errno)) + { + ctx->acls_not_supported = true; + if (from_mode || acl_access_nontrivial (ctx->acl) == 0) + ret = 0; + } + } + else + { + *acls_set = true; + if (S_ISDIR(ctx->mode)) + { + if (! from_mode && ctx->default_acl) + ret = acl_set_file (name, ACL_TYPE_DEFAULT, + ctx->default_acl); + else + ret = acl_delete_def_file (name); + } + } + } + } + +# else /* HAVE_ACL_TYPE_EXTENDED */ + /* Mac OS X */ + + /* On Mac OS X, acl_get_file (name, ACL_TYPE_ACCESS) + and acl_get_file (name, ACL_TYPE_DEFAULT) + always return NULL / EINVAL. You have to use + acl_get_file (name, ACL_TYPE_EXTENDED) + or acl_get_fd (open (name, ...)) + to retrieve an ACL. + On the other hand, + acl_set_file (name, ACL_TYPE_ACCESS, acl) + and acl_set_file (name, ACL_TYPE_DEFAULT, acl) + have the same effect as + acl_set_file (name, ACL_TYPE_EXTENDED, acl): + Each of these calls sets the file's ACL. */ + + if (ctx->acl == NULL) + { + acl_t acl; + + /* Remove ACLs if the file has ACLs. */ + if (HAVE_ACL_GET_FD && desc != -1) + acl = acl_get_fd (desc); + else + acl = acl_get_file (name, ACL_TYPE_EXTENDED); + if (acl) + { + acl_free (acl); + + acl = acl_init (0); + if (acl) + { + if (HAVE_ACL_SET_FD && desc != -1) + ret = acl_set_fd (desc, acl); + else + ret = acl_set_file (name, ACL_TYPE_EXTENDED, acl); + acl_free (acl); + } + else + ret = -1; + } + } + else + { + if (HAVE_ACL_SET_FD && desc != -1) + ret = acl_set_fd (desc, ctx->acl); + else + ret = acl_set_file (name, ACL_TYPE_EXTENDED, ctx->acl); + if (ret != 0) + { + if (! acl_errno_valid (errno) + && ! acl_extended_nontrivial (ctx->acl)) + ret = 0; + } + } + *acls_set = true; + +# endif + +# elif defined GETACL /* Solaris, Cygwin, not HP-UX */ + + /* Solaris 2.5 through Solaris 10, Cygwin, and contemporaneous versions + of Unixware. The acl() call returns the access and default ACL both + at once. */ + + /* If both ace_entries and entries are available, try SETACL before + ACE_SETACL, because SETACL cannot fail with ENOTSUP whereas ACE_SETACL + can. */ + + if (from_mode) + return set_acls_from_mode (name, desc, ctx->mode, must_chmod); + + if (ret == 0 && ctx->count) + { + if (desc != -1) + ret = facl (desc, SETACL, ctx->count, ctx->entries); + else + ret = acl (name, SETACL, ctx->count, ctx->entries); + if (ret < 0) + { + if ((errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL) + && acl_nontrivial (ctx->count, ctx->entries) == 0) + ret = 0; + } + else + *acls_set = true; + } + +# ifdef ACE_GETACL + if (ret == 0 && ctx->ace_count) + { + if (desc != -1) + ret = facl (desc, ACE_SETACL, ctx->ace_count, ctx->ace_entries); + else + ret = acl (name, ACE_SETACL, ctx->ace_count, ctx->ace_entries); + if (ret < 0) + { + if ((errno == ENOSYS || errno == EINVAL || errno == ENOTSUP) + && acl_ace_nontrivial (ctx->ace_count, ctx->ace_entries) == 0) + ret = 0; + } + else + *acls_set = true; + } +# endif + +#elif HAVE_GETACL /* HP-UX */ + + if (from_mode) + ret = context_acl_from_mode (ctx, name, desc); + + if (ret == 0 && ctx->count > 0) + { + if (desc != -1) + ret = fsetacl (desc, ctx->count, ctx->entries); + else + ret = setacl (name, ctx->count, ctx->entries); + if (ret < 0) + { + if ((errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP) + && (from_mode || !acl_nontrivial (ctx->count, ctx->entries, &source_statbuf))) + ret = 0; + } + else + *acls_set = true; + } + +# if HAVE_ACLV_H + if (from_mode) + ret = context_aclv_from_mode (ctx); + + if (ret == 0 && ctx->aclv_count > 0) + { + ret = acl ((char *) name, ACL_SET, ctx->aclv_count, ctx->aclv_entries); + if (ret < 0) + { + if ((errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL) + && (from_mode || !aclv_nontrivial (ctx->aclv_count, ctx->aclv_entries))) + ret = 0; + } + else + *acls_set = true; + } +# endif + +# elif HAVE_ACLX_GET && ACL_AIX_WIP /* AIX */ + + /* TODO: Implement setting ACLs once get_permissions() reads them. */ + + if (from_mode) + ret = set_acls_from_mode (name, desc, mode, must_chmod); + +# elif HAVE_STATACL /* older AIX */ + + if (from_mode) + ret = context_acl_from_mode (ctx); + + if (ret == 0 && ctx->have_u) + { + if (desc != -1) + ret = fchacl (desc, &ctx->u.a, ctx->u.a.acl_len); + else + ret = chacl ((char *) name, &ctx->u.a, ctx->u.a.acl_len); + if (ret < 0) + { + if (errno == ENOSYS && from_mode) + ret = 0; + } + else + *acls_set = true; + } + +# elif HAVE_ACLSORT /* NonStop Kernel */ + + if (from_mode) + ret = context_acl_from_mode (ctx); + + if (ret == 0 && ctx->count) + { + ret = acl ((char *) name, ACL_SET, ctx->count, ctx->entries); + if (ret != 0) + { + if (!acl_nontrivial (ctx->count, ctx->entries)) + ret = 0; + } + else + *acls_set = true; + } + +# else /* No ACLs */ + + /* Nothing to do. */ + +#endif + + return ret; +} +#endif + +/* If DESC is a valid file descriptor use fchmod to change the + file's mode to MODE on systems that have fchmod. On systems + that don't have fchmod and if DESC is invalid, use chmod on + NAME instead. + Return 0 if successful. Return -1 and set errno upon failure. */ + +int +chmod_or_fchmod (const char *name, int desc, mode_t mode) +{ + if (HAVE_FCHMOD && desc != -1) + return fchmod (desc, mode); + else + return chmod (name, mode); +} + +/* Set the permissions in CTX on a file. If DESC is a valid file descriptor, + use file descriptor operations, else use filename based operations on NAME. + If access control lists are not available, fchmod the target file to the + mode in CTX. Also sets the non-permission bits of the destination file + (S_ISUID, S_ISGID, S_ISVTX) to those from the mode in CTX if any are set. + Return 0 if successful. Return -1 and set errno upon failure. */ + +int +set_permissions (struct permission_context *ctx, const char *name, int desc) +{ + bool acls_set _GL_UNUSED = false; + bool early_chmod; + bool must_chmod = false; + int ret = 0; + +#if USE_ACL +# if HAVE_STATACL + /* older AIX */ + /* There is no need to call chmod_or_fchmod, since the mode + bits S_ISUID, S_ISGID, S_ISVTX are also stored in the ACL. */ + + early_chmod = false; +# else + /* All other platforms */ + /* On Cygwin, it is necessary to call chmod before acl, because + chmod can change the contents of the ACL (in ways that don't + change the allowed accesses, but still visible). */ + + early_chmod = (! MODE_INSIDE_ACL || (ctx->mode & (S_ISUID | S_ISGID | S_ISVTX))); +# endif +#else + /* No ACLs */ + + early_chmod = true; +#endif + + if (early_chmod) + { + ret = chmod_or_fchmod (name, desc, ctx->mode); + if (ret != 0) + return -1; + } + +#if USE_ACL + ret = set_acls (ctx, name, desc, false, &must_chmod, &acls_set); + if (! acls_set) + { + int saved_errno = ret ? errno : 0; + + /* If we can't set an acl which we expect to be able to set, try setting + the permissions to ctx->mode. Due to possible inherited permissions, + we cannot simply chmod. */ + + ret = set_acls (ctx, name, desc, true, &must_chmod, &acls_set); + if (! acls_set) + must_chmod = true; + + if (saved_errno) + { + errno = saved_errno; + ret = -1; + } + } +#endif + + if (must_chmod && ! early_chmod) + { + int saved_errno = ret ? errno : 0; + + ret = chmod_or_fchmod (name, desc, ctx->mode); + + if (saved_errno) + { + errno = saved_errno; + ret = -1; + } + } + + return ret; +} diff --git a/lib/setenv.c b/lib/setenv.c index 06791a90..6b16fd58 100644 --- a/lib/setenv.c +++ b/lib/setenv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1995-2003, 2005-2014 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1995-2003, 2005-2015 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 135c9a38..3e671c93 100644 --- a/lib/settime.c +++ b/lib/settime.c @@ -1,6 +1,6 @@ /* settime -- set the system clock - Copyright (C) 2002, 2004-2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2002, 2004-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 0ea35b08..4411ceec 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-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2003-2006, 2008-2015 Free Software Foundation, Inc. This program 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/sha1.h b/lib/sha1.h index 4fd7d668..b9074165 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-2014 Free Software + Copyright (C) 2000-2001, 2003, 2005-2006, 2008-2015 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 a07e4f9f..9ac81732 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/sha256.h b/lib/sha256.h index 92c0b955..dae84f55 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2015 Free Software Foundation, Inc. This program is free software: 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 5d3a1725..f48e74bd 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2015 Free Software Foundation, Inc. This program is free software: 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.h b/lib/sha512.h index 17aeea6c..d540887d 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2015 Free Software Foundation, Inc. This program is free software: 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.h b/lib/sig-handler.h index f4fe7eca..c814ed6d 100644 --- a/lib/sig-handler.h +++ b/lib/sig-handler.h @@ -1,6 +1,6 @@ /* Convenience declarations when working with . - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This 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 @@ 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. */ -SIG_HANDLER_INLINE sa_handler_t +SIG_HANDLER_INLINE sa_handler_t _GL_ATTRIBUTE_PURE get_handler (struct sigaction const *a) { #ifdef SA_SIGINFO diff --git a/lib/sig2str.c b/lib/sig2str.c index 119006af..58154daa 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 fc90b720..ac2f67a1 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002, 2005, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 c56ca460..9b2a0894 100644 --- a/lib/sigaction.c +++ b/lib/sigaction.c @@ -1,5 +1,5 @@ /* POSIX compatible signal blocking. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. Written by Eric Blake , 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/siglist.h b/lib/siglist.h index 7b682ff3..6cf38a2b 100644 --- a/lib/siglist.h +++ b/lib/siglist.h @@ -1,5 +1,5 @@ /* Canonical list of all signal names. - Copyright (C) 1996-1999, 2008-2014 Free Software Foundation, Inc. + Copyright (C) 1996-1999, 2008-2015 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 925e16f2..265b72ab 100644 --- a/lib/signal.in.h +++ b/lib/signal.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This 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,11 +55,13 @@ #ifndef _@GUARD_PREFIX@_SIGNAL_H #define _@GUARD_PREFIX@_SIGNAL_H -/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6 declare - pthread_sigmask in , not in . +/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6, Android + declare pthread_sigmask in , not in . But avoid namespace pollution on glibc systems.*/ #if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \ - && ((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ || defined __sun) \ + && ((defined __APPLE__ && defined __MACH__) \ + || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ \ + || defined __sun || defined __ANDROID__) \ && ! defined __GLIBC__ # include #endif diff --git a/lib/signbitd.c b/lib/signbitd.c index 26f30d59..289b477b 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: 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 191deb91..d771fcc7 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 9da26c6c..404304ec 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 506a51fe..e29b0126 100644 --- a/lib/sigprocmask.c +++ b/lib/sigprocmask.c @@ -1,5 +1,5 @@ /* POSIX compatible signal blocking. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2006. This program is free software: you can redistribute it and/or modify diff --git a/lib/size_max.h b/lib/size_max.h index 461ff1ca..5a0568e5 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/lib/smack.h b/lib/smack.h index e1e8a842..71dab6cc 100644 --- a/lib/smack.h +++ b/lib/smack.h @@ -1,5 +1,5 @@ /* Include and determine availability of smack routines - Copyright (C) 2013-2014 Free Software Foundation, Inc. + Copyright (C) 2013-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/snprintf.c b/lib/snprintf.c index ea1321c4..11500cad 100644 --- a/lib/snprintf.c +++ b/lib/snprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 2004, 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2004, 2006-2015 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 962c5785..0b60562c 100644 --- a/lib/sockets.c +++ b/lib/sockets.c @@ -1,6 +1,6 @@ /* sockets.c --- wrappers for Windows socket functions - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: 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 0bee1ddf..c863dfbe 100644 --- a/lib/sockets.h +++ b/lib/sockets.h @@ -1,6 +1,6 @@ /* sockets.h - wrappers for Windows socket functions - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: 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-size.h b/lib/stat-size.h index 42482fa6..c4011ce1 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-2014 Free Software Foundation, Inc. + Copyright (C) 1989, 1991-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/stat-time.h b/lib/stat-time.h index b3df6eb8..b67d1798 100644 --- a/lib/stat-time.h +++ b/lib/stat-time.h @@ -1,6 +1,6 @@ /* stat-related time functions. - Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2015 Free Software Foundation, Inc. This 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,7 @@ _GL_INLINE_HEADER_BEGIN #endif /* Return the nanosecond component of *ST's access time. */ -_GL_STAT_TIME_INLINE long int +_GL_STAT_TIME_INLINE long int _GL_ATTRIBUTE_PURE get_stat_atime_ns (struct stat const *st) { # if defined STAT_TIMESPEC @@ -67,7 +67,7 @@ get_stat_atime_ns (struct stat const *st) } /* Return the nanosecond component of *ST's status change time. */ -_GL_STAT_TIME_INLINE long int +_GL_STAT_TIME_INLINE long int _GL_ATTRIBUTE_PURE get_stat_ctime_ns (struct stat const *st) { # if defined STAT_TIMESPEC @@ -80,7 +80,7 @@ get_stat_ctime_ns (struct stat const *st) } /* Return the nanosecond component of *ST's data modification time. */ -_GL_STAT_TIME_INLINE long int +_GL_STAT_TIME_INLINE long int _GL_ATTRIBUTE_PURE get_stat_mtime_ns (struct stat const *st) { # if defined STAT_TIMESPEC @@ -93,7 +93,7 @@ get_stat_mtime_ns (struct stat const *st) } /* Return the nanosecond component of *ST's birth time. */ -_GL_STAT_TIME_INLINE long int +_GL_STAT_TIME_INLINE long int _GL_ATTRIBUTE_PURE get_stat_birthtime_ns (struct stat const *st) { # if defined HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC @@ -108,7 +108,7 @@ get_stat_birthtime_ns (struct stat const *st) } /* Return *ST's access time. */ -_GL_STAT_TIME_INLINE struct timespec +_GL_STAT_TIME_INLINE struct timespec _GL_ATTRIBUTE_PURE get_stat_atime (struct stat const *st) { #ifdef STAT_TIMESPEC @@ -122,7 +122,7 @@ get_stat_atime (struct stat const *st) } /* Return *ST's status change time. */ -_GL_STAT_TIME_INLINE struct timespec +_GL_STAT_TIME_INLINE struct timespec _GL_ATTRIBUTE_PURE get_stat_ctime (struct stat const *st) { #ifdef STAT_TIMESPEC @@ -136,7 +136,7 @@ get_stat_ctime (struct stat const *st) } /* Return *ST's data modification time. */ -_GL_STAT_TIME_INLINE struct timespec +_GL_STAT_TIME_INLINE struct timespec _GL_ATTRIBUTE_PURE get_stat_mtime (struct stat const *st) { #ifdef STAT_TIMESPEC @@ -151,7 +151,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. */ -_GL_STAT_TIME_INLINE struct timespec +_GL_STAT_TIME_INLINE struct timespec _GL_ATTRIBUTE_PURE get_stat_birthtime (struct stat const *st) { struct timespec t; diff --git a/lib/stat.c b/lib/stat.c index 35f4b0b1..2209826f 100644 --- a/lib/stat.c +++ b/lib/stat.c @@ -1,5 +1,5 @@ /* Work around platform bugs in stat. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/stdalign.in.h b/lib/stdalign.in.h index dcaab55b..a990050b 100644 --- a/lib/stdalign.in.h +++ b/lib/stdalign.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C11 . - Copyright 2011-2014 Free Software Foundation, Inc. + Copyright 2011-2015 Free Software Foundation, Inc. This 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 @@ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 # if defined __cplusplus && 201103 <= __cplusplus # define _Alignas(a) alignas (a) -# elif (__GNUC__ || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \ +# elif ((defined __APPLE__ && defined __MACH__ \ + ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ + : __GNUC__) \ + || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \ || __ICC || 0x5110 <= __SUNPRO_C) # define _Alignas(a) __attribute__ ((__aligned__ (a))) # elif 1300 <= _MSC_VER diff --git a/lib/stdarg.in.h b/lib/stdarg.in.h index 5b37dd36..5239f51a 100644 --- a/lib/stdarg.in.h +++ b/lib/stdarg.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around . - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software; 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 651e8dff..64a17618 100644 --- a/lib/stdbool.in.h +++ b/lib/stdbool.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc. +/* Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software; you can redistribute it and/or modify diff --git a/lib/stddef.in.h b/lib/stddef.in.h index f5c0e056..698307bc 100644 --- a/lib/stddef.in.h +++ b/lib/stddef.in.h @@ -1,6 +1,6 @@ /* A substitute for POSIX 2008 , for platforms that have issues. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This 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 @@ # if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _GL_STDDEF_WINT_T) # ifdef __need_wint_t -# undef _@GUARD_PREFIX@_STDDEF_H # define _GL_STDDEF_WINT_T # endif # @INCLUDE_NEXT@ @NEXT_STDDEF_H@ @@ -54,33 +53,56 @@ # @INCLUDE_NEXT@ @NEXT_STDDEF_H@ -# ifndef _@GUARD_PREFIX@_STDDEF_H -# define _@GUARD_PREFIX@_STDDEF_H - /* On NetBSD 5.0, the definition of NULL lacks proper parentheses. */ -#if @REPLACE_NULL@ -# undef NULL -# ifdef __cplusplus +# if (@REPLACE_NULL@ \ + && (!defined _@GUARD_PREFIX@_STDDEF_H || defined _GL_STDDEF_WINT_T)) +# undef NULL +# ifdef __cplusplus /* ISO C++ says that the macro NULL must expand to an integer constant expression, hence '((void *) 0)' is not allowed in C++. */ -# if __GNUG__ >= 3 +# if __GNUG__ >= 3 /* GNU C++ has a __null macro that behaves like an integer ('int' or 'long') but has the same size as a pointer. Use that, to avoid warnings. */ -# define NULL __null -# else -# define NULL 0L +# define NULL __null +# else +# define NULL 0L +# endif +# else +# define NULL ((void *) 0) +# endif # endif -# else -# define NULL ((void *) 0) -# endif -#endif + +# ifndef _@GUARD_PREFIX@_STDDEF_H +# define _@GUARD_PREFIX@_STDDEF_H /* Some platforms lack wchar_t. */ #if !@HAVE_WCHAR_T@ # define wchar_t int #endif +/* Some platforms lack max_align_t. */ +#if !@HAVE_MAX_ALIGN_T@ +/* On the x86, the maximum storage alignment of double, long, etc. is 4, + but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8, + and the C11 standard allows this. Work around this problem by + using __alignof__ (which returns 8 for double) rather than _Alignof + (which returns 4), and align each union member accordingly. */ +# ifdef __GNUC__ +# define _GL_STDDEF_ALIGNAS(type) \ + __attribute__ ((__aligned__ (__alignof__ (type)))) +# else +# define _GL_STDDEF_ALIGNAS(type) /* */ +# endif +typedef union +{ + char *__p _GL_STDDEF_ALIGNAS (char *); + double __d _GL_STDDEF_ALIGNAS (double); + long double __ld _GL_STDDEF_ALIGNAS (long double); + long int __i _GL_STDDEF_ALIGNAS (long int); +} max_align_t; +#endif + # endif /* _@GUARD_PREFIX@_STDDEF_H */ # endif /* _@GUARD_PREFIX@_STDDEF_H */ #endif /* __need_XXX */ diff --git a/lib/stdint.in.h b/lib/stdint.in.h index 247f0d89..378de2ec 100644 --- a/lib/stdint.in.h +++ b/lib/stdint.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2002, 2004-2014 Free Software Foundation, Inc. +/* Copyright (C) 2001-2002, 2004-2015 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. This file is part of gnulib. diff --git a/lib/stdio--.h b/lib/stdio--.h index 83ddf5aa..558cbb2c 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 299fe475..502d891b 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2008, 2010-2015 Free Software Foundation, Inc. This 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,8 @@ #include /* For detecting Plan9. */ -#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ +#if defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ # if defined __DragonFly__ /* DragonFly */ /* See . */ @@ -66,7 +67,7 @@ /* More fields, not relevant here. */ }; # define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub -# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */ +# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin, Android */ # define fp_ub fp_->_ub # endif diff --git a/lib/stdio-safer.h b/lib/stdio-safer.h index 96c861fe..0545907b 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 1e1fe84c..ec438742 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 2004, 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2004, 2007-2015 Free Software Foundation, Inc. This 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,8 +84,13 @@ except that it indicates to GCC that the supported format string directives are the ones of the system printf(), rather than the ones standardized by ISO C99 and POSIX. */ -#define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \ +#if GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU +# define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \ + _GL_ATTRIBUTE_FORMAT_PRINTF (formatstring_parameter, first_argument) +#else +# define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \ _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument)) +#endif /* _GL_ATTRIBUTE_FORMAT_SCANF indicates to GCC that the function takes a format string and arguments, @@ -718,11 +723,10 @@ _GL_WARN_ON_USE (getline, "getline is unportable - " so any use of gets warrants an unconditional warning; besides, C11 removed it. */ #undef gets -#if HAVE_RAW_DECL_GETS +#if HAVE_RAW_DECL_GETS && !defined __cplusplus _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); #endif - #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ struct obstack; /* Grow an obstack with formatted output. Return the number of diff --git a/lib/stdlib--.h b/lib/stdlib--.h index 29be0654..7bd917b6 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 6816a366..c5b79310 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 46e10dba..428a1191 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 1995, 2001-2004, 2006-2014 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2004, 2006-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -520,6 +520,29 @@ _GL_CXXALIAS_SYS (putenv, int, (char *string)); _GL_CXXALIASWARN (putenv); #endif +#if @GNULIB_QSORT_R@ +# if @REPLACE_QSORT_R@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef qsort_r +# define qsort_r rpl_qsort_r +# endif +_GL_FUNCDECL_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, + int (*compare) (void const *, void const *, + void *), + void *arg) _GL_ARG_NONNULL ((1, 4))); +_GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, + int (*compare) (void const *, void const *, + void *), + void *arg)); +# else +_GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size, + int (*compare) (void const *, void const *, + void *), + void *arg)); +# endif +_GL_CXXALIASWARN (qsort_r); +#endif + #if @GNULIB_RANDOM_R@ # if !@HAVE_RANDOM_R@ diff --git a/lib/stpcpy.c b/lib/stpcpy.c index 880a7061..559d2f23 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-2014 Free Software + Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2015 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 37018e8b..e72ea479 100644 --- a/lib/stpncpy.c +++ b/lib/stpncpy.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2007, 2009-2014 Free Software +/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2007, 2009-2015 Free Software * Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. diff --git a/lib/str-kmp.h b/lib/str-kmp.h index b25d07f8..66fcead4 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 49ee7469..6e10c8e3 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Eric Blake , 2008. diff --git a/lib/strdup.c b/lib/strdup.c index 14cb1266..4fdd0bd9 100644 --- a/lib/strdup.c +++ b/lib/strdup.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2014 Free Software +/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/streq.h b/lib/streq.h index 0e62fb93..6107fc6b 100644 --- a/lib/streq.h +++ b/lib/streq.h @@ -1,5 +1,5 @@ /* Optimized string comparison. - Copyright (C) 2001-2002, 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2015 Free Software Foundation, Inc. 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 255d9333..2bb4d745 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/strerror-override.h b/lib/strerror-override.h index e98c1c16..7af36dfd 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/strerror.c b/lib/strerror.c index e54f0cc9..adba738b 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -1,6 +1,6 @@ /* strerror.c --- POSIX compatible system error routine - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: 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 857cca56..2426aae7 100644 --- a/lib/strftime.c +++ b/lib/strftime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. +/* Copyright (C) 1991-2001, 2003-2007, 2009-2015 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. diff --git a/lib/strftime.h b/lib/strftime.h index be016ea8..3967afc4 100644 --- a/lib/strftime.h +++ b/lib/strftime.h @@ -1,6 +1,6 @@ /* declarations for strftime.c - Copyright (C) 2002, 2004, 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2008-2015 Free Software Foundation, Inc. This program is free software: 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 2495d81c..6f7dad8e 100644 --- a/lib/striconv.c +++ b/lib/striconv.c @@ -1,5 +1,5 @@ /* Charset conversion. - Copyright (C) 2001-2007, 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2007, 2010-2015 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 5747731e..33cc212c 100644 --- a/lib/striconv.h +++ b/lib/striconv.h @@ -1,5 +1,5 @@ /* Charset conversion. - Copyright (C) 2001-2004, 2006-2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006-2007, 2009-2015 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 90621420..2abd6bc0 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 1995-1996, 2001-2014 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 2001-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,16 +15,32 @@ You should have received a copy of the GNU General Public License along with this program; if not, see . */ -#ifndef _@GUARD_PREFIX@_STRING_H - #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif @PRAGMA_COLUMNS@ +#if defined _GL_ALREADY_INCLUDING_STRING_H +/* Special invocation convention: + - On OS X/NetBSD we have a sequence of nested includes + -> -> "string.h" + In this situation system _chk variants due to -D_FORTIFY_SOURCE + might be used after any replacements defined here. */ + +#@INCLUDE_NEXT@ @NEXT_STRING_H@ + +#else +/* Normal invocation convention. */ + +#ifndef _@GUARD_PREFIX@_STRING_H + +#define _GL_ALREADY_INCLUDING_STRING_H + /* The include_next requires a split double-inclusion guard. */ #@INCLUDE_NEXT@ @NEXT_STRING_H@ +#undef _GL_ALREADY_INCLUDING_STRING_H + #ifndef _@GUARD_PREFIX@_STRING_H #define _@GUARD_PREFIX@_STRING_H @@ -1027,3 +1043,4 @@ _GL_WARN_ON_USE (strverscmp, "strverscmp is unportable - " #endif /* _@GUARD_PREFIX@_STRING_H */ #endif /* _@GUARD_PREFIX@_STRING_H */ +#endif diff --git a/lib/strintcmp.c b/lib/strintcmp.c index 98665017..ea665a59 100644 --- a/lib/strintcmp.c +++ b/lib/strintcmp.c @@ -1,6 +1,6 @@ /* Compare integer strings. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This program is free software: 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 6f802d4c..12359cf7 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-2014 Free Software Foundation, + Copyright (C) 1990, 2001, 2003-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/strncat.c b/lib/strncat.c index 71be4d65..994e07d5 100644 --- a/lib/strncat.c +++ b/lib/strncat.c @@ -1,5 +1,5 @@ /* Concatenate strings. - Copyright (C) 1999, 2002, 2006, 2010-2014 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006, 2010-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 cc1a4843..793d5990 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-2014 Free Software + Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2015 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 ddccebc6..79e250c4 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2015 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 363776a9..48272a88 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 b2f956f5..794e436e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 436f0a6c..b3f63a76 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-2014 Free Software Foundation, Inc. + Copyright (C) 1988-2015 Free Software Foundation, Inc. This program is free software: 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 1a9bccfe..f1a33f41 100644 --- a/lib/strnumcmp.c +++ b/lib/strnumcmp.c @@ -1,6 +1,6 @@ /* Compare numeric strings. - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This program is free software: 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 46e58d3b..0e360f92 100644 --- a/lib/strpbrk.c +++ b/lib/strpbrk.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006, 2009-2014 Free Software +/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006, 2009-2015 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 77ba0630..06f2b20c 100644 --- a/lib/strsignal.c +++ b/lib/strsignal.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1994-2002, 2005, 2008-2014 Free Software Foundation, +/* Copyright (C) 1991, 1994-2002, 2005, 2008-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/strstr.c b/lib/strstr.c index d5b9d784..fbc11a2d 100644 --- a/lib/strstr.c +++ b/lib/strstr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2014 Free Software +/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/strtod.c b/lib/strtod.c index e554a84f..9fd0170f 100644 --- a/lib/strtod.c +++ b/lib/strtod.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1992, 1997, 1999, 2003, 2006, 2008-2014 Free Software +/* Copyright (C) 1991-1992, 1997, 1999, 2003, 2006, 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/strtoimax.c b/lib/strtoimax.c index 2c33d585..8ff65cee 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-2014 Free Software Foundation, + Copyright (C) 1999, 2001-2004, 2006, 2009-2015 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 2e015dc5..1bc14398 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-2014 Free Software + Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2015 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 47dfaa06..d7123491 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-2014 Free Software Foundation, + Copyright (C) 1995-1997, 1999, 2001, 2009-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/strtoul.c b/lib/strtoul.c index 4c5ceaff..20517777 100644 --- a/lib/strtoul.c +++ b/lib/strtoul.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1997, 2009-2014 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1997, 2009-2015 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 30e6e027..5cd2554c 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-2014 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 1999, 2009-2015 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 0e3fae25..14356c30 100644 --- a/lib/symlink.c +++ b/lib/symlink.c @@ -1,5 +1,5 @@ /* Stub for symlink(). - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: 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 c13e3172..d3758ac7 100644 --- a/lib/sys_ioctl.in.h +++ b/lib/sys_ioctl.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around . - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software; 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 7a17e32d..9dc2a0bb 100644 --- a/lib/sys_resource.in.h +++ b/lib/sys_resource.in.h @@ -1,5 +1,5 @@ /* Substitute for . - Copyright (C) 2012-2014 Free Software Foundation, Inc. + Copyright (C) 2012-2015 Free Software Foundation, Inc. This program is free software; 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 a876b9ca..fd7a2917 100644 --- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h @@ -1,5 +1,5 @@ /* Substitute for . - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This 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,8 +24,8 @@ On Cygwin, includes . Simply delegate to the system's header in this case. */ #if (@HAVE_SYS_SELECT_H@ \ + && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H \ && ((defined __osf__ && defined _SYS_TYPES_H_ \ - && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \ && defined _OSF_SOURCE) \ || (defined __sun && defined _SYS_TYPES_H \ && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ @@ -36,12 +36,13 @@ #elif (@HAVE_SYS_SELECT_H@ \ && (defined _CYGWIN_SYS_TIME_H \ - || (defined __osf__ && defined _SYS_TIME_H_ \ - && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \ - && defined _OSF_SOURCE) \ - || (defined __sun && defined _SYS_TIME_H \ - && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ - || defined __EXTENSIONS__)))) + || (!defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \ + && ((defined __osf__ && defined _SYS_TIME_H_ \ + && defined _OSF_SOURCE) \ + || (defined __sun && defined _SYS_TIME_H \ + && (! (defined _XOPEN_SOURCE \ + || defined _POSIX_C_SOURCE) \ + || defined __EXTENSIONS__)))))) # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h index 3cdc0d11..aa58933b 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h index b47a7ff0..9f5e8536 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h index 30057ad4..c556c5db 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software; 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_types.in.h b/lib/sys_types.in.h index deb5d67d..814bc179 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software; 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 0b403bc1..dbe7bde2 100644 --- a/lib/sys_uio.in.h +++ b/lib/sys_uio.in.h @@ -1,5 +1,5 @@ /* Substitute for . - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software; 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 f9e9d9d9..1fbef050 100644 --- a/lib/sys_utsname.in.h +++ b/lib/sys_utsname.in.h @@ -1,5 +1,5 @@ /* Substitute for . - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software; 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 6412af4d..87d2282b 100644 --- a/lib/sys_wait.in.h +++ b/lib/sys_wait.in.h @@ -1,5 +1,5 @@ /* A POSIX-like . - Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2015 Free Software Foundation, Inc. This program is free software; 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 183dae8c..1920274c 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-2014 Free Software Foundation, Inc. + Copyright (C) 1991-2003, 2005-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -64,6 +64,7 @@ # define struct_stat64 struct stat64 #else # define struct_stat64 struct stat +# define __try_tempname try_tempname # define __gen_tempname gen_tempname # define __getpid getpid # define __gettimeofday gettimeofday @@ -184,30 +185,15 @@ check_x_suffix (char const *s, size_t len) static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; -/* Generate a temporary file name based on TMPL. TMPL must match the - rules for mk[s]temp (i.e. end in at least X_SUFFIX_LEN "X"s, - possibly with a suffix). - The name constructed does not exist at the time of the call to - this function. TMPL is overwritten with the result. - - KIND may be one of: - __GT_NOCREATE: simply verify that the name does not exist - at the time of the call. - __GT_FILE: create the file using open(O_CREAT|O_EXCL) - and return a read-write fd. The file is mode 0600. - __GT_DIR: create a directory, which will be mode 0700. - - We use a clever algorithm to get hard-to-predict names. */ int -gen_tempname_len (char *tmpl, int suffixlen, int flags, int kind, - size_t x_suffix_len) +try_tempname_len (char *tmpl, int suffixlen, void *args, + int (*tryfunc) (char *, void *), size_t x_suffix_len) { size_t len; char *XXXXXX; unsigned int count; int fd = -1; int save_errno = errno; - struct_stat64 st; struct randint_source *rand_src; /* A lower bound on the number of temporary files to attempt to @@ -251,45 +237,7 @@ gen_tempname_len (char *tmpl, int suffixlen, int flags, int kind, for (i = 0; i < x_suffix_len; i++) XXXXXX[i] = letters[randint_genmax (rand_src, sizeof letters - 2)]; - switch (kind) - { - case __GT_FILE: - fd = __open (tmpl, - (flags & ~O_ACCMODE) - | O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); - break; - - case __GT_DIR: - fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); - break; - - case __GT_NOCREATE: - /* This case is backward from the other three. This function - succeeds if __xstat fails because the name does not exist. - Note the continue to bypass the common logic at the bottom - of the loop. */ - if (__lxstat64 (_STAT_VER, tmpl, &st) < 0) - { - if (errno == ENOENT) - { - __set_errno (save_errno); - fd = 0; - goto done; - } - else - { - /* Give up now. */ - fd = -1; - goto done; - } - } - continue; - - default: - assert (! "invalid KIND in __gen_tempname"); - abort (); - } - + fd = tryfunc (tmpl, args); if (fd >= 0) { __set_errno (save_errno); @@ -317,8 +265,81 @@ gen_tempname_len (char *tmpl, int suffixlen, int flags, int kind, return fd; } +static int +try_file (char *tmpl, void *flags) +{ + int *openflags = flags; + return __open (tmpl, + (*openflags & ~O_ACCMODE) + | O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); +} + +static int +try_dir (char *tmpl, void *flags _GL_UNUSED) +{ + return __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); +} + +static int +try_nocreate (char *tmpl, void *flags _GL_UNUSED) +{ + struct_stat64 st; + + if (__lxstat64 (_STAT_VER, tmpl, &st) == 0) + __set_errno (EEXIST); + return errno == ENOENT ? 0 : -1; +} + +/* Generate a temporary file name based on TMPL. TMPL must match the + rules for mk[s]temp (i.e., end in at least X_SUFFIX_LEN "X"s, + possibly with a suffix). + The name constructed does not exist at the time of the call to + this function. TMPL is overwritten with the result. + + KIND may be one of: + __GT_NOCREATE: simply verify that the name does not exist + at the time of the call. + __GT_FILE: create the file using open(O_CREAT|O_EXCL) + and return a read-write fd. The file is mode 0600. + __GT_DIR: create a directory, which will be mode 0700. + + We use a clever algorithm to get hard-to-predict names. */ +int +gen_tempname_len (char *tmpl, int suffixlen, int flags, int kind, + size_t x_suffix_len) +{ + int (*tryfunc) (char *, void *); + + switch (kind) + { + case __GT_FILE: + tryfunc = try_file; + break; + + case __GT_DIR: + tryfunc = try_dir; + break; + + case __GT_NOCREATE: + tryfunc = try_nocreate; + break; + + default: + assert (! "invalid KIND in __gen_tempname"); + abort (); + } + return try_tempname_len (tmpl, suffixlen, &flags, tryfunc, x_suffix_len); +} + int __gen_tempname (char *tmpl, int suffixlen, int flags, int kind) { return gen_tempname_len (tmpl, suffixlen, flags, kind, 6); } + +int +__try_tempname (char *tmpl, int suffixlen, void *args, + int (*tryfunc) (char *, void *)) +{ + return try_tempname_len (tmpl, suffixlen, args, tryfunc, 6); +} diff --git a/lib/tempname.h b/lib/tempname.h index 696aff25..6029b9fe 100644 --- a/lib/tempname.h +++ b/lib/tempname.h @@ -1,6 +1,6 @@ /* Create a temporary file or directory. - Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. This 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,6 +32,10 @@ # define GT_NOCREATE 2 # endif +#ifdef __cplusplus +extern "C" { +#endif + /* Generate a temporary file name based on TMPL. TMPL must match the rules for mk[s]temp (i.e. end in "XXXXXX", possibly with a suffix). The name constructed does not exist at the time of the call to @@ -49,4 +53,18 @@ extern int gen_tempname (char *tmpl, int suffixlen, int flags, int kind); extern int gen_tempname_len (char *tmpl, int suffixlen, int flags, int kind, size_t x_suffix_len); +/* Similar to gen_tempname, but TRYFUNC is called for each temporary + name to try. If TRYFUNC returns a non-negative number, TRY_GEN_TEMPNAME + returns with this value. Otherwise, if errno is set to EEXIST, another + name is tried, or else TRY_GEN_TEMPNAME returns -1. */ +extern int try_tempname (char *tmpl, int suffixlen, void *args, + int (*tryfunc) (char *, void *)); +extern int try_tempname_len (char *tmpl, int suffixlen, void *args, + int (*tryfunc) (char *, void *), + size_t x_suffix_len); + +#ifdef __cplusplus +} +#endif + #endif /* GL_TEMPNAME_H */ diff --git a/lib/termios.in.h b/lib/termios.in.h index 1299bb73..9e8a2812 100644 --- a/lib/termios.in.h +++ b/lib/termios.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around . - Copyright (C) 2010-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free software; 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 81abdf46..1a6b746c 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -1,6 +1,6 @@ /* A more-standard . - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -55,6 +55,8 @@ # include # elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ # include +# elif @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ +# include # else # ifdef __cplusplus diff --git a/lib/time_r.c b/lib/time_r.c index a848d544..0b512de9 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-2014 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2010-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/timespec.h b/lib/timespec.h index 872cbb76..9ec495a0 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-2014 Free Software + Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -74,7 +74,7 @@ make_timespec (time_t s, long int ns) The (int) cast avoids a gcc -Wconversion warning. */ -_GL_TIMESPEC_INLINE int +_GL_TIMESPEC_INLINE int _GL_ATTRIBUTE_PURE timespec_cmp (struct timespec a, struct timespec b) { return (a.tv_sec < b.tv_sec ? -1 @@ -84,7 +84,7 @@ timespec_cmp (struct timespec a, struct timespec b) /* Return -1, 0, 1, depending on the sign of A. A.tv_nsec must be nonnegative. */ -_GL_TIMESPEC_INLINE int +_GL_TIMESPEC_INLINE int _GL_ATTRIBUTE_PURE timespec_sign (struct timespec a) { return a.tv_sec < 0 ? -1 : a.tv_sec || a.tv_nsec; diff --git a/lib/trim.c b/lib/trim.c index 742de9be..369b20fe 100644 --- a/lib/trim.c +++ b/lib/trim.c @@ -1,5 +1,5 @@ /* Removes leading and/or trailing whitespaces - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This program is free software: 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 e4dc938b..8a38a9fb 100644 --- a/lib/trim.h +++ b/lib/trim.h @@ -1,5 +1,5 @@ /* Removes leading and/or trailing whitespaces - Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/u64.h b/lib/u64.h index ee3bfcd8..0e569d02 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/uname.c b/lib/uname.c index c1d85196..422467c4 100644 --- a/lib/uname.c +++ b/lib/uname.c @@ -1,5 +1,5 @@ /* uname replacement. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: 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 9df8b79f..6f969d23 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-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2006, 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/unicodeio.h b/lib/unicodeio.h index 1706cf64..d6e7fed5 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-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2005, 2008-2015 Free Software Foundation, Inc. This program is free software: 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 9d0e54d1..ada1f6b7 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-2014 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 4b0ca6ab..d4251b3e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2005, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 622b2287..958fea2a 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around . - Copyright (C) 2003-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2015 Free Software Foundation, Inc. This 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,6 +401,12 @@ _GL_WARN_ON_USE (dup3, "dup3 is unportable - " /* Set of environment variables and values. An array of strings of the form "VARIABLE=VALUE", terminated with a NULL. */ # if defined __APPLE__ && defined __MACH__ +# include +# if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR +# define _GL_USE_CRT_EXTERNS +# endif +# endif +# ifdef _GL_USE_CRT_EXTERNS # include # define environ (*_NSGetEnviron ()) # else @@ -1287,13 +1293,24 @@ _GL_WARN_ON_USE (readlink, "readlink is unportable - " #if @GNULIB_READLINKAT@ -# if !@HAVE_READLINKAT@ +# if @REPLACE_READLINKAT@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define readlinkat rpl_readlinkat +# endif +_GL_FUNCDECL_RPL (readlinkat, ssize_t, + (int fd, char const *file, char *buf, size_t len) + _GL_ARG_NONNULL ((2, 3))); +_GL_CXXALIAS_RPL (readlinkat, ssize_t, + (int fd, char const *file, char *buf, size_t len)); +# else +# if !@HAVE_READLINKAT@ _GL_FUNCDECL_SYS (readlinkat, ssize_t, (int fd, char const *file, char *buf, size_t len) _GL_ARG_NONNULL ((2, 3))); -# endif +# endif _GL_CXXALIAS_SYS (readlinkat, ssize_t, (int fd, char const *file, char *buf, size_t len)); +# endif _GL_CXXALIASWARN (readlinkat); #elif defined GNULIB_POSIXCHECK # undef readlinkat @@ -1407,13 +1424,25 @@ _GL_WARN_ON_USE (symlink, "symlink is not portable - " #if @GNULIB_SYMLINKAT@ -# if !@HAVE_SYMLINKAT@ +# if @REPLACE_SYMLINKAT@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef symlinkat +# define symlinkat rpl_symlinkat +# endif +_GL_FUNCDECL_RPL (symlinkat, int, + (char const *contents, int fd, char const *file) + _GL_ARG_NONNULL ((1, 3))); +_GL_CXXALIAS_RPL (symlinkat, int, + (char const *contents, int fd, char const *file)); +# else +# if !@HAVE_SYMLINKAT@ _GL_FUNCDECL_SYS (symlinkat, int, (char const *contents, int fd, char const *file) _GL_ARG_NONNULL ((1, 3))); -# endif +# endif _GL_CXXALIAS_SYS (symlinkat, int, (char const *contents, int fd, char const *file)); +# endif _GL_CXXALIASWARN (symlinkat); #elif defined GNULIB_POSIXCHECK # undef symlinkat diff --git a/lib/unistr.in.h b/lib/unistr.in.h index 222c9595..be158be1 100644 --- a/lib/unistr.in.h +++ b/lib/unistr.in.h @@ -1,5 +1,5 @@ /* Elementary Unicode string functions. - Copyright (C) 2001-2002, 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2005-2015 Free Software Foundation, Inc. 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 b11543a5..9cc15002 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-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 8fdd88b5..65445be1 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 df9b227e..a8250f42 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 bc302c24..d3c47ae6 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc. 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 b2fd218e..7694bebf 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-2014 Free Software Foundation, + Copyright (C) 2001-2002, 2005, 2007, 2009-2015 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 71ea0cb7..cdd9a555 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2005-2007, 2009-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 2c070c3e..c7e03b2a 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -32,7 +32,7 @@ * - Zero width characters; generated from * "grep '^[^;]*;ZERO WIDTH ' UnicodeData.txt" */ -static const unsigned char nonspacing_table_data[27*64] = { +static const unsigned char nonspacing_table_data[36*64] = { /* 0x0000-0x01ff */ 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0000-0x003f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x0040-0x007f */ @@ -61,7 +61,7 @@ static const unsigned char nonspacing_table_data[27*64] = { 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xbf, /* 0x0580-0x05bf */ 0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x05c0-0x05ff */ /* 0x0600-0x07ff */ - 0x0f, 0x00, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, /* 0x0600-0x063f */ + 0x3f, 0x00, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, /* 0x0600-0x063f */ 0x00, 0xf8, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, /* 0x0640-0x067f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0680-0x06bf */ 0x00, 0x00, 0xc0, 0xbf, 0x9f, 0x3d, 0x00, 0x00, /* 0x06c0-0x06ff */ @@ -73,7 +73,7 @@ static const unsigned char nonspacing_table_data[27*64] = { 0x00, 0x00, 0xc0, 0xfb, 0xef, 0x3e, 0x00, 0x00, /* 0x0800-0x083f */ 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, /* 0x0840-0x087f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0880-0x08bf */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08c0-0x08ff */ + 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xff, /* 0x08c0-0x08ff */ 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, /* 0x0900-0x093f */ 0xfe, 0x21, 0xfe, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0940-0x097f */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0980-0x09bf */ @@ -88,11 +88,11 @@ static const unsigned char nonspacing_table_data[27*64] = { 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0b80-0x0bbf */ 0x01, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0bc0-0x0bff */ /* 0x0c00-0x0dff */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, /* 0x0c00-0x0c3f */ + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, /* 0x0c00-0x0c3f */ 0xc1, 0x3d, 0x60, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0c40-0x0c7f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0c80-0x0cbf */ + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0c80-0x0cbf */ 0x00, 0x30, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0cc0-0x0cff */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0d00-0x0d3f */ + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0d00-0x0d3f */ 0x1e, 0x20, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0d40-0x0d7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0d80-0x0dbf */ 0x00, 0x04, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0dc0-0x0dff */ @@ -133,7 +133,7 @@ static const unsigned char nonspacing_table_data[27*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x3f, /* 0x1780-0x17bf */ 0x40, 0xfe, 0x0f, 0x20, 0x00, 0x00, 0x00, 0x00, /* 0x17c0-0x17ff */ /* 0x1800-0x19ff */ - 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1800-0x183f */ + 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1800-0x183f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1840-0x187f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, /* 0x1880-0x18bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18c0-0x18ff */ @@ -142,26 +142,26 @@ static const unsigned char nonspacing_table_data[27*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1980-0x19bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x19c0-0x19ff */ /* 0x1a00-0x1bff */ - 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, /* 0x1a00-0x1a3f */ + 0x00, 0x00, 0x80, 0x09, 0x00, 0x00, 0x00, 0x00, /* 0x1a00-0x1a3f */ 0x00, 0x00, 0x40, 0x7f, 0xe5, 0x1f, 0xf8, 0x9f, /* 0x1a40-0x1a7f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1a80-0x1abf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, /* 0x1a80-0x1abf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1ac0-0x1aff */ 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x17, /* 0x1b00-0x1b3f */ 0x04, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x1b40-0x1b7f */ - 0x03, 0x00, 0x00, 0x00, 0x3c, 0x03, 0x00, 0x00, /* 0x1b80-0x1bbf */ + 0x03, 0x00, 0x00, 0x00, 0x3c, 0x3b, 0x00, 0x00, /* 0x1b80-0x1bbf */ 0x00, 0x00, 0x00, 0x00, 0x40, 0xa3, 0x03, 0x00, /* 0x1bc0-0x1bff */ /* 0x1c00-0x1dff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xcf, 0x00, /* 0x1c00-0x1c3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c40-0x1c7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c80-0x1cbf */ - 0x00, 0x00, 0xf7, 0xff, 0xfd, 0x21, 0x00, 0x00, /* 0x1cc0-0x1cff */ + 0x00, 0x00, 0xf7, 0xff, 0xfd, 0x21, 0x10, 0x03, /* 0x1cc0-0x1cff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d00-0x1d3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d40-0x1d7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d80-0x1dbf */ - 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0xf0, /* 0x1dc0-0x1dff */ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xf0, /* 0x1dc0-0x1dff */ /* 0x2000-0x21ff */ 0x00, 0xf8, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, /* 0x2000-0x203f */ - 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, /* 0x2040-0x207f */ + 0x00, 0x00, 0x00, 0x00, 0xdf, 0xff, 0x00, 0x00, /* 0x2040-0x207f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2080-0x20bf */ 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, /* 0x20c0-0x20ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2100-0x213f */ @@ -178,7 +178,7 @@ static const unsigned char nonspacing_table_data[27*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d80-0x2dbf */ 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, /* 0x2dc0-0x2dff */ /* 0x3000-0x31ff */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, /* 0x3000-0x303f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, /* 0x3000-0x303f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3040-0x307f */ 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, /* 0x3080-0x30bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30c0-0x30ff */ @@ -188,8 +188,8 @@ static const unsigned char nonspacing_table_data[27*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x31c0-0x31ff */ /* 0xa600-0xa7ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa600-0xa63f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x30, /* 0xa640-0xa67f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa680-0xa6bf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf7, 0x3f, /* 0xa640-0xa67f */ + 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, /* 0xa680-0xa6bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, /* 0xa6c0-0xa6ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa700-0xa73f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa740-0xa77f */ @@ -203,12 +203,12 @@ static const unsigned char nonspacing_table_data[27*64] = { 0x00, 0x00, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, /* 0xa900-0xa93f */ 0x80, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa940-0xa97f */ 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x13, /* 0xa980-0xa9bf */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa9c0-0xa9ff */ + 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, /* 0xa9c0-0xa9ff */ /* 0xaa00-0xabff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x66, 0x00, /* 0xaa00-0xaa3f */ - 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaa40-0xaa7f */ + 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0xaa40-0xaa7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9d, 0xc1, /* 0xaa80-0xaabf */ - 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaac0-0xaaff */ + 0x02, 0x00, 0x00, 0x00, 0x00, 0x30, 0x40, 0x00, /* 0xaac0-0xaaff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab00-0xab3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab40-0xab7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab80-0xabbf */ @@ -223,7 +223,7 @@ static const unsigned char nonspacing_table_data[27*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfb80-0xfbbf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfbc0-0xfbff */ /* 0xfe00-0xffff */ - 0xff, 0xff, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, /* 0xfe00-0xfe3f */ + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, /* 0xfe00-0xfe3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfe40-0xfe7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfe80-0xfebf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0xfec0-0xfeff */ @@ -240,24 +240,87 @@ static const unsigned char nonspacing_table_data[27*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10140-0x1017f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10180-0x101bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, /* 0x101c0-0x101ff */ + /* 0x10200-0x103ff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10200-0x1023f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10240-0x1027f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10280-0x102bf */ + 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, /* 0x102c0-0x102ff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10300-0x1033f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x07, /* 0x10340-0x1037f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10380-0x103bf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x103c0-0x103ff */ /* 0x10a00-0x10bff */ 0x6e, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, /* 0x10a00-0x10a3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10a40-0x10a7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10a80-0x10abf */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10ac0-0x10aff */ + 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, /* 0x10ac0-0x10aff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b00-0x10b3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b40-0x10b7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b80-0x10bbf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10bc0-0x10bff */ /* 0x11000-0x111ff */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, /* 0x11000-0x1103f */ - 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11040-0x1107f */ + 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x11040-0x1107f */ 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x26, /* 0x11080-0x110bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x110c0-0x110ff */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11100-0x1113f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11140-0x1117f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11180-0x111bf */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x111c0-0x111ff */ + 0x07, 0x00, 0x00, 0x00, 0x80, 0xef, 0x1f, 0x00, /* 0x11100-0x1113f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, /* 0x11140-0x1117f */ + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x7f, /* 0x11180-0x111bf */ + 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x111c0-0x111ff */ + /* 0x11200-0x113ff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xd3, 0x00, /* 0x11200-0x1123f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11240-0x1127f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11280-0x112bf */ + 0x00, 0x00, 0x00, 0x80, 0xf8, 0x07, 0x00, 0x00, /* 0x112c0-0x112ff */ + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x11300-0x1133f */ + 0x01, 0x00, 0x00, 0x00, 0xc0, 0x1f, 0x1f, 0x00, /* 0x11340-0x1137f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11380-0x113bf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x113c0-0x113ff */ + /* 0x11400-0x115ff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11400-0x1143f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11440-0x1147f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x85, /* 0x11480-0x114bf */ + 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x114c0-0x114ff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11500-0x1153f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11540-0x1157f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0xb0, /* 0x11580-0x115bf */ + 0x01, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, /* 0x115c0-0x115ff */ + /* 0x11600-0x117ff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xa7, /* 0x11600-0x1163f */ + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11640-0x1167f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xbf, 0x00, /* 0x11680-0x116bf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x116c0-0x116ff */ + 0x00, 0x00, 0x00, 0xe0, 0xbc, 0x0f, 0x00, 0x00, /* 0x11700-0x1173f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11740-0x1177f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11780-0x117bf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x117c0-0x117ff */ + /* 0x16a00-0x16bff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16a00-0x16a3f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16a40-0x16a7f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16a80-0x16abf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, /* 0x16ac0-0x16aff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x00, /* 0x16b00-0x16b3f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16b40-0x16b7f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16b80-0x16bbf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16bc0-0x16bff */ + /* 0x16e00-0x16fff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16e00-0x16e3f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16e40-0x16e7f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16e80-0x16ebf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16ec0-0x16eff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16f00-0x16f3f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16f40-0x16f7f */ + 0x00, 0x80, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16f80-0x16fbf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16fc0-0x16fff */ + /* 0x1bc00-0x1bdff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bc00-0x1bc3f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bc40-0x1bc7f */ + 0x00, 0x00, 0x00, 0x60, 0x0f, 0x00, 0x00, 0x00, /* 0x1bc80-0x1bcbf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bcc0-0x1bcff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bd00-0x1bd3f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bd40-0x1bd7f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bd80-0x1bdbf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bdc0-0x1bdff */ /* 0x1d000-0x1d1ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d000-0x1d03f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d040-0x1d07f */ @@ -275,9 +338,27 @@ static const unsigned char nonspacing_table_data[27*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d300-0x1d33f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d340-0x1d37f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d380-0x1d3bf */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 /* 0x1d3c0-0x1d3ff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d3c0-0x1d3ff */ + /* 0x1da00-0x1dbff */ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xf8, /* 0x1da00-0x1da3f */ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x20, 0x00, /* 0x1da40-0x1da7f */ + 0x10, 0x00, 0x00, 0xf8, 0xfe, 0xff, 0x00, 0x00, /* 0x1da80-0x1dabf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1dac0-0x1daff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1db00-0x1db3f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1db40-0x1db7f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1db80-0x1dbbf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1dbc0-0x1dbff */ + /* 0x1e800-0x1e9ff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e800-0x1e83f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e840-0x1e87f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e880-0x1e8bf */ + 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e8c0-0x1e8ff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e900-0x1e93f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e940-0x1e97f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e980-0x1e9bf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 /* 0x1e9c0-0x1e9ff */ }; -static const signed char nonspacing_table_ind[240] = { +static const signed char nonspacing_table_ind[248] = { 0, 1, 2, 3, 4, 5, 6, 7, /* 0x0000-0x0fff */ 8, 9, -1, 10, 11, 12, 13, -1, /* 0x1000-0x1fff */ 14, -1, -1, -1, -1, -1, 15, -1, /* 0x2000-0x2fff */ @@ -294,20 +375,21 @@ static const signed char nonspacing_table_ind[240] = { -1, -1, -1, -1, -1, -1, -1, -1, /* 0xd000-0xdfff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0xe000-0xefff */ -1, -1, -1, -1, -1, 20, -1, 21, /* 0xf000-0xffff */ - 22, -1, -1, -1, -1, 23, -1, -1, /* 0x10000-0x10fff */ - 24, -1, -1, -1, -1, -1, -1, -1, /* 0x11000-0x11fff */ + 22, 23, -1, -1, -1, 24, -1, -1, /* 0x10000-0x10fff */ + 25, 26, 27, 28, -1, -1, -1, -1, /* 0x11000-0x11fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x12000-0x12fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x13000-0x13fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x14000-0x14fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x15000-0x15fff */ - -1, -1, -1, -1, -1, -1, -1, -1, /* 0x16000-0x16fff */ + -1, -1, -1, -1, -1, 29, -1, 30, /* 0x16000-0x16fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x17000-0x17fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x18000-0x18fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x19000-0x19fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1a000-0x1afff */ - -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1b000-0x1bfff */ + -1, -1, -1, -1, -1, -1, 31, -1, /* 0x1b000-0x1bfff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1c000-0x1cfff */ - 25, 26, -1, -1, -1, -1, -1, -1 /* 0x1d000-0x1dfff */ + 32, 33, -1, -1, -1, 34, -1, -1, /* 0x1d000-0x1dfff */ + -1, -1, -1, -1, 35, -1, -1, -1 /* 0x1e000-0x1efff */ }; /* Determine number of column positions required for UC. */ @@ -315,7 +397,7 @@ int uc_width (ucs4_t uc, const char *encoding) { /* Test for non-spacing or control character. */ - if ((uc >> 9) < 240) + if ((uc >> 9) < 248) { int ind = nonspacing_table_ind[uc >> 9]; if (ind >= 0) diff --git a/lib/unlink.c b/lib/unlink.c index a234be4a..e006273a 100644 --- a/lib/unlink.c +++ b/lib/unlink.c @@ -1,6 +1,6 @@ /* Work around unlink bugs. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: 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 fff8310e..af35256f 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This 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,9 +35,12 @@ # undef unlinkat -/* unlinkat without AT_REMOVEDIR does not honor trailing / on Solaris - 9. Solve it in a similar manner to unlink. Hurd has the same - issue. */ +/* unlinkat without AT_REMOVEDIR does not honor trailing / on Solaris 9. + Hurd has the same issue. + + unlinkat without AT_REMOVEDIR erroneously ignores ".." on Darwin 14. + + Solve these in a similar manner to unlink. */ int rpl_unlinkat (int fd, char const *name, int flag) @@ -78,7 +81,17 @@ rpl_unlinkat (int fd, char const *name, int flag) } } if (!result) - result = unlinkat (fd, name, flag); + { +# if UNLINK_PARENT_BUG + if (len >= 2 && name[len - 1] == '.' && name[len - 2] == '.' + && (len == 2 || ISSLASH (name[len - 3]))) + { + errno = EISDIR; /* could also use EPERM */ + return -1; + } +# endif + result = unlinkat (fd, name, flag); + } return result; } diff --git a/lib/unlocked-io.h b/lib/unlocked-io.h index 4b0f3ff0..06ffac61 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 53721fc4..87f41d59 100644 --- a/lib/unsetenv.c +++ b/lib/unsetenv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1995-2002, 2005-2014 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1995-2002, 2005-2015 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 1be9266e..84632c37 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-2014 Free Software + Copyright (C) 1989-1992, 1997-1998, 2000, 2002-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -234,7 +234,7 @@ parse_with_separator (char const *spec, char const *separator, free (u); free (gname); - return _(error_msg); + return error_msg ? _(error_msg) : NULL; } /* Extract from SPEC, which has the form "[user][:.][group]", diff --git a/lib/utimecmp.c b/lib/utimecmp.c index 49ea5f86..b91fe499 100644 --- a/lib/utimecmp.c +++ b/lib/utimecmp.c @@ -1,6 +1,6 @@ /* utimecmp.c -- compare file time stamps - Copyright (C) 2004-2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2004-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 81c16e27..f297a173 100644 --- a/lib/utimecmp.h +++ b/lib/utimecmp.h @@ -1,6 +1,6 @@ /* utimecmp.h -- compare file time stamps - Copyright (C) 2004, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2004, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 dd3ec668..7386dcf2 100644 --- a/lib/utimens.c +++ b/lib/utimens.c @@ -1,6 +1,6 @@ /* Set file access and modification times. - Copyright (C) 2003-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -24,7 +24,6 @@ #define _GL_UTIMENS_INLINE _GL_EXTERN_INLINE #include "utimens.h" -#include #include #include #include @@ -87,7 +86,6 @@ validate_timespec (struct timespec timespec[2]) { int result = 0; int utime_omit_count = 0; - assert (timespec); if ((timespec[0].tv_nsec != UTIME_NOW && timespec[0].tv_nsec != UTIME_OMIT && ! (0 <= timespec[0].tv_nsec diff --git a/lib/utimens.h b/lib/utimens.h index faaf3c70..cbd06cc7 100644 --- a/lib/utimens.h +++ b/lib/utimens.h @@ -1,6 +1,6 @@ /* Set file access and modification times. - Copyright 2012-2014 Free Software Foundation, Inc. + Copyright 2012-2015 Free Software Foundation, Inc. This program 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/utimensat.c b/lib/utimensat.c index 185cb14c..59839d40 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This program is free software: 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 b7c8709e..88332f0b 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -1,5 +1,5 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 1999, 2002-2014 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1886,7 +1886,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, else { do - result[length++] = (unsigned char) *cp++; + result[length++] = *cp++; while (--n > 0); } } @@ -1957,15 +1957,14 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) abort (); arg = a.arg[dp->width_arg_index].a.a_int; + width = arg; if (arg < 0) { /* "A negative field width is taken as a '-' flag followed by a positive field width." */ flags |= FLAG_LEFT; - width = (unsigned int) (-arg); + width = -width; } - else - width = arg; } else { @@ -2073,8 +2072,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, characters = 0; } - if (has_width && width > characters - && !(dp->flags & FLAG_LEFT)) + if (characters < width && !(dp->flags & FLAG_LEFT)) { size_t n = width - characters; ENSURE_ALLOCATION (xsum (length, n)); @@ -2127,8 +2125,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, } # endif - if (has_width && width > characters - && (dp->flags & FLAG_LEFT)) + if (characters < width && (dp->flags & FLAG_LEFT)) { size_t n = width - characters; ENSURE_ALLOCATION (xsum (length, n)); @@ -2201,8 +2198,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, characters = 0; } - if (has_width && width > characters - && !(dp->flags & FLAG_LEFT)) + if (characters < width && !(dp->flags & FLAG_LEFT)) { size_t n = width - characters; ENSURE_ALLOCATION (xsum (length, n)); @@ -2255,8 +2251,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, } # endif - if (has_width && width > characters - && (dp->flags & FLAG_LEFT)) + if (characters < width && (dp->flags & FLAG_LEFT)) { size_t n = width - characters; ENSURE_ALLOCATION (xsum (length, n)); @@ -2329,8 +2324,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, characters = 0; } - if (has_width && width > characters - && !(dp->flags & FLAG_LEFT)) + if (characters < width && !(dp->flags & FLAG_LEFT)) { size_t n = width - characters; ENSURE_ALLOCATION (xsum (length, n)); @@ -2383,8 +2377,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, } # endif - if (has_width && width > characters - && (dp->flags & FLAG_LEFT)) + if (characters < width && (dp->flags & FLAG_LEFT)) { size_t n = width - characters; ENSURE_ALLOCATION (xsum (length, n)); @@ -2435,15 +2428,14 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) abort (); arg = a.arg[dp->width_arg_index].a.a_int; + width = arg; if (arg < 0) { /* "A negative field width is taken as a '-' flag followed by a positive field width." */ flags |= FLAG_LEFT; - width = (unsigned int) (-arg); + width = -width; } - else - width = arg; } else { @@ -2573,8 +2565,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, characters = 0; } - if (has_width && width > characters - && !(dp->flags & FLAG_LEFT)) + if (characters < width && !(dp->flags & FLAG_LEFT)) { size_t n = width - characters; ENSURE_ALLOCATION (xsum (length, n)); @@ -2635,8 +2626,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, } } - if (has_width && width > characters - && (dp->flags & FLAG_LEFT)) + if (characters < width && (dp->flags & FLAG_LEFT)) { size_t n = width - characters; ENSURE_ALLOCATION (xsum (length, n)); @@ -2827,8 +2817,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, /* w doesn't matter. */ w = 0; - if (has_width && width > w - && !(dp->flags & FLAG_LEFT)) + if (w < width && !(dp->flags & FLAG_LEFT)) { size_t n = width - w; ENSURE_ALLOCATION (xsum (length, n)); @@ -2911,8 +2900,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, length += tmpdst_len; # endif - if (has_width && width > w - && (dp->flags & FLAG_LEFT)) + if (w < width && (dp->flags & FLAG_LEFT)) { size_t n = width - w; ENSURE_ALLOCATION (xsum (length, n)); @@ -2939,17 +2927,16 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, { arg_type type = a.arg[dp->arg_index].type; int flags = dp->flags; - int has_width; size_t width; int has_precision; size_t precision; size_t tmp_length; + size_t count; DCHAR_T tmpbuf[700]; DCHAR_T *tmp; DCHAR_T *pad_ptr; DCHAR_T *p; - has_width = 0; width = 0; if (dp->width_start != dp->width_end) { @@ -2960,15 +2947,14 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) abort (); arg = a.arg[dp->width_arg_index].a.a_int; + width = arg; if (arg < 0) { /* "A negative field width is taken as a '-' flag followed by a positive field width." */ flags |= FLAG_LEFT; - width = (unsigned int) (-arg); + width = -width; } - else - width = arg; } else { @@ -2978,7 +2964,6 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, width = xsum (xtimes (width, 10), *digitp++ - '0'); while (digitp != dp->width_end); } - has_width = 1; } has_precision = 0; @@ -3354,11 +3339,14 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, abort (); # endif } + /* The generated string now extends from tmp to p, with the zero padding insertion point being at pad_ptr. */ - if (has_width && p - tmp < width) + count = p - tmp; + + if (count < width) { - size_t pad = width - (p - tmp); + size_t pad = width - count; DCHAR_T *end = p + pad; if (flags & FLAG_LEFT) @@ -3391,28 +3379,26 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, p = end; } - { - size_t count = p - tmp; + count = p - tmp; - if (count >= tmp_length) - /* tmp_length was incorrectly calculated - fix the - code above! */ - abort (); + if (count >= tmp_length) + /* tmp_length was incorrectly calculated - fix the + code above! */ + abort (); - /* Make room for the result. */ - if (count >= allocated - length) - { - size_t n = xsum (length, count); + /* Make room for the result. */ + if (count >= allocated - length) + { + size_t n = xsum (length, count); - ENSURE_ALLOCATION (n); - } + ENSURE_ALLOCATION (n); + } - /* Append the result. */ - memcpy (result + length, tmp, count * sizeof (DCHAR_T)); - if (tmp != tmpbuf) - free (tmp); - length += count; - } + /* Append the result. */ + memcpy (result + length, tmp, count * sizeof (DCHAR_T)); + if (tmp != tmpbuf) + free (tmp); + length += count; } #endif #if (NEED_PRINTF_INFINITE_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL @@ -3446,8 +3432,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, arg_type type = a.arg[dp->arg_index].type; # endif int flags = dp->flags; - int has_width; size_t width; + size_t count; int has_precision; size_t precision; size_t tmp_length; @@ -3456,7 +3442,6 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, DCHAR_T *pad_ptr; DCHAR_T *p; - has_width = 0; width = 0; if (dp->width_start != dp->width_end) { @@ -3467,15 +3452,14 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) abort (); arg = a.arg[dp->width_arg_index].a.a_int; + width = arg; if (arg < 0) { /* "A negative field width is taken as a '-' flag followed by a positive field width." */ flags |= FLAG_LEFT; - width = (unsigned int) (-arg); + width = -width; } - else - width = arg; } else { @@ -3485,7 +3469,6 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, width = xsum (xtimes (width, 10), *digitp++ - '0'); while (digitp != dp->width_end); } - has_width = 1; } has_precision = 0; @@ -3925,9 +3908,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, digits without trailing zeroes. */ if (exponent >= 0) { - size_t count = exponent + 1; + size_t ecount = exponent + 1; /* Note: count <= precision = ndigits. */ - for (; count > 0; count--) + for (; ecount > 0; ecount--) *p++ = digits[--ndigits]; if ((flags & FLAG_ALT) || ndigits > nzeroes) { @@ -3941,10 +3924,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, } else { - size_t count = -exponent - 1; + size_t ecount = -exponent - 1; *p++ = '0'; *p++ = decimal_point_char (); - for (; count > 0; count--) + for (; ecount > 0; ecount--) *p++ = '0'; while (ndigits > nzeroes) { @@ -4395,9 +4378,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, digits without trailing zeroes. */ if (exponent >= 0) { - size_t count = exponent + 1; - /* Note: count <= precision = ndigits. */ - for (; count > 0; count--) + size_t ecount = exponent + 1; + /* Note: ecount <= precision = ndigits. */ + for (; ecount > 0; ecount--) *p++ = digits[--ndigits]; if ((flags & FLAG_ALT) || ndigits > nzeroes) { @@ -4411,10 +4394,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, } else { - size_t count = -exponent - 1; + size_t ecount = -exponent - 1; *p++ = '0'; *p++ = decimal_point_char (); - for (; count > 0; count--) + for (; ecount > 0; ecount--) *p++ = '0'; while (ndigits > nzeroes) { @@ -4542,9 +4525,11 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, /* The generated string now extends from tmp to p, with the zero padding insertion point being at pad_ptr. */ - if (has_width && p - tmp < width) + count = p - tmp; + + if (count < width) { - size_t pad = width - (p - tmp); + size_t pad = width - count; DCHAR_T *end = p + pad; if (flags & FLAG_LEFT) @@ -4577,36 +4562,36 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, p = end; } - { - size_t count = p - tmp; + count = p - tmp; - if (count >= tmp_length) - /* tmp_length was incorrectly calculated - fix the - code above! */ - abort (); + if (count >= tmp_length) + /* tmp_length was incorrectly calculated - fix the + code above! */ + abort (); - /* Make room for the result. */ - if (count >= allocated - length) - { - size_t n = xsum (length, count); + /* Make room for the result. */ + if (count >= allocated - length) + { + size_t n = xsum (length, count); - ENSURE_ALLOCATION (n); - } + ENSURE_ALLOCATION (n); + } - /* Append the result. */ - memcpy (result + length, tmp, count * sizeof (DCHAR_T)); - if (tmp != tmpbuf) - free (tmp); - length += count; - } + /* Append the result. */ + memcpy (result + length, tmp, count * sizeof (DCHAR_T)); + if (tmp != tmpbuf) + free (tmp); + length += count; } #endif else { arg_type type = a.arg[dp->arg_index].type; int flags = dp->flags; -#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION int has_width; +#endif +#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION size_t width; #endif #if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || NEED_PRINTF_UNBOUNDED_PRECISION @@ -4635,8 +4620,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, TCHAR_T *tmp; #endif -#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION has_width = 0; +#endif +#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION width = 0; if (dp->width_start != dp->width_end) { @@ -4647,15 +4634,14 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) abort (); arg = a.arg[dp->width_arg_index].a.a_int; + width = arg; if (arg < 0) { /* "A negative field width is taken as a '-' flag followed by a positive field width." */ flags |= FLAG_LEFT; - width = (unsigned int) (-arg); + width = -width; } - else - width = arg; } else { @@ -4665,7 +4651,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, width = xsum (xtimes (width, 10), *digitp++ - '0'); while (digitp != dp->width_end); } +#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION has_width = 1; +#endif } #endif @@ -4805,7 +4793,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, { const FCHAR_T *mp = dp->width_start; do - *fbp++ = (unsigned char) *mp++; + *fbp++ = *mp++; while (--n > 0); } } @@ -4826,7 +4814,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, { const FCHAR_T *mp = dp->precision_start; do - *fbp++ = (unsigned char) *mp++; + *fbp++ = *mp++; while (--n > 0); } } @@ -5153,7 +5141,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, size_t tmp_length = MAX_ROOM_NEEDED (&a, dp->arg_index, dp->conversion, type, flags, - has_width ? width : 0, + width, has_precision, precision, pad_ourselves); @@ -5191,18 +5179,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, /* SNPRINTF or sprintf failed. Save and use the errno that it has set, if any. */ int saved_errno = errno; + if (saved_errno == 0) + { + if (dp->conversion == 'c' || dp->conversion == 's') + saved_errno = EILSEQ; + else + saved_errno = EINVAL; + } if (!(result == resultbuf || result == NULL)) free (result); if (buf_malloced != NULL) free (buf_malloced); CLEANUP (); - errno = - (saved_errno != 0 - ? saved_errno - : (dp->conversion == 'c' || dp->conversion == 's' - ? EILSEQ - : EINVAL)); + + errno = saved_errno; return NULL; } @@ -5391,7 +5382,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, tmpsrc += count; tmpdst += count; for (n = count; n > 0; n--) - *--tmpdst = (unsigned char) *--tmpsrc; + *--tmpdst = *--tmpsrc; } } #endif diff --git a/lib/vasnprintf.h b/lib/vasnprintf.h index daa946dc..3494eef3 100644 --- a/lib/vasnprintf.h +++ b/lib/vasnprintf.h @@ -1,5 +1,5 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 2002-2004, 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2007-2015 Free Software Foundation, Inc. This program is free software; 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 eed90374..5dd4abd4 100644 --- a/lib/vasprintf.c +++ b/lib/vasprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2014 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006-2015 Free Software Foundation, Inc. This program is free software; 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 a25e5146..60eba498 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -1,6 +1,6 @@ /* Compile-time assert-like macros. - Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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.c b/lib/verror.c index 9388f622..81a2ffcb 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 c6292bc6..5aaa63cf 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 b37dd605..ad78d0d7 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-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 04f5b620..a93b008d 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-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2015 Free Software Foundation, Inc. This 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 = 2014 }; +enum { COPYRIGHT_YEAR = 2015 }; /* The three functions below display the --version information the standard way. diff --git a/lib/version-etc.h b/lib/version-etc.h index 8e1b2ccf..408581e3 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-2014 Free Software Foundation, Inc. + Copyright (C) 1999, 2003, 2005, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 b49caaee..c5bcfeb1 100644 --- a/lib/vfprintf.c +++ b/lib/vfprintf.c @@ -1,5 +1,5 @@ /* Formatted output to a stream. - Copyright (C) 2004, 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2004, 2006-2015 Free Software Foundation, Inc. This program is free software: 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 d97f5c8a..9f80aba2 100644 --- a/lib/vprintf.c +++ b/lib/vprintf.c @@ -1,5 +1,5 @@ /* Formatted output to a stream. - Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 b921b1bc..dace9cf7 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: 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 473285fb..684299f7 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 , for platforms that have issues. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This 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,9 +30,14 @@ #endif @PRAGMA_COLUMNS@ -#if defined __need_mbstate_t || defined __need_wint_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H +#if (((defined __need_mbstate_t || defined __need_wint_t) \ + && !defined __MINGW32__) \ + || (defined __hpux \ + && ((defined _INTTYPES_INCLUDED && !defined strtoimax) \ + || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) \ + || defined _GL_ALREADY_INCLUDING_WCHAR_H) /* Special invocation convention: - - Inside glibc and uClibc header files. + - Inside glibc and uClibc header files, but not MinGW. - On HP-UX 11.00 we have a sequence of nested includes -> -> , and the latter includes , once indirectly -> -> -> diff --git a/lib/wcrtomb.c b/lib/wcrtomb.c index 1d340cd9..b38d2e0d 100644 --- a/lib/wcrtomb.c +++ b/lib/wcrtomb.c @@ -1,5 +1,5 @@ /* Convert wide character to multibyte character. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. Written by Bruno Haible , 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 b71f9976..7cd5bc93 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-2014 Free Software Foundation, Inc. + Copyright (C) 1999, 2011-2015 Free Software Foundation, Inc. Written by Bruno Haible , 1999. This program is free software: you can redistribute it and/or modify diff --git a/lib/wcswidth.c b/lib/wcswidth.c index 656dc6c4..36cb6e1a 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-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/wctype.in.h b/lib/wctype.in.h index ab066539..9050b7e5 100644 --- a/lib/wctype.in.h +++ b/lib/wctype.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 , for platforms that lack it. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/wcwidth.c b/lib/wcwidth.c index d7837bb1..d2b71189 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-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2010-2015 Free Software Foundation, Inc. This program is free software: 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 1cd0b791..fcf4f86e 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/write.c b/lib/write.c index ff31dbb6..ed2d3b7b 100644 --- a/lib/write.c +++ b/lib/write.c @@ -1,5 +1,5 @@ /* POSIX compatible write() function. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/xalloc-die.c b/lib/xalloc-die.c index 7bdd2a31..3cea6386 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-2014 Free Software + Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2015 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 f3329228..f0e9778f 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-2014 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/xalloc.h b/lib/xalloc.h index 3f6b5b80..81ef680a 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-2014 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -41,7 +41,8 @@ extern "C" { # define _GL_ATTRIBUTE_MALLOC #endif -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) +#if ! defined __clang__ && \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) # define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) #else # define _GL_ATTRIBUTE_ALLOC_SIZE(args) @@ -258,5 +259,6 @@ xmemdup (T const *p, size_t s) #endif +_GL_INLINE_HEADER_END #endif /* !XALLOC_H_ */ diff --git a/lib/xasprintf.c b/lib/xasprintf.c index 4e0b5b16..f8eef978 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-2014 Free Software Foundation, + Copyright (C) 1999, 2002-2004, 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/xdectoimax.c b/lib/xdectoimax.c new file mode 100644 index 00000000..d4bb18fa --- /dev/null +++ b/lib/xdectoimax.c @@ -0,0 +1,6 @@ +#define __xdectoint xdectoimax +#define __xnumtoint xnumtoimax +#define __xdectoint_t intmax_t +#define __xstrtol xstrtoimax +#define __xdectoint_signed 1 +#include "xdectoint.c" diff --git a/lib/xdectoint.c b/lib/xdectoint.c new file mode 100644 index 00000000..47200e4f --- /dev/null +++ b/lib/xdectoint.c @@ -0,0 +1,86 @@ +/* Convert decimal strings with bounds checking and exit on error. + + Copyright (C) 2014-2015 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +#include "xdectoint.h" + +#include +#include +#include + +#include "error.h" +#include "quote.h" +#include "xstrtol.h" + +/* Parse numeric string N_STR of base BASE, and return the value. + Exit on parse error or if MIN or MAX are exceeded. + Strings can have multiplicative SUFFIXES if specified. + ERR is printed along with N_STR on error. */ + +__xdectoint_t +__xnumtoint (const char *n_str, int base, __xdectoint_t min, __xdectoint_t max, + const char *suffixes, const char *err, int err_exit) +{ + strtol_error s_err; + + __xdectoint_t tnum; + s_err = __xstrtol (n_str, NULL, base, &tnum, suffixes); + + if (s_err == LONGINT_OK) + { + if (tnum < min || max < tnum) + { + s_err = LONGINT_OVERFLOW; + /* Use have the INT range as a heuristic to distinguish + type overflow rather than other min/max limits. */ + if (tnum > INT_MAX/2) + errno = EOVERFLOW; +#if __xdectoint_signed + else if (tnum < INT_MIN/2) + errno = EOVERFLOW; +#endif + else + errno = ERANGE; + } + } + else if (s_err == LONGINT_OVERFLOW) + errno = EOVERFLOW; + else if (s_err == LONGINT_INVALID_SUFFIX_CHAR_WITH_OVERFLOW) + errno = 0; /* Don't show ERANGE errors for invalid numbers. */ + + if (s_err != LONGINT_OK) + { + /* EINVAL error message is redundant in this context. */ + error (err_exit ? err_exit : EXIT_FAILURE, errno == EINVAL ? 0 : errno, + "%s: %s", err, quote (n_str)); + } + + return tnum; +} + +/* Parse decimal string N_STR, and return the value. + Exit on parse error or if MIN or MAX are exceeded. + Strings can have multiplicative SUFFIXES if specified. + ERR is printed along with N_STR on error. */ + +__xdectoint_t +__xdectoint (const char *n_str, __xdectoint_t min, __xdectoint_t max, + const char *suffixes, const char *err, int err_exit) +{ + return __xnumtoint (n_str, 10, min, max, suffixes, err, err_exit); +} diff --git a/lib/xdectoint.h b/lib/xdectoint.h new file mode 100644 index 00000000..f15ea521 --- /dev/null +++ b/lib/xdectoint.h @@ -0,0 +1,36 @@ +/* Convert decimal strings with bounds checking and exit on error. + + Copyright (C) 2014-2015 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef XDECTOINT_H_ +# define XDECTOINT_H_ 1 + +# include + +# define _DECLARE_XDECTOINT(name, type) \ + type name (const char *n_str, type min, type max, \ + const char *suffixes, const char *err, int err_exit); +# define _DECLARE_XNUMTOINT(name, type) \ + type name (const char *n_str, int base, type min, type max, \ + const char *suffixes, const char *err, int err_exit); + +_DECLARE_XDECTOINT (xdectoimax, intmax_t) +_DECLARE_XDECTOINT (xdectoumax, uintmax_t) + +_DECLARE_XNUMTOINT (xnumtoimax, intmax_t) +_DECLARE_XNUMTOINT (xnumtoumax, uintmax_t) + +#endif /* not XDECTOINT_H_ */ diff --git a/lib/xdectoumax.c b/lib/xdectoumax.c new file mode 100644 index 00000000..412ddf96 --- /dev/null +++ b/lib/xdectoumax.c @@ -0,0 +1,6 @@ +#define __xdectoint xdectoumax +#define __xnumtoint xnumtoumax +#define __xdectoint_t uintmax_t +#define __xstrtol xstrtoumax +#define __xdectoint_signed 0 +#include "xdectoint.c" diff --git a/lib/xfreopen.c b/lib/xfreopen.c index abc8221b..73dfe396 100644 --- a/lib/xfreopen.c +++ b/lib/xfreopen.c @@ -1,5 +1,5 @@ /* a wrapper for freopen - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: 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 bcc82d05..367eb3d9 100644 --- a/lib/xfts.c +++ b/lib/xfts.c @@ -1,6 +1,6 @@ /* xfts.c -- a wrapper for fts_open - Copyright (C) 2003-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2015 Free Software Foundation, Inc. This program is free software: 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 e91e8e55..cbaf4d8d 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-2014 Free Software + Copyright (C) 2001, 2003-2004, 2006-2007, 2009-2015 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 9630d6c7..9c472349 100644 --- a/lib/xgetcwd.h +++ b/lib/xgetcwd.h @@ -1,5 +1,5 @@ /* prototype for xgetcwd - Copyright (C) 1995, 2001, 2003, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 1995, 2001, 2003, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 7f9d86a4..1cc8b033 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: 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 0f7b178f..24592ac2 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-2014 Free Software + Copyright (C) 1992, 1996, 2000-2001, 2003-2006, 2009-2015 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 264d44af..e246559f 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-2014 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2002-2006, 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/xmemcoll.c b/lib/xmemcoll.c index 39b8ce8e..4de10c69 100644 --- a/lib/xmemcoll.c +++ b/lib/xmemcoll.c @@ -1,6 +1,6 @@ /* Locale-specific memory comparison. - Copyright (C) 2002-2004, 2006, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2006, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 3b2b43ba..c66f2167 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 52f8d5cd..68b4a37f 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 96fbcfa1..aba83ca4 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-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This program is free software: 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 2f3b8a10..5082d0b0 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 af80ca43..a970eb9b 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-2014 Free Software Foundation, + Copyright (C) 2001, 2003-2004, 2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/xsize.h b/lib/xsize.h index fd12c670..b2a786a8 100644 --- a/lib/xsize.h +++ b/lib/xsize.h @@ -1,6 +1,6 @@ /* xsize.h -- Checked size_t computations. - Copyright (C) 2003, 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2003, 2008-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/xstriconv.c b/lib/xstriconv.c index be1ef2df..d5e19515 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006, 2009-2015 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 75f8f832..6319989f 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-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006-2007, 2009-2015 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 d2259c82..51831d8c 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-2014 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 6a409f7a..d510bf37 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-2014 Free Software Foundation, Inc. + Copyright (C) 2003, 2009-2015 Free Software Foundation, Inc. This program is free software: 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 7caa615d..6941a35a 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-2014 Free Software + Copyright (C) 1996, 1999-2000, 2003-2006, 2009-2015 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 1fb8d7b7..2dcdafa8 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-2014 Free Software + Copyright (C) 1996, 1998, 2003-2004, 2006, 2009-2015 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 9629dabb..6a2ebea0 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-2014 Free Software + Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2015 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 f6d535a7..bd3ffeb2 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-2014 Free Software + Copyright (C) 1995-1996, 1998-2001, 2003-2007, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -34,13 +34,13 @@ need stderr defined if assertion checking is enabled. */ #include -#include #include #include #include #include #include +#include "assure.h" #include "intprops.h" /* xstrtoll.c and xstrtoull.c, which include this file, require that @@ -93,10 +93,12 @@ __xstrtol (const char *s, char **ptr, int strtol_base, __strtol_t tmp; strtol_error err = LONGINT_OK; - assert (0 <= strtol_base && strtol_base <= 36); + assure (0 <= strtol_base && strtol_base <= 36); p = (ptr ? ptr : &t_ptr); + errno = 0; + if (! TYPE_SIGNED (__strtol_t)) { const char *q = s; @@ -107,7 +109,6 @@ __xstrtol (const char *s, char **ptr, int strtol_base, return LONGINT_INVALID; } - errno = 0; tmp = __strtol (s, p, strtol_base); if (*p == s) diff --git a/lib/xstrtol.h b/lib/xstrtol.h index fe54f6af..19202dcd 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-2014 Free Software + Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/xtime.h b/lib/xtime.h index 574e0dbf..d10ea779 100644 --- a/lib/xtime.h +++ b/lib/xtime.h @@ -1,6 +1,6 @@ /* xtime -- extended-resolution integer time stamps - Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/xvasprintf.c b/lib/xvasprintf.c index 7a4029e7..441ab598 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-2014 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-2004, 2006-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/xvasprintf.h b/lib/xvasprintf.h index 407a5e0d..3b7f5ad8 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-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2006-2015 Free Software Foundation, Inc. This program is free software: 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 ddb34454..331a4083 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-2014 Free Software Foundation, Inc. + Copyright (C) 1990, 1998, 2001, 2003-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -42,7 +42,10 @@ yesno (void) yes = false; else { - response[response_len - 1] = '\0'; + /* Remove EOL if present as that's not part of the matched response, + and not matched by $ for example. */ + if (response[response_len - 1] == '\n') + response[response_len - 1] = '\0'; yes = (0 < rpmatch (response)); } diff --git a/lib/yesno.h b/lib/yesno.h index 3a6d8c9f..d247d8ad 100644 --- a/lib/yesno.h +++ b/lib/yesno.h @@ -1,5 +1,5 @@ /* declare yesno - Copyright (C) 2004, 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2004, 2009-2015 Free Software Foundation, Inc. This program is free 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 8eca5518..c7103ed5 100644 --- a/m4/00gnulib.m4 +++ b/m4/00gnulib.m4 @@ -1,5 +1,5 @@ # 00gnulib.m4 serial 3 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 ba53ff00..bb989125 100644 --- a/m4/ChangeLog-2007 +++ b/m4/ChangeLog-2007 @@ -5004,7 +5004,7 @@ ----- - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4 index ce3e39e9..bc19dfc3 100644 --- a/m4/absolute-header.m4 +++ b/m4/absolute-header.m4 @@ -1,5 +1,5 @@ # absolute-header.m4 serial 16 -dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/acl.m4 b/m4/acl.m4 index f02f69d2..75fc9ce4 100644 --- a/m4/acl.m4 +++ b/m4/acl.m4 @@ -1,30 +1,36 @@ # acl.m4 - check for access control list (ACL) primitives -# serial 17 +# serial 21 -# Copyright (C) 2002, 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2002, 2004-2015 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. # Written by Paul Eggert and Jim Meyering. -AC_DEFUN([gl_FUNC_ACL], +AC_DEFUN([gl_FUNC_ACL_ARG], [ + gl_need_lib_has_acl= AC_ARG_ENABLE([acl], AS_HELP_STRING([--disable-acl], [do not support ACLs]), , [enable_acl=auto]) +]) + +AC_DEFUN([gl_FUNC_ACL], +[ + AC_REQUIRE([gl_FUNC_ACL_ARG]) AC_CHECK_FUNCS_ONCE([fchmod]) LIB_ACL= use_acl=0 - if test "x$enable_acl" != "xno"; then + if test "$enable_acl" != no; then dnl On all platforms, the ACL related API is declared in . 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, Mac OS X, IRIX, Tru64). - dnl -lacl is needed on Linux, -lpacl is needed on OSF/1. + dnl Test for POSIX-draft-like API (GNU/Linux, FreeBSD, Mac OS X, + dnl IRIX, Tru64). -lacl is needed on GNU/Linux, -lpacl on OSF/1. if test $use_acl = 0; then AC_SEARCH_LIBS([acl_get_file], [acl pacl], [if test "$ac_cv_search_acl_get_file" != "none required"; then @@ -40,7 +46,7 @@ AC_DEFUN([gl_FUNC_ACL], # If the acl_get_file bug is detected, don't enable the ACL support. gl_ACL_GET_FILE([use_acl=1], []) if test $use_acl = 1; then - dnl On Linux, additional API is declared in . + dnl On GNU/Linux, an additional API is declared in . AC_CHECK_HEADERS([acl/libacl.h]) AC_REPLACE_FUNCS([acl_entries]) AC_CACHE_CHECK([for ACL_FIRST_ENTRY], @@ -124,13 +130,15 @@ int type = ACL_TYPE_EXTENDED;]])], LIBS=$ac_save_LIBS fi - if test "x$enable_acl$use_acl" = "xyes0"; then + + if test "$enable_acl$use_acl" = yes0; then AC_MSG_ERROR([ACLs enabled but support not detected]) - elif test "x$enable_acl$use_acl" = "xauto0"; then + elif test "$enable_acl$use_acl" = auto0; then AC_MSG_WARN([libacl development library was not found or not usable.]) AC_MSG_WARN([AC_PACKAGE_NAME will be built without ACL support.]) fi fi + test $gl_need_lib_has_acl && LIB_HAS_ACL=$LIB_ACL AC_SUBST([LIB_ACL]) AC_DEFINE_UNQUOTED([USE_ACL], [$use_acl], [Define to nonzero if you want access control list support.]) @@ -139,7 +147,7 @@ int type = ACL_TYPE_EXTENDED;]])], ]) # gl_ACL_GET_FILE(IF-WORKS, IF-NOT) -# ------------------------------------- +# --------------------------------- # If 'acl_get_file' works (does not have a particular bug), # run IF-WORKS, otherwise, IF-NOT. # When building natively, test for a Darwin 8.7.0 bug, whereby acl_get_file @@ -166,3 +174,38 @@ AC_DEFUN([gl_ACL_GET_FILE], fi])]) AS_IF([test "$gl_cv_func_working_acl_get_file" != no], [$1], [$2]) ]) + +# On GNU/Linux, testing if a file has an acl can be done with the getxattr +# syscall which doesn't require linking against additional libraries. +AC_DEFUN([gl_FILE_HAS_ACL], +[ + AC_REQUIRE([gl_FUNC_ACL_ARG]) + if test "$enable_acl" != no; then + AC_CACHE_CHECK([for getxattr with XATTR_NAME_POSIX_ACL macros], + [gl_cv_getxattr_with_posix_acls], + [gl_cv_getxattr_with_posix_acls=no + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #include + #include + ]], + [[ssize_t a = getxattr (".", XATTR_NAME_POSIX_ACL_ACCESS, 0, 0); + ssize_t b = getxattr (".", XATTR_NAME_POSIX_ACL_DEFAULT, 0, 0); + return a < 0 || b < 0; + ]])], + [gl_cv_getxattr_with_posix_acls=yes])]) + fi + if test "$gl_cv_getxattr_with_posix_acls" = yes; then + LIB_HAS_ACL= + AC_DEFINE([GETXATTR_WITH_POSIX_ACLS], 1, + [Define to 1 if getxattr works with XATTR_NAME_POSIX_ACL_ACCESS + and XATTR_NAME_POSIX_ACL_DEFAULT.]) + else + dnl Set gl_need_lib_has_acl to a nonempty value, so that any + dnl later gl_FUNC_ACL call will set LIB_HAS_ACL=$LIB_ACL. + gl_need_lib_has_acl=1 + LIB_HAS_ACL=$LIB_ACL + fi + AC_SUBST([LIB_HAS_ACL]) +]) diff --git a/m4/alloca.m4 b/m4/alloca.m4 index d7bdea63..8408bed2 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-2014 Free Software Foundation, +dnl Copyright (C) 2002-2004, 2006-2007, 2009-2015 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 f01699a9..056bc7b4 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 b9bb634e..0f95ee31 100644 --- a/m4/assert.m4 +++ b/m4/assert.m4 @@ -1,6 +1,6 @@ #serial 7 -# Copyright (C) 1998-1999, 2001, 2004, 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-1999, 2001, 2004, 2008-2015 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 00d87093..239809cd 100644 --- a/m4/autobuild.m4 +++ b/m4/autobuild.m4 @@ -1,5 +1,5 @@ # autobuild.m4 serial 7 -dnl Copyright (C) 2004, 2006-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 69249449..fe1a5ab0 100644 --- a/m4/backupfile.m4 +++ b/m4/backupfile.m4 @@ -1,5 +1,5 @@ # backupfile.m4 serial 14 -dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 9559e30b..1e312368 100644 --- a/m4/base64.m4 +++ b/m4/base64.m4 @@ -1,5 +1,5 @@ # base64.m4 serial 4 -dnl Copyright (C) 2004, 2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/bison.m4 b/m4/bison.m4 index c003367b..acfca780 100644 --- a/m4/bison.m4 +++ b/m4/bison.m4 @@ -1,6 +1,6 @@ # serial 7 -# Copyright (C) 2002, 2005, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2002, 2005, 2009-2015 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 450cc99c..f6588dac 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-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # This program is free 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 99889445..c1da65d4 100644 --- a/m4/btowc.m4 +++ b/m4/btowc.m4 @@ -1,5 +1,5 @@ # btowc.m4 serial 10 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 69e964e2..b5d8ca01 100644 --- a/m4/c-strtod.m4 +++ b/m4/c-strtod.m4 @@ -1,6 +1,6 @@ # c-strtod.m4 serial 15 -# Copyright (C) 2004-2006, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2006, 2009-2015 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/calloc.m4 b/m4/calloc.m4 index a63daf82..2dc2c7a7 100644 --- a/m4/calloc.m4 +++ b/m4/calloc.m4 @@ -1,6 +1,6 @@ # calloc.m4 serial 15 -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 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 76cded04..b9adb5a5 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 ace45566..6d932fd1 100644 --- a/m4/canonicalize.m4 +++ b/m4/canonicalize.m4 @@ -1,6 +1,6 @@ # canonicalize.m4 serial 26 -dnl Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/chdir-long.m4 b/m4/chdir-long.m4 index 8ed436de..14485832 100644 --- a/m4/chdir-long.m4 +++ b/m4/chdir-long.m4 @@ -6,7 +6,7 @@ # never fails with ENAMETOOLONG. # Arrange to compile chdir-long.c only on systems that define PATH_MAX. -dnl Copyright (C) 2004-2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/check-decl.m4 b/m4/check-decl.m4 index 56dea37f..5343e6ac 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2015 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 2f7b6d7f..633ea3ab 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-2014 Free Software +dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2015 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 6c4a637d..a903e582 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 80cde85a..a7a2efee 100644 --- a/m4/close-stream.m4 +++ b/m4/close-stream.m4 @@ -1,5 +1,5 @@ #serial 4 -dnl Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 68510c5c..d04aefbe 100644 --- a/m4/close.m4 +++ b/m4/close.m4 @@ -1,5 +1,5 @@ # close.m4 serial 8 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 d234a522..a4403b4a 100644 --- a/m4/closedir.m4 +++ b/m4/closedir.m4 @@ -1,5 +1,5 @@ # closedir.m4 serial 2 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 db7fb5a9..06ad36ce 100644 --- a/m4/closein.m4 +++ b/m4/closein.m4 @@ -1,5 +1,5 @@ # closein.m4 serial 2 -dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 2f0c87e8..26b16e3a 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-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 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/config-h.m4 b/m4/config-h.m4 index 52629960..d1ffbaeb 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 0cd86cf9..49d3a13e 100644 --- a/m4/configmake.m4 +++ b/m4/configmake.m4 @@ -1,5 +1,5 @@ # configmake.m4 serial 2 -dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 150383b7..e28975f5 100644 --- a/m4/ctype.m4 +++ b/m4/ctype.m4 @@ -1,5 +1,5 @@ # ctype_h.m4 serial 6 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/cycle-check.m4 b/m4/cycle-check.m4 index 62d08ee3..6c6070e0 100644 --- a/m4/cycle-check.m4 +++ b/m4/cycle-check.m4 @@ -1,5 +1,5 @@ #serial 7 -dnl Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/d-ino.m4 b/m4/d-ino.m4 index 5ccb733c..aa9b2437 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-2014 Free Software +# Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009-2015 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 0190d73b..92bb2ffd 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-2014 Free Software Foundation, Inc. +# Copyright (C) 1997, 1999-2004, 2006, 2009-2015 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 0a197fbc..20095750 100644 --- a/m4/dirent-safer.m4 +++ b/m4/dirent-safer.m4 @@ -1,5 +1,5 @@ #serial 2 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 3f2b16b1..7abd1d05 100644 --- a/m4/dirent_h.m4 +++ b/m4/dirent_h.m4 @@ -1,5 +1,5 @@ # dirent_h.m4 serial 16 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 b4227694..ce56cff6 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2006, 2008-2015 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 d2627b8a..2a0be516 100644 --- a/m4/dirname.m4 +++ b/m4/dirname.m4 @@ -1,5 +1,5 @@ #serial 10 -*- autoconf -*- -dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 937f4bca..f307eb2f 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 9393bc52..b67e5b7f 100644 --- a/m4/dup.m4 +++ b/m4/dup.m4 @@ -1,5 +1,5 @@ # dup.m4 serial 3 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/dup2.m4 b/m4/dup2.m4 index 6498fc20..59028e09 100644 --- a/m4/dup2.m4 +++ b/m4/dup2.m4 @@ -1,5 +1,5 @@ -#serial 20 -dnl Copyright (C) 2002, 2005, 2007, 2009-2014 Free Software Foundation, Inc. +#serial 24 +dnl Copyright (C) 2002, 2005, 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free 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_FUNC_DUP2], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) - AC_CHECK_FUNCS_ONCE([getdtablesize]) m4_ifdef([gl_FUNC_DUP2_OBSOLETE], [ AC_CHECK_FUNCS_ONCE([dup2]) if test $ac_cv_func_dup2 = no; then @@ -20,38 +19,50 @@ AC_DEFUN([gl_FUNC_DUP2], if test $HAVE_DUP2 = 1; then AC_CACHE_CHECK([whether dup2 works], [gl_cv_func_dup2_works], [AC_RUN_IFELSE([ - AC_LANG_PROGRAM([[#include -#include -#include ]], - [int result = 0; -#ifdef HAVE_GETDTABLESIZE - int bad_fd = getdtablesize (); -#else - int bad_fd = 1000000; -#endif -#ifdef FD_CLOEXEC - if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1) - result |= 1; -#endif - if (dup2 (1, 1) == 0) - result |= 2; -#ifdef FD_CLOEXEC - if (fcntl (1, F_GETFD) != FD_CLOEXEC) - result |= 4; -#endif - close (0); - if (dup2 (0, 0) != -1) - result |= 8; - /* Many gnulib modules require POSIX conformance of EBADF. */ - if (dup2 (2, bad_fd) == -1 && errno != EBADF) - result |= 16; - /* Flush out some cygwin core dumps. */ - if (dup2 (2, -1) != -1 || errno != EBADF) - result |= 32; - dup2 (2, 255); - dup2 (2, 256); - return result; - ]) + AC_LANG_PROGRAM( + [[#include + #include + #include + #include + #include + #ifndef RLIM_SAVED_CUR + # define RLIM_SAVED_CUR RLIM_INFINITY + #endif + #ifndef RLIM_SAVED_MAX + # define RLIM_SAVED_MAX RLIM_INFINITY + #endif + ]], + [[int result = 0; + int bad_fd = INT_MAX; + struct rlimit rlim; + if (getrlimit (RLIMIT_NOFILE, &rlim) == 0 + && 0 <= rlim.rlim_cur && rlim.rlim_cur <= INT_MAX + && rlim.rlim_cur != RLIM_INFINITY + && rlim.rlim_cur != RLIM_SAVED_MAX + && rlim.rlim_cur != RLIM_SAVED_CUR) + bad_fd = rlim.rlim_cur; + #ifdef FD_CLOEXEC + if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1) + result |= 1; + #endif + if (dup2 (1, 1) != 1) + result |= 2; + #ifdef FD_CLOEXEC + if (fcntl (1, F_GETFD) != FD_CLOEXEC) + result |= 4; + #endif + close (0); + if (dup2 (0, 0) != -1) + result |= 8; + /* Many gnulib modules require POSIX conformance of EBADF. */ + if (dup2 (2, bad_fd) == -1 && errno != EBADF) + result |= 16; + /* Flush out some cygwin core dumps. */ + if (dup2 (2, -1) != -1 || errno != EBADF) + result |= 32; + dup2 (2, 255); + dup2 (2, 256); + return result;]]) ], [gl_cv_func_dup2_works=yes], [gl_cv_func_dup2_works=no], [case "$host_os" in @@ -59,15 +70,14 @@ AC_DEFUN([gl_FUNC_DUP2], gl_cv_func_dup2_works="guessing no" ;; cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0 gl_cv_func_dup2_works="guessing no" ;; - linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a - # closed fd may yield -EBADF instead of -1 / errno=EBADF. - gl_cv_func_dup2_works="guessing no" ;; aix* | freebsd*) # on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE, # not EBADF. gl_cv_func_dup2_works="guessing no" ;; haiku*) # on Haiku alpha 2, dup2(1, 1) resets FD_CLOEXEC. gl_cv_func_dup2_works="guessing no" ;; + *-android*) # implemented using dup3(), which fails if oldfd == newfd + gl_cv_func_dup2_works="guessing no" ;; *) gl_cv_func_dup2_works="guessing yes" ;; esac]) ]) diff --git a/m4/eealloc.m4 b/m4/eealloc.m4 index 8a51fe7c..322bdd50 100644 --- a/m4/eealloc.m4 +++ b/m4/eealloc.m4 @@ -1,5 +1,5 @@ # eealloc.m4 serial 3 -dnl Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/environ.m4 b/m4/environ.m4 index cfabe46f..4dbf9473 100644 --- a/m4/environ.m4 +++ b/m4/environ.m4 @@ -1,5 +1,5 @@ # environ.m4 serial 6 -dnl Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 4ee9e6a1..cfaa6876 100644 --- a/m4/errno_h.m4 +++ b/m4/errno_h.m4 @@ -1,5 +1,5 @@ # errno_h.m4 serial 12 -dnl Copyright (C) 2004, 2006, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/error.m4 b/m4/error.m4 index f08ae50f..b3bd7f6c 100644 --- a/m4/error.m4 +++ b/m4/error.m4 @@ -1,6 +1,6 @@ #serial 14 -# Copyright (C) 1996-1998, 2001-2004, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-1998, 2001-2004, 2009-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/euidaccess.m4 b/m4/euidaccess.m4 index 55393a45..e23e9c31 100644 --- a/m4/euidaccess.m4 +++ b/m4/euidaccess.m4 @@ -1,5 +1,5 @@ # euidaccess.m4 serial 15 -dnl Copyright (C) 2002-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/exponentd.m4 b/m4/exponentd.m4 index 7bee6357..84f1691a 100644 --- a/m4/exponentd.m4 +++ b/m4/exponentd.m4 @@ -1,5 +1,5 @@ # exponentd.m4 serial 3 -dnl Copyright (C) 2007-2008, 2010-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2008, 2010-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 b2dfeef9..95e32cdd 100644 --- a/m4/exponentf.m4 +++ b/m4/exponentf.m4 @@ -1,5 +1,5 @@ # exponentf.m4 serial 2 -dnl Copyright (C) 2007-2008, 2010-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2008, 2010-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 d6f4ba7f..6b95e737 100644 --- a/m4/exponentl.m4 +++ b/m4/exponentl.m4 @@ -1,5 +1,5 @@ # exponentl.m4 serial 3 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 37f55ca3..35bc49c9 100644 --- a/m4/extensions.m4 +++ b/m4/extensions.m4 @@ -1,7 +1,7 @@ # serial 13 -*- Autoconf -*- # Enable extensions on systems that normally disable them. -# Copyright (C) 2003, 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006-2015 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. @@ -68,6 +68,10 @@ dnl configure.ac when using autoheader 2.62. #ifndef _GNU_SOURCE # undef _GNU_SOURCE #endif +/* Use GNU style printf and scanf. */ +#ifndef __USE_MINGW_ANSI_STDIO +# undef __USE_MINGW_ANSI_STDIO +#endif /* Enable threading extensions on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS @@ -100,6 +104,7 @@ dnl configure.ac when using autoheader 2.62. AC_DEFINE([_ALL_SOURCE]) AC_DEFINE([_DARWIN_C_SOURCE]) AC_DEFINE([_GNU_SOURCE]) + AC_DEFINE([__USE_MINGW_ANSI_STDIO]) AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) AC_DEFINE([_TANDEM_SOURCE]) AC_CACHE_CHECK([whether _XOPEN_SOURCE should be defined], diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index 240150ef..72800650 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -1,6 +1,6 @@ dnl 'extern inline' a la ISO C99. -dnl Copyright 2012-2014 Free Software Foundation, Inc. +dnl Copyright 2012-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -19,13 +19,28 @@ AC_DEFUN([gl_EXTERN_INLINE], 'reference to static identifier "f" in extern inline function'. This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16. - Suppress the use of extern inline on problematic Apple configurations. - OS X 10.8 and earlier mishandle it; see, e.g., - . + Suppress extern inline (with or without __attribute__ ((__gnu_inline__))) + on configurations that mistakenly use 'static inline' to implement + functions or macros in standard C headers like . For example, + if isdigit is mistakenly implemented via a static inline function, + a program containing an extern inline function that calls isdigit + may not work since the C standard prohibits extern inline functions + from calling static functions. This bug is known to occur on: + + OS X 10.8 and earlier; see: + http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html + + DragonFly; see + http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log + + FreeBSD; see: + http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html + OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and for clang but remains for g++; see . - Perhaps Apple will fix this some day. */ -#if (defined __APPLE__ \ + Assume DragonFly and FreeBSD will be similar. */ +#if (((defined __APPLE__ && defined __MACH__) \ + || defined __DragonFly__ || defined __FreeBSD__) \ && (defined __header_inline \ ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ && ! defined __clang__) \ @@ -33,19 +48,19 @@ AC_DEFUN([gl_EXTERN_INLINE], && (defined __GNUC__ || defined __cplusplus)) \ || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ && defined __GNUC__ && ! defined __cplusplus)))) -# define _GL_EXTERN_INLINE_APPLE_BUG +# define _GL_EXTERN_INLINE_STDHEADER_BUG #endif #if ((__GNUC__ \ ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ : (199901L <= __STDC_VERSION__ \ && !defined __HP_cc \ && !(defined __SUNPRO_C && __STDC__))) \ - && !defined _GL_EXTERN_INLINE_APPLE_BUG) + && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) # define _GL_INLINE inline # define _GL_EXTERN_INLINE extern inline # define _GL_EXTERN_INLINE_IN_USE #elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ - && !defined _GL_EXTERN_INLINE_APPLE_BUG) + && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) # if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) @@ -59,17 +74,19 @@ AC_DEFUN([gl_EXTERN_INLINE], # define _GL_EXTERN_INLINE static _GL_UNUSED #endif -#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) +/* In GCC 4.6 (inclusive) to 5.1 (exclusive), + suppress bogus "no previous prototype for 'FOO'" + and "no previous declaration for 'FOO'" diagnostics, + when FOO is an inline function in the header; see + and + . */ +#if __GNUC__ == 4 && 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 - /* Suppress GCC's bogus "no previous prototype for 'FOO'" - and "no previous declaration for 'FOO'" diagnostics, - when FOO is an inline function in the header; see - . */ # define _GL_INLINE_HEADER_BEGIN \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ diff --git a/m4/faccessat.m4 b/m4/faccessat.m4 index d9016bdf..941cb02d 100644 --- a/m4/faccessat.m4 +++ b/m4/faccessat.m4 @@ -1,7 +1,7 @@ # serial 6 # See if we need to provide faccessat replacement. -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fchdir.m4 b/m4/fchdir.m4 index 9da16b03..3d2d97bd 100644 --- a/m4/fchdir.m4 +++ b/m4/fchdir.m4 @@ -1,5 +1,5 @@ # fchdir.m4 serial 21 -dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 28954c4e..b64ff5fd 100644 --- a/m4/fchmodat.m4 +++ b/m4/fchmodat.m4 @@ -1,5 +1,5 @@ # fchmodat.m4 serial 1 -dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 479b277a..f55d2d5f 100644 --- a/m4/fchownat.m4 +++ b/m4/fchownat.m4 @@ -1,5 +1,5 @@ # fchownat.m4 serial 1 -dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 10260183..6bd1ad8a 100644 --- a/m4/fclose.m4 +++ b/m4/fclose.m4 @@ -1,5 +1,5 @@ # fclose.m4 serial 6 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 43c93124..891a62fb 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fcntl-safer.m4 b/m4/fcntl-safer.m4 index 2179ddea..6bb54a9d 100644 --- a/m4/fcntl-safer.m4 +++ b/m4/fcntl-safer.m4 @@ -1,5 +1,5 @@ #serial 9 -dnl Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 f824beb6..76dd8671 100644 --- a/m4/fcntl.m4 +++ b/m4/fcntl.m4 @@ -1,5 +1,5 @@ -# fcntl.m4 serial 5 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +# fcntl.m4 serial 8 +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -19,7 +19,7 @@ AC_DEFUN([gl_FUNC_FCNTL], AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) - AC_CHECK_FUNCS_ONCE([fcntl getdtablesize]) + AC_CHECK_FUNCS_ONCE([fcntl]) if test $ac_cv_func_fcntl = no; then gl_REPLACE_FCNTL else @@ -27,30 +27,40 @@ AC_DEFUN([gl_FUNC_FCNTL], dnl haiku alpha 2 F_DUPFD has wrong errno AC_CACHE_CHECK([whether fcntl handles F_DUPFD correctly], [gl_cv_func_fcntl_f_dupfd_works], - [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -#ifdef HAVE_GETDTABLESIZE -# include -#endif -#include -#include -]], [[int result = 0; -#ifdef HAVE_GETDTABLESIZE - int bad_fd = getdtablesize (); -#else - int bad_fd = 1000000; -#endif - if (fcntl (0, F_DUPFD, -1) != -1) result |= 1; - if (errno != EINVAL) result |= 2; - if (fcntl (0, F_DUPFD, bad_fd) != -1) result |= 4; - if (errno != EINVAL) result |= 8; - return result; - ]])], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #include + #include + #include + #include + #ifndef RLIM_SAVED_CUR + # define RLIM_SAVED_CUR RLIM_INFINITY + #endif + #ifndef RLIM_SAVED_MAX + # define RLIM_SAVED_MAX RLIM_INFINITY + #endif + ]], + [[int result = 0; + int bad_fd = INT_MAX; + struct rlimit rlim; + if (getrlimit (RLIMIT_NOFILE, &rlim) == 0 + && 0 <= rlim.rlim_cur && rlim.rlim_cur <= INT_MAX + && rlim.rlim_cur != RLIM_INFINITY + && rlim.rlim_cur != RLIM_SAVED_MAX + && rlim.rlim_cur != RLIM_SAVED_CUR) + bad_fd = rlim.rlim_cur; + if (fcntl (0, F_DUPFD, -1) != -1) result |= 1; + if (errno != EINVAL) result |= 2; + if (fcntl (0, F_DUPFD, bad_fd) != -1) result |= 4; + if (errno != EINVAL) result |= 8; + return result;]])], [gl_cv_func_fcntl_f_dupfd_works=yes], [gl_cv_func_fcntl_f_dupfd_works=no], - [# Guess that it works on glibc systems - case $host_os in #(( - *-gnu*) gl_cv_func_fcntl_f_dupfd_works="guessing yes";; - *) gl_cv_func_fcntl_f_dupfd_works="guessing no";; + [case $host_os in + aix* | cygwin* | haiku*) + gl_cv_func_fcntl_f_dupfd_works="guessing no" ;; + *) gl_cv_func_fcntl_f_dupfd_works="guessing yes" ;; esac])]) case $gl_cv_func_fcntl_f_dupfd_works in *yes) ;; diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 index fb2556d3..b279162a 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fdatasync.m4 b/m4/fdatasync.m4 index 4fea09f0..35b09a84 100644 --- a/m4/fdatasync.m4 +++ b/m4/fdatasync.m4 @@ -1,5 +1,5 @@ # fdatasync.m4 serial 4 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fdopen.m4 b/m4/fdopen.m4 index 4cf8f359..8c57b993 100644 --- a/m4/fdopen.m4 +++ b/m4/fdopen.m4 @@ -1,5 +1,5 @@ # fdopen.m4 serial 3 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4 index a3e7849b..317eac94 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 d8069c91..ef3d443b 100644 --- a/m4/fflush.m4 +++ b/m4/fflush.m4 @@ -1,6 +1,6 @@ # fflush.m4 serial 15 -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 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/fileblocks.m4 b/m4/fileblocks.m4 index 2ec23e7d..be356ff9 100644 --- a/m4/fileblocks.m4 +++ b/m4/fileblocks.m4 @@ -1,5 +1,5 @@ # fileblocks.m4 serial 6 -dnl Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 0b9e3566..e2a195c0 100644 --- a/m4/filemode.m4 +++ b/m4/filemode.m4 @@ -1,5 +1,5 @@ # filemode.m4 serial 8 -dnl Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 6c6656aa..bedb58d3 100644 --- a/m4/filenamecat.m4 +++ b/m4/filenamecat.m4 @@ -1,5 +1,5 @@ # filenamecat.m4 serial 11 -dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 b1385504..95500caf 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009-2015 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 a27ef7f9..e4853f3b 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 9db4144b..c33792fe 100644 --- a/m4/fnmatch.m4 +++ b/m4/fnmatch.m4 @@ -1,6 +1,6 @@ # Check for fnmatch - serial 9. -# Copyright (C) 2000-2007, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2007, 2009-2015 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 7b26c783..baec65e6 100644 --- a/m4/fopen.m4 +++ b/m4/fopen.m4 @@ -1,5 +1,5 @@ # fopen.m4 serial 9 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fpending.m4 b/m4/fpending.m4 index c2d01ef0..4781db12 100644 --- a/m4/fpending.m4 +++ b/m4/fpending.m4 @@ -1,6 +1,6 @@ # serial 21 -# Copyright (C) 2000-2001, 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2004-2015 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 729afe85..a4e48997 100644 --- a/m4/fpieee.m4 +++ b/m4/fpieee.m4 @@ -1,5 +1,5 @@ # fpieee.m4 serial 2 -dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 ee017d20..4b68a189 100644 --- a/m4/fpurge.m4 +++ b/m4/fpurge.m4 @@ -1,5 +1,5 @@ # fpurge.m4 serial 7 -dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/freadahead.m4 b/m4/freadahead.m4 index 95b41412..4d8e8369 100644 --- a/m4/freadahead.m4 +++ b/m4/freadahead.m4 @@ -1,5 +1,5 @@ # freadahead.m4 serial 1 -dnl Copyright (C) 2012-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/freading.m4 b/m4/freading.m4 index 836f4d73..f1271553 100644 --- a/m4/freading.m4 +++ b/m4/freading.m4 @@ -1,5 +1,5 @@ # freading.m4 serial 1 -dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/freadptr.m4 b/m4/freadptr.m4 index f1f4619d..795561b3 100644 --- a/m4/freadptr.m4 +++ b/m4/freadptr.m4 @@ -1,5 +1,5 @@ # freadptr.m4 serial 1 -dnl Copyright (C) 2012-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/freadseek.m4 b/m4/freadseek.m4 index 83a0a415..b3e34e3a 100644 --- a/m4/freadseek.m4 +++ b/m4/freadseek.m4 @@ -1,5 +1,5 @@ # freadseek.m4 serial 2 -dnl Copyright (C) 2012-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/freopen.m4 b/m4/freopen.m4 index 69e4523c..18a2d502 100644 --- a/m4/freopen.m4 +++ b/m4/freopen.m4 @@ -1,5 +1,5 @@ -# freopen.m4 serial 4 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +# freopen.m4 serial 5 +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_FREOPEN], AC_REQUIRE([gl_STDIO_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) case "$host_os" in - mingw* | pw*) + mingw* | pw* | os2*) REPLACE_FREOPEN=1 ;; esac diff --git a/m4/frexp.m4 b/m4/frexp.m4 index 57982621..04f40679 100644 --- a/m4/frexp.m4 +++ b/m4/frexp.m4 @@ -1,5 +1,5 @@ # frexp.m4 serial 15 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/frexpl.m4 b/m4/frexpl.m4 index e2722910..cd3ac6e5 100644 --- a/m4/frexpl.m4 +++ b/m4/frexpl.m4 @@ -1,5 +1,5 @@ # frexpl.m4 serial 20 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fseek.m4 b/m4/fseek.m4 index a5ea41d0..fb29688a 100644 --- a/m4/fseek.m4 +++ b/m4/fseek.m4 @@ -1,5 +1,5 @@ # fseek.m4 serial 4 -dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 4ccb57d0..84555e2c 100644 --- a/m4/fseeko.m4 +++ b/m4/fseeko.m4 @@ -1,5 +1,5 @@ # fseeko.m4 serial 17 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 index b676fe0b..f687ef5b 100644 --- a/m4/fseterr.m4 +++ b/m4/fseterr.m4 @@ -1,5 +1,5 @@ # fseterr.m4 serial 1 -dnl Copyright (C) 2012-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fstat.m4 b/m4/fstat.m4 index ddd3fb97..d6a92882 100644 --- a/m4/fstat.m4 +++ b/m4/fstat.m4 @@ -1,5 +1,5 @@ # fstat.m4 serial 4 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fstatat.m4 b/m4/fstatat.m4 index 548eb7b8..e5f9f900 100644 --- a/m4/fstatat.m4 +++ b/m4/fstatat.m4 @@ -1,5 +1,5 @@ # fstatat.m4 serial 3 -dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 d90e0069..d787cf2f 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-2014 Free Software +# Copyright (C) 1998-1999, 2001, 2004, 2006, 2009-2015 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 5203bbc6..2837dff2 100644 --- a/m4/fsusage.m4 +++ b/m4/fsusage.m4 @@ -1,7 +1,7 @@ # serial 30 # Obtaining file system usage information. -# Copyright (C) 1997-1998, 2000-2001, 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-1998, 2000-2001, 2003-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/fsync.m4 b/m4/fsync.m4 index 888a65de..bc2b0935 100644 --- a/m4/fsync.m4 +++ b/m4/fsync.m4 @@ -1,5 +1,5 @@ # fsync.m4 serial 2 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 b99e76d9..77989192 100644 --- a/m4/ftell.m4 +++ b/m4/ftell.m4 @@ -1,5 +1,5 @@ # ftell.m4 serial 3 -dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 14a9beee..3825cf2d 100644 --- a/m4/ftello.m4 +++ b/m4/ftello.m4 @@ -1,5 +1,5 @@ # ftello.m4 serial 11 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 29c76ccf..758706c3 100644 --- a/m4/ftruncate.m4 +++ b/m4/ftruncate.m4 @@ -2,7 +2,7 @@ # See if we need to emulate a missing ftruncate function using chsize. -# Copyright (C) 2000-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2015 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/fts.m4 b/m4/fts.m4 index 80acc2cf..7302f35d 100644 --- a/m4/fts.m4 +++ b/m4/fts.m4 @@ -1,5 +1,5 @@ #serial 20 -dnl Copyright (C) 2005-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/futimens.m4 b/m4/futimens.m4 index 39798137..b2f4da02 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 2e665848..f3e40c47 100644 --- a/m4/getaddrinfo.m4 +++ b/m4/getaddrinfo.m4 @@ -1,5 +1,5 @@ # getaddrinfo.m4 serial 30 -dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4 index de69622f..1a023ccb 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009-2015 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-path-max.m4 b/m4/getcwd-path-max.m4 index 6b49f1ab..4630a591 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2007, 2009-2015 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. @@ -122,6 +122,8 @@ main () if (PATH_MAX <= cwd_len && cwd_len < PATH_MAX + DIR_NAME_SIZE) { + struct stat sb; + c = getcwd (buf, PATH_MAX); if (!c && errno == ENOENT) { @@ -138,6 +140,16 @@ main () fail = 21; break; } + + /* Our replacement needs to be able to stat() long ../../paths, + so generate a path larger than PATH_MAX to check, + avoiding the replacement if we can't stat(). */ + c = getcwd (buf, cwd_len + 1); + if (c && !AT_FDCWD && stat (c, &sb) != 0 && is_ENAMETOOLONG (errno)) + { + fail = 32; + break; + } } if (dotdot_max <= cwd_len - initial_cwd_len) @@ -194,6 +206,7 @@ main () [case $? in 10|11|12) gl_cv_func_getcwd_path_max='no, but it is partly working';; 31) gl_cv_func_getcwd_path_max='no, it has the AIX bug';; + 32) gl_cv_func_getcwd_path_max='yes, but with shorter paths';; *) gl_cv_func_getcwd_path_max=no;; esac], [case "$host_os" in diff --git a/m4/getcwd.m4 b/m4/getcwd.m4 index fc986cda..b9fbcec2 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2007, 2009-2015 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. @@ -136,11 +136,16 @@ AC_DEFUN([gl_FUNC_GETCWD], [Define to 1 if getcwd works, except it sometimes fails when it shouldn't, setting errno to ERANGE, ENAMETOOLONG, or ENOENT.]) ;; + "yes, but with shorter paths") + AC_DEFINE([HAVE_GETCWD_SHORTER], [1], + [Define to 1 if getcwd works, but with shorter paths + than is generally tested with the replacement.]) + ;; esac if { case "$gl_cv_func_getcwd_null" in *yes) false;; *) true;; esac; } \ || test $gl_cv_func_getcwd_posix_signature != yes \ - || test "$gl_cv_func_getcwd_path_max" != yes \ + || { case "$gl_cv_func_getcwd_path_max" in *yes*) false;; *) true;; esac; } \ || test $gl_abort_bug = yes; then REPLACE_GETCWD=1 fi diff --git a/m4/getdelim.m4 b/m4/getdelim.m4 index c7639941..af9b1faa 100644 --- a/m4/getdelim.m4 +++ b/m4/getdelim.m4 @@ -1,6 +1,6 @@ # getdelim.m4 serial 10 -dnl Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2015 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 aa523b63..25e99689 100644 --- a/m4/getdtablesize.m4 +++ b/m4/getdtablesize.m4 @@ -1,5 +1,5 @@ -# getdtablesize.m4 serial 5 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +# getdtablesize.m4 serial 6 +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free 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,9 @@ AC_DEFUN([gl_FUNC_GETDTABLESIZE], AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) AC_CHECK_FUNCS_ONCE([getdtablesize]) - if test $ac_cv_func_getdtablesize = yes; then + AC_CHECK_DECLS_ONCE([getdtablesize]) + if test $ac_cv_func_getdtablesize = yes && + test $ac_cv_have_decl_getdtablesize = yes; then # Cygwin 1.7.25 automatically increases the RLIMIT_NOFILE soft limit # up to an unchangeable hard limit; all other platforms correctly # require setrlimit before getdtablesize() can report a larger value. diff --git a/m4/getgroups.m4 b/m4/getgroups.m4 index f05357d5..16e72c7b 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-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-1997, 1999-2004, 2008-2015 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 d759ab13..07216973 100644 --- a/m4/gethostname.m4 +++ b/m4/gethostname.m4 @@ -1,5 +1,5 @@ # gethostname.m4 serial 13 -dnl Copyright (C) 2002, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 5ce9a912..4f8ca4ba 100644 --- a/m4/gethrxtime.m4 +++ b/m4/gethrxtime.m4 @@ -1,5 +1,5 @@ # gethrxtime.m4 serial 12 -dnl Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/getline.m4 b/m4/getline.m4 index 0330666b..a35f3a29 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-2014 Free Software Foundation, +dnl Copyright (C) 1998-2003, 2005-2007, 2009-2015 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 d7448048..1234ba9f 100644 --- a/m4/getloadavg.m4 +++ b/m4/getloadavg.m4 @@ -1,6 +1,6 @@ # Check for getloadavg. -# Copyright (C) 1992-1996, 1999-2000, 2002-2003, 2006, 2008-2014 Free Software +# Copyright (C) 1992-1996, 1999-2000, 2002-2003, 2006, 2008-2015 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation diff --git a/m4/getlogin.m4 b/m4/getlogin.m4 index 47b8f089..0db7d51b 100644 --- a/m4/getlogin.m4 +++ b/m4/getlogin.m4 @@ -1,5 +1,5 @@ # getlogin.m4 serial 3 -dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 2358ca62..23dbaaac 100644 --- a/m4/getndelim2.m4 +++ b/m4/getndelim2.m4 @@ -1,5 +1,5 @@ # getndelim2.m4 serial 8 -dnl Copyright (C) 2003, 2006, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 f127028f..e76e501f 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,5 +1,5 @@ # getopt.m4 serial 44 -dnl Copyright (C) 2002-2006, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/getpagesize.m4 b/m4/getpagesize.m4 index ce506952..7057a21d 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-2014 Free Software Foundation, +dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2015 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 cf545a6d..30437ef0 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-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 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/gettime.m4 b/m4/gettime.m4 index c5ec2643..cd499ff5 100644 --- a/m4/gettime.m4 +++ b/m4/gettime.m4 @@ -1,5 +1,5 @@ # gettime.m4 serial 8 -dnl Copyright (C) 2002, 2004-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 1c2d66ee..ce246e18 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,6 +1,6 @@ # serial 21 -# Copyright (C) 2001-2003, 2005, 2007, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2003, 2005, 2007, 2009-2015 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 8dff39ad..8fc81939 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-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 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 e5197c8d..c0335f6e 100644 --- a/m4/getusershell.m4 +++ b/m4/getusershell.m4 @@ -1,5 +1,5 @@ # getusershell.m4 serial 7 -dnl Copyright (C) 2002-2003, 2006, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/gl-openssl.m4 b/m4/gl-openssl.m4 index 6d664121..41d4307b 100644 --- a/m4/gl-openssl.m4 +++ b/m4/gl-openssl.m4 @@ -1,5 +1,5 @@ # gl-openssl.m4 serial 3 -dnl Copyright (C) 2013-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2013-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 ab58b712..3a971c5a 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-2014 Free Software Foundation, +dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2015 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 5a9ce3f9..55029c33 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 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/gnu-make.m4 b/m4/gnu-make.m4 index 6e4b1433..dc106ff9 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2015 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 35f61952..40e82f6e 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,5 +1,5 @@ -# gnulib-common.m4 serial 35 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +# gnulib-common.m4 serial 36 +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -278,12 +278,12 @@ Amsterdam dnl but prefer ${host}-ar over ar (useful for cross-compiling). AC_CHECK_TOOL([AR], [ar], [ar]) if test -z "$ARFLAGS"; then - ARFLAGS='cru' + ARFLAGS='cr' fi fi else if test -z "$ARFLAGS"; then - ARFLAGS='cru' + ARFLAGS='cr' fi fi AC_SUBST([AR]) @@ -319,26 +319,28 @@ m4_ifdef([AC_PROG_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. -# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness. -m4_ifndef([AC_AUTOCONF_VERSION],[ +# This definition is copied from post-2.69 Autoconf and overrides the +# AC_C_RESTRICT macro from autoconf 2.60..2.69. It can be removed +# once autoconf >= 2.70 can be assumed. It's painful to check version +# numbers, and in practice this macro is more up-to-date than Autoconf +# is, so override Autoconf unconditionally. AC_DEFUN([AC_C_RESTRICT], [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict], [ac_cv_c_restrict=no # The order here caters to the fact that C++ does not require restrict. for ac_kw in __restrict __restrict__ _Restrict restrict; do - AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[typedef int * int_ptr; - int foo (int_ptr $ac_kw ip) { - return ip[0]; - }]], - [[int s[1]; - int * $ac_kw t = s; - t[0] = 0; - return foo(t)]])], + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[typedef int *int_ptr; + int foo (int_ptr $ac_kw ip) { return ip[0]; } + int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ + int bar (int ip[$ac_kw]) { return ip[0]; } + ]], + [[int s[1]; + int *$ac_kw t = s; + t[0] = 0; + return foo (t) + bar (t); + ]])], [ac_cv_c_restrict=$ac_kw]) test "$ac_cv_c_restrict" != no && break done @@ -348,21 +350,21 @@ AC_DEFUN([AC_C_RESTRICT], nothing if this is not supported. Do not define if restrict is supported directly. */ #undef restrict -/* Work around a bug in Sun C++: it does not support _Restrict, even - though the corresponding Sun C compiler does, which causes - "#define restrict _Restrict" in the previous line. Perhaps some future - version of Sun C++ will work with _Restrict; if so, it'll probably - define __RESTRICT, just as Sun C does. */ +/* Work around a bug in Sun C++: it does not support _Restrict or + __restrict__, even though the corresponding Sun C compiler ends up with + "#define restrict _Restrict" or "#define restrict __restrict__" in the + previous line. Perhaps some future version of Sun C++ will work with + restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ #if defined __SUNPRO_CC && !defined __RESTRICT # define _Restrict +# define __restrict__ #endif]) case $ac_cv_c_restrict in restrict) ;; no) AC_DEFINE([restrict], []) ;; *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;; esac -]) -]) +])# AC_C_RESTRICT # gl_BIGENDIAN # is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd. diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 1989f9f6..9d90223b 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -1,5 +1,5 @@ # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 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 @@ -43,6 +43,7 @@ AC_DEFUN([gl_EARLY], # Code from module accept: # Code from module accept-tests: # Code from module acl: + # Code from module acl-permissions: # Code from module acl-tests: # Code from module alignof: # Code from module alignof-tests: @@ -63,7 +64,10 @@ AC_DEFUN([gl_EARLY], # Code from module argv-iter-tests: # Code from module arpa_inet: # Code from module arpa_inet-tests: + # Code from module array-list: + # Code from module array-list-tests: # Code from module assert: + # Code from module assure: # Code from module at-internal: # Code from module autobuild: AB_INIT @@ -190,6 +194,8 @@ AC_DEFUN([gl_EARLY], AC_REQUIRE([AC_FUNC_FSEEKO]) # Code from module fflush-tests: # Code from module fgetc-tests: + # Code from module file-has-acl: + # Code from module file-has-acl-tests: # Code from module file-set: # Code from module file-type: # Code from module fileblocks: @@ -373,6 +379,9 @@ AC_DEFUN([gl_EARLY], # Code from module link-tests: # Code from module linkat: # Code from module linkat-tests: + # Code from module linked-list: + # Code from module linked-list-tests: + # Code from module list: # Code from module listen: # Code from module listen-tests: # Code from module localcharset: @@ -494,7 +503,8 @@ AC_DEFUN([gl_EARLY], AC_DEFINE([_REENTRANT], 1, [For thread-safety on OSF/1, Solaris.]) AC_DEFINE([_THREAD_SAFE], 1, [For thread-safety on AIX, FreeBSD.]) # Code from module putenv: - # Code from module qacl: + # Code from module qcopy-acl: + # Code from module qset-acl: # Code from module quote: # Code from module quotearg: # Code from module quotearg-simple: @@ -763,11 +773,13 @@ AC_DEFUN([gl_EARLY], # Code from module xalloc-die: # Code from module xalloc-die-tests: # Code from module xalloc-oversized: + # Code from module xdectoint: # Code from module xfreopen: # Code from module xfts: # Code from module xgetcwd: # Code from module xgetgroups: # Code from module xgethostname: + # Code from module xlist: # Code from module xmemcoll: # Code from module xnanosleep: # Code from module xprintf: @@ -808,6 +820,7 @@ 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 @@ -985,6 +998,7 @@ AC_DEFUN([gl_INIT], fi gl_MODULE_INDICATOR([fflush]) gl_STDIO_MODULE_INDICATOR([fflush]) + gl_FILE_HAS_ACL gl_FILEBLOCKS if test $ac_cv_member_struct_stat_st_blocks = no; then AC_LIBOBJ([fileblocks]) @@ -1332,8 +1346,6 @@ AC_DEFUN([gl_INIT], 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]) @@ -1550,7 +1562,6 @@ AC_DEFUN([gl_INIT], gl_PREREQ_PUTENV fi gl_STDLIB_MODULE_INDICATOR([putenv]) - gl_FUNC_ACL gl_QUOTE gl_QUOTEARG gl_FUNC_RAISE @@ -1578,7 +1589,7 @@ AC_DEFUN([gl_INIT], fi gl_UNISTD_MODULE_INDICATOR([readlink]) gl_FUNC_READLINKAT - if test $HAVE_READLINKAT = 0; then + if test $HAVE_READLINKAT = 0 || test $REPLACE_READLINKAT = 1; then AC_LIBOBJ([readlinkat]) fi gl_UNISTD_MODULE_INDICATOR([readlinkat]) @@ -1709,8 +1720,8 @@ AC_DEFUN([gl_INIT], gl_FUNC_SNPRINTF gl_STDIO_MODULE_INDICATOR([snprintf]) gl_MODULE_INDICATOR([snprintf]) - gl_SOCKETLIB - gl_SOCKETS + AC_REQUIRE([gl_SOCKETLIB]) + AC_REQUIRE([gl_SOCKETS]) gl_TYPE_SOCKLEN_T gt_TYPE_SSIZE_T gl_FUNC_STAT @@ -1841,7 +1852,7 @@ AC_DEFUN([gl_INIT], AC_PROG_MKDIR_P gl_HEADER_SYS_SELECT AC_PROG_MKDIR_P - gl_HEADER_SYS_SOCKET + AC_REQUIRE([gl_HEADER_SYS_SOCKET]) AC_PROG_MKDIR_P gl_HEADER_SYS_STAT_H AC_PROG_MKDIR_P @@ -1878,14 +1889,14 @@ AC_DEFUN([gl_INIT], gl_UNICODEIO gl_UNISTD_H gl_UNISTD_SAFER - gl_LIBUNISTRING_LIBHEADER([0.9.2], [unistr.h]) + gl_LIBUNISTRING_LIBHEADER([0.9.4], [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_LIBUNISTRING_LIBHEADER([0.9.4], [unitypes.h]) + gl_LIBUNISTRING_LIBHEADER([0.9.4], [uniwidth.h]) + gl_LIBUNISTRING_MODULE([0.9.6], [uniwidth/width]) gl_FUNC_UNLINK if test $REPLACE_UNLINK = 1; then AC_LIBOBJ([unlink]) @@ -2025,7 +2036,6 @@ changequote([, ])dnl 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]) @@ -2042,6 +2052,7 @@ changequote([, ])dnl fi gl_SYS_SOCKET_MODULE_INDICATOR([connect]) AC_CHECK_FUNCS_ONCE([getegid]) + AC_CHECK_DECLS_ONCE([alarm]) gl_FUNC_UNGETC_WORKS gl_FUNC_UNGETC_WORKS gl_FUNC_UNGETC_WORKS @@ -2168,7 +2179,7 @@ changequote([, ])dnl AC_CHECK_HEADERS_ONCE([sys/mman.h]) AC_CHECK_FUNCS_ONCE([mprotect]) gl_FUNC_SYMLINKAT - if test $HAVE_SYMLINKAT = 0; then + if test $HAVE_SYMLINKAT = 0 || test $REPLACE_SYMLINKAT = 1; then AC_LIBOBJ([symlinkat]) fi gl_UNISTD_MODULE_INDICATOR([symlinkat]) @@ -2312,8 +2323,10 @@ AC_DEFUN([gl_FILE_LIST], [ build-aux/vc-list-files doc/fdl.texi doc/gendocs_template + doc/gendocs_template_min doc/parse-datetime.texi lib/acl-errno-valid.c + lib/acl-internal.c lib/acl-internal.h lib/acl.h lib/acl_entries.c @@ -2334,6 +2347,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/arpa_inet.in.h lib/asnprintf.c lib/asprintf.c + lib/assure.h lib/at-func.c lib/at-func2.c lib/backupfile.c @@ -2500,6 +2514,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/full-write.h lib/futimens.c lib/gai_strerror.c + lib/get-permissions.c lib/getaddrinfo.c lib/getcwd-lgpl.c lib/getcwd.c @@ -2528,7 +2543,15 @@ AC_DEFUN([gl_FILE_LIST], [ lib/getugroups.c lib/getugroups.h lib/getusershell.c + lib/gl_anylinked_list1.h + lib/gl_anylinked_list2.h + lib/gl_linked_list.c + lib/gl_linked_list.h + lib/gl_list.c + lib/gl_list.h lib/gl_openssl.h + lib/gl_xlist.c + lib/gl_xlist.h lib/glthread/lock.c lib/glthread/lock.h lib/glthread/threadlib.c @@ -2775,6 +2798,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/selinux-at.c lib/selinux-at.h lib/set-acl.c + lib/set-permissions.c lib/setenv.c lib/settime.c lib/sha1.c @@ -2928,6 +2952,10 @@ AC_DEFUN([gl_FILE_LIST], [ lib/xalloc-oversized.h lib/xalloc.h lib/xasprintf.c + lib/xdectoimax.c + lib/xdectoint.c + lib/xdectoint.h + lib/xdectoumax.c lib/xfreopen.c lib/xfreopen.h lib/xfts.c @@ -3189,6 +3217,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/nocrash.m4 m4/non-recursive-gnulib-prefix-hack.m4 m4/nproc.m4 + m4/obstack.m4 m4/off_t.m4 m4/open.m4 m4/openat.m4 @@ -3379,6 +3408,7 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-argmatch.c tests/test-argv-iter.c tests/test-arpa_inet.c + tests/test-array_list.c tests/test-base64.c tests/test-binary-io.c tests/test-binary-io.sh @@ -3545,6 +3575,7 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-link.c tests/test-link.h tests/test-linkat.c + tests/test-linked_list.c tests/test-listen.c tests/test-locale.c tests/test-localeconv.c @@ -3768,6 +3799,8 @@ AC_DEFUN([gl_FILE_LIST], [ tests=lib/binary-io.h tests=lib/bind.c tests=lib/connect.c + tests=lib/gl_array_list.c + tests=lib/gl_array_list.h tests=lib/glthread/thread.c tests=lib/glthread/thread.h tests=lib/glthread/yield.h diff --git a/m4/group-member.m4 b/m4/group-member.m4 index 11d55d6c..526a67a8 100644 --- a/m4/group-member.m4 +++ b/m4/group-member.m4 @@ -1,6 +1,6 @@ # serial 14 -# Copyright (C) 1999-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2003-2007, 2009-2015 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 7aa90e03..a484f541 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 86318971..93843a97 100644 --- a/m4/host-os.m4 +++ b/m4/host-os.m4 @@ -1,6 +1,6 @@ # serial 9 -# Copyright (C) 2001, 2003-2004, 2006, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2004, 2006, 2009-2015 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 dd8fc070..6706d1f5 100644 --- a/m4/hostent.m4 +++ b/m4/hostent.m4 @@ -1,5 +1,5 @@ # hostent.m4 serial 2 -dnl Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 840b0d4f..f1ace92d 100644 --- a/m4/human.m4 +++ b/m4/human.m4 @@ -1,5 +1,5 @@ #serial 11 -dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 ac468411..15862617 100644 --- a/m4/i-ring.m4 +++ b/m4/i-ring.m4 @@ -1,5 +1,5 @@ # serial 2 -dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 4b29c5f2..4e373631 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -1,4 +1,4 @@ -# iconv.m4 serial 18 (gettext-0.18.2) +# iconv.m4 serial 19 (gettext-0.18.2) dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -72,27 +72,33 @@ AC_DEFUN([AM_ICONV_LINK], if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ + am_cv_func_iconv_works=no + for ac_iconv_const in '' 'const'; do + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[ #include #include -int main () -{ - int result = 0; + +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const +#endif + ]], + [[int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful returns. */ { iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); if (cd_utf8_to_88591 != (iconv_t)(-1)) { - static const char input[] = "\342\202\254"; /* EURO SIGN */ + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ char buf[10]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_utf8_to_88591, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) result |= 1; @@ -105,14 +111,14 @@ int main () iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); if (cd_ascii_to_88591 != (iconv_t)(-1)) { - static const char input[] = "\263"; + static ICONV_CONST char input[] = "\263"; char buf[10]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_ascii_to_88591, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) result |= 2; @@ -124,14 +130,14 @@ int main () iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); if (cd_88591_to_utf8 != (iconv_t)(-1)) { - static const char input[] = "\304"; + static ICONV_CONST char input[] = "\304"; static char buf[2] = { (char)0xDE, (char)0xAD }; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = 1; char *outptr = buf; size_t outbytesleft = 1; size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) result |= 4; @@ -144,14 +150,14 @@ int main () iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); if (cd_88591_to_utf8 != (iconv_t)(-1)) { - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; char buf[50]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if ((int)res > 0) result |= 8; @@ -171,17 +177,14 @@ int main () && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) result |= 16; return result; -}]])], - [am_cv_func_iconv_works=yes], - [am_cv_func_iconv_works=no], - [ -changequote(,)dnl - case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; - *) am_cv_func_iconv_works="guessing yes" ;; - esac -changequote([,])dnl - ]) +]])], + [am_cv_func_iconv_works=yes], , + [case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac]) + test "$am_cv_func_iconv_works" = no || break + done LIBS="$am_save_LIBS" ]) case "$am_cv_func_iconv_works" in diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4 index e992fa39..c6878faa 100644 --- a/m4/iconv_h.m4 +++ b/m4/iconv_h.m4 @@ -1,5 +1,5 @@ # iconv_h.m4 serial 8 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 e0bfd720..177fccba 100644 --- a/m4/iconv_open.m4 +++ b/m4/iconv_open.m4 @@ -1,5 +1,5 @@ # iconv_open.m4 serial 14 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 e168fdee..8aee826c 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-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 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 cb185db0..91aaf8ad 100644 --- a/m4/include-exclude-prog.m4 +++ b/m4/include-exclude-prog.m4 @@ -1,5 +1,5 @@ #serial 2 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 69ad3dbb..233d254e 100644 --- a/m4/include_next.m4 +++ b/m4/include_next.m4 @@ -1,5 +1,5 @@ # include_next.m4 serial 23 -dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 5b27759c..df2bc746 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 136ed24d..433faee0 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 c49957f8..dc7063e7 100644 --- a/m4/inline.m4 +++ b/m4/inline.m4 @@ -1,5 +1,5 @@ # inline.m4 serial 4 -dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4 index af5561e5..4bd8155c 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-2014 Free Software Foundation, +dnl Copyright (C) 1997-2004, 2006-2007, 2009-2015 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 c48e9deb..b1842900 100644 --- a/m4/inttostr.m4 +++ b/m4/inttostr.m4 @@ -1,5 +1,5 @@ #serial 8 -dnl Copyright (C) 2004-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 00251e1d..0884e71e 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2002, 2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 2f9317d9..4209ffd1 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,5 +1,5 @@ # inttypes.m4 serial 26 -dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 87be9cfb..d0b5f5d9 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 5a31a396..d37d5825 100644 --- a/m4/ioctl.m4 +++ b/m4/ioctl.m4 @@ -1,5 +1,5 @@ # ioctl.m4 serial 4 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 97295a37..796e6762 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2015 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 6fcf9317..00d82e42 100644 --- a/m4/isatty.m4 +++ b/m4/isatty.m4 @@ -1,5 +1,5 @@ # isatty.m4 serial 3 -dnl Copyright (C) 2012-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/isblank.m4 b/m4/isblank.m4 index 7aa858c9..2e2205cf 100644 --- a/m4/isblank.m4 +++ b/m4/isblank.m4 @@ -1,5 +1,5 @@ # isblank.m4 serial 3 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 36e4ea30..4d5c615b 100644 --- a/m4/isnand.m4 +++ b/m4/isnand.m4 @@ -1,5 +1,5 @@ # isnand.m4 serial 11 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 1f2717d5..09c3e5ed 100644 --- a/m4/isnanf.m4 +++ b/m4/isnanf.m4 @@ -1,5 +1,5 @@ # isnanf.m4 serial 14 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 98b2b69f..b86ca9ef 100644 --- a/m4/isnanl.m4 +++ b/m4/isnanl.m4 @@ -1,5 +1,5 @@ -# isnanl.m4 serial 17 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +# isnanl.m4 serial 19 +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -108,11 +108,8 @@ AC_DEFUN([gl_HAVE_ISNANL_IN_LIBM], ]) ]) -dnl Test whether isnanl() recognizes all numbers which are neither finite nor -dnl infinite. This test fails e.g. on NetBSD/i386 and on glibc/ia64. -dnl Also, the GCC >= 4.0 built-in __builtin_isnanl does not pass the tests -dnl - for pseudo-denormals on i686 and x86_64, -dnl - for pseudo-zeroes, unnormalized numbers, and pseudo-denormals on ia64. +dnl Test whether isnanl() recognizes all canonical numbers which are neither +dnl finite nor infinite. AC_DEFUN([gl_FUNC_ISNANL_WORKS], [ AC_REQUIRE([AC_PROG_CC]) @@ -177,7 +174,7 @@ int main () # ifdef WORDS_BIGENDIAN # define LDBL80_WORDS(exponent,manthi,mantlo) \ { ((unsigned int) (exponent) << 16) | ((unsigned int) (manthi) >> 16), \ - ((unsigned int) (manthi) << 16) | (unsigned int) (mantlo) >> 16), \ + ((unsigned int) (manthi) << 16) | ((unsigned int) (mantlo) >> 16), \ (unsigned int) (mantlo) << 16 \ } # else @@ -197,41 +194,35 @@ int main () if (!isnanl (x.value)) result |= 2; } - /* The isnanl function should recognize Pseudo-NaNs, Pseudo-Infinities, - Pseudo-Zeroes, Unnormalized Numbers, and Pseudo-Denormals, as defined in - Intel IA-64 Architecture Software Developer's Manual, Volume 1: - Application Architecture. - Table 5-2 "Floating-Point Register Encodings" - Figure 5-6 "Memory to Floating-Point Register Data Translation" - */ + /* isnanl should return something even for noncanonical values. */ { /* Pseudo-NaN. */ static memory_long_double x = { LDBL80_WORDS (0xFFFF, 0x40000001, 0x00000000) }; - if (!isnanl (x.value)) + if (isnanl (x.value) && !isnanl (x.value)) result |= 4; } { /* Pseudo-Infinity. */ static memory_long_double x = { LDBL80_WORDS (0xFFFF, 0x00000000, 0x00000000) }; - if (!isnanl (x.value)) + if (isnanl (x.value) && !isnanl (x.value)) result |= 8; } { /* Pseudo-Zero. */ static memory_long_double x = { LDBL80_WORDS (0x4004, 0x00000000, 0x00000000) }; - if (!isnanl (x.value)) + if (isnanl (x.value) && !isnanl (x.value)) result |= 16; } { /* Unnormalized number. */ static memory_long_double x = { LDBL80_WORDS (0x4000, 0x63333333, 0x00000000) }; - if (!isnanl (x.value)) + if (isnanl (x.value) && !isnanl (x.value)) result |= 32; } { /* Pseudo-Denormal. */ static memory_long_double x = { LDBL80_WORDS (0x0000, 0x83333333, 0x00000000) }; - if (!isnanl (x.value)) + if (isnanl (x.value) && !isnanl (x.value)) result |= 64; } #endif @@ -240,16 +231,6 @@ int main () }]])], [gl_cv_func_isnanl_works=yes], [gl_cv_func_isnanl_works=no], - [case "$host_cpu" in - # Guess no on ia64, x86_64, i386. - ia64 | x86_64 | i*86) gl_cv_func_isnanl_works="guessing no";; - *) - case "$host_os" in - netbsd*) gl_cv_func_isnanl_works="guessing no";; - *) gl_cv_func_isnanl_works="guessing yes";; - esac - ;; - esac - ]) + [gl_cv_func_isnanl_works="guessing yes"]) ]) ]) diff --git a/m4/iswblank.m4 b/m4/iswblank.m4 index a9ce0a3b..bb748081 100644 --- a/m4/iswblank.m4 +++ b/m4/iswblank.m4 @@ -1,5 +1,5 @@ # iswblank.m4 serial 4 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 a96ecabb..51c533a4 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-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -78,6 +78,7 @@ AC_DEFUN([coreutils_MACROS], AC_CHECK_FUNCS_ONCE([ endgrent endpwent + fallocate fchown fchmod ftruncate @@ -88,6 +89,7 @@ AC_DEFUN([coreutils_MACROS], sethostname siginterrupt sync + syncfs sysctl sysinfo tcgetpgrp @@ -163,6 +165,21 @@ AC_DEFUN([coreutils_MACROS], LIBS="$ac_seq_save_LIBS" ]) + + # See is fpsetprec() required to use extended double precision + # This is needed on 32 bit FreeBSD to give accurate conversion of: + # `numfmt 9223372036854775808` + AC_TRY_LINK([#include ], + [#ifdef __i386__ + fpsetprec(FP_PE); + #else + # error not required on 64 bit + #endif + ], [ac_have_fpsetprec=yes], [ac_have_fpsetprec=no]) + if test "$ac_have_fpsetprec" = "yes" ; then + AC_DEFINE([HAVE_FPSETPREC], 1, [whether fpsetprec is present and required]) + fi + AC_REQUIRE([AM_LANGINFO_CODESET]) # Accept configure options: --with-tty-group[=GROUP], --without-tty-group @@ -189,6 +206,7 @@ AC_DEFUN([gl_CHECK_ALL_HEADERS], [ AC_CHECK_HEADERS_ONCE([ hurd.h + linux/falloc.h paths.h priv.h stropts.h diff --git a/m4/jm-winsz1.m4 b/m4/jm-winsz1.m4 index 84ecf28e..ace8b623 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-2014 Free Software +# Copyright (C) 1996, 1999, 2001-2002, 2004, 2006, 2009-2015 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 97aafc0e..b69a227b 100644 --- a/m4/jm-winsz2.m4 +++ b/m4/jm-winsz2.m4 @@ -1,6 +1,6 @@ # serial 7 -# Copyright (C) 1996, 1999, 2001, 2004, 2009-2014 Free Software Foundation, +# Copyright (C) 1996, 1999, 2001, 2004, 2009-2015 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 e8d78f9d..c3ecba66 100644 --- a/m4/langinfo_h.m4 +++ b/m4/langinfo_h.m4 @@ -1,5 +1,5 @@ # langinfo_h.m4 serial 7 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 a1b564ad..b7a6c48b 100644 --- a/m4/largefile.m4 +++ b/m4/largefile.m4 @@ -1,6 +1,6 @@ # Enable large files on systems where this is not the default. -# Copyright 1992-1996, 1998-2014 Free Software Foundation, Inc. +# Copyright 1992-1996, 1998-2015 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/lchmod.m4 b/m4/lchmod.m4 index f227e787..8a44a10f 100644 --- a/m4/lchmod.m4 +++ b/m4/lchmod.m4 @@ -1,6 +1,6 @@ #serial 3 -dnl Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 743ed5b0..e47b7793 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-2014 Free Software Foundation, +dnl Copyright (C) 1998, 2001, 2003-2007, 2009-2015 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation diff --git a/m4/ldexp.m4 b/m4/ldexp.m4 index 9c4f0663..c1b326b7 100644 --- a/m4/ldexp.m4 +++ b/m4/ldexp.m4 @@ -1,5 +1,5 @@ # ldexp.m4 serial 1 -dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 6959f426..30547db9 100644 --- a/m4/ldexpl.m4 +++ b/m4/ldexpl.m4 @@ -1,5 +1,5 @@ # ldexpl.m4 serial 16 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lib-ignore.m4 b/m4/lib-ignore.m4 index 7baa5283..0fa92fe5 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 ddc569f7..91ca9117 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,5 +1,5 @@ # lib-ld.m4 serial 6 -dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 1996-2003, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index 3522d994..d8d5d1f0 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 31f49e40..0465f477 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2005, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 d0032671..cb8ae8ae 100644 --- a/m4/libunistring-base.m4 +++ b/m4/libunistring-base.m4 @@ -1,5 +1,5 @@ # libunistring-base.m4 serial 5 -dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 8b15585e..49899b21 100644 --- a/m4/link-follow.m4 +++ b/m4/link-follow.m4 @@ -2,7 +2,7 @@ dnl Run a program to determine whether link(2) follows symlinks. dnl Set LINK_FOLLOWS_SYMLINKS accordingly. -# Copyright (C) 1999-2001, 2004-2006, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2004-2006, 2009-2015 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/link.m4 b/m4/link.m4 index e923d0d0..4778b332 100644 --- a/m4/link.m4 +++ b/m4/link.m4 @@ -1,5 +1,5 @@ # link.m4 serial 8 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 2da0e30c..9ed082db 100644 --- a/m4/linkat.m4 +++ b/m4/linkat.m4 @@ -1,7 +1,7 @@ -# serial 6 +# serial 7 # See if we need to provide linkat replacement. -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -20,26 +20,38 @@ AC_DEFUN([gl_FUNC_LINKAT], if test $ac_cv_func_linkat = no; then HAVE_LINKAT=0 else - AC_CACHE_CHECK([whether linkat(,AT_SYMLINK_FOLLOW) works], - [gl_cv_func_linkat_follow], - [rm -rf conftest.f1 conftest.f2 - touch conftest.f1 - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -#include -#ifdef __linux__ -/* Linux added linkat in 2.6.16, but did not add AT_SYMLINK_FOLLOW - until 2.6.18. Always replace linkat to support older kernels. */ -choke me -#endif -]], [return linkat (AT_FDCWD, "conftest.f1", AT_FDCWD, "conftest.f2", - AT_SYMLINK_FOLLOW);])], - [gl_cv_func_linkat_follow=yes], - [gl_cv_func_linkat_follow="need runtime check"]) - rm -rf conftest.f1 conftest.f2]) + dnl OS X Yosemite has linkat() but it's not sufficient + dnl to our needs since it doesn't support creating + dnl hardlinks to symlinks. Therefore check for that + dnl capability before considering using the system version. + AC_CACHE_CHECK([whether linkat() can link symlinks], + [gl_cv_func_linkat_nofollow], + [rm -rf conftest.l1 conftest.l2 + ln -s target conftest.l1 + AC_RUN_IFELSE([AC_LANG_PROGRAM( + [[#include + #include + ]], + [return linkat (AT_FDCWD, "conftest.l1", AT_FDCWD, + "conftest.l2", 0); + ])], + [gl_cv_func_linkat_nofollow=yes], + [gl_cv_func_linkat_nofollow=no], + [case "$host_os" in + darwin*) gl_cv_func_linkat_nofollow="guessing no" ;; + *) gl_cv_func_linkat_nofollow="guessing yes" ;; + esac]) + + rm -rf conftest.l1 conftest.l2]) + + case $gl_cv_func_linkat_nofollow in + *no) LINKAT_SYMLINK_NOTSUP=1 ;; + *yes) LINKAT_SYMLINK_NOTSUP=0 ;; + esac + AC_CACHE_CHECK([whether linkat handles trailing slash correctly], [gl_cv_func_linkat_slash], - [rm -rf conftest.a conftest.b conftest.c conftest.d + [rm -rf conftest.a conftest.b conftest.c conftest.d conftest.e conftest.s AC_RUN_IFELSE( [AC_LANG_PROGRAM( [[#include @@ -70,6 +82,16 @@ choke me if (linkat (AT_FDCWD, "conftest.a", AT_FDCWD, "conftest.d/", AT_SYMLINK_FOLLOW) == 0) result |= 8; + + /* On OS X 10.10 a trailing "/" will cause the second path to be + dereferenced, and thus will succeed on a dangling symlink. */ + if (symlink ("conftest.e", "conftest.s") == 0) + { + if (linkat (AT_FDCWD, "conftest.a", AT_FDCWD, "conftest.s/", + AT_SYMLINK_FOLLOW) == 0) + result |= 16; + } + return result; ]])], [gl_cv_func_linkat_slash=yes], @@ -80,16 +102,24 @@ choke me *) gl_cv_func_linkat_slash="guessing no";; esac ]) - rm -rf conftest.a conftest.b conftest.c conftest.d]) + rm -rf conftest.a conftest.b conftest.c conftest.d conftest.e conftest.s]) case "$gl_cv_func_linkat_slash" in *yes) gl_linkat_slash_bug=0 ;; *) gl_linkat_slash_bug=1 ;; esac - if test "$gl_cv_func_linkat_follow" != yes \ + + case "$gl_cv_func_linkat_nofollow" in + *yes) linkat_nofollow=yes ;; + *) linkat_nofollow=no ;; + esac + + if test "$linkat_nofollow" != yes \ || test $gl_linkat_slash_bug = 1; then REPLACE_LINKAT=1 AC_DEFINE_UNQUOTED([LINKAT_TRAILING_SLASH_BUG], [$gl_linkat_slash_bug], [Define to 1 if linkat fails to recognize a trailing slash.]) + AC_DEFINE_UNQUOTED([LINKAT_SYMLINK_NOTSUP], [$LINKAT_SYMLINK_NOTSUP], + [Define to 1 if linkat can create hardlinks to symlinks]) fi fi ]) diff --git a/m4/localcharset.m4 b/m4/localcharset.m4 index ada2f01f..f03916c0 100644 --- a/m4/localcharset.m4 +++ b/m4/localcharset.m4 @@ -1,5 +1,5 @@ # localcharset.m4 serial 7 -dnl Copyright (C) 2002, 2004, 2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004, 2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 27db5ab8..92ff5525 100644 --- a/m4/locale-fr.m4 +++ b/m4/locale-fr.m4 @@ -1,5 +1,5 @@ # locale-fr.m4 serial 17 -dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale-ja.m4 b/m4/locale-ja.m4 index c88fe8b4..a3abef87 100644 --- a/m4/locale-ja.m4 +++ b/m4/locale-ja.m4 @@ -1,5 +1,5 @@ # locale-ja.m4 serial 12 -dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale-tr.m4 b/m4/locale-tr.m4 index 535b2566..655c1ec4 100644 --- a/m4/locale-tr.m4 +++ b/m4/locale-tr.m4 @@ -1,5 +1,5 @@ # locale-tr.m4 serial 10 -dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4 index d3b23474..c5c4ef65 100644 --- a/m4/locale-zh.m4 +++ b/m4/locale-zh.m4 @@ -1,5 +1,5 @@ # locale-zh.m4 serial 12 -dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale_h.m4 b/m4/locale_h.m4 index 28385884..0d7bb34a 100644 --- a/m4/locale_h.m4 +++ b/m4/locale_h.m4 @@ -1,5 +1,5 @@ # locale_h.m4 serial 19 -dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/localeconv.m4 b/m4/localeconv.m4 index 1fd29195..464e6308 100644 --- a/m4/localeconv.m4 +++ b/m4/localeconv.m4 @@ -1,5 +1,5 @@ # localeconv.m4 serial 1 -dnl Copyright (C) 2012-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 d865c66d..ef5dd5f2 100644 --- a/m4/localename.m4 +++ b/m4/localename.m4 @@ -1,5 +1,5 @@ # localename.m4 serial 2 -dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 73a3c54c..9fd4aa78 100644 --- a/m4/lock.m4 +++ b/m4/lock.m4 @@ -1,5 +1,5 @@ # lock.m4 serial 13 (gettext-0.18.2) -dnl Copyright (C) 2005-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/longlong.m4 b/m4/longlong.m4 index eefb37c4..d57bc700 100644 --- a/m4/longlong.m4 +++ b/m4/longlong.m4 @@ -1,5 +1,5 @@ # longlong.m4 serial 17 -dnl Copyright (C) 1999-2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 1999-2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 563ed71c..7e4aa192 100644 --- a/m4/ls-mntd-fs.m4 +++ b/m4/ls-mntd-fs.m4 @@ -1,7 +1,7 @@ -# serial 30 +# serial 32 # How to list mounted file systems. -# Copyright (C) 1998-2004, 2006, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2004, 2006, 2009-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -120,7 +120,7 @@ if test $ac_cv_func_getmntent = yes; then # Determine whether it's the one-argument variant or the two-argument one. if test -z "$ac_list_mounted_fs"; then - # 4.3BSD, SunOS, HP-UX, Dynix, Irix + # GNU/Linux, 4.3BSD, SunOS, HP-UX, Dynix, Irix AC_MSG_CHECKING([for one-argument getmntent function]) AC_CACHE_VAL([fu_cv_sys_mounted_getmntent1], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ diff --git a/m4/lseek.m4 b/m4/lseek.m4 index 0904d02d..f337abf1 100644 --- a/m4/lseek.m4 +++ b/m4/lseek.m4 @@ -1,5 +1,5 @@ # lseek.m4 serial 10 -dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 c5e72b81..adf752c0 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,6 +1,6 @@ -# serial 26 +# serial 27 -# Copyright (C) 1997-2001, 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2001, 2003-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -37,30 +37,28 @@ AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], [gl_cv_func_lstat_dereferences_slashed_symlink], [rm -f conftest.sym conftest.file echo >conftest.file - if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then - AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [AC_INCLUDES_DEFAULT], - [[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; - ]])], - [gl_cv_func_lstat_dereferences_slashed_symlink=yes], - [gl_cv_func_lstat_dereferences_slashed_symlink=no], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; - esac - ]) - else - # If the 'ln -s' command failed, then we probably don't even - # have an lstat function. - gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" - fi + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [AC_INCLUDES_DEFAULT], + [[struct stat sbuf; + if (symlink ("conftest.file", "conftest.sym") != 0) + return 1; + /* 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; + ]])], + [gl_cv_func_lstat_dereferences_slashed_symlink=yes], + [gl_cv_func_lstat_dereferences_slashed_symlink=no], + [case "$host_os" in + *-gnu*) + # Guess yes on glibc systems. + gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; + *) + # If we don't know, assume the worst. + gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; + esac + ]) rm -f conftest.sym conftest.file ]) case "$gl_cv_func_lstat_dereferences_slashed_symlink" in diff --git a/m4/malloc.m4 b/m4/malloc.m4 index 322ad6ef..31368ab9 100644 --- a/m4/malloc.m4 +++ b/m4/malloc.m4 @@ -1,5 +1,5 @@ # malloc.m4 serial 14 -dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 dcc1a084..72489517 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-2014 Free Software Foundation, +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2015 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 e1cee6cf..b4e38d94 100644 --- a/m4/manywarnings.m4 +++ b/m4/manywarnings.m4 @@ -1,5 +1,5 @@ -# manywarnings.m4 serial 6 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +# manywarnings.m4 serial 7 +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -93,6 +93,14 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], fi # List all gcc warning categories. + # To compare this list to your installed GCC's, run this Bash command: + # + # comm -3 \ + # <(sed -n 's/^ *\(-[^ ]*\) .*/\1/p' manywarnings.m4 | sort) \ + # <(gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort | + # grep -v -x -f <( + # awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec)) + gl_manywarn_set= for gl_manywarn_item in \ -W \ @@ -100,20 +108,25 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], -Waddress \ -Waggressive-loop-optimizations \ -Wall \ - -Warray-bounds \ -Wattributes \ -Wbad-function-cast \ + -Wbool-compare \ -Wbuiltin-macro-redefined \ -Wcast-align \ -Wchar-subscripts \ + -Wchkp \ -Wclobbered \ -Wcomment \ -Wcomments \ -Wcoverage-mismatch \ -Wcpp \ + -Wdate-time \ -Wdeprecated \ -Wdeprecated-declarations \ + -Wdesignated-init \ -Wdisabled-optimization \ + -Wdiscarded-array-qualifiers \ + -Wdiscarded-qualifiers \ -Wdiv-by-zero \ -Wdouble-promotion \ -Wempty-body \ @@ -124,6 +137,7 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], -Wformat-extra-args \ -Wformat-nonliteral \ -Wformat-security \ + -Wformat-signedness \ -Wformat-y2k \ -Wformat-zero-length \ -Wfree-nonheap-object \ @@ -131,15 +145,19 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], -Wimplicit \ -Wimplicit-function-declaration \ -Wimplicit-int \ + -Wincompatible-pointer-types \ -Winit-self \ -Winline \ + -Wint-conversion \ -Wint-to-pointer-cast \ -Winvalid-memory-model \ -Winvalid-pch \ -Wjump-misses-init \ + -Wlogical-not-parentheses \ -Wlogical-op \ -Wmain \ -Wmaybe-uninitialized \ + -Wmemset-transposed-args \ -Wmissing-braces \ -Wmissing-declarations \ -Wmissing-field-initializers \ @@ -150,9 +168,10 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], -Wnarrowing \ -Wnested-externs \ -Wnonnull \ - -Wnormalized=nfc \ + -Wodr \ -Wold-style-declaration \ -Wold-style-definition \ + -Wopenmp-simd \ -Woverflow \ -Woverlength-strings \ -Woverride-init \ @@ -167,6 +186,9 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], -Wreturn-type \ -Wsequence-point \ -Wshadow \ + -Wshift-count-negative \ + -Wshift-count-overflow \ + -Wsizeof-array-argument \ -Wsizeof-pointer-memaccess \ -Wstack-protector \ -Wstrict-aliasing \ @@ -176,7 +198,10 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], -Wsuggest-attribute=format \ -Wsuggest-attribute=noreturn \ -Wsuggest-attribute=pure \ + -Wsuggest-final-methods \ + -Wsuggest-final-types \ -Wswitch \ + -Wswitch-bool \ -Wswitch-default \ -Wsync-nand \ -Wsystem-headers \ @@ -203,13 +228,27 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], -Wvla \ -Wvolatile-register-var \ -Wwrite-strings \ - -fdiagnostics-show-option \ - -funit-at-a-time \ \ ; do gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item" done + # gcc --help=warnings outputs an unusual form for these options; list + # them here so that the above 'comm' command doesn't report a false match. + gl_manywarn_set="$gl_manywarn_set -Warray-bounds=2" + gl_manywarn_set="$gl_manywarn_set -Wnormalized=nfc" + + # These are needed for older GCC versions. + if test -n "$GCC"; then + case `($CC --version) 2>/dev/null` in + 'gcc (GCC) '[[0-3]].* | \ + 'gcc (GCC) '4.[[0-7]].*) + gl_manywarn_set="$gl_manywarn_set -fdiagnostics-show-option" + gl_manywarn_set="$gl_manywarn_set -funit-at-a-time" + ;; + esac + fi + # Disable specific options as needed. if test "$gl_cv_cc_nomfi_needed" = yes; then gl_manywarn_set="$gl_manywarn_set -Wno-missing-field-initializers" diff --git a/m4/math_h.m4 b/m4/math_h.m4 index 9e2adfba..7d0f5834 100644 --- a/m4/math_h.m4 +++ b/m4/math_h.m4 @@ -1,5 +1,5 @@ # math_h.m4 serial 114 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbchar.m4 b/m4/mbchar.m4 index e250ca83..3f721c9d 100644 --- a/m4/mbchar.m4 +++ b/m4/mbchar.m4 @@ -1,5 +1,5 @@ # mbchar.m4 serial 9 -dnl Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbiter.m4 b/m4/mbiter.m4 index 648bf45c..becf8a7c 100644 --- a/m4/mbiter.m4 +++ b/m4/mbiter.m4 @@ -1,5 +1,5 @@ # mbiter.m4 serial 7 -dnl Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbrlen.m4 b/m4/mbrlen.m4 index 10df9b36..9cde958a 100644 --- a/m4/mbrlen.m4 +++ b/m4/mbrlen.m4 @@ -1,5 +1,5 @@ # mbrlen.m4 serial 9 -dnl Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 45696f54..c0d751dc 100644 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,5 +1,5 @@ # mbrtowc.m4 serial 26 -dnl Copyright (C) 2001-2002, 2004-2005, 2008-2014 Free Software Foundation, +dnl Copyright (C) 2001-2002, 2004-2005, 2008-2015 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 e1598a1d..61c40329 100644 --- a/m4/mbsinit.m4 +++ b/m4/mbsinit.m4 @@ -1,5 +1,5 @@ # mbsinit.m4 serial 8 -dnl Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 1dc1940d..52becd56 100644 --- a/m4/mbslen.m4 +++ b/m4/mbslen.m4 @@ -1,5 +1,5 @@ # mbslen.m4 serial 2 -dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 6967f356..cea47e51 100644 --- a/m4/mbsrtowcs.m4 +++ b/m4/mbsrtowcs.m4 @@ -1,5 +1,5 @@ # mbsrtowcs.m4 serial 13 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 068155a5..42ad6cd6 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 eaa2ff32..efe3e21c 100644 --- a/m4/mbswidth.m4 +++ b/m4/mbswidth.m4 @@ -1,5 +1,5 @@ # mbswidth.m4 serial 18 -dnl Copyright (C) 2000-2002, 2004, 2006-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2004, 2006-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 cacfe161..88cdeeef 100644 --- a/m4/mbtowc.m4 +++ b/m4/mbtowc.m4 @@ -1,5 +1,5 @@ # mbtowc.m4 serial 2 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 f0249d9e..0bb9036e 100644 --- a/m4/md5.m4 +++ b/m4/md5.m4 @@ -1,5 +1,5 @@ # md5.m4 serial 14 -dnl Copyright (C) 2002-2006, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/memcasecmp.m4 b/m4/memcasecmp.m4 index d907c1aa..5f669797 100644 --- a/m4/memcasecmp.m4 +++ b/m4/memcasecmp.m4 @@ -1,5 +1,5 @@ #serial 6 -dnl Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 b9f126cf..cb958d86 100644 --- a/m4/memchr.m4 +++ b/m4/memchr.m4 @@ -1,5 +1,5 @@ # memchr.m4 serial 12 -dnl Copyright (C) 2002-2004, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 db54a568..75cb810d 100644 --- a/m4/memcoll.m4 +++ b/m4/memcoll.m4 @@ -1,5 +1,5 @@ # memcoll.m4 serial 10 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4 index b6d0b141..aff590ef 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-2014 Free Software Foundation, +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2015 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 5dbe4d1e..f3f74b82 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-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2015 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 a9672c07..42b5cf83 100644 --- a/m4/mgetgroups.m4 +++ b/m4/mgetgroups.m4 @@ -1,5 +1,5 @@ #serial 5 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 f815358e..886bb60c 100644 --- a/m4/mkancesdirs.m4 +++ b/m4/mkancesdirs.m4 @@ -1,5 +1,5 @@ # Make a file's ancestor directories. -dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 0bc5001f..a6992418 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 51e78c13..3d9868df 100644 --- a/m4/mkdir.m4 +++ b/m4/mkdir.m4 @@ -1,6 +1,6 @@ # serial 11 -# Copyright (C) 2001, 2003-2004, 2006, 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2004, 2006, 2008-2015 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 4328d8f6..7d67a297 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 8475bc38..f6407a7a 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4 index 9033a4e6..f5df0d0b 100644 --- a/m4/mkstemp.m4 +++ b/m4/mkstemp.m4 @@ -1,6 +1,6 @@ #serial 23 -# Copyright (C) 2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2007, 2009-2015 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 e8d340ac..3f0e1eee 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,5 +1,5 @@ # serial 25 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2015 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/mmap-anon.m4 b/m4/mmap-anon.m4 index 94ae2e2f..92a88d05 100644 --- a/m4/mmap-anon.m4 +++ b/m4/mmap-anon.m4 @@ -1,5 +1,5 @@ # mmap-anon.m4 serial 10 -dnl Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mode_t.m4 b/m4/mode_t.m4 index db6e192b..01badba7 100644 --- a/m4/mode_t.m4 +++ b/m4/mode_t.m4 @@ -1,5 +1,5 @@ # mode_t.m4 serial 2 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 b89101e8..8a763c7d 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-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 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 f5c60bcc..ec58dc86 100644 --- a/m4/mountlist.m4 +++ b/m4/mountlist.m4 @@ -1,5 +1,5 @@ # serial 11 -dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 cc37be15..c892aa2e 100644 --- a/m4/mpsort.m4 +++ b/m4/mpsort.m4 @@ -1,6 +1,6 @@ # Sort a vector of pointers to data. -# Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2015 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 7f26087e..9446fa58 100644 --- a/m4/msvc-inval.m4 +++ b/m4/msvc-inval.m4 @@ -1,5 +1,5 @@ # msvc-inval.m4 serial 1 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 9e32c171..5d72a042 100644 --- a/m4/msvc-nothrow.m4 +++ b/m4/msvc-nothrow.m4 @@ -1,5 +1,5 @@ # msvc-nothrow.m4 serial 1 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 2cb956de..fc575c1d 100644 --- a/m4/multiarch.m4 +++ b/m4/multiarch.m4 @@ -1,5 +1,5 @@ # multiarch.m4 serial 7 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4 index d1d6111d..a0574eed 100644 --- a/m4/nanosleep.m4 +++ b/m4/nanosleep.m4 @@ -5,7 +5,7 @@ dnl Check for the nanosleep function. dnl If not found, use the supplied replacement. dnl -# Copyright (C) 1999-2001, 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2003-2015 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/netdb_h.m4 b/m4/netdb_h.m4 index cd7d4829..fce20801 100644 --- a/m4/netdb_h.m4 +++ b/m4/netdb_h.m4 @@ -1,5 +1,5 @@ # netdb_h.m4 serial 11 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 1d447d6f..42ac0084 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 6976e776..c8bf20fb 100644 --- a/m4/nl_langinfo.m4 +++ b/m4/nl_langinfo.m4 @@ -1,5 +1,5 @@ # nl_langinfo.m4 serial 5 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nocrash.m4 b/m4/nocrash.m4 index 5a5d77d6..56283180 100644 --- a/m4/nocrash.m4 +++ b/m4/nocrash.m4 @@ -1,5 +1,5 @@ # nocrash.m4 serial 4 -dnl Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/non-recursive-gnulib-prefix-hack.m4 b/m4/non-recursive-gnulib-prefix-hack.m4 index 967b6c0b..bf9ae7c9 100644 --- a/m4/non-recursive-gnulib-prefix-hack.m4 +++ b/m4/non-recursive-gnulib-prefix-hack.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2012-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nproc.m4 b/m4/nproc.m4 index 937c4a92..988404b1 100644 --- a/m4/nproc.m4 +++ b/m4/nproc.m4 @@ -1,5 +1,5 @@ # nproc.m4 serial 4 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/obstack.m4 b/m4/obstack.m4 new file mode 100644 index 00000000..92139219 --- /dev/null +++ b/m4/obstack.m4 @@ -0,0 +1,35 @@ +# See if we need to provide obstacks. + +dnl Copyright 1996-2015 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl This replaces Autoconf's AC_FUNC_OBSTACK. +dnl The Autoconf version should be marked obsolete at some point. + +AC_DEFUN([AC_FUNC_OBSTACK], + [AC_LIBSOURCES([obstack.h, obstack.c])dnl + AC_CACHE_CHECK([for obstacks that work with any size object], + [ac_cv_func_obstack], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include "obstack.h" + void *obstack_chunk_alloc (size_t n) { return 0; } + void obstack_chunk_free (void *p) { } + /* Check that an internal function returns size_t, not int. */ + size_t _obstack_memory_used (struct obstack *); + ]], + [[struct obstack mem; + obstack_init (&mem); + obstack_free (&mem, 0); + ]])], + [ac_cv_func_obstack=yes], + [ac_cv_func_obstack=no])]) + if test "$ac_cv_func_obstack" = yes; then + AC_DEFINE([HAVE_OBSTACK], 1, + [Define to 1 if the system has obstacks that work with any size object.]) + else + AC_LIBOBJ([obstack]) + fi +]) diff --git a/m4/off_t.m4 b/m4/off_t.m4 index f5885b34..0eb14678 100644 --- a/m4/off_t.m4 +++ b/m4/off_t.m4 @@ -1,5 +1,5 @@ # off_t.m4 serial 1 -dnl Copyright (C) 2012-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 68f116f0..2accbaa9 100644 --- a/m4/open.m4 +++ b/m4/open.m4 @@ -1,5 +1,5 @@ # open.m4 serial 14 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/openat.m4 b/m4/openat.m4 index ad1d9d38..c928ff76 100644 --- a/m4/openat.m4 +++ b/m4/openat.m4 @@ -1,7 +1,7 @@ # serial 45 # See if we need to use our replacement for Solaris' openat et al functions. -dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/opendir.m4 b/m4/opendir.m4 index fa29c643..cd83706a 100644 --- a/m4/opendir.m4 +++ b/m4/opendir.m4 @@ -1,5 +1,5 @@ # opendir.m4 serial 2 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 78730096..2fc15c62 100644 --- a/m4/parse-datetime.m4 +++ b/m4/parse-datetime.m4 @@ -1,5 +1,5 @@ # parse-datetime.m4 serial 21 -dnl Copyright (C) 2002-2006, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 114f91f0..0e3db7a2 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-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 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 4c12829b..bda3ec91 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-2014 Free Software Foundation, +# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2015 Free Software Foundation, # Inc. # # This file is free software; the Free Software Foundation diff --git a/m4/perror.m4 b/m4/perror.m4 index ff9c08f9..42f6667d 100644 --- a/m4/perror.m4 +++ b/m4/perror.m4 @@ -1,5 +1,5 @@ # perror.m4 serial 6 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 a1179eb3..ebfb8c37 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-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2008-2015 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 d3532d5d..730c5343 100644 --- a/m4/pipe.m4 +++ b/m4/pipe.m4 @@ -1,5 +1,5 @@ # pipe.m4 serial 2 -dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 c7378784..43012dca 100644 --- a/m4/po.m4 +++ b/m4/po.m4 @@ -1,4 +1,4 @@ -# po.m4 serial 23 (gettext-0.18.3) +# po.m4 serial 24 (gettext-0.19) dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -30,7 +30,7 @@ AC_DEFUN([AM_PO_SUBDIRS], dnl Release version of the gettext macros. This is used to ensure that dnl the gettext macros and po/Makefile.in.in are in sync. - AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) + AC_SUBST([GETTEXT_MACRO_VERSION], [0.19]) dnl Perform the following tests also if --disable-nls has been given, dnl because they are needed for "make dist" to work. diff --git a/m4/posix-shell.m4 b/m4/posix-shell.m4 index 20e2fb4f..8d57e1f6 100644 --- a/m4/posix-shell.m4 +++ b/m4/posix-shell.m4 @@ -1,6 +1,6 @@ # Find a POSIX-conforming shell. -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 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/posixtm.m4 b/m4/posixtm.m4 index b27b9c79..3f553733 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-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2015 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 5f6e1f6a..380d2b84 100644 --- a/m4/posixver.m4 +++ b/m4/posixver.m4 @@ -1,5 +1,5 @@ # posixver.m4 serial 12 -dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 f219e897..b9fd2cc7 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-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/m4/printf-frexp.m4 b/m4/printf-frexp.m4 index 88a4f5c3..b923c82b 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 ad0dfe66..ab0eccf0 100644 --- a/m4/printf-frexpl.m4 +++ b/m4/printf-frexpl.m4 @@ -1,5 +1,5 @@ # printf-frexpl.m4 serial 10 -dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/printf.m4 b/m4/printf.m4 index 3d7b381e..d06746aa 100644 --- a/m4/printf.m4 +++ b/m4/printf.m4 @@ -1,5 +1,5 @@ -# printf.m4 serial 51 -dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc. +# printf.m4 serial 52 +dnl Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -328,7 +328,7 @@ int main () # ifdef WORDS_BIGENDIAN # define LDBL80_WORDS(exponent,manthi,mantlo) \ { ((unsigned int) (exponent) << 16) | ((unsigned int) (manthi) >> 16), \ - ((unsigned int) (manthi) << 16) | (unsigned int) (mantlo) >> 16), \ + ((unsigned int) (manthi) << 16) | ((unsigned int) (mantlo) >> 16), \ (unsigned int) (mantlo) << 16 \ } # else @@ -365,66 +365,51 @@ int main () { /* Pseudo-NaN. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0xFFFF, 0x40000001, 0x00000000) }; - if (sprintf (buf, "%Lf", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lf", x.value) <= 0) result |= 4; - if (sprintf (buf, "%Le", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Le", x.value) <= 0) result |= 4; - if (sprintf (buf, "%Lg", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lg", x.value) <= 0) result |= 4; } { /* Pseudo-Infinity. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0xFFFF, 0x00000000, 0x00000000) }; - if (sprintf (buf, "%Lf", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lf", x.value) <= 0) result |= 8; - if (sprintf (buf, "%Le", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Le", x.value) <= 0) result |= 8; - if (sprintf (buf, "%Lg", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lg", x.value) <= 0) result |= 8; } { /* Pseudo-Zero. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0x4004, 0x00000000, 0x00000000) }; - if (sprintf (buf, "%Lf", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lf", x.value) <= 0) result |= 16; - if (sprintf (buf, "%Le", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Le", x.value) <= 0) result |= 16; - if (sprintf (buf, "%Lg", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lg", x.value) <= 0) result |= 16; } { /* Unnormalized number. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0x4000, 0x63333333, 0x00000000) }; - if (sprintf (buf, "%Lf", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lf", x.value) <= 0) result |= 32; - if (sprintf (buf, "%Le", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Le", x.value) <= 0) result |= 32; - if (sprintf (buf, "%Lg", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lg", x.value) <= 0) result |= 32; } { /* Pseudo-Denormal. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0x0000, 0x83333333, 0x00000000) }; - if (sprintf (buf, "%Lf", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lf", x.value) <= 0) result |= 64; - if (sprintf (buf, "%Le", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Le", x.value) <= 0) result |= 64; - if (sprintf (buf, "%Lg", x.value) < 0 - || !strisnan (buf, 0, strlen (buf))) + if (sprintf (buf, "%Lg", x.value) <= 0) result |= 64; } #endif diff --git a/m4/priv-set.m4 b/m4/priv-set.m4 index 6a1ed240..e834bc63 100644 --- a/m4/priv-set.m4 +++ b/m4/priv-set.m4 @@ -1,6 +1,6 @@ # serial 8 -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/progtest.m4 b/m4/progtest.m4 index b499f79c..8706d526 100644 --- a/m4/progtest.m4 +++ b/m4/progtest.m4 @@ -1,5 +1,5 @@ # progtest.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 1996-2003, 2005, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/pthread.m4 b/m4/pthread.m4 index 1ed0dd33..b8e2c4c5 100644 --- a/m4/pthread.m4 +++ b/m4/pthread.m4 @@ -1,5 +1,5 @@ -# pthread.m4 serial 8 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +# pthread.m4 serial 10 +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free 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,7 @@ AC_DEFUN([gl_PTHREAD_CHECK], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[#include - #ifdef strtok_r + #if defined strtok_r || defined localtime_r #error break me #endif @@ -63,7 +63,7 @@ AC_DEFUN([gl_PTHREAD_CHECK], [gl_cv_lib_pthread], [gl_saved_libs=$LIBS gl_cv_lib_pthread= - for gl_lib_prefix in '' '-lpthread'; do + for gl_lib_prefix in '' '-pthread' '-lpthread'; do LIBS="$gl_lib_prefix $gl_saved_libs" AC_LINK_IFELSE( [AC_LANG_PROGRAM( diff --git a/m4/putenv.m4 b/m4/putenv.m4 index d79321be..73a5f469 100644 --- a/m4/putenv.m4 +++ b/m4/putenv.m4 @@ -1,5 +1,5 @@ # putenv.m4 serial 20 -dnl Copyright (C) 2002-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 95b3e71b..af72e964 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-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 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 eaebbf63..985b30d0 100644 --- a/m4/quotearg.m4 +++ b/m4/quotearg.m4 @@ -1,5 +1,5 @@ # quotearg.m4 serial 9 -dnl Copyright (C) 2002, 2004-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 8656578e..ed6aae03 100644 --- a/m4/raise.m4 +++ b/m4/raise.m4 @@ -1,5 +1,5 @@ # raise.m4 serial 3 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 a2beacc6..67e50bd1 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 176b0b04..9fdd7df1 100644 --- a/m4/read.m4 +++ b/m4/read.m4 @@ -1,5 +1,5 @@ # read.m4 serial 4 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/readdir.m4 b/m4/readdir.m4 index bd7be5c3..8aa348ff 100644 --- a/m4/readdir.m4 +++ b/m4/readdir.m4 @@ -1,5 +1,5 @@ # readdir.m4 serial 1 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 f9ce868c..88c9bfef 100644 --- a/m4/readlink.m4 +++ b/m4/readlink.m4 @@ -1,5 +1,5 @@ # readlink.m4 serial 12 -dnl Copyright (C) 2003, 2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 65c0689c..3477602a 100644 --- a/m4/readlinkat.m4 +++ b/m4/readlinkat.m4 @@ -1,7 +1,7 @@ -# serial 3 +# serial 5 # See if we need to provide readlinkat replacement. -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free 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,30 @@ AC_DEFUN([gl_FUNC_READLINKAT], AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_CHECK_FUNCS_ONCE([readlinkat]) + AC_REQUIRE([gl_FUNC_READLINK]) if test $ac_cv_func_readlinkat = no; then HAVE_READLINKAT=0 + else + AC_CACHE_CHECK([whether readlinkat signature is correct], + [gl_cv_decl_readlinkat_works], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + /* Check whether original declaration has correct type. */ + ssize_t readlinkat (int, char const *, char *, size_t);]])], + [gl_cv_decl_readlinkat_works=yes], + [gl_cv_decl_readlinkat_works=no])]) + # Assume readinkat has the same trailing slash bug as readlink, + # as is the case on Mac Os X 10.10 + case "$gl_cv_func_readlink_works" in + *yes) + if test "$gl_cv_decl_readlinkat_works" != yes; then + REPLACE_READLINKAT=1 + fi + ;; + *) + REPLACE_READLINKAT=1 + ;; + esac fi ]) diff --git a/m4/readtokens.m4 b/m4/readtokens.m4 index 0eaba552..fd6f6b60 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-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 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 0e614b68..e90dc27b 100644 --- a/m4/readutmp.m4 +++ b/m4/readutmp.m4 @@ -1,5 +1,5 @@ # readutmp.m4 serial 20 -dnl Copyright (C) 2002-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/realloc.m4 b/m4/realloc.m4 index f96537ba..0e1d3386 100644 --- a/m4/realloc.m4 +++ b/m4/realloc.m4 @@ -1,5 +1,5 @@ # realloc.m4 serial 13 -dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 08bd46a9..0fa7455d 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,6 +1,6 @@ # serial 65 -# Copyright (C) 1996-2001, 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 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/remove.m4 b/m4/remove.m4 index 7eb8f7e0..9e65daf3 100644 --- a/m4/remove.m4 +++ b/m4/remove.m4 @@ -1,5 +1,5 @@ # remove.m4 serial 5 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/rename.m4 b/m4/rename.m4 index ea577949..b5e43345 100644 --- a/m4/rename.m4 +++ b/m4/rename.m4 @@ -1,6 +1,6 @@ # serial 26 -# Copyright (C) 2001, 2003, 2005-2006, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005-2006, 2009-2015 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 06f54142..a189793e 100644 --- a/m4/rewinddir.m4 +++ b/m4/rewinddir.m4 @@ -1,5 +1,5 @@ # rewinddir.m4 serial 1 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 db6a9399..09ed159e 100644 --- a/m4/rmdir.m4 +++ b/m4/rmdir.m4 @@ -1,5 +1,5 @@ # rmdir.m4 serial 13 -dnl Copyright (C) 2002, 2005, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/rpmatch.m4 b/m4/rpmatch.m4 index 6fd0f5df..541a3101 100644 --- a/m4/rpmatch.m4 +++ b/m4/rpmatch.m4 @@ -1,5 +1,5 @@ # rpmatch.m4 serial 10 -dnl Copyright (C) 2002-2003, 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 f0c42e08..697a07cf 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-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 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 66648bbb..1cef87c5 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 cb63894a..e6c7c1f8 100644 --- a/m4/same.m4 +++ b/m4/same.m4 @@ -1,5 +1,5 @@ #serial 9 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 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 68dd1c5c..8e61212f 100644 --- a/m4/save-cwd.m4 +++ b/m4/save-cwd.m4 @@ -1,5 +1,5 @@ # serial 10 -dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 8f617db0..e51af103 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-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 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 68a3e8c1..28f6a5ef 100644 --- a/m4/savewd.m4 +++ b/m4/savewd.m4 @@ -1,6 +1,6 @@ # Save and restore the working directory, possibly using a child process. -dnl Copyright (C) 2004, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sched_h.m4 b/m4/sched_h.m4 index 329af351..0cbf2d29 100644 --- a/m4/sched_h.m4 +++ b/m4/sched_h.m4 @@ -1,5 +1,5 @@ -# sched_h.m4 serial 6 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +# sched_h.m4 serial 7 +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free 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,9 +27,16 @@ AC_DEFUN([gl_SCHED_H], fi AC_SUBST([HAVE_SCHED_H]) - AC_CHECK_TYPE([struct sched_param], - [HAVE_STRUCT_SCHED_PARAM=1], [HAVE_STRUCT_SCHED_PARAM=0], - [#include ]) + if test "$HAVE_SCHED_H" = 1; then + AC_CHECK_TYPE([struct sched_param], + [HAVE_STRUCT_SCHED_PARAM=1], [HAVE_STRUCT_SCHED_PARAM=0], + [#include ]) + else + dnl On OS/2 kLIBC, struct sched_param is in spawn.h. + AC_CHECK_TYPE([struct sched_param], + [HAVE_STRUCT_SCHED_PARAM=1], [HAVE_STRUCT_SCHED_PARAM=0], + [#include ]) + fi AC_SUBST([HAVE_STRUCT_SCHED_PARAM]) dnl Ensure the type pid_t gets defined. diff --git a/m4/secure_getenv.m4 b/m4/secure_getenv.m4 index 149888df..6afe89fd 100644 --- a/m4/secure_getenv.m4 +++ b/m4/secure_getenv.m4 @@ -1,5 +1,5 @@ # Look up an environment variable more securely. -dnl Copyright 2013-2014 Free Software Foundation, Inc. +dnl Copyright 2013-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 1d2fcb37..2a2ee6f9 100644 --- a/m4/select.m4 +++ b/m4/select.m4 @@ -1,5 +1,5 @@ # select.m4 serial 7 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/selinux-context-h.m4 b/m4/selinux-context-h.m4 index 1e4bcfee..de9ea9aa 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 2009-2015 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 af0696cc..fd09b299 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 2009-2015 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 4dc7a9f7..e871d45c 100644 --- a/m4/servent.m4 +++ b/m4/servent.m4 @@ -1,5 +1,5 @@ # servent.m4 serial 2 -dnl Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 0f46a7be..3aa38d89 100644 --- a/m4/setenv.m4 +++ b/m4/setenv.m4 @@ -1,5 +1,5 @@ # setenv.m4 serial 26 -dnl Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 fe83aab3..6d153f9e 100644 --- a/m4/setlocale.m4 +++ b/m4/setlocale.m4 @@ -1,5 +1,5 @@ # setlocale.m4 serial 4 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 7ca6e8bc..adc9ad18 100644 --- a/m4/settime.m4 +++ b/m4/settime.m4 @@ -1,5 +1,5 @@ # settime.m4 serial 7 -dnl Copyright (C) 2002, 2004-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 bf51b1b6..9d6aa0ce 100644 --- a/m4/sha1.m4 +++ b/m4/sha1.m4 @@ -1,5 +1,5 @@ # sha1.m4 serial 12 -dnl Copyright (C) 2002-2006, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sha256.m4 b/m4/sha256.m4 index 6dc63032..a12cd7e3 100644 --- a/m4/sha256.m4 +++ b/m4/sha256.m4 @@ -1,5 +1,5 @@ # sha256.m4 serial 8 -dnl Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sha512.m4 b/m4/sha512.m4 index 5ef5d404..77c76a8f 100644 --- a/m4/sha512.m4 +++ b/m4/sha512.m4 @@ -1,5 +1,5 @@ # sha512.m4 serial 9 -dnl Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sig2str.m4 b/m4/sig2str.m4 index 69ec37ff..71cfa4b2 100644 --- a/m4/sig2str.m4 +++ b/m4/sig2str.m4 @@ -1,5 +1,5 @@ # serial 7 -dnl Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 d0609860..98a32b2f 100644 --- a/m4/sigaction.m4 +++ b/m4/sigaction.m4 @@ -1,5 +1,5 @@ # sigaction.m4 serial 7 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/signal_h.m4 b/m4/signal_h.m4 index c8f664fb..f737c36b 100644 --- a/m4/signal_h.m4 +++ b/m4/signal_h.m4 @@ -1,5 +1,5 @@ # signal_h.m4 serial 18 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 a2ad9e8e..7eeaf542 100644 --- a/m4/signalblocking.m4 +++ b/m4/signalblocking.m4 @@ -1,5 +1,5 @@ # signalblocking.m4 serial 14 -dnl Copyright (C) 2001-2002, 2006-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2002, 2006-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/signbit.m4 b/m4/signbit.m4 index 9ed48c78..21b9bf5e 100644 --- a/m4/signbit.m4 +++ b/m4/signbit.m4 @@ -1,5 +1,5 @@ # signbit.m4 serial 13 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/size_max.m4 b/m4/size_max.m4 index 7e192d5e..186e3fdd 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 2f84da57..b789ac57 100644 --- a/m4/sleep.m4 +++ b/m4/sleep.m4 @@ -1,5 +1,5 @@ # sleep.m4 serial 7 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 888db35c..8ae70050 100644 --- a/m4/snprintf.m4 +++ b/m4/snprintf.m4 @@ -1,5 +1,5 @@ # snprintf.m4 serial 6 -dnl Copyright (C) 2002-2004, 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 041498ba..93417395 100644 --- a/m4/socketlib.m4 +++ b/m4/socketlib.m4 @@ -1,5 +1,5 @@ # socketlib.m4 serial 1 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 da6ff742..e75ac02b 100644 --- a/m4/sockets.m4 +++ b/m4/sockets.m4 @@ -1,5 +1,5 @@ # sockets.m4 serial 7 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 4c07f864..bcabed3e 100644 --- a/m4/socklen.m4 +++ b/m4/socklen.m4 @@ -1,5 +1,5 @@ # socklen.m4 serial 10 -dnl Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 31d436f0..50eb7619 100644 --- a/m4/sockpfaf.m4 +++ b/m4/sockpfaf.m4 @@ -1,5 +1,5 @@ # sockpfaf.m4 serial 8 -dnl Copyright (C) 2004, 2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 fbe1d068..25bd4514 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2003, 2006, 2010-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 3c9b52e2..6543bf62 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-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-1999, 2001, 2009-2015 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 f0065368..081532f5 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/m4/stat-size.m4 b/m4/stat-size.m4 index 71acd35d..2de8fc4e 100644 --- a/m4/stat-size.m4 +++ b/m4/stat-size.m4 @@ -1,6 +1,6 @@ #serial 1 -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 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 ea5c4fc5..9c8ceec1 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-2014 Free Software +# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2015 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation diff --git a/m4/stat.m4 b/m4/stat.m4 index 1ae327b3..d1b37689 100644 --- a/m4/stat.m4 +++ b/m4/stat.m4 @@ -1,6 +1,6 @@ # serial 11 -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/stdalign.m4 b/m4/stdalign.m4 index 9efafe5c..033b0d39 100644 --- a/m4/stdalign.m4 +++ b/m4/stdalign.m4 @@ -1,6 +1,6 @@ # Check for stdalign.h that conforms to C11. -dnl Copyright 2011-2014 Free Software Foundation, Inc. +dnl Copyright 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -32,8 +32,12 @@ AC_DEFUN([gl_STDALIGN_H], /* Test _Alignas only on platforms where gnulib can help. */ #if \ ((defined __cplusplus && 201103 <= __cplusplus) \ - || __GNUC__ || __IBMC__ || __IBMCPP__ || __ICC \ - || 0x5110 <= __SUNPRO_C || 1300 <= _MSC_VER) + || (defined __APPLE__ && defined __MACH__ \ + ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ + : __GNUC__) \ + || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \ + || __ICC || 0x5110 <= __SUNPRO_C \ + || 1300 <= _MSC_VER) struct alignas_test { char c; char alignas (8) alignas_8; }; char test_alignas[offsetof (struct alignas_test, alignas_8) == 8 ? 1 : -1]; diff --git a/m4/stdarg.m4 b/m4/stdarg.m4 index 732aa313..d208eb35 100644 --- a/m4/stdarg.m4 +++ b/m4/stdarg.m4 @@ -1,5 +1,5 @@ # stdarg.m4 serial 6 -dnl Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 006ed52d..7273b822 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 c555e295..23105027 100644 --- a/m4/stddef_h.m4 +++ b/m4/stddef_h.m4 @@ -1,6 +1,6 @@ -dnl A placeholder for POSIX 2008 , for platforms that have issues. -# stddef_h.m4 serial 4 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl A placeholder for , for platforms that have issues. +# stddef_h.m4 serial 5 +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free 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([gl_STDDEF_H], AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) AC_REQUIRE([gt_TYPE_WCHAR_T]) STDDEF_H= + AC_CHECK_TYPE([max_align_t], [], [HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h], + [[#include + ]]) if test $gt_cv_c_wchar_t = no; then HAVE_WCHAR_T=0 STDDEF_H=stddef.h @@ -43,5 +46,6 @@ AC_DEFUN([gl_STDDEF_H_DEFAULTS], [ dnl Assume proper GNU behavior unless another module says otherwise. REPLACE_NULL=0; AC_SUBST([REPLACE_NULL]) + HAVE_MAX_ALIGN_T=1; AC_SUBST([HAVE_MAX_ALIGN_T]) HAVE_WCHAR_T=1; AC_SUBST([HAVE_WCHAR_T]) ]) diff --git a/m4/stdint.m4 b/m4/stdint.m4 index 1981d9db..4011a494 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,5 +1,5 @@ # stdint.m4 serial 43 -dnl Copyright (C) 2001-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 7fc2ce9a..5097c0b0 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 d15913a3..f60cc215 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,14 +1,41 @@ -# stdio_h.m4 serial 43 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +# stdio_h.m4 serial 46 +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free 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_STDIO_H], [ + dnl For __USE_MINGW_ANSI_STDIO + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + AC_REQUIRE([gl_STDIO_H_DEFAULTS]) gl_NEXT_HEADERS([stdio.h]) + dnl Determine whether __USE_MINGW_ANSI_STDIO makes printf and + dnl inttypes.h behave like gnu instead of system; we must give our + dnl printf wrapper the right attribute to match. + AC_CACHE_CHECK([which flavor of printf attribute matches inttypes macros], + [gl_cv_func_printf_attribute_flavor], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #define __STDC_FORMAT_MACROS 1 + #include + #include + /* For non-mingw systems, compilation will trivially succeed. + For mingw, compilation will succeed for older mingw (system + printf, "I64d") and fail for newer mingw (gnu printf, "lld"). */ + #if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) && \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) + extern char PRIdMAX_probe[sizeof PRIdMAX == sizeof "I64d" ? 1 : -1]; + #endif + ]])], [gl_cv_func_printf_attribute_flavor=system], + [gl_cv_func_printf_attribute_flavor=gnu])]) + if test "$gl_cv_func_printf_attribute_flavor" = gnu; then + AC_DEFINE([GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU], [1], + [Define to 1 if printf and friends should be labeled with + attribute "__gnu_printf__" instead of "__printf__"]) + fi + dnl No need to create extra modules for these functions. Everyone who uses dnl likely needs them. GNULIB_FSCANF=1 diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index 03b448b9..0b4c623e 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,5 +1,5 @@ # stdlib_h.m4 serial 42 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free 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,6 +55,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], GNULIB_PTSNAME=0; AC_SUBST([GNULIB_PTSNAME]) GNULIB_PTSNAME_R=0; AC_SUBST([GNULIB_PTSNAME_R]) GNULIB_PUTENV=0; AC_SUBST([GNULIB_PUTENV]) + GNULIB_QSORT_R=0; AC_SUBST([GNULIB_QSORT_R]) GNULIB_RANDOM=0; AC_SUBST([GNULIB_RANDOM]) GNULIB_RANDOM_R=0; AC_SUBST([GNULIB_RANDOM_R]) GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX]) @@ -107,6 +108,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], REPLACE_PTSNAME=0; AC_SUBST([REPLACE_PTSNAME]) REPLACE_PTSNAME_R=0; AC_SUBST([REPLACE_PTSNAME_R]) REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV]) + REPLACE_QSORT_R=0; AC_SUBST([REPLACE_QSORT_R]) REPLACE_RANDOM_R=0; AC_SUBST([REPLACE_RANDOM_R]) REPLACE_REALLOC=0; AC_SUBST([REPLACE_REALLOC]) REPLACE_REALPATH=0; AC_SUBST([REPLACE_REALPATH]) diff --git a/m4/stpcpy.m4 b/m4/stpcpy.m4 index 966ba951..7e28beee 100644 --- a/m4/stpcpy.m4 +++ b/m4/stpcpy.m4 @@ -1,5 +1,5 @@ # stpcpy.m4 serial 8 -dnl Copyright (C) 2002, 2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 7f1222c9..7c4617b8 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-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2015 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/strdup.m4 b/m4/strdup.m4 index 1681a30e..90ea29d2 100644 --- a/m4/strdup.m4 +++ b/m4/strdup.m4 @@ -1,6 +1,6 @@ # strdup.m4 serial 13 -dnl Copyright (C) 2002-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2015 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 0763fe3b..75a17f20 100644 --- a/m4/strerror.m4 +++ b/m4/strerror.m4 @@ -1,5 +1,5 @@ # strerror.m4 serial 17 -dnl Copyright (C) 2002, 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 e13a369b..9065cfff 100644 --- a/m4/strerror_r.m4 +++ b/m4/strerror_r.m4 @@ -1,5 +1,5 @@ # strerror_r.m4 serial 15 -dnl Copyright (C) 2002, 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strftime.m4 b/m4/strftime.m4 index 0ba3dd07..4557626a 100644 --- a/m4/strftime.m4 +++ b/m4/strftime.m4 @@ -1,6 +1,6 @@ # serial 33 -# Copyright (C) 1996-1997, 1999-2007, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-1997, 1999-2007, 2009-2015 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 64e683f9..55d09ef4 100644 --- a/m4/string_h.m4 +++ b/m4/string_h.m4 @@ -1,6 +1,6 @@ # Configure a GNU-like replacement for . -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/strncat.m4 b/m4/strncat.m4 index 8ea522ed..ba461e48 100644 --- a/m4/strncat.m4 +++ b/m4/strncat.m4 @@ -1,5 +1,5 @@ # strncat.m4 serial 2 -dnl Copyright (C) 2002-2004, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 55df0399..e6e2300d 100644 --- a/m4/strndup.m4 +++ b/m4/strndup.m4 @@ -1,5 +1,5 @@ # strndup.m4 serial 21 -dnl Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strnlen.m4 b/m4/strnlen.m4 index 94317f8a..5f85d3fa 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-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2015 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/strpbrk.m4 b/m4/strpbrk.m4 index f2fc15e4..1350a0c6 100644 --- a/m4/strpbrk.m4 +++ b/m4/strpbrk.m4 @@ -1,5 +1,5 @@ # strpbrk.m4 serial 6 -dnl Copyright (C) 2002-2003, 2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 b9dfeca2..d40b7fb8 100644 --- a/m4/strsignal.m4 +++ b/m4/strsignal.m4 @@ -1,5 +1,5 @@ # strsignal.m4 serial 8 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 33cd7a32..040c0b9d 100644 --- a/m4/strstr.m4 +++ b/m4/strstr.m4 @@ -1,5 +1,5 @@ # strstr.m4 serial 16 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 bbe99bc7..2d5f3156 100644 --- a/m4/strtod.m4 +++ b/m4/strtod.m4 @@ -1,5 +1,5 @@ # strtod.m4 serial 22 -dnl Copyright (C) 2002-2003, 2006-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2006-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 71137816..fde732aa 100644 --- a/m4/strtoimax.m4 +++ b/m4/strtoimax.m4 @@ -1,5 +1,5 @@ # strtoimax.m4 serial 14 -dnl Copyright (C) 2002-2004, 2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 9f2a1777..666f44a6 100644 --- a/m4/strtoll.m4 +++ b/m4/strtoll.m4 @@ -1,5 +1,5 @@ # strtoll.m4 serial 7 -dnl Copyright (C) 2002, 2004, 2006, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004, 2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 f4d5f616..4267bd72 100644 --- a/m4/strtoull.m4 +++ b/m4/strtoull.m4 @@ -1,5 +1,5 @@ # strtoull.m4 serial 7 -dnl Copyright (C) 2002, 2004, 2006, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004, 2006, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 fc582fcf..5312ef4d 100644 --- a/m4/strtoumax.m4 +++ b/m4/strtoumax.m4 @@ -1,5 +1,5 @@ # strtoumax.m4 serial 12 -dnl Copyright (C) 2002-2004, 2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 de4924b4..a59e2f0d 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 db7ad487..fd975c89 100644 --- a/m4/symlinkat.m4 +++ b/m4/symlinkat.m4 @@ -1,7 +1,7 @@ -# serial 5 +# serial 6 # See if we need to provide symlinkat replacement. -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free 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,5 +16,38 @@ AC_DEFUN([gl_FUNC_SYMLINKAT], AC_CHECK_FUNCS_ONCE([symlinkat]) if test $ac_cv_func_symlinkat = no; then HAVE_SYMLINKAT=0 + else + AC_CACHE_CHECK([whether symlinkat handles trailing slash correctly], + [gl_cv_func_symlinkat_works], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #include + ]], + [[int result = 0; + if (!symlinkat ("a", AT_FDCWD, "conftest.link/")) + result |= 1; + if (symlinkat ("conftest.f", AT_FDCWD, "conftest.lnk2")) + result |= 2; + else if (!symlinkat ("a", AT_FDCWD, "conftest.lnk2/")) + result |= 4; + return result; + ]])], + [gl_cv_func_symlinkat_works=yes], + [gl_cv_func_symlinkat_works=no], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_symlinkat_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_symlinkat_works="guessing no" ;; + esac + ]) + rm -f conftest.f conftest.link conftest.lnk2]) + case "$gl_cv_func_symlinkat_works" in + *yes) ;; + *) + REPLACE_SYMLINKAT=1 + ;; + esac fi ]) diff --git a/m4/sys_ioctl_h.m4 b/m4/sys_ioctl_h.m4 index 16542319..7e8197d4 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 f0650991..492939a3 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 1a502b4e..5ec5919f 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 114d8281..eaeabe7d 100644 --- a/m4/sys_socket_h.m4 +++ b/m4/sys_socket_h.m4 @@ -1,5 +1,5 @@ # sys_socket_h.m4 serial 23 -dnl Copyright (C) 2005-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 index eaa7642b..6c909e81 100644 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,5 +1,5 @@ # sys_stat_h.m4 serial 28 -*- Autoconf -*- -dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4 index 5c79300f..50133b9f 100644 --- a/m4/sys_time_h.m4 +++ b/m4/sys_time_h.m4 @@ -1,7 +1,7 @@ # Configure a replacement for . # serial 8 -# Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4 index 9748905b..2232aece 100644 --- a/m4/sys_types_h.m4 +++ b/m4/sys_types_h.m4 @@ -1,5 +1,5 @@ # sys_types_h.m4 serial 5 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 ba6b4b5e..3dfbcbe6 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 5e75e2d4..b4f1f510 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 a9676c29..ae0a3b3e 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 1594e1f5..b1694d68 100644 --- a/m4/tempname.m4 +++ b/m4/tempname.m4 @@ -1,6 +1,6 @@ #serial 5 -# Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 2009-2015 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 f8e44589..4e76b6db 100644 --- a/m4/termios_h.m4 +++ b/m4/termios_h.m4 @@ -1,5 +1,5 @@ # termios_h.m4 serial 4 -dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 b6d602a6..59451269 100644 --- a/m4/thread.m4 +++ b/m4/thread.m4 @@ -1,5 +1,5 @@ # thread.m4 serial 3 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/threadlib.m4 b/m4/threadlib.m4 index a8817026..8615ac94 100644 --- a/m4/threadlib.m4 +++ b/m4/threadlib.m4 @@ -1,5 +1,5 @@ -# threadlib.m4 serial 10 (gettext-0.18.2) -dnl Copyright (C) 2005-2014 Free Software Foundation, Inc. +# threadlib.m4 serial 11 (gettext-0.18.2) +dnl Copyright (C) 2005-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -22,7 +22,7 @@ dnl libtool). dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for dnl programs that really need multithread functionality. The difference dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak -dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread". +dnl symbols, typically LIBTHREAD is empty whereas LIBMULTITHREAD is not. dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for dnl multithread-safe programs. @@ -162,15 +162,31 @@ int main () # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist # in libc. IRIX 6.5 has the first one in both libc and libpthread, but # the second one only in libpthread, and lock.c needs it. - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[pthread_mutex_lock((pthread_mutex_t*)0); - pthread_mutexattr_init((pthread_mutexattr_t*)0);]])], - [gl_have_pthread=yes]) + # + # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04 + # needs -pthread for some reason. See: + # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html + save_LIBS=$LIBS + for gl_pthread in '' '-pthread'; do + LIBS="$LIBS $gl_pthread" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include + pthread_mutex_t m; + pthread_mutexattr_t ma; + ]], + [[pthread_mutex_lock (&m); + pthread_mutexattr_init (&ma);]])], + [gl_have_pthread=yes + LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread + LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread]) + LIBS=$save_LIBS + test -n "$gl_have_pthread" && break + done + # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) - if test -n "$gl_have_pthread"; then + if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then # The program links fine without libpthread. But it may actually # need to link with libpthread in order to create multiple threads. AC_CHECK_LIB([pthread], [pthread_kill], @@ -185,7 +201,7 @@ int main () [Define if the pthread_in_use() detection is hard.]) esac ]) - else + elif test -z "$gl_have_pthread"; then # Some library is needed. Try libpthread and libc_r. AC_CHECK_LIB([pthread], [pthread_kill], [gl_have_pthread=yes @@ -326,6 +342,8 @@ dnl Linux 2.4/glibc posix -lpthread Y OK dnl dnl GNU Hurd/glibc posix dnl +dnl Ubuntu 14.04 posix -pthread Y OK +dnl dnl FreeBSD 5.3 posix -lc_r Y dnl posix -lkse ? Y dnl posix -lpthread ? Y diff --git a/m4/time_h.m4 b/m4/time_h.m4 index 9852778f..d9c41a48 100644 --- a/m4/time_h.m4 +++ b/m4/time_h.m4 @@ -1,8 +1,8 @@ # Configure a more-standard replacement for . -# Copyright (C) 2000-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2015 Free Software Foundation, Inc. -# serial 8 +# serial 9 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -26,7 +26,7 @@ AC_DEFUN([gl_HEADER_TIME_H_BODY], ]) dnl Check whether 'struct timespec' is declared -dnl in time.h, sys/time.h, or pthread.h. +dnl in time.h, sys/time.h, pthread.h, or unistd.h. AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], [ @@ -44,6 +44,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], TIME_H_DEFINES_STRUCT_TIMESPEC=0 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0 PTHREAD_H_DEFINES_STRUCT_TIMESPEC=0 + UNISTD_H_DEFINES_STRUCT_TIMESPEC=0 if test $gl_cv_sys_struct_timespec_in_time_h = yes; then TIME_H_DEFINES_STRUCT_TIMESPEC=1 else @@ -70,12 +71,26 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], [gl_cv_sys_struct_timespec_in_pthread_h=no])]) if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1 + else + AC_CACHE_CHECK([for struct timespec in ], + [gl_cv_sys_struct_timespec_in_unistd_h], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + ]], + [[static struct timespec x; x.tv_sec = x.tv_nsec;]])], + [gl_cv_sys_struct_timespec_in_unistd_h=yes], + [gl_cv_sys_struct_timespec_in_unistd_h=no])]) + if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then + UNISTD_H_DEFINES_STRUCT_TIMESPEC=1 + fi fi fi fi AC_SUBST([TIME_H_DEFINES_STRUCT_TIMESPEC]) AC_SUBST([SYS_TIME_H_DEFINES_STRUCT_TIMESPEC]) AC_SUBST([PTHREAD_H_DEFINES_STRUCT_TIMESPEC]) + AC_SUBST([UNISTD_H_DEFINES_STRUCT_TIMESPEC]) ]) AC_DEFUN([gl_TIME_MODULE_INDICATOR], diff --git a/m4/time_r.m4 b/m4/time_r.m4 index 7e15600f..8df7e139 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2006-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/timer_time.m4 b/m4/timer_time.m4 index 578ebe08..962bbd2b 100644 --- a/m4/timer_time.m4 +++ b/m4/timer_time.m4 @@ -1,5 +1,5 @@ # timer_time.m4 serial 3 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/timespec.m4 b/m4/timespec.m4 index 2ce654fe..06b3533e 100644 --- a/m4/timespec.m4 +++ b/m4/timespec.m4 @@ -1,6 +1,6 @@ #serial 15 -# Copyright (C) 2000-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2015 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/tls.m4 b/m4/tls.m4 index ebd86ec9..9c146bd7 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 486351b4..71a88f92 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 cef0d02e..9bcdc630 100644 --- a/m4/tzset.m4 +++ b/m4/tzset.m4 @@ -1,6 +1,6 @@ # serial 7 -# Copyright (C) 2003, 2007, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2003, 2007, 2009-2015 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 0136f2e6..5e02c449 100644 --- a/m4/uname.m4 +++ b/m4/uname.m4 @@ -1,5 +1,5 @@ # uname.m4 serial 11 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 6cdf625d..2a34b301 100644 --- a/m4/ungetc.m4 +++ b/m4/ungetc.m4 @@ -1,5 +1,5 @@ # ungetc.m4 serial 3 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free 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,8 +29,9 @@ AC_DEFUN_ONCE([gl_FUNC_UNGETC_WORKS], fclose (f); remove ("conftest.tmp");])], [gl_cv_func_ungetc_works=yes], [gl_cv_func_ungetc_works=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_ungetc_works="guessing yes" ;; + # Guess yes on glibc and bionic systems. + *-gnu*|*-android*) + gl_cv_func_ungetc_works="guessing yes" ;; # If we don't know, assume the worst. *) gl_cv_func_ungetc_works="guessing no" ;; esac diff --git a/m4/unicodeio.m4 b/m4/unicodeio.m4 index 5257745a..507f8049 100644 --- a/m4/unicodeio.m4 +++ b/m4/unicodeio.m4 @@ -1,5 +1,5 @@ # unicodeio.m4 serial 2 -dnl Copyright (C) 2002-2003, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 96cb7df7..006bba24 100644 --- a/m4/unistd-safer.m4 +++ b/m4/unistd-safer.m4 @@ -1,5 +1,5 @@ #serial 9 -dnl Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 1fa197e6..b3c581f7 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,5 +1,5 @@ -# unistd_h.m4 serial 67 -dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. +# unistd_h.m4 serial 68 +dnl Copyright (C) 2006-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -173,9 +173,11 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], REPLACE_PWRITE=0; AC_SUBST([REPLACE_PWRITE]) REPLACE_READ=0; AC_SUBST([REPLACE_READ]) REPLACE_READLINK=0; AC_SUBST([REPLACE_READLINK]) + REPLACE_READLINKAT=0; AC_SUBST([REPLACE_READLINKAT]) REPLACE_RMDIR=0; AC_SUBST([REPLACE_RMDIR]) REPLACE_SLEEP=0; AC_SUBST([REPLACE_SLEEP]) REPLACE_SYMLINK=0; AC_SUBST([REPLACE_SYMLINK]) + REPLACE_SYMLINKAT=0; AC_SUBST([REPLACE_SYMLINKAT]) REPLACE_TTYNAME_R=0; AC_SUBST([REPLACE_TTYNAME_R]) REPLACE_UNLINK=0; AC_SUBST([REPLACE_UNLINK]) REPLACE_UNLINKAT=0; AC_SUBST([REPLACE_UNLINKAT]) diff --git a/m4/unlink-busy.m4 b/m4/unlink-busy.m4 index c45648d2..0827a9b6 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2004, 2007, 2009-2015 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 03cf8ae0..094d69a0 100644 --- a/m4/unlink.m4 +++ b/m4/unlink.m4 @@ -1,5 +1,5 @@ # unlink.m4 serial 11 -dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/unlinkat.m4 b/m4/unlinkat.m4 index f5110aaa..be70c4fe 100644 --- a/m4/unlinkat.m4 +++ b/m4/unlinkat.m4 @@ -1,5 +1,5 @@ # unlinkat.m4 serial 2 -dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -24,6 +24,7 @@ AC_DEFUN([gl_FUNC_UNLINKAT], ;; *) # GNU/Hurd has unlinkat, but it has the same bug as unlink. + # Darwin has unlinkat, but it has the same UNLINK_PARENT_BUG. if test $REPLACE_UNLINK = 1; then REPLACE_UNLINKAT=1 fi diff --git a/m4/unlinkdir.m4 b/m4/unlinkdir.m4 index 99797af5..964cc76b 100644 --- a/m4/unlinkdir.m4 +++ b/m4/unlinkdir.m4 @@ -1,6 +1,6 @@ # serial 7 -# Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2007, 2009-2015 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 6a1dec27..e5a6f434 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-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2006, 2009-2015 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 47a90a14..4e6db5e0 100644 --- a/m4/uptime.m4 +++ b/m4/uptime.m4 @@ -1,6 +1,6 @@ # serial 8 -# Copyright (C) 1996, 1999-2001, 2004, 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 1996, 1999-2001, 2004, 2009-2015 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 99ffd0bd..74bb79d8 100644 --- a/m4/userspec.m4 +++ b/m4/userspec.m4 @@ -1,5 +1,5 @@ # serial 11 -dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 822a063c..7c33ae94 100644 --- a/m4/utimbuf.m4 +++ b/m4/utimbuf.m4 @@ -1,6 +1,6 @@ # serial 9 -# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2014 Free Software Foundation, +# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2015 Free Software Foundation, # Inc. # # This file is free software; the Free Software Foundation diff --git a/m4/utimecmp.m4 b/m4/utimecmp.m4 index 112add39..d8f19d72 100644 --- a/m4/utimecmp.m4 +++ b/m4/utimecmp.m4 @@ -1,5 +1,5 @@ #serial 4 -dnl Copyright (C) 2004-2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 c9c44cf2..b022cfdc 100644 --- a/m4/utimens.m4 +++ b/m4/utimens.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2003-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 9cb97c98..9a80fa06 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 c3613578..e26a576b 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2005, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 106192ea..4708f2b8 100644 --- a/m4/vasnprintf.m4 +++ b/m4/vasnprintf.m4 @@ -1,5 +1,5 @@ # vasnprintf.m4 serial 36 -dnl Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2006-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/vasprintf-posix.m4 b/m4/vasprintf-posix.m4 index b1935d74..1628d334 100644 --- a/m4/vasprintf-posix.m4 +++ b/m4/vasprintf-posix.m4 @@ -1,5 +1,5 @@ # vasprintf-posix.m4 serial 13 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 c76c99c3..b785dc32 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-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2006-2007, 2009-2015 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 667f9f82..a87ac980 100644 --- a/m4/version-etc.m4 +++ b/m4/version-etc.m4 @@ -1,5 +1,5 @@ # version-etc.m4 serial 1 -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 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 b89ecfdd..8fc68ef6 100644 --- a/m4/vfprintf-posix.m4 +++ b/m4/vfprintf-posix.m4 @@ -1,5 +1,5 @@ # vfprintf-posix.m4 serial 14 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 f707afa1..c15dd82d 100644 --- a/m4/vprintf-posix.m4 +++ b/m4/vprintf-posix.m4 @@ -1,5 +1,5 @@ # vprintf-posix.m4 serial 3 -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 43156f45..5ae01def 100644 --- a/m4/warnings.m4 +++ b/m4/warnings.m4 @@ -1,5 +1,5 @@ # warnings.m4 serial 11 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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_h.m4 b/m4/wchar_h.m4 index 85db9528..9d1b0f8b 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -1,6 +1,6 @@ dnl A placeholder for ISO C99 , for platforms that have issues. -dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 839a04c1..dc964e67 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 844ef6a8..7e3fe3f5 100644 --- a/m4/wcrtomb.m4 +++ b/m4/wcrtomb.m4 @@ -1,5 +1,5 @@ # wcrtomb.m4 serial 11 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 0e4b1c2e..c7d1970b 100644 --- a/m4/wcswidth.m4 +++ b/m4/wcswidth.m4 @@ -1,5 +1,5 @@ # wcswidth.m4 serial 2 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 41f57afc..501dc4ab 100644 --- a/m4/wctob.m4 +++ b/m4/wctob.m4 @@ -1,5 +1,5 @@ # wctob.m4 serial 10 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 3b4ff797..05c6685a 100644 --- a/m4/wctomb.m4 +++ b/m4/wctomb.m4 @@ -1,5 +1,5 @@ # wctomb.m4 serial 2 -dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 3fac0ee0..95a4705b 100644 --- a/m4/wctype_h.m4 +++ b/m4/wctype_h.m4 @@ -2,7 +2,7 @@ dnl A placeholder for ISO C99 , for platforms that lack it. -dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4 index f00a6cca..b11dc8db 100644 --- a/m4/wcwidth.m4 +++ b/m4/wcwidth.m4 @@ -1,5 +1,5 @@ # wcwidth.m4 serial 23 -dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 index 9b07b070..ca3fd449 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-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 5b2baff6..d9f0548d 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2015 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 820dd4f7..ce7042ef 100644 --- a/m4/write.m4 +++ b/m4/write.m4 @@ -1,5 +1,5 @@ # write.m4 serial 5 -dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xalloc.m4 b/m4/xalloc.m4 index b6a2257b..6dfcab3c 100644 --- a/m4/xalloc.m4 +++ b/m4/xalloc.m4 @@ -1,5 +1,5 @@ # xalloc.m4 serial 18 -dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xattr.m4 b/m4/xattr.m4 index 9fc1b134..e34a718f 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/xgetcwd.m4 b/m4/xgetcwd.m4 index c6057fdc..968e9fd5 100644 --- a/m4/xgetcwd.m4 +++ b/m4/xgetcwd.m4 @@ -1,5 +1,5 @@ #serial 8 -dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 c23d9ada..7c2daa22 100644 --- a/m4/xnanosleep.m4 +++ b/m4/xnanosleep.m4 @@ -1,5 +1,5 @@ #serial 5 -dnl Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 3af23ec7..98faf7de 100644 --- a/m4/xsize.m4 +++ b/m4/xsize.m4 @@ -1,5 +1,5 @@ # xsize.m4 serial 5 -dnl Copyright (C) 2003-2004, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2004, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xstrndup.m4 b/m4/xstrndup.m4 index 8521f0ed..296603be 100644 --- a/m4/xstrndup.m4 +++ b/m4/xstrndup.m4 @@ -1,5 +1,5 @@ # xstrndup.m4 serial 2 -dnl Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 94d1c45f..3b36dd95 100644 --- a/m4/xstrtod.m4 +++ b/m4/xstrtod.m4 @@ -1,5 +1,5 @@ #serial 8 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 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 03419d81..fa6a2735 100644 --- a/m4/xstrtol.m4 +++ b/m4/xstrtol.m4 @@ -1,5 +1,5 @@ #serial 11 -dnl Copyright (C) 2002-2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives 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 c2d3ec7f..715609a2 100644 --- a/m4/xvasprintf.m4 +++ b/m4/xvasprintf.m4 @@ -1,5 +1,5 @@ # xvasprintf.m4 serial 2 -dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/yesno.m4 b/m4/yesno.m4 index 89fdbf2c..4019dc47 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-2014 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 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 e9442a62..4f245824 100644 --- a/m4/yield.m4 +++ b/m4/yield.m4 @@ -1,5 +1,5 @@ # yield.m4 serial 2 -dnl Copyright (C) 2005-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl 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 e5a37829..b6ec1b5e 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-2014 Free Software Foundation, Inc. +## Copyright (C) 2001-2015 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -996,6 +996,14 @@ sc_prohibit_undesirable_word_seq: | grep -vE '$(ignore_undesirable_word_sequence_RE_)' | grep . \ && { echo '$(ME): undesirable word sequence' >&2; exit 1; } || : +# Except for shell files and for loops, double semicolon is probably a mistake +sc_prohibit_double_semicolon: + @prohibit='; *;[ {} \]*(/[/*]|$$)' \ + in_vc_files='\.[chly]$$' \ + exclude='\bfor *\(.*\)' \ + halt="Double semicolon detected" \ + $(_sc_search_regexp) + _ptm1 = use "test C1 && test C2", not "test C1 -''a C2" _ptm2 = use "test C1 || test C2", not "test C1 -''o C2" # Using test's -a and -o operators is not portable. @@ -1640,14 +1648,14 @@ _gl_tight_scope: $(bin_PROGRAMS) perl -lne \ '$(_gl_TS_function_match) and print "^$$1\$$"' $$hdr; \ ) | sort -u > $$t; \ - nm -e $(_gl_TS_obj_files)|$(SED) -n 's/.* T //p'|grep -Ev -f $$t \ + nm -g $(_gl_TS_obj_files)|$(SED) -n 's/.* T //p'|grep -Ev -f $$t \ && { echo the above functions should have static scope >&2; \ exit 1; } || : ; \ ( printf '^%s$$\n' '__.*' $(_gl_TS_unmarked_extern_vars); \ perl -lne '$(_gl_TS_var_match) and print "^$$1\$$"' \ $$hdr $(_gl_TS_other_headers) \ ) | sort -u > $$t; \ - nm -e $(_gl_TS_obj_files) | $(SED) -n 's/.* [BCDGRS] //p' \ + nm -g $(_gl_TS_obj_files) | $(SED) -n 's/.* [BCDGRS] //p' \ | sort -u | grep -Ev -f $$t \ && { echo the above variables should have static scope >&2; \ exit 1; } || : diff --git a/man/chmod.x b/man/chmod.x index f26d7631..76ea30d0 100644 --- a/man/chmod.x +++ b/man/chmod.x @@ -1,4 +1,4 @@ -'\" Copyright (C) 1998-2014 Free Software Foundation, Inc. +'\" Copyright (C) 1998-2015 Free Software Foundation, Inc. '\" '\" This is free software. You may redistribute copies of it under the terms '\" of the GNU General Public License . diff --git a/man/chown.x b/man/chown.x index 96b0c237..1a36e185 100644 --- a/man/chown.x +++ b/man/chown.x @@ -1,4 +1,4 @@ -'\" Copyright (C) 1998-2014 Free Software Foundation, Inc. +'\" Copyright (C) 1998-2015 Free Software Foundation, Inc. '\" '\" This is free software. You may redistribute copies of it under the terms '\" of the GNU General Public License . diff --git a/man/df.x b/man/df.x index 6fd040ac..8136d158 100644 --- a/man/df.x +++ b/man/df.x @@ -1,4 +1,4 @@ -'\" Copyright (C) 1998-2014 Free Software Foundation, Inc. +'\" Copyright (C) 1998-2015 Free Software Foundation, Inc. '\" '\" This is free software. You may redistribute copies of it under the terms '\" of the GNU General Public License . diff --git a/man/du.x b/man/du.x index 7c302718..be9191cf 100644 --- a/man/du.x +++ b/man/du.x @@ -1,4 +1,4 @@ -'\" Copyright (C) 1998-2014 Free Software Foundation, Inc. +'\" Copyright (C) 1998-2015 Free Software Foundation, Inc. '\" '\" This is free software. You may redistribute copies of it under the terms '\" of the GNU General Public License . diff --git a/man/dummy-man b/man/dummy-man index dca2b678..bf31912b 100755 --- a/man/dummy-man +++ b/man/dummy-man @@ -69,5 +69,5 @@ The full documentation for 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 +.B info $bs(aq(coreutils) $progname invocation$bs(aq END diff --git a/man/help2man b/man/help2man index bfeb9897..fe786ac2 100755 --- a/man/help2man +++ b/man/help2man @@ -405,16 +405,19 @@ s/\\/\x82/g; # "(?:[\\w-]+ +)?" in the bug reporting pattern is used to indicate an # optional word, so that either "Report bugs" or "Report _program_ bugs" will # be matched. -my $PAT_BUGS = _('Report +(?:[\w-]+ +)?bugs|Email +bug +reports +to'); +my $PAT_BUGS = _('Report +(?:[\w-]+ +)?bugs|' . + 'Email +bug +reports +to|' . + '.* +online +help:'); my $PAT_AUTHOR = _('Written +by'); my $PAT_OPTIONS = _('Options'); my $PAT_ENVIRONMENT = _('Environment'); my $PAT_FILES = _('Files'); my $PAT_EXAMPLES = _('Examples'); my $PAT_FREE_SOFTWARE = _('This +is +free +software'); +my $PAT_SEE_ALSO = _('Full +documentation'); # Start a new paragraph (if required) for these. -s/([^\n])\n($PAT_BUGS|$PAT_AUTHOR) /$1\n\n$2 /og; +s/([^\n])\n($PAT_BUGS|$PAT_AUTHOR|$PAT_SEE_ALSO) /$1\n\n$2 /og; # Convert iso-8859-1 copyright symbol or (c) to nroff # character. @@ -462,6 +465,12 @@ while (length) $sect = _('AUTHOR'); } + elsif (/^($PAT_SEE_ALSO)/o) + { + $sect = _('SEE ALSO'); + $opt_no_info = 1; + } + # Examples, indicated by an indented leading $, % or > are # rendered in a constant width font. if (/^( +)([\$\%>] )\S/) @@ -588,6 +597,17 @@ while (length) # ... s/\n([[:upper:]])/\n.br\n$1/g; } + elsif ($sect eq _('SEE ALSO')) + { + # Handle external references of the form: + # + # GNU online resources: + # Full documentation at: + # or available locally via: info ... + # + s/\'/\\(aq/g; # shell quotes for info command + s/\n(.)/\n.br\n$1/g; # separate lines for each item + } } # Check if matched paragraph contains /pat/. diff --git a/man/local.mk b/man/local.mk index f4b213f7..45bda93e 100644 --- a/man/local.mk +++ b/man/local.mk @@ -1,7 +1,7 @@ # Make coreutils man pages. -*-Makefile-*- # This is included by the top-level Makefile.am. -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This 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,33 +52,117 @@ mandeps += $(top_srcdir)/src/system.h $(ALL_MANS): $(mandeps) -# Most prog.1 man pages depend on src/$prog, except when they are part of a -# single binary, in which case they depend on src/coreutils. The exceptions -# are handled by converting $name to $prog on the following code. -# $(ALL_MANS) includes the $(EXTRA_MANS) so even the programs that are not -# being installed will have the right dependency for the manpages. -DISTCLEANFILES += man/dynamic-deps.mk -man/dynamic-deps.mk: Makefile - $(AM_V_GEN)rm -f $@ $@-t - $(AM_V_at)for man in $(ALL_MANS); do \ - name=`echo "$$man"|sed 's|.*/||; s|\.1$$||'` || exit 1; \ - case $$name in \ - arch) prog='uname';; \ - install) prog='ginstall';; \ - test) prog='[';; \ - *) prog=$$name;; \ - esac; \ - case " $(single_binary_progs) " in \ - *" $$prog "*) \ - echo $$man: src/coreutils$(EXEEXT);; \ - *) \ - echo $$man: src/$$prog$(EXEEXT);; \ - esac \ - done > $@-t \ - && mv $@-t $@ - -# Include the generated man dependencies. -@AMDEP_TRUE@@am__include@ man/dynamic-deps.mk +if SINGLE_BINARY +mandeps += src/coreutils$(EXEEXT) +else +# Most prog.1 man pages depend on src/prog. List the exceptions: +man/arch.1: src/uname$(EXEEXT) +man/install.1: src/ginstall$(EXEEXT) +man/test.1: src/[$(EXEEXT) + +man/base64.1: src/base64$(EXEEXT) +man/basename.1: src/basename$(EXEEXT) +man/cat.1: src/cat$(EXEEXT) +man/chcon.1: src/chcon$(EXEEXT) +man/chgrp.1: src/chgrp$(EXEEXT) +man/chmod.1: src/chmod$(EXEEXT) +man/chown.1: src/chown$(EXEEXT) +man/chroot.1: src/chroot$(EXEEXT) +man/cksum.1: src/cksum$(EXEEXT) +man/comm.1: src/comm$(EXEEXT) +man/coreutils.1: src/coreutils$(EXEEXT) +man/cp.1: src/cp$(EXEEXT) +man/csplit.1: src/csplit$(EXEEXT) +man/cut.1: src/cut$(EXEEXT) +man/date.1: src/date$(EXEEXT) +man/dd.1: src/dd$(EXEEXT) +man/df.1: src/df$(EXEEXT) +man/dir.1: src/dir$(EXEEXT) +man/dircolors.1: src/dircolors$(EXEEXT) +man/dirname.1: src/dirname$(EXEEXT) +man/du.1: src/du$(EXEEXT) +man/echo.1: src/echo$(EXEEXT) +man/env.1: src/env$(EXEEXT) +man/expand.1: src/expand$(EXEEXT) +man/expr.1: src/expr$(EXEEXT) +man/factor.1: src/factor$(EXEEXT) +man/false.1: src/false$(EXEEXT) +man/fmt.1: src/fmt$(EXEEXT) +man/fold.1: src/fold$(EXEEXT) +man/groups.1: src/groups$(EXEEXT) +man/head.1: src/head$(EXEEXT) +man/hostid.1: src/hostid$(EXEEXT) +man/hostname.1: src/hostname$(EXEEXT) +man/id.1: src/id$(EXEEXT) +man/join.1: src/join$(EXEEXT) +man/kill.1: src/kill$(EXEEXT) +man/link.1: src/link$(EXEEXT) +man/ln.1: src/ln$(EXEEXT) +man/logname.1: src/logname$(EXEEXT) +man/ls.1: src/ls$(EXEEXT) +man/md5sum.1: src/md5sum$(EXEEXT) +man/mkdir.1: src/mkdir$(EXEEXT) +man/mkfifo.1: src/mkfifo$(EXEEXT) +man/mknod.1: src/mknod$(EXEEXT) +man/mktemp.1: src/mktemp$(EXEEXT) +man/mv.1: src/mv$(EXEEXT) +man/nice.1: src/nice$(EXEEXT) +man/nl.1: src/nl$(EXEEXT) +man/nohup.1: src/nohup$(EXEEXT) +man/nproc.1: src/nproc$(EXEEXT) +man/numfmt.1: src/numfmt$(EXEEXT) +man/od.1: src/od$(EXEEXT) +man/paste.1: src/paste$(EXEEXT) +man/pathchk.1: src/pathchk$(EXEEXT) +man/pinky.1: src/pinky$(EXEEXT) +man/pr.1: src/pr$(EXEEXT) +man/printenv.1: src/printenv$(EXEEXT) +man/printf.1: src/printf$(EXEEXT) +man/ptx.1: src/ptx$(EXEEXT) +man/pwd.1: src/pwd$(EXEEXT) +man/readlink.1: src/readlink$(EXEEXT) +man/realpath.1: src/realpath$(EXEEXT) +man/rm.1: src/rm$(EXEEXT) +man/rmdir.1: src/rmdir$(EXEEXT) +man/runcon.1: src/runcon$(EXEEXT) +man/seq.1: src/seq$(EXEEXT) +man/sha1sum.1: src/sha1sum$(EXEEXT) +man/sha224sum.1: src/sha224sum$(EXEEXT) +man/sha256sum.1: src/sha256sum$(EXEEXT) +man/sha384sum.1: src/sha384sum$(EXEEXT) +man/sha512sum.1: src/sha512sum$(EXEEXT) +man/shred.1: src/shred$(EXEEXT) +man/shuf.1: src/shuf$(EXEEXT) +man/sleep.1: src/sleep$(EXEEXT) +man/sort.1: src/sort$(EXEEXT) +man/split.1: src/split$(EXEEXT) +man/stat.1: src/stat$(EXEEXT) +man/stdbuf.1: src/stdbuf$(EXEEXT) +man/stty.1: src/stty$(EXEEXT) +man/sum.1: src/sum$(EXEEXT) +man/sync.1: src/sync$(EXEEXT) +man/tac.1: src/tac$(EXEEXT) +man/tail.1: src/tail$(EXEEXT) +man/tee.1: src/tee$(EXEEXT) +man/timeout.1: src/timeout$(EXEEXT) +man/touch.1: src/touch$(EXEEXT) +man/tr.1: src/tr$(EXEEXT) +man/true.1: src/true$(EXEEXT) +man/truncate.1: src/truncate$(EXEEXT) +man/tsort.1: src/tsort$(EXEEXT) +man/tty.1: src/tty$(EXEEXT) +man/uname.1: src/uname$(EXEEXT) +man/unexpand.1: src/unexpand$(EXEEXT) +man/uniq.1: src/uniq$(EXEEXT) +man/unlink.1: src/unlink$(EXEEXT) +man/uptime.1: src/uptime$(EXEEXT) +man/users.1: src/users$(EXEEXT) +man/vdir.1: src/vdir$(EXEEXT) +man/wc.1: src/wc$(EXEEXT) +man/who.1: src/who$(EXEEXT) +man/whoami.1: src/whoami$(EXEEXT) +man/yes.1: src/yes$(EXEEXT) +endif .x.1: $(AM_V_GEN)name=`echo $@ | sed 's|.*/||; s|\.1$$||'` || exit 1; \ @@ -97,12 +181,14 @@ man/dynamic-deps.mk: Makefile && t=$*.td \ && rm -rf $$t \ && $(MKDIR_P) $$t \ - && (cd $$t && $(LN_S) '$(abs_top_builddir)/src/'$$prog $$argv) \ + && (cd $$t && $(LN_S) '$(abs_top_builddir)/src/'$$prog$(EXEEXT) \ + $$argv$(EXEEXT)) \ && $(run_help2man) \ --source='$(PACKAGE_STRING)' \ --include=$(srcdir)/man/$$name.x \ - --output=$$t/$$name.1 $$t/$$argv \ - --info-page='coreutils \(aq'$$name' invocation\(aq' \ + --output=$$t/$$name.1 \ + --info-page='\(aq(coreutils) '$$name' invocation\(aq' \ + $$t/$$argv$(EXEEXT) \ && sed \ -e 's|$*\.td/||g' \ -e '/For complete documentation/d' \ diff --git a/man/rm.x b/man/rm.x index 6da82c42..d3a77817 100644 --- a/man/rm.x +++ b/man/rm.x @@ -1,4 +1,4 @@ -'\" Copyright (C) 1998-2014 Free Software Foundation, Inc. +'\" Copyright (C) 1998-2015 Free Software Foundation, Inc. '\" '\" This is free software. You may redistribute copies of it under the terms '\" of the GNU General Public License . diff --git a/man/stdbuf.x b/man/stdbuf.x index 0f50219b..1076c82c 100644 --- a/man/stdbuf.x +++ b/man/stdbuf.x @@ -1,4 +1,4 @@ -'\" Copyright (C) 2009-2014 Free Software Foundation, Inc. +'\" Copyright (C) 2009-2015 Free Software Foundation, Inc. '\" '\" This is free software. You may redistribute copies of it under the terms '\" of the GNU General Public License . @@ -13,5 +13,5 @@ Run COMMAND, with modified buffering operations for its standard streams. .br This will immedidately display unique entries from access.log [BUGS] -On GLIBC platforms, specifying a buffer size, i.e. using fully buffered mode +On GLIBC platforms, specifying a buffer size, i.e., using fully buffered mode will result in undefined operation. diff --git a/man/sync.x b/man/sync.x index 7947bb77..18ee3fc4 100644 --- a/man/sync.x +++ b/man/sync.x @@ -1,6 +1,9 @@ [NAME] -sync \- flush file system buffers +sync \- Synchronize cached writes to persistent storage [DESCRIPTION] .\" Add any additional description here +[BUGS] +Persistence guarantees vary per system. +See the system calls below for more details. [SEE ALSO] -sync(2) +fdatasync(2), fsync(2), sync(2), syncfs(2) diff --git a/man/timeout.x b/man/timeout.x index 41b42954..cefa1228 100644 --- a/man/timeout.x +++ b/man/timeout.x @@ -5,4 +5,4 @@ timeout \- run a command with a time limit [SEE ALSO] kill(1) [BUGS] -Some platforms don't curently support timeouts beyond 2038 +Some platforms don't curently support timeouts beyond the year 2038. diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog index 410774b4..d38b4d97 100644 --- a/old/fileutils/ChangeLog +++ b/old/fileutils/ChangeLog @@ -8390,7 +8390,7 @@ ----- - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 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 ccfd13d8..32e65e79 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-2014 Free Software Foundation, Inc. + Copyright (C) 1990-2015 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 5ae36d97..596fe2ef 100644 --- a/old/fileutils/NEWS +++ b/old/fileutils/NEWS @@ -749,7 +749,7 @@ Major changes in release 3.3: ======================================================================== -Copyright (C) 1992-2014 Free Software Foundation, Inc. +Copyright (C) 1992-2015 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 bb203b1e..68a2cecd 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-2014 Free Software Foundation, Inc. + Copyright (C) 1994-2015 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 3e9261f6..4719199f 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-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 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 35895ef9..57f44a39 100644 --- a/old/sh-utils/NEWS +++ b/old/sh-utils/NEWS @@ -273,7 +273,7 @@ Major changes in release 1.7: ======================================================================== -Copyright (C) 1992-2014 Free Software Foundation, Inc. +Copyright (C) 1992-2015 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 b2231a2f..aa69a6be 100644 --- a/old/textutils/ChangeLog +++ b/old/textutils/ChangeLog @@ -8745,7 +8745,7 @@ Sat Dec 16 15:15:50 1989 David J. MacKenzie (djm at hobbes.ai.mit.edu) ----- - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 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 26e7c700..dba202a1 100644 --- a/old/textutils/NEWS +++ b/old/textutils/NEWS @@ -461,7 +461,7 @@ Major changes in release 1.4: ======================================================================== -Copyright (C) 1992-2014 Free Software Foundation, Inc. +Copyright (C) 1992-2015 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 1304763a..ac8ff4a4 100644 --- a/po/ChangeLog-2007 +++ b/po/ChangeLog-2007 @@ -246,7 +246,7 @@ ----- - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 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 87cd254e..041b8e5c 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -34,6 +34,7 @@ ro ru sk sl +sr sv tr uk diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 5b0ce380..65184f65 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -8,13 +8,14 @@ # Please note that the actual code of GNU gettext is covered by the GNU # General Public License and is *not* in the public domain. # -# Origin: gettext-0.18 -GETTEXT_MACRO_VERSION = 0.18 +# Origin: gettext-0.19 +GETTEXT_MACRO_VERSION = 0.19 PACKAGE = @PACKAGE@ VERSION = @VERSION@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +SED = @SED@ SHELL = /bin/sh @SET_MAKE@ @@ -76,6 +77,16 @@ POTFILES = \ CATALOGS = @CATALOGS@ +POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot +POFILESDEPS_yes = $(POFILESDEPS_) +POFILESDEPS_no = +POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT)) + +DISTFILESDEPS_ = update-po +DISTFILESDEPS_yes = $(DISTFILESDEPS_) +DISTFILESDEPS_no = +DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO)) + # Makevars gets inserted here. (Don't remove this line!) .SUFFIXES: @@ -96,14 +107,14 @@ CATALOGS = @CATALOGS@ mv t-$@ $@ -all: check-macro-version all-@USE_NLS@ +all: all-@USE_NLS@ all-yes: stamp-po all-no: # Ensure that the gettext macros and this Makefile.in.in are in sync. -check-macro-version: - @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ +CHECK_MACRO_VERSION = \ + test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ exit 1; \ } @@ -123,6 +134,7 @@ check-macro-version: # $(POFILES) has been designed to not touch files that don't need to be # changed. stamp-po: $(srcdir)/$(DOMAIN).pot + @$(CHECK_MACRO_VERSION) test ! -f $(srcdir)/$(DOMAIN).pot || \ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) @test ! -f $(srcdir)/$(DOMAIN).pot || { \ @@ -137,11 +149,29 @@ stamp-po: $(srcdir)/$(DOMAIN).pot # This target rebuilds $(DOMAIN).pot; it is an expensive operation. # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. +# The determination of whether the package xyz is a GNU one is based on the +# heuristic whether some file in the top level directory mentions "GNU xyz". +# If GNU 'find' is available, we avoid grepping through monster files. $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed - if true; then \ - package_gnu='GNU '; \ + package_gnu="$(PACKAGE_GNU)"; \ + test -n "$$package_gnu" || { \ + if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ + LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \ + -size -10000000c -exec grep 'GNU @PACKAGE@' \ + /dev/null '{}' ';' 2>/dev/null; \ + else \ + LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ + fi; \ + } | grep -v 'libtool:' >/dev/null; then \ + package_gnu=yes; \ + else \ + package_gnu=no; \ + fi; \ + }; \ + if test "$$package_gnu" = "yes"; then \ + package_prefix='GNU '; \ else \ - package_gnu=''; \ + package_prefix=''; \ fi; \ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ @@ -161,7 +191,7 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ - --package-name="$${package_gnu}@PACKAGE@" \ + --package-name="$${package_prefix}@PACKAGE@" \ --package-version='@VERSION@' \ --msgid-bugs-address="$$msgid_bugs_address" \ ;; \ @@ -189,9 +219,10 @@ $(srcdir)/$(DOMAIN).pot: # This target rebuilds a PO file if $(DOMAIN).pot has changed. # Note that a PO file is not touched if it doesn't need to be changed. -$(POFILES): $(srcdir)/$(DOMAIN).pot +$(POFILES): $(POFILESDEPS) @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ + test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ cd $(srcdir) \ @@ -352,7 +383,7 @@ maintainer-clean: distclean distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: - $(MAKE) update-po + test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS) @$(MAKE) dist2 # This is a separate target because 'update-po' must be executed before. dist2: stamp-po $(DISTFILES) diff --git a/po/Makevars b/po/Makevars index efe18d01..e0330ff1 100644 --- a/po/Makevars +++ b/po/Makevars @@ -42,6 +42,13 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ \ # their copyright. COPYRIGHT_HOLDER = Free Software Foundation, Inc. +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = + # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: # - Strings which are not entire sentences, see the maintainer guidelines @@ -61,3 +68,27 @@ MSGID_BUGS_ADDRESS = bug-coreutils@gnu.org # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. EXTRA_LOCALE_CATEGORIES = LC_TIME + +# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' +# context. Possible values are "yes" and "no". Set this to yes if the +# package uses functions taking also a message context, like pgettext(), or +# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. +USE_MSGCTXT = no + +# These options get passed to msgmerge. +# Useful options are in particular: +# --previous to keep previous msgids of translated messages, +# --quiet to reduce the verbosity. +MSGMERGE_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = yes + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = yes diff --git a/po/POTFILES.in b/po/POTFILES.in index d380deed..abec1096 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,5 @@ # List of files which contain translatable strings. -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # These are nominally temporary... lib/argmatch.c diff --git a/po/Rules-quot b/po/Rules-quot index af524879..7b92c7e4 100644 --- a/po/Rules-quot +++ b/po/Rules-quot @@ -1,3 +1,4 @@ +# This file, Rules-quot, can be copied and used freely without restrictions. # Special Makefile rules for English message catalogs with quotation marks. DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot @@ -14,13 +15,23 @@ en@boldquot.po-update: en@boldquot.po-update-en .insert-header.po-update-en: @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ - if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ + if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ tmpdir=`pwd`; \ echo "$$lang:"; \ ll=`echo $$lang | sed -e 's/@.*//'`; \ LC_ALL=C; export LC_ALL; \ cd $(srcdir); \ - if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ + if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \ + | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \ + { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \ + $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \ + ;; \ + *) \ + $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \ + ;; \ + esac } 2>/dev/null > $$tmpdir/$$lang.new.po \ + ; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ diff --git a/po/af.gmo b/po/af.gmo index 18647b81..df05a147 100644 Binary files a/po/af.gmo and b/po/af.gmo differ diff --git a/po/af.po b/po/af.po index 5964bea2..2c169f07 100644 --- a/po/af.po +++ b/po/af.po @@ -3,11 +3,12 @@ # This file is distributed under the same license as the PACKAGE package. # Petri Jooste , 2004. # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils 5.2.1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2004-03-17 11:58+0200\n" "Last-Translator: Petri Jooste \n" "Language-Team: Afrikaans \n" @@ -35,18 +36,18 @@ msgstr "Geldige parameters is soos volg:" msgid "error closing file" msgstr "toevoerlêer %s word toegemaak" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "skryffout" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, fuzzy, c-format msgid "preserving permissions for %s" msgstr "toegangsregte vir %s word gestel" @@ -237,57 +238,62 @@ msgstr "" msgid "Unknown error" msgstr "Onbekende stelselfout" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: opsie `%s' is dubbelsinnig\n" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: opsie `-W %s' is dubbelsinnig\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: opsie `--%s' laat nie 'n parameter toe nie\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: opsie `%c%s' laat nie 'n parameter toe nie\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, fuzzy, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: opsie `%s' benodig 'n parameter\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: onbekende opsie `--%s'\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: onbekende opsie `%c%s'\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ongeldige opsie -- %c\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opsie benodig 'n parameter -- %c\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: opsie `-W %s' is dubbelsinnig\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: opsie `-W %s' laat nie 'n parameter toe nie\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, fuzzy, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: opsie `%s' benodig 'n parameter\n" @@ -297,13 +303,13 @@ msgstr "%s: opsie `%s' benodig 'n parameter\n" msgid "cannot change permissions of %s" msgstr "kan nie toegangsregte van %s verander nie" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "Kan nie lêergids %s skep nie." -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "geheue uitgeput" @@ -352,6 +358,12 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: seek het misluk" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: leesfout" + #: lib/regcomp.c:131 msgid "Success" msgstr "" @@ -466,7 +478,7 @@ msgstr "^[jJ]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "toegangsregte vir %s word gestel" @@ -909,7 +921,7 @@ msgid "" "Base64 encode or decode FILE, or standard input, to standard output.\n" msgstr "" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -919,15 +931,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Met geen LÊER, of wanneer die LÊER - is, lees standaardtoevoer.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -936,51 +940,51 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "leesfout" -#: src/base64.c:231 +#: src/base64.c:229 #, fuzzy, c-format msgid "invalid input" msgstr "ongeldige gebruiker" -#: src/base64.c:268 +#: src/base64.c:266 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "ongeldige keepgrootte: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, fuzzy, c-format msgid "extra operand %s" msgstr "ekstra operand `%s'" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "standaard-toevoer word nou toegemaak" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "" @@ -1023,39 +1027,45 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, fuzzy, c-format msgid "missing operand" msgstr "lêerparameter ontbreek" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Gebruik so: %s [OPSIE]... [LÊER]...\n" #: src/cat.c:92 #, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"Druk die geselekteerde dele van reëls uit elke LÊER na standaardafvoer.\n" +"\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1073,7 +1083,7 @@ msgstr "" " -n, --number nommer al die afvoerreëls\n" " -s, --squeeze-blank nooit meer as een leë reël word gewys nie\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1086,7 +1096,7 @@ msgstr "" " -v, --show-nonprinting gebruik ^ and M- notasie, behalwe vir LFD and " "TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1095,17 +1105,18 @@ msgid "" " %s Copy standard input to standard output.\n" msgstr "" -#: src/cat.c:326 +#: src/cat.c:327 #, fuzzy, c-format msgid "cannot do ioctl on %s" msgstr "kan nie ioctl uitvoer op `%s' nie" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "standaard-afvoer" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: Die toevoerlêernaam is 'n afvoerlêer." @@ -1117,10 +1128,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "" @@ -1134,8 +1145,8 @@ msgstr "kon nie attribute van %s verkry nie" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "kon nie attribute van %s verkry nie" @@ -1150,13 +1161,13 @@ msgstr "" 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:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "kan nie toegang verkry na %s nie" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "kan nie gids %s lees nie" @@ -1172,7 +1183,7 @@ msgstr "toegangsregte van %s word verander" msgid "fts_read failed" msgstr "fts_read het misluk" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, fuzzy, c-format msgid "fts_close failed" @@ -1263,7 +1274,7 @@ msgid "-R -h requires -P" msgstr "" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, fuzzy, c-format msgid "missing operand after %s" @@ -1280,9 +1291,8 @@ msgid "conflicting security context specifiers given" msgstr "" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "kon nie attribute van %s verkry nie" @@ -1542,17 +1552,17 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "ongeldige groep %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, fuzzy, c-format msgid "invalid group list %s" msgstr "ongeldige groep %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1561,7 +1571,7 @@ msgstr "" "Gebruik so: %s NUWEBEGINPUNT [BEVEL...]\n" " of: %s OPSIE\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1569,13 +1579,20 @@ msgstr "" "Loop BEVEL met wortelgids gestel volgens NUWEBEGINPUNT.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:207 #, fuzzy msgid "" "\n" @@ -1584,42 +1601,47 @@ msgstr "" "\n" "As geen bevel gegee is nie, loop ``${SHELL} -i'' (verstek: /bin/sh).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "kan nie wortelgids verander na %s toe nie" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "kan nie chdir uitvoer na wortelgids toe nie" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "kan nie aanvullende groeplys verkry nie" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" -msgstr "kan nie die aanvullende groep stel nie" +msgid "failed to set supplemental groups" +msgstr "kan nie aanvullende groeplys verkry nie" -#: src/chroot.c:402 +#: src/chroot.c:418 #, fuzzy, c-format msgid "failed to set group-ID" msgstr "kan nie groep-ID na %ld verander nie" -#: src/chroot.c:405 +#: src/chroot.c:421 #, fuzzy, c-format msgid "failed to set user-ID" msgstr "kon nie %s oopmaak nie" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, fuzzy, c-format msgid "failed to run command %s" msgstr "kan nie bevel %s uitvoer nie" @@ -1660,7 +1682,16 @@ msgstr "Gebruik so: %s [OPSIE]... LÊER1 LÊER2 \n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Vergelyk gesorteerde lêers LÊER1 en LÊER2 reël-vir-reël.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Met geen LÊER, of wanneer die LÊER - is, lees standaardtoevoer.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1668,7 +1699,7 @@ msgid "" "and column three contains lines common to both files.\n" msgstr "" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1676,7 +1707,7 @@ msgid "" " -3 suppress column 3 (lines that appear in both files)\n" msgstr "" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1684,17 +1715,17 @@ msgid "" " --nocheck-order do not check that the input is correctly sorted\n" msgstr "" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1703,314 +1734,328 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "" -#: src/comm.c:407 +#: src/comm.c:411 #, fuzzy, c-format msgid "multiple delimiters specified" msgstr "veelvuldige afvoerlêers is gespesifiseer" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "kan nie lseek op %s doen nie" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "fout met die les van %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "kan nie lseek op %s doen nie" +msgid "error reading %s" +msgstr "fout met die les van %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "fout met die skryf na %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "fout met die les van %s" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "kon nie attribute van %s verkry nie" -#: src/copy.c:383 +#: src/copy.c:478 #, fuzzy, c-format msgid "%s: write failed" msgstr "'write' het gefaal" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "kon nie %s oopmaak nie" -#: src/copy.c:687 +#: src/copy.c:789 #, fuzzy, c-format msgid "clearing permissions for %s" msgstr "toegangsregte vir %s word gestel" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "eienaarskap van %s kon nie behou word nie" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "kon nie lêer %s opspoor nie" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "outeurskap van %s kon nie behou word nie" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, fuzzy, c-format msgid "failed to set default file creation context to %s" msgstr "kon nie attribute van %s verkry nie" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "kon nie attribute van %s verkry nie" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "kon nie attribute van %s verkry nie" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "kan nie %s oopmaak om te lees nie" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "kan nie fstat op %s uitvoer nie" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "lêer %s word oorgeslaan, want dit is vervang tydens kopieëring" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "kan nie %s verwyder nie" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "%s is verwyder.\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "kan nie 'n gewone lêer %s skep nie" -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" msgstr "kon nie %s oopmaak nie" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "lêertye van %s word behou" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "kon nie %s oopmaak nie" -#: src/copy.c:1580 +#: src/copy.c:1669 #, fuzzy, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: oorskryf %s, moet modus %04lo ter syde gestel word? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: oorskryf %s?" -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr "(rugsteun: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "kon nie vaste skakel %s na %s skep nie" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "kan nie stat %s uitvoer nie" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "lêergids %s word oorgeslaan" -#: src/copy.c:1791 +#: src/copy.c:1880 #, 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:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s en %s is dieselfde lêer" -#: src/copy.c:1939 +#: src/copy.c:2019 #, 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:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "die pasgeskepte %s sal nie met %s oorskryf word nie" -#: src/copy.c:1975 +#: src/copy.c:2055 #, 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:1989 +#: src/copy.c:2069 #, 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:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "kan nie rugsteun neem van %s nie" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, 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:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "waarskuwing: bronlêer %s is meer as een keer gespesifiseer" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "kan nie %s skuif na %s nie" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "sikliese simboliese skakel %s kan nie gekopieer word nie" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "kon nie simboliese skakel %s na %s skep nie" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "kan nie die pyp %s skep nie" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "kan nie spesiale lêer %s skep nie" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "simboliese skakel %s kan nie gelees word nie" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "kon nie simboliese skakel %s skep nie" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s het 'n onbekende lêertipe" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "kan nie %s ont-rugsteun nie" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (ont-rugsteun)\n" @@ -2020,25 +2065,25 @@ msgstr "%s -> %s (ont-rugsteun)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, fuzzy, c-format msgid "unknown program %s" msgstr "onbekende gebruiker-id: %s" @@ -2225,8 +2270,8 @@ msgstr "%s bestaan maar is nie 'n lêergids nie" msgid "failed to access %s" msgstr "kon nie %s oopmaak nie" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, fuzzy, c-format msgid "missing file operand" msgstr "lêerparameter ontbreek" @@ -2298,138 +2343,147 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "toevoer het verdwyn" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: reëlnommer buite bereik" -#: src/csplit.c:713 +#: src/csplit.c:714 #, fuzzy, c-format msgid "%s: %s: line number out of range" msgstr "%s: `%s': reëlnommer buite bereik" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr "by herhaling %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, fuzzy, c-format msgid "%s: %s: match not found" msgstr "%s: `%s': patroon nie gevind nie" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "fout in soektog met reëlmatige uitdrukking" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, fuzzy, c-format msgid "write error for %s" msgstr "skryffout vir `%s'" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: 'n heelgetal is verwag na die skeisimbool" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: `}' word benodig in herhaaltelling" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: tussen `{' en `}' moet 'n heelgetal wees" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: afsluit-skeisimbool `%c' ontbreek" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: ongeldige reëlmatige uitdrukking: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: ongeldige patroon" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: reëlnommer moet groter as nul wees" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "ontbrekende omskakelingaanduider in suffiks" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "ontbrekende omskakelingaanduider in suffiks: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "ontbrekende omskakelingaanduider in suffiks: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "ontbrekende omskakelingaanduider in suffiks: %c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "te veel %% omskakelingaanduiders in suffiks" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "ontbrekende %% omskakelingaanduider in suffiks" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: ongeldige getal" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "ongeldige nommer %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Gebruik so: %s [OPSIE]... LÊER PATROON...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Lees vanaf standaardtoevoer as LÊER gegee is as -. Elke PATROON kan wees:\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2437,28 +2491,21 @@ msgid "" " -k, --keep-files do not remove output files on errors\n" msgstr "" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Lees vanaf standaardtoevoer as LÊER gegee is as -. Elke PATROON kan wees:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 msgid "" "\n" +"Each PATTERN may be:\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" @@ -2485,14 +2532,14 @@ msgstr "" "Druk die geselekteerde dele van reëls uit elke LÊER na standaardafvoer.\n" "\n" -#: src/cut.c:182 +#: src/cut.c:183 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:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2500,7 +2547,7 @@ msgid "" " -n (ignored)\n" msgstr "" -#: src/cut.c:193 +#: src/cut.c:194 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2509,14 +2556,14 @@ msgstr "" " --verbose druk 'n diagnostiese boodskap op standaardafvoer\n" " direk voor elke afvoerlêer oopgemaak word\n" -#: src/cut.c:197 +#: src/cut.c:198 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:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2524,7 +2571,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:210 +#: src/cut.c:211 msgid "" "Each range is one of:\n" "\n" @@ -2532,59 +2579,57 @@ msgid "" " 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:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "ongeldige greep of veldlys" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "" -#: src/cut.c:320 +#: src/cut.c:319 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "ongeldige opsie %s vir wydte" -#: src/cut.c:334 -#, fuzzy +#: src/cut.c:333 src/numfmt.c:1417 +#, fuzzy, c-format msgid "invalid decreasing range" msgstr "ongeldige modusstring: %s" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "greepuitwyking %s is te groot" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "veldnommer %s is te groot" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "slegs een soort lys mag gespesifiseer word" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "die verdeler mag net een karakter wees" -#: src/cut.c:787 +#: src/cut.c:786 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:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2592,11 +2637,11 @@ msgstr "" "om nie-afgeslote reëls te onderdruk, maak slegs sin\n" "\twanneer dit op velde van toepassing gemaak word" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "ontbrekende lys van velde" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "ontbrekende lys van posisies" @@ -2613,34 +2658,48 @@ 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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" msgstr "" -#: src/date.c:142 +#: src/date.c:138 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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" -#: src/date.c:147 +#: src/date.c:145 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 (UTC)\n" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" +msgstr "" + +#: src/date.c:149 +msgid "" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" +msgstr "" + +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" msgstr "" #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2648,7 +2707,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2656,7 +2715,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2664,14 +2723,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:177 +#: src/date.c:183 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 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2679,7 +2738,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2687,7 +2746,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2698,7 +2757,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2706,7 +2765,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:209 +#: src/date.c:215 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" @@ -2714,7 +2773,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2722,7 +2781,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2734,7 +2793,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2745,7 +2804,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2754,7 +2813,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -2768,36 +2827,36 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "standaardtoevoer" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, fuzzy, c-format msgid "invalid date %s" msgstr "ongeldige datum `%s'" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, fuzzy, c-format msgid "multiple output formats specified" msgstr "veelvuldige afvoerlêers is gespesifiseer" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2805,23 +2864,23 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "kon nie die datum stel nie" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "" -#: src/dd.c:527 +#: src/dd.c:556 #, fuzzy, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2830,7 +2889,7 @@ msgstr "" "Gebruik so: %s [GETAL]... \n" " of: %s OPSIE\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -2841,7 +2900,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:570 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -2851,8 +2910,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=LÊER lees vanaf LÊER in plaas van stdin\n" " obs=GREPE skryf GREPE(aantal) grepe op 'n slag\n" @@ -2862,7 +2923,7 @@ msgstr "" " skip=BLOKKE slaan BLOKKE(aantal) ibs-grootte blokke oor aan die begin " "van toevoer\n" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -2873,7 +2934,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:561 +#: src/dd.c:592 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -2901,7 +2962,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:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2911,7 +2972,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2920,124 +2981,104 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:593 +#: src/dd.c:624 #, fuzzy msgid " directory fail unless a directory\n" msgstr "%s: hierdie bestemming is nie 'n lêergids nie" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 +#: src/dd.c:661 #, 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:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" - -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:754 -#, fuzzy, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "afgekapte rekord" -msgstr[1] "afgekapte rekord" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "" @@ -3051,168 +3092,182 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr "" -#: src/dd.c:877 +#: src/dd.c:809 +#, c-format +msgid ", %.6f s, %s/s" +msgstr "" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" + +#: src/dd.c:834 +#, fuzzy, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "afgekapte rekord" +msgstr[1] "afgekapte rekord" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "toevoerlêer %s word toegemaak" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "afvoerlêer %s word toegemaak" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "besig om te skryf na %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, fuzzy, c-format msgid "unrecognized operand %s" msgstr "onbekende opsie %s" -#: src/dd.c:1285 +#: src/dd.c:1376 #, fuzzy msgid "invalid conversion" msgstr "ongeldige omskakeling: %s" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 #, fuzzy msgid "invalid input flag" msgstr "ongeldige nommer by begin van veld" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 #, fuzzy msgid "invalid output flag" msgstr "ongeldige groep " -#: src/dd.c:1294 +#: src/dd.c:1385 #, fuzzy -msgid "invalid status flag" +msgid "invalid status level" msgstr "ongeldige gebruiker %s" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "ongeldige nommer %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1417 +#: src/dd.c:1520 #, fuzzy, c-format msgid "cannot combine block and unblock" msgstr "die gebruikernaam en groepnaam mag nie albei ontbreek nie" -#: src/dd.c:1419 +#: src/dd.c:1522 #, fuzzy, c-format msgid "cannot combine lcase and ucase" msgstr "die gebruikernaam en groepnaam mag nie albei ontbreek nie" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" " of mt_type=0x%0lx -- see for the list of types" msgstr "" -#: src/dd.c:1670 +#: src/dd.c:1773 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: kan nie teruggaan nie" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, fuzzy, c-format msgid "%s: cannot seek" msgstr "%s: kan nie verwyder nie" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1903 +#: src/dd.c:2006 #, fuzzy, c-format msgid "setting flags for %s" msgstr "die tyd van %s is verstel" -#: src/dd.c:1957 +#: src/dd.c:2060 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: kan nie skuif tot by uitwyking %s nie" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2195 +#: src/dd.c:2311 #, fuzzy, c-format msgid "fsync failed for %s" msgstr "kon nie %s oopmaak nie" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "kon nie %s oopmaak nie" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, fuzzy, c-format msgid "failed to discard cache for: %s" msgstr "lêertye van %s kon nie behou word nie" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "" @@ -3293,12 +3348,12 @@ msgstr "" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3306,18 +3361,18 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3326,20 +3381,33 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:1409 +#: src/df.c:1429 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" +msgstr "" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose druk 'n diagnostiese boodskap op standaardafvoer\n" +" direk voor elke afvoerlêer oopgemaak word\n" + +#: src/df.c:1439 +msgid "" " -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:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3347,26 +3415,26 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, fuzzy, c-format msgid "options %s and %s are mutually exclusive" msgstr "die --string en --check opsies is onderling uitsluitend" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Waarskuwing: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 #, fuzzy msgid "cannot read table of mounted file systems" msgstr "%s kan nie die tabel met gemonteerde lêerstelsels lees nie" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "" @@ -3459,7 +3527,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3469,7 +3537,8 @@ msgstr "" " of: %s [OPSIE]... --reference=RLÊER LÊER...\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" #: src/du.c:291 @@ -3553,62 +3622,56 @@ msgstr "" msgid "Infinity" msgstr "" -#: src/du.c:636 +#: src/du.c:657 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fts_read het misluk" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "ongeldige maksimum diepte %s" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "ongeldige heelgetalparameter `%s'" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: leesfout" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 #, fuzzy msgid "invalid zero-length file name" msgstr "ongeldige groepnaam %s" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "totaal" @@ -3721,9 +3784,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "Verander spasies in elke LÊER na keepkarakters, terwyl dit op " "standaardafvoer geskryf word.\n" @@ -3767,7 +3828,7 @@ msgid "input line is too long" msgstr "groepnaam te lank" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "" @@ -3875,12 +3936,12 @@ msgstr "fout in soektog met reëlmatige uitdrukking" msgid "non-integer argument" msgstr "nie-numeriese parameter" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "deling deur nul" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Stel LC_ALL='C' om die probleem te systap" @@ -3891,31 +3952,31 @@ msgid "the strings compared were %s and %s" msgstr "Die stringe wat vergelyk is, is %s en %s." #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, fuzzy, c-format msgid "%s is not a valid positive integer" msgstr "`%s' is nie 'n geldige positiewe heelgetal nie" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s is te groot" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -3924,7 +3985,7 @@ msgstr "" "Gebruik so: %s [GETAL]... \n" " of: %s OPSIE\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -3963,7 +4024,7 @@ msgid "" "The option -WIDTH is an abbreviated form of --width=DIGITS.\n" msgstr "" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -3971,7 +4032,7 @@ msgid "" " -s, --split-only split long lines, but do not refill\n" msgstr "" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -3980,34 +4041,35 @@ msgid "" " -g, --goal=WIDTH goal width (default of 93% of width)\n" msgstr "" -#: src/fmt.c:359 +#: src/fmt.c:356 #, 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" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "ongeldige wydte: %s" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +#, fuzzy +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" +"Druk die geselekteerde dele van reëls uit elke LÊER na standaardafvoer.\n" +"\n" -#: src/fold.c:77 +#: src/fold.c:76 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 -#, fuzzy, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "ongeldige aantal kolomme: `%s'" #. This is a proper name. See the gettext manual, section Names. @@ -4074,19 +4136,18 @@ msgstr "kan nie gebruiker-id stel nie" msgid "%s: no such user" msgstr "%s: gebruiker bestaan nie" -#: src/head.c:109 +#: src/head.c:110 #, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "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:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4096,13 +4157,13 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:125 +#: src/head.c:126 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 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4110,48 +4171,36 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: aantal grepe is te veel" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: kan nie skuif tot by uitwyking %s nie" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "" -#: src/head.c:886 +#: src/head.c:267 #, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "" - -#: src/head.c:887 -msgid "number of lines" -msgstr "aantal reëls" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "aantal grepe" +msgid "%s: number of bytes is too large" +msgstr "%s: aantal grepe is te veel" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "ongeldige aantal reëls" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "ongeldige aantal grepe" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "ongeldige opsie -- %c" @@ -4318,7 +4367,7 @@ msgstr "kan nie eienaarskap van %s verander nie" msgid "cannot set time stamps for %s" msgstr "" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "fork-stelselroep het gefaal" @@ -4437,7 +4486,7 @@ msgstr "" msgid "target directory not allowed when installing a directory" msgstr "%s: hierdie bestemming is nie 'n lêergids nie" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "ongeldige modus %s" @@ -4472,15 +4521,19 @@ msgstr "" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +msgid "" "\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:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -4488,7 +4541,7 @@ msgid "" " -t CHAR use CHAR as input and output field separator\n" msgstr "" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -4500,14 +4553,14 @@ msgid "" " print them without trying to pair them\n" msgstr "" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 #, fuzzy msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated beëindig reëls met 'n 0-greep, i.p.v. 'n " "nuwereëlkarakter\n" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -4526,47 +4579,47 @@ msgid "" "warning message will be given.\n" msgstr "" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "ongeldige veldnommer: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, fuzzy, c-format msgid "invalid field specifier: %s" msgstr "ongeldige veld-aanduider: `%s'" -#: src/join.c:884 +#: src/join.c:890 #, fuzzy, c-format msgid "invalid file number in field spec: %s" msgstr "ongeldige wydte vir reëlnommer veld: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, fuzzy, c-format msgid "multi-character tab %s" msgstr "saamgestelde keepkarakter `%s'" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "onversoenbare keepkarakters" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "" @@ -4633,17 +4686,17 @@ msgstr "" msgid "no process ID specified" msgstr "geen proses-id is gespesifiseer" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, fuzzy, c-format msgid "invalid buffering mode %s for %s\n" msgstr "ongeldige parameter %s vir %s" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -4792,7 +4845,7 @@ msgstr "kon nie simboliese skakel %s skep nie" msgid "FIXME: unknown" msgstr "" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Gebruik so: %s [OPSIE]\n" @@ -4805,7 +4858,7 @@ msgstr "" "Druk die naam van die huidige gebruiker.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "geen gebruikersnaam" @@ -4815,7 +4868,7 @@ msgstr "geen gebruikersnaam" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -4824,101 +4877,101 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "ongeldige reëlwydte: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "ongeldige keepgrootte: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "ongeldige tydformaatstring: %s" -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "Geldige parameters is soos volg:" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "onbekende voorvoegsel: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "Kan nie lêergids %s oopmaak nie." -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "" -#: src/ls.c:2581 +#: src/ls.c:2578 #, fuzzy, c-format msgid "%s: not listing already-listed directory" msgstr "%s: kan nie die gids oorskryf nie" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "lêergids %s word gelees" -#: src/ls.c:2673 +#: src/ls.c:2670 #, fuzzy, c-format msgid "closing directory %s" msgstr "lêergids %s word oorgeslaan" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "" -#: src/ls.c:4781 +#: src/ls.c:4775 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:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -4927,7 +4980,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -4941,18 +4994,19 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4798 msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -4962,11 +5016,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -4975,7 +5029,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -4983,7 +5037,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -4996,7 +5050,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5008,7 +5062,7 @@ msgid "" " -k, --kibibytes default to 1024-byte blocks for disk usage\n" msgstr "" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5018,7 +5072,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5029,7 +5083,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -5041,7 +5095,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5049,21 +5103,21 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4886 +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -5077,31 +5131,32 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4908 +#: src/ls.c:4904 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:4912 +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4919 +#: src/ls.c:4915 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 security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5110,7 +5165,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5139,47 +5194,52 @@ msgstr "" 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 "" "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/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" +"\n" +" -B, --binary skryf binêre data na die konsole-toestel.\n" +"\n" -#: src/md5sum.c:178 +#: src/md5sum.c:180 #, fuzzy -msgid " -b, --binary read in binary mode\n" +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr "" "\n" " -B, --binary skryf binêre data na die konsole-toestel.\n" "\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -5191,97 +5251,98 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: MISLUKTE open of lees\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "GEFAAL" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "OK" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, fuzzy, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % 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:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, 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:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, 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" @@ -5314,22 +5375,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "kon nie attribute van %s verkry nie" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "lêertye van %s kon nie behou word nie" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "gids %s is geskep" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -5500,7 +5561,7 @@ msgstr "te veel parameters" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" @@ -5612,9 +5673,7 @@ 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" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "Verander spasies in elke LÊER na keepkarakters, terwyl dit op " "standaardafvoer geskryf word.\n" @@ -5691,27 +5750,27 @@ msgstr "ongeldige styl vir lyfnommering: %s" msgid "invalid footer numbering style: %s" msgstr "ongeldige styl vir voetnommering: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "ongeldige beginreëlnommer: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "ongeldige inkrement vir reëlnommers: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "ongeldige aantal leë reëls: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "ongeldige wydte vir reëlnommer veld: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "ongeldige reëlnommeringformaat: %s" @@ -5735,7 +5794,7 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -5747,43 +5806,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "herleiding van standaardafvoer het misluk" -#: src/nohup.c:131 +#: src/nohup.c:129 #, fuzzy, c-format msgid "ignoring input" msgstr "all parameters word geïgnoreer" -#: src/nohup.c:175 +#: src/nohup.c:173 #, fuzzy, c-format msgid "ignoring input and appending output to %s" msgstr "afvoer word bygevoeg by %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "afvoer word bygevoeg by %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "" @@ -5805,96 +5864,93 @@ msgid "" " --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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, fuzzy, c-format msgid "value too large to be converted: %s" msgstr "%s: waarde is nie volledig omgeskakel nie" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "ongeldige nommer %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "ongeldige reëlwydte: %s" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "lêertye van %s kon nie behou word nie" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "ongeldige keepgrootte: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Gebruik so: %s [OPSIE]... [GEBRUIKER]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -5902,19 +5958,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -5924,40 +5980,40 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" msgstr "" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -5966,7 +6022,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -5974,7 +6030,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -5982,7 +6038,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -5990,7 +6046,19 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -5999,9 +6067,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -6013,7 +6082,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -6028,118 +6097,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "ongeldige wydte vir formaat" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "ongeldige presisie: %s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "ongeldige reëlwydte: %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "ongeldige veldnommer: %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "ongeldige datum `%s'" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "ongeldige veldnommer: %s" +msgid "multiple field specifications" +msgstr "%s: ongeldige veldspesifikasie `%s'" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "ongeldige styl vir kopnommering: %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "geen proses-id is gespesifiseer" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "fout met die les van %s" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6148,18 +6229,17 @@ msgid "" "[b]]\n" msgstr "" -#: src/od.c:326 +#: src/od.c:327 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:333 +#: src/od.c:335 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" @@ -6168,7 +6248,7 @@ msgid "" "suffixes may be . for octal and b for multiply by 512.\n" msgstr "" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -6177,7 +6257,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -6190,7 +6270,7 @@ msgid "" " --traditional accept arguments in third form above\n" msgstr "" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -6201,7 +6281,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6211,7 +6291,7 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -6220,7 +6300,7 @@ msgid "" " c printable character or backslash escape\n" msgstr "" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6229,7 +6309,7 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -6238,14 +6318,14 @@ msgid "" "for sizeof(double) or L for sizeof(long double).\n" msgstr "" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -6258,55 +6338,55 @@ msgid "" "and so on for G, T, P, E, Z, Y.\n" msgstr "" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, fuzzy, c-format msgid "invalid type string %s" msgstr "ongeldige tipe-string `%s'" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte integral type" msgstr "" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte floating point type" msgstr "" -#: src/od.c:869 +#: src/od.c:872 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "ongeldige karakter `%c' in tipe-string `%s'" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "" -#: src/od.c:1650 +#: src/od.c:1658 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "" @@ -6326,7 +6406,6 @@ msgstr "standaardtoevoer is gesluit" 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 "" "Verander spasies in elke LÊER na keepkarakters, terwyl dit op " "standaardafvoer geskryf word.\n" @@ -6462,12 +6541,12 @@ msgstr "Wanneer" msgid "Where" msgstr "Waar" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Gebruik so: %s [OPSIE]... [GEBRUIKER]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6477,7 +6556,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6486,7 +6565,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -6494,96 +6573,96 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:597 +#: src/pinky.c:596 #, 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 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" -#: src/pr.c:910 +#: src/pr.c:907 #, fuzzy, c-format msgid "invalid page range %s" msgstr "ongeldige tipe-string `%s'" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "`-l PAGE_LENGTH' ongeldige aantal reëls: `%s'" -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "`-N NUMBER' ongeldige beginreëlnommer: `%s'" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "`-o MARGIN' ongeldige lynuitwyking: `%s'" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "`-w PAGE_WIDTH' ongeldige aantal karakters: `%s'" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "`-W PAGE_WIDTH' ongeldige aantal karakters: `%s'" -#: src/pr.c:1096 +#: src/pr.c:1059 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" -#: src/pr.c:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" -#: src/pr.c:1196 +#: src/pr.c:1166 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "Bladsywydte te nou" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" -#: src/pr.c:2380 +#: src/pr.c:2350 #, fuzzy, c-format msgid "page number overflow" msgstr "veldnommer is nul" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6593,7 +6672,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6603,7 +6682,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6615,7 +6694,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -6628,16 +6707,21 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2798 +#: src/pr.c:2769 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2775 +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -6647,7 +6731,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -6656,7 +6740,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -6667,17 +6751,22 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2828 +#: src/pr.c:2802 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6691,7 +6780,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -6700,16 +6789,6 @@ msgid "" " with -S or -s\n" msgstr "" -#: src/pr.c:2853 -#, fuzzy -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"Met geen LÊER, of wanneer die LÊER - is, lees standaardtoevoer.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -6839,15 +6918,20 @@ msgid "" "files.\n" msgstr "" -#: src/ptx.c:1830 +#: src/ptx.c:1831 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:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -6855,7 +6939,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -6865,7 +6949,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -6873,20 +6957,16 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Met geen LÊER, of wanneer die LÊER - is, lees standaardtoevoer.\n" - #: src/ptx.c:1951 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "ongeldige wydte: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "ongeldige reëlwydte: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -6910,7 +6990,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "kon nie %s oopmaak nie" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, fuzzy, c-format msgid "failed to stat %s" msgstr "kon nie %s oopmaak nie" @@ -6930,8 +7010,8 @@ msgstr "parameters wat nie opsies is nie word geïgnoreer" msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Gebruik so: %s [OPSIE]... LÊER...\n" @@ -7120,16 +7200,16 @@ msgid "" msgstr "" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " -msgstr[0] "" -msgstr[1] "" +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " +msgstr[0] "%s: verwyder %s %s? " +msgstr[1] "%s: verwyder %s %s? " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: verwyder %s %s? " msgstr[1] "%s: verwyder %s %s? " @@ -7307,12 +7387,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "ongeldige wisselpunt parameter: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s het 'n onbekende lêertipe" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -7328,7 +7408,16 @@ msgid "" "for even very expensive hardware probing to recover the data.\n" msgstr "" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Met geen LÊER, of wanneer die LÊER - is, lees standaardtoevoer.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7337,7 +7426,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -7346,11 +7435,9 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:192 +#: src/shred.c:196 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.\n" @@ -7362,7 +7449,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -7373,7 +7460,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7385,7 +7472,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7394,7 +7481,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -7406,134 +7493,134 @@ msgid "" "\n" msgstr "" -#: src/shred.c:241 +#: src/shred.c:243 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:340 +#: src/shred.c:342 #, fuzzy, c-format msgid "%s: fdatasync failed" msgstr "%s: seek het misluk" -#: src/shred.c:351 +#: src/shred.c:353 #, fuzzy, c-format msgid "%s: fsync failed" msgstr "%s: seek het misluk" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: kan nie teruggaan nie" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: pass %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: fout tydens skryfbewerking by uitwyking %s" -#: src/shred.c:549 +#: src/shred.c:551 #, fuzzy, c-format msgid "%s: lseek failed" msgstr "%s: seek het misluk" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: lêer te groot" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: pass %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: pass %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, fuzzy, c-format msgid "%s: fstat failed" msgstr "'stat' het gefaal" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: ongeldige lêertipe:" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: lêer het negatiewe grootte" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: fout tydens afeindiging" -#: src/shred.c:989 +#: src/shred.c:991 #, fuzzy, c-format msgid "%s: fcntl failed" msgstr "%s: seek het misluk" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: besig om te verwyder" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: hernoem as %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, fuzzy, c-format msgid "%s: failed to remove" msgstr "%s: lêer te groot" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: is verwyder" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, fuzzy, c-format msgid "%s: failed to close" msgstr "%s: lêer te lank" -#: src/shred.c:1171 +#: src/shred.c:1173 #, fuzzy, c-format msgid "%s: failed to open for writing" msgstr "%s: lêer te lank" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: ongeldige aantal lopies" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, fuzzy, c-format msgid "multiple random sources specified" msgstr "veelvuldige afvoerlêers is gespesifiseer" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: ongeldige lêergrootte." -#: src/shuf.c:61 +#: src/shuf.c:62 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -7544,11 +7631,11 @@ msgstr "" " or: %s [OPSIE]... :GROEP LÊER...\n" " or: %s [OPSIE]... --reference=RLÊER LÊER...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -7559,37 +7646,37 @@ msgid "" " -r, --repeat output lines can be repeated\n" msgstr "" -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "te veel nie-opsie parameters" -#: src/shuf.c:431 +#: src/shuf.c:428 #, fuzzy, c-format msgid "multiple -i options specified" msgstr "veelvuldige -l of -t opsies is gespesifiseer" -#: src/shuf.c:452 -#, fuzzy, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "ongeldige nommer %s" -#: src/shuf.c:465 +#: src/shuf.c:459 #, fuzzy, c-format -msgid "invalid line count %s" +msgid "invalid line count: %s" msgstr "ongeldige reëlwydte: %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "veelvuldige afvoerlêers is gespesifiseer" -#: src/shuf.c:502 +#: src/shuf.c:496 #, fuzzy, c-format msgid "cannot combine -e and -i options" msgstr "die gebruikernaam en groepnaam mag nie albei ontbreek nie" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -7608,12 +7695,12 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, fuzzy, c-format msgid "invalid time interval %s" msgstr "ongeldige tydinterval `%s'" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "kan nie die reëletyd-horlosie lees nie" @@ -7625,13 +7712,13 @@ msgstr "" "Druk die geselekteerde dele van reëls uit elke LÊER na standaardafvoer.\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -7639,19 +7726,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:443 +#: src/sort.c:444 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:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -7659,7 +7746,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7669,19 +7756,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -7690,7 +7777,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7699,13 +7786,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -7713,7 +7800,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7728,7 +7815,7 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -7747,283 +7834,282 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:524 +#: src/sort.c:525 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:725 +#: src/sort.c:724 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "besig om te skryf na %s" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:884 +#: src/sort.c:883 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "kan nie 'n tydelike lêer skep nie" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "'open' het gefaal" -#: src/sort.c:998 +#: src/sort.c:997 #, fuzzy msgid "fflush failed" msgstr "'close' het gefaal" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "'close' het gefaal" -#: src/sort.c:1140 +#: src/sort.c:1139 #, fuzzy msgid "couldn't create temporary file" msgstr "kan nie 'n tydelike lêer skep nie" -#: src/sort.c:1179 +#: src/sort.c:1178 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "Kan nie lêergids %s skep nie." -#: src/sort.c:1252 +#: src/sort.c:1251 #, fuzzy, c-format msgid "warning: cannot remove: %s" msgstr "kan nie %s verwyder nie" -#: src/sort.c:1338 +#: src/sort.c:1337 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "ongeldige parameter: %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "dubbelsinnige parameter %s vir %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s: telling `%.*s' is te groot" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "'stat' het gefaal" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "'read' het gefaal" -#: src/sort.c:2076 +#: src/sort.c:2075 #, fuzzy, c-format msgid "string transformation failed" msgstr "stringvergelyking het gefaal" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "%s: opsie `-W %s' is dubbelsinnig\n" msgstr[1] "%s: opsie `-W %s' is dubbelsinnig\n" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "'write' het gefaal" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "" -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "standaardfout-afvoer" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "%s: kan nie teruggaan nie" -#: src/sort.c:4017 +#: src/sort.c:4016 #, fuzzy, c-format msgid "%s: invalid field specification %s" msgstr "%s: ongeldige veldspesifikasie `%s'" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "" -#: src/sort.c:4079 +#: src/sort.c:4078 #, fuzzy, c-format msgid "%s: invalid count at start of %s" msgstr "%s: ongeldige telling by begin van `%s'" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "ongeldige getal na `-'" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "ongeldige getal na `.'" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "verdwaalde karakter in veldspesifikasie" -#: src/sort.c:4403 +#: src/sort.c:4402 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "veelvuldige -l of -t opsies is gespesifiseer" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "ongeldige nommer by begin van veld" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "veldnommer is nul" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "karakteruitwyking is nul" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "ongeldige getal na `,'" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "leë keepkarakter" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, fuzzy, c-format msgid "cannot read file names from %s" msgstr "kan nie die pyp %s skep nie" -#: src/sort.c:4613 +#: src/sort.c:4612 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s: ongeldige lêertipe:" -#: src/sort.c:4619 +#: src/sort.c:4618 #, fuzzy, c-format msgid "no input from %s" msgstr "toevoerlêer %s word toegemaak" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 +#: src/split.c:224 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Gebruik so: %s [OPSIE] [TOEVOER [PREFIKS]]\n" -#: src/split.c:207 +#: src/split.c:228 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 #, fuzzy msgid "" " --verbose print a diagnostic just before each\n" @@ -8032,201 +8118,206 @@ msgstr "" " --verbose druk 'n diagnostiese boodskap op standaardafvoer\n" " direk voor elke afvoerlêer oopgemaak word\n" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "uitgange vir afvoerlêers is uitgeput" -#: src/split.c:365 +#: src/split.c:419 #, fuzzy, c-format msgid "creating file %s\n" msgstr "besig om nuwe lêer `%s' te skep\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "kon nie %s oopmaak nie" -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" msgstr "toevoerlêer %s word toegemaak" -#: src/split.c:410 +#: src/split.c:464 #, fuzzy, c-format msgid "closing output pipe" msgstr "afvoerlêer %s word toegemaak" -#: src/split.c:414 +#: src/split.c:468 #, fuzzy, c-format msgid "moving input pipe" msgstr "toevoerlêer %s word toegemaak" -#: src/split.c:416 +#: src/split.c:470 #, fuzzy, c-format msgid "closing input pipe" msgstr "toevoerlêer %s word toegemaak" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "kan nie bevel %s uitvoer nie" -#: src/split.c:427 +#: src/split.c:481 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "kon nie %s oopmaak nie" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "kan nie verdeel op meer as een manier nie" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: ongeldige aantal sekondes" -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: ongeldige getal" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: ongeldige suffikslengte" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: ongeldige aantal grepe" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: ongeldige aantal reëls" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "saamgestelde keepkarakter `%s'" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "spesiale karakterlêer" -#: src/split.c:1286 +#: src/split.c:1383 #, 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:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "ongeldige beginreëlnommer: %s" -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: ongeldige lêergrootte." -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "" -#: src/stat.c:887 +#: src/stat.c:890 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "kon nie %s oopmaak nie" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "%s: onbekende opsie `%c%s'\n" -#: src/stat.c:1184 +#: src/stat.c:1187 #, fuzzy, c-format msgid "%s: invalid directive" msgstr "%%%c: ongeldige direktief" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8237,7 +8328,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8245,30 +8336,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8276,17 +8367,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8296,7 +8387,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -8308,7 +8399,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8318,7 +8409,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8331,7 +8422,7 @@ msgid "" " %T minor device type in hex, for character/block device special files\n" msgstr "" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8346,7 +8437,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8357,7 +8448,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -8412,8 +8503,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -8438,7 +8528,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8446,96 +8536,149 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 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:535 +#: src/stty.c:543 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:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +msgid "" " 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 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:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" msgstr "" -#: src/stty.c:559 +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" + +#: src/stty.c:614 +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 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:578 +#: src/stty.c:632 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" +msgstr "" + +#: src/stty.c:637 +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:584 +#: src/stty.c:641 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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -8543,10 +8686,13 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -8554,135 +8700,249 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +msgid "" " [-]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:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:619 +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +msgid "" " [-]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:627 +#: src/stty.c:712 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:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]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:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +msgid "" " * 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr "" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:672 +#: src/stty.c:843 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" +msgstr "" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:875 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:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 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:707 +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8691,25 +8951,27 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8718,57 +8980,62 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "slegs een toestel mag gespesifiseer word" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, fuzzy, c-format msgid "invalid argument %s" msgstr "ongeldige parameter: %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, fuzzy, c-format msgid "missing argument to %s" msgstr "parameter vir `%s' ontbreek" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: fout tydens afeindiging" + +#: src/stty.c:1331 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "ongeldige reëlwydte: %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: geen grootte-inligting is beskikbaar vir hierdie toestel nie" -#: src/stty.c:1924 -#, fuzzy, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "ongeldige heelgetalparameter `%s'" #. This is a proper name. See the gettext manual, section Names. @@ -8777,25 +9044,67 @@ msgid "Kayvan Aghaiepour" msgstr "" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Druk CRC-toetssom en greeptellings van elke LÊER.\n" +"\n" + +#: src/sum.c:68 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 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Gebruik so: %s [OPSIE] [ LÊER]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" +"\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" msgstr "" -#: src/sync.c:69 +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "fout met die les van %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "kan nie verander na die null-groep nie" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "fout met die les van %s" + +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "all parameters word geïgnoreer" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -8804,15 +9113,23 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help wys hierdie teks en stop\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version wys weergawe-inligting en stop\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Met geen LÊER, of wanneer die LÊER - is, lees standaardtoevoer.\n" + +#: src/system.h:544 #, fuzzy msgid "" "\n" @@ -8821,7 +9138,7 @@ msgstr "" "Verpligte parameters vir langformaat opsies is ook verpligtend vir " "kortformaat opsies.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -8829,7 +9146,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -8838,7 +9155,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -8849,22 +9166,27 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "Full documentation at: <%s%s>\n" msgstr "" -#: src/system.h:591 +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "" + +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Probeer `%s --help' vir meer inligting.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -8881,9 +9203,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "Verander spasies in elke LÊER na keepkarakters, terwyl dit op " "standaardafvoer geskryf word.\n" @@ -8897,70 +9217,69 @@ msgid "" " -s, --separator=STRING use STRING as the separator instead of newline\n" msgstr "" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: seek het misluk" -#: src/tac.c:263 +#: src/tac.c:277 #, fuzzy, c-format msgid "record too large" msgstr "%s: lêer te groot" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "kan nie 'n tydelike lêer skep nie" -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "kon nie %s oopmaak nie" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "lêertye van %s kon nie behou word nie" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, fuzzy, c-format msgid "%s: write error" msgstr "skryffout" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "kan nie %s oopmaak om te lees nie" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "verdeler mag nie leeg wees nie" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "" -#: src/tail.c:262 +#: src/tail.c:257 #, 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" 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:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -8968,7 +9287,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -8981,14 +9300,14 @@ msgid "" " with inotify, this option is rarely useful\n" msgstr "" -#: src/tail.c:293 +#: src/tail.c:288 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 if it is inaccessible\n" msgstr "" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -8997,7 +9316,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -9008,7 +9327,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -9018,169 +9337,168 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "lêer word toegemaak: %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" -#: src/tail.c:980 +#: src/tail.c:973 #, fuzzy, c-format msgid "%s has become inaccessible" msgstr "`%s' het ontoeganklik geword" -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" -#: src/tail.c:1006 +#: src/tail.c:999 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" -#: src/tail.c:1027 +#: src/tail.c:1020 #, fuzzy, c-format msgid "%s has become accessible" msgstr "`%s' het toeganklik geword" -#: src/tail.c:1035 +#: src/tail.c:1032 #, c-format -msgid "%s has appeared; following end of new file" +msgid "%s has appeared; following new file" msgstr "" -#: src/tail.c:1046 +#: src/tail.c:1042 #, c-format -msgid "%s has been replaced; following end of new file" +msgid "%s has been replaced; following new file" msgstr "" -#: src/tail.c:1163 +#: src/tail.c:1159 #, fuzzy, c-format msgid "%s: cannot change nonblocking mode" msgstr "kan nie verander na die null-groep nie" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: lêer is afgekap" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "geen oorblywende lêers" -#: src/tail.c:1424 +#: src/tail.c:1440 #, fuzzy, c-format msgid "cannot watch parent directory of %s" msgstr "Kan nie lêergids %s skep nie." -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, fuzzy, c-format msgid "inotify resources exhausted" msgstr "geheue uitgeput" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, fuzzy, c-format msgid "cannot watch %s" msgstr "kan nie %s aanraak nie" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: vervang %s?" + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1597 #, fuzzy, c-format msgid "error reading inotify event" msgstr "fout met die les van %s" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" -#: src/tail.c:1961 -#, fuzzy, c-format -msgid "number in %s is too large" -msgstr "veldnommer %s is te groot" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +msgid "invalid maximum number of unchanged stats between opens" msgstr "" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: ongeldige PID" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: ongeldige aantal sekondes" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "ongeldige aantal kolomme: `%s'" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "kan nie %s per naam volg nie" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -9188,66 +9506,77 @@ msgid "" " -i, --ignore-interrupts ignore interrupt signals\n" msgstr "" -#: src/tee.c:71 -#, fuzzy +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Met geen LÊER, of wanneer die LÊER - is, lees standaardtoevoer.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, fuzzy, c-format msgid "missing argument after %s" msgstr "parameter vir `%s' ontbreek" -#: src/test.c:159 +#: src/test.c:161 #, fuzzy, c-format msgid "invalid integer %s" msgstr "ongeldige nommer %s" -#: src/test.c:241 +#: src/test.c:243 #, fuzzy msgid "')' expected" msgstr "')' is verwag\n" -#: src/test.c:244 +#: src/test.c:246 #, fuzzy, c-format msgid "')' expected, found %s" msgstr "')' is verwag, maar %s gevind\n" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, fuzzy, c-format msgid "%s: unary operator expected" msgstr "%s: unitêre operator is verwag\n" -#: src/test.c:329 +#: src/test.c:331 #, fuzzy msgid "-nt does not accept -l" msgstr "-nt aanvaar nie -l nie\n" -#: src/test.c:342 +#: src/test.c:344 #, fuzzy msgid "-ef does not accept -l" msgstr "-ef aanvaar nie -l nie \n" -#: src/test.c:358 +#: src/test.c:360 #, fuzzy msgid "-ot does not accept -l" msgstr "-ot aanvaar nie -l nie \n" -#: src/test.c:367 +#: src/test.c:369 #, fuzzy msgid "unknown binary operator" msgstr "onbenede binêre operator\n" -#: src/test.c:646 +#: src/test.c:648 #, fuzzy, c-format msgid "%s: binary operator expected" msgstr "%s: binêre operator is verwag\n" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -9256,20 +9585,20 @@ msgid "" " or: [ OPTION\n" msgstr "" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" msgstr "" -#: src/test.c:717 +#: src/test.c:719 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 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -9278,7 +9607,7 @@ msgid "" " EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n" msgstr "" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -9288,7 +9617,7 @@ msgid "" " STRING1 != STRING2 the strings are not equal\n" msgstr "" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -9299,7 +9628,7 @@ msgid "" " INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n" msgstr "" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -9307,7 +9636,7 @@ msgid "" " FILE1 -ot FILE2 FILE1 is older than FILE2\n" msgstr "" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -9316,7 +9645,7 @@ msgid "" " -e FILE FILE exists\n" msgstr "" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -9325,7 +9654,7 @@ msgid "" " -k FILE FILE exists and has its sticky bit set\n" msgstr "" -#: src/test.c:766 +#: src/test.c:768 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" @@ -9334,7 +9663,7 @@ msgid "" " -s FILE FILE exists and has a size greater than zero\n" msgstr "" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -9343,7 +9672,7 @@ msgid "" " -x FILE FILE exists and execute (or search) permission is granted\n" msgstr "" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -9352,33 +9681,33 @@ msgid "" "INTEGER may also be -l STRING, which evaluates to the length of STRING.\n" msgstr "" -#: src/test.c:786 +#: src/test.c:788 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 +#: src/test.c:793 msgid "test and/or [" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "" -#: src/test.c:858 +#: src/test.c:860 #, fuzzy msgid "missing ']'" msgstr "ontbrekende `]'\n" -#: src/test.c:872 +#: src/test.c:874 #, fuzzy, c-format msgid "extra argument %s" msgstr "ongeldige parameter: %s" @@ -9398,7 +9727,7 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -9407,11 +9736,11 @@ msgstr "" "Gebruik so: %s BEVEL [ARG]...\n" " of: %s OPSIE\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -9429,7 +9758,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9437,7 +9766,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -9448,7 +9777,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -9463,6 +9792,11 @@ msgstr "fout met die skryf na %s" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -9744,12 +10078,12 @@ msgstr "" msgid "Exit with a status code indicating failure." msgstr "" -#: src/truncate.c:96 +#: src/truncate.c:69 #, fuzzy, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Gebruik so: %s [OPSIE]... LÊER...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -9760,22 +10094,22 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -9783,57 +10117,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: lêer het negatiewe grootte" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "kon nie die tyd van die dag vasstel nie" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "" -#: src/truncate.c:303 +#: src/truncate.c:276 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "veelvuldige afvoerlêers is gespesifiseer" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "ongeldige nommer %s" + +#: src/truncate.c:307 #, 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:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, fuzzy, c-format msgid "cannot open %s for writing" msgstr "kan nie %s oopmaak om te lees nie" @@ -9848,16 +10187,19 @@ msgstr "" 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:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: toevoer bevat 'n lus" @@ -9906,9 +10248,7 @@ msgstr "kan nie die stelselnaam vasstel nie" #: 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "Verander spasies in elke LÊER na keepkarakters, terwyl dit op " "standaardafvoer geskryf word.\n" @@ -9954,8 +10294,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -9966,7 +10306,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -10104,11 +10444,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "" - #: src/uptime.c:214 #, fuzzy, c-format msgid "" @@ -10130,12 +10465,16 @@ msgstr "" "As LÊER nie gespesifiseer is nie, gebruik %s. %s vir LÊER is algemeen.\n" "\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +msgid "" +"\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" @@ -10143,12 +10482,12 @@ msgid "" " -l, --lines print the newline counts\n" msgstr "" -#: src/wc.c:128 +#: src/wc.c:134 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" @@ -10294,9 +10633,9 @@ msgstr "" "Dieselfde as id -un.\n" "\n" -#: src/whoami.c:91 +#: src/whoami.c:87 #, fuzzy, c-format -msgid "%s: cannot find name for user ID %lu\n" +msgid "cannot find name for user ID %lu" msgstr "%s: kan nie die gebruikersnaam vir UID %u opspoor nie\n" #: src/yes.c:41 @@ -10317,6 +10656,62 @@ msgstr "" "Skryf voortdurend 'n reël met al die gespesifiseerde STRING(e), of `y'.\n" "\n" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "Met geen LÊER, of wanneer die LÊER - is, lees standaardtoevoer.\n" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Met geen LÊER, of wanneer die LÊER - is, lees standaardtoevoer.\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "all parameters word geïgnoreer" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: ongeldige getal" + +#~ msgid "number of lines" +#~ msgstr "aantal reëls" + +#~ msgid "number of bytes" +#~ msgstr "aantal grepe" + +#, fuzzy +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: ongeldige aantal reëls" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: ongeldige aantal grepe" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: ongeldige aantal reëls" + +#, fuzzy +#~ msgid "number in %s is too large" +#~ msgstr "veldnommer %s is te groot" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: ongeldige aantal sekondes" + +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "kan nie die aanvullende groep stel nie" + +#, fuzzy +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: kan nie die gebruikersnaam vir UID %u opspoor nie\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: onwettige opsie -- %c\n" @@ -10346,9 +10741,6 @@ msgstr "" #~ msgid "too few arguments" #~ msgstr "te min parameters" -#~ msgid "Usage: %s [OPTION] [FILE]...\n" -#~ msgstr "Gebruik so: %s [OPSIE] [ LÊER]...\n" - #~ msgid "closing standard output" #~ msgstr "standaard-afvoer word nou toegemaak" diff --git a/po/be.gmo b/po/be.gmo index 2fa5c7f2..ce45bdf0 100644 Binary files a/po/be.gmo and b/po/be.gmo differ diff --git a/po/be.po b/po/be.po index c9a662b3..7342f9e7 100644 --- a/po/be.po +++ b/po/be.po @@ -5,11 +5,12 @@ # Alexander Nyakhaychyk , 2002, 2003, 2006. # # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils 5.97\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2006-08-16 03:27+0300\n" "Last-Translator: Alexander Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -39,18 +40,18 @@ msgstr "Рэчаісныя довады:" msgid "error closing file" msgstr "зачыняецца файл уводу %s" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "памылка запісу" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, fuzzy, c-format msgid "preserving permissions for %s" msgstr "усталяваньне правоў для %s" @@ -235,57 +236,62 @@ msgstr "" msgid "Unknown error" msgstr "Невядомая памылка" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: выбар `%s' неадназначны\n" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: выбар `-W %s' неадназначыны\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: выбар `--%s' не дазваляе довад\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: выбар `%c%s' не дазваляе довад\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, fuzzy, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: выбар `%s' патрабуе довад\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: нераспазнаны выбар `--%s'\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: нераспазнаны выбар `%c%s'\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: нерэчаісны парамэтар -- %c\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: выбар патрабуе довад -- %c\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: выбар `-W %s' неадназначыны\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: выбар `-W %s' не дазваляе довад\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, fuzzy, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: выбар `%s' патрабуе довад\n" @@ -295,13 +301,13 @@ msgstr "%s: выбар `%s' патрабуе довад\n" msgid "cannot change permissions of %s" msgstr "немагчыма зьмяніць правы %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "немагчыма стварыць тэчку %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "памяць вычарпана" @@ -350,6 +356,12 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: збой seek" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: памылка чытаньня" + #: lib/regcomp.c:131 msgid "Success" msgstr "" @@ -467,7 +479,7 @@ msgstr "^[тТ]" msgid "^[nN]" msgstr "^[нН]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "усталяваньне правоў для %s" @@ -897,7 +909,7 @@ msgid "" "Base64 encode or decode FILE, or standard input, to standard output.\n" msgstr "" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -907,15 +919,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Калі ФАЙЛ не зададзены альбо зададзены -, чытае стандартны ўвод.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -924,51 +928,51 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "памылка чытаньня" -#: src/base64.c:231 +#: src/base64.c:229 #, fuzzy, c-format msgid "invalid input" msgstr "нерэчаісны сьцяг уводу: %s" -#: src/base64.c:268 +#: src/base64.c:266 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "незразумелы памер табуляцыі: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "непатрэбны аргумэнт %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, 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:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "" @@ -1011,39 +1015,45 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "прапушчаны аргумент" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Выкарыстаньне: %s [ПАРАМЭТАР]... [ФАЙЛ]...\n" #: src/cat.c:92 #, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"Запісвае зьвяз упарадкаваных ФАЙЛаў на стандартны вывад.\n" +"\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1061,7 +1071,7 @@ msgstr "" " -n, --number нумараваць усе радкі вываду\n" " -s, --squeeze-blank ня больш за адзін парожні радок\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1074,7 +1084,7 @@ msgstr "" " -v, --show-nonprinting выарыстоўвае ^ і M- запіс, за выключэньнем\n" " LFD і TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1088,17 +1098,18 @@ msgstr "" "g.\n" " %s Капіюе стандартны ўвод на стандартны вывад.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "немагчыма выканаць ioctl на %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "стандартны вывад" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: файл уводу зьяўляецца й файлам вываду" @@ -1110,10 +1121,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "" @@ -1127,8 +1138,8 @@ msgstr "немагчыма зьмяніць уладальніка %s\n" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "немагчыма атрымаць атрыбуты %s" @@ -1143,13 +1154,13 @@ msgstr "" msgid "failed to change context of %s to %s" msgstr "немагчыма зьмяніць уладальніка %s на %s\n" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "немагчыма атрымаць доступ да %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "немагчыма прачытаць тэчку %s" @@ -1165,7 +1176,7 @@ msgstr "зьмяненьне правоў %s" msgid "fts_read failed" msgstr "збой fts_read" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, fuzzy, c-format msgid "fts_close failed" @@ -1252,7 +1263,7 @@ msgid "-R -h requires -P" msgstr "-R -h патрабуе -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1269,9 +1280,8 @@ msgid "conflicting security context specifiers given" msgstr "" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "немагчыма атрымаць атрыбуты %s" @@ -1561,17 +1571,17 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "нерэчаісная група %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, fuzzy, c-format msgid "invalid group list %s" msgstr "нерэчаісная група %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1580,7 +1590,7 @@ msgstr "" "Выкарыстаньне: %s НОВЫ_ROOT [ЗАГАД...]\n" " ці: %s ВЫБАР\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1588,13 +1598,20 @@ msgstr "" "Запускае ЗАГАД з новай каранёвай тэчкай.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:207 #, fuzzy msgid "" "\n" @@ -1603,42 +1620,47 @@ msgstr "" "\n" "Калі не атрыман загад, выконвае ``${SHELL} -i'' (дапомна: /bin/sh).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "немагчыма зьмяніць каранёвую тэчку на %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "немачыма перайсьці да каранёвае тэчкі" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "немагчыма атрымаць сьпіс дадатковых групаў" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" -msgstr "немагчыма ўсталяваць дадатковую групу" +msgid "failed to set supplemental groups" +msgstr "немагчыма атрымаць сьпіс дадатковых групаў" -#: src/chroot.c:402 +#: src/chroot.c:418 #, fuzzy, c-format msgid "failed to set group-ID" msgstr "збой stat %s" -#: src/chroot.c:405 +#: src/chroot.c:421 #, fuzzy, c-format msgid "failed to set user-ID" msgstr "збой stat %s" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, fuzzy, c-format msgid "failed to run command %s" msgstr "немагчыма выканаць загад %s" @@ -1679,7 +1701,16 @@ msgstr "Выкарыстаньне: %s [ПАРАМЭТАР]... ФАЙЛ1 ФАЙ msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Калі ФАЙЛ не зададзены альбо зададзены -, чытае стандартны ўвод.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1687,7 +1718,7 @@ msgid "" "and column three contains lines common to both files.\n" msgstr "" -#: src/comm.c:116 +#: src/comm.c:120 #, fuzzy msgid "" "\n" @@ -1701,7 +1732,7 @@ msgstr "" " -2 не адлюстроўваць радкі, якія ёсьць толькі ў правым файле\n" " -3 неадлюстроўваць радкі, якія ёсьць у абодвух файлах\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1709,17 +1740,17 @@ msgid "" " --nocheck-order do not check that the input is correctly sorted\n" msgstr "" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1728,309 +1759,323 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "" -#: src/comm.c:407 +#: src/comm.c:411 #, fuzzy, c-format msgid "multiple delimiters specified" msgstr "заданыя шматлікія файлы вываду" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "немагчыма зрабіць lseek %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "памылка чытаньня %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "немагчыма зрабіць lseek %s" +msgid "error reading %s" +msgstr "памылка чытаньня %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "памылка запісу %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "памылка чытаньня %s" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "%s: немагчыма выдаліць" -#: src/copy.c:383 +#: src/copy.c:478 #, fuzzy, c-format msgid "%s: write failed" msgstr "памылка запісу" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "немагчыма адчыніць %s" -#: src/copy.c:687 +#: src/copy.c:789 #, fuzzy, c-format msgid "clearing permissions for %s" msgstr "усталяваньне правоў для %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "памылка пры захаваньні ўладальніку для %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "немагчыма адшукаць файл %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "збой пры захаваньні аўтарства для %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, fuzzy, c-format msgid "failed to set default file creation context to %s" msgstr "немагчыма атрымаць атрыбуты %s" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "немагчыма атрымаць атрыбуты %s" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "немагчыма атрымаць атрыбуты %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "немагыма адчыніць %s для чытаньня" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "немагчыма выканаць fstat %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "файл %s мінаецца, таму што ён быў заменены пад час капіяваньня" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "немагчыма выдаліць %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "выдален %s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "немагчыма стварыць звычайны файл %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" msgstr "немагчыма адчыніць %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "захоўвае час для %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "немагчыма адчыніць %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, fuzzy, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: перазапісаць %s, рэжым перазапісу %04lo? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: перазапісаць %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (запасны: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "немагчыма стварыць жорсткае лучыва %s на %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "немагчыма зрабіць stat %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "мінаецца тэчка %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "увага: зыходны файл %s зададзены больш за адзін раз" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s і %s адзін і той жа ж файл" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "немагчыма перазапісаць ня тэчку %s тэчкай %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "толькі што створаны %s з %s ня будзе перазапісаны" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "немагчыма перазапісаць тэчку %s ня тэчкай" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "немагчыма перамясьціць тэчку ў ня тэчку: %s -> %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "стварэньне запасной копіі %s зьнішчыць крыніцу; %s не перанесен" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "стварэньне запасной копіі %s зьнішчыць крыніцу; %s не скапіяван" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "немагчыма стварыць запасную копію %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, fuzzy, c-format msgid "will not copy %s through just-created symlink %s" msgstr "толькі што створаны %s з %s ня будзе перазапісаны" -#: src/copy.c:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "немагчыма скапіяваць тэчку, %s, саму ў сябе, %s" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "увага: зыходны файл %s зададзены больш за адзін раз" + +#: src/copy.c:2294 #, c-format msgid "will not create hard link %s to directory %s" msgstr "жорсткае лучыва %s на тэчку %s ня будзе створана" -#: src/copy.c:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "немагчыма перамясьціць %s ва ўласную падтэчку, %s" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "немагчыма перамясьціць %s у %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "збой міжпрыладнага перамяшчэньня: %s у %s; немагчыма выдаліць мэту" -#: src/copy.c:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "немагчыма скапіяваць цыклічнае знакавае лучыва %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: можа стварыць адноснае знакавае лучыва толькі ў бягучае тэчцы" -#: src/copy.c:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "немагчыма стварыць знакавае лучыва %s на %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "немагчыма стварыць fifo %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "немагчыма стварыць асаблівы файл %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "немагчыма прачытаць знакавае лучыва %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "немагчыма стварыць знакавае лучыва %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s мае невядомы від файлу" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "немагчыма вастанавіць %s з запасное копіі" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (вастанаўленьне)\n" @@ -2040,25 +2085,25 @@ msgstr "%s -> %s (вастанаўленьне)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, fuzzy, c-format msgid "unknown program %s" msgstr "невядомы ID карыстальніка: %s" @@ -2333,8 +2378,8 @@ msgstr "%s існуе, але гэта ня тэчка" msgid "failed to access %s" msgstr "немагчыма адчыніць %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "прапушчаны файлавы довад" @@ -2406,131 +2451,131 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "увод недаступны" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: нумар радку за дапушчальнымі межамі" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: нумар радка па-за дазволенымі межамі" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " на паўтарэньні %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: супадзеньне ня знойдзена" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "памылка ў пошуку звычайнага выразу" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "памылка запісу для %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: пасьля падзяляльніка чакаецца цэлы лік" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: `}' патрабуецца для падліку паўтораў" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: цэлы патрабуецца паміж `{' і `}'" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: прапушчаны падзяляльнік зачыненьня `%c'" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: нерэчаісны сталы выраз: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: нерэчаісны прыклад" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: нумар радку павінен быць большым за нуль." -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "нумар радка %s меншы за нумар папярэдняга радка, %s" -#: src/csplit.c:1200 +#: src/csplit.c:1201 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "Увага! Нумар радка %s супадае з нумарам папярэдняга радка." -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "прапушчан вызначальнік пераўтварэньня ва ўстаўцы" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "нерэчаісны вызначальнік пераўтварэньня ва ўстаўцы: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "нерэчаісны вызначальнік пераўтварэньня ва ўстаўцы: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "%s: нерэчаісная спэцыфікацыя поля \"%s\"" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "за шмат ва ўстаўцы %% вызначальнікаў пераўтварэньня" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "ва ўстаўцы прапушчан %% вызначальнік пераўтварэньня" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: нерэчаісны нумар" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "нерэчаісны нумар %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Выкарыстаньне: %s [ВЫБАР]... ФАЙЛ УЗОР..\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 #, fuzzy msgid "" "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n" @@ -2540,7 +2585,16 @@ msgstr "" "таксама выводзіць на стандартны вывад колькасьць байтаў у кожным кавалку.\n" "\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Чытае стандартны ўвод, калі замест ФАЙЛа -. Кожны ЎЗОР можа быць:\n" + +#: src/csplit.c:1492 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2551,11 +2605,11 @@ msgstr "" " -f, --prefix=ПРЫСТАЎКА Выкарыстоўваць ПРЫСТАЎКу замест `xx'\n" " -k, --keep-files Не выдаляць файлы вываду пры памылках\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 msgid "" " -n, --digits=DIGITS use specified number of digits instead of 2\n" " -s, --quiet, --silent do not print counts of output file sizes\n" @@ -2567,17 +2621,10 @@ msgstr "" " -s, --quiet, --silent Не друкаваць падлікі памераў файлаў вываду.\n" " -z, --elide-empty-files Выдаляць парожнія файлы вываду.\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Чытае стандартны ўвод, калі замест ФАЙЛа -. Кожны ЎЗОР можа быць:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 msgid "" "\n" +"Each PATTERN may be:\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" @@ -2604,7 +2651,7 @@ msgstr "" " Друкуе абраныя часкі радкоў з кожнага ФАЙЛу ў стандартны вывад.\n" "\n" -#: src/cut.c:182 +#: src/cut.c:183 #, fuzzy msgid "" " -b, --bytes=LIST select only these bytes\n" @@ -2617,7 +2664,7 @@ msgstr "" " Выкарыстоўваць адмысловы падзяляльнік для\n" " размежаваньня палёў, замест TAB.\n" -#: src/cut.c:187 +#: src/cut.c:188 #, fuzzy msgid "" " -f, --fields=LIST select only these fields; also print any line\n" @@ -2630,13 +2677,13 @@ msgstr "" " выняткам тых выпадкаў, калі заданы выбар -s.\n" " -n (незаўважаецца)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2647,7 +2694,7 @@ msgstr "" " Выкарыстоўвае радок як падзяляльнік вываду;\n" " дапомна выкарыстоўваецца падзяляльнік уводу.\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2655,7 +2702,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:210 +#: src/cut.c:211 msgid "" "Each range is one of:\n" "\n" @@ -2663,57 +2710,55 @@ msgid "" " 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:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "нерэчаісны байт ці сьпіс поля" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "" -#: src/cut.c:320 +#: src/cut.c:319 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "незразумелая шырыня радка: %s" -#: src/cut.c:334 -#, fuzzy +#: src/cut.c:333 src/numfmt.c:1417 +#, fuzzy, c-format msgid "invalid decreasing range" msgstr "Недзеяздольны прамежак старонак %s" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "байт зруху %s занадта вялікі" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "нумар поля %s занадта вялікі" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "толькі адзін від сьпісу можа быць зададзены" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "падзяляльнік паінен быць адным знакам" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "вы павінны пазначыць сьпіс байтаў, знакаў ці палёў" -#: src/cut.c:790 +#: src/cut.c:789 msgid "an input delimiter may be specified only when operating on fields" msgstr "падзяляльнік уводу можа быць зададзены толькі для дзеяньняў над палямі" -#: src/cut.c:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2721,11 +2766,11 @@ msgstr "" "падаўленьне непадзеленых радкоў мае сэнс толькі для\n" "\tдзеяньняў над палямі" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "прапушчан сьпіс палёў" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "прапушчан сьпіс становішчаў" @@ -2744,31 +2789,34 @@ 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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" msgstr "" -#: src/date.c:142 +#: src/date.c:138 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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" -#: src/date.c:147 +#: src/date.c:145 +msgid "" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" +msgstr "" + +#: src/date.c:149 #, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " -r, --reference=ФАЙЛ Адлюстроўвае час апошняга зьмяненьня файла.\n" " -R, --rfc-2822 Выдае радок часу ўзгодна з RFC-2822.\n" @@ -2778,8 +2826,19 @@ msgstr "" " -s, --set=РАДОК Усталёвае час, які апісаны радком.\n" " -u, --utc, --universal Друкуе Ўнівэрсальны скаардынаваны час.\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2787,7 +2846,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:165 +#: src/date.c:171 #, fuzzy msgid "" " %A locale's full weekday name (e.g., Sunday)\n" @@ -2801,7 +2860,7 @@ msgstr "" "Сьнежань).\n" " %c Мясцовыя дата й час (Чцв Ліс 18 06:06:06 MSK 1982).\n" -#: src/date.c:171 +#: src/date.c:177 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2814,7 +2873,7 @@ msgstr "" " %D Дата (мм/дздз/гг).\n" " %e Дзень месяца, бяз 0 ( 1..31).\n" -#: src/date.c:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2824,7 +2883,7 @@ msgstr "" " %g дзвюх лічбавы год нумара тыдня ў ISO (гл. %G).\n" " %G год нумара тыдня ў ISO (гл. %V); звычайна ідзе разам з %V.\n" -#: src/date.c:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2836,7 +2895,7 @@ msgstr "" " %I гадзіна (01..12)\n" " %j дзень году (001..366)\n" -#: src/date.c:188 +#: src/date.c:194 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2849,7 +2908,7 @@ msgstr "" " %m месяц (01..12)\n" " %M хвіліна (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2867,7 +2926,7 @@ msgstr "" " %R 24-гадзінны час; як і %H:%M\n" " %s колькасьць сэкундаў з 1970-01-01 00:00:00 UTC\n" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2875,7 +2934,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:209 +#: src/date.c:215 #, fuzzy msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" @@ -2888,7 +2947,7 @@ msgstr "" " %w Дзень тыдня (0..6); дзе 0 - гэта нядзеля.\n" " %W Нумар тыдня года, дзе першы дзень тыдня - панядзелак (00..53).\n" -#: src/date.c:215 +#: src/date.c:221 #, fuzzy msgid "" " %x locale's date representation (e.g., 12/31/99)\n" @@ -2901,7 +2960,7 @@ msgstr "" " %y дзьве апошнія лічбы году (00..99)\n" " %Y год (1970...)\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2913,7 +2972,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2924,7 +2983,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2933,7 +2992,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -2947,35 +3006,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "стандартны ўвод" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "нерэчаісная дата %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "зададзены некалькі фарматаў вываду" -#: src/date.c:430 +#: src/date.c:436 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "выбары, што вызначаюць дату для друку ўзаема выключныя" -#: src/date.c:437 +#: src/date.c:443 #, c-format msgid "the options to print and set the time may not be used together" msgstr "выбары для ўсталяваньня й друку часу нельга ўжываць разам" -#: src/date.c:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2983,23 +3042,23 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "немагчыма ўсталяваць дату" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3008,7 +3067,7 @@ msgstr "" "Выкарыстаньне: %s [АПЭРАНД]...\n" " або: %s ПАРАМЭТАР\n" -#: src/dd.c:532 +#: src/dd.c:561 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3029,7 +3088,7 @@ msgstr "" " count=БЛЁКАЎ Капіяваць толькі заданую колькасьць блёкаў уводу.\n" " ibs=БАЙТАЎ Чатаць заданую колькасьць байтаў за раз.\n" -#: src/dd.c:541 +#: src/dd.c:570 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3039,8 +3098,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=ФАЙЛ Чытаць з файлу замест стандартнага ўводу.\n" " obs=БАЙТАЎ Пісаць заданую колькасьць байтаў за раз.\n" @@ -3050,7 +3111,7 @@ msgstr "" " skip=БЛЁКАЎ Абмінуць заданую колькасьць блёкаў ад пачатку ў файле " "ўводу.\n" -#: src/dd.c:552 +#: src/dd.c:583 #, fuzzy msgid "" "\n" @@ -3068,7 +3129,7 @@ msgstr "" "Кожнае ключавое слова можа быць:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3095,7 +3156,7 @@ msgstr "" " выкарыстоўваецца разам з block ці unblock, дадаваць прагалы,\n" " замест нулёў.\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3111,7 +3172,7 @@ msgstr "" " fdatasync physically write output file data before finishing\n" " fsync likewise, but also write metadata\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3120,121 +3181,98 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:589 +#: src/dd.c:620 #, fuzzy msgid " cio use concurrent I/O for data\n" msgstr " text выкарыстоўваць тэкставы ўвод/вывад для даных\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:593 +#: src/dd.c:624 #, fuzzy msgid " directory fail unless a directory\n" msgstr "%s: заданая тэчка мэты не зьяўляецца тэчкай" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text выкарыстоўваць тэкставы ўвод/вывад для даных\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 +#: src/dd.c:661 #, 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:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" - -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -"%+% запісаў уайшло\n" -"%+% запісаў выйшла\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% абрэзаны запіс\n" -msgstr[1] "% абрэзаных запісы\n" -msgstr[2] "% абрэзаных запісаў\n" -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" @@ -3242,7 +3280,7 @@ msgstr[0] "% байт (%s) скапіяваны" msgstr[1] "% байты (%s) скапіявана" msgstr[2] "% байтаў (%s) скапіявана" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "Бясконцасьць" @@ -3256,168 +3294,185 @@ 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:798 +#: src/dd.c:807 #, fuzzy, c-format msgid ", %g s, %s/s\n" msgstr ", %g сэкунда , %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g сэкунда , %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% запісаў уайшло\n" +"%+% запісаў выйшла\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% абрэзаны запіс\n" +msgstr[1] "% абрэзаных запісы\n" +msgstr[2] "% абрэзаных запісаў\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "зачыняецца файл уводу %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "закрываецца файл вываду %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, fuzzy, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "збой chdir у %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "запіс у %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "нераспазнаны апэранд %s" -#: src/dd.c:1285 +#: src/dd.c:1376 #, fuzzy msgid "invalid conversion" msgstr "нерэчаіснае ператварэньне: %s" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 #, fuzzy msgid "invalid input flag" msgstr "нерэчаісны сьцяг уводу: %s" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 #, fuzzy msgid "invalid output flag" msgstr "нерэчаісны сьцяг вываду: %s" -#: src/dd.c:1294 +#: src/dd.c:1385 #, fuzzy -msgid "invalid status flag" +msgid "invalid status level" msgstr "нерэчаісны сьцяг статусу: %s" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "нерэчаісны нумар %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1417 +#: src/dd.c:1520 #, fuzzy, c-format msgid "cannot combine block and unblock" msgstr "немагчыма абмінуць разам карыстальніка й групу" -#: src/dd.c:1419 +#: src/dd.c:1522 #, fuzzy, c-format msgid "cannot combine lcase and ucase" msgstr "немагчыма параўнаць назвы файлаў %s і %s" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "" -#: src/dd.c:1424 +#: src/dd.c:1527 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "немагчыма параўнаць назвы файлаў %s і %s" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" " of mt_type=0x%0lx -- see for the list of types" msgstr "" -#: src/dd.c:1670 +#: src/dd.c:1773 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: немагчыма перасунуць паказальнік" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: немагчыма перасунуць паказальнік" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "перапаўненьне зруху цягам чытаньня файла %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, fuzzy, c-format msgid "warning: invalid file offset after failed read" msgstr "увага: зрух файла пашкоджаны пасьля памылкі чытаньня" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "немагчыма абмінуць памылку ядра" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "выстаўленьне сьцягоў для %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: немагчыма перамясьціцца да адноснага зруху %s" -#: src/dd.c:2172 +#: src/dd.c:2288 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "дасягнуты %s байтаў у файле вываду %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "збой fdatasync для %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "збой fsync для %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "немагчыма адчыніць %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2306 +#: src/dd.c:2422 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "дасягнуты %s байтаў у файле вываду %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, fuzzy, c-format msgid "failed to discard cache for: %s" msgstr "збой chdir у %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "" @@ -3498,12 +3553,12 @@ msgstr "Ёміст." msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 #, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" @@ -3516,18 +3571,18 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -#: src/df.c:1402 +#: src/df.c:1422 #, fuzzy msgid "" " -i, --inodes list inode information instead of block usage\n" @@ -3543,7 +3598,7 @@ msgstr "" " --no-sync не выклякаць sync перад атрыманьнем зьвестак " "(дапомна)\n" -#: src/df.c:1409 +#: src/df.c:1429 #, fuzzy msgid "" " --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" @@ -3551,6 +3606,24 @@ msgid "" "omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" +msgstr "" +" -P, --portability выкарыстоўваць POSIX фармат вывадц\n" +" --sync выклякаць sync перад атрыманьнем зьвестак\n" +" -t, --type=ТЫП абмежаваць вывад файлавымі сыстэмамі заданага тыпу\n" +" -T, --print-type друкаваць тып файлавае сыстэмы\n" +" -x, --exclude-type=ТЫП\n" +" абмежаваць вывад файлавымі сыстэмамі ня гэтага тыпу\n" +" -v (незаўважаецца)\n" + +#: src/df.c:1435 +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3564,7 +3637,7 @@ msgstr "" " абмежаваць вывад файлавымі сыстэмамі ня гэтага тыпу\n" " -v (незаўважаецца)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3572,26 +3645,26 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, fuzzy, c-format msgid "options %s and %s are mutually exclusive" msgstr "выбары, што вызначаюць дату для друку ўзаема выключныя" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "файлавая сыстэма тыпу %s адначасова вылучана й выключана" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Увага: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 #, fuzzy msgid "cannot read table of mounted file systems" msgstr "%s немагчыма прачытаць табліцу прымантаваных файлавых сыстэм" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "" @@ -3685,7 +3758,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3696,7 +3769,8 @@ msgstr "" #: src/du.c:285 #, fuzzy -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Падсумоўвае ўжываньне дыска кожным файлам; дзейнічае\n" "рэкурсіўна для тэчак.\n" @@ -3797,62 +3871,56 @@ msgstr "" msgid "Infinity" msgstr "Бясконцасьць" -#: src/du.c:636 +#: src/du.c:657 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "збой fts_read" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "незразумелая найбольшая глыбіня %s" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "кепскі цэлы довад %s" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "немагчыма адначасова й падлічыць і паказаць усе пункты" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 #, fuzzy msgid "file operands cannot be combined with --files0-from" msgstr "Файлавыя апэранбы ня могуць быць аб'яднаны з --print-database (-p)." -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: памылка чытаньня" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "назва файла нулявой даўжыні" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "усяго" @@ -3967,9 +4035,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "Запісвае кожны ФАЙЛ ў стандартны вывад з апошняга па першы радок.\n" "Калі ФАЙЛ не зададзне альбо зададзены -, чытае стандартны ўвод.\n" @@ -4012,7 +4078,7 @@ msgid "input line is too long" msgstr "радок вываду задаўгі" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "" @@ -4120,12 +4186,12 @@ msgstr "памылка ў супастаўляльніку сталых выра msgid "non-integer argument" msgstr "ня лічбавы довад" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "дзяленьне на нуль" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Усталюйце LC_ALL='C' каб працаваць без пытаньняў." @@ -4136,31 +4202,31 @@ msgid "the strings compared were %s and %s" msgstr "Радкі былі параўнаны тут %s і тут %s." #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s - гэта не станоўчы цэлы лік" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s занадта вялікі" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4169,7 +4235,7 @@ msgstr "" "Выкарыстаньне: %s [ЛІК]...\n" " ці: %s ВЫБАР\n" -#: src/factor.c:2443 +#: src/factor.c:2533 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4212,7 +4278,7 @@ msgid "" "The option -WIDTH is an abbreviated form of --width=DIGITS.\n" msgstr "" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4220,7 +4286,7 @@ msgid "" " -s, --split-only split long lines, but do not refill\n" msgstr "" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4229,34 +4295,35 @@ msgid "" " -g, --goal=WIDTH goal width (default of 93% of width)\n" msgstr "" -#: src/fmt.c:359 +#: src/fmt.c:356 #, 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" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "недзеяздольная шырыня: %s" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +#, fuzzy +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" +" Друкуе абраныя часкі радкоў з кожнага ФАЙЛу ў стандартны вывад.\n" +"\n" -#: src/fold.c:77 +#: src/fold.c:76 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" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "незразумелая колькасьць слупкоў: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4323,19 +4390,18 @@ msgstr "немагчыма ўсталяваць id карыстальніка" msgid "%s: no such user" msgstr "%s: такі карыстальнік ня йснуе" -#: src/head.c:109 +#: src/head.c:110 #, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" " Друкуе першыя 10 радкоў кожнага файла ў стандартны вывад. Калі заданы\n" "больш чым адзін файл, дадаткова друкуе загаловак з назвай файла.\n" "Калі файл незаданы, ці калі замест яго працяжнік, чытае стандартны ўвод.\n" "\n" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4345,13 +4411,13 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:125 +#: src/head.c:126 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 +#: src/head.c:132 #, fuzzy msgid "" "\n" @@ -4366,48 +4432,36 @@ msgstr "" "Кожнае ключавое слова можа быць:\n" "\n" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: колькасьць байтаў занадта вялікая" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: немагчыма перамясьціцца да зруха %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: немагчыма перамясьціцца да адноснага зруху %s" -#: src/head.c:886 +#: src/head.c:267 #, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "%s: %s такі вялікі, што немагчыма паказаць" - -#: src/head.c:887 -msgid "number of lines" -msgstr "колькасьць радкоў" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "колькасьць байтаў" +msgid "%s: number of bytes is too large" +msgstr "%s: колькасьць байтаў занадта вялікая" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "недзеяздольная колькасьць радкоў" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "недзеяздольная колькасьць байтаў" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "нерэчаісны парамэтар -- %c" @@ -4582,7 +4636,7 @@ msgstr "немагчыма зьмяніць уладальніка %s" msgid "cannot set time stamps for %s" msgstr "немагчыма ўсталяваць адбіткі часу для %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "" @@ -4715,7 +4769,7 @@ msgstr "" msgid "target directory not allowed when installing a directory" msgstr "%s: заданая тэчка мэты не зьяўляецца тэчкай" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "нерэчаісны рэжым %s" @@ -4750,15 +4804,19 @@ msgstr "" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +msgid "" "\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:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -4766,7 +4824,7 @@ msgid "" " -t CHAR use CHAR as input and output field separator\n" msgstr "" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -4778,13 +4836,13 @@ msgid "" " print them without trying to pair them\n" msgstr "" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 #, fuzzy msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated Завяршаць радкі байтам 0, а ня новым радком.\n" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -4803,47 +4861,47 @@ msgid "" "warning message will be given.\n" msgstr "" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "недзеяздольны нумар поля: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, fuzzy, c-format msgid "invalid field specifier: %s" msgstr "%s: нерэчаісная спэцыфікацыя поля \"%s\"" -#: src/join.c:884 +#: src/join.c:890 #, fuzzy, c-format msgid "invalid file number in field spec: %s" msgstr "недзеяздольная шырыня поля нумара радка: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "шмат-байтавы знак табуляцыі %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "абодва файлы ня могуць быць стандартным уводам" @@ -4913,17 +4971,17 @@ msgstr "" msgid "no process ID specified" msgstr "незаданы ID працэсу" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, fuzzy, c-format msgid "invalid buffering mode %s for %s\n" msgstr "нерэчаісны довад %s для %s" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -5082,7 +5140,7 @@ msgstr "немагчыма стварыць знакавае лучыва %s" msgid "FIXME: unknown" msgstr "" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Выкарыстаньне: %s [ПАРАМЭТАР]\n" @@ -5095,7 +5153,7 @@ msgstr "" "Друкуе ўліковае імя бягучага карыстальніка.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "няма ўліковага ймя" @@ -5105,7 +5163,7 @@ msgstr "няма ўліковага ймя" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -5114,97 +5172,97 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" -"незаўважаецца нерэчаіснае значэньне зьменнай асяродзьдзя QUOTING_STYLE: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "незаўважае незразумелы памер табуляцыі ў пераменнай асяродзьдзя TABSIZE: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "незразумелая шырыня радка: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "незразумелы памер табуляцыі: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "незразумелы фармат стылю часу %s" -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "Рэчаісныя довады:" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "нераспазнаная прыстаўка: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" +"незаўважаецца нерэчаіснае значэньне зьменнай асяродзьдзя QUOTING_STYLE: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "немагчыма адчыніць тэчку %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "" -#: src/ls.c:2581 +#: src/ls.c:2578 #, fuzzy, c-format msgid "%s: not listing already-listed directory" msgstr "%s: немагчыма перазапісаць тэчку" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "чытаецца дырэкторыя %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "зачыняецца дырэкторыя %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "немагчыма параўнаць назвы файлаў %s і %s" -#: src/ls.c:4781 +#: src/ls.c:4775 #, fuzzy msgid "" "List information about the FILEs (the current directory by default).\n" @@ -5215,7 +5273,7 @@ msgstr "" "Упарадкоўвае запісы па алфавіту, калі няма -cftuSUX ці --sort.\n" "\n" -#: src/ls.c:4788 +#: src/ls.c:4782 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5230,7 +5288,7 @@ msgstr "" " -b, --escape друкаваць васьмярычныя значэньні для\n" " службовых/неграфічных знакаў\n" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5244,18 +5302,19 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4798 msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5265,11 +5324,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5278,7 +5337,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 +#: src/ls.c:4824 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5293,7 +5352,7 @@ msgstr "" " -H, --si гл. вышэй, але выкарыстоўваць ступені 1000 замест " "1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5306,7 +5365,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5318,7 +5377,7 @@ msgid "" " -k, --kibibytes default to 1024-byte blocks for disk usage\n" msgstr "" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5328,7 +5387,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5339,7 +5398,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -5351,7 +5410,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4881 +#: src/ls.c:4876 #, fuzzy msgid "" " -r, --reverse reverse order while sorting\n" @@ -5363,21 +5422,21 @@ msgstr "" " -R, --recursive паказываць тэчкі рэкурсыўна\n" " -s, --size друаваць памер кожнага файла ў блёках\n" -#: src/ls.c:4886 +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -5391,36 +5450,37 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4908 +#: src/ls.c:4904 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:4912 +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=ШЫРЫНЯ задае шырыню экрану ў знаках\n" " -x паказываць запісы па радкох а ня паслупкох\n" " -X упарадкаваць па абэцэдзе суфіксаў файлаў\n" " -1 паказываць па файлу на радок\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5429,7 +5489,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5458,17 +5518,16 @@ msgstr "" 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 "" "Выкарыстаньне: %s [ВЫБАР] [ФАЙЛ]...\n" " ці: %s [ВЫБАР] --check [ФАЙЛ]\n" "Друкуе ці правярае %s (%d-бітавую) праверчую суму.\n" "Калі файл незаданы, ці калі замест яго працяжнік, чытае стандартны ўвод.\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 #, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" @@ -5476,29 +5535,31 @@ msgstr "" " -B, --binary выкарыстоўвае дваічны запіс у прыладу кансолі.\n" "\n" -#: src/md5sum.c:178 +#: src/md5sum.c:180 #, fuzzy -msgid " -b, --binary read in binary mode\n" +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr "" "\n" " -B, --binary выкарыстоўвае дваічны запіс у прыладу кансолі.\n" "\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:192 +#: src/md5sum.c:195 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr "" @@ -5506,7 +5567,7 @@ msgstr "" " -B, --binary выкарыстоўвае дваічны запіс у прыладу кансолі.\n" "\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 #, fuzzy msgid "" "\n" @@ -5525,45 +5586,46 @@ msgstr "" "сумамі\n" "\n" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: зашмат радкоў з кантрольнымі сумамі" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: ня правільна складзены радок з кантрольнай сумай %s" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: немагчыма прачытаць файл\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "ПАМЫЛКА" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "ДОБРА" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, fuzzy, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" @@ -5571,7 +5633,7 @@ msgstr[0] "%s: %: ня правільна складзены радок msgstr[1] "%s: %: ня правільна складзены радок з кантрольнай сумай %s" msgstr[2] "%s: %: ня правільна складзены радок з кантрольнай сумай %s" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, fuzzy, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" @@ -5582,7 +5644,7 @@ msgstr[1] "" msgstr[2] "" "УВАГА! % з % пералічаных файлаў немагчыма прачытаць" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, fuzzy, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" @@ -5590,38 +5652,38 @@ msgstr[0] "УВАГА! %d з %d вылічаных %s НЕ СУПАДАЕ" msgstr[1] "УВАГА! %d з %d вылічаных %s НЕ СУПАДАЕ" msgstr[2] "УВАГА! %d з %d вылічаных %s НЕ СУПАДАЕ" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, fuzzy, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "выбар --warn мае сэнс толькі тады, калі параўноваюцца праверчыя сумы" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "выбар --warn мае сэнс толькі тады, калі параўноваюцца праверчыя сумы" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, fuzzy, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "выбар --warn мае сэнс толькі тады, калі параўноваюцца праверчыя сумы" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "выбар --warn мае сэнс толькі тады, калі параўноваюцца праверчыя сумы" @@ -5654,22 +5716,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "немагчыма атрымаць атрыбуты %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "збой пры захаваньні часу для %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "створана тэчка %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -5848,7 +5910,7 @@ msgstr "зашмат аднолькавых радкоў" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" @@ -5994,9 +6056,7 @@ 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" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "Write each FILE to standard output, with line numbers added.\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -6072,27 +6132,27 @@ msgstr "нерэчаісны стыль нумараваньня цела: %s" msgid "invalid footer numbering style: %s" msgstr "нерэчаісны стыль нумараваньня падвалу: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "нерэчаісны нумар пачатковага радка: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "недзеяздольнае значэньне павелічэньня нумару радка: \"%s\"" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "недзеяздольная колькасьць чыстых радокоў: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "недзеяздольная шырыня поля нумара радка: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "нерэчаісны фармат нумараваньня радкоў: %s" @@ -6118,7 +6178,7 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6130,43 +6190,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "немагчыма перанакіраваць стандартны вывад памылак" -#: src/nohup.c:131 +#: src/nohup.c:129 #, fuzzy, c-format msgid "ignoring input" msgstr "на ўсе довады не зьвяртаецца ўвага" -#: src/nohup.c:175 +#: src/nohup.c:173 #, fuzzy, c-format msgid "ignoring input and appending output to %s" msgstr "далучэньне вываду да %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "далучэньне вываду да %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" msgstr "немагчыма перанакіраваць стандартны вывад памылак" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "" @@ -6188,96 +6248,93 @@ msgid "" " --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: нерэчаісная колькасьць радкоў" - #. This is a proper name. See the gettext manual, section Names. -#: src/numfmt.c:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, fuzzy, c-format msgid "value too large to be converted: %s" msgstr "%s: значэньне цалка не пераўтворана" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "нерэчаісны нумар %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "нерэчаісны сьцяг уводу: %s" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "%s: немагчыма адчыніць для запісу" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "незразумелы памер табуляцыі: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Выкарыстаньне: %s [ВЫБАР]... [КАРЫСТАЛЬНІК]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6285,19 +6342,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -6307,40 +6364,40 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" msgstr "" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6349,7 +6406,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -6357,7 +6414,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -6365,7 +6422,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -6373,7 +6430,19 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -6382,9 +6451,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -6396,7 +6466,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -6411,118 +6481,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, fuzzy, c-format msgid "format %s has no %% directive" msgstr "згаданая мэта %s не з'яўляецца тэчкай" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "недзеяздольны фармат шырыні" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "нерэчаісная дакладнасьць: %s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "нерэчаісны сьцяг уводу: %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "недзеяздольны нумар поля: %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "нерэчаісная дата %s" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "недзеяздольны нумар поля: %s" +msgid "multiple field specifications" +msgstr "%s: нерэчаіснае вызначэньне поля %s" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "нерэчаісная дата %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, fuzzy, c-format msgid "--grouping cannot be combined with --format" msgstr "Файлавыя апэранбы ня могуць быць аб'яднаны з --print-database (-p)." -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "незаданы ID працэсу" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, fuzzy, c-format msgid "grouping cannot be combined with --to" msgstr "Файлавыя апэранбы ня могуць быць аб'яднаны з --print-database (-p)." -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "памылка чытаньня %s" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "" -#: src/od.c:320 +#: src/od.c:321 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6533,18 +6615,17 @@ msgstr "" "Выкарыстаньне: %s [ВЫБАР]... [ФАЙЛ]...\n" " ці: %s --traditional [ФАЙЛ] [[+]ВОДСТУП [[+]АДМЕЦІНА]]\n" -#: src/od.c:326 +#: src/od.c:327 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:333 +#: src/od.c:335 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" @@ -6553,7 +6634,7 @@ msgid "" "suffixes may be . for octal and b for multiply by 512.\n" msgstr "" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -6562,7 +6643,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -6575,7 +6656,7 @@ msgid "" " --traditional accept arguments in third form above\n" msgstr "" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -6586,7 +6667,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6596,7 +6677,7 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -6605,7 +6686,7 @@ msgid "" " c printable character or backslash escape\n" msgstr "" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6614,7 +6695,7 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -6623,14 +6704,14 @@ msgid "" "for sizeof(double) or L for sizeof(long double).\n" msgstr "" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 #, fuzzy msgid "" "\n" @@ -6647,12 +6728,12 @@ msgstr "" "SIZE may be (or may be an integer optionally followed by) one of following:\n" "kB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "недзеяздольны радок тыпу %s" -#: src/od.c:690 +#: src/od.c:693 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6661,7 +6742,7 @@ msgstr "" "нерэчаісны від радка \"%s\";\n" "сыстэма не прадастаўляе %lu-байтны цэлы тып" -#: src/od.c:811 +#: src/od.c:814 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6670,36 +6751,36 @@ msgstr "" "нерэчаісны від радка \"%s\";\n" "сыстэма не прадастаўляе %lu-байтны цэлы тып" -#: src/od.c:869 +#: src/od.c:872 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "нерэчаісны знак \"%c\" у радку тыпу \"%s\"" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "" -#: src/od.c:1650 +#: src/od.c:1658 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "Увага! Нерэчаісная шырыня %lu; выкарыстоўвайце %d замест яе" @@ -6719,7 +6800,6 @@ msgstr "стандартны вывад зачынены" msgid "" "Write lines consisting of the sequentially corresponding lines from\n" "each FILE, separated by TABs, to standard output.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Запісвае кожны ФАЙЛ ў стандартны вывад з апошняга па першы радок.\n" "Калі ФАЙЛ не зададзне альбо зададзены -, чытае стандартны ўвод.\n" @@ -6854,12 +6934,12 @@ msgstr "Калі" msgid "Where" msgstr "Дзе" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Выкарыстаньне: %s [ВЫБАР]... [КАРЫСТАЛЬНІК]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6869,7 +6949,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6878,7 +6958,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:513 +#: src/pinky.c:512 #, fuzzy, c-format msgid "" "\n" @@ -6889,99 +6969,99 @@ msgstr "" "Спрошчаная праграма \"finger\"; друкуе зьвесткі пра карыстальніка.\n" "Файлам utmp будзе %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, 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 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" -#: src/pr.c:910 +#: src/pr.c:907 #, fuzzy, c-format msgid "invalid page range %s" msgstr "Недзеяздольны прамежак старонак %s" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "\"-W ШЫРЫНЯ_СТАРОНКІ\" нерэчаісная колькасьць знакаў: %s" -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "нерэчаісны нумар пачатковага радка: %s" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "незразумелая шырыня радка: %s" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "\"-w ШЫРЫНЯ_СТАРОНКІ\" нерэчаісная колькасьць знакаў: %s" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "\"-W ШЫРЫНЯ_СТАРОНКІ\" нерэчаісная колькасьць знакаў: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" -#: src/pr.c:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" -#: src/pr.c:1196 +#: src/pr.c:1166 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "\"-%c\" дадатковыя знаці ці нерэчаісны нумар у довадзе: \"%s\"" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "шырыня старонкі занадта вузкая" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" -#: src/pr.c:2380 +#: src/pr.c:2350 #, fuzzy, c-format msgid "page number overflow" msgstr "перапаўненьне колькасьці радкоў" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "" -#: src/pr.c:2757 +#: src/pr.c:2727 #, fuzzy msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" " Падзяляе файл(ы) на старонкі ці слупкі для друку.\n" "\n" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6991,7 +7071,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7001,7 +7081,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7013,7 +7093,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7026,16 +7106,21 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2798 +#: src/pr.c:2769 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2775 +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7045,7 +7130,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7054,7 +7139,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7065,17 +7150,22 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2828 +#: src/pr.c:2802 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7089,7 +7179,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7098,16 +7188,6 @@ msgid "" " with -S or -s\n" msgstr "" -#: src/pr.c:2853 -#, fuzzy -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"Калі ФАЙЛ не зададзены альбо зададзены -, чытае стандартны ўвод.\n" - #: src/printenv.c:62 #, fuzzy, c-format msgid "" @@ -7245,15 +7325,20 @@ msgid "" "files.\n" msgstr "" -#: src/ptx.c:1830 +#: src/ptx.c:1831 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:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -7261,7 +7346,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7271,7 +7356,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7279,20 +7364,16 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Калі ФАЙЛ не зададзены альбо зададзены -, чытае стандартны ўвод.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "нерэчаісная шырыня прамежку: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "незразумелая шырыня радка: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -7318,7 +7399,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "збой chdir у %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "збой stat %s" @@ -7338,8 +7419,8 @@ msgstr "незаўважаюцца довады, якія не зьўляюцц msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Выкарыстаньне: %s [ВЫБАР]... ФАЙЛ...\n" @@ -7543,17 +7624,17 @@ msgstr "" "shred.\n" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " +msgstr[0] "%s: выдаліць %s %s? " +msgstr[1] "%s: выдаліць %s %s? " +msgstr[2] "%s: выдаліць %s %s? " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: выдаліць %s %s? " msgstr[1] "%s: выдаліць %s %s? " msgstr[2] "%s: выдаліць %s %s? " @@ -7735,12 +7816,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "" -#: src/seq.c:234 +#: src/seq.c:248 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s мае невядомы від файлу" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -7756,7 +7837,16 @@ msgid "" "for even very expensive hardware probing to recover the data.\n" msgstr "" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Калі ФАЙЛ -, капіюе зноў на стандартны ўвод.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7765,7 +7855,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -7774,11 +7864,9 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:192 +#: src/shred.c:196 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.\n" @@ -7790,7 +7878,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -7801,7 +7889,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7813,7 +7901,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7822,7 +7910,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -7834,134 +7922,134 @@ msgid "" "\n" msgstr "" -#: src/shred.c:241 +#: src/shred.c:243 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:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: збой fdatasync" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: збой fsync" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: праход %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: памылка запісу ля водступа %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: збой lseek" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: файл занадта вялікі" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: праход %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: збой fstat" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: нерэчаісны від файла" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: файл мае адмоўны памер" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: памылка абрэзаньня" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: збой fcntl" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: выдаленьне" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: перайменаваны ў %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: немагчыма выдаліць" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: выдален" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: немагчыма зачыніць" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: немагчыма адчыніць для запісу" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: незразумелая колькасьць праходаў" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, fuzzy, c-format msgid "multiple random sources specified" msgstr "зададзены некалькі фарматаў вываду" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: нерэчаісны памер файла" -#: src/shuf.c:61 +#: src/shuf.c:62 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -7972,14 +8060,14 @@ msgstr "" " ці: %s [ВЫБАР]... ПЕРШЫ АПОШНІ\n" " ці: %s [ВЫБАР]... ПЕРШЫ ПРЫРОСТ АПОШНІ\n" -#: src/shuf.c:67 +#: src/shuf.c:68 #, fuzzy msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" "Запісвае зьвяз упарадкаваных ФАЙЛаў на стандартны вывад.\n" "\n" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -7990,37 +8078,37 @@ msgid "" " -r, --repeat output lines can be repeated\n" msgstr "" -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "зашмат аднолькавых радкоў" -#: src/shuf.c:431 +#: src/shuf.c:428 #, fuzzy, c-format msgid "multiple -i options specified" msgstr "заданыя шматлікія файлы вываду" -#: src/shuf.c:452 -#, fuzzy, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "нерэчаісны сьцяг уводу: %s" -#: src/shuf.c:465 +#: src/shuf.c:459 #, fuzzy, c-format -msgid "invalid line count %s" +msgid "invalid line count: %s" msgstr "незразумелая шырыня радка: %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "заданыя шматлікія файлы вываду" -#: src/shuf.c:502 +#: src/shuf.c:496 #, fuzzy, c-format msgid "cannot combine -e and -i options" msgstr "немагчыма сумясьціць рэжым і парамэтры --reference" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -8039,12 +8127,12 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "нерэчаісны адрэзак часу %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "немагчыма прачытаць гадзіньнік рэальнага часу" @@ -8056,7 +8144,7 @@ msgstr "" "Запісвае зьвяз упарадкаваных ФАЙЛаў на стандартны вывад.\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -8064,7 +8152,7 @@ msgstr "" "Парамэтры ўпарадкаваньня:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8072,19 +8160,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:443 +#: src/sort.c:444 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:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8092,7 +8180,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8102,7 +8190,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 #, fuzzy msgid "" "Other options:\n" @@ -8111,13 +8199,13 @@ msgstr "" "Парамэтры ўпарадкаваньня:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -8126,7 +8214,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8135,13 +8223,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8149,7 +8237,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8164,7 +8252,7 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -8183,130 +8271,128 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:524 +#: src/sort.c:525 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:725 +#: src/sort.c:724 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "запіс у %s" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:884 +#: src/sort.c:883 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "немагчыма стварыць часовы файл %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "памылка адкрыцьця" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "збой fflush" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "памылка закрыцьця" -#: src/sort.c:1140 +#: src/sort.c:1139 #, fuzzy msgid "couldn't create temporary file" msgstr "немагчыма стварыць часовы файл" -#: src/sort.c:1179 +#: src/sort.c:1178 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "немагчыма стварыць тэчку %s" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "увага: немагчыма выдаліць: %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "нерэчаісны довад %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "неадназначны довад %s для %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s занадта вялікі" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "збой пачатку" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "памылка чытаньня" -#: src/sort.c:2076 +#: src/sort.c:2075 #, fuzzy, c-format msgid "string transformation failed" msgstr "памылка параўнаньня радку" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -8314,353 +8400,359 @@ msgstr[0] "%s: выбар `-W %s' неадназначыны\n" msgstr[1] "%s: выбар `-W %s' неадназначыны\n" msgstr[2] "%s: выбар `-W %s' неадназначыны\n" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "памылка запісу" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: бязладдзе: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "стандартны вывад памылак" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "немагчыма ўсталяваць дату" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: нерэчаіснае вызначэньне поля %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: нерэчаісны падлік на пачатку %s" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "нерэчаісная лічба пасьля \"-\"" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "нерэчаісная лічба пасьля \".\"" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "" -#: src/sort.c:4403 +#: src/sort.c:4402 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "зададзены некалькі фарматаў вываду" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "нерэчаісная лічба пасьля \",\"" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "пустая табуляцыя" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "немагчыма прачытаць назвы файлаў з %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "назва файла нулявой даўжыні" -#: src/sort.c:4619 +#: src/sort.c:4618 #, fuzzy, c-format msgid "no input from %s" msgstr "зачыняецца файл уводу %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, fuzzy, c-format msgid "extra operand %s not allowed with -%c" msgstr "непатрэбны аргумэнт %s" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 +#: src/split.c:224 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Выкарыстаньне: %s [ВЫБАР] [УВОД [ПРЫСТАЎКА]]\n" -#: src/split.c:207 +#: src/split.c:228 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "стварэньне файла %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "" "незаўважае незразумелы памер табуляцыі ў пераменнай асяродзьдзя TABSIZE: %s" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "збой stat %s" -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" msgstr "зачыняецца дырэкторыя %s" -#: src/split.c:410 +#: src/split.c:464 #, fuzzy, c-format msgid "closing output pipe" msgstr "закрываецца файл вываду %s" -#: src/split.c:414 +#: src/split.c:468 #, fuzzy, c-format msgid "moving input pipe" msgstr "зачыняецца файл уводу %s" -#: src/split.c:416 +#: src/split.c:470 #, fuzzy, c-format msgid "closing input pipe" msgstr "зачыняецца файл уводу %s" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "немагчыма выканаць загад %s" -#: src/split.c:427 +#: src/split.c:481 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "%s: немагчыма зачыніць" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: нерэчаісная колькасьць сэкундаў" -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: нерэчаісны нумар" -#: src/split.c:1169 +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" +msgstr "нерэчаісны сьцяг уводу: %s" + +#: src/split.c:1333 #, c-format -msgid "%s: invalid suffix length" +msgid "empty record separator" msgstr "" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 -#, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: нерэчаісная колькасьць байтаў" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "шмат-байтавы знак табуляцыі %s" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: нерэчаісная колькасьць радкоў" +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "асаблівы знакавы файл" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "" -#: src/split.c:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "нерэчаісны нумар пачатковага радка: %s" -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: нерэчаісны памер файла" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, fuzzy, c-format msgid "%s: cannot determine file size" msgstr "немагчыма вызначыць назву вузла" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "" -#: src/stat.c:887 +#: src/stat.c:890 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "немагчыма адчыніць %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "увага!: нераспазнаны парамэтар \"\\%c\"" -#: src/stat.c:1184 +#: src/stat.c:1187 #, fuzzy, c-format msgid "%s: invalid directive" msgstr "%s%s: нерэчаісная дырэктыва" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "немагчыма прачытаць зьвесткі файлавае сыстэмы для %s" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8671,7 +8763,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8679,30 +8771,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8710,17 +8802,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8730,7 +8822,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -8742,7 +8834,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8752,7 +8844,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8765,7 +8857,7 @@ msgid "" " %T minor device type in hex, for character/block device special files\n" msgstr "" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8780,7 +8872,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8791,7 +8883,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -8846,8 +8938,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -8872,7 +8963,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8880,96 +8971,149 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 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:535 +#: src/stty.c:543 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:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +msgid "" " 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 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:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" msgstr "" -#: src/stty.c:559 +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" + +#: src/stty.c:614 +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 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:578 +#: src/stty.c:632 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" +msgstr "" + +#: src/stty.c:637 +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:584 +#: src/stty.c:641 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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -8977,10 +9121,13 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -8988,135 +9135,249 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +msgid "" " [-]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:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:619 +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +msgid "" " [-]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:627 +#: src/stty.c:712 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:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]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:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +msgid "" " * 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr "" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:672 +#: src/stty.c:843 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" +msgstr "" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:875 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:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 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:707 +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -9125,25 +9386,27 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -9152,57 +9415,62 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "толькі адна прылада можа быць пазначана" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "нерэчаісны довад %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "прапушчаны довад для %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: памылка абрэзаньня" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "нерэчаісная дысцыпліна лініі %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: няма зьвестак пра памеры для гэтае прылады" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "кепскі цэлы довад %s" #. This is a proper name. See the gettext manual, section Names. @@ -9212,8 +9480,14 @@ msgstr "" #: src/sum.c:62 #, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Друкуе CRC падлік і колькасьць байтаў кожнага ФАЙЛу.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -9224,20 +9498,54 @@ msgstr "" "Кб\n" " -s, --sysv выкарыстоўваць альгарытм System V і блёкі ў 512 байтаў\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Выкарыстаньне: %s [ВЫБАР] [ФАЙЛ]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -" Вымагае запісу ўсіх зьмененых блёкаў на дыск і абнаўленьне супэрблёка.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" -#: src/sync.c:69 +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "памылка чытаньня %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: немагчыма зьмяніць незаблякаваны рэжым" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "памылка чытаньня %s" + +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "на ўсе довады не зьвяртаецца ўвага" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -9251,22 +9559,30 @@ msgstr "" "дакумэнтацыі вашага інтэрпрэтатара загадаў, каб даведацца аб парамэтрах,\n" "якія ён падтрымлівае.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help паказвае гэтую даведку\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version выводзіць зьвесткі пра вэрсію\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Калі ФАЙЛ не зададзены альбо зададзены -, чытае стандартны ўвод.\n" + +#: src/system.h:544 #, fuzzy msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Довады, абавязковыя для доўгіх выбараў, абавязковыя й для кароткіх.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -9274,7 +9590,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -9283,7 +9599,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -9294,22 +9610,27 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -#: src/system.h:591 +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Паспрабуйце \"%s --help\" для больш падрабязных зьвестак.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9326,9 +9647,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "Запісвае кожны ФАЙЛ ў стандартны вывад з апошняга па першы радок.\n" "Калі ФАЙЛ не зададзне альбо зададзены -, чытае стандартны ўвод.\n" @@ -9341,70 +9660,69 @@ msgid "" " -s, --separator=STRING use STRING as the separator instead of newline\n" msgstr "" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: збой seek" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "запіс завялікі" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "немагчыма стварыць часовы файл %s" -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: немагчыма адчыніць для запісу" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "збой пры захаваньні часу для %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: памылка запісу" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "немагыма адчыніць %s для чытаньня" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "падзяляльнік павінен нешта ўтрымліваць" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "" -#: src/tail.c:262 +#: src/tail.c:257 #, 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" msgstr "" " Друкуе першыя 10 радкоў кожнага файла ў стандартны вывад. Калі заданы\n" "больш чым адзін файл, дадаткова друкуе загаловак з назвай файла.\n" "Калі файл незаданы, ці калі замест яго працяжнік, чытае стандартны ўвод.\n" "\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -9412,7 +9730,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -9425,14 +9743,14 @@ msgid "" " with inotify, this option is rarely useful\n" msgstr "" -#: src/tail.c:293 +#: src/tail.c:288 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 if it is inaccessible\n" msgstr "" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -9441,7 +9759,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -9452,7 +9770,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -9462,169 +9780,168 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "зачыняецца %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, fuzzy, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "%s быў заменены на небясконцы файл; апрацоўка гэтага файла спынена" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s стаў недаступны" -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "%s быў заменены на небясконцы файл; апрацоўка гэтага файла спынена" -#: src/tail.c:1006 +#: src/tail.c:999 #, fuzzy, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "%s быў заменены на небясконцы файл; апрацоўка гэтага файла спынена" -#: src/tail.c:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s стаў даступны" -#: src/tail.c:1035 +#: src/tail.c:1032 #, c-format -msgid "%s has appeared; following end of new file" +msgid "%s has appeared; following new file" msgstr "" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" -msgstr "" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" +msgstr "%s быў заменены на небясконцы файл; апрацоўка гэтага файла спынена" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: немагчыма зьмяніць незаблякаваны рэжым" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: файл абрэзаны" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "не засталося больш файла" -#: src/tail.c:1424 +#: src/tail.c:1440 #, fuzzy, c-format msgid "cannot watch parent directory of %s" msgstr "немагчыма атрымаць стан бягучае тэчкі (зараз %s)" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, fuzzy, c-format msgid "inotify resources exhausted" msgstr "памяць вычарпана" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, fuzzy, c-format msgid "cannot watch %s" msgstr "немагчыма дакрануцца да %s" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: замяніць %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1597 #, fuzzy, c-format msgid "error reading inotify event" msgstr "памылка чытаньня %s" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "нумар у %s завялікі" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +msgid "invalid maximum number of unchanged stats between opens" msgstr "" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: нерэчаісны PID" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: нерэчаісная колькасьць сэкундаў" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "незразумелая колькасьць слупкоў: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "увага: --pid=PID не падтрымліваецца на гэтае сыстэме" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "немагчыма крочыць за %s па назве" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -9636,65 +9953,77 @@ msgstr "" " -a, --append Дадае да ФАЙЛаў (не перазапісвае іх).\n" " -i, --ignore-interrupts Не зьвяртае ўвагі на сыгнал спыненьня.\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Калі ФАЙЛ -, капіюе зноў на стандартны ўвод.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "прапушчаны довад пасьля %s" -#: src/test.c:159 +#: src/test.c:161 #, fuzzy, c-format msgid "invalid integer %s" msgstr "зададзены ня цэлы лік %s\n" -#: src/test.c:241 +#: src/test.c:243 #, fuzzy msgid "')' expected" msgstr "')' чакаецца\n" -#: src/test.c:244 +#: src/test.c:246 #, fuzzy, c-format msgid "')' expected, found %s" msgstr "')' чакаецца, знойдзен %s\n" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, fuzzy, c-format msgid "%s: unary operator expected" msgstr "%s: чакаецца ўнарны апэратар\n" -#: src/test.c:329 +#: src/test.c:331 #, fuzzy msgid "-nt does not accept -l" msgstr "-nt не прыймае -l\n" -#: src/test.c:342 +#: src/test.c:344 #, fuzzy msgid "-ef does not accept -l" msgstr "-ef не праймае -l\n" -#: src/test.c:358 +#: src/test.c:360 #, fuzzy msgid "-ot does not accept -l" msgstr "-ot не прыймае -д\n" -#: src/test.c:367 +#: src/test.c:369 #, fuzzy msgid "unknown binary operator" msgstr "невядомы двайковы дзейнік\n" -#: src/test.c:646 +#: src/test.c:648 #, fuzzy, c-format msgid "%s: binary operator expected" msgstr "%s: чакаецца бінарны апэратар\n" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -9708,7 +10037,7 @@ msgstr "" " альбо: [ ]\n" " альбо: [ ПАРАМЭТАР\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -9716,14 +10045,14 @@ msgstr "" "Завяршае працу з кодам вяртаньня, які вызначаецца ВЫРАЗАМ.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 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 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -9732,7 +10061,7 @@ msgid "" " EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n" msgstr "" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -9742,7 +10071,7 @@ msgid "" " STRING1 != STRING2 the strings are not equal\n" msgstr "" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -9753,7 +10082,7 @@ msgid "" " INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n" msgstr "" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -9761,7 +10090,7 @@ msgid "" " FILE1 -ot FILE2 FILE1 is older than FILE2\n" msgstr "" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -9770,7 +10099,7 @@ msgid "" " -e FILE FILE exists\n" msgstr "" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -9779,7 +10108,7 @@ msgid "" " -k FILE FILE exists and has its sticky bit set\n" msgstr "" -#: src/test.c:766 +#: src/test.c:768 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" @@ -9794,7 +10123,7 @@ msgstr "" " -r ФАЙЛ ФАЙЛ існуе, маюцца правы на яго чытаньне\n" " -s ФАЙЛ ФАЙЛ існуе, яго памер большы за нуль\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -9803,7 +10132,7 @@ msgid "" " -x FILE FILE exists and execute (or search) permission is granted\n" msgstr "" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -9812,33 +10141,33 @@ msgid "" "INTEGER may also be -l STRING, which evaluates to the length of STRING.\n" msgstr "" -#: src/test.c:786 +#: src/test.c:788 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 +#: src/test.c:793 msgid "test and/or [" msgstr "test і/альбо [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "" -#: src/test.c:858 +#: src/test.c:860 #, fuzzy msgid "missing ']'" msgstr "прапушчаны \"]\"\n" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "дадатковы довад %s" @@ -9858,7 +10187,7 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -9867,11 +10196,11 @@ msgstr "" "Выкарыстаньне: %s ЗАГАД [ДОВАД]...\n" " ці: %s ВЫБАР\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -9889,7 +10218,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9897,7 +10226,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -9908,7 +10237,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -9923,6 +10252,11 @@ msgstr "памылка запісу %s" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -10215,12 +10549,12 @@ msgstr "" msgid "Exit with a status code indicating failure." msgstr "" -#: src/truncate.c:96 +#: src/truncate.c:69 #, fuzzy, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Выкарыстаньне: %s [ВЫБАР]... ФАЙЛ...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -10231,22 +10565,22 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -10254,57 +10588,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: файл мае адмоўны памер" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "немагчыма ўсталяваць правы %s" -#: src/truncate.c:205 +#: src/truncate.c:178 #, fuzzy, c-format msgid "overflow rounding up size of file %s" msgstr "перапаўненьне зруху цягам чытаньня файла %s" -#: src/truncate.c:215 +#: src/truncate.c:188 #, fuzzy, c-format msgid "overflow extending size of file %s" msgstr "перапаўненьне зруху цягам чытаньня файла %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "" -#: src/truncate.c:303 +#: src/truncate.c:276 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "зададзены некалькі дырэкторыяў прызначэньня" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "нерэчаісны нумар %s" + +#: src/truncate.c:307 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "вы павінны пазначыць сьпіс байтаў, знакаў ці палёў" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "немагчыма адчыніць %s для запісу" @@ -10319,16 +10658,19 @@ msgstr "" 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:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: увод утрымлівае няцотную колькасьць элемэнтаў" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: увод утрымлівае цыкал:" @@ -10391,9 +10733,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "Запісвае кожны ФАЙЛ ў стандартны вывад з апошняга па першы радок.\n" "Калі ФАЙЛ не зададзне альбо зададзены -, чытае стандартны ўвод.\n" @@ -10438,8 +10778,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -10450,7 +10790,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -10595,11 +10935,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "" - #: src/uptime.c:214 #, fuzzy, c-format msgid "" @@ -10620,12 +10955,16 @@ msgid "" "\n" msgstr "" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +msgid "" +"\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" @@ -10633,12 +10972,12 @@ msgid "" " -l, --lines print the newline counts\n" msgstr "" -#: src/wc.c:128 +#: src/wc.c:134 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" @@ -10801,10 +11140,10 @@ msgstr "" "ID карыстальніка. Тое самае, што й \"id -un\".\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: немагчыма адшукаць імя карыстальніка з ID %lu\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "немагчыма атрымаць імя для ID карыстальніка %u" #: src/yes.c:41 #, c-format @@ -10824,6 +11163,71 @@ msgstr "" "Бесперапынна выводзіць РАДОК(і), ці літару \"y\".\n" "\n" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "Калі ФАЙЛ не зададзены альбо зададзены -, чытае стандартны ўвод.\n" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Калі ФАЙЛ не зададзены альбо зададзены -, чытае стандартны ўвод.\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ " Вымагае запісу ўсіх зьмененых блёкаў на дыск і абнаўленьне " +#~ "супэрблёка.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "на ўсе довады не зьвяртаецца ўвага" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: нерэчаісны нумар" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s такі вялікі, што немагчыма паказаць" + +#~ msgid "number of lines" +#~ msgstr "колькасьць радкоў" + +#~ msgid "number of bytes" +#~ msgstr "колькасьць байтаў" + +#, fuzzy +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: нерэчаісная колькасьць радкоў" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: нерэчаісная колькасьць байтаў" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: нерэчаісная колькасьць радкоў" + +#~ msgid "number in %s is too large" +#~ msgstr "нумар у %s завялікі" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: нерэчаісная колькасьць сэкундаў" + +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "немагчыма ўсталяваць дадатковую групу" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: немагчыма адшукаць імя карыстальніка з ID %lu\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: недапушчальны выраб -- %c\n" @@ -10853,9 +11257,6 @@ msgstr "" #~ " %s /usr/bin/sort Выводзіць \"sort\".\n" #~ " %s include/stdio.h .h Выводзіць \"stdio\".\n" -#~ msgid "Usage: %s [OPTION] [FILE]...\n" -#~ msgstr "Выкарыстаньне: %s [ВЫБАР] [ФАЙЛ]...\n" - #~ msgid "%s" #~ msgstr "%s" diff --git a/po/bg.gmo b/po/bg.gmo index 29ab006e..50d31563 100644 Binary files a/po/bg.gmo and b/po/bg.gmo differ diff --git a/po/bg.po b/po/bg.po index 851d1f0e..c9abf410 100644 --- a/po/bg.po +++ b/po/bg.po @@ -10,11 +10,12 @@ # # This file should be sent to translation@iro.umontreal.ca with the # following subject line: TP-Robot coreutils-6.5.bg.po +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils 6.5\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2006-11-23 22:41+0200\n" "Last-Translator: Anton Zinoviev \n" "Language-Team: Bulgarian \n" @@ -43,18 +44,18 @@ msgstr "Допустими аргументи са:" msgid "error closing file" msgstr "затваряне на входния файл %s" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "грешка при запис" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "режимът за достъп до %s е запазен" @@ -240,57 +241,62 @@ msgstr "Неправилно кодиран низ на аргумент" msgid "Unknown error" msgstr "Непозната грешка" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: опцията „%s“ е двусмислена\n" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: опцията „-W %s“ е двусмислена\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: опцията „--%s“ не допуска аргумент\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: опцията „%c%s“ не допуска аргумент\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, fuzzy, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: опцията „%s“ изисква аргумент\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: непозната опция „--%s“\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: непозната опция „%c%s“\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: неправилна опция -- %c\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: опцията изисква аргумент -- %c\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: опцията „-W %s“ е двусмислена\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: опцията „-W %s“ не допуска аргумент\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, fuzzy, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: опцията „%s“ изисква аргумент\n" @@ -300,13 +306,13 @@ msgstr "%s: опцията „%s“ изисква аргумент\n" msgid "cannot change permissions of %s" msgstr "не може да се сменят правата за достъп до %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "не може да се създаде каталог %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "паметта е изчерпана" @@ -355,6 +361,12 @@ msgstr "“" msgid "%s: end of file" msgstr "%s: край на файла" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: грешка при четене" + #: lib/regcomp.c:131 msgid "Success" msgstr "Успех" @@ -464,7 +476,7 @@ msgstr "^[дДoOyY]" msgid "^[nN]" msgstr "^[нНkKnN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "установява се режимът за достъп до %s" @@ -904,7 +916,7 @@ msgstr "" "изход\n" "\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -914,15 +926,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Ако няма ФАЙЛ или ако ФАЙЛ е -, се чете от стандартния вход.\n" - -#: src/base64.c:79 +#: src/base64.c:77 #, fuzzy msgid "" "\n" @@ -938,51 +942,51 @@ msgstr "" "ред)\n" "във входния поток.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "грешка при четене" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "недопустим вход" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "неправилен размер за пренасяне: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "излишен операнд „%s“" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, 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:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 #, fuzzy msgid "David MacKenzie" @@ -1026,40 +1030,46 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "липсващ операнд" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 #, fuzzy msgid "Richard M. Stallman" msgstr "Torbjorn Granlund и Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Използване: %s [ОПЦИЯ]... [ФАЙЛ]...\n" #: src/cat.c:92 #, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"Извежда на стандартния изход сортирана конкатенация на всички ФАЙЛ(ове).\n" +"\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1079,7 +1089,7 @@ msgstr "" " -s, --squeeze-blank никога последователност от повече от един празен " "ред\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1092,7 +1102,7 @@ msgstr "" " -v, --show-nonprinting ползва запис с ^ и M-, освен за нов ред и " "табулация\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1105,17 +1115,18 @@ msgstr "" " %s f - g Извежда съдържанието на f, после стандартния изход и g\n" " %s Копира стандартния вход на стандартния изход.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "не може да се изпълни ioctl за „%s“" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "стандартният изход" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: входният файл е изходен файл" @@ -1127,10 +1138,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 #, fuzzy msgid "Jim Meyering" msgstr "Jim Meyering и Paul Eggert" @@ -1145,8 +1156,8 @@ msgstr "промяната на собственика на %s не успя\n" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "не могат да се получат атрибутите на %s" @@ -1161,13 +1172,13 @@ msgstr "" msgid "failed to change context of %s to %s" msgstr "собственик на %s не можа да се промени на %s\n" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "няма достъп до %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "каталогът %s не може да се чете" @@ -1183,7 +1194,7 @@ msgstr "променят се правата за достъп до %s" msgid "fts_read failed" msgstr "неуспешен fts_read" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, fuzzy, c-format msgid "fts_close failed" @@ -1287,7 +1298,7 @@ msgid "-R -h requires -P" msgstr "-R -h изисква -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1304,9 +1315,8 @@ msgid "conflicting security context specifiers given" msgstr "" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "не могат да се получат атрибутите на %s" @@ -1603,17 +1613,17 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "неправилна група %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, fuzzy, c-format msgid "invalid group list %s" msgstr "неправилна група %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1622,7 +1632,7 @@ msgstr "" "Използване: %s НОВКОРЕНОВ [КОМАНДА...]\n" " или: %s ОПЦИЯ\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1630,13 +1640,20 @@ msgstr "" "Изпълнява КОМАНДА с коренов каталог НОВКОРЕНОВ.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:207 #, fuzzy msgid "" "\n" @@ -1646,42 +1663,47 @@ msgstr "" "Ако не е посочена команда, изпълнява „${SHELL} -i“ (по подразбиране: /bin/" "sh).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "кореновият каталог не може да се смени на %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "с chdir не може да се влиза в главния каталог" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "не може да се получи списъка от допълнителни групи" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" -msgstr "не може да се установи допълнителна група" +msgid "failed to set supplemental groups" +msgstr "не може да се получи списъка от допълнителни групи" -#: src/chroot.c:402 +#: src/chroot.c:418 #, fuzzy, c-format msgid "failed to set group-ID" msgstr "не може да се изпълни stat за %s" -#: src/chroot.c:405 +#: src/chroot.c:421 #, fuzzy, c-format msgid "failed to set user-ID" msgstr "не може да се изпълни stat за %s" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, fuzzy, c-format msgid "failed to run command %s" msgstr "неуспешно изпълнение на командата %s" @@ -1722,7 +1744,16 @@ msgstr "Използване: %s [ОПЦИЯ]... ФАЙЛ1 ФАЙЛ2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Сравнява сортираните файлове ФАЙЛ1 и ФАЙЛ2 ред по ред.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Ако няма ФАЙЛ или ако ФАЙЛ е -, се чете от стандартния вход.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1734,7 +1765,7 @@ msgstr "" "редовете, които са само във ФАЙЛ1. Вторият стълб съдържа редовете, които\n" "са само във ФАЙЛ2. Третият стълб съдържа редовете, общи и за двата файла.\n" -#: src/comm.c:116 +#: src/comm.c:120 #, fuzzy msgid "" "\n" @@ -1747,7 +1778,7 @@ msgstr "" " -2 не извежда редовете, които са само във ФАЙЛ2\n" " -3 не извежда редовете, които се появяват и в двата файла\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1755,17 +1786,17 @@ msgid "" " --nocheck-order do not check that the input is correctly sorted\n" msgstr "" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1774,313 +1805,327 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "" -#: src/comm.c:407 +#: src/comm.c:411 #, fuzzy, c-format msgid "multiple delimiters specified" msgstr "посочени са много опции -i" -#: src/comm.c:411 +#: src/comm.c:415 #, fuzzy, c-format msgid "empty %s not allowed" msgstr "допълнителният операнд %s не е позволен с -c" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "не може да се обработи непоследователно %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "грешка при четене на %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "не може да се обработи непоследователно %s" +msgid "error reading %s" +msgstr "грешка при четене на %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "грешка при запис в %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "грешка при четене на %s" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "%s: не може да се отстрани" -#: src/copy.c:383 +#: src/copy.c:478 #, fuzzy, c-format msgid "%s: write failed" msgstr "неуспешен запис" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "не може да се отвори %s" -#: src/copy.c:687 +#: src/copy.c:789 #, fuzzy, c-format msgid "clearing permissions for %s" msgstr "установява се режимът за достъп до %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "собствеността на %s не можа да се запази" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "не може да се търси файла %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "не можа да се запази авторството на %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, fuzzy, c-format msgid "failed to set default file creation context to %s" msgstr "не могат да се получат атрибутите на %s" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "каталогът %s не може да се затвори" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "не могат да се получат атрибутите на %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "не може да се отвори %s за четене" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "не може да се получи режимът за достъп до %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "файлът %s се пропуска, тъй като бе заместен по време на копирането" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "не може да се изтрие %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "%s е изтрит\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "не може да се създаде обикновен файл %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" msgstr "каталогът %s не може да се затвори" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "времената за %s се запазват" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "не може да се отвори %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, fuzzy, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: да се замести ли %s (режимът за достъп е %04lo)? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: да се замести ли %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (резервно копие: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "не може да се направи твърда връзка %s към %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "не могат да се получат атрибутите на %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "каталогът %s се пропуска" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "внимание: изходния файл %s е посочен повече от веднъж" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s и %s са един и същ файл" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "%s не е каталог и не може да се замести с каталога %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "току що създаденият %s няма да бъде заместен с %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "каталогът %s не може да се замести с файл, който не е каталог" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" "каталог не може да се премести върху файл, който не е каталог: %s -> %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "резервното копиране на %s би разрушило източника; %s не бе преместен" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "резервното копиране на %s би разрушило източника; %s не бе копиран" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "не може да се направи резервно копие на %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, fuzzy, c-format msgid "will not copy %s through just-created symlink %s" msgstr "току що създаденият %s няма да бъде заместен с %s" -#: src/copy.c:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "не може да се копира каталог (%s) в самия себе си (%s)" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "внимание: изходния файл %s е посочен повече от веднъж" + +#: src/copy.c:2294 #, c-format msgid "will not create hard link %s to directory %s" msgstr "няма да се направи твърда връзка %s към каталога %s" -#: src/copy.c:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "не може да се премести %s в своя подкаталог %s" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "не може да се премести %s в %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "преместването между устройства не успя (от %s в %s); целевият файл не можа " "да се изтрие" -#: src/copy.c:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "не може да се копира цикличната символна връзка %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: относителни символни връзки може да се правят само в текущия каталог" -#: src/copy.c:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "не може да се създаде символна връзка %s към %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "не може да се създаде именуван канал %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "не може да се създаде специален файл %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "не може да се чете символната връзка %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "не може да се създаде символна връзка %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s има непознат файлов тип" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "не може да се възстанови от резервно копие %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (от резервно копие)\n" @@ -2090,25 +2135,25 @@ msgstr "%s -> %s (от резервно копие)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, fuzzy, c-format msgid "unknown program %s" msgstr "непознат потребител: %s" @@ -2379,8 +2424,8 @@ msgstr "%s съществува, но не е каталог" msgid "failed to access %s" msgstr "не може да се отвори %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "липсващ файлов операнд" @@ -2453,132 +2498,131 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "входът изчезна" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: номерът на ред е извън диапазона" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: номерът на ред е извън диапазона" # Не е ясно за какво служи това. -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " при повтаряне %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: не е открито съответствие" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "грешка при търсене на регулярен израз" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "грешка при запис за %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: след разделител се очаква цяло число" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: при означаване брой повторения е необходим „}“" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: между „{“ и „}“ е необходимо цяло число" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: липсва затварящ ограничител „%c“" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: неправилен регулярен израз: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: неправилен образец" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: номерът на ред трябва да бъде положителен" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "номерът на ред %s е по-малък от предходния номер - %s" -#: src/csplit.c:1200 +#: src/csplit.c:1201 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "внимание: номерът на ред %s съвпада с предходния номер на ред" -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "в суфикса липсва означител за преобразуване" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "неправилен означител за преобразуване в суфикса: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "неправилен означител за преобразуване в суфикса: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "%.*s: неправилна спецификация на преобразувание" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "твърде много означители за преобразуване %% в суфикса" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "липсва означител %% за преобразуване в суфикса" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: недопустимо число" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +msgid "invalid number" +msgstr "неправилно число" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Използване: %s [ОПЦИЯ]... ФАЙЛ ОБРАЗЕЦ...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 #, fuzzy msgid "" "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n" @@ -2588,7 +2632,16 @@ msgstr "" "“xx01“, „xx02“,... Дължината им в байтове се извежда на стандартния изход.\n" "\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Ако ФАЙЛ е -, се чете от стандартния вход. Всеки ОБРАЗЕЦ може да бъде:\n" + +#: src/csplit.c:1492 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2600,11 +2653,11 @@ msgstr "" " -k, --keep-files да не се изтриват създадените файлове при " "грешка\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2615,18 +2668,11 @@ msgstr "" "файлове\n" " -z, --elide-empty-files да се изтриват генерираните празни файлове\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Ако ФАЙЛ е -, се чете от стандартния вход. Всеки ОБРАЗЕЦ може да бъде:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 #, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2661,7 +2707,7 @@ msgstr "" "Отпечатва избраните части от редовете на всеки ФАЙЛ на стандартния изход.\n" "\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2672,7 +2718,7 @@ msgstr "" " -d, --delimiter=РАЗДЕЛ РАЗДЕЛ вместо табулация като разделител между " "полетата\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2685,7 +2731,7 @@ msgstr "" " ако е посочена и опцията -s.\n" " -n (пренебрегва се)\n" -#: src/cut.c:193 +#: src/cut.c:194 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2694,7 +2740,7 @@ msgstr "" " --complement извежда допълнението на съвкупността от избрани\n" " байтове, знаци или полета.\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2705,7 +2751,7 @@ msgstr "" " --output-delimiter=НИЗ да се ползва НИЗ като разделител на изхода\n" " по подразбиране се използва входният разделител\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2713,7 +2759,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:210 +#: src/cut.c:211 #, fuzzy msgid "" "Each range is one of:\n" @@ -2722,8 +2768,6 @@ msgid "" " 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 "" "\n" "Използвайте точно една от опциите -b, -c и -f. Всеки СПИС се състои\n" @@ -2738,53 +2782,53 @@ msgstr "" "\n" "Без ФАЙЛ или ако ФАЙЛ е - се чете от стандартния вход.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "неправилен списък байтове или полета" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "" -#: src/cut.c:320 +#: src/cut.c:319 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "неправилна опция за ширина: %s" -#: src/cut.c:334 -#, fuzzy +#: src/cut.c:333 src/numfmt.c:1417 +#, fuzzy, c-format msgid "invalid decreasing range" msgstr "неправилен входен диапазон: %s" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "байтовото отместване %s е твърде дълго" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "номерът на поле %s е твърде голям" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "трябва да се посочи само един вид списък" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "разделителят трябва да се състои от един знак" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "трябва да посочите списък байтове, знаци или полета" -#: src/cut.c:790 +#: src/cut.c:789 msgid "an input delimiter may be specified only when operating on fields" msgstr "входен разделител може да се посочва само ако се работи с полета" -#: src/cut.c:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2792,11 +2836,11 @@ msgstr "" "потискането на редове, несъдържащи разделител, има смисъл\n" "\tсамо ако се работи с полета" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "липсва списък полета" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "липсва списък позиции" @@ -2816,12 +2860,24 @@ msgstr "" #: src/date.c:134 #, fuzzy msgid "" -" -d, --date=STRING display time described by STRING, not 'now'\n" -" -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -" -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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" +"Извежда текущото време в посочения ФОРМАТ или установява датата на " +"системата.\n" +"\n" +" -d, --date=НИЗ извежда времето, посочено от НИЗ, вместо „now“\n" +" -f, --file=ФАЙЛДАТИ като --date по веднъж за всеки ред от ФАЙЛДАТИ\n" + +#: src/date.c:138 +#, fuzzy +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" "Извежда текущото време според посочения ФОРМАТ или настройва системната " "дата.\n" @@ -2838,23 +2894,20 @@ msgstr "" " --iso-8601 без ВИДВРЕМЕ е еквивалентно на " "„date“.\n" -#: src/date.c:142 +#: src/date.c:145 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" -#: src/date.c:147 +#: src/date.c:149 #, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " -r, --reference=ФАЙЛ извежда времето на последна промяна на ФАЙЛ\n" " -R, --rfc-2822 извежда датов низ според RFC-2822\n" @@ -2866,7 +2919,18 @@ msgstr "" "НИЗ\n" " -u, --utc, --universal отпечатва или настройва гринуичко време\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 +msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 #, fuzzy msgid "" "\n" @@ -2884,7 +2948,7 @@ msgstr "" " %a съкратено наименование на деня от седмицата според локала (пн,вт," "ср,...)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2897,7 +2961,7 @@ msgstr "" " %B име на месеца според локала, променлива дължина (напр. януари)\n" " %c датата и часът според локала (например сб ное 4 12:02:33 EЕТ 1989)\n" -#: src/date.c:171 +#: src/date.c:177 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2910,7 +2974,7 @@ msgstr "" " %D датата; същото като %m/%d/%y\n" " %e денят от месеца с пълнеж от интервал; същото като %_d (напр. „ 1“)\n" -#: src/date.c:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2920,7 +2984,7 @@ msgstr "" " %g последните две цифри на годината, съдържаща седмицата с номер %V\n" " %G годината, съдържаща седмицата с номер %V\n" -#: src/date.c:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2932,7 +2996,7 @@ msgstr "" " %I часът (01-12)\n" " %j поредният ден в годината (001-366)\n" -#: src/date.c:188 +#: src/date.c:194 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2945,7 +3009,7 @@ msgstr "" " %m месецът (01-12)\n" " %M минутата (00-59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2963,7 +3027,7 @@ msgstr "" " %R 24 часово време, същото като %H:%M\n" " %s секундите изминали от 1 януари 1970, 00:00:00 по гринуич\n" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2976,7 +3040,7 @@ msgstr "" " %T 24 часово време, същото като %H:%M:%S\n" " %u денят от седмицата (1-7); 1 означава понеделник\n" -#: src/date.c:209 +#: src/date.c:215 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" @@ -2990,7 +3054,7 @@ msgstr "" " %W номерът на седмицата в годината, понеделник е пръв седмичен ден " "(00-53)\n" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3002,7 +3066,7 @@ msgstr "" " %y последните две цифри от годината (00-99)\n" " %Y годината\n" -#: src/date.c:221 +#: src/date.c:227 #, fuzzy msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" @@ -3030,7 +3094,7 @@ msgstr "" " ^ да се използват главни букви, където може\n" " # да се използват малки букви, където може\n" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3041,7 +3105,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3058,7 +3122,7 @@ msgstr "" "E за да се използва алтернативното представяне според локала, или\n" "O за да се използват алтернативните числови знаци, ако ги има.\n" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3072,37 +3136,37 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "стандартният вход" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "неправилна дата %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "посочени са много формати за изхода" -#: src/date.c:430 +#: src/date.c:436 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "посочените опции за дати за отпечатване са взаимно изключващи се" -#: src/date.c:437 +#: src/date.c:443 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" "не може едновременно да се използват опции за отпечатване и настройка на " "времето" -#: src/date.c:458 +#: src/date.c:464 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3114,23 +3178,23 @@ msgstr "" "аргумент\n" "трябва да бъде форматен низ, започващ с „+“." -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "не може да се настрои датата" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3139,7 +3203,7 @@ msgstr "" "Използване: %s [ОПЕРАНД]...\n" " или: %s ОПЦИЯ\n" -#: src/dd.c:532 +#: src/dd.c:561 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3158,7 +3222,7 @@ msgstr "" " count=БЛОКОВЕ копира само БЛОКОВЕ входни блока\n" " ibs=БАЙТОВЕ чете на парчета от по БАЙТОВЕ байта\n" -#: src/dd.c:541 +#: src/dd.c:570 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3168,8 +3232,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=ФАЙЛ чете от ФАЙЛ вместо от стандартния вход\n" " iflag=ФЛАГ,... чете според посочените флагове\n" @@ -3180,7 +3246,7 @@ msgstr "" " skip=БЛОКОВЕ пропуска БЛОКОВЕ входни блока с размер ibs всеки\n" " status=noxfer без статистика за трансфера\n" -#: src/dd.c:552 +#: src/dd.c:583 #, fuzzy msgid "" "\n" @@ -3198,7 +3264,7 @@ msgstr "" "Всяка КЛЮЧДУМА може да бъде:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3228,7 +3294,7 @@ msgstr "" " използване с block или unblock попълва с интервали вместо с " "нули\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3244,7 +3310,7 @@ msgstr "" " fdatasync записва физически изходните данни още преди пълното приключване\n" " fsync подобно, но освен това записва и метаданните\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3258,145 +3324,113 @@ msgstr "" " append режим добавяне (смислено само за изхода, препоръчва се " "conv=notrunc)\n" -#: src/dd.c:589 +#: src/dd.c:620 #, fuzzy msgid " cio use concurrent I/O for data\n" msgstr "" " text да се използват текстови входно/изходни операции за данните\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr "" " direct да се използват директни входно/изходни операции за данните\n" -#: src/dd.c:593 +#: src/dd.c:624 #, fuzzy msgid " directory fail unless a directory\n" msgstr " directory отказва да работи, освен при каталог\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" " dsync да се използват синхронизирани входно/изходни операции за " "данните\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr "" " sync подобно, но също и за метаданните (напр. на файловата система)\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock да се използват неблокиращи входно/изходни операции\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime да не се обновява времето за достъп\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty да не се определя управляващ терминал от файл\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow да не се следват символните връзки\n" # TODO: наистина ли се имат предвид твърди връзки? -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks отказва да работи при множество твърди връзки\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr "" " binary да се използват двоични входно/изходни операции за данните\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr "" " text да се използват текстови входно/изходни операции за данните\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 -#, fuzzy, c-format +#: src/dd.c:661 +#, 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 "" -"\n" -"Изпращането на сигнал %s към към работещ процес „dd“ го кара да изведе\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" -" изкопирани са 9387674624 байта (9.4 GB) за 34,6279 секунди с 271 MB/s\n" - -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -"%+% прочетени блока\n" -"%+% записани блока\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% съкратен запис\n" -msgstr[1] "% съкратени записа\n" -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "изкопиран е % байт (%s)" msgstr[1] "изкопирани са % байта (%s)" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "Безброй" @@ -3410,88 +3444,104 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% прочетени блока\n" +"%+% записани блока\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% съкратен запис\n" +msgstr[1] "% съкратени записа\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "затваряне на входния файл %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "затваряне на изходния файл %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, fuzzy, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "не може отвори каталогът %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "запис в %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "непознат операнд %s" -#: src/dd.c:1285 +#: src/dd.c:1376 #, fuzzy msgid "invalid conversion" msgstr "неправилно посочено преобразуване: %s" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 #, fuzzy msgid "invalid input flag" msgstr "непознат входен флаг: %s" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 #, fuzzy msgid "invalid output flag" msgstr "непознат изходен флаг: %s" -#: src/dd.c:1294 +#: src/dd.c:1385 #, fuzzy -msgid "invalid status flag" +msgid "invalid status level" msgstr "непознат флаг за състояние: %s" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "недопустимо число %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "не може да се комбинират никои две от {ascii,ebcdic,ibm}" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "не може да се комбинират block и unblock" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "не може да се комбинират lcase и ucase" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "не може да се комбинират excl и nocreat" -#: src/dd.c:1424 +#: src/dd.c:1527 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "не може да се комбинират excl и nocreat" # Това ме мързи да го превеждам. -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3500,62 +3550,62 @@ msgstr "" "warning: working around lseek kernel bug for file (%s)\n" " of mt_type=0x%0lx -- see for the list of types" -#: src/dd.c:1670 +#: src/dd.c:1773 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: неуспешно позициониране" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: неуспешно позициониране" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "препълване на отместването при четене на файла %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, fuzzy, c-format msgid "warning: invalid file offset after failed read" msgstr "внимание: съмнително отместване във файла след пропаднало четене" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "в крайна сметка не може да се компенсира грешката в ядрото" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "задействат се флаговете за %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: не може да се отиде на относително отместване %s във файла" -#: src/dd.c:2172 +#: src/dd.c:2288 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "съкращаване до % байта в изходния файл %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "неуспешно извикване на fdatasync за %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "неуспешнен запис (fsync) за %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "не може да се отвори %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3564,19 +3614,19 @@ msgstr "" "твърде голямо отместване: не може да се отреже до дължината на seek=" "% (%lu-byte) блокове" -#: src/dd.c:2306 +#: src/dd.c:2422 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "съкращаване до % байта в изходния файл %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, fuzzy, c-format msgid "failed to discard cache for: %s" msgstr "не може отвори каталогът %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "" @@ -3657,12 +3707,12 @@ msgstr "Обем" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 #, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" @@ -3674,18 +3724,18 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3701,7 +3751,7 @@ msgstr "" " --no-sync без sync преди получаване на използването (по " "подразб.)\n" -#: src/df.c:1409 +#: src/df.c:1429 #, fuzzy msgid "" " --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" @@ -3709,6 +3759,28 @@ msgid "" "omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" +msgstr "" +" -P, --portability да се използва изходен формат POSIX\n" +" --sync изпълнява sync преди получаване на информация\n" +" -t, --type=ТИП извежда информация само за файлови системи от тип " +"ТИП\n" +" -T, --print-type извежда типа на файловата система\n" +" -x, --exclude-type=ТИП не извежда информация за файлови системи от тип " +"ТИП\n" +" -v (пренебрегва се)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose съобщава на стандартната грешка преди отварянето\n" +" на всеки изходен файл\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3723,7 +3795,7 @@ msgstr "" "ТИП\n" " -v (пренебрегва се)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3731,26 +3803,26 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, fuzzy, c-format msgid "options %s and %s are mutually exclusive" msgstr "опциите --string и --check не може да се използват едновременно" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "файловите системи от тип %s са едновременно избрани и изключени" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Внимание: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 #, fuzzy msgid "cannot read table of mounted file systems" msgstr "%sне може да се прочете таблицата на монтирани файлови системи" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "нито една файлова система не бе обработена" @@ -3863,7 +3935,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3874,7 +3946,8 @@ msgstr "" #: src/du.c:285 #, fuzzy -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Резюмира използването на диска от всеки ФАЙЛ, рекурсивно за каталозите.\n" "\n" @@ -4021,63 +4094,57 @@ msgstr "" msgid "Infinity" msgstr "Безброй" -#: src/du.c:636 +#: src/du.c:657 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "неуспешен fts_read" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "неправилна максимална дълбочина %s" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "неправилен аргумент „%s“" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "не може едновременно да се резюмира и да се показват всички елементи" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "внимание: резюмирането е еквивалентно на --max-depth=0" -#: src/du.c:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "внимание: резюмирането влиза в конфликт с --max-depth=%lu" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 #, fuzzy msgid "file operands cannot be combined with --files0-from" msgstr "Не може да се комбинират файлови операнди с --files0-from." -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: грешка при четене" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" "при четене на файлови имена от stdin, никое файлово име не може да бъде %s" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "неправилно файлово име с дължина нула" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "общо" @@ -4216,9 +4283,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "Замества табулациите във всеки ФАЙЛ с интервали и извежда на стандартния " "изход.\n" @@ -4266,7 +4331,7 @@ msgid "input line is too long" msgstr "входният ред е твърде дълъг" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "" @@ -4423,12 +4488,12 @@ msgstr "грешка при пасването на регулярния изр msgid "non-integer argument" msgstr "нечислов аргумент" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "делене на нула" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Използвайте LC_ALL='C', за да заобиколите този проблем." @@ -4439,31 +4504,31 @@ msgid "the strings compared were %s and %s" msgstr "Сравняваните низове бяха %s и %s." #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s не е правилно положително цяло число" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s е твърде дълго" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4472,7 +4537,7 @@ msgstr "" "Използване: %s [ЧИСЛО]...\n" " или: %s ОПЦИЯ\n" -#: src/factor.c:2443 +#: src/factor.c:2533 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4520,7 +4585,7 @@ msgstr "" "Ако няма посочен ФАЙЛ или ако ФАЙЛ е „-“, чете от стандартния вход.\n" "\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4533,7 +4598,7 @@ msgstr "" " НИЗ, форматира, след което добавя пак НИЗ\n" " -s, --split-only цепи дългите редове, но не попълва късите\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, fuzzy, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4546,7 +4611,7 @@ msgstr "" " -w, --width=ШИРИНА максимална ширина на реда (по подразбиране 75 " "знака)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4555,22 +4620,20 @@ msgstr "" "неправилна опция -- %c; -ШИРИНА се разпознава само ако е първа опция;\n" "в противен случай ползвайте -w ШИРИНА" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "неправилна ширина: %s" -#: src/fold.c:70 +#: src/fold.c:69 #, fuzzy -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "Развива поредово входните редове на всеки ФАЙЛ (или стандартния вход), като\n" "извежда резултата на стандартния изход.\n" "\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4580,9 +4643,9 @@ msgstr "" " -s, --spaces прекъсва при интервали\n" " -w, --width=ШИРИНА да се ползват ШИРИНА стълбове, вместо 80\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "неправилен номер стълбове: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4649,19 +4712,18 @@ msgstr "не може да се зададе потребителят" msgid "%s: no such user" msgstr "%s: Няма такъв потребител" -#: src/head.c:109 +#: src/head.c:110 #, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Извежда първите 10 реда от всеки ФАЙЛ на стандартния изход.\n" "При повече от един ФАЙЛ, поставя заглавия с файловите имена.\n" "При отсъствие на ФАЙЛ или ако ФАЙЛ е -, чете от стандартния вход.\n" "\n" -#: src/head.c:117 +#: src/head.c:118 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4678,7 +4740,7 @@ msgstr "" " със знак минус преди N извежда всички, освен\n" " последните N реда от всеки файл\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4686,7 +4748,7 @@ msgstr "" " -q, --quiet, --silent да не се извеждат заглавия с файловите имена\n" " -v, --verbose винаги да извежда заглавия с файловите имена\n" -#: src/head.c:131 +#: src/head.c:132 #, fuzzy msgid "" "\n" @@ -4701,49 +4763,37 @@ msgstr "" "Всяка КЛЮЧДУМА може да бъде:\n" "\n" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: файлът се е свил твърде много" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: твърде голям брой байтове" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: не може да се отиде на отместване %s във файла" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: не може да се отиде на относително отместване %s във файла" -#: src/head.c:886 +#: src/head.c:267 #, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "%s: %s е толкова голям, че не е изводим" - -#: src/head.c:887 -msgid "number of lines" -msgstr "брой на редовете" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "количество байтове" +msgid "%s: number of bytes is too large" +msgstr "%s: твърде голям брой байтове" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "недопустим брой редове" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "недопустимо количество байтове" # TODO: Как да се праведе trailing? -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "неправилна опция -- %c" @@ -4932,7 +4982,7 @@ msgstr "не може да се смени собствеността на %s" msgid "cannot set time stamps for %s" msgstr "не може да се зададе времето на %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "системната функция за нов процес (fork) не успя" @@ -5087,7 +5137,7 @@ msgid "target directory not allowed when installing a directory" msgstr "" "при инсталиране на каталог не се позволява посочването на целеви каталог" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "неправилен режим %s" @@ -5121,11 +5171,15 @@ msgid "Mike Haertel" msgstr "Mike Haertel и Paul Eggert" #: src/join.c:195 -#, 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" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5141,7 +5195,7 @@ msgstr "" " ФАЙЛНОМ е 1 или 2 съответно за ФАЙЛ1 и ФАЙЛ2\n" " -e ПРАЗНО заменя липсващите входни полета с ПРАЗНО\n" -#: src/join.c:204 +#: src/join.c:210 #, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" @@ -5156,7 +5210,7 @@ msgstr "" " -t ЗНАК ползва ЗНАК като разделител на входните и изходни " "полета\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5168,13 +5222,13 @@ msgid "" " print them without trying to pair them\n" msgstr "" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 #, fuzzy msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated завършва редовете с байт 0 вместо с нов ред\n" -#: src/join.c:225 +#: src/join.c:231 #, fuzzy msgid "" "\n" @@ -5208,47 +5262,47 @@ msgstr "" "Например\n" "ако на join не са подадени опции, ползвайте „sort -k 1b,1“.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "неправилен номер на поле: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "неправилен означител за поле: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "неправилен номер на файл при означител на поле: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "неправилни свързващи полета %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "несъвместими заменящи низове за празно поле" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "многосимволна табулация %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "несъвместими табулации" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "не може и двата файла да са стандартният вход" @@ -5329,17 +5383,17 @@ msgstr "не може да се задават сигнали заедно с -l msgid "no process ID specified" msgstr "не е посочен номер на процес" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, fuzzy, c-format msgid "invalid buffering mode %s for %s\n" msgstr "недопустим аргумент %s за %s" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -5519,7 +5573,7 @@ msgstr "не може да се създаде символна връзка %s" msgid "FIXME: unknown" msgstr "" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Използване: %s [ОПЦИЯ]\n" @@ -5532,7 +5586,7 @@ msgstr "" "Извежда името на текущия потребител.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "няма входящо име" @@ -5542,7 +5596,7 @@ msgstr "няма входящо име" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%e %b %Y" @@ -5551,100 +5605,100 @@ msgstr "%e %b %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%e %b %k,%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" -"пренебрегва се неправилната стойност на променливата от обкръжението " -"QUOTING_STYLE: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "" "пренебрегва се неправилната ширина в променливата от обкръжението COLUMNS: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "пренебрегва се неправилният размер на табулациите в променливата от " "обкръжението TABSIZE: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "неправилна дължина на реда: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "неправилен размер на табулациите: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "неправилен формат за времето %s" -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "Допустими аргументи са:" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "непознат префикс: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "неразбираема стойност на променливата от обкръжението LS_COLORS" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" +"пренебрегва се неправилната стойност на променливата от обкръжението " +"QUOTING_STYLE: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "не може да се отвори каталогът %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "не може да се установи устройството и i-възлите на %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: вече изведеният каталог не се извежда" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "чете се каталогът %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "затваря се каталогът %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "не може да се сравнят файловите имена %s и %s" -#: src/ls.c:4781 +#: src/ls.c:4775 #, fuzzy msgid "" "List information about the FILEs (the current directory by default).\n" @@ -5654,7 +5708,7 @@ msgstr "" "Сортира елементите азбучно, освен ако има опция -cftuSUX или --sort.\n" "\n" -#: src/ls.c:4788 +#: src/ls.c:4782 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5668,7 +5722,7 @@ msgstr "" " --author с -l извежда автора на всеки файл\n" " -b, --escape извежда осмични числа за неграфичните знаци\n" -#: src/ls.c:4794 +#: src/ls.c:4788 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." @@ -5690,13 +5744,14 @@ msgstr "" " с -l: показва ctime и сортира според името\n" " иначе: сортира според ctime\n" -#: src/ls.c:4804 +#: src/ls.c:4798 #, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5712,7 +5767,7 @@ msgstr "" " и символните връзки, вместо сочените файлове\n" " -D, --dired генерира изход за режима „dired“ на Емакс\n" -#: src/ls.c:4812 +#: src/ls.c:4807 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5731,11 +5786,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time като -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr " -g като -l, но не извежда собственика\n" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5744,7 +5799,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 +#: src/ls.c:4824 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5757,7 +5812,7 @@ msgstr "" " -h, --human-readable извежда размерите като за хора (напр. 1K, 234M, 2G)\n" " -H, --si подобно, но с множител 1000 вместо 1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 #, fuzzy msgid "" " -H, --dereference-command-line\n" @@ -5783,7 +5838,7 @@ msgstr "" " (пренебрегва се, ако има -a или -A)\n" # TODO: превод на shell-ОБРАЗЕЦ? -#: src/ls.c:4845 +#: src/ls.c:4840 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5803,7 +5858,7 @@ msgstr "" "ОБРАЗЕЦ\n" " -k като --block-size=1K\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5820,7 +5875,7 @@ msgstr "" " -m попълва в широчина с разделени със запетая " "елементи\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5841,7 +5896,7 @@ msgstr "" " -p, --indicator-style=slash\n" " добавя знак / към каталозите\n" -#: src/ls.c:4871 +#: src/ls.c:4866 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" @@ -5863,7 +5918,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 #, fuzzy msgid "" " -r, --reverse reverse order while sorting\n" @@ -5875,19 +5930,19 @@ msgstr "" " -R, --recursive извежда подкаталозите рекурсивно\n" " -s, --size извежда размера в блокове на всеки файл\n" -#: src/ls.c:4886 +#: src/ls.c:4881 #, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S сортира според размера на файловете\n" " --sort=ДУМА сортира според ДУМА: none -U, extension -X,\n" @@ -5898,7 +5953,7 @@ msgstr "" "ctime,\n" " или status; по това време се и сортира\n" -#: src/ls.c:4896 +#: src/ls.c:4892 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5925,18 +5980,18 @@ msgstr "" " -T, --tabsize=КОЛОНИ приема, че табулациите са през КОЛОНИ вместо " "през 8\n" -#: src/ls.c:4908 +#: src/ls.c:4904 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:4912 +#: src/ls.c:4908 #, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -5949,21 +6004,22 @@ msgstr "" "каталога\n" " -v сортира според версията\n" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=КОЛОНИ приема, че екранът има ширина КОЛОНИ\n" " -x извежда елементите по редове, а не в стълбове\n" " -X сортира в азбучен ред според разширението\n" " -1 извежда по един файл на ред\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5972,7 +6028,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6002,38 +6058,39 @@ msgstr "" 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 "" "Използване: %s [ОПЦИЯ] [ФАЙЛ]...\n" "Извежда или проверява контролни суми %s (%d-битови).\n" "Без ФАЙЛ или ако ФАЙЛ е -, чете от стандартния вход.\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 #, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" " -b, --binary чете в двоичен режим (по подразбиране, при четене от " "терминал)\n" -#: src/md5sum.c:178 +#: src/md5sum.c:180 #, fuzzy -msgid " -b, --binary read in binary mode\n" +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary чете в двоичен режим\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, fuzzy, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" " -c, --check прочита %s суми от ФАЙЛовете и ги проверява\n" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 #, fuzzy msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" @@ -6041,12 +6098,12 @@ msgstr "" " -t, --text чете в текстов режим (по подразбиране, ako\n" " стандартният вход е от терминал)\n" -#: src/md5sum.c:192 +#: src/md5sum.c:195 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text чете в текстов режим (по подразбиране)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 #, fuzzy msgid "" "\n" @@ -6066,14 +6123,15 @@ msgstr "" "суми\n" "\n" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "Сумите се изчисляват така, както е посочено в %s. При проверка входът\n" @@ -6082,44 +6140,44 @@ msgstr "" "с контролна сума, знак посочващ типа (“*“ за двоичен, „ “ за текстов)\n" "и името на всеки ФАЙЛ.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: твърде много редове с контролни суми" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: неправилно форматиран ред с контролна сума %s" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: НЕ УСПЯ системна функция open или read\n" # Не е ясно къде се използва -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "НЕУСПЕШНО" # Не е ясно къде се използва -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "ОК" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: не са открити правилно форматирани %s редове с контролни суми" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, fuzzy, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "%s: %: неправилно форматиран ред с контролна сума %s" msgstr[1] "%s: %: неправилно форматиран ред с контролна сума %s" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, fuzzy, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" @@ -6129,7 +6187,7 @@ msgstr[1] "" "ВНИМАНИЕ: % от общо % изброени файла не могат да бъдат " "прочетени" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, fuzzy, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" @@ -6138,39 +6196,39 @@ msgstr[0] "" msgstr[1] "" "ВНИМАНИЕ: % от % пресметнати контролни суми НЕ пасват" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, fuzzy, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "опцията --status е смислена само при проверяване на контролни суми" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" "опциите --binary и --text са безсмислени при проверка на контролни суми" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "опцията --status е смислена само при проверяване на контролни суми" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "опцията --warn е смислена само при проверяване на контролни суми" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, fuzzy, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "опцията --status е смислена само при проверяване на контролни суми" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "опцията --status е смислена само при проверяване на контролни суми" @@ -6207,22 +6265,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "не могат да се получат атрибутите на %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "времената на %s не можаха да се запазят" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "създаден е каталог %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6413,7 +6471,7 @@ msgstr "твърде много повторени редове" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" @@ -6553,9 +6611,7 @@ 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" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "Извежда всеки от ФАЙЛовете на стандартния изход с добавени номера на " "редовете.\n" @@ -6674,27 +6730,27 @@ msgstr "неправилен формат за номериране: %s" msgid "invalid footer numbering style: %s" msgstr "неправилен формат за номериране на долен колонтитул: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "неправилен начален номер на ред: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "неправилна разлика между съседни редове: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "неправилен брой празни редове: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "неправилна ширина на полето за номер на ред: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "неправилен формат за номериране на редове: %s" @@ -6720,7 +6776,7 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6732,47 +6788,47 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "не може да се пренасочи стандартния изход" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "входът се пренебрегва" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "входът се пренебрегва, а изходът се насочва към %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, fuzzy, c-format msgid "appending output to %s" msgstr "входът се пренебрегва, а изходът се насочва към %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "не успешно затваряне на стандартната грешка" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" "входът се пренебрегва, а стандартната грешка се пренасочва към стандартния " "изход" -#: src/nohup.c:199 +#: src/nohup.c:197 #, fuzzy, c-format msgid "redirecting stderr to stdout" msgstr "" "входът се пренебрегва, а стандартната грешка се пренасочва към стандартния " "изход" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" msgstr "неуспешно пренасочване на стандартната грешка" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "" @@ -6794,96 +6850,93 @@ msgid "" " --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: неправилен брой редове" - #. This is a proper name. See the gettext manual, section Names. -#: src/numfmt.c:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, fuzzy, c-format msgid "value too large to be converted: %s" msgstr "%s: стойността не е напълно преобразувана" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "недопустимо число %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "непознат входен флаг: %s" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "%s: не може да се отвори в режим за писане" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "неправилен размер на табулациите: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Използване: %s [ОПЦИЯ]... [ПОТРЕБИТЕЛ]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6891,19 +6944,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -6913,40 +6966,40 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" msgstr "" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6955,7 +7008,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -6963,7 +7016,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -6971,7 +7024,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -6979,30 +7032,56 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 -#, c-format +#: src/numfmt.c:973 +#, fuzzy 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 zero (%010f) width\n" -"will zero pad the number. Optional negative values (%-10f) will left align.\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" msgstr "" - -#: src/numfmt.c:913 -#, 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" +"Използвайте точно една от опциите -b, -c и -f. Всеки СПИС се състои\n" +"от един или повече диапазона, разделени със запетаи. Редовете се\n" +"извеждат в същия ред, в който са били прочетени, и при това точно\n" +"по веднъж. Всеки диапазон е едно от следните:\n" +"\n" +" n n-тият байт, знак или поле, броейки от 1\n" +" n- от n-тия байт, знак или поле до края на реда\n" +" n-m от n-тия до m-тия (включително) байт, знак или поле\n" +" -n от първия до m-тия (включително) байт, знак или поле\n" +"\n" +"Без ФАЙЛ или ако ФАЙЛ е - се чете от стандартния вход.\n" + +#: src/numfmt.c:983 +#, 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 zero (%010f) width\n" +"will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" +msgstr "" + +#: src/numfmt.c:991 +#, 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:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -7017,118 +7096,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, fuzzy, c-format msgid "format %s has no %% directive" msgstr "целта %s не е каталог" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "неправилна ширина на формат" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "неправилна точност: %s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "непознат входен флаг: %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "неправилен номер на поле: %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "неправилна дата %s" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "неправилен номер на поле: %s" +msgid "multiple field specifications" +msgstr "%s: неправилна спецификация на поле %s" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "неправилна дата %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, fuzzy, c-format msgid "--grouping cannot be combined with --format" msgstr "Не може да се комбинират файлови операнди с --files0-from." -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "посочени са много опции -i" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, fuzzy, c-format msgid "grouping cannot be combined with --to" msgstr "Не може да се комбинират файлови операнди с --files0-from." -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "грешка при четене на %s" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7140,14 +7231,13 @@ msgstr "" " или: %s [-abcdfilosx]... [ФАЙЛ] [[+]ОТМЕСТВАНЕ[.][b]]\n" " или: %s --traditional [ФАЙЛ] [[+]ОТМЕСТВАНЕ [[+]ЕТИКЕТ]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Извежда еднозначно представяне (по подразбиране осмични байтове) на\n" @@ -7156,9 +7246,10 @@ msgstr "" "ФАЙЛ или ако ФАЙЛ е - се чете от стандартния вход.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 #, 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" @@ -7181,7 +7272,7 @@ msgstr "" " a именуван знак, старшият бит се пренебрегва\n" " c знак от ASCII или код, защитен с \\\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7190,7 +7281,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 #, fuzzy msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" @@ -7212,7 +7303,7 @@ msgstr "" " -w, --width[=БАЙТОВЕ] извежда по БАЙТОВЕ входни байта на един ред\n" " --traditional да се приемат аргументи в традиционния формат\n" -#: src/od.c:363 +#: src/od.c:366 #, fuzzy msgid "" "\n" @@ -7232,7 +7323,7 @@ msgstr "" " -d е същото като -t u2, извеждат се беззнакови двубайтови десетични " "числа\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7248,7 +7339,7 @@ msgstr "" " -s е същото като -t d2, извеждат се двубайтови десетични числа\n" " -x е същото като -t x2, извеждат се двубайтови шестнадесетични числа\n" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -7257,7 +7348,7 @@ msgid "" " c printable character or backslash escape\n" msgstr "" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7271,7 +7362,7 @@ msgstr "" " u[РАЗМ] беззнаково десетично число от РАЗМ байта\n" " x[РАЗМ] шестнадесетично число от РАЗМ байта\n" -#: src/od.c:394 +#: src/od.c:397 #, fuzzy msgid "" "\n" @@ -7286,14 +7377,14 @@ msgstr "" "f, РАЗМ може да бъде и F за sizeof(float), D за sizeof(double) или L\n" "за sizeof(long double).\n" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 #, fuzzy msgid "" "\n" @@ -7311,12 +7402,12 @@ msgstr "" "kB=1000, K=1024, MB=1000*1000, M=1024*1024 и аналогично за G, T, P, E, Z и " "Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "неправилен низ за тип %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7325,7 +7416,7 @@ msgstr "" "неправилен низ за тип %s;\n" "тази система не поддържа %lu-байтови целочислени числа" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7334,38 +7425,38 @@ msgstr "" "неправилен низ за тип %s;\n" "тази система не поддържа %lu-байтови числа с плаваща запетая" -#: src/od.c:869 +#: src/od.c:872 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "неправилен знак „%c“ в низа за тип %s" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "не може да се пропусне след края на комбинирания вход" -#: src/od.c:1650 +#: src/od.c:1658 #, fuzzy, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" "неправилна база „%c“ на изходния адрес; трябва да бъде знак измежду [doxn]" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "при извеждане на низове не може да се посочва тип" -#: src/od.c:1863 +#: src/od.c:1871 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "При традиционния формат се поддържа най-много един файл." -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "skip-bytes + read-bytes са твърде много" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "внимание: неправилна ширина %lu; вместо нея се ползва %d" @@ -7385,7 +7476,6 @@ msgstr "стандартният вход е затворен" msgid "" "Write lines consisting of the sequentially corresponding lines from\n" "each FILE, separated by TABs, to standard output.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Извежда на стандартния изход редове, състоящи се от поредно\n" "съответстващи си редове от всеки ФАЙЛ, разделени с табулации.\n" @@ -7533,12 +7623,12 @@ msgstr "Кога" msgid "Where" msgstr "Къде" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Използване: %s [ОПЦИЯ]... [ПОТРЕБИТЕЛ]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7555,7 +7645,7 @@ msgstr "" " -p изпуска потребителския файл план в дългия формат\n" " -s извежда в кратък формат; по подразбиране е така\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7570,7 +7660,7 @@ msgstr "" " -q изпуска пълните имена, отдалечените хостове и\n" " време на неактивност при късия формат\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, fuzzy, c-format msgid "" "\n" @@ -7581,101 +7671,101 @@ msgstr "" "Олекотена програма „finger“ -- извежда информация за потребител.\n" "Файлът utmp ще бъде %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "при използване на -l трябва да се посочи поне едно потребителско име" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 #, fuzzy msgid "Roland Huebner" msgstr "Pete TerMaat и Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "на „--pages=ПЪРВА_СТР[:ПОСЛ_СТР]“ липсва аргумент" -#: src/pr.c:910 +#: src/pr.c:907 #, fuzzy, c-format msgid "invalid page range %s" msgstr "Неправилен диапазон от страници %s" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "“-l СТР_ДЪЛЖ“ неправилен брой редове: %s" -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "“-N НОМЕР“ неправилен номер на ред: %s" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "“-o ПОЛЕ“ неправилно отместване на редовете: %s" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "“-w СТР_ШИР“ неправилен брой знаци: %s" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "“-W СТР_ШИР“ неправилен брой знаци: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, fuzzy, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "Не може да се посочва номер на стълбове при паралелен печат." -#: src/pr.c:1100 +#: src/pr.c:1063 #, fuzzy, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "Не може да се задава едновременно успореден печат и печат напреки." -#: src/pr.c:1196 +#: src/pr.c:1166 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "“-%c“ излишни знаци или неправилен номер в аргумент: %s" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "ширината на страницата е твърде малка" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" "началният номер на страница % надминава броя страници %" -#: src/pr.c:2380 +#: src/pr.c:2350 #, fuzzy, c-format msgid "page number overflow" msgstr "Препълване на номера на страница" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Стр. %" -#: src/pr.c:2757 +#: src/pr.c:2727 #, fuzzy msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "Форматира за печат ФАЙЛовете по страници и стълбове.\n" "\n" -#: src/pr.c:2763 +#: src/pr.c:2734 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -7692,7 +7782,7 @@ msgstr "" " освен ако е използвано -a. Подравнява броя на редове\n" " в стълбовете на всяка страница.\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7708,7 +7798,7 @@ msgstr "" " -d, --double-space\n" " двойни интервали в изхода\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7730,7 +7820,7 @@ msgstr "" "редови\n" " горен и долен колонтитули)\n" -#: src/pr.c:2789 +#: src/pr.c:2760 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -7755,12 +7845,24 @@ msgstr "" "посочва\n" " ограничителите\n" -#: src/pr.c:2798 +#: src/pr.c:2769 #, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l СТР_ДЪЛЖ, --length=СТР_ДЪЛЖ\n" +" посочва дължина на страниците от СТР_ДЪЛЖ (66) реда\n" +" (по подразбиране броят редове на текст е 56, с -F -- " +"63)\n" +" -m, --merge извежда паралелно всички файлове, по един в стълб.\n" +" съкращава редовете, но с -J слива пълните редове\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -7771,7 +7873,7 @@ msgstr "" " -m, --merge извежда паралелно всички файлове, по един в стълб.\n" " съкращава редовете, но с -J слива пълните редове\n" -#: src/pr.c:2805 +#: src/pr.c:2779 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -7790,7 +7892,7 @@ msgstr "" "страница\n" " е с номер НОМЕР (вж. +ПЪРВА_СТР)\n" -#: src/pr.c:2813 +#: src/pr.c:2787 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -7806,7 +7908,7 @@ msgstr "" " -r, --no-file-warnings\n" " не предупреждава, ако файлът не може да бъде отворен\n" -#: src/pr.c:2820 +#: src/pr.c:2794 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -7828,7 +7930,7 @@ msgstr "" "е\n" " зададено и -w\n" -#: src/pr.c:2828 +#: src/pr.c:2802 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7836,7 +7938,6 @@ msgid "" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " разделя стълбовете с НИЗ; без -S, но с -J разделител е " "табу-\n" @@ -7844,7 +7945,13 @@ msgstr "" "опции.\n" " -t, --omit-header пропуска горните и долните колонтитули\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -7868,7 +7975,7 @@ msgstr "" " задава ширина на страницата от СТР_ШИР (72) знака при\n" " многоколонен извод, -s[знак] отменя (72)\n" -#: src/pr.c:2845 +#: src/pr.c:2822 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -7884,16 +7991,6 @@ msgstr "" "се\n" " влияе от -S и -s\n" -#: src/pr.c:2853 -#, fuzzy -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"Ако няма ФАЙЛ или ако ФАЙЛ е -, се чете от стандартния вход.\n" - #: src/printenv.c:62 #, fuzzy, c-format msgid "" @@ -8056,12 +8153,11 @@ msgstr "" "файлове\n" "\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 #, fuzzy 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 извежда автоматично генерираните препратки\n" " -G, --traditional работи подобно на командата „ptx“ от System " @@ -8070,6 +8166,12 @@ msgstr "" "редовете\n" #: src/ptx.c:1835 +msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -8086,7 +8188,7 @@ msgstr "" "изреченията\n" " -T, --format=tex извежда изход с команди за TeX\n" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8102,7 +8204,7 @@ msgstr "" " -i, --ignore-file=ФАЙЛ ФАЙЛ с думи, които да се пренебрегват\n" " -o, --only-file=ФАЙЛ признават се само думи от този ФАЙЛ\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8113,20 +8215,16 @@ msgstr "" " -t, --typeset-mode - не е реализирана -\n" " -w, --width=БРОЙ ширина на изхода, препратките не се броят\n" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Ако няма ФАЙЛ или ако ФАЙЛ е -, се чете от стандартния вход.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "неправилна ширина на мястото между полетата: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "неправилна дължина на реда: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8152,7 +8250,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "не може отвори каталогът %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "не може да се изпълни stat за %s" @@ -8173,8 +8271,8 @@ msgstr "пренебрегват се аргументи, които не са msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Използване: %s [ОПЦИЯ]... ФАЙЛ...\n" @@ -8438,15 +8536,15 @@ msgstr "" #: src/rm.c:342 #, fuzzy, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: да се изтрият ли рекурсивно всички аргументи? " msgstr[1] "%s: да се изтрият ли рекурсивно всички аргументи? " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: да се изтрият ли всички аргументи" msgstr[1] "%s: да се изтрият ли всички аргументи" @@ -8664,12 +8762,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "неправилно число с плаваща запетая като аргумент: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s има непознат файлов тип" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8692,7 +8790,16 @@ msgstr "" "апаратура.\n" "\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Ако ФАЙЛ е -, копира отново към стандартния изход.\n" + +#: src/shred.c:181 #, fuzzy, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8707,7 +8814,7 @@ msgstr "" "urandom)\n" " -s, --size=N заличава N байта (приемат се суфикси като K, M, G)\n" -#: src/shred.c:183 +#: src/shred.c:187 #, fuzzy msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" @@ -8725,12 +8832,10 @@ msgstr "" " -z, --zero накрая заличава с нули, за да се скрие използването на " "shred\n" -#: src/shred.c:192 +#: src/shred.c:196 #, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -8752,7 +8857,7 @@ msgstr "" "действа върху обикновени файлове, повечето хора използват опцията --remove.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8773,7 +8878,7 @@ msgstr "" "всички режими на работа на файловата система:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 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 +8901,7 @@ msgstr "" " Network Appliance\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8805,7 +8910,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:231 +#: src/shred.c:233 #, fuzzy msgid "" "In the case of ext3 file systems, the above disclaimer applies\n" @@ -8840,7 +8945,7 @@ msgstr "" "също могат да съдържат копия на файла, които не могат да бъдат отстранени и\n" "дават възможност заличеният със shred файл да бъде възстановен.\n" -#: src/shred.c:241 +#: src/shred.c:243 #, fuzzy msgid "" "In addition, file system backups and remote mirrors may contain copies\n" @@ -8858,127 +8963,127 @@ msgstr "" "изтритият\n" "файл да бъде възстановен.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: неуспешно извикване на fdatasync" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: неуспешно извикване на fsync" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: битовете не могат да се обръщат" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: итерация %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: грешка при запис на отместване %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: неуспешно извикване на lseek" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: файлът е твърде дълъг" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: итерация %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: итерация %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: неуспешно извикване на fstat" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: недопустим тип на файла" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: файлът има отрицателен размер" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: грешка при съкращаване" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: неуспешно извикване на fcntl" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: не може да се заличава файл с режим на достъп само за добавяне" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: изтриване" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: преименуван на %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: не може да се отстрани" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: изтрит" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: не може да се затвори" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: не може да се отвори в режим за писане" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: неправилен брой итерации" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "посочени са много случайни източници" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: неправилен размер на файла" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -8989,14 +9094,14 @@ msgstr "" " или: %s -e [ОПЦИЯ]... [АРГУМЕНТ]...\n" " или: %s -i ОТ-ДО [ОПЦИЯ]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 #, fuzzy msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" "Извежда на стандартния изход случайни пермутации на входните редове.\n" "\n" -#: src/shuf.c:73 +#: src/shuf.c:75 #, fuzzy msgid "" " -e, --echo treat each ARG as an input line\n" @@ -9017,37 +9122,37 @@ msgstr "" "urandom)\n" " -z, --zero-terminated завършва редовете с нулев байт вместо с нов ред\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "твърде много повторени редове" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "посочени са много опции -i" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "неправилен входен диапазон: %s" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "неправилен брой редове: %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "посочени са твърде много изходни файлове" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "не може да се комбинират опциите -e и -i" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -9076,12 +9181,12 @@ msgstr "" "от посочените времена.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "неправилен интервал за време %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "не може да се чете часовникът в реално време" @@ -9093,7 +9198,7 @@ msgstr "" "Извежда на стандартния изход сортирана конкатенация на всички ФАЙЛ(ове).\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -9101,7 +9206,7 @@ msgstr "" "Опции, определящи наредбата:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9113,19 +9218,19 @@ msgstr "" "знаци\n" " -f, --ignore-case приравнява малките с главните букви\n" -#: src/sort.c:443 +#: src/sort.c:444 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:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 #, fuzzy msgid "" " -n, --numeric-sort compare according to string numerical value\n" @@ -9144,7 +9249,7 @@ msgstr "" " -r, --reverse сортира в обратен ред\n" "\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9154,7 +9259,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 #, fuzzy msgid "" "Other options:\n" @@ -9163,13 +9268,13 @@ msgstr "" "Опции, определящи наредбата:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -9178,7 +9283,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9187,13 +9292,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 #, fuzzy msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" @@ -9212,7 +9317,7 @@ msgstr "" "comparison\n" " -S, --buffer-size=РАЗМ използва буфер в паметта с размер РАЗМ\n" -#: src/sort.c:497 +#: src/sort.c:498 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9235,7 +9340,7 @@ msgstr "" " извежда само първия от група еквивалентни " "редове\n" -#: src/sort.c:511 +#: src/sort.c:512 #, fuzzy msgid "" "\n" @@ -9264,12 +9369,11 @@ msgstr "" "\n" "РАЗМ може да бъде следван от някой от следните множители:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -9284,250 +9388,248 @@ msgstr "" "Използвайте LC_ALL=C, за да получите традиционната наредба,\n" "която сравнява според кодовете на знаците.\n" -#: src/sort.c:725 +#: src/sort.c:724 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "запис в %s" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:884 +#: src/sort.c:883 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "не може да се направи временен файл %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "неуспешно отваряне на файл" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "неуспешно извикване на fflush" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "неуспешно затваряне на файл" -#: src/sort.c:1140 +#: src/sort.c:1139 #, fuzzy msgid "couldn't create temporary file" msgstr "не може да се направи временен файл" -#: src/sort.c:1179 +#: src/sort.c:1178 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "не може да се създаде каталог %s" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "внимание: не може да се изтрие: %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "неправилен аргумент %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "двусмислен аргумент %s за %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s: броят „%.*s“ е твърде голям" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "файл не може да бъде открит" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "не може да се чете" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "неуспешно преобразуване на низ" -#: src/sort.c:2079 +#: src/sort.c:2078 #, fuzzy, c-format msgid "the untransformed string was %s" msgstr "Непреобразуваният низ беше %s." -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "%s: опцията „-W %s“ е двусмислена\n" msgstr[1] "%s: опцията „-W %s“ е двусмислена\n" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "неуспешен запис" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: разбърканост: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "стандартната грешка" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "%s: битовете не могат да се обръщат" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: неправилна спецификация на поле %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "опциите „-%s“ са несъвместими" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: неправилен брой в началото на %s" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "неправилно число след „-“" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "неправилно число след „.“" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "неочакван знак в спецификация на поле" -#: src/sort.c:4403 +#: src/sort.c:4402 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "посочени са много формати за изхода" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "неправилно число в началото на поле" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "номерът на поле е нула" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "отместването в знаци е нула" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "неправилно число след „,“" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "празна табулация" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "не може да се четат файлови имена от %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "неправилно файлово име с дължина нула" -#: src/sort.c:4619 +#: src/sort.c:4618 #, fuzzy, c-format msgid "no input from %s" msgstr "затваряне на входния файл %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, fuzzy, c-format msgid "extra operand %s not allowed with -%c" msgstr "допълнителният операнд %s не е позволен с -c" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 +#: src/split.c:224 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Използване: %s [ОПЦИЯ] [ВХОД [ПРЕФИКС]]\n" -#: src/split.c:207 +#: src/split.c:228 #, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" "Разделя ВХОД на парчета ПРЕФИКСaa, ПРЕФИКСab,... с фиксиран размер. По \n" "подразбиране ПРЕФИКС е „xx“, а размерът - 1000 реда. Без ВХОД или ако ВХОД " @@ -9535,25 +9637,28 @@ msgstr "" "чете от стандартния вход.\n" "\n" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 #, fuzzy msgid "" " --verbose print a diagnostic just before each\n" @@ -9562,201 +9667,206 @@ msgstr "" " --verbose съобщава на стандартната грешка преди отварянето\n" " на всеки изходен файл\n" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "Изчерпаха се суфиксите за изходни файлове" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "създава се файл %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "неразбираема стойност на променливата от обкръжението LS_COLORS" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "не може да се изпълни stat за %s" -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" msgstr "затваря се каталогът %s" -#: src/split.c:410 +#: src/split.c:464 #, fuzzy, c-format msgid "closing output pipe" msgstr "затваряне на изходния файл %s" -#: src/split.c:414 +#: src/split.c:468 #, fuzzy, c-format msgid "moving input pipe" msgstr "затваряне на входния файл %s" -#: src/split.c:416 +#: src/split.c:470 #, fuzzy, c-format msgid "closing input pipe" msgstr "затваряне на входния файл %s" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "неуспешно изпълнение на командата %s" -#: src/split.c:427 +#: src/split.c:481 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "каталогът %s не може да се затвори" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "не може да се цепи по повече от един начин" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: неправилен брой секунди" -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: недопустимо число" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: неправилна дължина на суфикс" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: неправилен брой байтове" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: неправилен брой редове" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "многосимволна табулация %s" -#: src/split.c:1286 +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "специален символен файл" + +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "опцията за брой редове -%s%c... е твърде голямa" -#: src/split.c:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "неправилен начален номер на ред: %s" -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: неправилен размер на файла" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, fuzzy, c-format msgid "%s: cannot determine file size" msgstr "хост-името не може да бъде определено" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "" -#: src/stat.c:887 +#: src/stat.c:890 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "не може да се отвори %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "внимание: неразпозната команда с обратна наклонена черта „\\%c“" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: неправилна команда" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "внимание: обратна наклонена черта в края на форматен низ" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "не може да се прочете от файловата система информация за %s" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9767,7 +9877,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9775,30 +9885,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9806,11 +9916,11 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 #, fuzzy msgid "" " -L, --dereference follow links\n" @@ -9822,7 +9932,7 @@ msgstr "" " -f, --file-system извежда състоянието на файловата система, вместо на " "файла\n" -#: src/stat.c:1422 +#: src/stat.c:1425 #, fuzzy msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" @@ -9843,7 +9953,7 @@ msgstr "" " Ако искате нов ред, вмъкнете \\n във ФОРМАТ.\n" " -t, --terse информацията да се извежда в сбита форма\n" -#: src/stat.c:1433 +#: src/stat.c:1436 #, fuzzy msgid "" "\n" @@ -9863,7 +9973,7 @@ msgstr "" " %b Брой заделени блокове (вж. %B)\n" " %B Размерът в байтове на всеки блок, съобщен от %b\n" -#: src/stat.c:1442 +#: src/stat.c:1445 #, fuzzy msgid "" " %d device number in decimal\n" @@ -9880,7 +9990,7 @@ msgstr "" " %g Номер на групата на собственика\n" " %G Име на групата на собственика\n" -#: src/stat.c:1450 +#: src/stat.c:1453 #, fuzzy msgid "" " %h number of hard links\n" @@ -9902,7 +10012,7 @@ msgstr "" " %t Голям шестнадесетичен номер на устройство\n" " %T Малък шестнадесетичен номер на устройство\n" -#: src/stat.c:1461 +#: src/stat.c:1464 #, fuzzy msgid "" " %u user ID of owner\n" @@ -9927,7 +10037,7 @@ msgstr "" " %Z Време на последна промяна в секунди от Епохата\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -9946,7 +10056,7 @@ msgstr "" " %d Свободни файлови възли във файловата система\n" " %f Свободни блокове във файловата система\n" -#: src/stat.c:1484 +#: src/stat.c:1487 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -10009,8 +10119,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -10035,7 +10144,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "" -#: src/stty.c:516 +#: src/stty.c:524 #, fuzzy, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10046,11 +10155,11 @@ msgstr "" " или: %s [-F УСТРОЙСТВО] [--file=УСТРОЙСТВО] [-a|--all]\n" " или: %s [-F УСТРОЙСТВО] [--file=УСТРОЙСТВО] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 #, fuzzy msgid "" " -a, --all print all current settings in human-readable form\n" @@ -10065,7 +10174,7 @@ msgstr "" " -F, --file=УСТРОЙСТВО отваря и използва посоченото УСТРОЙСТВО вместо стд." "вход\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10076,11 +10185,24 @@ msgstr "" "настройка.\n" "Кои настройки са допустими зависи от използваната система.\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -10091,9 +10213,13 @@ msgstr "" " eof ЗНАК ЗНАК ще изпрати сигнал край на файл (ще прекрати входа)\n" " eol ЗНАК ЗНАК ще завърши реда\n" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -10103,37 +10229,58 @@ msgstr "" " intr ЗНАК ЗНАК ще изпрати сигнал за прекъсване\n" " kill ЗНАК ЗНАК ще изтрие текущия ред\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" msgstr "" -" * lnext ЗНАК ЗНАК ще въведе следващия знак буквално, дори ако е " -"управляващ\n" -" quit ЗНАК ЗНАК ще изпрати сигнал „изход“\n" -" * rprnt ЗНАК ЗНАК ще пречертае текущия ред\n" -" start ЗНАК ЗНАК ще възобнови извеждането, след като е било прекъснато\n" -#: src/stty.c:559 +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 ЗНАК ЗНАК ще спре извеждането\n" " susp ЗНАК ЗНАК ще изпрати сигнал „спиране на терминала“\n" " * swtch ЗНАК ЗНАК ще превключи на друг слой на обвивката (shell layer)\n" " * werase ЗНАК ЗНАК ще изтрие последната въведена дума\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 #, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Специални настройки:\n" +" N посочва скорости за входа и изхода N бода\n" +" * cols N казва на ядрото, че терминалът има N стълба\n" +" * columns N същото като cols N\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -10143,10 +10290,17 @@ msgstr "" " * cols N казва на ядрото, че терминалът има N стълба\n" " * columns N същото като cols N\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -10156,11 +10310,22 @@ msgstr "" " min N с -icanon посочва поне N знака за завършено четене\n" " ospeed N посочва скорост на изхода N бода\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N казва на ядрото, че терминалът има N реда\n" +" * size извежда броя редове и стълбове според ядрото\n" +" speed извежда скоростта на терминала\n" +" time N с -icanon посочва прекъсване при четене до N десети от " +"секундата\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -10170,25 +10335,27 @@ msgstr "" " time N с -icanon посочва прекъсване при четене до N десети от " "секундата\n" -#: src/stty.c:584 -#, fuzzy +#: src/stty.c:641 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 позволява диалог (handshaking) RTS/CTS\n" -" csN посочва размер на знаците до N бита, N е от 5 до 8\n" -#: src/stty.c:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -10197,7 +10364,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb използва два стоп-бита на знак (един с „-“)\n" " [-]hup изпраща сигнал за увисване, ako всички процеси затворят " @@ -10206,7 +10372,12 @@ msgstr "" " [-]parenb генерира на изхода и очаква на входа бит за четност\n" " [-]parodd посочва текова четност (четна с „-“)\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -10214,6 +10385,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Настройки на входа:\n" @@ -10223,10 +10395,14 @@ msgstr "" " [-]ignbrk пренебрегва знаците за прекъсване\n" " [-]igncr пренебрегва знаците за връщане на курсора\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -10238,15 +10414,25 @@ msgstr "" " [-]inpck позволява проверка за четността на входа\n" " [-]istrip изчиства старшия (8-мия) бит на входните знаци\n" -#: src/stty.c:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" " * [-]iutf8 да се предполага, че входните знаци са кодирани в UTF-8\n" -#: src/stty.c:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" +" * [-]iutf8 да се предполага, че входните знаци са кодирани в UTF-8\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -10261,66 +10447,83 @@ msgstr "" " [-]parmrk маркира грешките по четност (с последователност 255-0)\n" " [-]tandem същото като [-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Настройки на извеждането:\n" -" * bsN стил за задържане на backspace, N е 0 или 1\n" -" * crN стил за задържане на връщане на курсора, N е от 0 до 3\n" -" * ffN стил за задържане на код за нова страница, N е 0 или 1\n" -" * nlN стил за задържане на код за нов ред, N е 0 или 1\n" -#: src/stty.c:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" msgstr "" -" * [-]ocrnl превежда кодовете за връщане на курсора в кодове за нов " -"ред\n" -" * [-]ofdel използва кодове delete за попълване вместо null\n" -" * [-]ofill използва попълващи кодове вместо синхронизиране при " -"забавяне\n" -" * [-]olcuc превежда знаците от долен регистър в знаци от горен " -"регистър\n" -" * [-]onlcr превежда кодовете нов ред в кодове връщане на курсора и нов " -"ред\n" -" * [-]onlret кодът за нов ред осъществява връщане на курсора\n" -#: src/stty.c:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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 "" -" * [-]onocr не извежда знаци за връщане на курсора в първия стълб\n" -" [-]opost дообработка (postprocess) на изхода\n" -" * tabN стил за задържане на кодове за хориз. табулация, N е от 0 " -"до 3\n" -" * tabs същото като tab0\n" -" * -tabs същото като tab3\n" -" * vtN стил за задържане на кодове за вертик. табулация, N е 0 или " -"1\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10331,47 +10534,65 @@ msgstr "" " * crtkill убива реда според на настройките echoprt и echoe\n" " * -crtkill убива реда според на настройките echoctl и echok\n" -#: src/stty.c:658 -#, fuzzy +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +#, fuzzy +msgid " [-]echo echo input characters\n" +msgstr "" +" * [-]iutf8 да се предполага, че входните знаци са кодирани в UTF-8\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]ctlecho ехо на управляващите кодове с шапки (“^c“)\n" -" [-]echo ехо на входните знаци\n" -" * [-]echoctl същото като [-]ctlecho\n" -" [-]echoe същото като [-]crterase\n" -" [-]echok ехо на нов ред след код за убиване\n" -#: src/stty.c:665 -#, fuzzy +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]echoke същото като [-]crtkill\n" -" [-]echonl ехо на нов ред дори ако не е имало ехо на други символи\n" -" * [-]echoprt ехо на изтритите знаци назад, между „\\“ и „/“\n" -" [-]icanon позволява управляващите кодове за erase, kill, werase и " -"rprnt\n" -" [-]iexten позволява управляващите кодове, които не отговарят на " -"POSIX\n" +" [-]isig позволява управляващите кодове за interrupt, quit и " +"suspend\n" +" [-]noflsh забранява моменталното извеждане след кодове interrupt и " +"quit\n" +" * [-]prterase същото като [-]echoprt\n" +" * [-]tostop спира фоновите задачи, които се опитват да пишат на " +"терминала\n" +" * [-]xcase с icanon извежда главните букви като предшествани от „\\“ " +"малки\n" -#: src/stty.c:672 +#: src/stty.c:843 #, fuzzy 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 "" " [-]isig позволява управляващите кодове за interrupt, quit и " "suspend\n" @@ -10383,11 +10604,33 @@ msgstr "" " * [-]xcase с icanon извежда главните букви като предшествани от „\\“ " "малки\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -10397,12 +10640,12 @@ msgstr "" " cbreak същото като -icanon\n" " -cbreak същото като icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 същото като brkint ignpar istrip icrnl ixon opost isig " "icanon\n" @@ -10411,29 +10654,38 @@ msgstr "" " -cooked същото като raw\n" " crt същото като echoe echoctl echoke\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -" dec същото като echoe echoctl echoke -ixany intr ^c erase 0177\n" -" kill ^u\n" -" * [-]decctlq същото като [-]ixany\n" -" ek управляващите символи erase и kill със стандартната си " -"стойност\n" -" evenp същото като parenb -parodd cs7\n" -#: src/stty.c:699 +#: src/stty.c:919 +#, fuzzy 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 "" " -evenp същото като -parenb cs8\n" " * [-]lcase същото като xcase iuclc olcuc\n" @@ -10442,7 +10694,19 @@ msgstr "" " nl същото като -icrnl -onlcr\n" " -nl същото като icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"Комбинирани настройки:\n" +" * [-]LCASE същото като [-]lcase\n" +" cbreak същото като -icanon\n" +" -cbreak същото като icanon\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10456,11 +10720,12 @@ msgstr "" " pass8 същото като -parenb -istrip cs8\n" " -pass8 същото като parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw същото като -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" @@ -10468,15 +10733,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw същото като\n" -#: src/stty.c:720 -#, fuzzy +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane същото като -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10485,7 +10750,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, всички управляващи\n" " знаци запазват стандартната си стойност.\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10500,12 +10765,12 @@ msgstr "" "като ^c, 0x37, 0177 или 127; специалните стойности ^- и undef се използват,\n" "за да се забранят съответните управляващи знаци.\n" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "може да се посочва само едно устройство" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10514,45 +10779,50 @@ msgstr "" "опциите за подробен и stty-четим изходен стил\n" "взаимно се изключват" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "при посочване на изходен стил не може да се настройват режими" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: не може да се презададе режимът non-blocking" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "неправилен аргумент %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "липсва аргумент за %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: грешка при съкращаване" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "неправилна дисциплина на редовете %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: не може да се осъществят всички поискани операции" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: няма информация за размера на това устройство" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "неправилен числов аргумент %s" #. This is a proper name. See the gettext manual, section Names. @@ -10563,8 +10833,14 @@ msgstr "Kayvan Aghaiepour и David MacKenzie" #: src/sum.c:62 #, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Отпечатва контролна сума CRC и броя байтове на всеки ФАЙЛ.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -10576,18 +10852,54 @@ msgstr "" " -s, --sysv ползва сумиращия алгоритъм на System V, блокове от 512 " "байта\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Използване: %s [ОПЦИЯ] [ФАЙЛ]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" +"\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" -msgstr "Записва на диска изменените блокове, актуализира суперблока.\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "грешка при четене на %s" -#: src/sync.c:69 +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: не може да се презададе режимът non-blocking" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "грешка при четене на %s" + +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "всички аргументи се пренебрегват" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10601,15 +10913,23 @@ msgstr "" "към документацията на използваната от вас обвивка за поддържаните от нея " "опции.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help извежда тази справка и завършва\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version извежда информация за версията и завършва\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Ако няма ФАЙЛ или ако ФАЙЛ е -, се чете от стандартния вход.\n" + +#: src/system.h:544 #, fuzzy msgid "" "\n" @@ -10617,7 +10937,7 @@ msgid "" msgstr "" "Аргументите, задължителни за дългите опции, са задължителни и за късите.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10625,7 +10945,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10634,7 +10954,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -10645,22 +10965,27 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -#: src/system.h:591 +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Използвайте „%s --help“ за повече информация.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10682,9 +11007,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "Извежда на стандартния изход всеки ФАЙЛ, последеният ред е пръв.\n" "Без ФАЙЛ или ако ФАЙЛ е -, се чете от стандартния вход.\n" @@ -10701,70 +11024,69 @@ msgstr "" " -s, --separator=НИЗ вместо кода за нов ред, използва като разделител " "НИЗ\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: неуспешно позициониране (seek) във файл" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "твърде дълъг запис" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "не може да се направи временен файл %s" -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: не може да се отвори в режим за писане" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "времената на %s не можаха да се запазят" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: грешка при запис" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "не може да се отвори %s за четене" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "разделителят не може да бъде празен" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "" -#: src/tail.c:262 +#: src/tail.c:257 #, 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" msgstr "" "Извежда на стандартния изход последните %d реда от всеки ФАЙЛ.\n" "Ако има повече от един ФАЙЛ, преди всеки поставя заглавие с файловото име.\n" "Без ФАЙЛ или ако ФАЙЛ е -, се чете от стандартния вход.\n" "\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 #, fuzzy msgid "" " -f, --follow[={name|descriptor}]\n" @@ -10779,7 +11101,7 @@ msgstr "" "еквивалентни\n" " -F същото като --follow=name --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10801,7 +11123,7 @@ msgstr "" " преименуван (което е обичайно при завъртане на\n" " журналните файлове)\n" -#: src/tail.c:293 +#: src/tail.c:288 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -10816,7 +11138,7 @@ msgstr "" " (стандартно 1.0)\n" " -v, --verbose винаги извежда заглавия с файловите имена\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -10825,7 +11147,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 +#: src/tail.c:302 #, fuzzy msgid "" "\n" @@ -10843,7 +11165,7 @@ msgstr "" "суфикс-множител: b за 512, k за 1024, m за 1024*1024.\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -10861,181 +11183,181 @@ msgstr "" "многократно файла, за да провери дали той не е бил отстранен или създаден\n" "нов файл със същото име от друга програма.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "Затваряне на %s (файлов дескриптор=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: не може да се отиде на отместване %s относно края на файла" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, fuzzy, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" "%s е бил заменен с файл, който е недостъпен за tail; tail повече няма да го " "следи" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s е станал недостъпен" -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" "%s е бил заменен с файл, който е недостъпен за tail; tail повече няма да го " "следи" -#: src/tail.c:1006 +#: src/tail.c:999 #, fuzzy, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" "%s е бил заменен с файл, който е недостъпен за tail; tail повече няма да го " "следи" -#: src/tail.c:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s е станал достъпен" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s се е появил; следва се краят на новия файл" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s е бил заменен; следва се краят на новия файл" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: не може да се смени режимът non-blocking" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: файлът е съкратен" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "няма повече файлове" -#: src/tail.c:1424 +#: src/tail.c:1440 #, fuzzy, c-format msgid "cannot watch parent directory of %s" msgstr "не може да се намери текущият каталог (сега %s)" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, fuzzy, c-format msgid "inotify resources exhausted" msgstr "паметта е изчерпана" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, fuzzy, c-format msgid "cannot watch %s" msgstr "не може да се въздейства на %s" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: да се замени ли %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1597 #, fuzzy, c-format msgid "error reading inotify event" msgstr "грешка при четене на %s" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: не може да се следва края на този тип файлове; tail няма да следи този " "файл" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "номерът в %s е твърде голям" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "%s: неправилен максимален брой достъпи без промяна между отварянията" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: неправилен номер на процес" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: неправилен брой секунди" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "неправилен номер стълбове: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "опция, използване в грешен контекст -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, fuzzy, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" "внимание: пренебрегва се номера на процес; --pid=PID е полезно само при " "следване" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" "внимание: пренебрегва се номера на процес; --pid=PID е полезно само при " "следване" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "внимание: --pid=PID не се поддържа на тази система" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "не може да се следва %s според името" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "внимание: безкрайното следване на стандартния вход е безполезно" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -11048,60 +11370,72 @@ msgstr "" " -a, --append добавя към посочените ФАЙЛове, а не ги замества\n" " -i, --ignore-interrupts пренебрегва сигналите за прекъсване\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Ако ФАЙЛ е -, копира отново към стандартния изход.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "липсва аргумент след %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "неправилно цяло число %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "очаква се „)“" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "очаква се „)“, а е намерен %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: очаква се унарна операция" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt не допуска -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef не приема -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot не приема -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "непозната двуместна операция" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: очаква се двуместна операция" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11115,7 +11449,7 @@ msgstr "" " или: [ ]\n" " или: [ ОПЦИЯ\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11123,7 +11457,7 @@ msgstr "" "Завършва с код-състояние, определен от ИЗРАЗ.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11134,7 +11468,7 @@ msgstr "" "определя\n" "кода на завършване. Той може да бъде:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11148,7 +11482,7 @@ msgstr "" " ИЗРАЗ1 -a ИЗРАЗ2 както ИЗРАЗ1, така и ИЗРАЗ2 са истина\n" " ИЗРАЗ1 -o ИЗРАЗ2 поне един от ИЗРАЗ1 и ИЗРАЗ2 е истина\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11164,7 +11498,7 @@ msgstr "" " НИЗ1 = НИЗ2 низовете са еднакви\n" " НИЗ1 != НИЗ2 низовете не са еднакви\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11182,7 +11516,7 @@ msgstr "" " ЦЯЛО1 -lt ЦЯЛО2 ЦЯЛО1 е по-малко от ЦЯЛО2\n" " ЦЯЛО1 -ne ЦЯЛО2 ЦЯЛО1 е различно от ЦЯЛО2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11195,7 +11529,7 @@ msgstr "" " ФАЙЛ1 -nt ФАЙЛ2 ФАЙЛ1 е по-нов (спрямо датата на изменение) от ФАЙЛ2\n" " ФАЙЛ1 -ot ФАЙЛ2 ФАЙЛ1 е по-стар от ФАЙЛ2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11209,7 +11543,7 @@ msgstr "" " -d ФАЙЛ ФАЙЛ съществува и е каталог\n" " -e ФАЙЛ ФАЙЛ съществува\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11224,7 +11558,7 @@ msgstr "" "група\n" " -k ФАЙЛ ФАЙЛ съществува и е със sticky bit\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11238,7 +11572,7 @@ msgstr "" " -r ФАЙЛ ФАЙЛ съществува и е достъпен за четене\n" " -s ФАЙЛ ФАЙЛ съществува и има ненулев размер\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11253,7 +11587,7 @@ msgstr "" " -x ФАЙЛ ФАЙЛ съществува и е изпълним файл (при каталог: може да се " "търси)\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11268,33 +11602,33 @@ msgstr "" "\n" "ЦЯЛО може да бъде също и -l НИЗ и дава дължината на НИЗ.\n" -#: src/test.c:786 +#: src/test.c:788 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 +#: src/test.c:793 msgid "test and/or [" msgstr "test и/или [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "" -#: src/test.c:858 +#: src/test.c:860 #, fuzzy msgid "missing ']'" msgstr "липсва „]“" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "излишен аргумент %s" @@ -11314,7 +11648,7 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11323,11 +11657,11 @@ msgstr "" "Използване: %s КОМАНДА [АРГУМЕНТ]...\n" " или: %s ОПЦИЯ\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11345,7 +11679,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11353,7 +11687,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -11364,7 +11698,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -11379,6 +11713,11 @@ msgstr "грешка при запис в %s" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -11736,12 +12075,12 @@ msgstr "Завършва с код-състояние, посочващ успе msgid "Exit with a status code indicating failure." msgstr "Завършва с код-състояние, посочващ неуспех." -#: src/truncate.c:96 +#: src/truncate.c:69 #, fuzzy, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Използване: %s [ОПЦИЯ]... ФАЙЛ...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -11752,22 +12091,22 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11775,57 +12114,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: файлът има отрицателен размер" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "не може да се получи времето от деня" -#: src/truncate.c:205 +#: src/truncate.c:178 #, fuzzy, c-format msgid "overflow rounding up size of file %s" msgstr "препълване на отместването при четене на файла %s" -#: src/truncate.c:215 +#: src/truncate.c:188 #, fuzzy, c-format msgid "overflow extending size of file %s" msgstr "препълване на отместването при четене на файла %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "" -#: src/truncate.c:303 +#: src/truncate.c:276 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "посочени са много целеви каталози" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "неправилно число" + +#: src/truncate.c:307 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "трябва да посочите списък байтове, знаци или полета" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "не може да се отвори %s за запис" @@ -11836,12 +12180,10 @@ msgid "Mark Kettenis" msgstr "" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Използване: %s [ОПЦИЯ] [ФАЙЛ]\n" "\n" @@ -11849,12 +12191,17 @@ msgstr "" "Без ФАЙЛ или ако ФАЙЛ е -, чете от стандартния вход.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: входните данни съдържат нечетен брой лексеми" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: входният файл съдържа цикъл:" @@ -11919,9 +12266,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "Преобразува интервалите във всеки от ФАЙЛовете в табулации, извежда на\n" "стандартния изход. Без ФАЙЛ или ако ФАЙЛ е - чете от стандартния вход.\n" @@ -11977,8 +12322,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -11989,7 +12334,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -12141,11 +12486,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "" - #: src/uptime.c:214 #, fuzzy, c-format msgid "" @@ -12167,13 +12507,17 @@ msgstr "" "Ако не е посочен ФАЙЛ, използва %s. Често ФАЙЛ е %s.\n" "\n" -#: src/wc.c:117 -#, fuzzy +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -12188,13 +12532,13 @@ msgstr "" " -m, --chars извежда броя букви\n" " -l, --lines извежда броя редове\n" -#: src/wc.c:128 +#: src/wc.c:134 #, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=Ф чете от файловете, чиито имена са изредени във " @@ -12363,10 +12707,10 @@ msgstr "" "Същото като id -un.\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: не може да се намери името на потребител с номер %lu\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "не може да се намери името на потребител с номер %lu" #: src/yes.c:41 #, c-format @@ -12386,6 +12730,227 @@ msgstr "" "Непрекъснато извежда ред, състоящ се от посочените НИЗ(ове) или „y“.\n" "\n" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "Ако няма ФАЙЛ или ако ФАЙЛ е -, се чете от стандартния вход.\n" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Ако няма ФАЙЛ или ако ФАЙЛ е -, се чете от стандартния вход.\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "Записва на диска изменените блокове, актуализира суперблока.\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "всички аргументи се пренебрегват" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: недопустимо число" + +#~ msgid "invalid number %s" +#~ msgstr "недопустимо число %s" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s е толкова голям, че не е изводим" + +#~ msgid "number of lines" +#~ msgstr "брой на редовете" + +#~ msgid "number of bytes" +#~ msgstr "количество байтове" + +#, fuzzy +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: неправилен брой редове" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: неправилен брой байтове" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: неправилен брой редове" + +#~ msgid "number in %s is too large" +#~ msgstr "номерът в %s е твърде голям" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: неправилен брой секунди" + +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "не може да се установи допълнителна група" + +#, fuzzy +#~ 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 "" +#~ "\n" +#~ "Изпращането на сигнал %s към към работещ процес „dd“ го кара да изведе\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" +#~ " изкопирани са 9387674624 байта (9.4 GB) за 34,6279 секунди с 271 MB/s\n" + +#~ 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 ЗНАК ЗНАК ще въведе следващия знак буквално, дори ако е " +#~ "управляващ\n" +#~ " quit ЗНАК ЗНАК ще изпрати сигнал „изход“\n" +#~ " * rprnt ЗНАК ЗНАК ще пречертае текущия ред\n" +#~ " start ЗНАК ЗНАК ще възобнови извеждането, след като е било " +#~ "прекъснато\n" + +#, 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" +#~ "Управляващи настройки:\n" +#~ " [-]clocal забранява сигналите управляващите сигнали за модем\n" +#~ " [-]cread позволява да се получава входа\n" +#~ " * [-]crtscts позволява диалог (handshaking) RTS/CTS\n" +#~ " csN посочва размер на знаците до N бита, N е от 5 до 8\n" + +#~ 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 "" +#~ "\n" +#~ "Настройки на извеждането:\n" +#~ " * bsN стил за задържане на backspace, N е 0 или 1\n" +#~ " * crN стил за задържане на връщане на курсора, N е от 0 до 3\n" +#~ " * ffN стил за задържане на код за нова страница, N е 0 или 1\n" +#~ " * nlN стил за задържане на код за нов ред, N е 0 или 1\n" + +#, fuzzy +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl превежда кодовете за връщане на курсора в кодове за нов " +#~ "ред\n" +#~ " * [-]ofdel използва кодове delete за попълване вместо null\n" +#~ " * [-]ofill използва попълващи кодове вместо синхронизиране при " +#~ "забавяне\n" +#~ " * [-]olcuc превежда знаците от долен регистър в знаци от горен " +#~ "регистър\n" +#~ " * [-]onlcr превежда кодовете нов ред в кодове връщане на курсора и " +#~ "нов ред\n" +#~ " * [-]onlret кодът за нов ред осъществява връщане на курсора\n" + +#~ 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 "" +#~ " * [-]onocr не извежда знаци за връщане на курсора в първия стълб\n" +#~ " [-]opost дообработка (postprocess) на изхода\n" +#~ " * tabN стил за задържане на кодове за хориз. табулация, N е от " +#~ "0 до 3\n" +#~ " * tabs същото като tab0\n" +#~ " * -tabs същото като tab3\n" +#~ " * vtN стил за задържане на кодове за вертик. табулация, N е 0 " +#~ "или 1\n" + +#, fuzzy +#~ 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 "" +#~ " * [-]ctlecho ехо на управляващите кодове с шапки (“^c“)\n" +#~ " [-]echo ехо на входните знаци\n" +#~ " * [-]echoctl същото като [-]ctlecho\n" +#~ " [-]echoe същото като [-]crterase\n" +#~ " [-]echok ехо на нов ред след код за убиване\n" + +#, fuzzy +#~ 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 "" +#~ " * [-]echoke същото като [-]crtkill\n" +#~ " [-]echonl ехо на нов ред дори ако не е имало ехо на други символи\n" +#~ " * [-]echoprt ехо на изтритите знаци назад, между „\\“ и „/“\n" +#~ " [-]icanon позволява управляващите кодове за erase, kill, werase и " +#~ "rprnt\n" +#~ " [-]iexten позволява управляващите кодове, които не отговарят на " +#~ "POSIX\n" + +#~ 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 "" +#~ " dec същото като echoe echoctl echoke -ixany intr ^c erase " +#~ "0177\n" +#~ " kill ^u\n" +#~ " * [-]decctlq същото като [-]ixany\n" +#~ " ek управляващите символи erase и kill със стандартната си " +#~ "стойност\n" +#~ " evenp същото като parenb -parodd cs7\n" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: не може да се намери името на потребител с номер %lu\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: неправилна опция -- %c\n" @@ -12455,9 +13020,6 @@ msgstr "" #~ " %s /usr/bin/sort извежда „sort“.\n" #~ " %s include/stdio.h .h извежда „stdio“.\n" -#~ msgid "Usage: %s [OPTION] [FILE]...\n" -#~ msgstr "Използване: %s [ОПЦИЯ] [ФАЙЛ]...\n" - #~ msgid "" #~ "Change the group of each FILE to GROUP.\n" #~ "With --reference, change the group of each FILE to that of RFILE.\n" @@ -12607,20 +13169,6 @@ msgstr "" #~ msgid "invalid format precision" #~ msgstr "неправилна точност на формат" -#~ msgid "" -#~ "Display the current time in the given FORMAT, or set the system date.\n" -#~ "\n" -#~ " -d, --date=STRING display time described by STRING, not `now'\n" -#~ " -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -#~ msgstr "" -#~ "Извежда текущото време в посочения ФОРМАТ или установява датата на " -#~ "системата.\n" -#~ "\n" -#~ " -d, --date=НИЗ извежда времето, посочено от НИЗ, вместо " -#~ "„now“\n" -#~ " -f, --file=ФАЙЛДАТИ като --date по веднъж за всеки ред от " -#~ "ФАЙЛДАТИ\n" - #~ msgid "unrecognized operand %s=%s" #~ msgstr "непознат операнд %s=%s" @@ -13913,9 +14461,6 @@ msgstr "" #~ "Ако началната стойност е по-малка от границата,\n" #~ "стъпката трябва да бъде положителна" -#~ msgid "invalid number" -#~ msgstr "неправилно число" - #~ msgid "*** invalid date/time ***" #~ msgstr "*** неправилна дата/време ***" diff --git a/po/ca.gmo b/po/ca.gmo index 0d15e94a..f38c1033 100644 Binary files a/po/ca.gmo and b/po/ca.gmo differ diff --git a/po/ca.po b/po/ca.po index 11a52828..352bb6f7 100644 --- a/po/ca.po +++ b/po/ca.po @@ -50,12 +50,13 @@ # - Els missatges marcats com a multilínia només arriben fins a la columna 70. # A sovint contenen marques de format; en aquest cas s’hi inserta una nova # línia perquè no hi ha forma de saber com serà de llarga la línia. +#: src/stty.c:941 msgid "" msgstr "" -"Project-Id-Version: coreutils 8.22-pre4\n" +"Project-Id-Version: coreutils 8.23-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" -"PO-Revision-Date: 2014-01-19 19:29+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" +"PO-Revision-Date: 2014-08-28 20:10+0200\n" "Last-Translator: Ivan Vilata i Balaguer \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -85,12 +86,12 @@ msgstr "Els arguments vàlids són:" msgid "error closing file" msgstr "error en tancar el fitxer" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 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" @@ -98,7 +99,7 @@ msgstr "error d’escriptura" # Usa quote(). ivb # Indica condició d'error. ivb -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "en preservar els permisos de %s" @@ -150,7 +151,7 @@ msgstr "fitxer especial de caràcters" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "dades contígües" #: lib/file-type.c:75 msgid "fifo" @@ -158,44 +159,39 @@ msgstr "cua FIFO" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "porta" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "fitxer especial de blocs" +msgstr "fitxer especial de blocs multiplexat" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "fitxer especial de caràcters" +msgstr "fitxer especial de caràcters multiplexat" #: lib/file-type.c:87 -#, fuzzy msgid "multiplexed file" -msgstr "s’han especificat múltiples rols" +msgstr "fitxer multiplexat" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "fitxer estrany" +msgstr "fitxer amb nom" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "fitxer especial de blocs" +msgstr "fitxer especial de xarxa" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "fitxer migrat amb dades" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "fitxer migrat sense dades" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "port" #: lib/file-type.c:105 msgid "socket" @@ -203,7 +199,7 @@ msgstr "connector" #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "esborrament" #: lib/file-type.c:110 msgid "weird file" @@ -285,57 +281,62 @@ msgstr "La codificació del paràmetre cadena no és correcta" msgid "Unknown error" msgstr "Error desconegut" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: l’opció «%s» és ambigua; possibilitats:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: l’opció «-W %s» és ambigua\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: l’opció «--%s» no admet arguments\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: l’opció «%c%s» no admet arguments\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: l’opció «--%s» necessita un argument\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: l’opció «--%s» no és reconeguda\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: l’opció «%c%s» no és reconeguda\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: l’opció «%c» no és vàlida\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: l’opció «%c» necessita un argument\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: l’opció «-W %s» és ambigua\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: l’opció «-W %s» no admet arguments\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: l’opció «-W %s» necessita un argument\n" @@ -347,13 +348,13 @@ 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:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "no s’ha pogut crear el directori %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "la memòria s’ha exhaurit" @@ -403,6 +404,12 @@ msgstr "»" msgid "%s: end of file" msgstr "%s: s’ha trobat el final del fitxer" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: error de lectura" + #: lib/regcomp.c:131 msgid "Success" msgstr "Èxit" @@ -518,7 +525,7 @@ msgstr "^[nN]" # Usa quote(). ivb # Indica condició d'error. ivb -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "en establir els permisos de %s" @@ -964,7 +971,7 @@ msgstr "" "Codifica o descodifica el FITXER (o l’entrada estàndard) emprant base 64, i\n" "escriu el resultat en l’eixida estàndard.\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -981,15 +988,7 @@ msgstr "" " indicat (per defecte 76). Empreu 0 per a no " "ajustar.\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Sense cap FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -1004,53 +1003,53 @@ msgstr "" "de\n" "tolerar altres octets no alfabètics en el flux codificat.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "error de lectura" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "l’entrada no és vàlida" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "la longitud d’ajustament no és vàlida: %s" # Usa quote(). ivb -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 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:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "en tancar l’entrada estàndard" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1073,7 +1072,6 @@ msgstr "" "s’especifica, també s’elimina el SUFIX del darrere.\n" #: src/basename.c:60 -#, fuzzy msgid "" " -a, --multiple support multiple arguments and treat each as a NAME\n" " -s, --suffix=SUFFIX remove a trailing SUFFIX; implies -a\n" @@ -1082,9 +1080,10 @@ 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" +" -s, --suffix=SUFIX Elimina el SUFIX del darrere; implica «-a».\n" +" -z, --zero Acaba cada línia d’eixida amb un caràcter NUL en " +"lloc\n" +" d’un caràcter de nova línia.\n" #: src/basename.c:67 #, c-format @@ -1105,38 +1104,44 @@ msgstr "" " %s -a una/cad1 una/cad2 -> «cad1» seguit per «cad2»\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "manca un operand" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Forma d’ús: %s [OPCIÓ]… [FITXER]…\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"Escriu la concatenació ordenada de tots els FITXERs a la sortida estàndard.\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1156,7 +1161,7 @@ msgstr "" " -n, --number Enumera totes les línies.\n" " -s, --squeeze-blank No mostra més d’una línia en blanc seguida.\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1173,7 +1178,7 @@ msgstr "" # Esperem que el «%s» no empente la línia més enllà de la columna 78. ivb # Aquest arranjament funciona bé per a «%s = cat», el més comú. ivb -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1189,17 +1194,18 @@ msgstr "" " «%s» Còpia l’entrada estàndard a l’eixida estàndard.\n" # Usa quote(). ivb -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "ha fallat ioctl() sobre %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "eixida estàndard" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: el fitxer d’entrada i el de sortida són el mateix" @@ -1211,10 +1217,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1231,8 +1237,8 @@ msgid "failed to set %s security context component to %s" msgstr "no s’ha pogut establir el component «%s» del context de seguretat a %s" # Els 5 usen quote(). ivb -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "no s’ha pogut obtenir el context de seguretat de %s" @@ -1251,14 +1257,14 @@ msgid "failed to change context of %s to %s" msgstr "no s’ha pogut canviar el context de %s a %s" # Usa quote(). ivb -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "no s’ha pogut accedir a %s" # Usa quote(). ivb -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "no s’ha pogut llegir el directori %s" @@ -1278,7 +1284,7 @@ msgid "fts_read failed" msgstr "ha fallat fts_read()" # És una funció. ivb -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1404,7 +1410,7 @@ msgstr "«-R -h» necessita «-P»" # Usa quote(). ivb #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1422,9 +1428,8 @@ msgstr "s’han proporcionat diverses especificacions de context de seguretat" # Els 9 usen quote(). ivb #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "no s’han pogut obtenir els atributs de %s" @@ -1774,18 +1779,18 @@ msgid "Roland McGrath" msgstr "Roland McGrath" # Usa quote(). ivb -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "el grup %s no és vàlid" # Usa quote(). ivb -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "la llista de grups %s no és vàlida" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1794,7 +1799,7 @@ msgstr "" "Forma d’ús: %s [OPCIÓ] NOU_ARREL [ORDRE [ARGUMENT]…]\n" " o bé: %s OPCIÓ\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1802,16 +1807,28 @@ msgstr "" "Executa l’ORDRE establint‐hi el directori arrel a NOU_ARREL.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" +" --userspec=USUARI:GRUP\n" +" Usuari i grup a emprar (identificadors o noms).\n" +" --groups=GRUPS Llista de grups suplementaris, com «g1,g2,…,gN».\n" + +#: src/chroot.c:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" " --userspec=USUARI:GRUP\n" " Usuari i grup a emprar (identificadors o noms).\n" " --groups=GRUPS Llista de grups suplementaris, com «g1,g2,…,gN».\n" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" @@ -1820,44 +1837,49 @@ msgstr "" "Si no s’indica cap ordre s’executa «${SHELL} -i» (per defecte «/bin/sh -" "i»).\n" +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + # No usa quote(). ivb -#: src/chroot.c:311 +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "no s’ha pogut canviar el directori arrel a «%s»" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "no s’ha pogut canviar al directori arrel" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" -msgstr "" +msgstr "no s’ha especificat un grup per a l’UID desconegut %d" -#: src/chroot.c:383 -#, fuzzy, c-format +#: src/chroot.c:400 +#, c-format msgid "failed to get supplemental groups" -msgstr "no s’han pogut establir els grups suplementaris" +msgstr "no s’han pogut obtenir els grups suplementaris" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" -msgstr "no s’han pogut establir els grups suplementaris" +msgid "failed to set supplemental groups" +msgstr "no s’han pogut obtenir els grups suplementaris" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "no s’ha pogut establir l’identificador de grup" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "no s’ha pogut establir l’identificador d’usuari" # Usa quote(). ivb -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "no s’ha pogut executar l’ordre %s" @@ -1898,7 +1920,16 @@ msgstr "Forma d’ús: %s [OPCIÓ]… FITXER1 FITXER2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Compara els fitxers ordenats FITXER1 i FITXER2 línia per línia.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Sense cap FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1910,7 +1941,7 @@ msgstr "" "línies que només es troben al FITXER1, la segona les que només es troben al\n" "FITXER2, i la tercera les línies comunes a ambdós fitxers.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1925,7 +1956,7 @@ msgstr "" " -3 Elimina la columna 3 (línies que apareixen en ambdós\n" " fitxers).\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1940,13 +1971,13 @@ msgstr "" " --nocheck-order No comprova si l’entrada es troba correctament\n" " ordenada.\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" " --output-delimiter=CADENA\n" " Separa les columnes amb la CADENA.\n" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" @@ -1956,7 +1987,7 @@ msgstr "" "per\n" "LC_COLLATE.\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1974,56 +2005,68 @@ msgstr "" "al\n" " FITXER2 (i viceversa).\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "el fitxer número %d no està ordenat" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "s’han especificat múltiples delimitadors" # Usa quote. ivb -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "no es permet un valor buit per a %s" -# uniq no usa quote(). ivb -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 -#, c-format -msgid "error reading %s" -msgstr "error en llegir %s" - # Usa quote(). ivb -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:181 src/copy.c:452 #, c-format msgid "cannot lseek %s" msgstr "ha fallat lseek() sobre %s" # uniq no usa quote(). ivb -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" +msgstr "error en llegir %s" + +# uniq no usa quote(). ivb +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 +#, c-format +msgid "error reading %s" +msgstr "error en llegir %s" + +# uniq no usa quote(). ivb +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "error en escriure %s" -#: src/copy.c:323 +# uniq no usa quote(). ivb +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "error en llegir %s" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s: no s’ha pogut obtenir la informació sobre les extensions" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: no s’ha pogut escriure" # Usa quote(). ivb -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "no s’ha pogut estendre %s" @@ -2031,31 +2074,31 @@ msgstr "no s’ha pogut estendre %s" # Usa quote(). ivb # Indica condició d'error. ivb # Fallada en establir permisos segurs abans de canviar propietari/grup. ivb -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "en assegurar els permisos de %s" # Els 3 usen quote(). ivb -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "no s’ha pogut preservar el propietari de %s" # Usa quote(). ivb -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "no s’ha pogut cercar el fitxer %s" # Usa quote(). ivb -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "no s’ha pogut preservar l’autoria de %s" # Usa quote(). ivb -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" @@ -2063,40 +2106,40 @@ msgstr "" "no s’ha pogut establir el context per defecte de creació de fitxers a %s" # Usa quote(). ivb -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "" "no s’ha pogut establir el context per defecte de creació de fitxers de %s" # Usa quote(). ivb -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "no s’ha pogut establir el context de seguretat de %s" # Usa quote(). ivb -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, 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:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "ha fallat fstat() sobre %s" # Usa quote(). ivb -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "es salta el fitxer %s, que va ser reemplaçat en ser copiat" # Els 6 usen quote(). ivb -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" @@ -2104,41 +2147,40 @@ msgstr "no s’ha pogut eliminar %s" # Usa quote(). ivb # Missatge informatiu. ivb -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "s’ha eliminat %s\n" # Usa quote. ivb # Missatge d’error. ivb -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "no es copiarà a través de l’enllaç simbòlic trencat %s" # Usa quote(). ivb -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "no s’ha pogut crear el fitxer ordinari %s" # Els 2 usen quote(). ivb -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "no s’ha pogut clonar %s des de %s" # Usa quote(). ivb # Indica condició d'error. ivb -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "en preservar les dates de %s" # Usa quote(). ivb -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "no s’ha pogut tancar %s" @@ -2150,142 +2192,150 @@ msgstr "no s’ha pogut tancar %s" # (nota per a la posteritat) Debian 3.0 ja fa 2 mesos que "ja està # a punt" :) I encara no tindrà fileutils traduït... jm # 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:1580 -#, fuzzy, c-format +# Usa quote() en el 2n arg. ivb +# Entre parèntesis va una cadena estil «-rwxr-xr-x». ivb +#: src/copy.c:1669 +#, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " -msgstr "%s: voleu sobreescriure %s, reemplaçant el mode %04lo (%s)? " +msgstr "%s: voleu reemplaçar %s, descartant el mode %04lo (%s)? " -#: src/copy.c:1581 +# Usa quote() en el 2n arg. ivb +# Entre parèntesis el mode i la cadena equivalent. ivb +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " -msgstr "" +msgstr "%s: no es pot escriure %s (mode %04lo, %s), voleu provar igualment? " # Usa quote(). ivb -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: voleu sobreescriure %s? " # Usa quote(). ivb -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (còpia de seguretat: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, 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:1706 +#: src/copy.c:1795 #, 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:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "ha fallat stat() sobre %s" # Usa quote(). ivb -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "es descarta el directori %s" # Usa quote(). ivb -#: src/copy.c:1791 +#: src/copy.c:1880 #, 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:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s i %s són el mateix fitxer" # Usa quote() en els 2 args. ivb -#: src/copy.c:1939 +#: src/copy.c:2019 #, 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:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "no es sobreescriurà %s, tot just creat, amb %s" # Usa quote(). ivb -#: src/copy.c:1975 +#: src/copy.c:2055 #, 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:1989 +#: src/copy.c:2069 #, 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:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "no sha pogut crear una còpia de seguretat de %s" # Usa quote() en els 2 args. ivb -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "no es pot copiar un directori, %s, dins d’ell mateix, %s" +# Usa quote(). ivb +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "avís: s’ha especificat el fitxer origen %s més d’una vegada" + # Un quote() en els 2 args. ivb -#: src/copy.c:2201 +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, 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:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" @@ -2293,62 +2343,62 @@ msgstr "" "destinació" # Usa quote(). ivb -#: src/copy.c:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "no es pot copiar l’enllaç simbòlic cíclic %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, 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:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "no s’ha pogut crear la cua FIFO %s" # Usa quote(). ivb -#: src/copy.c:2545 +#: src/copy.c:2638 #, 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:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, 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:2583 +#: src/copy.c:2676 #, 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:2615 +#: src/copy.c:2708 #, 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:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "no s’ha pogut recuperar la còpia de seguretat de %s" # Usa quote() en els 2 args. ivb -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (recuperació de la còpia de seguretat)\n" @@ -2356,31 +2406,37 @@ msgstr "%s -> %s (recuperació de la còpia de seguretat)\n" #. This is a proper name. See the gettext manual, section Names. #: src/coreutils.c:47 msgid "Alex Deymo" -msgstr "" +msgstr "Alex Deymo" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" -msgstr "" +msgstr "Forma d’ús: %s --coreutils-prog=NOM_PROGRAMA [PARÀMETRE…]\n" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" +"Executa el programa incorporat anomenat NOM_PROGRAMA amb els paràmetres\n" +"especificats.\n" +"\n" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" +"\n" +"Empreu «%s --coreutils-prog=NOM_PROGRAMA --help» per a obtenir l’ajuda\n" +"de cada programa.\n" -# Un nom de flux com els anteriors. ivb -#: src/coreutils.c:178 src/coreutils.c:202 -#, fuzzy, c-format +# Usa quote(). ivb +#: src/coreutils.c:177 src/coreutils.c:201 +#, c-format msgid "unknown program %s" -msgstr "flux desconegut" +msgstr "el programa %s no és conegut" #: src/cp.c:157 src/mv.c:288 #, c-format @@ -2556,18 +2612,20 @@ msgstr "" " -x, --one-file-system Es manté dins d’aquest sistema de fitxers.\n" #: src/cp.c:232 -#, fuzzy msgid "" " -Z set SELinux security context of destination\n" " file to default type\n" " --context[=CTX] like -Z, or if CTX is specified then set the\n" " SELinux or SMACK security context to CTX\n" msgstr "" -" -Z, --context[=CONTEXT]\n" -" Estableix el context de seguretat de SELinux del\n" -" fitxer destinació al tipus per defecte, o al CONTEXT " -"si\n" -" s’especifica.\n" +" -Z Estableix el context de seguretat de SELinux del\n" +" fitxer destinació al tipus per defecte.\n" +" --context[=CONTEXT]\n" +" Equival a «-Z», i si s’especifica un CONTEXT " +"l’estableix\n" +" com a context de seguretat de SELinux o SMACK del " +"fitxer\n" +" destinació.\n" # ivb: # «Sparse» són fitxers amb blocs seguits de caràcters nuls. Com es pareix @@ -2681,8 +2739,8 @@ msgstr "%s existeix però no és un directori" msgid "failed to access %s" msgstr "no s’ha pogut accedir a %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "manca un operand fitxer" @@ -2760,136 +2818,137 @@ msgstr "" "aquests no ha sigut compil·lada en «cp»" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "l’entrada ha desaparegut" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, 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:713 +#: src/csplit.c:714 #, 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:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " a la %sa repetició\n" # Usa quote(). ivb -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: no s’ha trobat cap coincidència" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "error a la cerca de l’expressió regular" # Usa quote(). ivb -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "error en escriure %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: s’esperava un número enter després del delimitador" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: cal «}» al nombre de repeticions" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: cal especificar un número enter entre «{» i «}»" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: manca el delimitador «%c» de tancament" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: l’expressió regular no és vàlida: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: el patró no és vàlid" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, 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:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "manca l’especificació de conversió al sufix" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "l’especificació de conversió al sufix no és vàlida: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "l’especificació de conversió al sufix no és vàlida: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, 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:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "sobren especificacions de conversió «%%» al sufix" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "manca l’especificació de conversió «%%» al sufix" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: el número no és vàlid" +# Usa quote(). ivb +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "el número %s no és vàlid" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Forma d’ús: %s [OPCIÓ]… FITXER PATRÓ…\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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" @@ -2900,7 +2959,16 @@ msgstr "" "estàndard\n" "la mida en octets de cadascun d’ells.\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Si FITXER és «-», llegeix l’entrada estàndard. Cada PATRÓ pot ser:\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2912,13 +2980,13 @@ msgstr "" " -f, --prefix=PREFIX Empra aquest PREFIX en lloc de «xx».\n" " -k, --keep-files No elimina els fitxer generats, en cas d’error.\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" " -m, --suppress-matched\n" " Elimina les línies que coincideixen amb el PATRÓ.\n" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2930,17 +2998,11 @@ msgstr "" " -z, --elide-empty-files\n" " Elimina els fitxers resultants que estan buits.\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Si FITXER és «-», llegeix l’entrada estàndard. Cada PATRÓ pot ser:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 +#, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2980,7 +3042,7 @@ msgstr "" "Escriu parts seleccionades de les línies de cada FITXER a la sortida\n" "estàndard.\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2992,7 +3054,7 @@ msgstr "" " -d, --delimiter=DELIM Empra DELIM en lloc de la tabulació com a\n" " delimitador de camp.\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -3006,7 +3068,7 @@ msgstr "" " que s’especifique l’opció «-s».\n" " -n (No es té en compte.)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -3014,7 +3076,7 @@ msgstr "" " --complement Complementa el conjunt d’octets, caràcters o camps\n" " escollits.\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -3027,7 +3089,7 @@ msgstr "" " Empra la CADENA com a delimitador de sortida; per\n" " defecte s’utilitza el delimitador d’entrada.\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -3042,7 +3104,8 @@ msgstr "" "una\n" "sola volta, exactament.\n" -#: src/cut.c:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -3050,8 +3113,6 @@ msgid "" " 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 "" "Cada interval pot ser un de:\n" "\n" @@ -3062,66 +3123,67 @@ msgstr "" "\n" "Sense FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "la llista d’octets, caràcters o camps no és vàlida" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "els camps i les posicions compten des d’1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "l’interval sense punt final no és vàlid: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format 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:383 +#: src/cut.c:382 #, 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:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "el número de camp %s és massa gran" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "només es pot especificar un únic tipus de llista" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "el delimitador ha de ser un únic caràcter" -#: src/cut.c:787 +#: src/cut.c:786 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:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 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:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "manca la llista de camps" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "manca la llista de posicions" @@ -3142,18 +3204,25 @@ msgstr "" "Mostra la data actual en el FORMAT indicat, o estableix la data del " "sistema.\n" +#: 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" +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:134 +#: src/date.c:138 +#, fuzzy msgid "" -" -d, --date=STRING display time described by STRING, not 'now'\n" -" -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -" -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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" " -d, --date=CADENA Mostra la data descrita a la CADENA en lloc de la " "data\n" @@ -3170,26 +3239,25 @@ msgstr "" " (nanosegons).\n" # «-R» no mostra la data traduïda. ivb -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=FITXER\n" " Mostra la data de la darrera modificació del FITXER.\n" " -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:147 +#: src/date.c:149 +#, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=PRECISIÓ\n" " Mostra la data en format RFC 3339 fins a la PRECISIÓ\n" @@ -3203,9 +3271,20 @@ msgstr "" " Mostra o estableix el Temps Universal Coordinat " "(UTC).\n" -# Les descr. han de començar en la 12a. columna (per «%:::z»). ivb +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +# Les descr. han de començar en la 12a. columna (per «%:::z»). ivb +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -3218,7 +3297,7 @@ msgstr "" " %% Un «%» literal.\n" " %a Dia de la setmana abreujat del locale, p. ex. «dg».\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -3231,7 +3310,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:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -3245,7 +3324,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:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -3257,7 +3336,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:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -3269,7 +3348,7 @@ msgstr "" " %I Hora (01..12).\n" " %j Dia de l’any (001..366).\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -3281,7 +3360,7 @@ msgstr "" " %m Mes (01..12).\n" " %M Minut (00..59).\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -3301,7 +3380,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:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3313,7 +3392,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:209 +#: src/date.c:215 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" @@ -3330,7 +3409,7 @@ msgstr "" "de\n" " la setmana (00..53).\n" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3342,7 +3421,7 @@ msgstr "" " %y Darrers dos dígits de l’any (00..99).\n" " %Y Any.\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3362,7 +3441,7 @@ msgstr "" "\n" "Per defecte, «date» reomple els camps numèrics amb zeros.\n" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3380,7 +3459,7 @@ msgstr "" " «^» Empra majúscules, si és possible.\n" " «#» Intercanvia majúscules i minúscules, si és possible.\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3396,7 +3475,7 @@ msgstr "" "els\n" "símbols numèrics alternatius del locale (si n’hi ha).\n" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3428,38 +3507,38 @@ msgstr "" "\n" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "entrada estàndard" # Ambdues usen quote(). ivb -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "la data %s no és vàlida" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "s’han especificat múltiples formats d’eixida" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3470,23 +3549,23 @@ msgstr "" "especificar dates, cal que qualsevol argument no‐opció siga una cadena de " "format que comence per «+»" -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "no s’ha pogut establir la data" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3495,7 +3574,7 @@ msgstr "" "Forma d’ús: %s [OPERAND]…\n" " o bé: %s OPCIÓ\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3516,7 +3595,8 @@ msgstr "" " ibs=OCTETS Llegeix com a molt aquest nombre d’OCTETS alhora (per\n" " defecte 512).\n" -#: src/dd.c:541 +#: src/dd.c:570 +#, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3525,8 +3605,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=FITXER Llegeix del FITXER en lloc de fer‐ho de l’entrada\n" " estàndard.\n" @@ -3544,7 +3626,7 @@ msgstr "" " d’errors: «noxfer» amaga l’estadística de la\n" " tranferència, «none» amaga tota la informació.\n" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3562,7 +3644,7 @@ msgstr "" "Cada símbol de CONVERSIONS pot ser:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3596,7 +3678,7 @@ msgstr "" "espais\n" " en lloc de NUL.\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3614,7 +3696,7 @@ msgstr "" " fsync El mateix, però també n’escriu les metadades.\n" # El més llarg és «count_bytes». ivb -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3628,141 +3710,105 @@ msgstr "" " append Mode de només addició (només té sentit per a l’eixida, es\n" " suggereix emprar «conv=notrunc»).\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio Empra E/S concurrent per a les dades.\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct Empra E/S directa per a les dades.\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory Falla si no és un directori.\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync Empra E/S sincronitzada per a les dades.\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync El mateix, però també per a les metadades.\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" " fullblock Acumula blocs d’entrada sencers (símbol per a «iflag»).\n" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock Empra E/S no blocadora.\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime No actualitza la data d’accés.\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nocache Descarta les dades de la memòria cau.\n" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty No assigna el fitxer com a terminal de control.\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow No segueix els enllaços simbòlics.\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks Falla si el fitxer té més d’un enllaç.\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary Empra E/S binària per a les dades.\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text Empra E/S textual per a les dades.\n" -#: src/dd.c:620 +#: src/dd.c:651 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:623 +#: src/dd.c:654 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:626 +#: src/dd.c:657 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:631 +#: src/dd.c:661 #, 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 "" -"\n" -"Enviar un senyal %s a un procés «dd» en marxa fa que mostre una estadística\n" -"d’entrada/eixida a l’eixida estàndard d’errors, i que després continue\n" -"copiant.\n" -"\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ kill -%s $pid; sleep 1; kill $pid\n" -" 18335302+0 registres llegits\n" -" 18335302+0 registres escrits\n" -" 9387674624 octets (9,4 GB) copiats, 34,6279 segons, 271 MB/s\n" -"\n" -"Les opcions són:\n" -"\n" # No és molt literal, però s’entén. ivb -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +#: src/dd.c:699 +#, fuzzy, c-format +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "no hi ha memòria suficient per al bloc d’entrada de %zu octets (%s)" # No és molt literal, però s’entén. ivb -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +#: src/dd.c:721 +#, fuzzy, c-format +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "no hi ha memòria suficient per al bloc d’eixida de %zu octets (%s)" -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" -"%+% registres llegits\n" -"%+% registres escrits\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% registre truncat\n" -msgstr[1] "% registres truncats\n" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" @@ -3770,7 +3816,7 @@ msgstr[0] "% octet (%s) copiat" msgstr[1] "% octets (%s) copiats" # Es refereix a octets per segon. ivb -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "Infinits B" @@ -3784,96 +3830,112 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% registres llegits\n" +"%+% registres escrits\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% registre truncat\n" +msgstr[1] "% registres truncats\n" + # Usa quote(). ivb # Condició d'error. ivb -#: src/dd.c:877 +#: src/dd.c:920 #, 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:884 +#: src/dd.c:927 #, 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:1089 +#: src/dd.c:1142 #, 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:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "en escriure %s" # Usa quote(). ivb -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "l’operand %s no és reconegut" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "la conversió no és vàlida" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "el senyalador d’entrada no és vàlid" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "el senyalador d’eixida no és vàlid" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "el senyalador d’estat no és vàlid" -# Usa quote(). ivb -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "el número %s no és vàlid" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, 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:1417 +#: src/dd.c:1520 #, 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:1419 +#: src/dd.c:1522 #, 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:1421 +#: src/dd.c:1524 #, 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:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "no es poden combinar «direct» i «nocache»" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3882,71 +3944,71 @@ msgstr "" "avís: s’evita un error del nucli en lseek() per al fitxer «%s» de tipus " "mt_type=0x%0lx —vegeu per a la llista de tipus" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: no s’ha pogut saltar" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: no s’ha pogut desplaçar" # Usa quote(). ivb -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "s’ha desbordat el desplaçament en llegir el fitxer %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, 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:1760 +#: src/dd.c:1863 #, 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:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "en establir els senyaladors de %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, 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:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "no s’ha pogut truncar a % octets al fitxer d’eixida %s" # Usa quote. ivb -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "ha fallat fdatasync() sobre %s" # Usa quote(). ivb -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "ha fallat fsync() sobre %s" # Els 2 usen quote(). ivb -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "no s’ha pogut obrir %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3957,20 +4019,20 @@ msgstr "" # Usa quote(). ivb # Condició d'error. ivb -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "no s’ha pogut truncar a % octets al fitxer d’eixida %s" # Usa quote(). ivb -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "no s’ha pogut descartar la memòria cau de %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -4054,12 +4116,13 @@ msgstr "Cabuda" msgid "%s-%s" msgstr "%2$s de %1$s" -#: src/df.c:1215 +# Usa quote(). ivb +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" -msgstr "" +msgstr "no s’ha pogut accedir a %s: s’ha muntat un altre dispositiu a sobre" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -4071,14 +4134,14 @@ msgstr "" # Crec que «virtual» capta millor el significat de «dummy». ivb #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 #, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -4088,11 +4151,13 @@ msgstr "" " unitats de 1.048.576 octets. Més detalls sobre el\n" " format de la MIDA a sota.\n" " --total Produeix un recompte total.\n" -" -h, --human-readable Mostra les mides en un format llegible per als\n" -" humans (per exemple: 1K 234M 2G).\n" -" -H, --si El mateix, però empra potències de 1000, no de 1024.\n" +" -h, --human-readable Mostra les mides com a potències de 1024 (per\n" +" exemple: 1023M).\n" +" -H, --si Mostra les mides com a potències de 1000 (per " +"exemple:\n" +" 1.1G).\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -4108,13 +4173,43 @@ msgstr "" " --no-sync No invoca sync() abans d’obtenir la informació sobre\n" " l’ús (per defecte).\n" -#: src/df.c:1409 +#: src/df.c:1429 +#, 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" +msgstr "" +" --output[=LLISTA_DE_CAMPS]\n" +" Empra el format d’eixida definit a la " +"LLISTA_DE_CAMPS, o\n" +" mostra tots els camps si s’omet aquesta.\n" +" -P, --portability Empra el format d’eixida POSIX.\n" +" --sync Invoca sync() abans d’obtenir la informació sobre " +"l’ús.\n" +" -t, --type=TIPUS Limita el llistat als sistemes de fitxers del TIPUS\n" +" especificat.\n" +" -T, --print-type Mostra el tipus de sistema de fitxers.\n" +" -x, --exclude-type=TIPUS\n" +" Limita el llistat als sistemes de fitxers que no " +"siguen\n" +" del TIPUS especificat.\n" +" -v (No es té en compte.)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose Mostra un missatge abans d’obrir cada fitxer de\n" +" sortida.\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -4136,7 +4231,7 @@ msgstr "" " del TIPUS especificat.\n" " -v (No es té en compte.)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -4152,26 +4247,26 @@ msgstr "" "info).\n" # No usa quote(), passa les opcions com a -X. -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "les opcions «%s» i «%s» són mútuament excloents" # Usa quote(). ivb -#: src/df.c:1610 +#: src/df.c:1636 #, 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:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "avís: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "no s’ha pogut llegir la taula de sistemes de fitxers muntats" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "no s’ha processat cap sistema de fitxers" @@ -4276,11 +4371,11 @@ msgstr "" "\n" #: src/dirname.c:59 -#, fuzzy msgid " -z, --zero end each output line with NUL, not newline\n" msgstr "" -" -z, --zero Escriu un octet 0 en lloc de cada caràcter de nova\n" -" línia per a separar els resultats.\n" +" -z, --zero Acaba cada línia d’eixida amb un caràcter NUL en " +"lloc\n" +" d’un caràcter de nova línia.\n" #: src/dirname.c:64 #, c-format @@ -4298,7 +4393,7 @@ msgstr "" " %s dir1/str dir2/str -> «dir1» seguit per «dir2»\n" " %s stdio.h -> «.»\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -4308,13 +4403,14 @@ msgstr "" " o bé: %s [OPCIÓ]… --files0-from=FITXER\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +#, fuzzy +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Resumeix l’ús de disc de cada FITXER, de forma recursiva per als " "directoris.\n" #: src/du.c:291 -#, fuzzy msgid "" " -0, --null end each output line with NUL, not newline\n" " -a, --all write counts for all files, not just directories\n" @@ -4324,9 +4420,9 @@ msgid "" " larger due to holes in ('sparse') files, internal\n" " fragmentation, indirect blocks, and the like\n" msgstr "" -" -0, --null Acaba cada línia d’eixida amb un octet 0 en lloc " -"d’un\n" -" caràcter de nova línia.\n" +" -0, --null Acaba cada línia d’eixida amb un caràcter NUL en " +"lloc\n" +" d’un caràcter de nova línia.\n" " -a, --all Mostra recomptes per a tots els fitxers, no només " "per\n" " als directoris.\n" @@ -4473,69 +4569,63 @@ msgid "Infinity" msgstr "Infinits" # És una funció. ivb -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "ha fallat fts_read(): %s" # Usa quote(). ivb -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "la profunditat màxima %s no és vàlida" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "l’argument «-0» de l’opció «--threshold» no és vàlid" -#: src/du.c:898 +#: src/du.c:919 #, 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:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "avís: resumir no és compatible amb «--max-depth=%lu»" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" "avís: les opcions «--apparent-size» i «-b» no tenen efecte amb «--inodes»" # Açò s'imprimeix després d'un missatge d'error. ivb -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "No es poden combinar els operands fitxer amb «--files0-from»." -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: error de lectura" - # Usa quote(). ivb -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "el nom buit de fitxer no és vàlid" # Els 3 fan el mateix ús. ivb -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "total" @@ -4649,7 +4739,6 @@ msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" msgstr "Estableix cada NOM a VALOR a l’entorn i executa l’ORDRE.\n" #: src/env.c:61 -#, fuzzy msgid "" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with NUL, not newline\n" @@ -4657,9 +4746,9 @@ msgid "" msgstr "" " -i, --ignore-environment\n" " Parteix d’un entorn buit.\n" -" -0, --null Acaba cada línia d’eixida amb un octet 0 en lloc " -"d’un\n" -" caràcter de nova línia.\n" +" -0, --null Acaba cada línia d’eixida amb un caràcter NUL en " +"lloc\n" +" d’un caràcter de nova línia.\n" " -u, --unset=NOM Elimina la variable NOM de l’entorn.\n" #: src/env.c:68 @@ -4689,9 +4778,8 @@ msgid "cannot specify --null (-0) with command" msgstr "no es pot especificar «--null» (-0) en indicar una ordre" #: 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" +#, fuzzy +msgid "Convert tabs in each FILE to spaces, writing to standard output.\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 «-», " @@ -4747,7 +4835,7 @@ msgid "input line is too long" msgstr "la línia d’entrada és massa llarga" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4911,12 +4999,12 @@ msgstr "error al cercador d’expressions regulars" msgid "non-integer argument" msgstr "l’argument no és enter" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "divisió entre zero" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, 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" @@ -4929,33 +5017,33 @@ msgid "the strings compared were %s and %s" msgstr "Les cadenes comparades eren %s i %s." #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "Niels Möller" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "Ha fallat el test de primalitat de Lucas. Açò no hauria d’ocórrer. " -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "s’ha desbordat la cua d’SQUFOF" # Usa quote(). ivb -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s no és un número enter positiu vàlid" # És un enter correcte però massa gran. ivb -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s és massa gran" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4964,7 +5052,7 @@ msgstr "" "Forma d’ús: %s [NÚMERO]…\n" " o bé: %s OPCIÓ\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -5012,7 +5100,7 @@ msgstr "" # buscar una traducció per refill # Així queda prou clar, d'acord amb l'info. ivb -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -5028,7 +5116,7 @@ msgstr "" " curtes.\n" # FIXME: invalid/untranslatable accidental format specification! ivb -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -5047,7 +5135,7 @@ msgstr "" " -g, --goal=AMPLADA Indica l’AMPLADA objectiu (per defecte un 93% ode\n" " l’amplada).\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -5057,21 +5145,20 @@ msgstr "" "opció; empreu «-w AMPLADA» al seu lloc" # Usa quote(). ivb -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "l’amplada no és vàlida: %s" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +#, fuzzy +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "Ajusta les línies de cada FITXER (per defecte l’entrada estàndard), i " "escriu\n" "a la sortida estàndard.\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -5082,9 +5169,9 @@ msgstr "" " -w, --width=AMPLADA Indica el nombre de columnes, en lloc de 80.\n" # Usa quote(). ivb -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "el nombre de columnes no és vàlid: %s" #. This is a proper name. See the gettext manual, section Names. @@ -5160,11 +5247,11 @@ msgstr "no s’ha pogut obtenir el GID real" msgid "%s: no such user" msgstr "%s: l’usuari no existeix" -#: src/head.c:109 +#: src/head.c:110 +#, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Escriu les 10 primeres línies de cada FITXER a la sortida estàndard. Amb " "més\n" @@ -5172,7 +5259,7 @@ msgstr "" "cap\n" "FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -5189,7 +5276,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:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -5198,7 +5285,7 @@ msgstr "" " -v, --verbose Sempre escriu les capçaleres amb els noms dels " "fitxers.\n" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -5211,49 +5298,37 @@ msgstr "" "M 1024*1024, GB 1000*1000*1000, G 1024*1024*1024, i així per a T, P, E, Z, " "Y.\n" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: el fitxer ha minvat massa" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: el nombre d’octets és massa gran" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: no s’ha pogut moure fins al desplaçament %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: no s’ha pogut moure dins el desplaçament relatiu %s" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "el nombre de línies" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "el nombre d’octets" +msgid "%s: number of bytes is too large" +msgstr "%s: el nombre d’octets és massa gran" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "el nombre de línies no és vàlid" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "el nombre d’octets no és vàlid" # Per a invocacions com ``head -10x``. ivb -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "l’opció final «%c» no és vàlida" @@ -5320,7 +5395,6 @@ msgstr "" "\n" #: src/id.c:90 -#, fuzzy msgid "" " -a ignore, for compatibility with other versions\n" " -Z, --context print only the security context of the process\n" @@ -5334,8 +5408,7 @@ msgid "" msgstr "" " -a No es té en compte, s’accepta per compatibilitat amb\n" " altres versions.\n" -" -Z, --context Només mostra el context de seguretat de l’usuari\n" -" actual.\n" +" -Z, --context Només mostra el context de seguretat del procés.\n" " -g, --group Només mostra l’identificador efectiu de grup.\n" " -G, --groups Mostra tots els identificadors de grup.\n" " -n, --name Mostra un nom en lloc d’un número, per a «-ugG».\n" @@ -5455,7 +5528,7 @@ msgstr "no s’ha pogut canviar el propietari de %s" msgid "cannot set time stamps for %s" msgstr "no s’han pogut establir les dates de %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "ha fallat la crida al sistema fork()" @@ -5598,7 +5671,6 @@ msgstr "" "creant.\n" #: src/install.c:648 -#, fuzzy msgid "" " --preserve-context preserve SELinux security context\n" " -Z set SELinux security context of destination\n" @@ -5608,11 +5680,14 @@ msgid "" msgstr "" " --preserve-context\n" " Preserva el context de seguretat de SELinux.\n" -" -Z, --context[=CONTEXT]\n" -" Estableix el context de seguretat de SELinux del\n" -" fitxer destinació al tipus per defecte, o al CONTEXT " -"si\n" -" s’especifica.\n" +" -Z Estableix el context de seguretat de SELinux del\n" +" fitxer destinació al tipus per defecte.\n" +" --context[=CONTEXT]\n" +" Equival a «-Z», i si s’especifica un CONTEXT " +"l’estableix\n" +" com a context de seguretat de SELinux o SMACK del " +"fitxer\n" +" destinació.\n" # Usa quote(). ivb #: src/install.c:696 src/unlink.c:86 @@ -5640,7 +5715,7 @@ msgstr "" "no es pot especificar el directori destinació en instal·lar un directori" # Els 2 usen quote(). ivb -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "el mode %s no és vàlid" @@ -5681,8 +5756,13 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5698,7 +5778,7 @@ msgstr "" " NUMFITXER, «1» per al FITXER1 o «2» per al FITXER2.\n" " -e CADENA Reemplaça els camps que manquen amb CADENA.\n" -#: src/join.c:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5714,7 +5794,7 @@ msgstr "" "d’entrada\n" " i de sortida.\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5740,15 +5820,13 @@ msgstr "" " de camp, i les imprimeix sense provar d’emparellar‐" "les.\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 -#, fuzzy +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" -" -z, --zero-terminated Escriu un octet 0 en lloc de cada caràcter de " -"nova\n" -" línia.\n" +" -z, --zero-terminated Acaba cada línia d’eixida amb un caràcter NUL en\n" +" lloc d’un caràcter de nova línia.\n" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5790,37 +5868,37 @@ msgstr "" "es\n" "poden emparellar algunes línies, es mostrarà un missatge d’avís.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:%: no es troba ordenat: %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "el número de camp «%s» no és vàlid" # Ambdues usen quote(). ivb -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "l’especificació de camp %s no és vàlida" # Usa quote(). ivb # No ho pose al davant pq tb hi apareix el número de camp. ivb -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "el número de fitxer a l’especificació de camp no és vàlid: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "els camps d’unió %lu i %lu no són compatibles" # Hau! ivb # I damunt no descriu bé l'error. ivb -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "" @@ -5828,18 +5906,18 @@ msgstr "" # Ambdues usen quote(). ivb # No és necessàriament una tabulació, ho diu info. ivb -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, 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:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "els separadors no són compatibles" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "ambdós fitxers no poden ser l’entrada estàndard" @@ -5916,7 +5994,7 @@ msgstr "no es pot combinar un senyal amb «-l» o «-t»" msgid "no process ID specified" msgstr "no s’ha especificat cap identificador de procés" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" @@ -5924,13 +6002,13 @@ msgstr "" "flux estàndard\n" # Cap dels dos usa quote(). ivb -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "el mode de memòria intermèdia «%s» no és vàlid per a «%s»\n" # Cap dels dos usa quote(). ivb -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -6143,7 +6221,7 @@ msgstr "«--relative» necessita «--symbolic»" msgid "FIXME: unknown" msgstr "ARREGLA’M: desconegut" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Forma d’ús: %s [OPCIÓ]\n" @@ -6156,7 +6234,7 @@ msgstr "" "Mostra el nom de l’usuari actual.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "no hi ha nom d’entrada" @@ -6167,7 +6245,7 @@ msgstr "no hi ha nom d’entrada" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%e %b %Y" @@ -6177,101 +6255,101 @@ msgstr "%e %b %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%e %b %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" -"es descarta el valor no vàlid de la variable d’entorn QUOTING_STYLE: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "es descarta l’amplària no vàlida a la variable d’entorn COLUMNS: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "es descarta l’amplària no vàlida de tabulació a la variable d’entorn " "TABSIZE: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "l’amplària de línia no és vàlida: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "l’amplària de tabulació no és vàlida: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "l’estil de data «%s» no és vàlid" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "Els arguments vàlids són:\n" # No pose cometes al principi perquè abans apareix una altra línia sense. ivb -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr " - +FORMAT (p.ex. «+%H:%M») per al format a l’estil de «date»\n" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "error en iniciar les cadenes dels mesos" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "el prefix no és reconegut: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "el valor de la variable d’entorn LS_COLORS no és interpretable" +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" +"es descarta el valor no vàlid de la variable d’entorn QUOTING_STYLE: %s" + # Usa quote(). ivb -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "no s’ha pogut obrir el directori %s" # Usa quote(). ivb -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "no es poden determinar el dispositiu i node índex de %s" # Usa quote(). ivb -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: no es llista el directori ja llistat" # Els 2 usen quote(). ivb # Indica condició d'error. ivb -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "en llegir el directori %s" # Usa quote(). ivb # És un missatge d'error. ivb -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "en tancar el directori %s" # Usa quote() en els 2 args. ivb -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "no es poden comparar els noms de fitxer %s i %s" @@ -6281,7 +6359,7 @@ msgstr "no es poden comparar els noms de fitxer %s i %s" # 2.- Com és d'important el principi KISS # 3.- Com és de _vital_ el moviment cap enrere de la pantalla de text # (Déu els compila i ells s'enllacen!) ivb -#: src/ls.c:4781 +#: src/ls.c:4775 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" @@ -6292,7 +6370,7 @@ msgstr "" "«-cftuvSUX» o «--sort».\n" # Amb «implied» vol dir que no han estat indicats explícitament com a args. ivb -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -6306,7 +6384,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:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -6333,12 +6411,14 @@ msgstr "" "més\n" " nou).\n" -#: src/ls.c:4804 +#: src/ls.c:4798 +#, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -6352,7 +6432,7 @@ msgstr "" " continguts.\n" " -D, --dired Genera eixida preparada per al mode «dired» d’Emacs.\n" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -6371,11 +6451,11 @@ msgstr "" " single-column (-1), verbose (-l), vertical (-C).\n" " --full-time Equival a «-l --time-style=full-iso».\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr " -g Com «-l», però no mostra el propietari.\n" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -6388,9 +6468,7 @@ msgstr "" " l’opció «--sort», però «--sort=none» (-U) inhabilita\n" " l’agrupament.\n" -# Crec que «virtual» capta millor el significat de «dummy». ivb -#: src/ls.c:4829 -#, fuzzy +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -6398,14 +6476,13 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" " -G, --no-group Amb «-l», no mostra els noms de grup.\n" -" -h, --human-readable Amb «-l», mostra les mides en un format llegible " -"per\n" -" als humans (per exemple: 1K 234M 2G).\n" +" -h, --human-readable Amb «-l» o «-s», mostra les mides en un format\n" +" llegible per als humans (per exemple: 1K 234M 2G).\n" " --si El mateix, però empra potències de 1000, no de 1024.\n" # «--dereference-command-line-symlink-to-dir» /**/ ivb # «--hide», encara una altra opció! O_O ivb -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -6430,7 +6507,7 @@ msgstr "" " el PATRÓ d’intèrpret indicat (inhabilitada per les\n" " opcions «-a» i «A»).\n" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -6452,7 +6529,7 @@ msgstr "" " -k, --kibibytes Empra blocs de 1024 octets per a mostrar l’ús de " "disc.\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -6469,7 +6546,7 @@ msgstr "" "per\n" " comes.\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -6489,7 +6566,7 @@ msgstr "" " -p, --indicator-style=slash\n" " Afegeix l’indicador «/» als directoris.\n" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -6513,7 +6590,7 @@ msgstr "" " Empra l’ESTIL indicat per a citar les paraules:\n" " literal, locale, shell, shell-always, c, escape.\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -6524,18 +6601,19 @@ msgstr "" " -R, --recursive Llista recursivament els subdirectoris.\n" " -s, --size Mostra la mida en blocs de cada fitxer.\n" -#: src/ls.c:4886 +#: src/ls.c:4881 +#, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S Ordena les entrades per la seua mida.\n" " --sort=CLAU Ordena en base a la CLAU indicada en lloc d’emprar " @@ -6552,7 +6630,7 @@ msgstr "" " aquesta data.\n" # ls, your next programming language for the shell... ivb -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -6575,7 +6653,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:4908 +#: src/ls.c:4904 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -6585,11 +6663,12 @@ msgstr "" " -T, --tabsize=COLUMNES\n" " Indica les COLUMNES entre tabulacions, en lloc de 8.\n" -#: src/ls.c:4912 +#: src/ls.c:4908 +#, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -6600,14 +6679,15 @@ msgstr "" " troben al directori.\n" " -v Ordena pel número (de versió) inclós al nom.\n" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=COLS Assumeix un altre ample de pantalla en lloc del " "valor\n" @@ -6615,11 +6695,10 @@ msgstr "" " -x Llista les entrades en línies en lloc d’en columnes.\n" " -X Ordena alfabèticament segons l’extensió de cada\n" " entrada.\n" -" -Z, --context Mostra el context de seguretat de SELinux de cada\n" -" fitxer.\n" +" -Z, --context Mostra el context de seguretat de cada fitxer.\n" " -1 Llista un fitxer per línia.\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6635,7 +6714,7 @@ msgstr "" "LS_COLORS permet canviar la configuració dels colors. Empreu l’ordre\n" "«dircolors» per a establir la variable.\n" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6667,12 +6746,10 @@ msgid "David Madore" msgstr "David Madore" #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" "Forma d’ús: %s [OPCIÓ]… [FITXER]…\n" "Escriu o comprova sumes de verificació %s (de %d bits). Sense FITXER, o " @@ -6680,41 +6757,46 @@ msgstr "" "FITXER és «-», llegeix l’entrada estàndard.\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" 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:178 -msgid " -b, --binary read in binary mode\n" +#: src/md5sum.c:180 +#, fuzzy +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary Llegeix en mode binari.\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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:184 +#: src/md5sum.c:187 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 +#: src/md5sum.c:191 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:192 +#: src/md5sum.c:195 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:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -6738,14 +6820,15 @@ msgstr "" "incorrecte.\n" "\n" -#: src/md5sum.c:206 -#, c-format +#: src/md5sum.c:209 +#, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "El càlcul de les sumes es realitza com es descriu al document %s.\n" @@ -6756,88 +6839,88 @@ msgstr "" "el\n" "nom de cada FITXER.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: hi ha massa línies de suma" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: la línia de suma %s està mal formatada" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: no s’ha pogut obrir o llegir\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "INCORRECTE" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "CORRECTE" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, 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:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "avís: % línia està mal formatada" msgstr[1] "avís: % línies estan mal formatades" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "avís: % fitxer llistat no s’ha pogut llegir" msgstr[1] "avís: % fitxers llistats no s’han pogut llegir" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "avís: % suma calculada NO coincideix" msgstr[1] "avís: % sumes calculades NO coincideixen" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "l’opció «--tag» no admet el mode text" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, 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:777 +#: src/md5sum.c:780 #, 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:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, 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" @@ -6852,7 +6935,6 @@ msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "Crea cada DIRECTORI indicat, si no existeix ja.\n" #: src/mkdir.c:65 -#, fuzzy msgid "" " -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" " -p, --parents no error if existing, make parent directories as needed\n" @@ -6863,11 +6945,6 @@ msgstr "" " -p, --parents Crea els directoris pare necessaris, sense mostrar\n" " errors si aquests ja existeixen.\n" " --verbose Mostra un missatge per cada directori creat.\n" -" -Z, --context[=CONTEXT]\n" -" Estableix el context de seguretat de SELinux de cada\n" -" directori creat al tipus per defecte, o al CONTEXT " -"si\n" -" s’especifica.\n" #: src/mkdir.c:70 msgid "" @@ -6877,26 +6954,34 @@ msgid "" " --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n" " or SMACK security context to CTX\n" msgstr "" +" -Z Estableix el context de seguretat de SELinux de cada\n" +" directori creat al tipus per defecte.\n" +" --context[=CONTEXT]\n" +" Equival a «-Z», i si s’especifica un CONTEXT " +"l’estableix\n" +" com a context de seguretat de SELinux o SMACK de " +"cada\n" +" directori creat.\n" # Usa quote(). ivb -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "no s’ha pogut establir el context per defecte de creació de %s" # Usa quote(). ivb -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" msgstr "no s’ha pogut restaurar el context de %s" # Usa quote(). ivb -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "s’ha creat el directori %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6925,6 +7010,13 @@ msgid "" " --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n" " or SMACK security context to CTX\n" msgstr "" +" -Z Estableix el context de seguretat de SELinux al " +"tipus\n" +" per defecte.\n" +" --context[=CONTEXT]\n" +" Equival a «-Z», i si s’especifica un CONTEXT " +"l’estableix\n" +" com a context de seguretat de SELinux o SMACK.\n" #: src/mkfifo.c:153 src/mknod.c:150 #, c-format @@ -7117,7 +7209,7 @@ 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:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "el sufix %s no és vàlid perquè conté un separador de directoris" @@ -7271,9 +7363,8 @@ msgid "Scott Bartram" msgstr "Scott Bartram" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, with line numbers added.\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" @@ -7396,31 +7487,31 @@ msgid "invalid footer numbering style: %s" msgstr "l’estil de numeració de peu no és vàlid: «%s»" # Usa quote(). ivb -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "el número inicial de línia no és vàlid: %s" # Usa quote(). ivb -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "l’increment del número de línia no és vàlid: %s" # Usa quote(). ivb -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "el número de línies en blanc no és vàlid: %s" # Usa quote(). ivb -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "l’amplada del camp de números de línia no és vàlida: %s" # Usa quote(). ivb -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "l’estil de numeració de línia no és vàlid: %s" @@ -7443,10 +7534,10 @@ msgstr "" "\n" #: src/nohup.c:65 -#, c-format +#, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -7469,26 +7560,26 @@ msgid "failed to render standard input unusable" msgstr "no s’ha pogut inhabilitar l’entrada estàndard" # Missatge informatiu. ivb -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "es descarta l’entrada" # Missatge informatiu. ivb # Usa quote(). ivb -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "es descarta l’entrada i s’afegeix l’eixida a %s" # Missatge informatiu. ivb # Usa quote(). ivb -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "s’afegeix l’eixida a %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" @@ -7496,25 +7587,25 @@ msgstr "" "tanque en fer exec()" # Missatge informatiu. ivb -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" "es descarta l’entrada i es redirigeixen els errors a l’eixida estàndard" # Missatge informatiu. ivb -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "es redirigeixen els errors a l’eixida estàndard" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -7543,63 +7634,58 @@ msgstr "" "sistema.\n" " --ignore=N Exclou N unitats de processament si és possible.\n" -#: 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "Assaf Gordon" # Usa quote(). ivb -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "el valor és massa gran per a ser convertit: «%s»" # Usa quote(). ivb -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, c-format msgid "invalid number: %s" msgstr "el número no és vàlid: %s" # Usa quote(). ivb -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "es rebutja el sufix a l’entrada: %s (considereu emprar «--from»)" # Usa quote(). ivb -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" msgstr "s’ha trobat un sufix no vàlid a l’entrada: %s" # Usa quote(). ivb -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "manca el sufix «i» a l’entrada: %s (p.ex. Ki/Mi/Gi)" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "no s’ha pogut preparar el valor «%Lf» per a escriure’l" # Usa quote(). ivb -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, c-format msgid "invalid unit size: %s" msgstr "la mida de la unitat no és vàlida: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Forma d’ús: %s [OPCIÓ]… [NÚMERO]…\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" @@ -7607,26 +7693,29 @@ msgstr "" "Reformata cada NÚMERO, o els números de l’entrada estàndard si no se\n" "n’especifica cap.\n" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr " --debug Mostra avisos sobre les entrades no vàlides.\n" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" " -d, --delimiter=DELIM Empra DELIM en lloc d’espais en blanc com a\n" " delimitador de camp.\n" -#: src/numfmt.c:827 +#: src/numfmt.c:893 +#, fuzzy msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" " --field=N Reemplaça el número que es troba al camp d’entrada " "amb\n" " posició N (per defecte 1).\n" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" @@ -7634,7 +7723,7 @@ msgstr "" " --format=FORMAT Empra el FORMAT indicat de coma flotat d’estil\n" " printf(). Més detalls sobre el FORMAT a sota.\n" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" @@ -7644,7 +7733,7 @@ msgstr "" " UNITAT (per defecte «none»). Més detalls sobre la\n" " UNITAT a sota.\n" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" @@ -7652,7 +7741,7 @@ msgstr "" " --from-unit=N Especifica la mida de la unitat d’entrada (per\n" " defecte 1).\n" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -7663,7 +7752,7 @@ msgstr "" "ex.\n" " 1,000,000 (no té cap efecte amb el locale C/POSIX).\n" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" @@ -7671,7 +7760,7 @@ msgstr "" " --header[=N] Imprimeix (sense convertir) les primeres N línies\n" " llegides (per defecte 1).\n" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" @@ -7680,7 +7769,7 @@ msgstr "" " pot ser «abort» (per defecte), «fail», «warn» o\n" " «ignore». Més detalls a sota.\n" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -7695,7 +7784,7 @@ msgstr "" " caràcters. Per defecte s’alinea a dreta o esquerra\n" " automàticament si es troben espais en blanc.\n" -#: src/numfmt.c:860 +#: src/numfmt.c:927 msgid "" " --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" " up, down, from-zero (default), towards-zero, " @@ -7708,7 +7797,7 @@ msgstr "" "zero»\n" " (cap a zero), «nearest» (el més proper).\n" -#: src/numfmt.c:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" @@ -7717,21 +7806,21 @@ msgstr "" "el\n" " SUFIX opcional als números de l’entrada.\n" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" " --to=UNITAT Escala automàticament els números de l’eixida a la\n" " UNITAT. Més detalls sobre la UNITAT a sota.\n" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" " --to-unit=N Especifica la mida de la unitat d’eixida (per\n" " defecte 1).\n" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" @@ -7741,12 +7830,12 @@ msgstr "" "\n" # El més llarg és «iec-i». ivb -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr " none No accepta cap escala: els sufixos provocaran un error.\n" # El més llarg és «iec-i». ivb -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -7758,7 +7847,7 @@ msgstr "" " 1K = 1000, 1Ki = 1024, 1M = 1000000, 1Mi = 1048576.\n" # El més llarg és «iec-i». ivb -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -7769,7 +7858,7 @@ msgstr "" " 1K = 1000, 1M = 1000000…\n" # El més llarg és «iec-i». ivb -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7780,7 +7869,7 @@ msgstr "" " 1K = 1024, 1M = 1048576…\n" # El més llarg és «iec-i». ivb -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7790,7 +7879,28 @@ msgstr "" " iec-i Accepta sufixos opcionals de dues lletres, així:\n" " 1Ki = 1024, 1Mi = 1048576…\n" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Cada interval pot ser un de:\n" +"\n" +" N L’octet, caràcter o camp N, comptant des d’1.\n" +" N- Des de l’octet, caràcter o camp N fins al final de la línia.\n" +" N-M Des de l’octet, caràcter o camp N fins a l’M (inclòs).\n" +" -M Des del principi fins a l’octet, caràcter o camp M (inclòs).\n" +"\n" +"Sense FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n" + +#: src/numfmt.c:983 #, fuzzy, c-format msgid "" "\n" @@ -7799,17 +7909,20 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" "\n" "El FORMAT ha de basar‐se en «%f» i ser adequat per a imprimir un argument " "de\n" "coma flotant. Una cometa opcional («%'f») habilita l’agrupament (com fa\n" "«--grouping») si el locale actual ho permet. Una amplada opcional («%10f»)\n" -"reomple l’eixida per l’esquerra. Una amplada negativa («%-10f») reomple\n" -"l’eixida per la dreta.\n" +"reomple l’eixida per l’esquerra. Una amplada opcional amb zero («%010f»)\n" +"reomple amb zeros un número. Una amplada negativa («%-10f») reomple " +"l’eixida\n" +"per la dreta.\n" # És el nom del programa. No usa quote(). ivb -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7832,8 +7945,8 @@ msgstr "" "errors de conversió i el codi d’eixida és 0.\n" # Són el nom del programa. No usa quote(). ivb -#: src/numfmt.c:922 -#, c-format +#: src/numfmt.c:1000 +#, fuzzy, c-format msgid "" "\n" "Examples:\n" @@ -7847,8 +7960,8 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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 "" @@ -7871,53 +7984,66 @@ msgstr "" " $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n" # Usa quote(). ivb -#: src/numfmt.c:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "el format %s no té una directiva «%%»" # Usa quote(). ivb -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "el format %s no és vàlid (desbordament de l’amplada)" -#: src/numfmt.c:1008 -#, c-format -msgid "--format padding overridding --padding" -msgstr "" +#: src/numfmt.c:1085 +#, fuzzy, c-format +msgid "--format padding overriding --padding" +msgstr "el reomplit de «--format» descarta el de «--padding»" # Usa quote(). ivb -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "el format %s acaba en «%%»" +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "la precisió no és vàlida: %s" + # Usa quote(). ivb -#: src/numfmt.c:1030 +#: src/numfmt.c:1126 #, fuzzy, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" -msgstr "el format %s no és vàlid, la directiva ha de ser «%%['][-][N]f»" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" +msgstr "el format %s no és vàlid, la directiva ha de ser «%%[0]['][-][N]f»" # Usa quote(). ivb -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "el format %s té massa directives «%%»" # Usa quote en els 2 args. ivb -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, c-format msgid "invalid suffix in input %s: %s" msgstr "s’ha trobat un sufix no vàlid a l’entrada %s: %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, fuzzy, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" +"el valor és massa gran per a ser imprès: «%Lg» (considereu emprar «--to»)" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" "el valor és massa gran per a ser imprès: «%Lg» (considereu emprar «--to»)" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" @@ -7925,77 +8051,76 @@ msgstr "" "majors que 999Y)" # Usa quote(). ivb -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "el valor d’entrada %s és gran, pot haver perdut precisió" -#: src/numfmt.c:1308 +# Usa quote(). ivb +# Açò queda més clar. ivb +#: src/numfmt.c:1386 src/numfmt.c:1399 #, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" -"la línia d’entrada és massa curta i no inclou un camp %ld amb un número a " -"convertir" +msgid "invalid field value %s" +msgstr "el número de camp %s no és vàlid" # Usa quote(). ivb # Açò queda més clar. ivb -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, c-format msgid "invalid padding value %s" msgstr "l’amplada de reomplit %s no és vàlida" # Usa quote(). ivb -# Açò queda més clar. ivb -#: src/numfmt.c:1417 -#, c-format -msgid "invalid field value %s" -msgstr "el número de camp %s no és vàlid" +#: src/numfmt.c:1646 +#, fuzzy, c-format +msgid "multiple field specifications" +msgstr "%s: l’especifiació de camp no és vàlida: %s" # Usa quote(). ivb # Açò queda més clar. ivb -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, c-format msgid "invalid header value %s" msgstr "el número de capçaleres %s no és vàlid" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "no es poden combinar «--grouping» i «--format»" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "no s’ha especificat cap opció de conversió" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "no es poden combinar «--grouping» i «--to»" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "l’agrupament no té cap efecte en aquest locale" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "«--header» no es té en compte en llegir l’entrada de la línia d’ordres" # Posaria «entrada estàndard» però en vista de l’existència de # l’opció «--header» preferisc no pillar‐me els dits. ivb -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "error en llegir l’entrada" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "no s’han pogut convertir alguns dels números de l’entrada" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -8007,14 +8132,13 @@ msgstr "" " o bé: %s [-abcdfilosx]… [FITXER] [[+]DESPLAÇAMENT[.][b]]\n" " o bé: %s --traditional [OPC]… [FITX] [[+]DESPL[.][b] [+][ETIQ][.][b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Escriu una representació inequívoca, d’octets en octal per defecte, del " @@ -8025,8 +8149,10 @@ msgstr "" "\n" # El més llarg és «x[MIDA]». ivb -#: src/od.c:333 +#: src/od.c:335 +#, 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" @@ -8044,8 +8170,7 @@ msgstr "" "«0X» indica hexadecimal. Els sufixs poden ser «.» per a octal i «b» com a\n" "multiplicació per 512.\n" -#: src/od.c:344 -#, fuzzy +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -8059,11 +8184,15 @@ msgstr "" " pot ser «d» (decimal), «o» (octal), «h» (hexadecimal) " "o\n" " «n» (cap).\n" +" --endian={big|little}\n" +" Intercanvia els octets d’entrada d’acord amb " +"l’ordenació\n" +" especificada.\n" " -j, --skip-bytes=OCTETS\n" " Salta aquest nombre d’OCTETS al principi de " "l’entrada.\n" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -8091,7 +8220,7 @@ msgstr "" # buscar una traducció per `named characters' i `shorts' # Crec que així va bé. ivb -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -8116,7 +8245,7 @@ msgstr "" # buscar traduccions pels diferents tipus # Crec que així va bé. ivb -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -8132,7 +8261,7 @@ msgstr "" " -s Equival a «-t d2», enters de 2 octets en decimal.\n" " -x Equival a «-t x2», enters de 2 octets en hexadecimal.\n" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -8150,7 +8279,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:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -8164,7 +8293,7 @@ msgstr "" " u[MIDA] Decimal sense signe, de MIDA octets com a enter.\n" " x[MIDA] Hexadecimal, de MIDA bytes com a enter.\n" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -8180,7 +8309,7 @@ msgstr "" "«sizeof(float)», «D» per a «sizeof(double)» o bé «L» per a\n" "«sizeof(long double)».\n" -#: src/od.c:401 +#: src/od.c:404 msgid "" "\n" "Adding a z suffix to any type displays printable characters at the end of\n" @@ -8190,7 +8319,7 @@ msgstr "" "En afegir «z» a qualsevol tipus es mostraran els caràcters imprimibles al\n" "final de cada línia d’eixida.\n" -#: src/od.c:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -8216,13 +8345,13 @@ msgstr "" "i així per a G, T, P, E, Z, Y.\n" # Ambdues usen quote(). ivb -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "la cadena de tipus no és vàlida: %s" # Usa quote(). ivb -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -8232,7 +8361,7 @@ msgstr "" "enter de %lu octets" # Usa quote(). ivb -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -8242,39 +8371,39 @@ msgstr "" "de coma flotant de %lu octets" # Usa quote() en la segona. ivb -#: src/od.c:869 +#: src/od.c:872 #, 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:1094 +#: src/od.c:1105 #, 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:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, 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:1863 +#: src/od.c:1871 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:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "«skip-bytes» + «read-bytes» és massa gran" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "atenció: l’amplada %lu no és vàlida; s’emprarà %d" @@ -8290,10 +8419,10 @@ 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" msgstr "" "Escriu línies consistents en les línies corresponents seqüencialment de " "cada\n" @@ -8453,12 +8582,12 @@ msgstr "Quan" msgid "Where" msgstr "On" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Forma d’ús: %s [OPCIÓ]… [USUARI]…\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -8477,7 +8606,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:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -8495,7 +8624,7 @@ msgstr "" " d’inactivitat (ociós) al format curt.\n" # No usa quote(). ivb -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -8506,108 +8635,108 @@ msgstr "" "Un programa de «finger» lleuger; mostra informació sobre els usuaris. El\n" "fitxer «utmp» serà «%s».\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" "no s’ha indicat cap nom d’usuari; n’heu d’indicar almenys un si empreu «-l»" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, 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:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "el rang de pàgines no és vàlid: %s" # Usa quote(). ivb -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "-l LLARG_PÀG: el nombre de línies no és vàlid: %s" # Usa quote(). ivb -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "-N NÚMERO: el número inicial de línia no és vàlid: %s" # Usa quote(). ivb -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "-o MARGE: el desplaçament de línia no és vàlid: %s" # Usa quote(). ivb -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "-w AMPLADA_PÀG: el nombre de caràcters no és vàlid: %s" # Usa quote(). ivb -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "-W AMPLADA_PÀG: el nombre de caràcters no és vàlid: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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 paral·lel" -#: src/pr.c:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "no es pot especificar impressió en paral·lel i de través alhora" # Usa quote() en la segona. ivb -#: src/pr.c:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "l’amplada de pàgina és insuficient" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" "el número de pàgina inicial % excedeix el comptador de pàgines " "%" -#: src/pr.c:2380 +#: src/pr.c:2350 #, 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:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Pàgina %" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "Arranja el(s) FITXER(s) en pàgines o columnes per a imprimir.\n" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -8625,7 +8754,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:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -8642,7 +8771,7 @@ msgstr "" " d’escapada en octal amb barra invertida.\n" " -d, --double-space Escriu el text amb espaiat doble.\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -8668,7 +8797,7 @@ msgstr "" "de\n" " capçalera i 5 de cua sense «-F»).\n" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -8695,11 +8824,26 @@ msgstr "" "columna,\n" " i «--sep-string[=CADENA]» defineix els separadors.\n" -#: src/pr.c:2798 +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l, --length=LLARG_PÀG\n" +" Defineix la llargada de pàgina en LLARG_PÀG (66) " +"línies\n" +" (per defecte hi ha 56 línies de text, 63 amb «-F»).\n" +" -m, --merge Escriu els fitxers en paral·lel, un en cada columna,\n" +" amb truncament de línies, però ajuntant les que " +"ocupen\n" +" una línia sencera si s’empra l’opció «-J».\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -8712,7 +8856,7 @@ msgstr "" "ocupen\n" " una línia sencera si s’empra l’opció «-J».\n" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -8732,7 +8876,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:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -8746,9 +8890,7 @@ msgstr "" " -r, --no-file-warnings\n" " No avisa quan un fitxer no es pot obrir.\n" -# Aaalaaa, ni punts ni res! ivb -#: src/pr.c:2820 -#, fuzzy +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -8769,14 +8911,14 @@ msgstr "" " especifiqueu «-w».\n" # Eeeeinnn?? Beneït info! ivb -#: src/pr.c:2828 +#: src/pr.c:2802 +#, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -S, --sep-string[=CADENA]\n" " Separa les columnes amb aquesta CADENA; si no " @@ -8789,10 +8931,16 @@ msgstr "" " columna.\n" " -t, --omit-header Omet les capçaleres i cues de pàgina.\n" +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +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:2835 +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -8819,7 +8967,7 @@ msgstr "" "inhabilita\n" " l’amplada de pàgina per defecte.\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -8834,17 +8982,6 @@ msgstr "" "interfereix\n" " amb les opcions «-S» o «-s».\n" -# Acaba pr i encara estic viu! Vaig a prendre una aspirina... ivb -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"L’opció «-t» és implícita quan LLARG_PÀG és menor o igual que 10. Sense\n" -"FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -8859,12 +8996,11 @@ msgstr "" "\n" #: src/printenv.c:69 -#, fuzzy msgid " -0, --null end each output line with NUL, not newline\n" msgstr "" -" -0, --null Acaba cada línia d’eixida amb un octet 0 en lloc " -"d’un\n" -" caràcter de nova línia.\n" +" -0, --null Acaba cada línia d’eixida amb un caràcter NUL en " +"lloc\n" +" d’un caràcter de nova línia.\n" #: src/printf.c:79 #, c-format @@ -9016,11 +9152,11 @@ msgstr "" "fitxers\n" "que formen l’entrada.\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 +#, fuzzy 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 Escriu les referències generades automàticament.\n" " -G, --traditional Es comporta com el «ptx» de System V.\n" @@ -9030,6 +9166,12 @@ msgstr "" #: src/ptx.c:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -9048,7 +9190,7 @@ msgstr "" " l’expressió regular indicada.\n" " -T, --format=tex Genera la sortida com a directives de TeX.\n" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -9075,7 +9217,7 @@ msgstr "" "que\n" " seran preses com a paraules clau.\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -9088,21 +9230,17 @@ msgstr "" " -w, --width=NÚMERO Amplada (en columnes) de la sortida (excloent‐ne la\n" " referència).\n" -#: src/ptx.c:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Sense cap FITXER, o quan FITXER és «-», llegeix l’entrada estàndard. Per\n" -"defecte s’empra «-F /».\n" - # Usa quote(). ivb #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "la mida de la separació no és vàlida: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "l’amplària de línia no és vàlida: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -9125,6 +9263,8 @@ msgid "" "\n" "If no option is specified, -P is assumed.\n" msgstr "" +"\n" +"Si no s’especifica cap opció, s’assumeix «-P».\n" # Usa quote(). ivb #: src/pwd.c:169 @@ -9133,7 +9273,7 @@ msgid "failed to chdir to %s" msgstr "no s’ha pogut canviar al directori %s" # Usa quote(). ivb -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "ha fallat stat() sobre %s" @@ -9156,8 +9296,8 @@ msgstr "es descarten els arguments no‐opció" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Forma d’ús: %s [OPCIÓ]… FITXER…\n" @@ -9193,7 +9333,6 @@ 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 " @@ -9215,8 +9354,9 @@ msgstr "" " -q, --quiet,\n" " -s, --silent No mostra la majoria de missatges d’error.\n" " -v, --verbose Mostra els missatges d’error.\n" -" -z, --zero Escriu un octet 0 en lloc de cada caràcter de nova\n" -" línia per a separar els resultats.\n" +" -z, --zero Acaba cada línia d’eixida amb un caràcter NUL en " +"lloc\n" +" d’un caràcter de nova línia.\n" #: src/readlink.c:152 #, c-format @@ -9235,7 +9375,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" @@ -9267,8 +9406,9 @@ msgstr "" " FITXER.\n" " -s, --strip, --no-symlinks\n" " No resol els enllaços simbòlics.\n" -" -z, --zero Escriu un octet 0 en lloc de cada caràcter de nova\n" -" línia per a separar els resultats.\n" +" -z, --zero Acaba cada línia d’eixida amb un caràcter NUL en " +"lloc\n" +" d’un caràcter de nova línia.\n" # Condició d’error. ivb #: src/relpath.c:130 @@ -9457,16 +9597,16 @@ msgstr "" "realment irrecuperables, considereu emprar «shred».\n" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: voleu eliminar %zu argument recursivament? " msgstr[1] "%s: voleu eliminar %zu arguments recursivament? " #: src/rm.c:345 -#, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +#, fuzzy, c-format +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: voleu eliminar %zu argument? " msgstr[1] "%s: voleu eliminar %zu arguments? " @@ -9705,12 +9845,12 @@ msgid "invalid floating point argument: %s" msgstr "l’argument de coma flotant no és vàlid: «%s»" # Usa quote() en la 1a. ivb -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "el format %s té una directiva «%%%c» desconeguda" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -9730,7 +9870,16 @@ msgstr "" "les\n" "dades, fins i tot per sondejos de maquinari molt cars.\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Si un dels FITXER és «-», el torna a copiar sobre l’eixida estàndard.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -9748,7 +9897,7 @@ msgstr "" "sufixos\n" " com «K», «M» i «G»).\n" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -9768,11 +9917,10 @@ msgstr "" "zeros\n" " per amagar la destrucció de les dades.\n" -#: src/shred.c:192 +#: src/shred.c:196 +#, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -9797,7 +9945,7 @@ msgstr "" "teniu en compte que pot ser costós.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -9819,7 +9967,7 @@ msgstr "" "del sistema de fitxers:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -9843,7 +9991,7 @@ msgstr "" " Appliances.\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -9857,7 +10005,7 @@ msgstr "" "* Sistemes de fitxers amb compressió.\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -9881,7 +10029,7 @@ msgstr "" "«/etc/fstab», com s’indica al manual de «mount» (executeu «man mount»).\n" "\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -9892,130 +10040,130 @@ msgstr "" "fitxers poden contenir còpies del fitxer que no poden ser eliminades, i que\n" "podrien permetre recuperar més endavant el fitxer destruït.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: ha fallat fdatasync()" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: ha fallat fsync()" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: no s’ha pogut rebobinar" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: passada %lu/%lu (%s)…" -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: error en escriure al desplaçament %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: ha fallat lseek()" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: el fitxer és massa gran" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: passada %lu/%lu (%s)…%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: passada %lu/%lu (%s)…%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: ha fallat fstat()" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: el tipus del fitxer no és vàlid" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: el fitxer té una mida negativa" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: error en truncar" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: ha fallat fcntl()" -#: src/shred.c:994 +#: src/shred.c:996 #, 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:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: inici de l’eliminació" # No usa quote(). ivb -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: s’ha reanomenat a «%s»" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: no s’ha pogut eliminar" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: ha estat eliminat" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: no s’ha pogut tancar" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: no s’ha pogut obrir per a escriure" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: el nombre de passades no és vàlid" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "s’han especificat múltiples fonts d’aleatorietat" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: la mida del fitxer no és vàlida" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -10026,15 +10174,14 @@ msgstr "" " o bé: %s -e [OPCIÓ]… [ARGUMENT]…\n" " o bé: %s -i INF-SUP [OPCIÓ]…\n" -#: src/shuf.c:67 +#: src/shuf.c:68 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" # So much for "do one thing and do it well". ivb -#: src/shuf.c:73 -#, fuzzy +#: src/shuf.c:75 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 " @@ -10056,44 +10203,41 @@ msgstr "" " --random-source=FITXER\n" " Obté octets aleatoris del FITXER.\n" " -r, --repeat Permet línies d’eixida repetides.\n" -" -z, --zero-terminated Escriu un octet 0 en lloc de cada caràcter de " -"nova\n" -" línia.\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "hi ha massa línies d’entrada" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "s’han especificat múltiples opcions «-i»" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "el rang d’entrada no és vàlid: %s" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "el nombre de línies no és vàlid: %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "s’han especificat múltiples fitxers d’eixida" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "no es poden combinar les opcions «-e» i «-i»" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" -msgstr "" +msgstr "no hi ha línies a repetir" #: src/sleep.c:44 #, c-format @@ -10121,12 +10265,12 @@ msgstr "" "\n" # Usa quote(). ivb -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "l’interval de temps %s no és vàlid" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "no s’ha pogut llegir el rellotge de temps real" @@ -10136,7 +10280,7 @@ 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" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -10144,7 +10288,7 @@ msgstr "" "Opcions d’ordenació:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -10159,7 +10303,7 @@ msgstr "" " alfanumèrics.\n" " -f, --ignore-case Converteix a majúscules.\n" -#: src/sort.c:443 +#: src/sort.c:444 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -10172,7 +10316,7 @@ msgstr "" " -M, --month-sort Ordena per mesos en anglés:\n" " (desconegut) < JAN < … < DEC.\n" -#: src/sort.c:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" @@ -10180,7 +10324,7 @@ msgstr "" " Compara números en format llegible per als humans\n" " (p.ex. «2K» i «1G»).\n" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -10193,7 +10337,7 @@ msgstr "" " Obté octets aleatoris del FITXER.\n" " -r, --reverse Inverteix el resultat de l’ordenació.\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -10211,7 +10355,7 @@ msgstr "" " «random» (-R).\n" " -V, --version-sort Ordena pel número (de versió) inclós al nom.\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -10219,7 +10363,7 @@ msgstr "" "Altres opcions:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -10228,7 +10372,7 @@ msgstr "" "a\n" " mesclar‐ne més empra fitxers temporals.\n" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -10245,7 +10389,7 @@ msgstr "" " Comprimeix els fitxers temporals amb el PROGRAMA,\n" " els descomprimeix amb «PROGRAMA -d».\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -10263,7 +10407,7 @@ msgstr "" " Si el FITXER és «-», llegeix els noms de l’entrada\n" " estàndard.\n" -#: src/sort.c:487 +#: src/sort.c:488 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -10272,7 +10416,7 @@ msgstr "" " ubicació i el tipus.\n" " -m, --merge Mescla fitxers prèviament ordenats; no ordena.\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -10286,7 +10430,7 @@ msgstr "" " -S, --buffer-size=MIDA\n" " Defineix la MIDA de la memòria intermèdia principal.\n" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -10313,7 +10457,7 @@ msgstr "" " contrari només escriu la primera d’aquelles entrades\n" " que resulten iguals.\n" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -10346,12 +10490,11 @@ msgstr "" "\n" "La MIDA pot anar seguida pels següents sufixs multiplicadors:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -10369,269 +10512,268 @@ msgstr "" # No usa quote() (afortunadament). ivb # Condició d'error. ivb -#: src/sort.c:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "en esperar la finalització de «%s [-d]»" # No usa quote() (afortunadament). ivb -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "«%s [-d]» ha finalitzat de forma anormal" # Usa quote(). ivb -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "no s’ha pogut crear un fitxer temporal a %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "no s’ha pogut obrir" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "ha fallat fflush()" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "no s’ha pogut tancar" # Va seguit del nom del fitxer. ivb -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "no s’ha pogut crear el fitxer temporal" # No usa quote() (afortunadament). ivb -#: src/sort.c:1179 +#: src/sort.c:1178 #, 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:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "avís: no s’ha pogut eliminar: %s" # La segona usa quote(). ivb -#: src/sort.c:1338 +#: src/sort.c:1337 #, 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:1341 +#: src/sort.c:1340 #, 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:1356 +#: src/sort.c:1355 #, 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:1359 +#: src/sort.c:1358 #, 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:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "el nombre d’ordenacions concurrents ha de ser major que zero" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "ha fallat stat()" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "no s’ha pogut llegir" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "ha fallat la transformació de la cadena" # Usa quote(). ivb -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "la cadena sense transformar era %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "^ no s’ha trobat la clau\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, 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:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "es descarta la clau %lu de longitud zero" -#: src/sort.c:2439 +#: src/sort.c:2438 #, 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:2452 +#: src/sort.c:2451 #, 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:2484 +#: src/sort.c:2483 #, 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:2490 +#: src/sort.c:2489 #, 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:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "no s’ha pogut escriure" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: fora d’ordre: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "eixida estàndard d’errors" # Condició d’error, però imprecisa. ivb -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "no es pot llegir" # Usa quote(). ivb -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: l’especifiació de camp no és vàlida: %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "les opcions «%s» no són compatibles" # Usa quote(). ivb -#: src/sort.c:4079 +#: src/sort.c:4078 #, 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:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "el número després de «-» no és vàlid" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "el número després de «.» no és vàlid" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "l’especificació de camp conté un caràcter extraviat" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "s’han especificat múltiples programes de compressió" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "el número a l’inici del camp no és vàlid" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "el número de camp és zero" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "el desplaçament de caràcter és zero" -#: src/sort.c:4448 +#: src/sort.c:4447 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:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "el separador és buit" # Usa quote(). ivb -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, 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:4613 +#: src/sort.c:4612 #, 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:4619 +#: src/sort.c:4618 #, 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:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "s’estan emprant les regles d’ordenació de %s" # Missatge informatiu. ivb -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "s’està emprant la comparació directa d’octets" # Usa quote(). ivb -#: src/sort.c:4699 +#: src/sort.c:4698 #, 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:186 -#, c-format -msgid "the suffix length needs to be at least %zu" +#: src/split.c:207 +#, fuzzy, c-format +msgid "the suffix length needs to be at least %" msgstr "la longitud del sufix ha de ser almenys %zu" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Forma d’ús: %s [OPCIÓ]… [ENTRADA [PREFIX]]\n" -#: src/split.c:207 +#: src/split.c:228 +#, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\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». " @@ -10640,21 +10782,24 @@ msgstr "" # corregir l'opció -C # Ein? ivb -#: src/split.c:215 -#, c-format +#: src/split.c:236 +#, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file names\n" " -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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" " -a, --suffix-length=N Genera sufixs de longitud N (per defecte %d).\n" @@ -10678,7 +10823,7 @@ msgstr "" " -u, --unbuffered Còpia immediatament l’entrada a l’eixida en emprar\n" " «-n r/…».\n" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -10686,16 +10831,17 @@ msgstr "" " --verbose Mostra un missatge abans d’obrir cada fitxer de\n" " sortida.\n" -#: src/split.c:235 +#: src/split.c:258 +#, fuzzy 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" "\n" "TROSSOS pot ser:\n" @@ -10709,188 +10855,195 @@ 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:353 +#: src/split.c:407 #, 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:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "s’està creant el fitxer %s\n" # Usa quote(). ivb -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "%s sobreescriuria l’entrada; s’avorta" # Usa quote(). ivb -#: src/split.c:390 +#: src/split.c:444 #, 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:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "s’està executant amb «FILE=%s»\n" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "no s’ha pogut crear la canonada" # És un missatge d'error. ivb -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "en tancar la canonada anterior" # Condició d'error. ivb -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "en tancar la canonada d’eixida" # Condició d'error. ivb -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "en moure la canonada d’entrada" # Condició d'error. ivb -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "en tancar la canonada d’entrada" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "no s’ha pogut executar l’ordre «%s -c %s»" -#: src/split.c:427 +#: src/split.c:481 #, 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:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "en esperar la finalització del procés fill" -#: src/split.c:473 +#: src/split.c:527 #, 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:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "amb «FILE=%1$s», l’ordre «%3$s» ha eixit amb el codi %2$d" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" -msgstr "el codi d’eixida de l’ordre és desconegut (0x%X)" +msgstr "el codi d’eixida de l’ordre no és conegut (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, 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:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: el nombre de trossos no és vàlid" # K de K/N. ivb -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: el número del tros no és vàlid" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: la longitud del sufix no és vàlida" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: el nombre d’octets no és vàlid" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: el nombre de línies no és vàlid" +# Ambdues usen quote(). ivb +# No és necessàriament una tabulació, ho diu info. ivb +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "%s és un separador multicaràcter" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "fitxer especial de caràcters multiplexat" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "l’opció de nombre de línies «-%s%c…» és massa gran" -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: el valor d’inici per als sufixs numèrics no és vàlid" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: la mida del bloc d’E/S no és vàlida" -#: src/split.c:1347 +#: src/split.c:1437 #, 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:1384 +#: src/split.c:1477 #, 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:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" # Usa quote(). ivb -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "no s’ha pogut trobar el nom canònic de %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "avís: la seqüència d’escapada «\\%c» no és reconeguda" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: la directiva no és vàlida" -#: src/stat.c:1231 +#: src/stat.c:1234 #, 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:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" @@ -10898,20 +11051,20 @@ msgstr "" "fitxers" # Usa quote(). ivb -#: src/stat.c:1269 +#: src/stat.c:1272 #, 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:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -10928,7 +11081,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:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -10939,34 +11092,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:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr " Context: %C\n" # Alineat amb «Modificació:». ivb -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -10978,11 +11131,11 @@ msgstr "" " Canvi: %z\n" " Naixement: %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "Mostra l’estat d’un fitxer o sistema de fitxers.\n" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" @@ -10991,7 +11144,7 @@ msgstr "" " -f, --file-system Mostra l’estat del sistema de fitxers en lloc de\n" " l’estat del fitxer.\n" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -11011,7 +11164,7 @@ msgstr "" " incloeu «\\n» al FORMAT.\n" " -t, --terse Mostra la informació de forma pelada.\n" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -11032,7 +11185,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:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -11048,7 +11201,7 @@ msgstr "" " %g Identificador del grup del propietari.\n" " %G Nom del grup del propietari.\n" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -11076,9 +11229,8 @@ msgstr "" "de\n" " caràcters o blocs.\n" -# Indique «de les dades» i «del node índex», queda més clar. ivb -#: src/stat.c:1461 -#, fuzzy +# Indique «del node índex», queda més clar. ivb +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -11110,7 +11262,7 @@ msgstr "" " %Z Data del darrer canvi al node índex en segons des de l’Època.\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -11128,7 +11280,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:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -11207,11 +11359,11 @@ msgstr "" "pel MODE en octets.\n" #: src/stdbuf.c:116 +#, fuzzy 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" +"for example) then that will override corresponding changes 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 "" @@ -11247,7 +11399,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "cal que especifiqueu una opció de mode de memòria intermèdia" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -11258,11 +11410,11 @@ msgstr "" " o bé: %s [-F DISPOSITIU | --file=DISPOSITIU] [-a|--all]\n" " o bé: %s [-F DISPOSITIU | --file=DISPOSITIU] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "Mostra o canvia les característiques del terminal.\n" -#: src/stty.c:528 +#: src/stty.c:536 msgid "" " -a, --all print all current settings in human-readable form\n" " -g, --save print all current settings in a stty-readable form\n" @@ -11278,7 +11430,7 @@ msgstr "" "de\n" " l’entrada estàndard.\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -11290,12 +11442,25 @@ msgstr "" "no‐POSIX. Les propietats disponibles venen determinades pel sistema " "subjaent.\n" -# El més llarg és «werase CAR». ivb -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +# El més llarg és «werase CAR». ivb +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -11307,9 +11472,13 @@ 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -11319,35 +11488,58 @@ msgstr "" " intr CAR CAR enviarà un senyal d’interrupció.\n" " kill CAR CAR esborrarà la línia actual.\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" msgstr "" -" * lnext CAR CAR entrarà el caràcter següent entrecometat.\n" -" quit CAR CAR enviarà un senyal d’eixir.\n" -" * 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:559 +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 CAR CAR aturarà l’eixida.\n" " susp CAR CAR enviarà un senyal d’aturada de terminal.\n" " * swtch CAR CAR canviarà a una capa d’intèrpret diferent.\n" " * werase CAR CAR esborrarà la darrera paraula escrita.\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 +#, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Propietats especials:\n" +" N Estableix la velocitat d’entrada i eixida a N bauds.\n" +" * cols N Anuncia al nucli que el terminal té N columnes.\n" +" * columns N Equival a «cols N».\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -11357,10 +11549,17 @@ msgstr "" " * cols N Anuncia al nucli que el terminal té N columnes.\n" " * columns N Equival a «cols N».\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -11371,11 +11570,23 @@ msgstr "" " lectura completa.\n" " ospeed N Estableix la velocitat d’eixida a N bauds.\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N Anucia al nucli que el terminal té N files.\n" +" * size Mostra el nombre de files i columnes d’acord amb el nucli.\n" +" speed Mostra la velocitat del terminal.\n" +" time N Amb «-icanon», l’expiració de la lectura esdevé d’N " +"dècimes\n" +" de segon.\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -11386,26 +11597,29 @@ msgstr "" "dècimes\n" " de segon.\n" -#: src/stty.c:584 +#: src/stty.c:641 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" -"Propietats de control:\n" -" [-]clocal Inhabilita els senyals de control del mòdem.\n" -" [-]cread Permet rebre entrada.\n" -" * [-]crtscts Habilita l’establiment de connexió amb RTS/CTS.\n" -" * [-]cdtrdsr Habilita l’establiment de connexió amb DTR/DSR.\n" -" csN Estableix la mida de caràcter a N bits [5..8].\n" + +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" # Stick parity: http://sebhcmaillist.heathkit.garlanger.com/sebhc/2004-July/001015.html ivb -#: src/stty.c:593 +#: src/stty.c:660 +#, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -11413,7 +11627,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb Empra dos bits d’aturada per caràcter (només un amb «-»).\n" " [-]hup S’envia un senyal de penjat quan el darrer procés tanque " @@ -11425,7 +11638,12 @@ msgstr "" " [-]parodd Empra paritat senar (parella amb «-»).\n" " * [-]cmspar Empra paritat fixa (marca o espai).\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -11433,6 +11651,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Propietats de l’entrada:\n" @@ -11442,10 +11661,14 @@ msgstr "" " [-]ignbrk Descarta els caràcters d’interrupció.\n" " [-]igncr Descarta els retorns de carro.\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -11458,16 +11681,27 @@ 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:616 +#: src/stty.c:692 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:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" +" * [-]iutf8 Assumeix que els caràcters d’entrada estan codificats fent\n" +" servir UTF‑8.\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -11483,61 +11717,83 @@ msgstr "" " 255‐0‐caràcter).\n" " [-]tandem Equival a «[-]ixoff»\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Propietats de l’eixida:\n" -" * bsN Estil del retard del retrocés, N en [0..1].\n" -" * crN Estil del retard del retorn de carro, N en [0..3].\n" -" * 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:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" -msgstr "" -" * [-]ocrnl Tradueix els retorns de carro a noves línies.\n" -" * [-]ofdel Empra per a reomplir caràcters d’esborrat en lloc de nuls.\n" -" * [-]ofill Reomple amb caràcters en lloc d’esperar durant els " -"retards.\n" -" * [-]olcuc Tradueix els caràcters en minúscula a majúscula.\n" -" * [-]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:643 -msgid "" -" * [-]onocr do not print carriage returns in the first column\n" -" [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 +msgid "" " * 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 "" -" * [-]onocr No imprimeix retorns de carro a la primera columna.\n" -" [-]opost Postprocessa l’eixida.\n" -" * tabN Estil del retard de la tabulació horitzontal, N en [0..3].\n" -" * tabs Equival a «tab0».\n" -" * -tabs Equival a «tab3».\n" -" * vtN Estil del retard de la tabulació vertical, N en [0..1].\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -11548,48 +11804,65 @@ 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +#, fuzzy +msgid " [-]echo echo input characters\n" +msgstr "" +" * [-]iutf8 Assumeix que els caràcters d’entrada estan codificats fent\n" +" servir UTF‑8.\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]ctlecho Mostra els caràcters de control amb notació d’accent\n" -" circumflex («^c»).\n" -" [-]echo Mostra els caràcters de l’entrada.\n" -" * [-]echoctl Equival a «[-]ctlecho».\n" -" [-]echoe Equival a «[-]crterase».\n" -" [-]echok Mostra una nova línia després del caràcter d’esborrar " -"línia.\n" -#: src/stty.c:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]echoke Equival a «[-]crtkill».\n" -" [-]echonl Mostra les noves línies encara que no es mostren la resta\n" -" dels caràcters.\n" -" * [-]echoprt Mostra entre «\\\\» i «/» els caràcters esborrats amb el\n" -" retrocés.\n" -" [-]icanon Habilita els caràcters especials d’esborrar, esborrar " -"línia,\n" -" esborrar paraula i redibuixar.\n" -" [-]iexten Habilita els caràcters especials no‐POSIX.\n" +" [-]isig Habilita els caràcters especials d’interrupció, eixida i\n" +" aturada de terminal.\n" +" [-]noflsh Inhabilita el buidat després d’haver rebut els caràcters\n" +" especials d’interrupció i eixida.\n" +" * [-]prterase Equival a «[-]echoprt».\n" +" * [-]tostop Para els processos de fons que intenten escriure al " +"terminal.\n" +" * [-]xcase Amb «icanon», escapa amb «\\\\» les majúscules.\n" -#: src/stty.c:672 +#: src/stty.c:843 +#, fuzzy 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 "" " [-]isig Habilita els caràcters especials d’interrupció, eixida i\n" " aturada de terminal.\n" @@ -11600,11 +11873,33 @@ msgstr "" "terminal.\n" " * [-]xcase Amb «icanon», escapa amb «\\\\» les majúscules.\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -11614,12 +11909,12 @@ msgstr "" " cbreak Equival a «-icanon».\n" " -cbreak Equival a «icanon».\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 Posa a llurs valors per defecte els caràcters: brkint " "ignpar\n" @@ -11627,29 +11922,38 @@ msgstr "" " -cooked Equival a «raw».\n" " crt Equival a «echoe echoctl echoke».\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -" dec Equival a «echoe echoctl echoke -ixany intr ^c erase 0177\n" -" kill ^u».\n" -" * [-]decctlq Equival a «[-]ixany».\n" -" ek Posa a llurs valors per defecte els caràcters «kill» i\n" -" «erase».\n" -" evenp Equival a «parenb -parodd cs7».\n" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 +#, fuzzy 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 "" " -evenp Equival a «-parenb cs8».\n" " * [-]lcase Equival a «xcase iuclc olcuc».\n" @@ -11658,7 +11962,19 @@ msgstr "" " nl Equival a «-icrnl -onlcr».\n" " -nl Equival a «icrnl -inlcr -igncr onlcr -ocrnl -onlret».\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"Propietats combinades:\n" +" * [-]LCASE Equival a «[-]lcase».\n" +" cbreak Equival a «-icanon».\n" +" -cbreak Equival a «icanon».\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -11672,11 +11988,12 @@ msgstr "" " pass8 Equival a «-parenb -istrip cs8».\n" " -pass8 Equival a «parenb istrip cs7».\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw Equival a «-ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" @@ -11684,14 +12001,15 @@ msgstr "" " -opost -isig -icanon -xcase min 1 time 0»\n" " -raw Equival a «cooked».\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane Equival a «cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr -" @@ -11702,7 +12020,7 @@ msgstr "" "especials\n" " a llurs valors per defecte.\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -11717,12 +12035,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:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "només es pot especificar un dispositiu" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -11731,50 +12049,55 @@ msgstr "" "les opcions per a mostrar les propietats de forma llegible per humans i per " "«stty» són mútuament excloents" -#: src/stty.c:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, 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:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "l’argument %s no és vàlid" # Totes sis usen quote(). ivb -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "manca un argument per a %s" +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: error en truncar" + # Usa quote(). ivb -#: src/stty.c:987 +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "la disciplina de línia %s no és vàlida" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: no s’han pogut realitzar totes les operacions requerides" -#: src/stty.c:1403 +#: src/stty.c:1747 #, 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:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "l’argument enter %s no és vàlid" #. This is a proper name. See the gettext manual, section Names. @@ -11783,8 +12106,15 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Mostra la suma CRC i la mida en octets de cada FITXER.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -11796,20 +12126,57 @@ msgstr "" "512\n" " octets.\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, fuzzy, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Forma d’ús: %s [OPCIÓ]… [FITXER]…\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Bolca els blocs modificats al disc i actualitza el superbloc.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +# uniq no usa quote(). ivb +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "error en llegir %s" -#: src/sync.c:69 +# Realment el desactiva, no reinicia. ivb +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: no s’ha pogut desactivar el mode no blocador" + +# uniq no usa quote(). ivb +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "error en llegir %s" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "" + +#: src/sync.c:216 #, c-format -msgid "ignoring all arguments" -msgstr "es descarten tots els arguments" +msgid "--data needs at least one argument" +msgstr "" -#: src/system.h:343 +#: src/system.h:337 #, c-format msgid "" "\n" @@ -11823,16 +12190,24 @@ msgstr "" "del\n" "vostre intèrpret quines opcions admet.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help Mostra aquesta ajuda i surt.\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version Mostra informació sobre la versió i surt.\n" +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Sense cap FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n" + # Agafat més o menys de libc. ivb -#: src/system.h:543 +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -11841,8 +12216,7 @@ msgstr "" "Els arguments obligatoris per a les opcions llargues també ho són per a les\n" "opcions curtes corresponents.\n" -#: src/system.h:551 -#, fuzzy +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -11850,14 +12224,13 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" "\n" -"MIDA és un enter amb una unitat opcional (per exemple: 10M és " -"10*1024*1024).\n" -"Les unitats són K, M, G, T, P, E, Z, Y (potències de 1024) o KB, MB, GB, " -"TB,\n" -"PB, EB, ZB, YB (potències de 1000).\n" +"L’argument MIDA és un enter amb una unitat opcional (per exemple: 10K és\n" +"10*1024). Les unitats són K, M, G, T, P, E, Z, Y (potències de 1024) o KB, " +"MB,\n" +"GB, TB, 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:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -11875,7 +12248,7 @@ msgstr "" # Cap de les dues usa quote. ivb # La primera és el nom del programa i la segona una adreça web. ivb -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -11888,24 +12261,28 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "Informeu dels errors de traducció de «%s» a .\n" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -"Per a la documentació completa, executeu «info coreutils '%s invocation'».\n" -#: src/system.h:591 +#: src/system.h:613 #, 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:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -11926,9 +12303,8 @@ msgid "Jay Lepreau" msgstr "Jay Lepreau" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, last line first.\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" @@ -11946,61 +12322,60 @@ msgstr "" "de\n" " nova línia.\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: ha fallat el desplaçament" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "el registre és massa gran" # Usa quote(). ivb -#: src/tac.c:450 +#: src/tac.c:459 #, 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:458 +#: src/tac.c:467 #, 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:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" msgstr "no s’ha pogut rebobinar el flux de %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: error d’escriptura" # Usa quote(). ivb -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "no s’ha pogut obrir %s per a llegir" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "el separador no pot ser buit" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 -#, c-format +#: src/tail.c:257 +#, 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" msgstr "" "Escriu les darreres %d línies de cada FITXER a la sortida estàndard. Amb " "més\n" @@ -12008,7 +12383,7 @@ msgstr "" "cap\n" "FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" @@ -12019,7 +12394,7 @@ msgstr "" "de\n" " cada fitxer.\n" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -12032,7 +12407,7 @@ msgstr "" " -F Equival a «--follow=name --retry».\n" # «-n» cap pq per defecte és 10. ivb -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -12059,7 +12434,7 @@ msgstr "" "Amb\n" " «inotify» aquesta opció no sol ser útil.\n" -#: src/tail.c:293 +#: src/tail.c:288 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -12072,7 +12447,7 @@ msgstr "" " --retry Continua intentant obrir un fitxer si és " "inaccessible.\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -12087,7 +12462,7 @@ msgstr "" " segons.\n" " -v, --verbose Sempre escriu els noms dels fitxers.\n" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -12106,7 +12481,7 @@ msgstr "" "Y.\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -12127,24 +12502,24 @@ msgstr "" # No usa quote(). ivb # Missatge d'error. ivb -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "en tancar «%s» (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, 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:898 +#: src/tail.c:893 #, 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:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -12155,7 +12530,7 @@ msgstr "" # Usa quote(). ivb # FIXME: pretty_name() lacks i18n. ivb -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" @@ -12164,7 +12539,7 @@ msgstr "" # Usa quote(). ivb # FIXME: pretty_name() lacks i18n. ivb -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s ha esdevingut inaccessible" @@ -12172,7 +12547,7 @@ msgstr "%s ha esdevingut inaccessible" # tailable = cuable? ;) # Usa quote(). ivb # FIXME: pretty_name() lacks i18n. ivb -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" @@ -12181,7 +12556,7 @@ msgstr "" # Usa quote(). ivb # FIXME: pretty_name() lacks i18n. ivb -#: src/tail.c:1006 +#: src/tail.c:999 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" @@ -12189,144 +12564,144 @@ msgstr "" # Usa quote(). ivb # FIXME: pretty_name() lacks i18n. ivb -#: src/tail.c:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s ha esdevingut accessible" # Usa quote(). ivb # FIXME: pretty_name() lacks i18n. ivb -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following 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:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s ha estat substituït; es segueix el final del nou fitxer" # Realment el desactiva, no reinicia. ivb -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: no s’ha pogut desactivar el mode no blocador" # FIXME: pretty_name() lacks i18n. ivb -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: el fitxer ha estat truncat" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "no resta cap fitxer" # Usa quote(). ivb -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "no es pot fer un seguiment del directori pare de %s" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "s’han esgotat els recursos d’«inotify»" # Usa quote(). ivb -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "no es pot fer un seguiment de %s" -#: src/tail.c:1529 +# Usa quote(). ivb +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: voleu reemplaçar %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "error en fer un seguiment de l’event d’«inotify»" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "error en llegir l’event d’«inotify»" # FIXME: pretty_name() lacks i18n. ivb -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: no es pot seguir el final d’aquest tipus de fitxer; s’abandona la pista " "d’aquest nom" -# És un enter correcte però massa gran. ivb -# Usa quote(). ivb -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "el número %s és massa gran" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "" "%s: el nombre màxim d’iteracions sense alteracions entre obertures no és " "vàlid" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: el PID no és vàlid" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: el nombre de segons no és vàlid" +# Usa quote(). ivb +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "el nombre de columnes no és vàlid: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "l’opció «%c» no és vàlida en aquest context" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "avís: es descarta «--retry»; «--retry» només és útil en fer seguiments" # Per a «--follow=descriptor» quan manca algun fitxer. ivb -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "avís: «--retry» només té efecte per a obrir per primera volta" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "avís: es descarta el PID; «--pid=PID» només és útil en fer seguiments" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "avís: aquest sistema no permet l’opció «--pid=PID»" # Usa quote(). ivb -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "no es pot seguir %s pel nom" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "avís: seguir indefinidament l’entrada estàndard no és efectiu" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "no es pot emprar «inotify», es recorrerà a l’enquesta" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -12339,63 +12714,75 @@ msgstr "" " -i, --ignore-interrupts\n" " Descarta els senyals d’interrupció.\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Si un dels FITXER és «-», el torna a copiar sobre l’eixida estàndard.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" # Usa quote(). ivb -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "manca un argument després de %s" # Usa quote(). ivb -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "el número enter %s no és vàlid" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "cal «)»" # No usa quote(). ivb -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "cal «)», s’ha trobat «%s»" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: cal un operador unari" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "«-nt» no admet «-l»" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "«-ef» no admet «-l»" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "«-ot» no admet «-l»" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "l’operador binari no és conegut" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: cal un operador binari" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -12409,7 +12796,7 @@ msgstr "" " o bé: [ ]\n" " o bé: [ OPCIÓ\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -12417,7 +12804,7 @@ msgstr "" "Ix amb un codi determinat per l’EXPRESSIÓ.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -12429,7 +12816,7 @@ msgstr "" "falsa i estableix el codi d’eixida. És una de:\n" # El més llarg és «EXPRESSIÓ1 -a EXPRESSIÓ2». ivb -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -12443,7 +12830,7 @@ msgstr "" " EXPRESSIÓ1 -a EXPRESSIÓ2 L’EXPRESSIÓ1 i l’EXPRESSIÓ2 són certes.\n" " EXPRESSIÓ1 -o EXPRESSIÓ2 L’EXPRESSIÓ1 o l’EXPRESSIÓ2 és certa.\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -12459,7 +12846,7 @@ msgstr "" " CADENA1 = CADENA2 Les cadenes són iguals.\n" " CADENA1 != CADENA2 Les cadenes no són iguals.\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -12477,7 +12864,7 @@ msgstr "" " ENTER1 -lt ENTER2 L’ENTER1 és menor que l’ENTER2.\n" " ENTER1 -ne ENTER2 L’ENTER1 no és igual que l’ENTER2.\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -12492,7 +12879,7 @@ msgstr "" " el FITXER2.\n" " FITXER1 -ot FITXER2 El FITXER1 és més antic que el FITXER2.\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -12509,7 +12896,7 @@ msgstr "" " -e FITXER El FITXER existeix.\n" # En «-G» no és necessari posar «ID». ivb -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -12527,7 +12914,7 @@ msgstr "" " permanença.\n" # En «-O» no és necessari posar ID. ivb -#: src/test.c:766 +#: src/test.c:768 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" @@ -12545,7 +12932,7 @@ msgstr "" "que\n" " zero.\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -12563,7 +12950,7 @@ msgstr "" "de\n" " cerca).\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -12578,7 +12965,7 @@ msgstr "" "ENTER\n" "també pot ser «-l CADENA», que s’avalua a la longitud de la CADENA.\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -12590,26 +12977,26 @@ msgstr "" # FIXME: The way this integrates in the message about builtins is language-dependent. ivb # Quin xanxullo!!! ivb -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test» o «[" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "manca «]»" # Usa quote(). ivb -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "sobra l’argument %s" @@ -12632,7 +13019,7 @@ msgstr "avís: ha fallat timer_settime()" msgid "warning: timer_create" msgstr "avís: ha fallat timer_create()" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -12642,14 +13029,14 @@ msgstr "" " o bé: %s [OPCIÓ]\n" # Agafat més o menys de libc. ivb -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" "Llança l’ORDRE i si encara està en marxa passat el temps indicat per la " "DURADA,\n" "la mata.\n" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -12683,7 +13070,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:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -12695,7 +13082,7 @@ msgstr "" "a\n" "segons (per defecte), «m» per a minuts, «h» per a hores i «d» per a dies.\n" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -12717,7 +13104,7 @@ msgstr "" "el\n" "senyal «KILL» (9), el codi d’eixida serà 128+9 en lloc de 124.\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "avís: no s’han pogut inhabilitar els bolcats de memòria" @@ -12732,6 +13119,11 @@ msgstr "error en esperar l’ordre" msgid "the monitored command dumped core" msgstr "l’ordre llançada ha bolcat la seua memòria" +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "el codi d’eixida de l’ordre no és conegut (0x%X)" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -13128,12 +13520,12 @@ msgstr "Ix amb un codi que indica èxit." msgid "Exit with a status code indicating failure." msgstr "Ix amb un codi que indica fallada." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Forma d’ús: %s OPCIÓ… FITXER…\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -13152,18 +13544,18 @@ msgstr "" "octets\n" "zero.\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create No crea cap fitxer.\n" -#: src/truncate.c:112 +#: src/truncate.c:85 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:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" @@ -13173,7 +13565,7 @@ msgstr "" " -s, --size=MIDA Estableix o ajusta la mida dels fitxers a MIDA " "octets.\n" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -13188,68 +13580,74 @@ msgstr "" # Usa quote. ivb # Espere que així quede més clar. ivb -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" "desbordament en (% blocs * % octets/bloc) per al fitxer %s" # Usa quote(). ivb -#: src/truncate.c:173 +#: src/truncate.c:146 #, 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:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "no es pot obtenir la mida de %s" # Usa quote(). ivb -#: src/truncate.c:205 +#: src/truncate.c:178 #, 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:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "desbordament en augmentar la mida del fitxer %s" # Usa quote(). ivb -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "no s’ha pogut truncar %s a % octets" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "s’han especificat múltiples modificadors relatius" +# Usa quote(). ivb +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "el número %s no és vàlid" + # Usa quote() en el ambdós args. ivb -#: src/truncate.c:333 +#: src/truncate.c:307 #, 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:340 +#: src/truncate.c:314 #, 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:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "heu especificat %s però no %s" # Usa quote(). ivb -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "no s’ha pogut obrir %s per a escriure" @@ -13260,12 +13658,10 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Forma d’ús: %s [OPCIÓ] [FITXER]\n" "Escriu una llista totalment ordenada d’acord amb l’ordenació parcial " @@ -13274,12 +13670,17 @@ msgstr "" "estàndard.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: l’entrada conté un nombre senar de components" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: l’entrada conté un cicle:" @@ -13352,9 +13753,8 @@ msgid "cannot get system name" msgstr "no s’ha pogut obtenir el nom del sistema" #: 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" +#, fuzzy +msgid "Convert blanks in each FILE to tabs, writing to standard output.\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" @@ -13420,9 +13820,10 @@ msgstr "" "grup.\n" #: src/uniq.c:187 +#, fuzzy msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" " -D, --all-repeated[=MÈTODE]\n" @@ -13437,9 +13838,10 @@ msgid " -f, --skip-fields=N avoid comparing the first N fields\n" msgstr " -f, --skip-fields=N Evita la comparació dels primers N camps.\n" #: src/uniq.c:195 +#, fuzzy msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" " --group[=MÈTODE] Escriu totes les línies, delimitant els grups " @@ -13450,7 +13852,6 @@ msgstr "" " grup, «append» al darrere i «both» fa ambdues coses.\n" #: src/uniq.c:199 -#, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing\n" " -s, --skip-chars=N avoid comparing the first N characters\n" @@ -13460,9 +13861,6 @@ msgstr "" " minúscules.\n" " -s, --skip-chars=N Evita la comparació dels primers N caràcters.\n" " -u, --unique Només escriu les línies que són úniques.\n" -" -z, --zero-terminated Escriu un octet 0 en lloc de cada caràcter de " -"nova\n" -" línia.\n" #: src/uniq.c:207 msgid " -w, --check-chars=N compare no more than N characters in lines\n" @@ -13615,11 +14013,6 @@ msgstr "" " Els processos en estat de parada ininterrompible\n" "també contribueixen a la càrrega mitjana.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - # No usa quote() en cap dels dos args. ivb #: src/uptime.c:214 #, c-format @@ -13644,14 +14037,19 @@ msgstr "" "com a FITXER.\n" "\n" +#: src/wc.c:118 +msgid "" +"Print newline, word, and byte counts for each FILE, and a total line if\n" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + # afegir una línia en blanc entre la descripció i les opcions # Ja està. ivb -#: src/wc.c:117 +#: src/wc.c:126 +#, fuzzy msgid "" -"Print newline, word, and byte counts for each FILE, and a total line if\n" -"more than one FILE is specified. With no FILE, or when FILE is -,\n" -"read standard input. A word is a non-zero-length sequence of characters\n" -"delimited by white space.\n" +"\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" @@ -13674,12 +14072,13 @@ msgstr "" " -m, --chars Escriu el nombre de caràcters.\n" " -l, --lines Escriu el nombre de caràcters de nova línia.\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=FITXER\n" @@ -13874,10 +14273,10 @@ msgstr "" "actualment. Equival a «id -un».\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: no s’ha pogut trobar el nom de l’ID d’usuari %lu\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "no s’ha pogut trobar el nom de l’ID d’usuari %s" #: src/yes.c:41 #, c-format @@ -13896,122 +14295,240 @@ msgstr "" "Mostra repetidament una línia amb totes les cadenes indicades, o «y».\n" "\n" -# Condició d’error. ivb -#~ msgid "cannot create pipe" -#~ msgstr "no s’ha pogut crear la canonada" +#~ msgid "input line is too short, no numbers found to convert in field %ld" +#~ msgstr "" +#~ "la línia d’entrada és massa curta i no inclou un camp %ld amb un número a " +#~ "convertir" -# Cap empra quote(). ivb -#~ msgid "%s subprocess failed" -#~ msgstr "el subprocés «%s» ha fallat" +# Acaba pr i encara estic viu! Vaig a prendre una aspirina... ivb +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "L’opció «-t» és implícita quan LLARG_PÀG és menor o igual que 10. Sense\n" +#~ "FITXER, o quan FITXER és «-», llegeix l’entrada estàndard.\n" -# És una funció. ivb -#~ msgid "_open_osfhandle failed" -#~ msgstr "ha fallat _open_osfhandle()" +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Sense cap FITXER, o quan FITXER és «-», llegeix l’entrada estàndard. " +#~ "Per\n" +#~ "defecte s’empra «-F /».\n" -#~ msgid "cannot restore fd %d: dup2 failed" +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" #~ msgstr "" -#~ "no s’ha pogut restaurar el descriptor de fitxer %d: ha fallat dup2()" +#~ "Bolca els blocs modificats al disc i actualitza el superbloc.\n" +#~ "\n" -# Condició d’error. ivb -# No empra quote(). ivb -#~ msgid "%s subprocess" -#~ msgstr "subprocés «%s»" +#~ msgid "ignoring all arguments" +#~ msgstr "es descarten tots els arguments" -# Condició d’error. ivb -# No empra quote(). ivb -#~ msgid "%s subprocess got fatal signal %d" -#~ msgstr "el subprocés «%s» ha rebut el senyal fatal %d" +#~ msgid "%s: invalid number" +#~ msgstr "%s: el número no és vàlid" -#~ msgid "failed to set additional groups" -#~ msgstr "no s’han pogut establir els grups suplementaris" +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s és tan gran que no es pot representar" -# Usa quote(). ivb -#~ msgid "mount point %s already traversed" -#~ msgstr "el punt de muntatge %s ja ha estat recorregut" +#~ msgid "number of lines" +#~ msgstr "el nombre de línies" -#~ msgid "%s: cannot lseek back to original position" -#~ msgstr "%s: no s’ha pogut desplaçar fins a la posició original" +#~ msgid "number of bytes" +#~ msgstr "el nombre d’octets" -#~ msgid "%s: failed to reset file pointer" -#~ msgstr "%s: no s’ha pogut reiniciar el punter del fitxer" +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: el nombre d’unitats de processament a excloure no és vàlid" +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: el nombre d’octets no és vàlid" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: el nombre de línies no és vàlid" + +# És un enter correcte però massa gran. ivb # Usa quote(). ivb -#~ msgid "cannot reposition file pointer for %s" -#~ msgstr "no s’ha pogut recol·locar el punter del fitxer de %s" +#~ msgid "number in %s is too large" +#~ msgstr "el número %s és massa gran" +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: el nombre de segons no és vàlid" + +# FIXME Language-dependent sentence construction. ivb +# FIXME The inserted terms "set" and "clear" have no i18n. ivb +#~ msgid "failed to %s supplemental groups" +#~ msgstr "no s’han pogut %s els grups suplementaris" + +# La substitució pot ser «USR1» o «INFO». ivb #~ msgid "" -#~ " -Z, --context[=CTX] set the SELinux security context of each NAME to\n" -#~ " default type, or CTX if specified\n" +#~ "\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 "" -#~ " -Z, --context[=CONTEXT]\n" -#~ " Estableix el context de seguretat de SELinux de " -#~ "cada\n" -#~ " NOM al tipus per defecte, o al CONTEXT si " -#~ "s’especifica.\n" +#~ "\n" +#~ "Enviar un senyal %s a un procés «dd» en marxa fa que mostre una " +#~ "estadística\n" +#~ "d’entrada/eixida a l’eixida estàndard d’errors, i que després continue\n" +#~ "copiant.\n" +#~ "\n" +#~ " $ dd if=/dev/zero of=/dev/null& pid=$!\n" +#~ " $ kill -%s $pid; sleep 1; kill $pid\n" +#~ " 18335302+0 registres llegits\n" +#~ " 18335302+0 registres escrits\n" +#~ " 9387674624 octets (9,4 GB) copiats, 34,6279 segons, 271 MB/s\n" +#~ "\n" +#~ "Les opcions són:\n" +#~ "\n" #~ msgid "" -#~ " -Z, --context[=CTX] set the SELinux security context of NAME to\n" -#~ " default type, or to CTX if specified\n" +#~ " * 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 "" -#~ " -Z, --context[=CONTEXT]\n" -#~ " Estableix el context de seguretat de SELinux del " -#~ "NOM al\n" -#~ " tipus per defecte, o al CONTEXT si s’especifica.\n" - -#~ msgid "out of memory (requested %zu bytes)" -#~ msgstr "no resta memòria (s’han demanat %zu octets)" - -#~ msgid "--padding cannot be combined with --format" -#~ msgstr "no es poden combinar «--padding» i «--format»" +#~ " * lnext CAR CAR entrarà el caràcter següent entrecometat.\n" +#~ " quit CAR CAR enviarà un senyal d’eixir.\n" +#~ " * rprnt CAR CAR redibuixarà la línia actual.\n" +#~ " start CAR CAR reiniciarà l’eixida després d’haver‐la aturat.\n" #~ msgid "" -#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n" -#~ " or: %s LONG-OPTION\n" +#~ "\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 "" -#~ "Forma d’ús: %s [OPCIÓ_CURTA]… USUARI ORDRE [ARGUMENT]…\n" -#~ " o bé: %s OPCIÓ_LLARGA\n" +#~ "\n" +#~ "Propietats de control:\n" +#~ " [-]clocal Inhabilita els senyals de control del mòdem.\n" +#~ " [-]cread Permet rebre entrada.\n" +#~ " * [-]crtscts Habilita l’establiment de connexió amb RTS/CTS.\n" +#~ " * [-]cdtrdsr Habilita l’establiment de connexió amb DTR/DSR.\n" +#~ " csN Estableix la mida de caràcter a N bits [5..8].\n" #~ 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" +#~ "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 "" -#~ "Abandona els grups suplementaris, assumeix els identificadors d’usuari i " -#~ "grup\n" -#~ "de l’USUARI indicat (per número o per nom), i executa l’ORDRE amb els\n" -#~ "ARGUMENTs especificats. Ix amb codi 111 si no pot assumir els " -#~ "identificadors\n" -#~ "d’usuari o grup requerits. En cas contrari ix amb el codi d’eixida de\n" -#~ "l’ORDRE. Aquest programa només és d’utilitat quan l’executa root (que " -#~ "té\n" -#~ "identificador d’usuari 0).\n" #~ "\n" +#~ "Propietats de l’eixida:\n" +#~ " * bsN Estil del retard del retrocés, N en [0..1].\n" +#~ " * crN Estil del retard del retorn de carro, N en [0..3].\n" +#~ " * 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" #~ msgid "" -#~ " -g GID[,GID1...] also set the primary group-ID to the numeric GID, " -#~ "and\n" -#~ " (if specified) supplemental group IDs to GID1, ...\n" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" #~ msgstr "" -#~ " -g GID,[GID1…] Estableix també el grup primari al GID numèric i, " -#~ "si\n" -#~ " s’indiquen, els grups suplementaris a GID1…\n" +#~ " * [-]ocrnl Tradueix els retorns de carro a noves línies.\n" +#~ " * [-]ofdel Empra per a reomplir caràcters d’esborrat en lloc de " +#~ "caràcters\n" +#~ " NUL.\n" +#~ " * [-]ofill Reomple amb caràcters en lloc d’esperar durant els " +#~ "retards.\n" +#~ " * [-]olcuc Tradueix els caràcters en minúscula a majúscula.\n" +#~ " * [-]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" -# Usa quote(). ivb -#~ msgid "unknown user-ID: %s" -#~ msgstr "l’identificador d’usuari no és conegut: %s" +#~ 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 "" +#~ " * [-]onocr No imprimeix retorns de carro a la primera columna.\n" +#~ " [-]opost Postprocessa l’eixida.\n" +#~ " * tabN Estil del retard de la tabulació horitzontal, N en " +#~ "[0..3].\n" +#~ " * tabs Equival a «tab0».\n" +#~ " * -tabs Equival a «tab3».\n" +#~ " * vtN Estil del retard de la tabulació vertical, N en [0..1].\n" -# Usa quote(). ivb -#~ msgid "to use user-ID %s you need to use -g too" +#~ 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 "" -#~ "per a emprar l’identificador d’usuari %s també heu d’emprar l’opció «-g»" +#~ " * [-]ctlecho Mostra els caràcters de control amb notació d’accent\n" +#~ " circumflex («^c»).\n" +#~ " [-]echo Mostra els caràcters de l’entrada.\n" +#~ " * [-]echoctl Equival a «[-]ctlecho».\n" +#~ " [-]echoe Equival a «[-]crterase».\n" +#~ " [-]echok Mostra una nova línia després del caràcter d’esborrar " +#~ "línia.\n" -#~ msgid "cannot set group-ID to %lu" -#~ msgstr "no s’ha pogut establir l’identificador de grup a %lu" +#~ 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 "" +#~ " * [-]echoke Equival a «[-]crtkill».\n" +#~ " [-]echonl Mostra les noves línies encara que no es mostren la " +#~ "resta\n" +#~ " dels caràcters.\n" +#~ " * [-]echoprt Mostra entre «\\\\» i «/» els caràcters esborrats amb " +#~ "el\n" +#~ " retrocés.\n" +#~ " [-]icanon Habilita els caràcters especials d’esborrar, esborrar " +#~ "línia,\n" +#~ " esborrar paraula i redibuixar.\n" +#~ " [-]iexten Habilita els caràcters especials no‐POSIX.\n" + +#~ 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 "" +#~ " dec Equival a «echoe echoctl echoke -ixany intr ^c erase " +#~ "0177\n" +#~ " kill ^u».\n" +#~ " * [-]decctlq Equival a «[-]ixany».\n" +#~ " ek Posa a llurs valors per defecte els caràcters «kill» i\n" +#~ " «erase».\n" +#~ " evenp Equival a «parenb -parodd cs7».\n" + +#~ msgid "For complete documentation, run: info coreutils '%s invocation'\n" +#~ msgstr "" +#~ "Per a la documentació completa, executeu «info coreutils '%s " +#~ "invocation'».\n" -#~ msgid "cannot set user-ID to %lu" -#~ msgstr "no s’ha pogut establir l’identificador d’usuari %lu" +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: no s’ha pogut trobar el nom de l’ID d’usuari %lu\n" diff --git a/po/coreutils.pot b/po/coreutils.pot index e64a18ed..0f2f7ca8 100644 --- a/po/coreutils.pot +++ b/po/coreutils.pot @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#: src/stty.c:941 #, fuzzy msgid "" msgstr "" -"Project-Id-Version: GNU coreutils 8.23\n" +"Project-Id-Version: GNU coreutils 8.24\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -36,18 +37,18 @@ msgstr "" msgid "error closing file" msgstr "" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "" @@ -228,57 +229,62 @@ msgstr "" msgid "Unknown error" msgstr "" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "" @@ -288,13 +294,13 @@ msgstr "" msgid "cannot change permissions of %s" msgstr "" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "" @@ -343,6 +349,12 @@ msgstr "" msgid "%s: end of file" msgstr "" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "" + #: lib/regcomp.c:131 msgid "Success" msgstr "" @@ -450,7 +462,7 @@ msgstr "" msgid "^[nN]" msgstr "" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "" @@ -856,7 +868,7 @@ msgid "" "Base64 encode or decode FILE, or standard input, to standard output.\n" msgstr "" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -866,13 +878,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -881,51 +887,51 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, 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:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "" @@ -962,38 +968,41 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "" #: src/cat.c:92 +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" + +#: src/cat.c:98 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" @@ -1003,7 +1012,7 @@ msgid "" " -s, --squeeze-blank suppress repeated empty output lines\n" msgstr "" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1011,7 +1020,7 @@ msgid "" " -v, --show-nonprinting use ^ and M- notation, except for LFD and TAB\n" msgstr "" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1020,17 +1029,18 @@ msgid "" " %s Copy standard input to standard output.\n" msgstr "" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "" @@ -1042,10 +1052,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "" @@ -1059,8 +1069,8 @@ msgstr "" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "" @@ -1075,13 +1085,13 @@ msgstr "" msgid "failed to change context of %s to %s" msgstr "" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "" @@ -1097,7 +1107,7 @@ msgstr "" msgid "fts_read failed" msgstr "" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1181,7 +1191,7 @@ msgid "-R -h requires -P" msgstr "" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1198,9 +1208,8 @@ msgid "conflicting security context specifiers given" msgstr "" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "" @@ -1456,77 +1465,89 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" " or: %s OPTION\n" msgstr "" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" msgstr "" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" msgstr "" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, c-format msgid "failed to get supplemental groups" msgstr "" -#: src/chroot.c:395 +#: src/chroot.c:412 #, c-format -msgid "failed to %s supplemental groups" +msgid "failed to set supplemental groups" msgstr "" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "" @@ -1563,7 +1584,13 @@ msgstr "" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1571,7 +1598,7 @@ msgid "" "and column three contains lines common to both files.\n" msgstr "" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1579,7 +1606,7 @@ msgid "" " -3 suppress column 3 (lines that appear in both files)\n" msgstr "" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1587,17 +1614,17 @@ msgid "" " --nocheck-order do not check that the input is correctly sorted\n" msgstr "" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1606,309 +1633,323 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" msgstr "" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:191 src/copy.c:554 #, c-format -msgid "cannot lseek %s" +msgid "error deallocating %s" +msgstr "" + +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 +#, c-format +msgid "error reading %s" msgstr "" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "" -#: src/copy.c:323 +#: src/copy.c:302 +#, c-format +msgid "overflow reading %s" +msgstr "" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "" -#: src/copy.c:1580 +#: src/copy.c:1669 #, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "" -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "" -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr "" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "" -#: src/copy.c:2107 +#: src/copy.c:2187 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "" -#: src/copy.c:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, c-format +msgid "warning: source directory %s specified more than once" +msgstr "" + +#: src/copy.c:2294 #, c-format msgid "will not create hard link %s to directory %s" msgstr "" -#: src/copy.c:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" -#: src/copy.c:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "" @@ -1918,25 +1959,25 @@ msgstr "" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, c-format msgid "unknown program %s" msgstr "" @@ -2120,8 +2161,8 @@ msgstr "" msgid "failed to access %s" msgstr "" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "" @@ -2193,137 +2234,142 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr "" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "" -#: src/csplit.c:1200 +#: src/csplit.c:1201 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "" -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +msgid "invalid number" msgstr "" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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:1490 +#: src/csplit.c:1485 +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2331,26 +2377,21 @@ msgid "" " -k, --keep-files do not remove output files on errors\n" msgstr "" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 msgid "" "\n" +"Each PATTERN may be:\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" @@ -2374,14 +2415,14 @@ msgstr "" msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" -#: src/cut.c:182 +#: src/cut.c:183 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:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2389,20 +2430,20 @@ msgid "" " -n (ignored)\n" msgstr "" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" -#: src/cut.c:197 +#: src/cut.c:198 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:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2410,7 +2451,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:210 +#: src/cut.c:211 msgid "" "Each range is one of:\n" "\n" @@ -2418,64 +2459,63 @@ msgid "" " 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:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "" -#: src/cut.c:790 +#: src/cut.c:789 msgid "an input delimiter may be specified only when operating on fields" msgstr "" -#: src/cut.c:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" msgstr "" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "" @@ -2492,34 +2532,48 @@ 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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" msgstr "" -#: src/date.c:142 +#: src/date.c:138 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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" -#: src/date.c:147 +#: src/date.c:145 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 (UTC)\n" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" +msgstr "" + +#: src/date.c:149 +msgid "" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" +msgstr "" + +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" msgstr "" #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2527,7 +2581,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2535,7 +2589,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2543,14 +2597,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:177 +#: src/date.c:183 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 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2558,7 +2612,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2566,7 +2620,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2577,7 +2631,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2585,7 +2639,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:209 +#: src/date.c:215 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" @@ -2593,7 +2647,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2601,7 +2655,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2613,7 +2667,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2624,7 +2678,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2633,7 +2687,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -2647,35 +2701,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "" -#: src/date.c:430 +#: src/date.c:436 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "" -#: src/date.c:437 +#: src/date.c:443 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" -#: src/date.c:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2683,30 +2737,30 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" " or: %s OPTION\n" msgstr "" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -2717,7 +2771,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:570 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2726,11 +2780,13 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -2741,7 +2797,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -2756,7 +2812,7 @@ msgid "" " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2766,7 +2822,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2775,123 +2831,103 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 +#: src/dd.c:661 #, 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:676 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:698 +#: src/dd.c:721 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "" -msgstr[1] "" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "" @@ -2905,164 +2941,178 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr "" -#: src/dd.c:877 +#: src/dd.c:809 +#, c-format +msgid ", %.6f s, %s/s" +msgstr "" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "" +msgstr[1] "" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "" -#: src/dd.c:1294 -msgid "invalid status flag" -msgstr "" - -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" +#: src/dd.c:1385 +msgid "invalid status level" msgstr "" -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" " of mt_type=0x%0lx -- see for the list of types" msgstr "" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, 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:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "" @@ -3143,12 +3193,12 @@ msgstr "" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3156,18 +3206,18 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3176,20 +3226,30 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:1409 +#: src/df.c:1429 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" +msgstr "" + +#: src/df.c:1435 +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" + +#: src/df.c:1439 +msgid "" " -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:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3197,25 +3257,25 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "" -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "" @@ -3305,7 +3365,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3313,7 +3373,8 @@ msgid "" msgstr "" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" #: src/du.c:291 @@ -3397,61 +3458,55 @@ msgstr "" msgid "Infinity" msgstr "" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "" @@ -3561,9 +3616,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" #: src/expand.c:114 @@ -3603,7 +3656,7 @@ msgid "input line is too long" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "" @@ -3709,12 +3762,12 @@ msgstr "" msgid "non-integer argument" msgstr "" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "" @@ -3725,38 +3778,38 @@ msgid "the strings compared were %s and %s" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" " or: %s OPTION\n" msgstr "" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -3795,7 +3848,7 @@ msgid "" "The option -WIDTH is an abbreviated form of --width=DIGITS.\n" msgstr "" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -3803,7 +3856,7 @@ msgid "" " -s, --split-only split long lines, but do not refill\n" msgstr "" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -3812,34 +3865,30 @@ msgid "" " -g, --goal=WIDTH goal width (default of 93% of width)\n" msgstr "" -#: src/fmt.c:359 +#: src/fmt.c:356 #, 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" +#: src/fmt.c:400 src/fmt.c:407 +msgid "invalid width" msgstr "" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" -#: src/fold.c:77 +#: src/fold.c:76 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" +#: src/fold.c:283 src/pr.c:831 +msgid "invalid number of columns" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -3906,14 +3955,13 @@ msgstr "" msgid "%s: no such user" msgstr "" -#: src/head.c:109 +#: src/head.c:110 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 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -3923,13 +3971,13 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:125 +#: src/head.c:126 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 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -3937,48 +3985,36 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "" -#: src/head.c:886 +#: src/head.c:267 #, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "" - -#: src/head.c:887 -msgid "number of lines" -msgstr "" - -#: src/head.c:887 -msgid "number of bytes" +msgid "%s: number of bytes is too large" msgstr "" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "" @@ -4145,7 +4181,7 @@ msgstr "" msgid "cannot set time stamps for %s" msgstr "" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "" @@ -4261,7 +4297,7 @@ msgstr "" msgid "target directory not allowed when installing a directory" msgstr "" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "" @@ -4296,15 +4332,19 @@ msgstr "" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +msgid "" "\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:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -4312,7 +4352,7 @@ msgid "" " -t CHAR use CHAR as input and output field separator\n" msgstr "" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -4324,11 +4364,11 @@ msgid "" " print them without trying to pair them\n" msgstr "" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -4347,47 +4387,47 @@ msgid "" "warning message will be given.\n" msgstr "" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "" @@ -4451,17 +4491,17 @@ msgstr "" msgid "no process ID specified" msgstr "" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -4608,7 +4648,7 @@ msgstr "" msgid "FIXME: unknown" msgstr "" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "" @@ -4619,7 +4659,7 @@ msgid "" "\n" msgstr "" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "" @@ -4629,7 +4669,7 @@ msgstr "" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "" @@ -4638,100 +4678,98 @@ msgstr "" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +msgid "invalid line width" msgstr "" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +msgid "invalid tab size" msgstr "" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "" -#: src/ls.c:4781 +#: src/ls.c:4775 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:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -4740,7 +4778,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -4754,18 +4792,19 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4798 msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -4775,11 +4814,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -4788,7 +4827,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -4796,7 +4835,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -4809,7 +4848,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -4821,7 +4860,7 @@ msgid "" " -k, --kibibytes default to 1024-byte blocks for disk usage\n" msgstr "" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -4831,7 +4870,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -4842,7 +4881,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -4854,7 +4893,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -4862,21 +4901,21 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4886 +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -4890,31 +4929,32 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4908 +#: src/ls.c:4904 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:4912 +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4919 +#: src/ls.c:4915 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 security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -4923,7 +4963,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -4952,39 +4992,40 @@ msgstr "" 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 +#: src/md5sum.c:175 msgid "" +"\n" " -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" +#: src/md5sum.c:180 +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr "" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -4996,97 +5037,98 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -5116,22 +5158,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" msgstr "" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -5300,7 +5342,7 @@ msgstr "" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" @@ -5411,9 +5453,7 @@ 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" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" #: src/nl.c:186 @@ -5486,27 +5526,23 @@ msgstr "" msgid "invalid footer numbering style: %s" msgstr "" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +msgid "invalid starting line number" msgstr "" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +msgid "invalid line number increment" msgstr "" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +msgid "invalid line number of blank lines" msgstr "" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +msgid "invalid line number field width" msgstr "" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "" @@ -5528,7 +5564,7 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -5540,43 +5576,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "" @@ -5598,96 +5634,93 @@ msgid "" " --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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, c-format msgid "invalid number: %s" msgstr "" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" msgstr "" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, c-format msgid "invalid unit size: %s" msgstr "" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -5695,19 +5728,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -5717,40 +5750,40 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" msgstr "" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -5759,7 +5792,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -5767,7 +5800,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -5775,7 +5808,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -5783,7 +5816,19 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -5792,9 +5837,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -5806,7 +5852,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -5821,118 +5867,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid precision in format %s" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1126 +#, c-format +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" +msgstr "" + +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, c-format msgid "invalid suffix in input %s: %s" msgstr "" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, c-format -msgid "input line is too short, no numbers found to convert in field %ld" +msgid "invalid field value %s" msgstr "" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, c-format msgid "invalid padding value %s" msgstr "" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, c-format -msgid "invalid field value %s" +msgid "multiple field specifications" msgstr "" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, c-format msgid "invalid header value %s" msgstr "" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5941,18 +5999,17 @@ msgid "" "[b]]\n" msgstr "" -#: src/od.c:326 +#: src/od.c:327 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:333 +#: src/od.c:335 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" @@ -5961,7 +6018,7 @@ msgid "" "suffixes may be . for octal and b for multiply by 512.\n" msgstr "" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -5970,7 +6027,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -5983,7 +6040,7 @@ msgid "" " --traditional accept arguments in third form above\n" msgstr "" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -5994,7 +6051,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6004,7 +6061,7 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -6013,7 +6070,7 @@ msgid "" " c printable character or backslash escape\n" msgstr "" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6022,7 +6079,7 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -6031,14 +6088,14 @@ msgid "" "for sizeof(double) or L for sizeof(long double).\n" msgstr "" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -6051,55 +6108,55 @@ msgid "" "and so on for G, T, P, E, Z, Y.\n" msgstr "" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte integral type" msgstr "" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte floating point type" msgstr "" -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" msgstr "" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "" -#: src/od.c:1650 +#: src/od.c:1658 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "" @@ -6118,7 +6175,6 @@ msgstr "" 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 @@ -6250,12 +6306,12 @@ msgstr "" msgid "Where" msgstr "" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6265,7 +6321,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6274,7 +6330,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -6282,96 +6338,91 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:597 +#: src/pinky.c:596 #, 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 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +msgid "'-N NUMBER' invalid starting line number" msgstr "" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +msgid "'-o MARGIN' invalid line offset" msgstr "" -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "" -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "" -#: src/pr.c:1096 +#: src/pr.c:1059 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" -#: src/pr.c:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" -#: src/pr.c:1196 +#: src/pr.c:1166 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6381,7 +6432,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6391,7 +6442,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6403,7 +6454,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -6416,16 +6467,21 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2798 +#: src/pr.c:2769 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2775 +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -6435,7 +6491,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -6444,7 +6500,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -6455,17 +6511,22 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2828 +#: src/pr.c:2802 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6479,7 +6540,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -6488,13 +6549,6 @@ msgid "" " with -S or -s\n" msgstr "" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" - #: src/printenv.c:62 #, c-format msgid "" @@ -6619,15 +6673,20 @@ msgid "" "files.\n" msgstr "" -#: src/ptx.c:1830 +#: src/ptx.c:1831 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:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -6635,7 +6694,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -6645,7 +6704,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -6653,17 +6712,16 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -6687,7 +6745,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "" @@ -6707,8 +6765,8 @@ msgstr "" msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "" @@ -6898,15 +6956,15 @@ msgstr "" #: src/rm.c:342 #, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "" msgstr[1] "" #: src/rm.c:345 #, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "" msgstr[1] "" @@ -7084,12 +7142,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -7105,7 +7163,13 @@ msgid "" "for even very expensive hardware probing to recover the data.\n" msgstr "" -#: src/shred.c:177 +#: src/shred.c:174 +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7114,7 +7178,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -7123,11 +7187,9 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:192 +#: src/shred.c:196 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.\n" @@ -7139,7 +7201,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -7150,7 +7212,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7162,7 +7224,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7171,7 +7233,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -7183,134 +7245,132 @@ msgid "" "\n" msgstr "" -#: src/shred.c:241 +#: src/shred.c:243 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:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "" -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +msgid "invalid number of passes" msgstr "" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +msgid "invalid file size" msgstr "" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -7318,11 +7378,11 @@ msgid "" " or: %s -i LO-HI [OPTION]...\n" msgstr "" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -7333,37 +7393,36 @@ msgid "" " -r, --repeat output lines can be repeated\n" msgstr "" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +msgid "invalid input range" msgstr "" -#: src/shuf.c:465 +#: src/shuf.c:459 #, c-format -msgid "invalid line count %s" +msgid "invalid line count: %s" msgstr "" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -7382,12 +7441,12 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "" @@ -7396,13 +7455,13 @@ msgstr "" msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -7410,19 +7469,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:443 +#: src/sort.c:444 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:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -7430,7 +7489,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7440,19 +7499,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -7461,7 +7520,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7470,13 +7529,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -7484,7 +7543,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7499,7 +7558,7 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -7518,477 +7577,477 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:524 +#: src/sort.c:525 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:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "" msgstr[1] "" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "" -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" msgstr "" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 +#: src/split.c:224 #, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "" -#: src/split.c:207 +#: src/split.c:228 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +msgid "invalid number of chunks" msgstr "" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +msgid "invalid chunk number" +msgstr "" + +#: src/split.c:1259 +msgid "invalid suffix length" msgstr "" -#: src/split.c:1169 +#: src/split.c:1333 #, c-format -msgid "%s: invalid suffix length" +msgid "empty record separator" msgstr "" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1344 #, c-format -msgid "%s: invalid number of bytes" +msgid "multi-character separator %s" msgstr "" -#: src/split.c:1213 src/split.c:1360 +#: src/split.c:1352 #, c-format -msgid "%s: invalid number of lines" +msgid "multiple separator characters specified" msgstr "" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "" -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +msgid "invalid IO block size" msgstr "" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, c-format msgid "%s: cannot determine file size" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -7999,7 +8058,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8007,30 +8066,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8038,17 +8097,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8058,7 +8117,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -8070,7 +8129,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8080,7 +8139,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8093,7 +8152,7 @@ msgid "" " %T minor device type in hex, for character/block device special files\n" msgstr "" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8108,7 +8167,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8119,7 +8178,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -8174,8 +8233,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -8200,7 +8258,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8208,96 +8266,149 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 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:535 +#: src/stty.c:543 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:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +msgid "" " 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 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:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" msgstr "" -#: src/stty.c:559 +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" + +#: src/stty.c:614 +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 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:578 +#: src/stty.c:632 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" +msgstr "" + +#: src/stty.c:637 +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:584 +#: src/stty.c:641 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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -8305,10 +8416,13 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -8316,135 +8430,249 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +msgid "" " [-]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:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:619 +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +msgid "" " [-]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:627 +#: src/stty.c:712 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:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]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:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +msgid "" " * 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr "" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:672 +#: src/stty.c:843 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" +msgstr "" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:875 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:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -#: src/stty.c:699 +#: src/stty.c:919 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:707 +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8453,25 +8681,27 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8480,57 +8710,61 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "" -#: src/stty.c:987 +#: src/stty.c:1283 +#, c-format +msgid "%s: error setting %s" +msgstr "" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +msgid "invalid integer argument" msgstr "" #. This is a proper name. See the gettext manual, section Names. @@ -8539,25 +8773,64 @@ msgid "Kayvan Aghaiepour" msgstr "" #: src/sum.c:62 +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" + +#: src/sum.c:68 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 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" +"\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" msgstr "" -#: src/sync.c:69 +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 #, c-format -msgid "ignoring all arguments" +msgid "error opening %s" msgstr "" -#: src/system.h:343 +#: src/sync.c:124 +#, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "" + +#: src/sync.c:154 +#, c-format +msgid "error syncing %s" +msgstr "" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "" + +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -8566,21 +8839,27 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr "" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr "" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -8588,7 +8867,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -8597,7 +8876,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -8608,22 +8887,27 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -#: src/system.h:591 +#: src/system.h:613 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -8639,9 +8923,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" #: src/tac.c:144 @@ -8651,66 +8933,65 @@ msgid "" " -s, --separator=STRING use STRING as the separator instead of newline\n" msgstr "" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "" -#: src/tac.c:450 +#: src/tac.c:459 #, c-format msgid "failed to create temporary file in %s" msgstr "" -#: src/tac.c:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" msgstr "" -#: src/tac.c:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" msgstr "" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "" -#: src/tail.c:262 +#: src/tail.c:257 #, 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 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -8718,7 +8999,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -8731,14 +9012,14 @@ msgid "" " with inotify, this option is rarely useful\n" msgstr "" -#: src/tail.c:293 +#: src/tail.c:288 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 if it is inaccessible\n" msgstr "" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -8747,7 +9028,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -8758,7 +9039,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -8768,169 +9049,167 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "" -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" -#: src/tail.c:1006 +#: src/tail.c:999 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" -#: src/tail.c:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "" -#: src/tail.c:1035 +#: src/tail.c:1032 #, c-format -msgid "%s has appeared; following end of new file" +msgid "%s has appeared; following new file" msgstr "" -#: src/tail.c:1046 +#: src/tail.c:1042 #, c-format -msgid "%s has been replaced; following end of new file" +msgid "%s has been replaced; following new file" msgstr "" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "" -#: src/tail.c:1529 +#: src/tail.c:1513 #, c-format -msgid "error monitoring inotify event" +msgid "%s was replaced" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1577 #, c-format -msgid "error reading inotify event" +msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1844 +#: src/tail.c:1597 #, c-format -msgid "%s: cannot follow end of this type of file; giving up on this name" +msgid "error reading inotify event" msgstr "" -#: src/tail.c:1961 +#: src/tail.c:1902 #, c-format -msgid "number in %s is too large" +msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +msgid "invalid maximum number of unchanged stats between opens" msgstr "" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +msgid "invalid PID" msgstr "" -#: src/tail.c:2068 +#: src/tail.c:2107 #, c-format -msgid "%s: invalid number of seconds" +msgid "invalid number of seconds: %s" msgstr "" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -8938,58 +9217,72 @@ msgid "" " -i, --ignore-interrupts ignore interrupt signals\n" msgstr "" -#: src/tee.c:71 +#: src/tee.c:93 +msgid "" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" +msgstr "" + +#: src/tee.c:98 msgid "" "\n" -"If a FILE is -, copy again to standard output.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -8998,20 +9291,20 @@ msgid "" " or: [ OPTION\n" msgstr "" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" msgstr "" -#: src/test.c:717 +#: src/test.c:719 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 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -9020,7 +9313,7 @@ msgid "" " EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n" msgstr "" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -9030,7 +9323,7 @@ msgid "" " STRING1 != STRING2 the strings are not equal\n" msgstr "" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -9041,7 +9334,7 @@ msgid "" " INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n" msgstr "" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -9049,7 +9342,7 @@ msgid "" " FILE1 -ot FILE2 FILE1 is older than FILE2\n" msgstr "" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -9058,7 +9351,7 @@ msgid "" " -e FILE FILE exists\n" msgstr "" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -9067,7 +9360,7 @@ msgid "" " -k FILE FILE exists and has its sticky bit set\n" msgstr "" -#: src/test.c:766 +#: src/test.c:768 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" @@ -9076,7 +9369,7 @@ msgid "" " -s FILE FILE exists and has a size greater than zero\n" msgstr "" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -9085,7 +9378,7 @@ msgid "" " -x FILE FILE exists and execute (or search) permission is granted\n" msgstr "" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -9094,32 +9387,32 @@ msgid "" "INTEGER may also be -l STRING, which evaluates to the length of STRING.\n" msgstr "" -#: src/test.c:786 +#: src/test.c:788 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 +#: src/test.c:793 msgid "test and/or [" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "" @@ -9139,18 +9432,18 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" " or: %s [OPTION]\n" msgstr "" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -9168,7 +9461,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9176,7 +9469,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -9187,7 +9480,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -9202,6 +9495,11 @@ msgstr "" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -9479,12 +9777,12 @@ msgstr "" msgid "Exit with a status code indicating failure." msgstr "" -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -9495,22 +9793,22 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -9518,57 +9816,61 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "" -#: src/truncate.c:333 +#: src/truncate.c:285 +msgid "Invalid number" +msgstr "" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "" @@ -9583,16 +9885,19 @@ msgstr "" 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:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "" @@ -9640,9 +9945,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" #: src/unexpand.c:124 @@ -9684,8 +9987,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -9696,7 +9999,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -9830,11 +10133,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "" - #: src/uptime.c:214 #, c-format msgid "" @@ -9850,12 +10148,16 @@ msgid "" "\n" msgstr "" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +msgid "" +"\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" @@ -9863,12 +10165,12 @@ msgid "" " -l, --lines print the newline counts\n" msgstr "" -#: src/wc.c:128 +#: src/wc.c:134 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" @@ -10003,9 +10305,9 @@ msgid "" "\n" msgstr "" -#: src/whoami.c:91 +#: src/whoami.c:87 #, c-format -msgid "%s: cannot find name for user ID %lu\n" +msgid "cannot find name for user ID %lu" msgstr "" #: src/yes.c:41 diff --git a/po/cs.gmo b/po/cs.gmo index 33901fd9..3b3ae357 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index 4d4f07fb..cf312dfa 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,11 +5,12 @@ # Petr Pisar , 2006, 2007, 2008, 2009, 2010, 2011, 2012. # Petr Pisar , 2013, 2014. # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils 8.23-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2014-07-14 20:52+0200\n" "Last-Translator: Petr Pisar \n" "Language-Team: Czech \n" @@ -37,18 +38,18 @@ msgstr "Platné argumenty jsou:" msgid "error closing file" msgstr "chyba při zavírání souboru" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "chyba při zápisu" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "zachování práv pro %s" @@ -229,57 +230,62 @@ msgstr "Řetězec v parametru není správně zakódován" msgid "Unknown error" msgstr "Neznámá chyba" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: přepínač „%s“ není jednoznačný, možnosti:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: přepínač „-W %s“ není jednoznačný\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: přepínač „--%s“ musí být zadán bez argumentu\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: přepínač „%c%s“ musí být zadán bez argumentu\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: přepínač „--%s“ vyžaduje argument\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: neznámý přepínač „--%s“\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: neznámý přepínač „%c%s“\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: neplatný přepínač – %c\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: přepínač vyžaduje argument – %c\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: přepínač „-W %s“ není jednoznačný\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: přepínač „-W %s“ musí být zadán bez argumentu\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: přepínač „-W %s“ vyžaduje argument\n" @@ -289,13 +295,13 @@ msgstr "%s: přepínač „-W %s“ vyžaduje argument\n" msgid "cannot change permissions of %s" msgstr "práva %s nelze změnit" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "adresář %s nelze vytvořit" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "paměť vyčerpána" @@ -344,6 +350,12 @@ msgstr "“" msgid "%s: end of file" msgstr "%s: konec souboru" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: chyba při čtení" + #: lib/regcomp.c:131 msgid "Success" msgstr "Úspěch" @@ -451,7 +463,7 @@ msgstr "^[aAyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "nastavení práv pro %s" @@ -890,7 +902,7 @@ msgstr "" "Zakóduje do base64 nebo dekóduje z base64 SOUBOR nebo standardní vstup na\n" "standardní výstup.\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -906,15 +918,7 @@ msgstr "" " Zalamování lze zakázat hodnotou 0\n" "\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Není-li uveden SOUBOR nebo když je SOUBOR „-“, čte ze standardního vstupu.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -928,51 +932,51 @@ 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:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "chyba při čtení" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "neplatný vstup" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "neplatná délka zalomení: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "nadbytečný operand %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "zavírám standardní vstup" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1022,38 +1026,43 @@ msgstr "" " %s -a any/str1 any/str2 Vypíše „str1“ následováno „str2“\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "chybí operand" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Použití: %s [PŘEPÍNAČ]… [SOUBOR]…\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "Vypíše seřazené zřetězení všech SOUBORŮ na standardní výstup.\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1073,7 +1082,7 @@ msgstr "" " -n, --number čísluje všechny výstupní řádky\n" " -s, --squeeze-blank prázdné řádky jdoucí po sobě redukuje na jediný\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1085,7 +1094,7 @@ msgstr "" " -u (ignorováno)\n" " -v, --show-nonprinting použije zápisu ^ a M-, kromě znaků LF a TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1098,17 +1107,18 @@ msgstr "" " %s f - g Vypíše obsah souboru f, pak standardní vstup, poté obsah g.\n" " %s Kopíruje standardní vstup na standardní výstup.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "ioctl na „%s“ není možné vykonat" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "standardní výstup" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: vstupní soubor je zároveň výstupním" @@ -1120,10 +1130,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1137,8 +1147,8 @@ msgstr "chyba při výrobě bezpečnostního kontextu: %s" msgid "failed to set %s security context component to %s" msgstr "nastavení složky %s bezpečnostního kontextu na %s se nezdařilo" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "získat bezpečnostní kontext %s se nezdařilo" @@ -1153,13 +1163,13 @@ msgstr "částečný kontext na neoznačený soubor %s nelze uplatnit" 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:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "nelze přistoupit k %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "adresář %s nelze číst" @@ -1175,7 +1185,7 @@ msgstr "měním bezpečnostní kontext %s\n" msgid "fts_read failed" msgstr "fts_read selhalo" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1294,7 +1304,7 @@ msgid "-R -h requires -P" msgstr "-R -h vyžaduje -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1311,9 +1321,8 @@ msgid "conflicting security context specifiers given" msgstr "byly zadány odporující si požadavky na bezpečnostní kontext" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "selhalo získání vlastností souboru %s" @@ -1623,17 +1632,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "neplatná skupina %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "neplatný seznam skupin %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1642,7 +1651,7 @@ msgstr "" "Použití: %s [PŘEPÍNAČ] NOVÝ_ROOT [PŘÍKAZ [ARG]…]\n" " nebo: %s PŘEPÍNAČ\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1650,17 +1659,30 @@ msgstr "" "Spustí PŘÍKAZ s kořenovým adresářem nastaveným na NOVÝ_ROOT.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" msgstr "" " --userspec=UŽIVATEL:SKUPINA\n" " určuje uživatele a skupinu (ID nebo jméno),\n" " který se použije\n" " --groups=SEZNAM_SKUPIN určuje doplňkové skupiny (zápis: S1,S2,…,Sn)\n" -#: src/chroot.c:203 +#: src/chroot.c:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" +" --userspec=UŽIVATEL:SKUPINA\n" +" určuje uživatele a skupinu (ID nebo jméno),\n" +" který se použije\n" +" --groups=SEZNAM_SKUPIN určuje doplňkové skupiny (zápis: S1,S2,…,Sn)\n" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" @@ -1668,42 +1690,47 @@ msgstr "" "\n" "Není-li zadán žádný příkaz, spustí „${SHELL} -i“ (výchozí: „/bin/sh -i“).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "nelze změnit kořenový adresář na %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "nelze změnit pracovní adresář na kořenový" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "pro neznámé UID nebyla zadána žádná skupina: %d" -#: src/chroot.c:383 +#: src/chroot.c:400 #, c-format msgid "failed to get supplemental groups" msgstr "doplňkové skupiny nelze získat" -#: src/chroot.c:395 -#, c-format -msgid "failed to %s supplemental groups" -msgstr "doplňkové skupinu(y) nelze %s" +#: src/chroot.c:412 +#, fuzzy, c-format +msgid "failed to set supplemental groups" +msgstr "doplňkové skupiny nelze získat" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "selhalo nastavení ID skupiny" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "selhalo nastavení ID uživatele" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "spuštění příkazu %s selhalo" @@ -1744,7 +1771,16 @@ msgstr "Použití: %s [PŘEPÍNAČ]… SOUBOR1 SOUBOR2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Porovná seřazené soubory SOUBOR1 a SOUBOR2 řádek po pořádku.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Není-li uveden SOUBOR nebo když je SOUBOR „-“, čte ze standardního vstupu.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1757,7 +1793,7 @@ msgstr "" "sloupec\n" "třetí obsahuje řádky společné oběma souborům.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1769,7 +1805,7 @@ msgstr "" " -2 neukazuje 2. sloupec (řádky obsažené pouze v SOUBORU2)\n" " -3 neukazuje 3. sloupec (řádky společné oběma souborům)\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1781,11 +1817,11 @@ msgstr "" " řádky lze spárovat\n" " --nocheck-order neověřuje, zda je vstup správně seřazen\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=ŘET odděluje sloupce pomocí ŘET\n" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" @@ -1793,7 +1829,7 @@ msgstr "" "\n" "Uvědomte si, že porovnávání respektuje pravidla daná „LC_COLLATE“.\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1808,309 +1844,323 @@ msgstr "" " %s -3 soubor1 soubor2 Vypíše řádky existující v soubor1,\n" " ale ne v soubor2 nebo obráceně.\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "soubor %d není seřazen" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "zadáno více oddělovačů" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "prázdný %s nedovolen" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "nelze nastavit pozici pro %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "chyba při čtení %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "nelze nastavit pozici pro %s" +msgid "error reading %s" +msgstr "chyba při čtení %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "chyba při zápisu %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "chyba při čtení %s" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s: selhalo získání údajů o rozsazích" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: zápis se nezdařil" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "rozšíření %s selhalo" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "odebírám práva k %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "selhalo zachování vlastnictví souboru %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "selhalo vyhledání souboru %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "selhalo zachování autorství souboru %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "selhalo nastavení výchozího kontextu pro vytvářené soubory na %s" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "selhalo nastavení výchozího kontextu pro vytvářené soubory v %s" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "nastavení bezpečnostního kontextu %s se nezdařilo" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "%s nelze otevřít pro čtení" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "nelze získat informace o souboru %s z deskriptoru" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "přeskakuji soubor %s, protože byl nahrazen během kopírování" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "nelze odstranit %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "smazáno %s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "nezapisuji skrze slepý symbolický odkaz %s" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "nelze vytvořit obyčejný soubor %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "klonování %s z %s selhalo" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "zachování časů souboru %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "zavření %s selhalo" -#: src/copy.c:1580 +#: src/copy.c:1669 #, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: nahradit %s přebitím přístupových práv %04lo (%s)? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "%s: nezapsatelný %s (práva %04lo, %s); zkusit znovu? " -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: přepsat %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (záloha: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, 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:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "nelze vytvořit pevný odkaz %s na %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "nelze získat informace o %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "vynechávám adresář %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, 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:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s a %s jsou jeden a tentýž soubor" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "ne-adresář %s nelze přepsat adresářem %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "právě vytvořený %s nebude přepsán %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "adresář %s nelze přepsat ne-adresářem" -#: src/copy.c:1989 +#: src/copy.c:2069 #, 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:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "nelze vytvořit zálohu %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "nelze kopírovat adresář %s na sebe %s" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "varování: zdrojový soubor %s byl zadán více krát" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "nelze přesunout %s do %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "%s: zacyklené symbolické odkazy nelze kopírovat" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "nelze vytvořit symbolický odkaz %s na %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "nelze vytvořit rouru %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "nelze vytvořit zvláštní soubor %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "symbolický odkaz %s nelze přečíst" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "nelze vytvořit symbolický odkaz %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s: neznámý typ souboru" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "%s: nelze obnovit ze zálohy" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s → %s (obnoven ze zálohy)\n" @@ -2120,18 +2170,18 @@ msgstr "%s → %s (obnoven ze zálohy)\n" msgid "Alex Deymo" msgstr "Alex Deymo" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "Použití: %s --coreutils-prog=NÁZEV_PROGRAMU [PARAMETRY]…\n" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "Vykoná vestavěný program NÁZEV_PROGRAMU se zadanými ARGUMENTY.\n" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" @@ -2141,7 +2191,7 @@ msgstr "" "Použití: „%s --coreutils-prog=NÁZEV_PROGRAMU --help“ pro nápovědu " "k jednotlivému programu.\n" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, c-format msgid "unknown program %s" msgstr "neznámý program %s" @@ -2419,8 +2469,8 @@ msgstr "%s existuje, ale není adresářem" msgid "failed to access %s" msgstr "k %s nelze přistoupit" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "chybí název souboru" @@ -2495,131 +2545,131 @@ msgstr "" "atributů" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "vstup se ztratil" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: číslo řádku je mimo rozsah" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: číslo řádku je mimo rozsah" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " v %s. opakování\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: nenalezeno" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "chyba při vyhledávání pomocí regulárního výrazu" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "chyba při zápisu do %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: po oddělovači je očekáváno celé číslo" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: „}' je požadována v počítadle opakování" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: mezi „{“ a „}“ musí být celé číslo" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: postrádán koncový oddělovač „%c“" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: chybný regulární výraz: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: chybný vzorek" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, 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:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "v parametru přepínače chybí určení typu konverze" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "chybně zadaný typ konverze v parametru přepínače: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "chybně zadaný typ konverze v parametru přepínače: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "neplatné příznaky v zadání konverze: %%%c%c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "příliš mnoho typů konverze %% v parametru přepínače" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "v parametru přepínače chybí zadání typu konverze pomocí %%" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: chybné číslo" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "neplatné číslo %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Použití: %s [PŘEPÍNAČ]… SOUBOR VZOREK…\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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" @@ -2627,7 +2677,16 @@ msgstr "" "Rozděluje SOUBOR v místech VZORKU(Ů) do souborů „xx00“, „xx01“, …\n" "a vypisuje velikosti každého výstupního souboru na standardní výstup.\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Jestliže SOUBOR je „-“, bude čten standardní vstup. Každý VZOREK může být:\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2639,11 +2698,11 @@ msgstr "" " -f, --prefix=PŘEDPONA použije PŘEDPONY místo „xx“\n" " -k, --keep-files nemaže výstupní soubory při chybách\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr " -m, --suppress-matched potlačí řádky odpovídající VZORKU\n" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2653,17 +2712,11 @@ 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:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Jestliže SOUBOR je „-“, bude čten standardní vstup. Každý VZOREK může být:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 +#, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2699,7 +2752,7 @@ msgstr "Použití: %s PŘEPÍNAČ… [SOUBOR]…\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:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2710,7 +2763,7 @@ msgstr "" " -d, --delimiter=ODDĚLOVAČ jako oddělovač použije ODDĚLOVAČ (místo " "tabulátoru)\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2723,7 +2776,7 @@ msgstr "" " není zadáno -s\n" " -n (ignorováno)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2731,7 +2784,7 @@ msgstr "" " --complement použije doplněk zadaných bajtů, znaků nebo " "položek\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2744,7 +2797,7 @@ msgstr "" "vstupní\n" " oddělovač.\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2757,7 +2810,8 @@ 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:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2765,8 +2819,6 @@ msgid "" " 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 "" "Každý rozsah může být:\n" "\n" @@ -2777,50 +2829,51 @@ msgstr "" "\n" "Jestliže SOUBOR není zadán, nebo je „-“, bude čten standardní vstup.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "chybný seznam bajtů, znaků nebo položek" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "položky a pozice se počítají od 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "neplatný rozsah bez konce: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "neplatný klesající rozsah" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "posun bajtů %s je příliš velký" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "číslo položky %s je příliš velké" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "pouze jeden typ seznamu může být zadán" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "oddělovač musí být jediný znak" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "musíte zadat seznam bajtů, znaků nebo položek" -#: src/cut.c:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2828,11 +2881,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:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "chybí seznam položek" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "chybí seznam pozicí" @@ -2850,13 +2903,25 @@ 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 +#, fuzzy +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +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" + +#: src/date.c:138 +#, fuzzy msgid "" -" -d, --date=STRING display time described by STRING, not 'now'\n" -" -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -" -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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" " -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" @@ -2868,25 +2933,24 @@ msgstr "" " čas bude vrácen s přesností na hodiny, minuty,\n" " sekundy nebo nanosekundy.\n" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=SOUBOR vypíše čas poslední změny obsahu SOUBORU\n" " -R, --rfc-2822 vypíše datum podle RFC-2822\n" " Příklad: Mon, 07 Aug 2006 12:34:56 -0600\n" -#: src/date.c:147 +#: src/date.c:149 +#, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=PŘESNOST vypíše datum a čas podle RFC 3339.\n" " PŘESNOST musí být „date“, „seconds“, nebo „ns“ a\n" @@ -2898,8 +2962,19 @@ msgstr "" " -u, --utc, --universal nastaví nebo vypíše UTC (světový koordinovaný " "čas)\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2912,7 +2987,7 @@ msgstr "" " %% znak %\n" " %a zkrácené jméno dne podle lokalizace (např. Ne)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2924,7 +2999,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:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2936,7 +3011,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:177 +#: src/date.c:183 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 +3021,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:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2958,7 +3033,7 @@ msgstr "" " %I hodina (01..12)\n" " %j číslo dne v roce (001..366)\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2970,7 +3045,7 @@ msgstr "" " %m měsíc (01..12)\n" " %M minuta (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2990,7 +3065,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:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3002,7 +3077,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:209 +#: src/date.c:215 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" @@ -3016,7 +3091,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:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3028,7 +3103,7 @@ msgstr "" " %y poslední dvě číslice letopočtu (00..99)\n" " %Y rok\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3050,7 +3125,7 @@ msgstr "" "\n" "Implicitně jsou číselné položky data zarovnány nulami.\n" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3068,7 +3143,7 @@ msgstr "" " ^ pokud lze, použije velká písmena\n" " # pokud lze, použije písmena opačné velikosti\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3083,7 +3158,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:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3107,35 +3182,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:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "standardní vstup" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "chybné datum: %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "zadáno více výstupních formátů" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3146,23 +3221,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:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "datum nelze nastavit" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3171,7 +3246,7 @@ msgstr "" "Použití: %s [OPERAND]…\n" " nebo: %s PŘEPÍNAČ\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3190,7 +3265,8 @@ msgstr "" " count=N zkopíruje pouze N vstupních bloků\n" " ibs=BAJTŮ čte BAJTŮ bajtů najednou (implicitně: 512)\n" -#: src/dd.c:541 +#: src/dd.c:570 +#, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3199,8 +3275,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\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 " @@ -3215,7 +3293,7 @@ msgstr "" " „noxfer“ potlačí statistické informace o přenosu dat,\n" " „none“ potlačí vše\n" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3233,7 +3311,7 @@ msgstr "" "Každá dílčí konverze v seznamu KONVERZÍ může být:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3263,7 +3341,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:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3279,7 +3357,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:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3293,134 +3371,97 @@ msgstr "" " append připisuje na konec (má smysl pouze pro výstup;\n" " doporučeno s conv=notrunc)\n" -#: src/dd.c:589 +#: src/dd.c:620 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:591 +#: src/dd.c:622 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:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory selže, pokud se nejedná o adresář\n" -#: src/dd.c:595 +#: src/dd.c:626 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:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync podobně, ale také pro metadata\n" -#: src/dd.c:598 +#: src/dd.c:629 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:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock použije neblokující I/O\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noaime neaktualizuje čas posledního přístupu k souboru\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nocache zahodí nakešovaná data\n" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty nepovažuje soubor za řídící terminál\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow nesleduje symbolické odkazy\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks selže, pokud na soubor vede více pevných odkazů\n" -#: src/dd.c:616 +#: src/dd.c:647 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:618 +#: src/dd.c:649 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:620 +#: src/dd.c:651 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:623 +#: src/dd.c:654 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:626 +#: src/dd.c:657 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:631 +#: src/dd.c:661 #, 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 "" -"\n" -"Zaslání signálu %s běžícímu procesu „dd“ způsobí vypsání statistických\n" -"informací o vstupně-výstupních operacích na standardní chybový výstup.\n" -"Pak se obnoví kopírování.\n" -"\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ kill -%s $pid; sleep 1; kill $pid\n" -" 18335302+0 záznamů přečteno\n" -" 18335302+0 záznamů zapsáno\n" -" 9 387 674 624 bajtů (9,4 GB) zkopírováno, 34,6279 s, 271 MB/s\n" -"\n" -"Volby jsou:\n" -"\n" -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +#: src/dd.c:699 +#, fuzzy, c-format +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "paměť vyčerpána vstupním bufferem o velikosti %'zu bajtů (%s)" -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +#: src/dd.c:721 +#, fuzzy, c-format +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "paměť vyčerpána výstupním bufferem o velikosti %'zu bajtů (%s)" -# TODO: Pluralize -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" -"%+% záznamů přečteno\n" -"%+% záznamů zapsáno\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% záznam zkrácen\n" -msgstr[1] "% záznamy zkráceny\n" -msgstr[2] "% záznamů zkráceno\n" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" @@ -3428,7 +3469,7 @@ msgstr[0] "% bajt (%s) zkopírován" msgstr[1] "% bajty (%s) zkopírovány" msgstr[2] "%' bajtů (%s) zkopírováno" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "nekonečno B" @@ -3442,83 +3483,102 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %'g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %'g s, %s/s\n" + +# TODO: Pluralize +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% záznamů přečteno\n" +"%+% záznamů zapsáno\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% záznam zkrácen\n" +msgstr[1] "% záznamy zkráceny\n" +msgstr[2] "% záznamů zkráceno\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "zavírám vstupní soubor %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "zavírám výstupní soubor %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "vypnutí O_DIRECT selhalo: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "zapisuji do %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "neznámý operand %s" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "neplatná konverze" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "neplatný příznak vstupu" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "neplatný příznak výstupu" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "neplatná hodnota operandu status" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "neplatné číslo %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "tyto konverze nelze kombinovat: ascii, ebcdic, ibm" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "block a unblock nelze použít současně" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "lcase a ucase nelze použít současně" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "excl a nocreat nelze použít současně" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "direct a nocache nelze použít současně" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3527,62 +3587,62 @@ msgstr "" "varování: obcházím chybu služby jádra lseek() nad souborem %s\n" " typu mt_type=0x%0lx – seznam typů naleznete v " -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: vstup nelze převíjet" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: výstup nelze převíjet" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "během čtení ze souboru %s přetekl offset" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "varování: chybný offset souboru poté, co selhalo čtení" -#: src/dd.c:1760 +#: src/dd.c:1863 #, 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:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "nastavuji příznaky pro %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: nelze se přesunout na zadanou pozici ve vstupu" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "zkrácení výstupního souboru %2$s na %1$ bajtů selhalo" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync na %s selhalo" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "fsync na %s selhalo" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "otevření %s selhalo" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3591,19 +3651,19 @@ msgstr "" "příliš velký offset: nelze zkrátit na délku seek=% (%lu-bajtových) " "bloků" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "zkrácení výstupního souboru %2$s na %1$ bajtů selhalo" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "nepodařilo se zahodit keš pro: %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3684,12 +3744,12 @@ msgstr "Kapacita" msgid "%s-%s" msgstr "%s %s" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "nelze přistoupit k %s: bod připojení je překryt jiným zařízením" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3699,13 +3759,14 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 +#, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3720,7 +3781,7 @@ msgstr "" " -h, --human-readable vypisuje velikosti v mocninách 1024 (např. 1023M)\n" " -H, --si vypisuje velikosti v mocninách 1000 (např. 1,1G)\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3733,13 +3794,38 @@ 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:1409 +#: src/df.c:1429 +#, 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" +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" +" -T, --print-type vypisuje typ souborového systému\n" +" -x, --exclude-type=TYP\n" +" ve výstupu nebudou souborové systémy typu TYP\n" +" -v (ignorováno)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose před otevřením každého výstupního souboru vypíše\n" +" oznámení o tomto\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3756,7 +3842,7 @@ msgstr "" " ve výstupu nebudou souborové systémy typu TYP\n" " -v (ignorováno)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3773,25 +3859,25 @@ msgstr "" "„pcent“ (procento místa), „file“ (soubor) a „target“ (cíl). Podrobnosti\n" "v info stránce.\n" -#: src/df.c:1460 +#: src/df.c:1486 #, 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:1610 +#: src/df.c:1636 #, 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:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Pozor: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "tabulku připojených souborových systémů nelze přečíst" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "žádný souborový systém nebyl zpracován" @@ -3909,7 +3995,7 @@ msgstr "" " %s adr1/řet adr2/řet Vypíše „adr1“ následovaný „adr2“\n" " %s stdio.h Vypíše „.“.\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3919,7 +4005,9 @@ msgstr "" " nebo: %s [PŘEPÍNAČ]… --files0-from=S\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +#, fuzzy +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Sčítá diskový prostor zabraný každým SOUBOREM, pro adresáře rekurzivně.\n" @@ -4065,63 +4153,57 @@ msgstr "" msgid "Infinity" msgstr "Nekonečno" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "fts_read selhalo: %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "chybné maximální hloubka %s" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "argument „-0“ za přepínačem --threshold je neplatný" -#: src/du.c:898 +#: src/du.c:919 #, 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:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "varování: sumarizace je v rozporu s --max-depth=%lu" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "pozor: přepínače --apparent-size a -b ztrácí s --inodes účinnost" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "operandy s názvy souborů nelze kombinovat s --files0-from" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: chyba při čtení" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "neplatný název souboru – nulová délka" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "celkem" @@ -4267,9 +4349,8 @@ msgid "cannot specify --null (-0) with command" msgstr "s příkazem nelze použít přepínač --null (-0)" #: 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" +#, fuzzy +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "Konvertuje tabelátory v každém SOUBORU na mezery, výsledek jde na " "standardní\n" @@ -4318,7 +4399,7 @@ msgid "input line is too long" msgstr "řádka na vstupu je příliš dlouhá" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4477,12 +4558,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:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "dělení nulou" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "pro obejdete, když nastavíte LC_ALL='C'" @@ -4493,31 +4574,31 @@ msgid "the strings compared were %s and %s" msgstr "byly porovnávány řetězce %s a %s" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "Niels Möller" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, 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:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "Fronta algoritmu SQUFOF přetekla" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s není celé kladné číslo" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s je příliš velké" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4526,7 +4607,7 @@ msgstr "" "Použití: %s [ČÍSLO]…\n" " nebo: %s PŘEPÍNAČ\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -4572,7 +4653,7 @@ msgstr "" "výstup.\n" "Přepínač -ŠÍŘKA je zkrácená podoba --width=ŠÍŘKA.\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4584,7 +4665,7 @@ msgstr "" "prefix\n" " -s, --split-only pouze rozdělí dlouhé řádky\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4597,7 +4678,7 @@ msgstr "" " -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:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4607,20 +4688,19 @@ msgstr "" "přepínačem;\n" "použijte -w ŠÍŘKA" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "chybné šířka: %s" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +#, fuzzy +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "Zalamuje vstupní řádky každého SOUBORU (implicitně standardního vstupu) a\n" "výsledek zapisuje na standardní výstup.\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4630,9 +4710,9 @@ msgstr "" " -s, --spaces zalamuje řádky v mezerách\n" " -w, --width=ŠÍŘKA používá ŠÍŘKA sloupců místo 80\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "neplatný počet sloupců: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4705,11 +4785,11 @@ msgstr "nelze zjistit reálné ID skupiny" msgid "%s: no such user" msgstr "%s: uživatel neexistuje" -#: src/head.c:109 +#: src/head.c:110 +#, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "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í " @@ -4717,7 +4797,7 @@ msgstr "" "SOUBORU. Jestliže SOUBOR nebude zadán nebo bude „-“, bude čten standardní\n" "vstup.\n" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4733,7 +4813,7 @@ msgstr "" " uvedení „-“ způsobí vypsání všech kromě\n" " posledních K řádků z každého souboru\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4741,7 +4821,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:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4753,49 +4833,36 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: soubor byl příliš zkrácen" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: počet bajtů je příliš velký" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: nelze se přemístit na pozici %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: nelze se přesunout na relativní pozici %s" -# src/tail.c:968 -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "počet řádků" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "počet bajtů" +msgid "%s: number of bytes is too large" +msgstr "%s: počet bajtů je příliš velký" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "chybný počet řádků" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "chybný počet bajtů" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "neznámý závěrečný přepínač – %c" @@ -4983,7 +5050,7 @@ msgstr "vlastnictví %s nelze změnit" msgid "cannot set time stamps for %s" msgstr "nelze nastavit časy %s " -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "systémové volání fork selhalo" @@ -5153,7 +5220,7 @@ msgstr "při instalaci adresáře nesmí být použit přepínač --strip" msgid "target directory not allowed when installing a directory" msgstr "při instalaci adresáře není dovolen cílový adresář (-t)" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "neplatná práva: %s" @@ -5190,8 +5257,13 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5208,7 +5280,7 @@ msgstr "" " kde STRANA je 1 nebo 2 pro SOUBOR1 nebo SOUBOR2\n" " -e VYPLŇ nahradí chybějící vstupní položky VÝPLNÍ\n" -#: src/join.c:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5221,7 +5293,7 @@ msgstr "" " -o FORMÁT řídí se FORMÁTEM při tvorbě výstupního řádku\n" " -t ZNAK použije ZNAK jako oddělovač položek na vstupu i výstupu\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5242,12 +5314,12 @@ msgstr "" "položek,\n" " vypíše je aniž by se je pokoušet spárovat\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated oddělovač řádků je znak NUL, ne nový řádek\n" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5283,47 +5355,47 @@ msgstr "" "Nebude-li vstup seřazen a nebude-li možné některé řádky propojit, bude\n" "zobrazeno varování.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:%: není seřazeno: %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "chybné číslo položky: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "chybně zadaná položka: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "chybné číslo souboru v popisu položky: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "neslučitelné propojovací položky %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "řetězce výplně je jsou v konfliktu" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "zvolený oddělovač položek %s má více znaků" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "neslučitelné oddělovače položek" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "oba dva soubory nemohou být standardním vstupem" @@ -5400,17 +5472,17 @@ msgstr "signál nelze kombinovat s -l nebo -t" msgid "no process ID specified" msgstr "nebylo zadáno číslo procesu" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "alokace stdio bufferu o velikosti % bajtů se nezdařila\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "režim bufferování %s je pro %s neplatný\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "nastavení bufferování %s na režim %s se nezdařilo\n" @@ -5603,7 +5675,7 @@ msgstr "přepínač --relative nelze bez přepínače --symbolic použít" msgid "FIXME: unknown" msgstr "OPRAVMĚ: neznámý" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Použití: %s [PŘEPÍNAČ]\n" @@ -5616,7 +5688,7 @@ msgstr "" "Vytiskne jméno aktuálního uživatele.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "chybí přihlašovací jméno" @@ -5626,7 +5698,7 @@ msgstr "chybí přihlašovací jméno" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%e. %b %Y" @@ -5635,95 +5707,95 @@ msgstr "%e. %b %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%e. %b %H.%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "ignoruji neplatnou hodnotu proměnné prostření QUOTUNG_STYLE: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "špatná šířka (%s) v proměnné prostředí COLUMNS, bude ignorována" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "špatná velikost tabelátoru (%s) v proměnné prostředí TABSIZE, bude ignorována" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "chybné délka řádku: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "chybná šířka tabelátoru: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "chybný formát pro výpis času %s" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "Platné argumenty jsou:\n" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr " - +FORMÁT (např. +%H:%M) pro formát jako u „date“\n" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "chyba při inicializaci řetězců měsíců" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "neznámý prefix: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "nesrozumitelná hodnota v proměnné prostředí LS_COLORS" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "ignoruji neplatnou hodnotu proměnné prostření QUOTUNG_STYLE: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "adresář %s nelze otevřít" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "zařízení a i-uzel pro %s nelze určit" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: nevypisuji již dříve vypsaný adresář" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "čte se adresář %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "zavírá se adresář %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "jména souborů %s a %s nelze porovnat" -#: src/ls.c:4781 +#: src/ls.c:4775 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" @@ -5732,7 +5804,7 @@ msgstr "" "není zadán žádný z přepínačů -cftuvSUX nebo --sort, výstup bude seřazen\n" "abecedně.\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5746,7 +5818,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:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5773,12 +5845,14 @@ msgstr "" " jinak: řadí podle ctime, vypisuje od " "nejnovějších\n" -#: src/ls.c:4804 +#: src/ls.c:4798 +#, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5791,7 +5865,7 @@ msgstr "" " -D, --dired generuje výstup formátovaný pro Emacsový\n" " mód „dired“\n" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5811,11 +5885,11 @@ msgstr "" " verbose jako -l, vertical jako -C\n" " --full-time jako -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr " -g jako -l, ale nevypisuje vlastníka\n" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5828,7 +5902,7 @@ msgstr "" " zachová funkci přepínače --sort, avšak\n" " --sort=none (-U) seskupování potlačí\n" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5842,7 +5916,7 @@ msgstr "" " --si jako předchozí, ale použije mocniny 1000 a ne " "1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5864,7 +5938,7 @@ msgstr "" " shellovému VZORU (lze přebít přepínači -a a -" "A)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5884,7 +5958,7 @@ msgstr "" " shellovému VZORU\n" " -k, --kibibytes u zaplnění disku použije 1024bajtové bloky\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5900,7 +5974,7 @@ msgstr "" "oddělených\n" " čárkami vyplňující šířku řádků\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5918,7 +5992,7 @@ msgstr "" " -p, --indicator-style=slash\n" " za názvy adresářů připojí „/“\n" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -5940,7 +6014,7 @@ msgstr "" " literal (doslovný), locale (lokalizovaný),\n" " shell, shell-always, c, escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5952,18 +6026,19 @@ msgstr "" " -s, --size vypíše alokovanou velikost každého souboru\n" " v blocích\n" -#: src/ls.c:4886 +#: src/ls.c:4881 +#, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S výstup seřadí podle délky souborů\n" " --sort=SLOVO výstup seřadí podle SLOVA: none (-U), size (-" @@ -5978,7 +6053,7 @@ msgstr "" "použije\n" " se tento čas jako řadicí klíč\n" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -6001,7 +6076,7 @@ msgstr "" " mladší soubory; pokud STYL začíná na „posix-“,\n" " bude STYL uvažován jen mimo POSIXOVÉ locale\n" -#: src/ls.c:4908 +#: src/ls.c:4904 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -6011,11 +6086,12 @@ msgstr "" " -T, --tabsize=SLOUPCŮ pozice tabelátoru každých SLOUPCŮ znaků (impl. " "8)\n" -#: src/ls.c:4912 +#: src/ls.c:4908 +#, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -6028,13 +6104,15 @@ msgstr "" " v jakém jsou v adresáři uloženy\n" " -v přirozené řazení (verzovacích) čísel v textu\n" -#: src/ls.c:4919 +#: src/ls.c:4915 +#, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=SLOUPCŮ použije tuto šířku obrazovky při vypisování\n" " -x jména souborů vypíše po řádcích místo po " @@ -6044,7 +6122,7 @@ msgstr "" " kontext\n" " -1 vypíše jeden soubor na jeden řádek\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6059,7 +6137,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:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6090,51 +6168,54 @@ msgid "David Madore" msgstr "David Madore" #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" "Použití: %s [PŘEPÍNAČ]… [SOUBOR]…\n" "Vypíše nebo zkontroluje %s (%dbitové) kontrolní součty.\n" "Jestliže SOUBOR nebude zadán nebo bude „-“, bude čten standardní vstup.\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" " -b, --binary čte v binárním módu (výchozí, pokud nečte standardní\n" " vstup terminálu)\n" -#: src/md5sum.c:178 -msgid " -b, --binary read in binary mode\n" +#: src/md5sum.c:180 +#, fuzzy +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary čte v binárním módu\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr " --tag vytvoří kontrolní součet ve stylu BSD\n" -#: src/md5sum.c:188 +#: src/md5sum.c:191 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:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text čte v textovém módu (výchozí)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -6155,14 +6236,15 @@ msgstr "" " -w, --warn upozorňuje na chybně formátované řádky součtů\n" "\n" -#: src/md5sum.c:206 -#, c-format +#: src/md5sum.c:209 +#, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "Součty jsou počítány podle popisu v %s. Při testování by vstup měl\n" @@ -6170,35 +6252,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:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: příliš mnoho řádků s kontrolními součty" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: nesprávně formátovaný řádek %s kontrolního součtu" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: SELHALO otevření nebo čtení\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "CHYBNÝ" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "V POŘÁDKU" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, 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:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" @@ -6213,7 +6295,7 @@ msgstr[2] "POZOR: % řá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:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" @@ -6230,7 +6312,7 @@ msgstr[2] "POZOR: % 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:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" @@ -6238,39 +6320,39 @@ msgstr[0] "POZOR: % spočtený součet NESOUHLASIL" msgstr[1] "POZOR: % spočtené součty NESOUHLASILY" msgstr[2] "POZOR: % spočtených součtů NESOUHLASILO" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "přepínač --tag nepodporuje režim --text" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, 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:777 +#: src/md5sum.c:780 #, 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:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, 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ů" @@ -6310,22 +6392,22 @@ msgstr "" " jako -Z nebo je-li KONTEXT zadán, nastaví selinuxový\n" " nebo smackový bezpečnostní kontext na KONTEXT\n" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "selhalo nastavení výchozího kontextu u %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" msgstr "selhalo obnovení kontextu u %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "adresář %s vytvořen" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6535,7 +6617,7 @@ msgstr "příliš mnoho šablon" msgid "with --suffix, template %s must end in X" msgstr "při --sufix šablona %s musí končit na X" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "chybná přípona %s, obsahuje oddělovač adresářů" @@ -6667,9 +6749,8 @@ msgid "Scott Bartram" msgstr "Scott Bartram" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, with line numbers added.\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í " @@ -6778,27 +6859,27 @@ msgstr "chybný styl číslování v těle: %s" msgid "invalid footer numbering style: %s" msgstr "chybný styl číslování v patičce: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "chybné počáteční číslo řádku: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "chybná hodnota přírůstku čísla řádku: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "chybný počet prázdných řádků: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "chybná šířka čísla řádku: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "chybný formát čísla řádku: %s" @@ -6819,10 +6900,10 @@ msgid "" msgstr "Spustí PŘÍKAZ tak, aby ignoroval signál hangup (zavěšení linky).\n" #: src/nohup.c:65 -#, c-format +#, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6840,43 +6921,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "přesměrování standardního vstupu do nepoužitelna selhalo" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "ignoruji vstup" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "vstup ignoruji a výstup připojuji k %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "výstup připojuji k %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "kopii stderr se nezdařilo nastavit příznak uzavření při exec" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "vstup ignoruji a stderr přesměrovávám na stdout" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "stderr přesměrovávám na stdout" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -6903,81 +6984,79 @@ 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: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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "Assaf Gordon" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "hodnota je pro převod příliš velká: %s" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, c-format msgid "invalid number: %s" msgstr "neplatné číslo: %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, 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:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" msgstr "neplatná přípona na vstupu: %s" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, 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:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, 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:791 +#: src/numfmt.c:854 #, c-format msgid "invalid unit size: %s" msgstr "neplatná jednotka velikost: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Použití: %s [PŘEPÍNAČ]… [ČÍSLO]…\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 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:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr " --debug vypisuje varování při neplatném vstupu\n" -#: src/numfmt.c:824 +#: src/numfmt.c:890 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:827 +#: src/numfmt.c:893 +#, fuzzy msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" " --field=N nahradí číslo v položce vstupu N (výchozí je 1)\n" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" @@ -6985,7 +7064,7 @@ msgstr "" " --format=FORMÁT použije printf FORMÁT pro výpis reálných čísel,\n" " pro podrobnosti vizte FORMÁT níže\n" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" @@ -6995,14 +7074,14 @@ msgstr "" " automaticky přeškáluje vstupní čísla na JEDNOTKY.\n" " Výchozí je „none“ (žádná). Vizte JEDNOTKY níže.\n" -#: src/numfmt.c:838 +#: src/numfmt.c:905 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:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -7013,7 +7092,7 @@ msgstr "" "1 000 000\n" " (což znamená, že nemá smysl v locale C či POSIX)\n" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" @@ -7021,7 +7100,7 @@ msgstr "" " --header[=N] vypíše (bez převodu) prvních N řádků hlavičky,\n" " výchozí hodnota N je 1\n" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" @@ -7030,7 +7109,7 @@ msgstr "" " abort (přerušit, výchozí), fail (selhat),\n" " warn (varovat), ignore (ignorovat).\n" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -7044,7 +7123,7 @@ msgstr "" " výplň se ignoruje. Výchozí je automatická výplň,\n" " je-li nalezeno bílé místo.\n" -#: src/numfmt.c:860 +#: src/numfmt.c:927 msgid "" " --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" " up, down, from-zero (default), towards-zero, " @@ -7055,7 +7134,7 @@ msgstr "" " from-zero (z nuly, výchozí), towards-zero (k nule),\n" " nearest (nejbližší)\n" -#: src/numfmt.c:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" @@ -7065,19 +7144,19 @@ msgstr "" "volitelnou\n" " PŘÍPONU u vstupních čísel\n" -#: src/numfmt.c:868 +#: src/numfmt.c:935 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:871 +#: src/numfmt.c:938 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:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" @@ -7085,11 +7164,11 @@ msgstr "" "\n" "JEDNOTKY:\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 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:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -7103,7 +7182,7 @@ msgstr "" " 1M = 1000000,\n" " 1Mi = 1048576,\n" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -7115,7 +7194,7 @@ msgstr "" " 1M = 1000000,\n" " ⋮\n" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7127,7 +7206,7 @@ msgstr "" " 1M = 1048576,\n" " ⋮\n" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7139,8 +7218,29 @@ msgstr "" " 1Mi = 1048576,\n" " ⋮\n" -#: src/numfmt.c:906 -#, c-format +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Každý rozsah může být:\n" +"\n" +" N N. bajt, znak nebo položka, počítáno od 1\n" +" N- od N. bajtu, znaku nebo položky, do konce řádku\n" +" N-M od N. do M. (včetně) bajtu, znaku nebo položky\n" +" -M od prvního do M. (včetně) bajtu, znaku nebo položky\n" +"\n" +"Jestliže SOUBOR není zadán, nebo je „-“, bude čten standardní vstup.\n" + +#: src/numfmt.c:983 +#, fuzzy, c-format msgid "" "\n" "FORMAT must be suitable for printing one floating-point argument '%f'.\n" @@ -7148,6 +7248,7 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" "\n" "FORMÁT musí být vhodný pro zobrazení jednoho argumentu s plovoucí " @@ -7159,7 +7260,7 @@ msgstr "" "(%010f) šířky doplní číslo nulami. Volitelné záporné hodnoty šířky (%-10f)\n" "způsobí výplň výstupu zleva.\n" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7178,8 +7279,8 @@ msgstr "" "ale návratový kód bude 0. S přepínačem --invalid='ignore' nejsou chyby\n" "převodu hlášeny a návratový kód je také 0.\n" -#: src/numfmt.c:922 -#, c-format +#: src/numfmt.c:1000 +#, fuzzy, c-format msgid "" "\n" "Examples:\n" @@ -7193,8 +7294,8 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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 "" @@ -7215,116 +7316,126 @@ msgstr "" " $ ls -lh | %s --header --field 5 --from=iec --padding=10\n" " $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n" -#: src/numfmt.c:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "formát %s nemá žádnou direktivu %%" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "neplatný formát %s (šířka přetekla)" -#: src/numfmt.c:1008 -#, c-format -msgid "--format padding overridding --padding" +#: src/numfmt.c:1085 +#, fuzzy, c-format +msgid "--format padding overriding --padding" msgstr "výplň --format přebíjí --padding" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "formát %s končí na %%" -#: src/numfmt.c:1030 -#, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "chybná přesnost: %s" + +#: src/numfmt.c:1126 +#, fuzzy, c-format +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "neplatný formát %s, řídicí posloupnost musí být %%[0]['][-][N]" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "formát %s má příliš mnoho direktiv %%" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, c-format msgid "invalid suffix in input %s: %s" msgstr "neplatná přípona na vstupu %s: %s" -#: src/numfmt.c:1103 -#, c-format -msgid "value too large to be printed: '%Lg' (consider using --to)" +#: src/numfmt.c:1206 +#, fuzzy, c-format +msgid "" +"value/precision 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:1111 +#: src/numfmt.c:1210 +#, 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:1219 #, 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:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "velká vstupní hodnota %s: hrozí ztráta přesnosti" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, 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" +msgid "invalid field value %s" +msgstr "chybná hodnota položky %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, c-format msgid "invalid padding value %s" msgstr "chybný hodnota výplně %s" -#: src/numfmt.c:1417 -#, c-format -msgid "invalid field value %s" -msgstr "chybná hodnota položky %s" +#: src/numfmt.c:1646 +#, fuzzy, c-format +msgid "multiple field specifications" +msgstr "%s: neplatné určení položky %s" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, c-format msgid "invalid header value %s" msgstr "chybné hodnota hlavičky %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, 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:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "nezadán žádný přepínač konverze" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, 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:1488 +#: src/numfmt.c:1719 #, 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:1501 +#: src/numfmt.c:1732 #, 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:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "chyba při čtení vstupu" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "převod některých vstupních čísel selhal" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7337,14 +7448,13 @@ msgstr "" " nebo: %s --traditional [PŘEPÍNAČ]… [SOUBOR] [[+]POSUN[.][b] [+][NÁVĚSTÍ]" "[.][b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Vypíše SOUBOR jednoznačným způsobem, implicitně v osmičkovém formátu, na\n" @@ -7354,8 +7464,10 @@ msgstr "" "standardní vstup.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 +#, 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" @@ -7371,7 +7483,7 @@ msgstr "" "tečkou „.“, jsou považována za osmičková čísla a pokud končí znakem „b“,\n" "znamená to, že budou násobena 512.\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7386,7 +7498,7 @@ msgstr "" " --endian={big|little} prohodí bajty vstupu podle zadaného pořadí\n" " -j, --skip-bytes=POČET přeskočí prvních POČET bajtů ze vstupu\n" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -7408,7 +7520,7 @@ msgstr "" " je 32)\n" " --traditional přijímá argumenty v před-POSIXOVÉM tvaru\n" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -7427,7 +7539,7 @@ msgstr "" "lomítkem\n" " -d stejné jako -t u2, desítková bez znaménka (dvoubajtová)\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7443,7 +7555,7 @@ msgstr "" " -s stejné jako -t d2, desítková (dvoubajtová)\n" " -x stejné jako -t x2, šestnáctková (dvoubajtová)\n" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -7457,7 +7569,7 @@ msgstr "" " a názvy znaků, nejvyšší bit je ignorován\n" " c tisknutelné znaky nebo kódy znaků se zpětným lomítkem\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7471,7 +7583,7 @@ msgstr "" " u[BAJTŮ] desítkové bez znaménka s počtem BAJTŮ na číslo\n" " x[BAJTŮ] šestnáctkové s počtem BAJTŮ na číslo\n" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -7485,7 +7597,7 @@ msgstr "" "sizeof(long). Jestliže TYP je f, BAJTŮ může být také F jako sizeof(float),\n" "D jako sizeof(double) nebo L jako sizeof(long double).\n" -#: src/od.c:401 +#: src/od.c:404 msgid "" "\n" "Adding a z suffix to any type displays printable characters at the end of\n" @@ -7495,7 +7607,7 @@ msgstr "" "Přidání přípony „z“ k typu způsobí vypsání tisknutelných znaků na konci\n" "každého výstupního řádku.\n" -#: src/od.c:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -7518,12 +7630,12 @@ msgstr "" " M 1024*1024\n" "a tak dále pro G, T, P, E, Z, Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "chybný typ řetězce %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7532,7 +7644,7 @@ msgstr "" "chybný typ řetězce %s;\n" "tento systém nemá %lubajtová celá čísla" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7541,37 +7653,37 @@ msgstr "" "chybný typ řetězce %s;\n" "tento systém nemá %lubajtová čísla s plovoucí řádovou čárkou" -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" msgstr "znak „%c“ v řetězci typu „%s“ je chybný" -#: src/od.c:1094 +#: src/od.c:1105 #, 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:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "při vypisování řetězců nelze zadat typ" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "kompatibilní mód podporuje nejvýše jeden soubor" -#: src/od.c:1884 +#: src/od.c:1892 #, 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:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "varování: chybná šířka %lu; užívám %d místo ní" @@ -7587,10 +7699,10 @@ msgid "standard input is closed" msgstr "standardní vstup je uzavřen" #: src/paste.c:439 +#, fuzzy msgid "" "Write lines consisting of the sequentially corresponding lines from\n" "each FILE, separated by TABs, to standard output.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "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" @@ -7734,12 +7846,12 @@ msgstr "Kdy" msgid "Where" msgstr "Odkud" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Použití: %s [PŘEPÍNAČ]… [UŽIVATEL]…\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7755,7 +7867,7 @@ msgstr "" " -p nevypisuje plán v dlouhém formátu\n" " -s krátký výstupní formát (implicitní)\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7768,7 +7880,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:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -7779,97 +7891,97 @@ msgstr "" "Odlehčený program „finger“; vypisuje údaje o uživateli.\n" "Utmp soubor bude %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, 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" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "„--pages=PRVNÍ_STRÁNKA[:POSLEDNÍ_STRÁNKA]“ postrádá argument" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "chybný rozsah stran %s" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "„-l DÉLKA_STRÁNKY“ chybný počet řádků: %s" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "„-N ČÍSLO“ chybné číslo počátečního řádku: %s" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "„-o OKRAJ“ chybný posun řádku: %s" -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "„-w ŠÍŘKA_STRÁNKY“ chybný počet znaků: %s" -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "„-W ŠÍŘKA_STRÁNKY“ chybný počet znaků: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, 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:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "šířka stránky je příliš malá" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "číslo počáteční stránka % přesahuje počet stránek %" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "číslo stránky přeteklo" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Stránka %" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "Rozvrhne SOUBOR(Y) pro tisk na stránky nebo sloupce.\n" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7887,7 +7999,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:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7904,7 +8016,7 @@ msgstr "" " -d, --double-space\n" " za každý řádek vloží jeden prázdný\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7924,7 +8036,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:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7945,11 +8057,24 @@ msgstr "" " zruší zarovnání sloupců, --sep-string[=ŘETĚZEC]\n" " nastavuje oddělovače\n" -#: src/pr.c:2798 +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l, --length=DÉLKA_STRÁNKY\n" +" nastaví délku stránky (66). Zadáno v řádcích.\n" +" (implicitně je 56 řádků textu, s -F 63)\n" +" -m, --merge vypíše soubory vedle sebe, každý v jednom sloupci,\n" +" zkracuje řádky, ale spolu s přepínačem -J vypisuje plné\n" +" řádky celé\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -7960,7 +8085,7 @@ msgstr "" " zkracuje řádky, ale spolu s přepínačem -J vypisuje plné\n" " řádky celé\n" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7977,7 +8102,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:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7992,7 +8117,7 @@ msgstr "" " -r, --no-file-warnings\n" " potlačí varování, když soubor nemůže být otevřen\n" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -8010,14 +8135,14 @@ 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:2828 +#: src/pr.c:2802 +#, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -S[ŘETĚZEC], --sep-string[=ŘETĚZEC]\n" " oddělí sloupce ŘETĚZCEM,\n" @@ -8026,7 +8151,13 @@ msgstr "" " neovlivňuje parametry sloupců.\n" " -t, --omit-header nevypisuje hlavičky a patičky stránek\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -8050,7 +8181,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:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -8063,16 +8194,6 @@ msgstr "" " když není zadán přepínač -J, zkracuje řádky;\n" " neovlivňuje -S nebo -s.\n" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"-t je implikováno, pokud DÉLKA_STRÁNKY <= 10. Nebude-li SOUBOR zadán nebo\n" -"bude-li „-“, pak bude čten standardní vstup.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -8230,11 +8351,11 @@ msgid "" msgstr "" "Vypíše permutovaný rejstřík, včetně kontextu, slov ze vstupních souborů\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 +#, fuzzy 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 ve výstupu jsou automaticky generované " "odkazy\n" @@ -8244,6 +8365,12 @@ msgstr "" #: src/ptx.c:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -8256,7 +8383,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:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8275,7 +8402,7 @@ msgstr "" " ze SOUBORU\n" " -o, --only-file=SOUBOR přečtení seznamu slov pouze ze SOUBORU\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8286,20 +8413,16 @@ msgstr "" " -t, --typeset-mode – neimplementováno –\n" " -w, --width=ČÍSLO šířka výstupu ve sloupcích, bez odkazů\n" -#: src/ptx.c:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Není-li uveden SOUBOR nebo když je SOUBOR „-“, čte ze standardního vstupu.\n" -"Výchozí je „-F /“.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "chybné šířka mezery: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "chybné délka řádku: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8330,7 +8453,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "změna pracovního adresáře na %s selhala" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "nelze získat informace o %s" @@ -8350,8 +8473,8 @@ msgstr "ignoruji argumenty, které nejsou přepínači" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Použití: %s [PŘEPÍNAČ]… SOUBOR…\n" @@ -8618,17 +8741,17 @@ msgstr "" "použití nástroje „shred“.\n" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: smazat %zu argument rekurzivně? " msgstr[1] "%s: smazat %zu argumenty rekurzivně? " msgstr[2] "%s: smazat %zu argumentů rekurzivně? " #: src/rm.c:345 -#, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +#, fuzzy, c-format +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: smazat %zu argument? " msgstr[1] "%s: smazat %zu argumenty? " msgstr[2] "%s: smazat %zu argumentů? " @@ -8846,12 +8969,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "chybný argument v pohyblivé řádové čárce: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "formát %s má neznámou direktivu %%%c" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8872,7 +8995,16 @@ msgstr "" "obsahu\n" "i za použití velmi drahého vybavení.\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Je-li SOUBOR „-“, kopíruje opět na standardní výstup.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8889,7 +9021,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:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -8904,11 +9036,10 @@ 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:192 +#: src/shred.c:196 +#, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -8932,7 +9063,7 @@ msgstr "" "Výchozí režim je „wipesync“, avšak mějte na paměti, že je náročný.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8951,7 +9082,7 @@ msgstr "" "těchto systémů:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8973,7 +9104,7 @@ msgstr "" "Network Appliance\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8987,7 +9118,7 @@ msgstr "" "* komprimované souborové systémy\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -9009,7 +9140,7 @@ msgstr "" "(man mount).\n" "\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -9019,127 +9150,127 @@ msgstr "" "souboru, který nemůže být smazán, a tak umožňují pozdější obnovu\n" "skartovaných souborů.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync selhala" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync selhala" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: nelze převinout" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: průchod %lu/%lu (%s)…" -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: chyba při zápisu na pozici %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek selhala" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: soubor je příliš dlouhý" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: průchod %lu/%lu (%s)…%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: průchod %lu/%lu (%s)…%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat selhala" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: chybný typ souboru" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: soubor má zápornou velikost" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: chyba při zkracování souboru" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl selhala" -#: src/shred.c:994 +#: src/shred.c:996 #, 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:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: probíhá mazání" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: přejmenováno na %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: mazání selhalo" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: smazán" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: uzavření selhalo" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: soubor nelze otevřít pro zápis" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: neplatný počet průchodů" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "zadáno více zdrojů náhodných čísel" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: chybná velikost souboru" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -9150,11 +9281,11 @@ msgstr "" " nebo: %s -e [PŘEPÍNAČ]… [ARG]…\n" " nebo: %s -i DO-HO [PŘEPÍNAČ]…\n" -#: src/shuf.c:67 +#: src/shuf.c:68 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:73 +#: src/shuf.c:75 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 " @@ -9173,37 +9304,37 @@ msgstr "" " získá náhodné bajty ze SOUBORU\n" " -r, --repeat výstupní řádky se mohou opakovat\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "příliš mnoho vstupních řádků" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "zadáno více přepínačů -i" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "neplatný vstupní rozsah %s" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "neplatný počet řádků %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "zadáno více výstupních souborů" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "přepínače -e a -i nelze kombinovat" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "žádné řádky na opakování" @@ -9231,12 +9362,12 @@ msgstr "" "čekat po dobu danou součtem zadaných hodnot.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "chybné časový interval %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "z hodin reálného času nelze číst" @@ -9245,7 +9376,7 @@ msgstr "z hodin reálného času nelze číst" 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:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -9253,7 +9384,7 @@ msgstr "" "Řadicí přepínače:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9264,7 +9395,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:443 +#: src/sort.c:444 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -9275,14 +9406,14 @@ msgstr "" " -M, --month-sort porovnává podle měsíců\n" " (neznámý) < „LED“ < … < „PRO“\n" -#: src/sort.c:448 +#: src/sort.c:449 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:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9294,7 +9425,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:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9310,7 +9441,7 @@ msgstr "" " -V, --version-sort přirozené řazení (verzovacích) čísel v textu\n" "\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -9318,7 +9449,7 @@ msgstr "" "Další přepínače:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9326,7 +9457,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:473 +#: src/sort.c:474 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 " @@ -9342,7 +9473,7 @@ msgstr "" " pomocné soubory komprimuje příkazem PROGRAM,\n" " dekomprimuje je pomocí PROGRAM -d\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9357,7 +9488,7 @@ msgstr "" " Je-li S „-“, pak načte jména ze standardního " "vstupu\n" -#: src/sort.c:487 +#: src/sort.c:488 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -9366,7 +9497,7 @@ msgstr "" " a druh\n" " -m, --merge spojí již seřazené soubory, neřadí\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9381,7 +9512,7 @@ msgstr "" " -S, --buffer-size=VELIKOST\n" " použije VELIKOST pro hlavní paměťový buffer\n" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9406,7 +9537,7 @@ msgstr "" " -u, --unique s -c testuje striktní uspořádání;\n" " jinak vypíše pouze první ze stejných sekvencí\n" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9437,12 +9568,11 @@ msgstr "" "\n" "VELIKOST smí být následována těmito násobnými příponami:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -9457,117 +9587,117 @@ msgstr "" "Tradiční pořadí řazení, které používá hodnoty jednotlivých bajtů, získáte\n" "nastavením LC_ALL=C.\n" -#: src/sort.c:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "čekám na %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] skončil neobvykle" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "v %s nelze vytvořit dočasný soubor" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "soubor se nepodařilo otevřít" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "vyprázdnění souborového proudu selhalo" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "uzavření souboru selhalo" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "nelze vytvořit dočasný soubor" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "pro %s -d nelze založit proces" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "varování: nelze smazat: %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "argument %2$s za --%1$s je neplatný" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "minimální argument pro --%s je %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "argument %2$s za --%1$s je příliš velký" -#: src/sort.c:1359 +#: src/sort.c:1358 #, 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:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "číslo u --parallel nesmí být nulové" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "funkce stat selhala" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "čtení ze souboru se nezdařilo" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "převod řetězce selhal" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "nepřevedený řetězec byl %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "^ žádná shoda klíče\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "použit zastaralý klíč %s, zvažte použití %s" -#: src/sort.c:2428 +#: src/sort.c:2427 #, 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:2439 +#: src/sort.c:2438 #, 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:2452 +#: src/sort.c:2451 #, 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:2484 +#: src/sort.c:2483 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -9575,147 +9705,149 @@ 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:2490 +#: src/sort.c:2489 #, 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:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "zápis se nezdařil" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: neseřaditelný řádek: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "standardní chybový výstup" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "nelze číst" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: neplatné určení položky %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "přepínače „-%s“ nejsou slučitelné" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: neplatné číslo na začátku %s" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "neplatné číslo za „-“" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "neplatné číslo za „.“" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "zbloudilý znak v zadání řadicí položky" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "zadáno více kompresních programů" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "neplatné číslo na začátku položky" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "číslo položky je nula" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "posun znaku je nula" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" msgstr "neplatné číslo za „,“" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "zvolený oddělovač položek je prázdný" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "z %s nelze načíst jména souborů" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: neplatný název souboru s nulovou délkou" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "žádný vstup z %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "použijí se řadicí pravidla %s" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "použije se obyčejné porovnávání bajtů" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "další argument %s není s -%c dovolen" -#: src/split.c:186 -#, c-format -msgid "the suffix length needs to be at least %zu" +#: src/split.c:207 +#, fuzzy, c-format +msgid "the suffix length needs to be at least %" msgstr "délka přípony musí být alespoň %zu" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Použití: %s [PŘEPÍNAČ]… [VSTUP [PŘEDPONA]]\n" -#: src/split.c:207 +#: src/split.c:228 +#, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\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" -#: src/split.c:215 -#, c-format +#: src/split.c:236 +#, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file names\n" " -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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" " -a, --suffix-length=N použije přípony délky N (výchozí je %d)\n" @@ -9740,7 +9872,7 @@ msgstr "" " -u, --unbuffered okamžitě kopíruje vstup na výstup spolu s „-n r/" "…“\n" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9748,16 +9880,17 @@ 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:235 +#: src/split.c:258 +#, fuzzy 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" "\n" "DÍLŮ smí být:\n" @@ -9768,191 +9901,196 @@ 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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "přípony výstupních souborů vyčerpány" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "vytvářím soubor %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "%s by přepsalo vstup; zpracování přerušeno" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "proměnnou prostředí FILE se nepodařilo nastavit" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "provádí se s FILE=%s\n" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "rouru nebylo možné vytvořit" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "zavírá se předchozí roura" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "zavírá se výstupní roura" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "přesunuje se vstupní roura" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "zavírá se vstupní roura" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "selhalo spuštění příkazu: „%s -c %s“" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "uzavření vstupní roury selhalo" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "čeká se na proces potomka" -#: src/split.c:473 +#: src/split.c:527 #, 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:481 +#: src/split.c:535 #, 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:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "neznámý návratový kód příkazu (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "soubor nelze rozdělit více způsoby" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: neplatný počet dílů" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: chybné číslo dílů" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: chybná délka přípony" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: chybný počet bajtů" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: chybný počet řádků" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "zvolený oddělovač položek %s má více znaků" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "multiplexované znakové zařízení" -#: src/split.c:1286 +#: src/split.c:1383 #, 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:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: chybná počáteční hodnota číselné přípony" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: chybná velikost I/O bloku" -#: src/split.c:1347 +#: src/split.c:1437 #, 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:1384 +#: src/split.c:1477 #, 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:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "normalizace %s selhala" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "pozor: neznámá escape sekvence „\\%c“" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: chybná specifikace" -#: src/stat.c:1231 +#: src/stat.c:1234 #, 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:1262 +#: src/stat.c:1265 #, 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:1269 +#: src/stat.c:1272 #, 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:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9968,7 +10106,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9978,30 +10116,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr " Kontext: %C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -10013,11 +10151,11 @@ msgstr "" "Změna i-uzlu: %z\n" " Vznik: %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "Zobrazí informace o souboru nebo souborovém systému.\n" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" @@ -10026,7 +10164,7 @@ msgstr "" " -f, --file-system zobrazí informace o souborovém systému místo " "o souboru\n" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -10043,7 +10181,7 @@ msgstr "" " přidejte do FORMÁTU „\\n“\n" " -t, --terse vytiskne informace ve stručné podobě\n" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -10063,7 +10201,7 @@ msgstr "" " %B velikost bloku z %b v bajtech\n" " %C řetězec selinuxového bezpečnostního kontextu\n" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -10079,7 +10217,7 @@ msgstr "" " %g ID skupiny vlastníka\n" " %G jméno skupiny vlastníka\n" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -10102,7 +10240,7 @@ msgstr "" " %t hlavní číslo zařízení šestnáctkově, pro znaková a bloková zařízení\n" " %T vedlejší číslo zařízení šestnáctkově, pro znaková a bloková zařízení\n" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -10129,7 +10267,7 @@ msgstr "" " %Z čas poslední změny stavu v sekundách od počátku unixové epochy\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -10147,7 +10285,7 @@ msgstr "" " %d volných i-uzlů v systému souborů\n" " %f volných bloků v systému souborů\n" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -10221,11 +10359,11 @@ msgstr "" "REŽIM bajtů.\n" #: src/stdbuf.c:116 +#, fuzzy 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" +"for example) then that will override corresponding changes 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 "" @@ -10257,7 +10395,7 @@ msgstr "bufferování po řádcích standardního vstupu nemá význam" msgid "you must specify a buffering mode option" msgstr "musíte zadat přepínač režimu bufferování" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10268,11 +10406,11 @@ msgstr "" " nebo: %s [-F ZAŘÍZENÍ] | --file=ZAŘÍZENÍ] [-a|--all]\n" " nebo: %s [-F ZAŘÍZENÍ] | --file=ZAŘÍZENÍ] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "Vypíše nebo změní nastavení terminálu.\n" -#: src/stty.c:528 +#: src/stty.c:536 msgid "" " -a, --all print all current settings in human-readable form\n" " -g, --save print all current settings in a stty-readable form\n" @@ -10282,7 +10420,7 @@ msgstr "" " -g, --save vypíše všechna nastavení ve formě pro stty\n" " -F, --file=ZAŘÍZENÍ místo stdin otevře a použije zadané zařízení\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10293,11 +10431,24 @@ msgstr "" "nedefinované normou POSIX. Použitý systém určuje, která nastavení jsou " "možná.\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -10308,9 +10459,13 @@ msgstr "" " eof ZNAK ZNAK, který posílá „konec souboru“ (ukončení vstupu)\n" " eol ZNAK ZNAK, který ukončuje řádek\n" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -10320,35 +10475,58 @@ msgstr "" " intr ZNAK ZNAK, který zasílá signál interrupt\n" " kill ZNAK ZNAK, který maže aktuální řádek\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" msgstr "" -" * lnext ZNAK ZNAK, který znemožňuje interpretaci dalšího znaku (quote)\n" -" quit ZNAK ZNAK, který posílá signál quit\n" -" * 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:559 +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 ZNAK ZNAK, který pozastavuje výstup\n" " susp ZNAK ZNAK, který posílá signál „terminal stop“\n" " * 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:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 +#, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Speciální nastavení:\n" +" N nastaví vstupní a výstupní rychlost na N baudů\n" +" * cols N sdělí jádru, že terminál má N sloupců\n" +" * columns N stejné jako cols N\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -10358,10 +10536,17 @@ msgstr "" " * cols N sdělí jádru, že terminál má N sloupců\n" " * columns N stejné jako cols N\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -10372,11 +10557,23 @@ msgstr "" " čtení\n" " ospeed N nastaví rychlost výstupu na N\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N pošle jádru OS, že terminál má N řádků\n" +" * size vypíše počet řádků a sloupců podle jádra OS\n" +" speed vypíše rychlost terminálu\n" +" time N spolu s -icanon nastaví časový limit pro čtení na N " +"desetin\n" +" sekundy\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -10387,25 +10584,28 @@ msgstr "" "desetin\n" " sekundy\n" -#: src/stty.c:584 +#: src/stty.c:641 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" -" * [-]cdtrdsr umožní „handshake“ DTR/DSR\n" -" csN nastaví velikost znaku na N bitů, N je 5–8\n" -#: src/stty.c:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 +#, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -10413,7 +10613,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb použije dva stop bity (jeden stop bit pomocí „-“)\n" " [-]hup pošle signál hangup, když poslední proces uzavře tty\n" @@ -10422,7 +10621,12 @@ msgstr "" " [-]parodd nastaví lichou paritu (nebo sudou pomocí „-“)\n" " * [-]cmspar použije trvalou (stick) paritu (značka/mezera)\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -10430,6 +10634,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Nastavení vstupu:\n" @@ -10438,10 +10643,14 @@ msgstr "" " [-]ignbrk ignoruje znak break\n" " [-]igncr ignoruje znak CR (carriage return)\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -10454,14 +10663,23 @@ msgstr "" " [-]inpck začne kontrolovat paritu na vstupu\n" " [-]istrip nuluje horní (8.) bit vstupních znaků\n" -#: src/stty.c:616 +#: src/stty.c:692 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:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr " * [-]iutf8 předpokládá vstupní znaky kódované v UTF-8\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -10474,59 +10692,83 @@ msgstr "" " [-]parmrk označí chyby parity (sekvencí 255-0-znak)\n" " [-]tandem jako [-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Nastavení výstupu:\n" -" * bsN způsob čekání na backspace, N je 0–1\n" -" * crN způsob čekání na CR (carriage return), N je 0–3\n" -" * 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:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" msgstr "" -" * [-]ocrnl překládá CR (cariage return) na LF (newline)\n" -" * [-]ofdel použije znak „delete“ místo znaku NUL pro výplně\n" -" * [-]ofill použije vyplňovací znak místo čekání\n" -" * [-]olcuc překládá malá písmena na velká\n" -" * [-]onlcr překládá LF (newline) na CRLF (carriage return-newline)\n" -" * [-]onlret LF (newline) provede CR (carriage return)\n" -#: src/stty.c:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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 "" -" * [-]onocr v prvním sloupci netiskne CR (carriage return)\n" -" [-]opost zpracování postprocesorem\n" -" * tabN způsob čekání na vodorovný tabelátor, N je 0–3\n" -" * tabs jako tab0\n" -" * -tabs jako tab3\n" -" * vtN způsob čekání na svislý tabelátor, N je 0–1\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10537,42 +10779,64 @@ msgstr "" " * crtkill zruší celý řádek podle nastavení echoprt a echoe\n" " * -crtkill zruší celý řádek podle nastavení echoctl a echok\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +#, fuzzy +msgid " [-]echo echo input characters\n" +msgstr " * [-]iutf8 předpokládá vstupní znaky kódované v UTF-8\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]ctlecho řídící znaky přepisuje v notaci se stříškou („^c“)\n" -" [-]echo opisuje vstupní znaky\n" -" * [-]echoctl jako [-]ctlecho\n" -" [-]echoe jako [-]crterase\n" -" [-]echok vypíše znak CR (newline) po znaku „kill“\n" -#: src/stty.c:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]echoke jako [-]crtkill\n" -" [-]echonl pokud není vypsán jiný znak, vypíše LF (newline)\n" -" * [-]echoprt vypisuje vymazané znaky pozpátku, mezi „\\“ a „/“\n" -" [-]icanon povolí speciální znaky erase, kill, werase a rprnt\n" -" [-]iexten povolí speciální znaky, které neodpovídají normě POSIX.\n" +" [-]isig povolí speciální znaky interrupt, quit a suspend\n" +" [-]noflsh zakáže vyprázdnění bufferů po speciálních znacích " +"interrupt\n" +" a quit\n" +" * [-]prterase jako [-]echoprt\n" +" * [-]tostop pozastaví procesy na pozadí, které se pokoušejí o zápis\n" +" na terminál\n" +" * [-]xcase spolu s icanon použije escape sekvenci („\\“) pro velká " +"písmena\n" -#: src/stty.c:672 +#: src/stty.c:843 +#, fuzzy 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 "" " [-]isig povolí speciální znaky interrupt, quit a suspend\n" " [-]noflsh zakáže vyprázdnění bufferů po speciálních znacích " @@ -10584,11 +10848,33 @@ msgstr "" " * [-]xcase spolu s icanon použije escape sekvenci („\\“) pro velká " "písmena\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -10598,12 +10884,12 @@ msgstr "" " cbreak jako -icanon\n" " -cbreak jako icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 jako brkint ignpar istrip icrnl ixon opost isig\n" " znaky icanon, eof a eol jsou nastaveny na jejich " @@ -10612,28 +10898,38 @@ msgstr "" " -cooked jako raw\n" " crt jako echoe echoctl echoke\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -" dec jako echoe echoctl echoke -ixany intr ^c erase 0177 kill " -"^u\n" -" * [-]decctlq jako [-]ixany\n" -" ek znaky erase a kill vrátí na jejich implicitní hodnoty\n" -" evenp jako parenb -parodd cs7\n" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 +#, fuzzy 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 "" " -evenp jako -parenb cs8\n" " * [-]lcase jako xcase iuclc olcuc\n" @@ -10642,7 +10938,19 @@ msgstr "" " nl jako -icrnl -onlcr\n" " -nl jako icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"Nastavení kombinací:\n" +" * [-]LCASE jako [-]lcase\n" +" cbreak jako -icanon\n" +" -cbreak jako icanon\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10656,11 +10964,12 @@ msgstr "" " pass8 jako -parenb -istrip cs8\n" " -pass8 jako parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw jako -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" @@ -10668,14 +10977,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw jako cooked\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane jako cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10684,7 +10994,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, všechny speciální\n" " znaky vrátí na jejich implicitní hodnoty\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10699,12 +11009,12 @@ msgstr "" "127; speciální hodnoty ^- nebo „undef“ jsou použity pro zákaz speciálních\n" "znaků.\n" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "pouze jedno zařízení může být zadáno" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10712,45 +11022,50 @@ msgid "" msgstr "" "přepínače pro upovídaný a stty čitelný styl výstupu se vzájemně vylučují" -#: src/stty.c:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: neblokovací mód souboru nelze zrušit" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "argument %s je neplatný" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "postrádám argument pro %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: chyba při zkracování souboru" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "chybná linková disciplína %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: všechny požadované operace nelze provést" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: pro toto zařízení neexistuje informace o velikosti" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "chybná celočíselný argument %s" #. This is a proper name. See the gettext manual, section Names. @@ -10759,8 +11074,15 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Vypíše CRC kontrolní součet a počet bajtů v každém SOUBORU.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -10770,20 +11092,54 @@ msgstr "" " -r použije BSD algoritmus a bloky po 1 K\n" " -s, --sysv použije System V algoritmus a bloky po 512 bajtech\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Použití: %s [PŘEPÍNAČ] [SOUBOR]…\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Donutí pozměněné bloky zapsat na disk, aktualizuje superblok.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" -#: src/sync.c:69 +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "chyba při čtení %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: neblokovací mód souboru nelze zrušit" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "chyba při čtení %s" + +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "ignoruji všechny argumenty" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10796,15 +11152,23 @@ 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:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help vypíše tuto nápovědu a skončí\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version vypíše označení verze a skončí\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Není-li uveden SOUBOR nebo když je SOUBOR „-“, čte ze standardního vstupu.\n" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -10813,7 +11177,7 @@ msgstr "" "Povinné argumenty dlouhých přepínačů jsou také povinné u odpovídajících\n" "krátkých přepínačů.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10825,7 +11189,7 @@ msgstr "" "10 * 1024). Jednotky jsou K, M, G, T, P, E, Z, Y (mocniny 1024) nebo\n" "KB, MB, … (mocniny 1000).\n" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10839,7 +11203,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:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -10852,25 +11216,29 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" "Chyby v překladu %s hlaste na \n" "(česky).\n" -#: src/system.h:584 +#: src/system.h:604 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "Full documentation at: <%s%s>\n" msgstr "" -"Úplnou dokumentaci lze získat příkazem: info coreutils '%s invocation'\n" -#: src/system.h:591 +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "" + +#: src/system.h:613 #, 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:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10891,9 +11259,8 @@ msgid "Jay Lepreau" msgstr "Jay Lepreau" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, last line first.\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" @@ -10909,64 +11276,63 @@ msgstr "" " -s, --separator=ŘETĚZEC použije ŘETĚZCE jako oddělovače místo nového " "řádku\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: pohyb v souboru selhal" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "záznam je příliš dlouhý" -#: src/tac.c:450 +#: src/tac.c:459 #, 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:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" msgstr "soubor %s se nepodařilo se otevřít pro zápis" -#: src/tac.c:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" msgstr "selhalo převinutí proudu souboru %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: chyba při zápisu" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "otevření %s pro čtení selhalo" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "oddělovač nemůže být prázdný" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 -#, c-format +#: src/tail.c:257 +#, 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" 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" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" @@ -10976,7 +11342,7 @@ msgstr "" "z každého\n" " souboru\n" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10990,7 +11356,7 @@ msgstr "" " chybějící hodnota znamená „descriptor“\n" " -F stejné jako --follow=name --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -11015,7 +11381,7 @@ msgstr "" "tento přepínač\n" " nemá valného smyslu\n" -#: src/tail.c:293 +#: src/tail.c:288 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -11026,7 +11392,7 @@ msgstr "" " --retry bude zkoušet otevřít soubor, i když je " "nedostupný\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -11039,7 +11405,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:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -11057,7 +11423,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:316 +#: src/tail.c:311 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" @@ -11074,22 +11440,22 @@ msgstr "" "soubor daného jména takovým způsobem, aby se vyrovnal s jeho přejmenováním,\n" "smazáním a vytvořením.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "uzavírání %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, 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:898 +#: src/tail.c:893 #, 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:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -11098,152 +11464,152 @@ 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:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "soubor %s byl nahrazen symbolickým odkazem; s tímto jménem je konec" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s se stal nedostupným" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s se stal znovu dostupným" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "soubor %s se objevil, sledování konce nového souboru pokračuje" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "" "soubor %s byl nahrazen jiným, sledování konce nového souboru pokračuje." -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: neblokující režim nelze změnit" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: soubor byl zkrácen" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "již nezbývají žádné soubory" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "rodičovský adresář %s nelze sledovat" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "zdroje pro inotify vyčerpány" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "%s nelze sledovat" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: přepsat %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "chyba při sledování události inotify" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "chyba při čtení události inotify" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "%s: nelze sledovat konec souboru tohoto typu; sledování ukončeno" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "počet v %s je příliš velký" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "" "%s: neplatné číslo maximálního počtu nezměněných výsledků funkce stat\n" "mezi otevřeními" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: neplatný PID" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: neplatný počet sekund" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "neplatný počet sloupců: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "přepínač použit v chybném kontextu  – %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" "pozor: --retry ignorován; --retry je užitečný pouze v případě sledování konce" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "pozor: --retry je účinný jen při prvním otevření" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" "pozor: PID ignorován; --pid=PID je užitečný pouze v případě sledování konce" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "pozor: --pid=PID není na tomto systému podporován" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "%s nelze sledovat podle jména" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "varování: sledování standardního vstupu je určitě neefektivní" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "inotify nelze použít, návrat k aktivnímu dotazování" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -11255,60 +11621,72 @@ msgstr "" " -a, --append připojí k daným SOUBORŮM, nepřepisuje je\n" " -i, --ignore-interrupts ignoruje signál „interrupt“\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Je-li SOUBOR „-“, kopíruje opět na standardní výstup.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "za %s postrádám argument" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "neplatné celé číslo %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "očekávána „)“" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "očekávána „)“, nalezeno %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: očekáván unární operátor" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "k přepínači -nt nemůže být uveden přepínač -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "k přepínači -ef nemůže být uveden přepínač -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "k přepínači -ot nemůže být uveden přepínač -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "neznámý binární operátor" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: očekáván binární operátor" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11322,7 +11700,7 @@ msgstr "" " nebo: [ ]\n" " nebo: [ OPTION\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11330,7 +11708,7 @@ msgstr "" "Ukončí se s návratovým kódem určeným VÝRAZEM.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11340,7 +11718,7 @@ msgstr "" "Vynechaný VÝRAZ značí nepravdu. Jinak VÝRAZ je pravda nebo nepravda\n" "a nastavuje návratový kód. VÝRAZ je jedním z:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11354,7 +11732,7 @@ msgstr "" " VÝRAZ1 -a VÝRAZ2 VÝRAZ1 i VÝRAZ2 jsou pravdivé\n" " VÝRAZ1 -o VÝRAZ2 VÝRAZ1 nebo VÝRAZ2 je pravdivý\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11370,7 +11748,7 @@ msgstr "" " ŘETĚZEC1 = ŘETĚZEC2 řetězce jsou shodné\n" " ŘETĚZEC1 != ŘETĚZEC2 řetězce se neshodují\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11390,7 +11768,7 @@ msgstr "" " CELÉ_ČÍSLO1 -lt CELÉ_ČÍSLO2 CELÉ_ČÍSLO1 je menší než CELÉ_ČÍSLO2\n" " CELÉ_ČÍSLO1 -ne CELÉ_ČÍSLO2 CELÉ_ČÍSLO1 není rovno CELÉMU_ČÍSLU2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11403,7 +11781,7 @@ msgstr "" " SOUBOR1 -nt SOUBOR2 SOUBOR1 je novější (datum změny obsahu) než SOUBOR2\n" " SOUBOR1 -ot SOUBOR2 SOUBOR1 je starší než SOUBOR2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11417,7 +11795,7 @@ msgstr "" " -d SOUBOR SOUBOR existuje a je to adresář\n" " -e SOUBOR SOUBOR existuje\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11431,7 +11809,7 @@ msgstr "" " -h SOUBOR SOUBOR existuje a je to symbolický odkaz (stejné jako -L)\n" " -k SOUBOR SOUBOR existuje a má nastaven „sticky“ bit\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11445,7 +11823,7 @@ msgstr "" " -r SOUBOR SOUBOR existuje a je čitelný\n" " -s SOUBOR SOUBOR existuje a má délku větší než nula\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11460,7 +11838,7 @@ msgstr "" " -x SOUBOR SOUBOR existuje a je spustitelný (nebo vstoupitelný " "adresář)\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11474,7 +11852,7 @@ msgstr "" "lomítky). CELÉ_ČÍSLO také může být -l ŘETĚZEC, který je vyhodnocen jako\n" "délka řetězce.\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11484,25 +11862,25 @@ msgstr "" "POZNÁMKA: Na rozdíl od test, [ přepínače --help a --version zpracovává.\n" "test je považuje za neprázdný ŘETĚZEC jako jakýkoliv jiný.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test a/nebo [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "chybí „]“" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "nadbytečný argumentů %s" @@ -11522,7 +11900,7 @@ msgstr "pozor: timer_settime" msgid "warning: timer_create" msgstr "pozor: timer_create" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11531,11 +11909,11 @@ msgstr "" "Použití: %s [PŘEPÍNAČ] DOBA PŘÍKAZ [ARG]…\n" " nebo: %s [PŘEPÍNAČ]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 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:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11568,7 +11946,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:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11579,7 +11957,7 @@ msgstr "" "DOBA je desetinné číslo s možnou příponou:\n" "„s“ pro sekundy (výchozí), „m“ pro minuty, „h“ pro hodiny nebo „d“ pro dny.\n" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -11598,7 +11976,7 @@ msgstr "" "nelze zachytit. Je-li zaslán signál KILL (9), návratový kód bude 128+9\n" "místo 124.\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "pozor: nepodařilo se vypnout vytváření výpisů paměti" @@ -11613,6 +11991,11 @@ msgstr "chyba při čekání na příkaz" msgid "the monitored command dumped core" msgstr "sledovaný příkaz skončil uložením obrazu paměti" +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "neznámý návratový kód příkazu (0x%X)" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -11985,12 +12368,12 @@ msgstr "Skončí s návratovým kódem značícím úspěch." msgid "Exit with a status code indicating failure." msgstr "Skončí s návratovým kódem značícím selhání." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Použití: %s PŘEPÍNAČ… SOUBOR…\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -12008,17 +12391,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:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create nevytváří žádné soubory\n" -#: src/truncate.c:112 +#: src/truncate.c:85 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:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" @@ -12026,7 +12409,7 @@ msgstr "" " -r, --reference=SOUBOR použije velikost tohoto SOUBORU\n" " -s, --size=VELIKOST použije tuto VELIKOST v bajtech\n" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -12039,57 +12422,62 @@ 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:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "přetečení v % * % bajt bloků u souboru %s" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s má nepoužitelnou, zjevně zápornou velikost" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "velikost %s nelze zjistit" -#: src/truncate.c:205 +#: src/truncate.c:178 #, 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:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "přetečení při prodlužování velikosti souboru %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "zkrácení %s na % bajtů selhalo" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "zadáno více relativních modifikátorů" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "neplatné číslo %s" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "musíte zadat buď %s, nebo %s" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "musíte zadat relativní %s s %s" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "bylo zadáno %s, ale nebylo %s" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "%s nelze otevřít pro zápis" @@ -12100,12 +12488,10 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Použití: %s [PŘEPÍNAČ] [SOUBOR]\n" "Výstupem je úplně uspořádaný seznam v souladu s částečným uspořádáním ze\n" @@ -12113,12 +12499,17 @@ msgstr "" "vstup.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: vstup obsahuje lichý počet položek" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: vstup obsahuje cyklus:" @@ -12185,9 +12576,8 @@ msgid "cannot get system name" msgstr "nelze zjistit název systému" #: 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" +#, fuzzy +msgid "Convert blanks in each FILE to tabs, writing to standard output.\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" @@ -12243,9 +12633,10 @@ msgstr "" " každou skupinu\n" #: src/uniq.c:187 +#, fuzzy msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" " -D, --all-repeated[=ZPŮSOB]\n" @@ -12259,9 +12650,10 @@ msgid " -f, --skip-fields=N avoid comparing the first N fields\n" msgstr " -f, --skip-fields=N neporovnává prvních N položek\n" #: src/uniq.c:195 +#, fuzzy msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" " --group[=ZPŮSOB] zobrazí všechny položky, skupiny oddělí prázdným\n" @@ -12420,11 +12812,6 @@ msgstr "" " Procesy v nepřerušitelném\n" "spánku rovněž přispívají do průměrné zátěže.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -12445,12 +12832,17 @@ msgstr "" "Pokud není SOUBOR zadán, použije se %s. Obvyklý SOUBOR je %s.\n" "\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -12469,12 +12861,13 @@ msgstr "" " -l, --lines vypíše počet řádků (resp. výskytů znaku nový " "řádek)\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=S zpracuje obsah souborů, jejichž jména oddělená\n" @@ -12646,10 +13039,10 @@ msgstr "" "příkaz id -un.\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: jméno uživatele pro UID %lu nelze najít\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "jméno uživatele pro UID %s nelze najít" #: src/yes.c:41 #, c-format @@ -12668,6 +13061,224 @@ msgstr "" "Opakovaně vypisuje řádku se zadanými ŘETĚZCI nebo s „y“.\n" "\n" +#~ 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" + +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "-t je implikováno, pokud DÉLKA_STRÁNKY <= 10. Nebude-li SOUBOR zadán " +#~ "nebo\n" +#~ "bude-li „-“, pak bude čten standardní vstup.\n" + +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Není-li uveden SOUBOR nebo když je SOUBOR „-“, čte ze standardního " +#~ "vstupu.\n" +#~ "Výchozí je „-F /“.\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Donutí pozměněné bloky zapsat na disk, aktualizuje superblok.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "ignoruji všechny argumenty" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: chybné číslo" + +# src/tail.c:968 +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s je příliš velký, proto není reprezentovatelný" + +#~ msgid "number of lines" +#~ msgstr "počet řádků" + +#~ msgid "number of bytes" +#~ msgstr "počet bajtů" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: chybný počet na ignorování" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: chybný počet bajtů" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: chybný počet řádků" + +#~ msgid "number in %s is too large" +#~ msgstr "počet v %s je příliš velký" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: neplatný počet sekund" + +#~ msgid "failed to %s supplemental groups" +#~ msgstr "doplňkové skupinu(y) nelze %s" + +#~ 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 "" +#~ "\n" +#~ "Zaslání signálu %s běžícímu procesu „dd“ způsobí vypsání statistických\n" +#~ "informací o vstupně-výstupních operacích na standardní chybový výstup.\n" +#~ "Pak se obnoví kopírování.\n" +#~ "\n" +#~ " $ dd if=/dev/zero of=/dev/null& pid=$!\n" +#~ " $ kill -%s $pid; sleep 1; kill $pid\n" +#~ " 18335302+0 záznamů přečteno\n" +#~ " 18335302+0 záznamů zapsáno\n" +#~ " 9 387 674 624 bajtů (9,4 GB) zkopírováno, 34,6279 s, 271 MB/s\n" +#~ "\n" +#~ "Volby jsou:\n" +#~ "\n" + +#~ 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 ZNAK ZNAK, který znemožňuje interpretaci dalšího znaku " +#~ "(quote)\n" +#~ " quit ZNAK ZNAK, který posílá signál quit\n" +#~ " * rprnt ZNAK ZNAK, který překresluje aktuální řádek\n" +#~ " start ZNAK ZNAK, který znovu spustí výstup po jeho pozastavení\n" + +#~ 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" +#~ " * [-]cdtrdsr umožní „handshake“ DTR/DSR\n" +#~ " csN nastaví velikost znaku na N bitů, N je 5–8\n" + +#~ 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 "" +#~ "\n" +#~ "Nastavení výstupu:\n" +#~ " * bsN způsob čekání na backspace, N je 0–1\n" +#~ " * crN způsob čekání na CR (carriage return), N je 0–3\n" +#~ " * 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" + +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl překládá CR (cariage return) na LF (newline)\n" +#~ " * [-]ofdel použije znak „delete“ místo znaku NUL pro výplně\n" +#~ " * [-]ofill použije vyplňovací znak místo čekání\n" +#~ " * [-]olcuc překládá malá písmena na velká\n" +#~ " * [-]onlcr překládá LF (newline) na CRLF (carriage return-newline)\n" +#~ " * [-]onlret LF (newline) provede CR (carriage return)\n" + +#~ 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 "" +#~ " * [-]onocr v prvním sloupci netiskne CR (carriage return)\n" +#~ " [-]opost zpracování postprocesorem\n" +#~ " * tabN způsob čekání na vodorovný tabelátor, N je 0–3\n" +#~ " * tabs jako tab0\n" +#~ " * -tabs jako tab3\n" +#~ " * vtN způsob čekání na svislý tabelátor, N je 0–1\n" + +#~ 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 "" +#~ " * [-]ctlecho řídící znaky přepisuje v notaci se stříškou („^c“)\n" +#~ " [-]echo opisuje vstupní znaky\n" +#~ " * [-]echoctl jako [-]ctlecho\n" +#~ " [-]echoe jako [-]crterase\n" +#~ " [-]echok vypíše znak CR (newline) po znaku „kill“\n" + +#~ 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 "" +#~ " * [-]echoke jako [-]crtkill\n" +#~ " [-]echonl pokud není vypsán jiný znak, vypíše LF (newline)\n" +#~ " * [-]echoprt vypisuje vymazané znaky pozpátku, mezi „\\“ a „/“\n" +#~ " [-]icanon povolí speciální znaky erase, kill, werase a rprnt\n" +#~ " [-]iexten povolí speciální znaky, které neodpovídají normě POSIX.\n" + +#~ 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 "" +#~ " dec jako echoe echoctl echoke -ixany intr ^c erase 0177 kill " +#~ "^u\n" +#~ " * [-]decctlq jako [-]ixany\n" +#~ " ek znaky erase a kill vrátí na jejich implicitní hodnoty\n" +#~ " evenp jako parenb -parodd cs7\n" + +#~ msgid "For complete documentation, run: info coreutils '%s invocation'\n" +#~ msgstr "" +#~ "Úplnou dokumentaci lze získat příkazem: info coreutils '%s invocation'\n" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: jméno uživatele pro UID %lu nelze najít\n" + #~ msgid "cannot create pipe" #~ msgstr "nelze vytvořit rouru" @@ -13341,18 +13952,6 @@ msgstr "" #~ " -R, --recursive pracuje i se soubory a adresáři v podadresářích\n" #~ " -v, --verbose vypíše informaci o každém zpracovávaném souboru\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 "" -#~ "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" - #~ msgid "" #~ "\n" #~ "SIZE may be (or may be an integer optionally followed by) one of " @@ -13712,9 +14311,6 @@ msgstr "" #~ msgid "FIXME unknown" #~ msgstr "OPRAVMĚ neznámý" -#~ msgid "Usage: %s [OPTION] [FILE]...\n" -#~ msgstr "Použití: %s [PŘEPÍNAČ] [SOUBOR]…\n" - #~ msgid "Richard Stallman" #~ msgstr "Richard Stallman" diff --git a/po/da.gmo b/po/da.gmo index 4bbb3d68..1cb27f9f 100644 Binary files a/po/da.gmo and b/po/da.gmo differ diff --git a/po/da.po b/po/da.po index 2434a29d..4e4f9211 100644 --- a/po/da.po +++ b/po/da.po @@ -1,4 +1,4 @@ -# translation of coreutils-8.22-pre4.po to Danish +# translation of coreutils-8.23-pre1.po to Danish # Danish messages for core-utils. # Copyright (C) 1996, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. # This file is distributed under the same license as the coreutils package. @@ -69,12 +69,13 @@ # translate (programmet tr) -> transformér # join (programmet join) -> flette # +#: src/stty.c:941 msgid "" msgstr "" -"Project-Id-Version: coreutils-8.22-pre4\n" +"Project-Id-Version: coreutils-8.23-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" -"PO-Revision-Date: 2014-02-23 20:14+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" +"PO-Revision-Date: 2014-11-17 17:20+0100\n" "Last-Translator: Ask Hjorth Larsen \n" "Language-Team: Danish \n" "Language: da\n" @@ -102,18 +103,18 @@ msgstr "Gyldige argumenter er:" msgid "error closing file" msgstr "fejl ved lukning af fil" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "skrivefejl" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "beholder rettigheder for %s" @@ -164,7 +165,7 @@ msgstr "tegnspecialfil" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "kontinuerte data" #: lib/file-type.c:75 msgid "fifo" @@ -172,52 +173,48 @@ msgstr "fifo" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "dør" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "blokspecialfil" +msgstr "multiplekset blokspecialfil" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "tegnspecialfil" +msgstr "multiplekset tegnspecialfil" #: lib/file-type.c:87 -#, fuzzy msgid "multiplexed file" -msgstr "flere roller" +msgstr "multiplekset fil" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "mærkværdig fil" +msgstr "navngiven fil" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "blokspecialfil" +msgstr "netværksspecialfil" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "fil migreret med data" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "fil migreret uden data" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "port" #: lib/file-type.c:105 msgid "socket" msgstr "sokkel" +# ikke sikker på kontekst #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "whiteout" #: lib/file-type.c:110 msgid "weird file" @@ -299,57 +296,62 @@ msgstr "Parameterstreng er ikke korrekt kodet" msgid "Unknown error" msgstr "Ukendt fejl" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: flaget '%s' er flertydigt; muligheder:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: flaget '-W %s' er flertydigt\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: flaget '--%s' tillader ikke et argument\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: flaget '%c%s' tillader ikke et argument\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: flaget '--%s' kræver et argument\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: ugyldigt flag '--%s'\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: ugyldigt flag '%c%s'\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ugyldigt flag -- %c\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: flaget kræver et argument -- %c\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: flaget '-W %s' er flertydigt\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: flaget '-W %s' tillader ikke et argument\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: flaget '-W %s' kræver et argument\n" @@ -359,13 +361,13 @@ msgstr "%s: flaget '-W %s' kræver et argument\n" msgid "cannot change permissions of %s" msgstr "kan ikke ændre adgangsrettigheder på %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "kan ikke oprette katalog %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "hukommelsen opbrugt" @@ -414,6 +416,12 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: filslut" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: læsefejl" + #: lib/regcomp.c:131 msgid "Success" msgstr "Success" @@ -521,7 +529,7 @@ msgstr "^[YyJj]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "sætter adgangsrettigheder på %s" @@ -962,7 +970,7 @@ msgstr "" "Kod eller afkod FIL eller standard-ind i Base64, og udskriv til standard-" "ud.\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -978,15 +986,7 @@ msgstr "" " Brug 0 for at slå linjeombrydning fra\n" "\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Hvis ingen FIL er angivet, eller FIL er -, læses fra standard-ind.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -1000,51 +1000,51 @@ 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:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "læsefejl" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "ugyldig inddata" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "ugyldig ombrydningsstørrelse: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "ekstra operand %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "lukker standard-ind" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1067,7 +1067,6 @@ msgstr "" "Hvis SUFFIKS er angivet, fjernes også afsluttende SUFFIKS.\n" #: src/basename.c:60 -#, fuzzy msgid "" " -a, --multiple support multiple arguments and treat each as a NAME\n" " -s, --suffix=SUFFIX remove a trailing SUFFIX; implies -a\n" @@ -1075,8 +1074,8 @@ msgid "" 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" +" -s, --suffix=SUFFIKS fjern efterfølgende SUFFIKS; medfører -a\n" +" -z, --zero afslut hver udlinje med NUL frem for linjeskift\n" #: src/basename.c:67 #, c-format @@ -1096,11 +1095,11 @@ msgstr "" " %s -a noget/str1 noget/str2 -> \"str1\" efterfulgt af \"str2\"\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" @@ -1108,27 +1107,32 @@ msgstr "manglende operand" # Navn jf. http://www.nada.kth.se/~tege/ #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjørn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Brug: %s [FLAG]... [FIL]...\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "Skriv det samlede, sorterede indhold af FILer til standard-ud.\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1147,7 +1151,7 @@ msgstr "" " -n, --number nummerér alle ud-linjer\n" " -s, --squeeze-blank skriv aldrig mere end én blank linje ad gangen\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1159,7 +1163,7 @@ msgstr "" " -u (ignoreret)\n" " -v, --show-nonprinting brug ^ og M- notation, undtagen for LFD og TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1172,17 +1176,18 @@ msgstr "" " %s f - g Udskriv f's indhold, dernæst standard-ind, dernæst g's indhold.\n" " %s Kopiér standard-ind til standard-ud.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "kan ikke udføre ioctl på %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "standard-ud" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: indfil er udfil" @@ -1194,10 +1199,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1212,8 +1217,8 @@ msgstr "kunne ikke oprette sikkerhedskontekst: %s" msgid "failed to set %s security context component to %s" msgstr "kunne ikke sætte %s-sikkerhedskontekstkomponent til %s" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "kunne ikke hente sikkerhedskontekst for %s" @@ -1228,13 +1233,13 @@ msgstr "kan ikke anvende delvis kontekst til umærket fil %s" 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:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "kan ikke tilgå %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "kan ikke læse katalog %s" @@ -1250,7 +1255,7 @@ msgstr "ændrer sikkerhedskontekst for %s\n" msgid "fts_read failed" msgstr "fts_read mislykkedes" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1363,7 +1368,7 @@ msgid "-R -h requires -P" msgstr "-R -h kræver -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1380,9 +1385,8 @@ msgid "conflicting security context specifiers given" msgstr "der er givet modstridende specifikationer for sikkerhedskontekst" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "kunne ikke hente attributter for %s" @@ -1691,17 +1695,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "ugyldig gruppe %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "ugyldig gruppeliste %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1710,7 +1714,7 @@ msgstr "" "Brug: %s [FLAG] NYROD [KOMMANDO [ARG]...]\n" " eller: %s FLAG\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1718,15 +1722,26 @@ msgstr "" "Kør KOMMANDO med rod-kataloget sat til NYROD.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" +" --userspec=BRUGER:GRUPPE angiv bruger og gruppe (ID eller navn)\n" +" --groups=G_LISTE angiv supplerende grupper som g1,g2,..,gN\n" + +#: src/chroot.c:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" " --userspec=BRUGER:GRUPPE angiv bruger og gruppe (ID eller navn)\n" " --groups=G_LISTE angiv supplerende grupper som g1,g2,..,gN\n" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" @@ -1735,42 +1750,47 @@ msgstr "" "Hvis ingen kommando er angivet, køres '${SHELL} -i' (som standard: /bin/" "sh).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "kan ikke ændre rod-kataloget til %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "kan ikke ændre til rod-katalog" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" -msgstr "" +msgstr "ingen gruppe angivet for ukendt uid: %d" -#: src/chroot.c:383 -#, fuzzy, c-format +#: src/chroot.c:400 +#, c-format msgid "failed to get supplemental groups" -msgstr "kunne ikke sætte supplerende grupper" +msgstr "kunne ikke hente supplerende grupper" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" -msgstr "kunne ikke sætte supplerende grupper" +msgid "failed to set supplemental groups" +msgstr "kunne ikke hente supplerende grupper" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "kunne ikke sætte gruppe-ID" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "kunne ikke sætte bruger-ID" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "kunne ikke køre kommandoen %s" @@ -1811,7 +1831,16 @@ msgstr "Brug: %s [FLAG]... FIL1 FIL2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Sammenlign de sorterede filer FIL1 og FIL2 linjevis.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Hvis ingen FIL er angivet, eller FIL er -, læses fra standard-ind.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1823,7 +1852,7 @@ msgstr "" "kun findes i FIL1; kolonne to indeholder filer, der kun findes i\n" "FIL2, mens kolonne tre indeholder linjer fælles for begge filer.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1835,7 +1864,7 @@ msgstr "" " -2 udelad kolonne 2 (linjer som kun findes i FIL2)\n" " -3 udelad kolonne 3 (linjer som findes i begge filer)\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1847,11 +1876,11 @@ msgstr "" " hvis alle inddatalinjer kan parinddeles\n" " --nocheck-order kontrollér ikke om inddata er korrekt sorteret\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=STR adskil kolonner med STR\n" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" @@ -1859,7 +1888,7 @@ msgstr "" "\n" "Bemærk at sammenligninger følger reglerne angivet af 'LC_COLLATE'.\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1873,311 +1902,325 @@ msgstr "" " %s -3 fil1 fil2 Udskriv linjer i fil1, som ikke er i fil2, og vice " "versa.\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "filen %d er ikke sorteret" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "flere skilletegn angivet" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "tom %s er ikke tilladt" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "kan ikke udføre lseek() %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "fejl ved læsning af %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "kan ikke udføre lseek() %s" +msgid "error reading %s" +msgstr "fejl ved læsning af %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "fejl ved skrivning af %s" +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "fejl ved læsning af %s" + # ? -#: src/copy.c:323 +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s: kunne ikke hente omfangsinfo" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: skrivning mislykkedes" # ? -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "kunne ikke udvide %s" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "rydder rettigheder for %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "kunne ikke bevare ejerskab for %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "kunne ikke slå filen %s op" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "kunne ikke bevare forfatter af %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "kunne ikke sætte standardkontekst for filoprettelse til %s" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "kunne ikke sætte standardkontekst for filoprettelse for %s" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "kunne ikke sætte sikkerhedskontekst for %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "kan ikke åbne %s til læsning" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "kan ikke udføre fstat() %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "springer filen %s over, da den blev erstattet mens den blev kopieret" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "kan ikke fjerne %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "fjernede %s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "skriver ikke gennem dinglende symlænke %s" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "kan ikke oprette almindelig fil %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "kunne ikke klone %s fra %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "beholder tider for %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "kunne ikke lukke %s" -#: src/copy.c:1580 -#, fuzzy, c-format +#: src/copy.c:1669 +#, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " -msgstr "%s: forsøg at overskrive %s, uden hensyn til tilstand %04lo (%s)? " +msgstr "%s: erstat %s, idet tilstanden %04lo (%s) tilsidesættes? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " -msgstr "" +msgstr "%s: uskrivelig %s (tilstand %04lo, %s); prøv alligevel? " -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: overskriv %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (sikkerhedskopi: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "kunne ikke genskabe standardkontekst for filoprettelse" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "kan ikke oprette hård lænke %s til %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "kan ikke udføre stat() på %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "udelader katalog %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "advarsel: kildefil %s er angivet mere end én gang" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s og %s er den samme fil" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "kan ikke overskrive ikke-katalog %s med katalog %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "vil ikke overskrive netop oprettet %s med %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "kan ikke overskrive katalog %s med ikke-katalog" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "kan ikke flytte katalog til ikke-katalog: %s -> %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "kan ikke sikkerhedskopiere %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, 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:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "advarsel: kildefil %s er angivet mere end én gang" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "kan ikke flytte %s til %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "kan ikke kopiere cyklisk symbolsk lænke %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "kan ikke oprette symbolsk lænke %s til %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "kan ikke oprette fifo %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "kan ikke oprette specialfil %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "kan ikke læse symbolsk lænke %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "kan ikke oprette symbolsk lænke %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s har ukendt filtype" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "kan ikke fjerne sikkerhedskopi af %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (fjern sikkerhedskopi)\n" @@ -2185,30 +2228,34 @@ msgstr "%s -> %s (fjern sikkerhedskopi)\n" #. This is a proper name. See the gettext manual, section Names. #: src/coreutils.c:47 msgid "Alex Deymo" -msgstr "" +msgstr "Alex Deymo" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" -msgstr "" +msgstr "Brug: %s --coreutils-prog=PROGRAMNAVN [PARAMETRE]... \n" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" +"Kør det indbyggede program PROGRAMNAVN med de givne PARAMETRE.\n" +"\n" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" +"\n" +"Brug: '%s --coreutils-prog=PROGRAMNAVN --help' for programspecifik hjælp.\n" -#: src/coreutils.c:178 src/coreutils.c:202 -#, fuzzy, c-format +#: src/coreutils.c:177 src/coreutils.c:201 +#, c-format msgid "unknown program %s" -msgstr "ukendt strøm" +msgstr "ukendt program %s" #: src/cp.c:157 src/mv.c:288 #, c-format @@ -2371,17 +2418,17 @@ msgstr "" " -x, --one-file-system bliv på dette filsystem\n" #: src/cp.c:232 -#, fuzzy msgid "" " -Z set SELinux security context of destination\n" " file to default type\n" " --context[=CTX] like -Z, or if CTX is specified then set the\n" " SELinux or SMACK security context to CTX\n" msgstr "" -" -Z, --context[=KONT] sæt SELinux-sikkerhedskontekst for " +" -Z sæt SELinux-sikkerhedskontekst for " "destinations-\n" -" filen til standardtypen eller KONT hvis " -"givet\n" +" filen til standardtypen\n" +" --context[=KONT] som -Z, eller givet KONT, sæt SELinux- eller\n" +" SMACK-sikkerhedskontekst til KONT\n" #: src/cp.c:240 msgid "" @@ -2478,8 +2525,8 @@ msgstr "%s eksisterer, men er ikke et katalog" msgid "failed to access %s" msgstr "kunne ikke tilgå %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "manglende filoperand" @@ -2556,131 +2603,131 @@ msgstr "" "understøttelse" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "inddata forsvandt" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: linjenummer uden for område" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: linjenummer uden for område" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " ved gentagelse %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: ingen træffer fundet" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "fejl i søgning med regulært udtryk" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "skrivefejl for %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: heltal forventedes efter skilletegn" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: '}' er nødvendig i gentagelsesantal" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: heltal kræves mellem '{' og '}'" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: afsluttende skilletegn '%c' mangler" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: ugyldigt regulært udtryk: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: ugyldigt mønster" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: linjenummeret skal være større end nul" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "manglende konverteringsspecifikator i suffiks" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "ugyldig konverteringsspecifikator i suffiks: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "ugyldig konverteringsspecifikator i suffiks: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "ugyldige flag i konverteringsspecifikation: %%%c%c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "for mange %%-konverteringsspecifikationer i suffiks" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "manglende %%-konverteringsspecifikation i suffiks" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: ugyldigt tal" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "ugyldigt antal %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Brug: %s [FLAG]... FIL MØNSTER...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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" @@ -2688,7 +2735,16 @@ 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" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Læs standard-ind når FIL er '-'. Hvert MØNSTER kan være:\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2699,11 +2755,11 @@ msgstr "" " -f, --prefix=PRÆFIKS brug PRÆFIKS i stedet for 'xx'\n" " -k, --keep-files fjern ikke udfiler ved fejl\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr " -m, --suppress-matched undertryk linjerne der matcher MØNSTER\n" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2713,17 +2769,11 @@ msgstr "" " -s, --quiet, --silent vis ikke størrelsen af udfilerne\n" " -z, --elide-empty-files fjern tomme udfiler\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Læs standard-ind når FIL er '-'. Hvert MØNSTER kan være:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 +#, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2755,7 +2805,7 @@ msgstr "Brug: %s FLAG... [FIL]...\n" 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" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2765,7 +2815,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:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2778,14 +2828,14 @@ msgstr "" " flaget -s er angivet\n" " -n (ignoreres)\n" -#: src/cut.c:193 +#: src/cut.c:194 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:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2796,7 +2846,7 @@ msgstr "" " --output-delimiter=STRENG brug STRENG som forvalgt ud-skilletegn.\n" " forvalgt er at bruge ind-skilletegnet\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2808,7 +2858,8 @@ 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:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2816,8 +2867,6 @@ msgid "" " 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 "" "Hvert interval er en af følgende:\n" "\n" @@ -2828,50 +2877,51 @@ msgstr "" "\n" "Hvis ingen FIL er angivet, eller FIL er -, læses fra standard-ind.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "ugyldig byte-, tegn- eller feltliste" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "felter og positioner nummereres fra 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "ugyldigt interval uden slutpunkt: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "ugyldigt aftagende interval" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "byte-startpunktet %s er for stort" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "felt nummer %s er for stort" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "kun én slags liste må bruges" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "skilletegnet skal være et enkelt tegn" -#: src/cut.c:787 +#: src/cut.c:786 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:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2879,11 +2929,11 @@ msgstr "" "fjernelse af linjer uden skilletegn giver kun mening hvis man opererer\n" "\tmed felter" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "feltliste mangler" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "positionsliste mangler" @@ -2902,12 +2952,19 @@ msgstr "Vis nuværende tidspunkt i det givne FORMAT, eller angiv systemdato.\n" #: 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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" + +#: src/date.c:138 +#, fuzzy +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" " -d, --date=STRENG vis tidspunkt beskrevet ved STRENG frem for " "'nu'\n" @@ -2919,26 +2976,25 @@ msgstr "" " 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:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=FIL vis sidste ændringsdato for FIL\n" " -R, --rfc-2822 udskriv dato og tid i henhold til RFC-2822\n" " Eksempel: Sun, 08 Mar 2009 14:56:49 +0100\n" "\n" -#: src/date.c:147 +#: src/date.c:149 +#, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=TIDSSPEC udskriv dato og tid i RFC 3339-format.\n" " TIMESPEC='date', 'seconds', eller 'ns' for\n" @@ -2948,8 +3004,19 @@ msgstr "" " -s, --set=STRENG indstil tiden som beskrevet af STRENG\n" " -u, --utc, --universal udskriv eller indstil universel tid (UTC)\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2962,7 +3029,7 @@ msgstr "" " %% et ordret %-tegn\n" " %a lokaliseret, forkortet ugedagsnavn (f.eks. søn)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2975,7 +3042,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:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2988,7 +3055,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:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2998,7 +3065,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:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -3010,7 +3077,7 @@ msgstr "" " %I time (01-12)\n" " %j dag på året (001-366)\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -3022,7 +3089,7 @@ msgstr "" " %m måned (01-12)\n" " %M minut (00-59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -3040,7 +3107,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:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3052,7 +3119,7 @@ msgstr "" " %T tid; samme som %H:%M:%S\n" " %u dag i ugen (1..7), 1 betyder mandag\n" -#: src/date.c:209 +#: src/date.c:215 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" @@ -3064,7 +3131,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:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3076,7 +3143,7 @@ msgstr "" " %y sidste to cifre i årstallet (00..99)\n" " %Y år\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3096,7 +3163,7 @@ msgstr "" "\n" "Som standard vil date udfylde eventuelle ekstra cifre ned nuller.\n" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3114,7 +3181,7 @@ msgstr "" " ^ brug store bogstaver hvis muligt\n" " # brug store/små bogstaver omvendt, hvis muligt\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3128,7 +3195,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:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3152,35 +3219,35 @@ msgstr "" "Vis det lokale klokkeslæt for 9:00 næste fredag på USA's vestkyst\n" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "standard-ind" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "ugyldig dato %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "flere udskriftsformater angivet" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3191,23 +3258,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:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "kan ikke sætte dato" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3216,7 +3283,7 @@ msgstr "" "Brug: %s [OPERAND]...\n" " eller: %s FLAG\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3235,7 +3302,8 @@ msgstr "" " count=N kopiér kun N indblokke\n" " ibs=BYTE læs BYTE byte ad gangen (standard: 512)\n" -#: src/dd.c:541 +#: src/dd.c:570 +#, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3244,8 +3312,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\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" @@ -3260,7 +3330,7 @@ msgstr "" " 'noxfer' udelader overførselsstatistik, 'none' udelader " "alt\n" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3278,7 +3348,7 @@ msgstr "" "Hvert KONV-symbol kan være:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3307,7 +3377,7 @@ msgstr "" " sync udfyld hver ind-blok med NUL op til ibs-størrelse; ved brug\n" " af block eller unblock, udfyldes med blanktegn frem for NUL.\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3323,7 +3393,7 @@ msgstr "" " fdatasync skriv data til udfil fysisk før der afsluttes\n" " fsync tilsvarende, men skriv også metadata\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3337,137 +3407,103 @@ msgstr "" " append tilføjelsestilstand (kun meningsfuld ved udskrift;\n" " conv=notrunc anbefales)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio brug parallel data-I/O\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct brug direkte data-I/O\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory meld fejl for ikke-kataloger\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync brug synkroniseret I/O til data\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync tilsvarende, men også for metadata\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock opsaml fulde ind-blokke (kun iflag)\n" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock brug ikkeblokerende I/O\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime opdatér ikke tilgangstid\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nocache forkast lagrede data\n" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty tildel ikke styrende terminal fra fil\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow følg ikke symbolske lænker\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks meld fejl hvis lænket flere gange\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary brug binær I/O til data\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text brug tekst-I/O til data\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr " count_bytes behandl 'count=N' som et antal byte (kun iflag)\n" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr " skip_bytes behandl 'skip=N' som et antal byte (kun iflag)\n" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr " seek_bytes behandl 'seek=N' som et antal byte (kun oflag)\n" -#: src/dd.c:631 +#: src/dd.c:661 #, 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 "" -"\n" -"Sendes et %s-signal til en kørende 'dd'-proces, vil den udskrive\n" -"I/O-statistik til standard-fejl og så fortsætte kopieringen.\n" -"\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ kill -%s $pid; sleep 1; kill $pid\n" -" 18335302+0 blokke ind\n" -" 18335302+0 blokke ud\n" -" 9387674624 byte (9.4 GB) kopieret, 34.6279 sekunder, 271 MB/s\n" -"\n" -"Mulige flag:\n" -"\n" -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +#: src/dd.c:699 +#, fuzzy, c-format +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "hukommelsen blev opbrugt af inddatabuffer af størrelse %zu byte (%s)" -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +#: src/dd.c:721 +#, fuzzy, c-format +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "hukommelsen blev opbrugt af uddatabuffer af størrelse %zu byte (%s)" -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" -"%+% blokke ind\n" -"%+% blokke ud\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% afkortet blok\n" -msgstr[1] "% afkortede blokke\n" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "% byte (%s) kopieret" msgstr[1] "% byte (%s) kopieret" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "Uendelig B" @@ -3481,83 +3517,100 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% blokke ind\n" +"%+% blokke ud\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% afkortet blok\n" +msgstr[1] "% afkortede blokke\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "lukker indfil %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "lukker uddatafil %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "kunne ikke slå O_DIRECT fra: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "skriver til %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "ukendt operand %s" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "ugyldig konvertering" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "ugyldigt ind-flag" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "ugyldigt ud-flag" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "ugyldigt statusflag" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "ugyldigt antal %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "kan ikke kombinere nogen af {ascii,ebcdic,ibm}" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "kan ikke kombinere block og unblock" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "kan ikke kombinere lcase og ucase" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "kan ikke kombinere excl og nocreat" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "kan ikke kombinere direct og nocache" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3566,62 +3619,62 @@ msgstr "" "advarsel: omgår lseek-kernefejl for fil (%s)\n" " med mt_type=0x%0lx -- se for listen af typer" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: kan ikke overspringe" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: kan ikke søge" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "overløb for afsæt ved læsning af fil %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "advarsel: ugyldigt filafsæt efter fejlslagen læsning" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "kan ikke arbejde omkring kernefejl alligevel" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "sætter flag for %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: kan ikke springe til det angivne afsæt" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "kunne ikke afkorte til % byte i udfilen %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync mislykkedes for %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "fsync mislykkedes for %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "kunne ikke åbne %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3630,19 +3683,19 @@ msgstr "" "afsæt for stort: kan ikke afkorte til en længde på seek=% (%lu-" "byte) blokke" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "kunne ikke afkorte til % byte i udfilen %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "kunne ikke fjerne cache for: %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3723,12 +3776,12 @@ msgstr "Kapacitet" msgid "%s-%s" msgstr "%s-%s" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" -msgstr "" +msgstr "kan ikke tilgå %s: over-monteret af anden enhed" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3738,14 +3791,14 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 #, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3756,10 +3809,11 @@ msgstr "" "1.048.576\n" " byte. Se STØR-format nedenfor\n" " --total udskriv en samlet sum\n" -" -h, --human-readable skriv størrelser på en læsevenlig form \n" -" (f.eks. 1K 234M 2G)\n" +" -h, --human-readable skriv størrelser som potenser af 1024\n" +" (f.eks. 1023M)\n" +" -H, --si udskriv størrelser i potenser af 1000 (f.eks. 1,1G)\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3773,19 +3827,44 @@ msgstr "" " --no-sync kør ikke sync før hentning af forbrugsinfo " "(standard)\n" -#: src/df.c:1409 +#: src/df.c:1429 +#, 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" +msgstr "" +" --output[=FELTLISTE] brug uddataformatet defineret af FELTLISTE, " +"eller\n" +" udskriv alle felter hvis FELTLISTE er " +"udeladt.\n" +" -P, --portability brug POSIX-format for uddata\n" +" --sync kør sync før hentning af forbrugsinfo\n" +" -t, --type=TYPE vis kun filsystemer af typen TYPE\n" +" -T, --print-type vis filsystemtype\n" +" -x, --exclude-type=TYPE vis kun filsystemer som ikke er af typen TYPE\n" +" -v (ignoreret)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose skriv informationer til standard-fejl lige\n" +" før hver udfil åbnes\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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 "" -" --output=[FELTLISTE] brug uddataformatet defineret af FELTLISTE, " +" --output[=FELTLISTE] brug uddataformatet defineret af FELTLISTE, " "eller\n" " udskriv alle felter hvis FELTLISTE er " "udeladt.\n" @@ -3796,7 +3875,7 @@ msgstr "" " -x, --exclude-type=TYPE vis kun filsystemer som ikke er af typen TYPE\n" " -v (ignoreret)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3809,25 +3888,25 @@ msgstr "" "feltnavne er: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n" "'size', 'used', 'avail', 'pcent', 'file' og 'target' (se info-side).\n" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "flagene %s og %s kan ikke bruges samtidigt" -#: src/df.c:1610 +#: src/df.c:1636 #, 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:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Advarsel: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "kan ikke læse tabellen over monterede filsystemer" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "ingen filsystemer behandlet" @@ -3922,9 +4001,8 @@ msgstr "" "nogen skråstreger, så udskriv '.' (for nuværende katalog).\n" #: src/dirname.c:59 -#, fuzzy msgid " -z, --zero end each output line with NUL, not newline\n" -msgstr " -z, --zero afslut linjer med en 0-byte frem for linjeskift\n" +msgstr " -z, --zero afslut udlinjer med NUL frem for linjeskift\n" #: src/dirname.c:64 #, c-format @@ -3941,7 +4019,7 @@ msgstr "" " %s dir1/str dir2/str -> \"dir1\" efterfulgt af \"dir2\"\n" " %s stdio.h -> \".\"\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3951,11 +4029,12 @@ msgstr "" " eller: %s [FLAG]... --files0-from=F\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +#, fuzzy +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "Opsummér diskforbrug for hver FIL, rekursivt for kataloger.\n" #: src/du.c:291 -#, fuzzy msgid "" " -0, --null end each output line with NUL, not newline\n" " -a, --all write counts for all files, not just directories\n" @@ -3965,7 +4044,7 @@ msgid "" " larger due to holes in ('sparse') files, internal\n" " fragmentation, indirect blocks, and the like\n" msgstr "" -" -0, --null afslut hver udlinje med 0-byte frem for linjeskift\n" +" -0, --null afslut hver udlinje med NUL frem for linjeskift\n" " -a, --all udskriv antal for alle filer, ikke kun kataloger\n" " --apparent-size udskriv tilsyneladende størrelser i stedet for\n" " diskforbrug; selvom den tilsyneladende størrelse\n" @@ -4033,7 +4112,7 @@ msgid "" " -m like --block-size=1M\n" msgstr "" " -k som --block-size=1K\n" -" -L, --deferefence følg alle symbolske lænker\n" +" -L, --dereference følg alle symbolske lænker\n" " -l, --count-links tæl størrelser flere gange for hårde lænker\n" " -m som --block-size=1M\n" @@ -4092,63 +4171,57 @@ msgstr "" msgid "Infinity" msgstr "Uendelig" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "fts_read mislykkedes: %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "ugyldig største dybde %s" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "ugyldigt argument '-0' til --threshold" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "kan ikke både summere og vise alle størrelser" -#: src/du.c:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "advarsel: summering er i konflikt med --max-depth=%lu" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" "advarsel: flagene --apparent-size og -b gælder ikke sammen med --inodes" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "filoperander kan ikke kombineres med --files0-from" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: læsefejl" - # %s evaluerer til '-' ifølge wc's kildekode -- altså man må ikke angive stdin som fil, der skal læses, når man læser fra stdin (hvilket er logisk) -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "ugyldigt filnavn af længde nul" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "totalt" @@ -4256,15 +4329,13 @@ msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" msgstr "Sæt hvert NAVN til VÆRDI i miljøet og kør KOMMANDO.\n" #: src/env.c:61 -#, fuzzy msgid "" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with NUL, not newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" " -i, --ignore-environment start uden miljøvariable\n" -" -0, --null afslut udskrevne linjer med 0-byte frem for\n" -" linjeskift\n" +" -0, --null afslut udskrevne linjer med NUL frem for linjeskift\n" " -u, --unset=NAVN fjern miljøvariablen NAVN\n" #: src/env.c:68 @@ -4293,9 +4364,8 @@ msgid "cannot specify --null (-0) with command" msgstr "kan ikke angive --null (-0) med kommando" #: 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" +#, fuzzy +msgid "Convert tabs in each FILE to spaces, writing to standard output.\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" @@ -4339,7 +4409,7 @@ msgid "input line is too long" msgstr "ind-linjen er for lang" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4493,12 +4563,12 @@ msgstr "fejl i regulært udtryksmatcher" msgid "non-integer argument" msgstr "ikke-heltalligt argument" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "deling med nul" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "sæt LC_ALL='C' for at omgå problemet" @@ -4512,31 +4582,31 @@ msgstr "de sammenlignede strenge var %s og %s" # # http://lists.gnu.org/archive/html/bug-coreutils/2012-09/msg00118.html #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "Niels Möller" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "Fejl i Lucas-primtalstest. Dette bør ikke ske" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "squfof-køoverløb" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s er ikke et gyldigt positivt heltal" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s er for stor" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4545,7 +4615,7 @@ msgstr "" "Brug: %s [TAL]...\n" " eller: %s FLAG\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -4590,7 +4660,7 @@ msgstr "" "Omformatér hvert afsnit i FILerne, og skriv til standard-ud.\n" "Flaget -BREDDE er en forkortet form af --width=BREDDE.\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4603,7 +4673,7 @@ msgstr "" " linjer\n" " -s, --split-only opdel lange linjer, men fyld ikke op\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4617,7 +4687,7 @@ msgstr "" " -w, --width=BREDDE maksimal linjelængde (ellers 75 kolonner)\n" " -g, --goal=BREDDE målbredde (som standard 93 % af bredden)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4626,20 +4696,19 @@ msgstr "" "ugyldigt flag -- %c; -BREDDE genkendes kun når det er første flag;\n" "brug -w N i stedet" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "ugyldig bredde: %s" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +#, fuzzy +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "Ombryd linjerne i hver FIL (forvalgt standard-ind), og skriv til standard-" "ud\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4649,9 +4718,9 @@ msgstr "" " -s, --spaces ombryd ved mellemrum\n" " -w, --width=BREDDE brug BREDDE kolonner i stedet for 80\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "ugyldigt antal kolonner: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4725,17 +4794,17 @@ msgstr "kan ikke finde reel GID" msgid "%s: no such user" msgstr "%s: ingen sådan bruger" -#: src/head.c:109 +#: src/head.c:110 +#, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Skriv de første 10 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" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4754,7 +4823,7 @@ msgstr "" "sidste\n" " K linjer af hver fil\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4762,7 +4831,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:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4774,48 +4843,36 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: filen er krympet for meget" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: antal byte er for stort" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: kan ikke søge til afsæt %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: kan ikke søge til relativt afsæt %s" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "antal linjer" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "antal byte" +msgid "%s: number of bytes is too large" +msgstr "%s: antal byte er for stort" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "ugyldigt antal linjer" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "ugyldigt antal byte" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "ugyldigt afsluttende flag -- %c" @@ -4879,7 +4936,6 @@ msgstr "" "eller (når BRUGER udelades) for den nuværende bruger.\n" #: src/id.c:90 -#, fuzzy msgid "" " -a ignore, for compatibility with other versions\n" " -Z, --context print only the security context of the process\n" @@ -4892,7 +4948,7 @@ msgid "" " not permitted in default format\n" msgstr "" " -a ignorér, for kompatibilitet med andre versioner\n" -" -Z, --context udskriv kun sikkerhedskontekst for den nuværende bruger\n" +" -Z, --context udskriv kun sikkerhedskontekst for processen\n" " -g, --group udskriv kun det effektive gruppe-ID\n" " -G, --groups udskriv alle gruppe-ID'er\n" " -n, --name udskriv et navn i stedet for et nummer, for -ugG\n" @@ -5004,7 +5060,7 @@ msgstr "kan ikke ændre ejerskab for %s" msgid "cannot set time stamps for %s" msgstr "kan ikke sætte tidsstempler for %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "systemkaldet fork mislykkedes" @@ -5130,7 +5186,6 @@ msgstr "" " -v, --verbose skriv navnet på hvert katalog når det bliver oprettet\n" #: src/install.c:648 -#, fuzzy msgid "" " --preserve-context preserve SELinux security context\n" " -Z set SELinux security context of destination\n" @@ -5139,9 +5194,11 @@ msgid "" " SELinux or SMACK security context to CTX\n" msgstr "" " --preserve-context behold SELinux-sikkerhedskontekst\n" -" -Z, --context[=KONT] sæt SELinux-sikkerhedskontekst for " +" -Z sæt SELinux-sikkerhedskontekst for " "destinationsfil\n" -" til standardtypen, eller til KONT hvis givet\n" +" til standardtypen\n" +" --context[=KONT] som -Z, eller hvis KONT er givet, sæt SELinux-\n" +" eller SMACK-sikkerhedskontekst til KONT\n" #: src/install.c:696 src/unlink.c:86 #, c-format @@ -5165,7 +5222,7 @@ msgstr "strip-flaget kan ikke bruges ved installation af et katalog" msgid "target directory not allowed when installing a directory" msgstr "målkatalog ikke tilladt ved installation af et katalog" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "ugyldig tilstand %s" @@ -5204,8 +5261,13 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5222,7 +5284,7 @@ msgstr "" " hvor FILNR er 1 eller 2 svarende til FIL1 eller FIL2\n" " -e TOM erstat manglende ind-felter med TOM\n" -#: src/join.c:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5236,7 +5298,7 @@ msgstr "" " -o FORMAT følg FORMAT ved sammensætning af udlinje\n" " -t TEGN brug TEGN som feltseparator for ind- og udfelter\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5258,14 +5320,13 @@ msgstr "" "og\n" " udskriv dem uden at forsøge parinddeling for disse\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 -#, fuzzy +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" -" -z, --zero-terminated afslut linjer med en 0 byte, ikke ny-linje\n" +" -z, --zero-terminated linjeadskiller er NUL frem for linjeskift\n" # bruger ""-anførselstegn de steder hvor '' optræder i kommandolinjeeksempler af hensyn til læselighed -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5299,47 +5360,47 @@ msgstr "" "reglerne angivet ved 'LC_COLLATE'. Hvis indlinjerne ikke er sorteret, og\n" "der optræder linjer som ikke kan flettes, vil der blive vist en advarsel.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:%: er ikke sorteret: %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "ugyldigt feltnummer: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "ugyldig specifikation af felt: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "ugyldigt filnummer i feltspec: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "inkompatible join-felter %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "modstridende erstatningsstrenge for tomme felter" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "flertegns-tabulator %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "inkompatible tabulatorer" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "begge filer kan ikke være standard-ind" @@ -5415,17 +5476,17 @@ msgstr "kan ikke kombinere signal med -l eller -t" msgid "no process ID specified" msgstr "ingen proces-ID angivet" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "kunne ikke allokere en stdio-buffer på % byte\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "ugyldigt buffertilstand %s til %s\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "kunne ikke indstille buffertilstand for %s til %s\n" @@ -5621,7 +5682,7 @@ msgstr "kan ikke bruge --relative uden --symbolic" msgid "FIXME: unknown" msgstr "FIXMIG: ukendt" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Brug: %s [FLAG]\n" @@ -5634,7 +5695,7 @@ msgstr "" "Udskriv navnet på den nuværende bruger.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "ikke noget login-navn" @@ -5647,7 +5708,7 @@ msgstr "ikke noget login-navn" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%e %b %Y" @@ -5656,94 +5717,94 @@ msgstr "%e %b %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%e %b %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "ignorerer ugyldig værdi af miljøvariabelen QUOTING_STYLE: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "ignorerer ugyldig længde i miljøvariabelen COLUMNS: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "ignorerer ugyldig tabulatorstørrelse i miljøvariabelen TABSIZE: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "ugyldig linjelængde: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "ugyldig tabulatorstørrelse %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "ugyldig tidsstilsformat %s" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "Gyldige argumenter er:\n" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr " - +FORMAT (f.eks., +%H:%M) for et format i stil med 'date'\n" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "fejl ved klargørelse af månedsstrenge" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "ukendt præfiks: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "uforståelig værdi i miljøvariabelen LS_COLORS" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "ignorerer ugyldig værdi af miljøvariabelen QUOTING_STYLE: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "kan ikke åbne katalog %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "kan ikke bestemme enhed og inode for %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: viser ikke allerede vist katalog" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "læser katalog %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "lukker kataloget %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "kan ikke sammenligne filnavnene %s og %s" -#: src/ls.c:4781 +#: src/ls.c:4775 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" @@ -5752,7 +5813,7 @@ msgstr "" "Sortér filerne alfabetisk hvis ingen af flagene -cftuvSUX eller --sort\n" "er givet.\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5766,7 +5827,7 @@ msgstr "" " -b, --escape skriv undvigesekvenser for ikke-grafiske tegn\n" " i stil med C\n" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5791,12 +5852,14 @@ msgstr "" " med -l: vis ctime og sortér efter navn;\n" " ellers: sortér efter ctime, nyeste først\n" -#: src/ls.c:4804 +#: src/ls.c:4798 +#, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5810,7 +5873,7 @@ msgstr "" "indhold\n" " -D, --dired lav uddata til Emacs' dired-tilstand\n" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5828,12 +5891,12 @@ msgstr "" " 'vertical' -C\n" " --full-time ligesom -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 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:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5847,8 +5910,7 @@ msgstr "" "brug\n" " af --sort=none (-U) deaktiverer gruppering\n" -#: src/ls.c:4829 -#, fuzzy +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5856,9 +5918,8 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" " -G, --no-group skriv ikke gruppenavne ved langt format\n" -" -h, --human-readable bruges med -l; skriv størrelser på læsevenlig " -"form\n" -" (f.eks. 1K 234M 2G)\n" +" -h, --human-readable bruges med -l og/eller -s; skriv læsevenlige\n" +" størrelser (f.eks. 1K 234M 2G)\n" " --si det samme, men brug 1000 som grundtal, ikke " "1024\n" @@ -5867,7 +5928,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:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5889,7 +5950,7 @@ msgstr "" "skalmønstret\n" " MØNSTER (tilsidesættes af -a eller -A)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5909,7 +5970,7 @@ msgstr "" " -k, --kibibytes brug som standard blokke på 1024 byte for " "diskbrug\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5927,7 +5988,7 @@ msgstr "" " -m brug hele skærmbredden med en liste adskilt af\n" " kommaer\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5945,7 +6006,7 @@ msgstr "" " -p, --indicator-style=slash\n" " tilføj skråstreg som indikator for kataloger\n" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -5966,7 +6027,7 @@ msgstr "" " literal, locale, shell, shell-always, c\n" " eller escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5978,18 +6039,19 @@ msgstr "" " -s, --size skriv allokeret størrelse for hver fil i " "blokke\n" -#: src/ls.c:4886 +#: src/ls.c:4881 +#, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S sortér efter filstørrelse\n" " --sort=ORD sortér efter ORD frem for navn: none (-U),\n" @@ -6002,7 +6064,7 @@ msgstr "" "angivne\n" " tid som sorteringsnøgle, hvis --sort=time\n" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -6028,7 +6090,7 @@ msgstr "" "kun\n" " blive anvendt uden for POSIX-lokalitet\n" -#: src/ls.c:4908 +#: src/ls.c:4904 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -6036,11 +6098,12 @@ msgstr "" " -t sortér efter ændringstidspunkt, nyeste først\n" " -T, --tabsize=KOLONNER antag tabulatorstop på KOLONNER frem for 8\n" -#: src/ls.c:4912 +#: src/ls.c:4908 +#, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -6052,25 +6115,25 @@ msgstr "" "kataloget\n" " -v naturlig sortering af (versions-)tal i tekst\n" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=KOLONNER antag denne skærmbredde i stedet for aktuel " "værdi\n" " -x vis elementer linjevis i stedet for kolonnevis\n" " -X sortér alfabetisk efter filendelser\n" -" -Z, --context udskriv eventuel SELinux-sikkerhedskontekst " -"for\n" -" hver fil\n" +" -Z, --context udskriv eventuel sikkerhedskontekst for hver " +"fil\n" " -1 vis én fil per linje\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6084,7 +6147,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:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6116,50 +6179,53 @@ msgstr "David Madore" # Anden %s er 'md5' #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" "Brug: %s [FLAG]... [FIL]...\n" "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:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" " -b, --binary binær læsetilstand (forvalg på nær ved læsning fra \n" " tty-stdin)\n" -#: src/md5sum.c:178 -msgid " -b, --binary read in binary mode\n" +#: src/md5sum.c:180 +#, fuzzy +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary binær læsetilstand\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr " --tag beregn en kontrolsum i stil med BSD\n" -#: src/md5sum.c:188 +#: src/md5sum.c:191 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:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text tekstlæsetilstand (forvalg)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -6180,14 +6246,15 @@ msgstr "" " -w, --warn advar om fejlformaterede kontrolsum-linjer\n" "\n" -#: src/md5sum.c:206 -#, c-format +#: src/md5sum.c:209 +#, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "Summerne bliver beregnet som beskrevet i %s. Ved kontrol skal inddata være\n" @@ -6195,66 +6262,66 @@ msgstr "" "linje med kontrolsum, et tegn som angiver inddatatilstand ('*' for binær,\n" "mellemrum for tekst), og navnet på hver FIL.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: for mange kontrolsumlinjer" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: ukorrekt formateret %s-kontrolsumlinje" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: FEJL ved åbning eller læsning\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "MISLYKKEDES" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "O.k." -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: ingen rigtigt formatterede %s-kontrolsumlinjer fundet" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "ADVARSEL: % linje er forkert formateret" msgstr[1] "ADVARSEL: % linjer er forkert formateret" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "ADVARSEL: % angivet fil kunne ikke læses" msgstr[1] "ADVARSEL: % angivne filer kunne ikke læses" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "ADVARSEL: % beregnet kontrolsum stemte IKKE overens" msgstr[1] "ADVARSEL: % beregnede kontrolsummer stemte IKKE overens" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "--tag understøtter ikke tilstanden --text" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "flaget --tag giver ikke mening når der verificeres kontrolsummer" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6262,22 +6329,22 @@ msgstr "" "flagene --binary og --text giver ikke mening ved verificering af " "kontrolsummer" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "flaget --strict har kun betydning ved kontrol af kontrolsummer" @@ -6292,7 +6359,6 @@ msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "Opret KATALOGerne, hvis de ikke allerede findes.\n" #: src/mkdir.c:65 -#, fuzzy msgid "" " -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" " -p, --parents no error if existing, make parent directories as needed\n" @@ -6302,8 +6368,6 @@ msgstr "" " -p, --parents opret overkataloger om nødvendigt, ingen fejl hvis " "findes\n" " -v, --verbose udskriv en besked for hvert katalog som oprettes\n" -" -Z, --context[=KONT] sæt SELinux-sikkerhedskontekst for hvert oprettet \n" -" katalog til standardtypen eller KONT hvis givet\n" #: src/mkdir.c:70 msgid "" @@ -6313,23 +6377,27 @@ msgid "" " --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n" " or SMACK security context to CTX\n" msgstr "" +" -Z sæt SELinux-sikkerhedskontekst for hvert oprettet\n" +" katalog til standardttypen\n" +" --context[=KONT] som -Z, eller hvis KONT er angivet, så sæt SELinux-\n" +" eller SMACK-sikkerhedskontekst til KONT\n" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "kunne ikke sætte standardoprettelseskontekst for %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" msgstr "kunne ikke gendanne kontekst for %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "oprettede katalog %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6358,6 +6426,9 @@ msgid "" " --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n" " or SMACK security context to CTX\n" msgstr "" +" -Z sæt SELinux-sikkerhedskonteksten til standardtypen\n" +" --context[=KONT] som -Z, eller hvis KONT er angivet, så sæt SELinux-\n" +" eller SMACK-sikkerhedskontekst til KONT\n" #: src/mkfifo.c:153 src/mknod.c:150 #, c-format @@ -6538,7 +6609,7 @@ msgstr "for mange skabeloner" msgid "with --suffix, template %s must end in X" msgstr "med --suffix, skal skabelon %s slutte med X" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "ugyldig skabelon %s, indeholder katalogseparator" @@ -6673,9 +6744,8 @@ msgid "Scott Bartram" msgstr "Scott Bartram" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, with line numbers added.\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" @@ -6779,27 +6849,27 @@ msgstr "ugyldig nummereringsstil til brødtekst: %s" msgid "invalid footer numbering style: %s" msgstr "ugyldig nummereringsstil til sidefod: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "ugyldigt første linjenummer: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "ugyldig øgning af linjenummer: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "ugyldigt antal tomme linjer: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "ugyldig bredde på linjenummerfelt: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "ugyldigt linjenummerformat: %s" @@ -6822,10 +6892,10 @@ msgstr "" "\n" #: src/nohup.c:65 -#, c-format +#, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6843,43 +6913,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "kunne ikke ubrugeliggøre standard-ind" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "ignorerer inddata" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "ignorerer inddata og føjer uddata til %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "føjer uddata til %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "kunne ikke sætte kopien af stderr til at lukke ved exec" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "ignorerer inddata og omdirigerer stderr til stdout" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "omdirigerer stderr til stdout" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -6905,79 +6975,77 @@ msgstr "" " --all udskriv antallet af installerede processorer\n" " --ignore=N hvis muligt, så ekskludér N processorenheder\n" -#: 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "Assaf Gordon" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "værdi for stor til at blive konverteret: %s" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, c-format msgid "invalid number: %s" msgstr "ugyldigt tal: %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "afviser suffiks i inddata: %s (overvej at bruge --from)" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" msgstr "ugyldigt suffiks i inddata: %s" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "mangler 'i'-suffiks i inddata: %s (f.eks. Ki/Mi/Gi)" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "kunne ikke forberede værdien '%Lf' til skrivning" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, c-format msgid "invalid unit size: %s" msgstr "ugyldig enhedsstørrelse: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Brug: %s [FLAG]... [TAL]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "Omformatér TAL eller tallene fra standard-input hvis ingen er givet.\n" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr " --debug udskriv advarsler om ugyldige inddata\n" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" " -d, --delimiter=X brug X frem for blanke tegn som feltskilletegn\n" -#: src/numfmt.c:827 +#: src/numfmt.c:893 +#, fuzzy msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" " --field=N erstat tallet i inddatafelt N (standardværdi er 1)\n" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" @@ -6985,7 +7053,7 @@ msgstr "" " --format=FORMAT brug FORMAT til flydende tal i stil med printf;\n" " se detaljer for FORMAT nedenfor\n" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" @@ -6994,14 +7062,14 @@ msgstr "" " --from=ENHED auto-skalér ind-tal til ENHEDer; standardværdi er\n" " 'none'; see ENHED nedenfor\n" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" " --from-unit=N angiv enhedsstørrelse for inddata (ellers bruges 1)\n" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -7013,7 +7081,7 @@ msgstr "" " i C/POSIX-regionsindstillinger)\n" # ikke sikker på hvad header er her -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" @@ -7021,7 +7089,7 @@ msgstr "" " --header[=N] udskriv (uden konvertering) de første N hovedlinjer;\n" " N sættes til 1 hvis ikke givet\n" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" @@ -7029,7 +7097,7 @@ msgstr "" " --invalid=TILSTAND fejltilstand for ugyldige tal: TILSTAND kan være:\n" " abort (standard), fail, warn, ignore\n" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -7046,7 +7114,7 @@ msgstr "" "at\n" " udfylde automatisk hvis der findes blanke tegn\n" -#: src/numfmt.c:860 +#: src/numfmt.c:927 msgid "" " --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" " up, down, from-zero (default), towards-zero, " @@ -7057,7 +7125,7 @@ msgstr "" " up, down, from-zero (standard), towards-zero, " "nearest\n" -#: src/numfmt.c:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" @@ -7065,20 +7133,20 @@ msgstr "" " --suffix=SUFFIKS tilføj SUFFIKS til ud-numre, og acceptér valgfrit\n" " SUFFIKS i ind-numre\n" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" " --to=ENHED autoskalér ud-tal til ENHEDer; se ENHED nedenfor\n" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" " --to-unit=N enhedsstørrelse for uddata (frem for standardværdien " "1)\n" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" @@ -7086,13 +7154,13 @@ msgstr "" "\n" "Flag til ENHED:\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" " none der foretages ingen autoskalering; suffikser vil udløse en " "fejl\n" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -7106,7 +7174,7 @@ msgstr "" " 1M = 1000000,\n" " 1Mi = 1048576,\n" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -7118,7 +7186,7 @@ msgstr "" " 1M = 1000000,\n" " ...\n" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7130,7 +7198,7 @@ msgstr "" " 1M = 1048576,\n" " ...\n" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7142,7 +7210,28 @@ msgstr "" " 1Mi = 1048576,\n" " ...\n" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Hvert interval er en af følgende:\n" +"\n" +" N N'te byte, tegn eller felt, talt fra 1\n" +" N- fra N'te byte, tegn eller felt, til slutningen af linjen\n" +" N-M fra N'te til M'te (til og med) byte, tegn eller felt\n" +" -M fra første til M'te (til og med) byte, tegn eller felt\n" +"\n" +"Hvis ingen FIL er angivet, eller FIL er -, læses fra standard-ind.\n" + +#: src/numfmt.c:983 #, fuzzy, c-format msgid "" "\n" @@ -7151,14 +7240,16 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" "\n" "FORMAT skal passe til at udskrive ét flydende tal '%f'.\n" "Valgfrit citationstegn (%'f) medfører --grouping (hvis understøttet af\n" "regionsindstillinger). Udskrift fyldes op til valgfri breddeværdi (%10f).\n" -"Valgfri negativ breddeværdi (%-10f) venstrefylder udskrift.\n" +"Valgfri nulbredde (%010f) vil udfylde tallet med nuller. Valgfri negativ\n" +"breddeværdi (%-10f) vil venstrestille.\n" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7179,8 +7270,8 @@ msgstr "" "konverteringsfejl, men slutstatus er 0. Med --invalid='ignore' vil\n" "konverteringsfejl ikke blive diagnosticeret, og slutstatus er 0.\n" -#: src/numfmt.c:922 -#, c-format +#: src/numfmt.c:1000 +#, fuzzy, c-format msgid "" "\n" "Examples:\n" @@ -7194,8 +7285,8 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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 "" @@ -7216,115 +7307,125 @@ msgstr "" " $ ls -lh | %s --header --field 5 --from=iec --padding=10\n" " $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n" -#: src/numfmt.c:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "formatet %s har intet %%-direktiv" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "ugyldigt format %s (breddeoverløb)" -#: src/numfmt.c:1008 -#, c-format -msgid "--format padding overridding --padding" -msgstr "" +#: src/numfmt.c:1085 +#, fuzzy, c-format +msgid "--format padding overriding --padding" +msgstr "udfyldning med --format tilsidesætter --padding" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "formatet %s slutter med %%" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "ugyldig præcision: %s" + +#: src/numfmt.c:1126 #, fuzzy, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" -msgstr "ugyldigt format %s; direktiv skal være %%['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" +msgstr "ugyldigt format %s; direktiv skal være %%[0]['][-][N]f" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "formatet %s har for mange %%-direktiver" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, c-format msgid "invalid suffix in input %s: %s" msgstr "ugyldigt suffiks i inddata %s: %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, fuzzy, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "værdi for stor til at udskrive: '%Lg' (overvej at bruge --to)" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "værdi for stor til at udskrive: '%Lg' (overvej at bruge --to)" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" "værdi for stor til at udskrive: '%Lg' (kan ikke håndtere værdier > 999Y)" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "stor indværdi %s: muligt tab af præcision" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" -"indlinjen er for kort; der blev ikke fundet nogen tal at konvertere i felt " -"%ld" +msgid "invalid field value %s" +msgstr "ugyldig feltværdi %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, c-format msgid "invalid padding value %s" msgstr "ugyldig udfyldningsværdi %s" -#: src/numfmt.c:1417 -#, c-format -msgid "invalid field value %s" -msgstr "ugyldig feltværdi %s" +#: src/numfmt.c:1646 +#, fuzzy, c-format +msgid "multiple field specifications" +msgstr "%s: ugyldig feltangivelse %s" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, c-format msgid "invalid header value %s" msgstr "ugyldig overskriftsværdi %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "--grouping kan ikke kombineres med --format" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "intet konverteringsflag givet" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "gruppering kan ikke kombineres med --to" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "gruppering har ingen virkning med disse regionsindstillinger" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "--header ignoreres med kommandolinjeinddata" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "fejl ved læsning af inddata" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "kunne ikke konvertere visse af ind-tallene" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7336,14 +7437,13 @@ msgstr "" " eller: %s [-abcdfilosx]... [FIL] [[+]AFSÆT[.][b]]\n" " eller: %s --traditional [FLAG]... [FIL] [[+]AFSÆT[.][b] [+][MÆRKE][.][b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Skriv en entydig repræsentation, oktale byte forvalgt, af FIL\n" @@ -7352,8 +7452,10 @@ msgstr "" "eller FIL er -, læses fra standard-ind.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 +#, 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" @@ -7372,8 +7474,7 @@ msgstr "" "b\n" "for blokke på 512 bytes.\n" -#: src/od.c:344 -#, fuzzy +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7385,9 +7486,10 @@ msgstr "" " [doxn], for titalssystem, oktal, heks " "eller\n" " intet\n" +" --endian={big|little} ombyt inputbyte ifølge den givne rækkefølge\n" " -j, --skip-bytes=BYTE overspring første BYTE fra hver fil\n" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -7410,7 +7512,7 @@ msgstr "" " --traditional acceptér argumenter på tredje form jf. " "ovenfor\n" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -7429,7 +7531,7 @@ msgstr "" "skråstregsnotation\n" " -d samme som -t u2, vælg decimale 2-byte-enheder uden fortegn\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7445,7 +7547,7 @@ 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:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -7459,7 +7561,7 @@ msgstr "" " a navngivet tegn, idet mest betydende (high-order) bit ignoreres\n" " c tegn der kan udskrives eller omvendt skråstregsnotation\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7473,7 +7575,7 @@ msgstr "" " u[STØR] decimal uden fortegn, STØR byte per tal\n" " x[STØR] hexadecimal, STØR byte per tal\n" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -7487,7 +7589,7 @@ msgstr "" "sizeof(long). Når TYPE er f, kan STØR være F for sizeof(float), D for\n" "sizeof(double) eller L for sizeof(long double).\n" -#: src/od.c:401 +#: src/od.c:404 msgid "" "\n" "Adding a z suffix to any type displays printable characters at the end of\n" @@ -7498,7 +7600,7 @@ msgstr "" "til\n" "slut i hver udlinje.\n" -#: src/od.c:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -7521,12 +7623,12 @@ msgstr "" " M 1024*1024\n" "og så videre for G, T, P, E, Z, Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "ugyldig typestreng %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7535,7 +7637,7 @@ msgstr "" "ugyldig type-streng %s;\n" "dette system understøtter ikke en %lu-byte heltalstype" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7544,37 +7646,37 @@ msgstr "" "ugyldig type-streng %s;\n" "dette system understøtter ikke en %lu-byte flydende-taltype" -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" msgstr "ugyldigt tegn '%c' i typestrengen %s" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "kan ikke springe forbi afslutning af kombineret inddata" -#: src/od.c:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "ingen type kan angives når strenge gemmes" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "kompatibilitetstilstand understøtter højst én fil" # jf. --skip-bytes -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "skip-bytes + read-bytes er for stor" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "advarsel: ugyldig bredde %lu; bruger %d i stedet" @@ -7590,10 +7692,10 @@ 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" msgstr "" "Skriv linjer som består af de sekventielt tilsvarende linjer fra hver\n" "FIL, separeret med tabulatorer, til standard-ud.\n" @@ -7735,12 +7837,12 @@ msgstr "Hvornår" msgid "Where" msgstr "Hvor" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Brug: %s [FLAG]... [BRUGER]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7756,7 +7858,7 @@ msgstr "" " -p udelad brugerens planfil i det lange format\n" " -s udskriv i kort format, dette er standard\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7771,7 +7873,7 @@ msgstr "" " -q udelad brugerens fulde navn, fjernvært og\n" " inaktiv tid i kort format\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -7782,96 +7884,96 @@ msgstr "" "Et letvægts-'finger'-program; udskriver brugerinformation.\n" "utmp-filen vil være %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, 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" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "'--pages=FØRSTE_SIDE[:SIDSTE_SIDE]' mangler argument" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "ugyldigt sideinterval %s" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "'-l SIDELÆNGDE' har ugyldigt antal linjer: %s" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "'-N NUMMER' har ugyldigt start-linjenummer: %s" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "'-o MARGEN' har ugyldigt linjeafsæt: %s" -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "'-w SIDEBREDDE' har ugyldigt antal tegn: %s" -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "'-W SIDEBREDDE' har ugyldigt antal tegn: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, 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:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "sidebredde for smal" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "startsidetallet % overgår antallet af sider %" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "overløb for sidetal" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Side %" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "Sidenummerér eller omform FILer til kolonner for udskrivning.\n" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7887,7 +7989,7 @@ msgstr "" " medmindre '-a' er angivet. Balancér antal linjer\n" " i kolonnerne på hver side.\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7904,7 +8006,7 @@ msgstr "" " -d, --double-space\n" " dobbelt afstand i udskriften\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7924,7 +8026,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:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7940,18 +8042,30 @@ msgstr "" " brug centreret OVERSKRIFT i stedet for filnavn i " "sidehoved;\n" " -h \"\" skriver en blank linje. Brug ikke -h\"\".\n" -" -i[TEGN[BREDDE]], --output-tabs=[TEGN[BREDDE]]\n" +" -i[TEGN[BREDDE]], --output-tabs[=TEGN[BREDDE]]\n" " erstat mellemrum med TEGN (TAB) med tabulatorer af \n" " BREDDE (8)\n" " -J, --join-lines flet fulde linjer. Deaktiverer linjeafkortning ved -W,\n" " ingen kolonnejustering, --sep-string[=STRENG] sætter\n" " separatorer\n" -#: src/pr.c:2798 +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l, --length=SIDELÆNGDE\n" +" sæt sidelængde til SIDELÆNGDE (66) linjer\n" +" (forvalgt antal tekstlinjer er 56, eller 63 med -F)\n" +" -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:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -7961,7 +8075,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:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7977,7 +8091,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:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7992,8 +8106,7 @@ msgstr "" " -r, --no-file-warnings\n" " advar ikke når en fil ikke kan åbnes\n" -#: src/pr.c:2820 -#, fuzzy +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -8009,14 +8122,14 @@ msgstr "" " -s[TEGN] slår linjeafkortning fra for alle 3 kolonne-\n" " flagene (-KOLONNER|-a -KOLONNER|-m) bortset fra -w\n" -#: src/pr.c:2828 +#: src/pr.c:2802 +#, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -S[STRENG], --sep-string[=STRENG]\n" " adskil kolonner med STRENG.\n" @@ -8026,7 +8139,13 @@ msgstr "" "kolonneflag\n" " -t, --omit-header brug ikke sidehoved og -fod\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -8049,7 +8168,7 @@ msgstr "" "for\n" " flerkolonneudskrift, -s[tegn] slår fra (72)\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -8062,16 +8181,6 @@ msgstr "" " Afkort linjer hvis -J ikke er sat. Påvirker ikke -S\n" " eller -s\n" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"-t medføres hvis SIDELÆNGDE <= 10. Hvis ingen FIL er angivet,\n" -"eller FIL er -, læses fra standard-ind.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -8087,9 +8196,8 @@ msgstr "" "\n" #: src/printenv.c:69 -#, fuzzy msgid " -0, --null end each output line with NUL, not newline\n" -msgstr " -0, --null afslut linjer med en 0-byte frem for linjeskift\n" +msgstr " -0, --null afslut linjer med NUL frem for linjeskift\n" #: src/printf.c:79 #, c-format @@ -8227,11 +8335,11 @@ msgid "" msgstr "" "Udskriv et permuteret indeks, med kontekst, over ordene i inddatafilerne.\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 +#, fuzzy 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 udskriv automatisk genererede referencer\n" " -G, --traditional vær mere som System V's 'ptx'\n" @@ -8239,6 +8347,12 @@ msgstr "" #: src/ptx.c:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -8254,7 +8368,7 @@ msgstr "" " sætninger\n" " -T, --format=tex generér udskrift som TeX-direktiver\n" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8273,7 +8387,7 @@ msgstr "" " denne FIL\n" " -o, --only-file=FIL læs kun ordliste fra denne FIL\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8285,19 +8399,16 @@ msgstr "" " -w, --width=BREDDE udskriftbredde for kolonner, eksklusive\n" " referencer\n" -#: src/ptx.c:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Uden FIL, eller hvis FIL er -, læses fra standard-ind. Standard er '-F /'.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "ugyldig hulbredde: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "ugyldig linjelængde: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8319,13 +8430,15 @@ msgid "" "\n" "If no option is specified, -P is assumed.\n" msgstr "" +"\n" +"Hvis der ikke er angivet noget tilvalg, antages -P.\n" #: src/pwd.c:169 #, c-format msgid "failed to chdir to %s" msgstr "kunne ikke foretage chdir til %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "kunne ikke foretage stat på %s" @@ -8345,8 +8458,8 @@ msgstr "ignorerer argumenter som ikke er flag" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Brug: %s [FLAG]... [FIL]...\n" @@ -8381,7 +8494,6 @@ 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 " @@ -8402,7 +8514,8 @@ msgstr "" " -q, --quiet,\n" " -s, --silent udelad de fleste fejlmeddelelser\n" " -v, --verbose udskriv fejlmeddelelser\n" -" -z, --zero adskil uddata med NUL frem for linjeskift\n" +" -z, --zero afslut hver udlinje med NUL frem for " +"linjeskift\n" #: src/readlink.c:152 #, c-format @@ -8420,7 +8533,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" @@ -8444,7 +8556,8 @@ msgstr "" "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" +" -z, --zero afslut hver udlinje med NUL frem for " +"linjeskift\n" "\n" #: src/relpath.c:130 @@ -8614,16 +8727,16 @@ msgstr "" "genskabes, så overvej at bruge 'shred'.\n" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: fjern %zu argument rekursivt? " msgstr[1] "%s: fjern %zu argumenter rekursivt? " #: src/rm.c:345 -#, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +#, fuzzy, c-format +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: fjern %zu argument? " msgstr[1] "%s: fjern %zu argumenter? " @@ -8841,12 +8954,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "ugyldigt flydende tal-argument: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "formatet %s har et ukendt %%%c-direktiv" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8866,7 +8979,16 @@ msgstr "" "Overskiv de angivne FILer gentagne gange for at gøre det sværere for\n" "selv meget dyrt genoprettelsesudstyr at genskabe data.\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Hvis en FIL er -, kopieres igen til standard-ud.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8879,7 +9001,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:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -8894,11 +9016,10 @@ 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:192 +#: src/shred.c:196 +#, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -8923,7 +9044,7 @@ msgstr "" "Standardtilstanden er 'wipesync', men bemærk at den kan være tidskrævende.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8940,7 +9061,7 @@ msgstr "" "fungere efter hensigten, eller ikke vil fungere i alle filsystemtilstande:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8962,7 +9083,7 @@ msgstr "" "server\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8976,7 +9097,7 @@ msgstr "" "* komprimerede filsystemer\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -8997,7 +9118,7 @@ msgstr "" "filen\n" "/etc/fstab, som dokumenteret i man-siden for mount (man mount).\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -9009,127 +9130,127 @@ msgstr "" "af\n" "en makuleret fil.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync mislykkedes" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync mislykkedes" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: kan ikke tilbagespole" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: gennemløb %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: fejl ved skrivning fra afsæt %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek mislykkedes" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: fil for stor" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: gennemløb %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: gennemløb %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat mislykkedes" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: ugyldig filtype" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: fil har negativ størrelse" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: fejl ved afkortning" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl mislykkedes" -#: src/shred.c:994 +#: src/shred.c:996 #, 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:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: sletter" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: omdøbt til %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: kunne ikke fjerne" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: slettet" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: kunne ikke lukke" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: kunne ikke åbne til skrivning" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: ugyldigt antal gennemløb" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "der er angivet flere kilder til tilfældige tal" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: ugyldig filstørrelse" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -9140,12 +9261,11 @@ msgstr "" " eller: %s -e [FLAG]... [ARG]\n" " eller: %s -i LAV-HØJ [FLAG]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 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" -#: src/shuf.c:73 -#, fuzzy +#: src/shuf.c:75 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 " @@ -9162,42 +9282,41 @@ msgstr "" " -o, --output=FIL skriv resultat til FIL frem for standard-ud\n" " --random-source=FIL læs tilfældige byte fra FIL\n" " -r, --repeat udlinjer kan blive gentaget\n" -" -z, --zero-terminated afslut linjer med 0-byte, ikke linjeskiftstegn\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "for mange indlinjer" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "flere -i-flag angivet" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "ugyldigt talområde %s angivet" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "ugyldigt linjetal %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "flere udfiler angivet" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "kan ikke kombinere flagene -e og -i" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" -msgstr "" +msgstr "ingen linjer at gentage" #: src/sleep.c:44 #, c-format @@ -9224,12 +9343,12 @@ msgstr "" "tidsrummet givet ved værdiernes sum.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "ugyldigt tidsinterval %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "kan ikke læse realtids-ur" @@ -9238,7 +9357,7 @@ msgstr "kan ikke læse realtids-ur" msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "Skriv det samlede, sorterede indhold af FILer til standard-ud.\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -9246,7 +9365,7 @@ msgstr "" "Sorteringsflag:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9258,7 +9377,7 @@ msgstr "" " betragtning\n" " -f, --ignore-case behandl små bogstaver som store bogstaver\n" -#: src/sort.c:443 +#: src/sort.c:444 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -9268,14 +9387,14 @@ msgstr "" " -i, --ignore-nonprinting tag kun synlige tegn i betragtning\n" " -M, --month-sort sammenlign (ukendt) < 'JAN' < ... < 'DEC'\n" -#: src/sort.c:448 +#: src/sort.c:449 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:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9287,7 +9406,7 @@ msgstr "" " --random-source=FIL hent tilfældige byte fra FIL \n" " -r, --reverse vend resultaterne af sammenligningerne om\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9304,7 +9423,7 @@ msgstr "" "tekst\n" "\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -9312,7 +9431,7 @@ msgstr "" "Andre flag:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9320,7 +9439,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:473 +#: src/sort.c:474 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 " @@ -9335,7 +9454,7 @@ msgstr "" " --compress-program=PROG komprimér midlertidige filer med PROG;\n" " udpak dem med PROG -d\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9350,7 +9469,7 @@ msgstr "" " navne i filen F; hvis F er -, så læs filnavne\n" " fra standard-ind\n" -#: src/sort.c:487 +#: src/sort.c:488 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -9359,7 +9478,7 @@ msgstr "" " og type\n" " -m, --merge flet allerede sorterede filer; sortér ikke\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9373,7 +9492,7 @@ msgstr "" "hukommelsesbuffer\n" # Infosiden for sort indeholder bedre information om hvad dette betyder -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9399,7 +9518,7 @@ msgstr "" " uden -c: udskriv kun den første af en række " "ens\n" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9429,12 +9548,11 @@ msgstr "" "\n" "STØR kan efterfølges af de følgende multiplikative endelser:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -9450,268 +9568,270 @@ msgstr "" "Sæt LC_ALL=C for at få den traditionelle sorteringsorden som benytter\n" "de interne byte-værdier.\n" -#: src/sort.c:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "venter på %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] afsluttede uplanmæssigt" -#: src/sort.c:884 +#: src/sort.c:883 #, 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:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "fejl ved åbning" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "fejl ved fflush" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "fejl ved lukning" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "kunne ikke oprette midlertidig fil" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "kunne ikke oprette proces for %s -d" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "advarsel: kan ikke fjerne: %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "ugyldigt argument %2$s til --%1$s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "mindste argument til --%s er %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "argumentet %2$s til --%1$s er for stort" -#: src/sort.c:1359 +#: src/sort.c:1358 #, 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:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "paralleliseringstallet skal være forskelligt fra nul" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "stat() mislykkedes" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "læsefejl" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "strengtransformation mislykkedes" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "den utransformerede streng var %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "^ ingen træffer for nøgle\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "forældet nøgle %s brugt; overvej i stedet %s" -#: src/sort.c:2428 +#: src/sort.c:2427 #, 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:2439 +#: src/sort.c:2438 #, 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:2452 +#: src/sort.c:2451 #, 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:2484 +#: src/sort.c:2483 #, 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:2490 +#: src/sort.c:2489 #, 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:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "fejl ved skrivning" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: uorden: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "standard-fejl" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "kan ikke læse" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: ugyldig feltangivelse %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "flagene '-%s' er inkompatible" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: ugyldigt antal ved starten af %s" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "ugyldigt tal efter '-'" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "ugyldigt tal efter '.'" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "forvildet tegn i feltangivelse" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "flere compress-programmer angivet" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "ugyldigt tal ved feltbegyndelsen" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "felt-nummeret er nul" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "tegnafsæt er nul" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" msgstr "ugyldigt tal efter ','" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "tom tabulator" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "kan ikke læse filnavne fra %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: ugyldigt filnavn af længde nul" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "ingen inddata fra %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "bruger sorteringsreglerne %s" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "bruger simpel bytesammenligning" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "ekstra operand %s er ikke tilladt med -%c" -#: src/split.c:186 -#, c-format -msgid "the suffix length needs to be at least %zu" +#: src/split.c:207 +#, fuzzy, c-format +msgid "the suffix length needs to be at least %" msgstr "suffikslængden skal være mindst %zu" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Brug: %s [FLAG]... [INDDATA [PRÆFIKS]]\n" -#: src/split.c:207 +#: src/split.c:228 +#, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\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" -#: src/split.c:215 -#, c-format +#: src/split.c:236 +#, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file names\n" " -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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" " -a, --suffix-length=N brug endelser med længden N (forvalg %d)\n" @@ -9729,7 +9849,7 @@ msgstr "" "nedenfor\n" " -u, --unbuffered kopiér omgående inddata til uddata med '-n r/...'\n" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9737,16 +9857,17 @@ msgstr "" " --verbose skriv informationer til standard-fejl lige\n" " før hver udfil åbnes\n" -#: src/split.c:235 +#: src/split.c:258 +#, fuzzy 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" "\n" "KLUMPER kan være:\n" @@ -9757,191 +9878,196 @@ msgstr "" "r/N som 'l', men brug jævn ('round robin-') fordeling\n" "r/K/N tilsvarende, men udskriv kun K'te af N til standard-ud\n" -#: src/split.c:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "løbet tør for endelser til udfiler" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "opretter filen %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "%s ville overskrive inddata; afbryder" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "kunne ikke sætte miljøvariablen FILE" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "kører med FILE=%s\n" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "kunne ikke oprette datakanal" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "lukker tidligere datakanal" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "lukker uddatakanal" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "flytter inddatakanal" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "lukker inddatakanal" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "kunne ikke køre kommandoen: \"%s -c %s\"" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "kunne ikke lukke inddatakanal" -#: src/split.c:463 +#: src/split.c:517 #, 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:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "med FILE=%s, signal %s fra kommando: %s" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "med FILE=%s, slutstatus %d fra kommando: %s" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "ukendt status fra kommando (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "kan ikke opdele på mere end én måde" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: ugyldigt antal klumper" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: ugyldigt klumpnummer" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: ugyldig længde på endelse" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: ugyldigt antal byte" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: ugyldigt antal linjer" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "flertegns-tabulator %s" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "multiplekset tegnspecialfil" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "linjetalflaget -%s%c... er for stort" -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: ugyldig startværdi for numerisk suffiks" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: ugyldig IO-blokstørrelse" -#: src/split.c:1347 +#: src/split.c:1437 #, 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:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "numerisk suffiksstartværdi er for stor til suffikslængden" -#: src/split.c:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "kunne ikke normalisere %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "advarsel: ukendt undvigesekvens '\\%c'" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: ugyldigt direktiv" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "advarsel: omvendt skråstreg ved slutningen af format" -#: src/stat.c:1262 +#: src/stat.c:1265 #, 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:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "kan ikke læse information om filsystem for %s" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9957,7 +10083,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9967,31 +10093,31 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, 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:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -10003,11 +10129,11 @@ msgstr "" "Ændret: %z\n" "Opret.: %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "Vis status for fil eller filsystem.\n" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" @@ -10015,7 +10141,7 @@ msgstr "" " -L, --dereference følg lænker\n" " -f, --file-system vis filsystemstatus fremfor filstatus\n" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -10033,7 +10159,7 @@ msgstr "" " så tilføj \\n i FORMAT.\n" " -t, --terse udskriv information kortfattet\n" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -10053,7 +10179,7 @@ msgstr "" " %B størrelsen i byte for hver blok rapporteret af %b\n" " %C streng for SELinux-sikkerhedskontekst\n" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -10069,7 +10195,7 @@ msgstr "" " %g - gruppe-id på ejer\n" " %G - gruppenavn på ejer\n" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -10092,8 +10218,7 @@ msgstr "" " %T overenhedstype i hex, for tegn-/blokenhedsspecialfiler\n" # Vi må hellere undgå den uklarheden i de engelske gloser (modification vs change) -#: src/stat.c:1461 -#, fuzzy +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -10117,10 +10242,10 @@ msgstr "" " %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" +" %z tidspunkt for sidste statusændring i læsevenligt format\n" +" %Z tidspunkt for sidste statusændring i sekunder siden Epoken\n" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -10138,7 +10263,7 @@ msgstr "" " %d frie filnoder i filsystem\n" " %f frie blokke i filsystem\n" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -10211,11 +10336,11 @@ msgstr "" "bufferstørrelsen angivet til TILSTAND byte.\n" #: src/stdbuf.c:116 +#, fuzzy 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" +"for example) then that will override corresponding changes 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 "" @@ -10246,7 +10371,7 @@ msgstr "linjebufring af stdin er meningsløst" msgid "you must specify a buffering mode option" msgstr "du skal angive et tilvalg til buffertilstand" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10257,11 +10382,11 @@ msgstr "" " eller: %s [-F ENHED | --file=ENHED] [-a|--all]\n" " eller: %s [-F ENHED | --file=ENHED] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "Udskriv eller ændr terminalegenskaber.\n" -#: src/stty.c:528 +#: src/stty.c:536 msgid "" " -a, --all print all current settings in human-readable form\n" " -g, --save print all current settings in a stty-readable form\n" @@ -10272,7 +10397,7 @@ msgstr "" "form\n" " -F, --file=ENHED åbn og brug den angivne ENHED i stedet for stdin\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10283,11 +10408,24 @@ msgstr "" "indstillinger som ikke følger POSIX-standarden. Det underliggende system\n" "definerer hvilke indstillinger som er tilgængelige.\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -10297,9 +10435,13 @@ msgstr "" " eof TEGN TEGN sender et filslut (afslutter inddata)\n" " eol TEGN TEGN afslutter linjen\n" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -10309,38 +10451,48 @@ msgstr "" " intr TEGN TEGN sender et afbrydningssignal\n" " 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:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" msgstr "" -" * lnext TEGN TEGN skriver næste tegn som et specialtegn\n" -" quit TEGN TEGN sender en afslutningssignal\n" -" * rprnt TEGN TEGN genskriver nuværende linje\n" -" start TEGN TEGN starter udskrift igen efter at have stoppet den\n" -#: src/stty.c:559 +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 TEGN TEGN stopper udskriften\n" " susp TEGN TEGN sender et terminalstopsignal\n" " * swtch TEGN TEGN skifter til en anden skál\n" " * werase TEGN TEGN sletter det senest skrevne ord\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 +#, fuzzy 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 "" "\n" "Specialindstillinger:\n" @@ -10348,26 +10500,56 @@ msgstr "" " * cols N sig til kernen at terminalen har N kolonner\n" " * columns N samme som cols N\n" -# http://en.wikipedia.org/wiki/Line_discipline -#: src/stty.c:572 +#: src/stty.c:614 +#, fuzzy 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" +" * cols N tell the kernel that the terminal has N columns\n" +" * columns N same as cols N\n" msgstr "" -" ispeed N sæt inddatahastighed til N\n" -" * line N anvend linjedisciplin N\n" -" min N med -icanon, sæt N tegn til minimum for en afsluttet " -"læsning\n" +"\n" +"Specialindstillinger:\n" +" N sæt ind- og uddatahastighed til N baud\n" +" * cols N sig til kernen at terminalen har N kolonner\n" +" * columns N samme som cols N\n" + +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +# http://en.wikipedia.org/wiki/Line_discipline +#: src/stty.c:627 +#, fuzzy +msgid "" +" min N with -icanon, set N characters minimum for a completed " +"read\n" +" ospeed N set the output speed to N\n" +msgstr "" +" ispeed N sæt inddatahastighed til N\n" +" * line N anvend linjedisciplin N\n" +" min N med -icanon, sæt N tegn til minimum for en afsluttet " +"læsning\n" " ospeed N sæt udskriftshastighed til N\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N sig til kernen at terminalen har N linjer\n" +" * size udskriv antal linjer og kolonner ifølge kernen\n" +" speed udskriv terminalens hastighed\n" +" time N med -icanon, sæt timeout for læsning til N tiendedels " +"sekunder\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -10377,26 +10559,29 @@ msgstr "" " time N med -icanon, sæt timeout for læsning til N tiendedels " "sekunder\n" -#: src/stty.c:584 +#: src/stty.c:641 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" -" Kontrolindstillinger:\n" -" [-]clocal deaktivér signaler for modemkontrol\n" -" [-]cread lad inddata blive modtaget\n" -" * [-]crtscts aktivér RTS/CTS-forhandling ('handshaking')\n" -" * [-]cdtrdsr aktivér DTR/DSR-forhandling\n" -" csN sæt tegnstørrelse til N bit, N i [5..8]\n" + +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" # stick, mark og space synes at være navne på bits i en eller anden sammenhæng.... -#: src/stty.c:593 +#: src/stty.c:660 +#, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -10404,7 +10589,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb brug to stop-bit per tegn (én med '-')\n" " [-]hup send et hangup-signal når den sidste proces lukker tty'en\n" @@ -10415,7 +10599,12 @@ msgstr "" " [-]parodd sæt ulige paritet (lige paritet med '-')\n" " * [-]cmspar brug \"stick\"-paritet (\"mark\" og \"space\")\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -10423,6 +10612,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Indstillinger for inddata:\n" @@ -10431,10 +10621,14 @@ msgstr "" " [-]ignbrk ignorér afbrydningstegn\n" " [-]igncr ignorér vognretur\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -10446,14 +10640,23 @@ msgstr "" " [-]inpck muliggør paritetskontrol af inddata\n" " [-]istrip nulstil den høje (8.) bit i et inddatategn\n" -#: src/stty.c:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 antag at ind-tegn er UTF-8-kodet\n" -#: src/stty.c:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr " * [-]iutf8 antag at ind-tegn er UTF-8-kodet\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -10467,60 +10670,83 @@ msgstr "" " [-]parmrk markér paritetsfejl (med en 255-0 tegnsekvens)\n" " [-]tandem samme som [-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Indstillinger for uddata:\n" -" * bsN baktegn-forsinkelsesstil, N i [0..1]\n" -" * crN vognretur-forsinkelsesstil, N i [0..3]\n" -" * ffN sideskift-forsinkelsesstil, N i [0..1]\n" -" * nlN linjeskift-forsinkelsesstil, N i [0..1]\n" -#: src/stty.c:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" msgstr "" -" * [-]ocrnl transformér vognretur til linjeskift\n" -" * [-]ofdel brug slettetegn til fyld i stedet for null-tegn\n" -" * [-]ofill brug fyld-tegn (padding) i stedet for forsinkelses-timing\n" -" * [-]olcuc transformér små bogstaver til store\n" -" * [-]onlcr transformér linjeskift til vognretur-linjeskift\n" -" * [-]onlret linjeskift foretager vognretur\n" -#: src/stty.c:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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 "" -" * [-]onocr skriv ikke vognreturer i første kolonne\n" -" [-]opost efterbehandl uddata\n" -" * tabN vandret tab-forsinkelsesstil, N i [0..3]\n" -" * tabs samme som tab0\n" -" * -tabs samme som tab3\n" -" * vtN lodret tab-forsinkelsesstil, N i [0..1]\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10532,42 +10758,62 @@ msgstr "" " * -crtkill dræb hele linjen ved at bruge indstillingerne\n" " for echoctl og echok\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +#, fuzzy +msgid " [-]echo echo input characters\n" +msgstr " * [-]iutf8 antag at ind-tegn er UTF-8-kodet\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" 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" -" [-]icanon aktivér specialtegnene erase, kill, werase og rprnt\n" -" [-]iexten aktivér specialtegn som ikke er POSIX-tegn\n" +" [-]isig aktivér specialtegn for afbrydning, afslut og hvile\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" +" for store bogstaver\n" -#: src/stty.c:672 +#: src/stty.c:843 +#, fuzzy 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 "" " [-]isig aktivér specialtegn for afbrydning, afslut og hvile\n" " [-]noflsh deaktivér tømning (flush) efter specialtegnene for\n" @@ -10577,11 +10823,33 @@ msgstr "" " * [-]xcase sammen med icanon, brug '\\' som kontrolsekvens\n" " for store bogstaver\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -10591,40 +10859,50 @@ msgstr "" " cbreak samme som -icanon\n" " -cbreak samme som icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 samme som at sætte brkint ignpar istrip icrnl ixon opost\n" " isig icanon, eof og eol til deres standardværdier\n" " -cooked samme som raw\n" " crt samme som echoe echoctl echoke\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -" dec samme som echoe echoctl echoke -ixany intr ^c erase 0177\n" -" kill ^u\n" -" * [-]decctlq samme som [-]ixany\n" -" ek slette- og dræbertegn sættes til deres standardværdier\n" -" evenp samme som parenb -parodd cs7\n" -#: src/stty.c:699 +#: src/stty.c:919 +#, fuzzy 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 "" " -evenp samme som -parenb cs8\n" " * [-]lcase samme som xcase iuclc olcuc\n" @@ -10633,7 +10911,19 @@ msgstr "" " nl samme som -icrnl -onlcr\n" " -nl samme som icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"Kombinationsindstillinger:\n" +" * [-]LCASE samme som [-]lcase\n" +" cbreak samme som -icanon\n" +" -cbreak samme som icanon\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10647,11 +10937,12 @@ msgstr "" " pass8 samme som -parenb -istrip cs8\n" " -pass8 samme som parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw samme som -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" @@ -10659,14 +10950,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw samme som cooked\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane samme som cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10675,7 +10967,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, alle specialtegn\n" " sættes til deres standardværdier.\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10689,57 +10981,62 @@ 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:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "kun en enhed kan angives" -#: src/stty.c:830 +#: src/stty.c:1154 #, 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:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: kunne ikke nulstille ikke-blokerende tilstand" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "ugyldigt argument %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "manglende argument til %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: fejl ved afkortning" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "ugyldig linjedisciplin %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, 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:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: ingen størrelsesinformation for denne enhed" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "ugyldig heltalsargument %s" #. This is a proper name. See the gettext manual, section Names. @@ -10748,8 +11045,15 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Udskriv CRC-kontrolsum og byteantal for hver FIL.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -10759,20 +11063,54 @@ msgstr "" " -r brug BSD-sumalgoritme, brug 1K-blokke\n" " -s, --sysv brug System V-sumalgoritme, brug 512 byte-blokke\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, fuzzy, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Brug: %s [FLAG]... [FIL]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Gem ændrede blokke til disk, opdatér superblokken.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "fejl ved læsning af %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: kunne ikke nulstille ikke-blokerende tilstand" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "fejl ved læsning af %s" -#: src/sync.c:69 +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "ignorerer alle argumenter" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10785,15 +11123,23 @@ msgstr "" "versionen beskrevet her. Referér venligst til din skals dokumentation for\n" "detaljer angående de understøttede flag.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help vis denne hjælpetekst og afslut\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version vis versionsinformation og afslut\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Hvis ingen FIL er angivet, eller FIL er -, læses fra standard-ind.\n" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -10801,8 +11147,7 @@ msgstr "" "\n" "Obligatoriske argumenter til lange flag er også obligatoriske for de korte.\n" -#: src/system.h:551 -#, fuzzy +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10810,12 +11155,12 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" "\n" -"STØRRELSE er et heltal eventuelt plus enhed (eksempel: 10M er " -"10*1024*1024).\n" -"Enheder er K, M, G, T, P, E, Z, Y (potenser af 1024) eller KB, MB, ... \n" +"Argumentet STØRRELSE er et heltal med eventuel enhed (f.eks.: 10K er " +"10*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:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10828,7 +11173,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:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -10841,24 +11186,27 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "Rapportér oversættelsesfejl i %s til \n" -#: src/system.h:584 +#: src/system.h:604 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "Full documentation at: <%s%s>\n" msgstr "" -"Den fuldstændige dokumentation fås ved at køre: info coreutils '%s " -"invocation'\n" -#: src/system.h:591 +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "" + +#: src/system.h:613 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Prøv '%s --help' for mere information.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10879,9 +11227,8 @@ msgid "Jay Lepreau" msgstr "Jay Lepreau" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, last line first.\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" @@ -10897,63 +11244,62 @@ msgstr "" " -s, --separator=STRENG brug STRENG som separator i stedet for " "linjeskift\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: søgning mislykkedes" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "blok er for stor" -#: src/tac.c:450 +#: src/tac.c:459 #, c-format msgid "failed to create temporary file in %s" msgstr "kunne ikke oprette midlertidig fil i %s" -#: src/tac.c:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" msgstr "kunne ikke åbne %s til skrivning" -#: src/tac.c:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" msgstr "kunne ikke spole strøm tilbage for %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: skrivefejl" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "kunne ikke åbne %s til læsning" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "separatoren kan ikke være tom" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 -#, c-format +#: src/tail.c:257 +#, 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" 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" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" @@ -10962,7 +11308,7 @@ msgstr "" "at\n" " udskrive byte fra position K i hver fil\n" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10975,7 +11321,7 @@ msgstr "" " udeladt tilvalgsargument betyder 'descriptor'\n" " -F det samme som --follow=navn --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -11002,7 +11348,7 @@ msgstr "" " Dette flag er sjældent nyttigt sammen med " "inotify.\n" -#: src/tail.c:293 +#: src/tail.c:288 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -11012,7 +11358,7 @@ msgstr "" " -q, --quiet, --silent udskriv ikke overskrifter med filnavne\n" " --retry forsøg fortsat at åbne en fil hvis utilgængelig\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -11028,7 +11374,7 @@ msgstr "" " en gang hvert N sekunder.\n" " -v, --verbose udskriv altid overskrifter med filnavne\n" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -11047,7 +11393,7 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024, og så videre for T, P, E, Z, Y.\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" "means that even if a tail'ed file is renamed, tail will continue to track\n" @@ -11064,23 +11410,23 @@ msgstr "" "tilfælde. Dette får 'tail' til at følge den angivne fil på en måde,\n" "der tillader omdøbning, sletning og oprettelse.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "lukker %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, 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:898 +#: src/tail.c:893 #, 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:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -11089,152 +11435,152 @@ msgstr "" "ukendt filsystemtype 0x%08lx for %s. rapportér venligst dette til %s. går " "over til gentagne forespørgsler" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "%s er blevet erstattet af en symbolsk lænke; giver op for dette navn" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s er blevet utilgængelig" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s er blevet tilgængelig" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s er dukket op. Følger slutningen af ny fil" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s er blevet erstattet. Følger slutningen af ny fil" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: kan ikke ændre ikke-blokerende tilstand" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: fil afkortet" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "ingen filer tilbage" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "kan ikke overvåge ophavskataloget for %s" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "inotify-ressourcer opbrugt" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "kan ikke overvåge %s" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: overskriv %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "fejl ved overvågning af inotify-hændelse" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "fejl ved læsning af inotify-hændelse" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: kan ikke følge slutningen på denne filtype; giver op for dette navn" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "tal i %s er for stort" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "" "%s: ugyldig maksimum antal af uændrede resultater af kald til stat() mellem " "kald til open()" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: ugyldig PID" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: ugyldigt antal sekunder" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "ugyldigt antal kolonner: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "flag brugt i ugyldig kontekst -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "advarsel: --retry ignoreres; --pid=PID er kun nyttig i følgetilstand" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "advarsel: --retry gælder kun ved første åbning" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "advarsel: PID ignoreres; --pid=PID er kun nyttig i følgetilstand" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "advarsel: --pid=PID er ikke understøttet på dette system" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "kan ikke følge %s ved navn" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "advarsel: det er ineffektivt at følge standard-ind på ubestemt tid" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "inotify kan ikke bruges, bruger i stedet gentagne forespørgsler" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -11246,61 +11592,73 @@ msgstr "" " -a, --append tilføj til de angivne FILer, overskriv ikke\n" " -i, --ignore-interrupts ignorer afbrydningssignaler\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Hvis en FIL er -, kopieres igen til standard-ud.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "manglende argument efter %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "ugyldigt heltal %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "')' forventet" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "')' forventet, fandt %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: unær operator forventet" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt accepterer ikke -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef accepterer ikke -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot accepterer ikke -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "ukendt binær operator" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: binær operator forventet" # mystisk -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11314,7 +11672,7 @@ msgstr "" " eller: [ ]\n" " eller: [ FLAG\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11322,7 +11680,7 @@ msgstr "" "Returnér med en statusværdi som bestemmes af UDTRYK.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11332,7 +11690,7 @@ msgstr "" "Et udeladt UDTRYK er som standard falsk. Ellers er \n" "UDTRYK sandt eller falsk og afgør returværdien. Det er én af:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11346,7 +11704,7 @@ msgstr "" " UDTRYK1 -a UDTRYK2 både UDTRYK1 og UDTRYK2 er sande\n" " UDTRYK1 -o UDTRYK2 mindst ét af udtrykkene er sande\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11362,7 +11720,7 @@ msgstr "" " STRENG1 = STRENG2 strengene er ens\n" " STRENG1 != STRENG2 strengene er forskellige\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11380,7 +11738,7 @@ msgstr "" " HELTAL1 -lt HELTAL2 HELTAL1 er mindre end HELTAL2\n" " HELTAL1 -ne HELTAL2 HELTAL1 er forskellig fra HELTAL2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11392,7 +11750,7 @@ msgstr "" " FIL1 -nt FIL2 FIL1 er nyere (ændringstidspunkt) end FIL2\n" " FIL1 -ot FIL2 FIL1 er ældre end FIL2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11406,7 +11764,7 @@ msgstr "" " -d FIL FIL findes og er et katalog\n" " -e FIL FIL findes\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11420,7 +11778,7 @@ msgstr "" " -h FIL FIL findes og er en symbolsk lænke (samme som -L)\n" " -k FIL FIL findes med klæbebitten sat\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11434,7 +11792,7 @@ msgstr "" " -r FIL FIL findes og er læsbar\n" " -s FIL FIL findes og har størrelse større end nul\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11448,7 +11806,7 @@ msgstr "" " -w FIL FIL findes og er skrivbar\n" " -x FIL FIL findes og kan eksekveres (eller søges)\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11463,7 +11821,7 @@ msgstr "" "for skaller.\n" "HELTAL kan også være -l STRENG, som evalueres til længden af STRENG.\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11474,25 +11832,25 @@ msgstr "" "test behandler hver af disse som den behandler enhver anden ikke-tom " "STRENG.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "kontrollér og/eller [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "manglende ']'" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "ekstra argument %s" @@ -11512,7 +11870,7 @@ msgstr "advarsel: timer_settime" msgid "warning: timer_create" msgstr "advarsel: timer_create" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11521,11 +11879,11 @@ msgstr "" "Brug: %s [FLAG] VARIGHED KOMMANDO [ARG]...\n" " eller: %s [FLAG]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 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" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11559,7 +11917,7 @@ msgstr "" " 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:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11571,7 +11929,7 @@ msgstr "" "'s' for sekunder (standard), 'm' for minutter, 'h' for timer og 'd' for " "dage.\n" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -11591,7 +11949,7 @@ msgstr "" "kan fanges. Hvis KILL (9)-signalet sendes, vil afslutningskoden være\n" "128+9 frem for 124.\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "advarsel: deaktivering af kernedump mislykkedes" @@ -11606,6 +11964,11 @@ msgstr "fejl under ventning på kommando" msgid "the monitored command dumped core" msgstr "kommandoen under overvågning udførte kernedump" +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "ukendt status fra kommando (0x%X)" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -11979,12 +12342,12 @@ msgstr "Afslut med en statuskode som angiver succes." msgid "Exit with a status code indicating failure." msgstr "Afslut med en statuskode som angiver fejl." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Brug: %s FLAG... FIL...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -12002,17 +12365,17 @@ msgstr "" "Fylder en FIL mindre, vil den blive udvidet, og den udvidede del (hullet)\n" "sættes til nul-byte.\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create opret ikke nogen filer\n" -#: src/truncate.c:112 +#: src/truncate.c:85 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:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" @@ -12020,7 +12383,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 byte\n" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -12032,57 +12395,62 @@ msgstr "" "'-' formindsk med, '<' højst, '>' mindst, '/' rund ned til multiplum af,\n" "'%' rund op til multiplum af.\n" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "overløb i % * % byte-blokke for filen %s" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s har en ubrugelig, tilsyneladende negativ størrelse" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "kan ikke bestemme størrelsen af %s" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "overløb ved oprunding af filstørrelse for %s" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "overløb ved udvidelse af filstørrelse for %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "kunne ikke afkorte %s ved byte %" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "flere relative modifikatorer angivet" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "ugyldigt antal %s" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "du skal angive enten %s eller %s" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "du skal angive en relativ %s med %s" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "%s blev angivet, men ikke %s" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "kan ikke åbne %s til skrivning" @@ -12093,24 +12461,27 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Brug: %s [FLAG] [FIL]\n" "Skriv en fuldstændig sorteret liste konsistent med den delvise sortering\n" "i FIL. Hvis ingen FIL eller hvis FIL er -, læses fra standard-ind.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: inddata indeholder et ulige antal elementer" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: inddata indeholder en løkke:" @@ -12177,9 +12548,8 @@ msgid "cannot get system name" msgstr "kan ikke finde ud af systemnavnet" #: 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" +#, fuzzy +msgid "Convert blanks in each FILE to tabs, writing to standard output.\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" @@ -12238,9 +12608,10 @@ msgstr "" "gruppe\n" #: src/uniq.c:187 +#, fuzzy msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" " -D, --all-repeated[=METODE] udskriv alle gentagne linjer\n" @@ -12252,9 +12623,10 @@ msgid " -f, --skip-fields=N avoid comparing the first N fields\n" msgstr " -f, --skip-fields=N undgå at sammenligne de første N felter\n" #: src/uniq.c:195 +#, fuzzy msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" " --group[=METODE] vis alle elementer; grupper adskilles med en tom " @@ -12262,7 +12634,6 @@ msgstr "" " METODE={separate(standard),prepend,append,both}\n" #: src/uniq.c:199 -#, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing\n" " -s, --skip-chars=N avoid comparing the first N characters\n" @@ -12271,7 +12642,6 @@ msgstr "" " -i, --ignore-case ignorér forskelle med store og små bogstaver\n" " -s, --skip-chars=N sammenlign ikke de første N tegn\n" " -u, --unique udskriv kun unikke linjer\n" -" -z, --zero-terminated afslut linjer med 0-byte frem for linjeskift\n" #: src/uniq.c:207 msgid " -w, --check-chars=N compare no more than N characters in lines\n" @@ -12417,11 +12787,6 @@ msgstr "" " Processer i\n" "uafbrydelig sovetilstand bidrager også til belastningsmiddeltallet.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -12442,12 +12807,17 @@ msgstr "" "Hvis FIL ikke er angivet bruges %s. %s som FIL er almindeligt.\n" "\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -12466,12 +12836,13 @@ msgstr "" " -m, --chars udskriv antal tegn\n" " -l, --lines udskriv antal linjeskift\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=F læs inddata fra filerne angivet ved NUL-afsluttede\n" @@ -12638,10 +13009,10 @@ msgstr "" "Samme som id -un.\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: kan ikke finde navnet for bruger-ID %lu\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "kan ikke finde navn for bruger-id %s" #: src/yes.c:41 #, c-format @@ -12660,6 +13031,223 @@ msgstr "" "Skriv gentagne gange en linje med alle specificerede STRENGe, eller 'y'\n" "\n" +#~ msgid "input line is too short, no numbers found to convert in field %ld" +#~ msgstr "" +#~ "indlinjen er for kort; der blev ikke fundet nogen tal at konvertere i " +#~ "felt %ld" + +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "-t medføres hvis SIDELÆNGDE <= 10. Hvis ingen FIL er angivet,\n" +#~ "eller FIL er -, læses fra standard-ind.\n" + +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Uden FIL, eller hvis FIL er -, læses fra standard-ind. Standard er '-" +#~ "F /'.\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Gem ændrede blokke til disk, opdatér superblokken.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "ignorerer alle argumenter" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: ugyldigt tal" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s er så stor at den ikke kan repræsenteres" + +#~ msgid "number of lines" +#~ msgstr "antal linjer" + +#~ msgid "number of bytes" +#~ msgstr "antal byte" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: ugyldigt antal at ignorere" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: ugyldigt antal byte" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: ugyldigt antal linjer" + +#~ msgid "number in %s is too large" +#~ msgstr "tal i %s er for stort" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: ugyldigt antal sekunder" + +#~ msgid "failed to %s supplemental groups" +#~ msgstr "kunne ikke %s supplerende grupper" + +#~ 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 "" +#~ "\n" +#~ "Sendes et %s-signal til en kørende 'dd'-proces, vil den udskrive\n" +#~ "I/O-statistik til standard-fejl og så fortsætte kopieringen.\n" +#~ "\n" +#~ " $ dd if=/dev/zero of=/dev/null& pid=$!\n" +#~ " $ kill -%s $pid; sleep 1; kill $pid\n" +#~ " 18335302+0 blokke ind\n" +#~ " 18335302+0 blokke ud\n" +#~ " 9387674624 byte (9.4 GB) kopieret, 34.6279 sekunder, 271 MB/s\n" +#~ "\n" +#~ "Mulige flag:\n" +#~ "\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 +#~ 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 TEGN TEGN skriver næste tegn som et specialtegn\n" +#~ " quit TEGN TEGN sender en afslutningssignal\n" +#~ " * rprnt TEGN TEGN genskriver nuværende linje\n" +#~ " start TEGN TEGN starter udskrift igen efter at have stoppet den\n" + +#~ 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" +#~ " Kontrolindstillinger:\n" +#~ " [-]clocal deaktivér signaler for modemkontrol\n" +#~ " [-]cread lad inddata blive modtaget\n" +#~ " * [-]crtscts aktivér RTS/CTS-forhandling ('handshaking')\n" +#~ " * [-]cdtrdsr aktivér DTR/DSR-forhandling\n" +#~ " csN sæt tegnstørrelse til N bit, N i [5..8]\n" + +#~ 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 "" +#~ "\n" +#~ "Indstillinger for uddata:\n" +#~ " * bsN baktegn-forsinkelsesstil, N i [0..1]\n" +#~ " * crN vognretur-forsinkelsesstil, N i [0..3]\n" +#~ " * ffN sideskift-forsinkelsesstil, N i [0..1]\n" +#~ " * nlN linjeskift-forsinkelsesstil, N i [0..1]\n" + +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl transformér vognretur til linjeskift\n" +#~ " * [-]ofdel brug slettetegn til fyld i stedet for NUL-tegn\n" +#~ " * [-]ofill brug fyld-tegn (padding) i stedet for forsinkelses-" +#~ "timing\n" +#~ " * [-]olcuc transformér små bogstaver til store\n" +#~ " * [-]onlcr transformér linjeskift til vognretur-linjeskift\n" +#~ " * [-]onlret linjeskift foretager vognretur\n" + +#~ 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 "" +#~ " * [-]onocr skriv ikke vognreturer i første kolonne\n" +#~ " [-]opost efterbehandl uddata\n" +#~ " * tabN vandret tab-forsinkelsesstil, N i [0..3]\n" +#~ " * tabs samme som tab0\n" +#~ " * -tabs samme som tab3\n" +#~ " * vtN lodret tab-forsinkelsesstil, N i [0..1]\n" + +#~ 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 "" +#~ " * [-]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" + +#~ 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 "" +#~ " * [-]echoke samme som [-]crtkill\n" +#~ " [-]echonl ekko linjeskift selv om ingen andre tegn ekkoes\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" + +#~ 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 "" +#~ " dec samme som echoe echoctl echoke -ixany intr ^c erase " +#~ "0177\n" +#~ " kill ^u\n" +#~ " * [-]decctlq samme som [-]ixany\n" +#~ " ek slette- og dræbertegn sættes til deres standardværdier\n" +#~ " evenp samme som parenb -parodd cs7\n" + +#~ 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" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: kan ikke finde navnet for bruger-ID %lu\n" + #~ msgid "cannot create pipe" #~ msgstr "kan ikke oprette datakanal" @@ -12693,14 +13281,6 @@ msgstr "" #~ msgid "cannot reposition file pointer for %s" #~ msgstr "kan ikke flytte filpegeren for %s" -#~ msgid "" -#~ " -Z, --context[=CTX] set the SELinux security context of each NAME to\n" -#~ " default type, or CTX if specified\n" -#~ msgstr "" -#~ " -Z, --context=[KONT] sæt SELinux-sikkerhedskontekst for hvert NAVN " -#~ "til\n" -#~ " standardtypen eller KONT hvis givet\n" - #~ msgid "" #~ " -Z, --context[=CTX] set the SELinux security context of NAME to\n" #~ " default type, or to CTX if specified\n" diff --git a/po/de.gmo b/po/de.gmo index c02c7589..8e493eb8 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 2f38d015..3ffdd0d1 100644 --- a/po/de.po +++ b/po/de.po @@ -35,13 +35,14 @@ # Lutz Behnke , 1996, 1997, 1998, 1999, 2000, 2001. # Michael Schmidt , 1996, 1997, 1998, 1999, 2000. # Michael Piefel , 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011. -# Philipp Thomas , 2010, 2011, 2012, 2013, 2014. +# Philipp Thomas , 2010, 2011, 2012, 2013, 2014,2015. +#: src/stty.c:941 msgid "" msgstr "" -"Project-Id-Version: GNU coreutils-8.23-pre1\n" +"Project-Id-Version: GNU coreutils-8.24-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" -"PO-Revision-Date: 2014-07-15 18:45+0200\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" +"PO-Revision-Date: 2015-07-01 10:15+0200\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" "Language: de\n" @@ -69,18 +70,18 @@ msgstr "Gültige Argumente sind:" msgid "error closing file" msgstr "Fehler beim Schließen der Datei" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "Schreibfehler" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "Erhalten der Zugriffsrechte für %s" @@ -261,57 +262,62 @@ msgstr "die Parameterzeichenkette ist nicht korrekt codiert" msgid "Unknown error" msgstr "Unbekannter Fehler" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: die Option „%s“ ist mehrdeutig; Mögliche Bedeutungen:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: die Option „%s“ ist mehrdeutig\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: die Option „--%s“ erlaubt kein Argument\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: die Option „%c%s“ erlaubt kein Argument\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: die Option „--%s“ benötigt ein Argument\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: die Option „--%s“ ist unbekannt\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: die Option „%c%s“ ist unbekannt\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid 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 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: die Option erfordert ein Argument -- „%c“\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: die Option „-W %s“ ist mehrdeutig\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: die Option „-W %s“ erlaubt kein Argument\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: die Option „-W %s“ erfordert ein Argument\n" @@ -321,13 +327,13 @@ msgstr "%s: die Option „-W %s“ erfordert ein Argument\n" msgid "cannot change permissions of %s" msgstr "die Zugriffsrechte von %s können nicht geändert werden" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "das Verzeichnis %s kann nicht angelegt werden" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "der Speicher ist ausgeschöpft" @@ -376,6 +382,12 @@ msgstr "“" msgid "%s: end of file" msgstr "%s: Dateieende" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: Lesefehler" + #: lib/regcomp.c:131 msgid "Success" msgstr "Erfolg" @@ -484,7 +496,7 @@ msgstr "^[jJyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "Setzen der Zugriffsrechte für %s" @@ -923,7 +935,7 @@ msgstr "" "in die Standardausgabe schreiben.\n" "\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -942,15 +954,7 @@ msgstr "" " verhindern\n" "\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Ohne DATEI oder wenn DATEI „-“ ist, Standardeingabe lesen.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -966,51 +970,51 @@ msgstr "" "gehörende\n" "Zeichen in der kodierten Eingabe zu verkraften.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "Lesefehler" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "ungültige Eingabe" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "ungültige Umbruchgröße: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "zusätzlicher Operand %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "schließe Standardeingabe" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1063,38 +1067,44 @@ msgstr "" " %s -a any/str1 any/str2 -> \"str1\" gefolgt von \"str2\"\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "fehlender Operand" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Aufruf: %s [OPTION]... [DATEI]...\n" #: src/cat.c:92 +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"Aneinanderfügung aller DATEI(en) sortiert auf die Standardausgabe " +"schreiben.\n" +"\n" + +#: src/cat.c:98 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" @@ -1103,7 +1113,6 @@ msgid "" " -n, --number number all output lines\n" " -s, --squeeze-blank suppress repeated empty output lines\n" msgstr "" -"DATEI(en) oder Standardeingabe auf Standardausgabe verketten. \n" "\n" " -A, --show-all äquivalent zu -vET\n" " -b, --number-nonblank nichtleere Ausgabezeilen nummerieren\n" @@ -1112,7 +1121,7 @@ msgstr "" " -n, --number alle Ausgabezeilen nummerieren\n" " -s, --squeeze-blank aufeinander folgende Leerzeilen unterdrücken\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1125,7 +1134,7 @@ msgstr "" " -v, --show-nonprinting ^‐ und M‐Notation benutzen, außer für LFD und " "Tab.\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1139,17 +1148,18 @@ msgstr "" " schließlich den Inhalt von g.\n" " %s Kopiert die Standardeingabe in die Standardausgabe.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "Anwendung von ioctl auf „%s“ ist nicht möglich" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "Standardausgabe" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: Eingabedatei ist Ausgabedatei" @@ -1161,10 +1171,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1178,8 +1188,8 @@ msgstr "der Sicherheitskontext konnte nicht erstellt werden: %s" msgid "failed to set %s security context component to %s" msgstr "die %s-Sicherheitskontextkomponente konnte nicht auf %s gesetzt werden" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "der Sicherheitskontext von %s konnte nicht ermittelt werden" @@ -1196,13 +1206,13 @@ msgstr "" msgid "failed to change context of %s to %s" msgstr "der Kontext von %s konnte nicht in %s geändert werden" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "Zugriff auf %s nicht möglich" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "das Verzeichnis %s kann nicht gelesen werden" @@ -1218,7 +1228,7 @@ msgstr "der Sicherheitskontext von %s wird geändert\n" msgid "fts_read failed" msgstr "fts_read fehlgeschlagen" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1341,7 +1351,7 @@ msgid "-R -h requires -P" msgstr "-R -h erfordert -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1358,9 +1368,8 @@ msgid "conflicting security context specifiers given" msgstr "widersprüchliche Sicherheitskontext-Angaben" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "konnte Attribute von %s nicht holen" @@ -1681,43 +1690,51 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "ungültige Gruppe %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "ungültige Gruppenliste %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" " or: %s OPTION\n" msgstr "" -"Aufruf: %s [OPTION] NEUEWURZEL [BEFEHL [ARGUMENT]...]\n" +"Aufruf: %s [OPTION] NEUESWURZELVERZEICHNIS [BEFEHL [ARGUMENT]...]\n" " oder: %s OPTION\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" msgstr "" -"BEFEHL ausführen, wobei das Wurzelverzeichnis auf NEUEWURZEL gesetzt wird.\n" +"BEFEHL ausführen, wobei das Wurzelverzeichnis auf NEUESWURZELVERZEICHNIS\n" +"gesetzt wird.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" +" --groups=G_LISTE zusätzliche Gruppen in der Form g1,g2,..,gN\n" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" " --userspec=BENUTZER:GRUPPE Angabe des zu verwenden Benutzers und Gruppe\n" " (ID oder Name)\n" -" --groups=G_LISTE zusätzliche Gruppen in der Form g1,g2,..,gN\n" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr " --skip-chdir das Arbeitsverzeichnis nicht in %s ändern\n" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" @@ -1725,42 +1742,49 @@ msgstr "" "\n" "Wenn kein Befehl angegeben ist, „${SHELL} -i“ (Vorgabe: /bin/sh) ausführen.\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" +"Die Option --skip-chdir ist nur zulässig, wenn NEUESWURZELVERZEICHNIS das " +"alte %s ist" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "Es ist nicht möglich, das Wurzelverzeichnis in %s zu ändern" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "Es ist nicht möglich, in das Wurzelverzeichnis zu wechseln" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "es wurde keine Gruppe angegeben oder die UID ist unbekannt: %d" -#: src/chroot.c:383 +#: src/chroot.c:400 #, c-format msgid "failed to get supplemental groups" msgstr "es konnten keine zusätzlichen Gruppen ermittelt werden" -#: src/chroot.c:395 +#: src/chroot.c:412 #, c-format -msgid "failed to %s supplemental groups" -msgstr "es konnten keine %s erweiterte Gruppe(n) gesetzt werden" +msgid "failed to set supplemental groups" +msgstr "die zusätzlichen Gruppen konnten nicht gesetzt werden" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "die Gruppen-ID konnte nicht gesetzt werden" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "die Benutzer-ID konnte nicht gesetzt werden" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "der Befehl %s konnte nicht ausgeführt werden" @@ -1801,7 +1825,16 @@ msgstr "Aufruf: %s [OPTION]... DATEI1 DATEI2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Sortierte Dateien DATEI1 und DATEI2 Zeile für Zeile vergleichen.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Wenn DATEI1 oder DATEI2 (nicht beide) „-“ ist, wird die Standardeingabe " +"gelesen.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1814,7 +1847,7 @@ msgstr "" "die nur in DATEI1 sind, Spalte 2 dementsprechend Zeilen aus DATEI2, und\n" "Spalte 3 die Zeilen, die in beiden Dateien gleich sind.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1826,7 +1859,7 @@ msgstr "" " -2 Zeilen unterdrücken, die nur in DATEI2 auftauchen\n" " -3 Zeilen unterdrücken, die in beiden Dateien auftauchen\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1838,11 +1871,11 @@ msgstr "" " wenn alle Eingabezeilen gepaart werden können\n" " --nocheck-order Sortierung der Eingabe nicht prüfen\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=STR Spalten mit STR trennen\n" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" @@ -1851,7 +1884,7 @@ msgstr "" "Bitte beachten Sie, dass die Vergleiche den durch „LC_COLLATE“ gegebenen\n" "Regeln folgen.\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1866,77 +1899,87 @@ msgstr "" " %s -3 Datei1 Datei2 Gibt nur die Zeilen aus, die nur in Datei1 oder\n" " Datei2 vorkommen.\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "die Datei %d ist nicht sortiert" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "es wurden mehrfache Trennzeichen angegeben" # XLATE_REMARK: Check this out! What is %s? -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "leeres %s ist nicht erlaubt" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 -#, c-format -msgid "error reading %s" -msgstr "Fehler beim Lesen von %s" - -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:181 src/copy.c:452 #, c-format msgid "cannot lseek %s" msgstr "der Aufruf von lseek für %s ist nicht möglich" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:191 src/copy.c:554 +#, c-format +msgid "error deallocating %s" +msgstr "Fehler beim Freigeben von %s" + +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 +#, c-format +msgid "error reading %s" +msgstr "Fehler beim Lesen von %s" + +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "Fehler beim Schreiben von %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, c-format +msgid "overflow reading %s" +msgstr "Überlauf beim Lesen von %s" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s: Info über die Erweiterung konnte nicht erfragt werden" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: das Schreiben schlug fehl" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "%s konnte nicht erweitert werden" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "die Zugriffsrechte für %s werden gelöscht" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "der Eigentümer für %s konnte nicht beibehalten werden" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "die Datei %s konnte nicht gefunden werden" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "der Urheber für %s konnte nicht beibehalten werden" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" @@ -1944,264 +1987,268 @@ msgstr "" "der Standard-Kontext zur Dateierstellung konnte nicht auf %s\n" "gesetzt werden" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "" "der Standard-Kontext zur Dateierstellung von %s konnte nicht gesetzt werden" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "der Sicherheitskontext von %s konnte nicht gesetzt werden" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "%s kann nicht zum Lesen geöffnet werden" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "der Aufruf von fstat für %s ist nicht möglich" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "" "die Datei %s wird übersprungen, da sie während des Kopierens ersetzt wurde" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "das Entfernen von %s ist nicht möglich" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "%s wurde entfernt\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "" "Schreiben durch die unvollständige symbolische Verknüpfung %s ist\n" "nicht möglich" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "reguläre Datei %s kann nicht angelegt werden" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "%s konnte nicht von %s geklont werden" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "die Zeiten für %s werden beibehalten" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "%s konnte nicht geschlossen werden" -#: src/copy.c:1580 +#: src/copy.c:1669 #, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: Überschreiben von %s, über Modus %04lo (%s) hinwegsetzen? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" "%s: %s kann nicht überschrieben werden (Rechte %04lo, %s); trotzdem " "versuchen? " -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: %s überschreiben? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (Sicherung: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "" "der Standard-Kontext zur Dateierstellung konnte nicht wieder hergestellt " "werden" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "" "das Erzeugen von harter Verknüpfung %s zu Verzeichnis %s ist nicht möglich" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "der Aufruf von stat für %s ist nicht möglich" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "Verzeichnis %s wurde ausgelassen" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "Warnung: Quelldatei %s mehr als einmal angegeben" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s und %s sind die gleiche Datei" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "" "das Überschreiben des Nicht‐Verzeichnisses %s mit Verzeichnis %s ist\n" "nicht möglich." -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "Neu erstelltes %s wird nicht mit %s überschrieben." -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "" "das Überschreiben des Verzeichnisses %s mit einem Nicht‐Verzeichnis ist\n" "nicht möglich." -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" "das Verschieben eines Verzeichnisses auf ein Nicht‐Verzeichnis ist nicht\n" "möglich: %s → %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" "die Sicherung von %s würde die Quelle zerstören; %s wurde\n" "nicht verschoben" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" "die Sicherung von %s würde die Quelle zerstören; %s wurde\n" "nicht kopiert" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "die Sicherung von %s ist nicht möglich" -#: src/copy.c:2107 +#: src/copy.c:2187 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "" "%s wird nicht mittels der neu erstellten symbolische\n" "Verknüpfung %s kopiert" -#: src/copy.c:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "" "Kopieren des Verzeichnisses %s in sich selbst (%s)\n" "ist nicht möglich" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, c-format +msgid "warning: source directory %s specified more than once" +msgstr "Warnung: Quellverzeichnis %s wird mehr als einmal angegeben" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "" "das Verschieben von %s in ein Unterverzeichnis\n" "seiner selbst (%s) ist nicht möglich" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "das Verschieben von %s nach %s ist nicht möglich" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "das Verschieben zwischen Geräten ist fehlgeschlagen: %s zu %s;\n" "das Ziel kann nicht entfernt werden" -#: src/copy.c:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "" "das Kopieren der zyklischen symbolischen Verknüpfung %s ist nicht möglich" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: eine relative symbolische Verknüpfungen kann nur im\n" "aktuellen Verzeichnis anglegt werden" -#: src/copy.c:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "die symbolische Verknüpfung %s zu %s kann nicht angelegt werden" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "der FIFO %s kann nicht erzeugt werden" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "die Spezialdatei %s kann nicht erzeugt werden" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "Lesen der symbolischen Verknüpfung %s nicht möglich" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "die symbolische Verknüpfung %s kann nicht angelegt werden" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s hat einen unbekannten Dateityp" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "das Löschen der Sicherung von %s ist nicht möglich" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s → %s (Löschen der Sicherung)\n" @@ -2211,12 +2258,12 @@ msgstr "%s → %s (Löschen der Sicherung)\n" msgid "Alex Deymo" msgstr "Alex Deymo" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "Aufruf: %s --coreutils-prog=PROGRAMMNAME [PARAMETER]…\n" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" @@ -2224,7 +2271,7 @@ msgstr "" "Führt das eingebaute PROGRAMMNAME mit den angegebenen PARATERn aus.\n" "\n" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" @@ -2235,7 +2282,7 @@ msgstr "" "Hilfe\n" " zum Programm.\n" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, c-format msgid "unknown program %s" msgstr "Unbekanntes Programm %s" @@ -2320,7 +2367,7 @@ msgid "" " -P, --no-dereference never follow symbolic links in SOURCE\n" msgstr "" " -n, --no-clobber keine existierenden Dateien überschreiben\n" -" (überstimmt eine vorangehende Option -n)\n" +" (überstimmt eine vorangehende Option -i)\n" " -P, --no-dereference symbolischen Verknüpfungen in QUELLE nie " "folgen\n" @@ -2517,8 +2564,8 @@ msgstr "%s existiert, ist aber kein Verzeichnis" msgid "failed to access %s" msgstr "auf %s konnte nicht zugegriffen werden" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "Fehlender Dateioperand" @@ -2598,131 +2645,130 @@ msgstr "" "Unterstützung für xattr gebaut wurde" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "Eingabe ist verschwunden" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: Zeilennummer nicht im zulässigen Bereich" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: Zeilennummer nicht im zulässigen Bereich" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " bei Wiederholung %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: keine Entsprechung gefunden" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "Fehler bei Suche mit regulären Ausdrücken" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "Fehler beim Schreiben von %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: ganze Zahl nach Trenner erwartet" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: „}“ ist bei Angabe einer Wiederholungsanzahl erforderlich" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: zwischen „{“ and „}“ ist eine Ganzzahl erforderlich" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: schließender Trenner „%c“ fehlt" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: ungültiger regulärer Ausdruck: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: ungültiges Muster" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: Zeilennummer muss größer als Null sein" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "Angabe zur Wandlung fehlt im Anhang" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "Angabe zur Wandlung fehlt im Anhang: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "Ungültige Angabe zur Wandlung im Anhang: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "ungültige Kennungen in der Umwandlungsangabe: %%%c%c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "Zu viele Angaben zur %%-Wandlung im Anhang" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "Fehlende %%-Angabe zur Wandlung im Anhang" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: ungültige Zahl" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +msgid "invalid number" +msgstr "ungültige Zahl" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Aufruf: %s [OPTION]... DATEI MUSTER...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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" @@ -2731,7 +2777,15 @@ msgstr "" "schreiben und die Bytezahl für jedes Teil auf Standardausgabe ausgeben.\n" "\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Standardeingabe lesen, wenn DATEI „-“ ist.\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2742,12 +2796,12 @@ msgstr "" " -f, --prefix=PRÄFIX PRÄFIX anstelle von „xx“ benutzen\n" " -k, --keep-files Ausgabedateien bei Fehler nicht löschen\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" " -m, --suppress-matched Zeilen die MUSTER entsprechen nicht ausgeben\n" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2759,17 +2813,10 @@ msgstr "" "ausgeben\n" " -z, --elide-empty-files leere Ausgabedateien löschen\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Standardeingabe lesen, wenn DATEI „-“ ist. Jedes MUSTER kann sein:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 msgid "" "\n" +"Each PATTERN may be:\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" @@ -2779,6 +2826,7 @@ msgid "" "A line OFFSET is a required '+' or '-' followed by a positive integer.\n" msgstr "" "\n" +"Jedes Muster kann sein:\n" " GANZZAHL bis zu angegebener Zeilennummer kopieren " "(ausschließlich)\n" " /REGEXP/[OFFSET] bis zu entsprechender Zeile kopieren (ausschließlich)\n" @@ -2805,7 +2853,7 @@ 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:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2815,7 +2863,7 @@ msgstr "" " -c, --characters=LISTE nur diese Zeichen ausgeben\n" " -d, --delimiter=TRENN TRENN anstelle von Tabulator als Trenner benutzen\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2828,7 +2876,7 @@ msgstr "" " Option -s ist gegeben\n" " -n (wird ignoriert)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2836,7 +2884,7 @@ msgstr "" " --complement das Komplement der Menge der gewählten Bytes,\n" " Zeichen oder Felder bilden\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2847,7 +2895,7 @@ msgstr "" " --ouput-delimiter=ZKETTE ZKETTE als Ausgabetrennzeichen benutzen;\n" " Voreinstellung ist das Eingabetrennzeichen\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2860,7 +2908,7 @@ msgstr "" "derselben Reihenfolge geschrieben, wie sie gelesen wird, und genau einmal\n" "geschrieben.\n" -#: src/cut.c:210 +#: src/cut.c:211 msgid "" "Each range is one of:\n" "\n" @@ -2868,8 +2916,6 @@ msgid "" " 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 "" "Jeder Bereich ist eins aus:\n" "\n" @@ -2877,49 +2923,48 @@ msgstr "" " N- vom Nten Byte, Zeichen oder Feld bis zum Ende der Zeile\n" " N-M vom Nten zum Mten (einschl.) Byte, Zeichen oder Feld\n" " -M vom ersten zum Mten (einschl.) Byte, Zeichen oder Feld\n" -"\n" -"Ohne DATEI, oder wenn DATEI „-“ ist, die Standardeingabe lesen.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "Ungültige Byte‐, Zeichen- oder Feldliste" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "Felder und Positionen werden von 1 an gezählt" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "ungültiger Bereich ohne Endpunkt: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "ungültiger abnehmender Bereich" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "Byte‐Offset %s ist zu groß" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "Feldnummer %s ist zu groß" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "Nur ein Typ einer Liste kann angegeben werden" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "Trenner muss ein einzelnes Zeichen sein" -#: src/cut.c:787 +#: src/cut.c:786 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:790 +#: src/cut.c:789 msgid "an input delimiter may be specified only when operating on fields" msgstr "" "Ein Eingabe-Begrenzer darf nur angegeben werden, wenn auf Feldern gearbeitet " @@ -2927,7 +2972,7 @@ msgstr "" # CHECKIT → no \t, please # 2001-08-10 08:03:34 CEST -ke- -#: src/cut.c:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2935,11 +2980,11 @@ msgstr "" "Nicht‐getrennte Zeilen zu unterdrücken ist nur sinnvoll,\n" "\twenn auf Feldern operiert wird." -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "Liste der Felder fehlt" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "Liste der Positionen fehlt" @@ -2960,15 +3005,21 @@ 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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" msgstr "" " -d, --date=ZEICHENKETTE Zeit gemäß ZEICHENKETTE anzeigen, nicht „jetzt“\n" " -f, --file=DATEI wie --date für jede Zeile in DATEI\n" + +#: src/date.c:138 +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" +msgstr "" " -I[ZEITSPEZ], --iso-8601[=ZEITSPEZ] gibt Datum/Zeit im ISO 8601 Format " "aus.\n" " ZEITSPEZ='date' nur für Datum (Vorgabe),\n" @@ -2976,25 +3027,21 @@ msgstr "" "Datum\n" " und Zeit mit der angegebenen Präzision.\n" -#: src/date.c:142 +#: src/date.c:145 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" -" -r, --reference=DATEI Zeit der letzten Änderung von DATEI anzeigen\n" " -R, --rfc-2822 Datumsausgabe gemäß RFC‐2822 anzeigen\n" " Beispiel: Tue, 27 Feb 2007 16:03:44 +0100\n" -#: src/date.c:147 +#: src/date.c:149 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=ZEITSPEZ Datumsausgabe gemäß RFC‐3339 anzeigen;\n" " ZEITSPEZ=„date“, „seconds“ oder „ns“ für\n" @@ -3002,10 +3049,22 @@ msgstr "" " Datum und Zeit werden durch einzelnes " "Leerzeichen\n" " getrennt: 2007-02-27 16:03:44+0100\n" + +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" +" -r, --reference=DATEI Zeit der letzten Änderung von DATEI anzeigen\n" + +#: src/date.c:158 +msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" " -s, --set=ZEICHENKETTE Zeit gemäß ZEICHENKETTE setzen\n" " -u, --utc, --universal Coordinated Universal Time anzeigen oder setzen\n" -#: src/date.c:158 +#: src/date.c:164 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -3019,7 +3078,7 @@ msgstr "" " %% wörtliches %\n" " %a abgekürzter Name des Wochentags der Lokale (z. B. Son)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -3031,7 +3090,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:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -3043,7 +3102,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:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -3054,7 +3113,7 @@ msgstr "" " %G Jahr der ISO‐Wochennummer (siehe %V); normalerweise nur mit %V " "benutzt\n" -#: src/date.c:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -3066,7 +3125,7 @@ msgstr "" " %I Stunde (01..12)\n" " %j Tag des Jahres (001..366)\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -3078,7 +3137,7 @@ msgstr "" " %m Monat (01..12)\n" " %M Minute (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -3096,7 +3155,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:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3108,7 +3167,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:209 +#: src/date.c:215 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" @@ -3121,7 +3180,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:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3133,7 +3192,7 @@ msgstr "" " %y die letzten zwei Ziffern des Jahres (00..99)\n" " %Y Jahr\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3153,7 +3212,7 @@ msgstr "" "\n" "Die Vorgabe ist, numerische Felder mit Nullen aufzufüllen.\n" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3171,7 +3230,7 @@ msgstr "" " ^ wenn möglich Großbuchstaben benutzen\n" " # wenn möglich Groß- und Kleinbuchstaben vertauschen\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3185,7 +3244,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:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3212,38 +3271,38 @@ msgstr "" "USA\n" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "Standardeingabe" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "ungültiges Datum %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "mehrere Ausgabeformate angegeben" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3255,23 +3314,23 @@ msgstr "" "Argument, das keine Option ist, eine Formatzeichenkette sein, die mit „+“\n" "beginnt." -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "das Datum kann nicht gesetzt werden" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3280,7 +3339,7 @@ msgstr "" "Aufruf: %s [OPERAND...]\n" " oder: %s OPTION\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3300,7 +3359,7 @@ msgstr "" " count=N nur N Eingabeblöcke kopieren\n" " ibs=BYTES Lesen von BYTES Bytes auf einmal (Voreinstellung: 512)\n" -#: src/dd.c:541 +#: src/dd.c:570 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3309,8 +3368,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=DATEI aus DATEI statt von der Standardeingabe lesen\n" " iflag=FLAGS anhand der kommagetrennten Symbolliste lesen\n" @@ -3324,7 +3385,7 @@ msgstr "" "übertragungsstatistik\n" " und „none“ alle Ausgaben\n" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3342,7 +3403,7 @@ msgstr "" "Jedes CONV‐Symbol kann sein:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3369,7 +3430,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:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3385,7 +3446,7 @@ msgstr "" " fdatasync vor Beendigung Ausgabedatendatei physisch schreiben\n" " fsync genauso, zusätzlich auch die Metadaten\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3398,87 +3459,81 @@ msgstr "" "\n" " append Anfügemodus (nur für Ausgabe sinnvoll; conv=notrunc empfohlen)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio nebenläufige Ein‐/Ausgabe für Daten benutzen\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct direkte Ein‐/Ausgabe für Daten benutzen\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory abbrechen, wenn kein Verzeichnis\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync synchronisierte Ein‐/Ausgabe für Daten benutzen\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync genauso, aber auch für Metadaten\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock volle Eingabeblöcke ansammeln (nur iflag)\n" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock nicht‐blockierende Ein‐/Ausgabe benutzen\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime die Zugriffszeit nicht erneuern\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nocache zwischengespeicherte Daten verwerfen\n" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty das kontrollierende Terminal nicht von Datei zuweisen\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow symbolischen Verknüpfungen nicht folgen\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks abbrechen, wenn mehrfach verlinkt\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary binäre Ein‐/Ausgabe benutzen\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text textuelle Ein‐/Ausgabe benutzen\n" -#: src/dd.c:620 +#: src/dd.c:651 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:623 +#: src/dd.c:654 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:626 +#: src/dd.c:657 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:631 +#: src/dd.c:661 #, 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 "" @@ -3487,49 +3542,27 @@ msgstr "" "auf der Standardfehlerausgabe Eingabe‐/Ausgabe‐Statistiken aus und fährt\n" "mit dem Kopieren fort.\n" "\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ kill -%s $pid; sleep 1; kill $pid\n" -" 18335302+0 Datensätze ein\n" -" 18335302+0 Datensätze aus\n" -" 9387674624 Bytes (9,4 GB) kopiert, 34,6279 Sekunden, 271 MB/s\n" -"\n" "Optionen sind:\n" "\n" -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "Hauptspeicher erschöpft durch Eingabepuffer von %zu Bytes (%s)" - -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" -msgstr "Hauptspeicher erschöpft durch Ausgabepuffer von %zu Bytes (%s)" - -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" -"%+% Datensätze ein\n" -"%+% Datensätze aus\n" +msgid "memory exhausted by input buffer of size % bytes (%s)" +msgstr "Hauptspeicher erschöpft durch Eingabepuffer von % Bytes (%s)" -#: src/dd.c:754 +#: src/dd.c:721 #, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "ein abgeschnittener Datensatz\n" -msgstr[1] "% abgeschnittene Datensätze\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" +msgstr "Hauptspeicher erschöpft durch Ausgabepuffer von % Bytes (%s)" -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "ein Byte kopiert" msgstr[1] "% Bytes (%s) kopiert" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "unendlich B" @@ -3543,83 +3576,99 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, c-format +msgid ", %.6f s, %s/s" +msgstr ", %.6f s, %s/s" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% Datensätze ein\n" +"%+% Datensätze aus\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "ein abgeschnittener Datensatz\n" +msgstr[1] "% abgeschnittene Datensätze\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "Schließen der Eingabedatei %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "Schließen der Ausgabedatei %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "O_DIRECT konnte nicht abgeschaltet werden: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "Schreiben in %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "nicht erkannter Operand %s" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "ungültige Konvertierung" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "ungültiges Eingabeflag" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "ungültiges Ausgabeflag" -#: src/dd.c:1294 -msgid "invalid status flag" -msgstr "ungültiges Statusflag" +#: src/dd.c:1385 +msgid "invalid status level" +msgstr "ungültige Statusebene" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "ungültige Zahl %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "{ascii,ebcdic,ibm} sind in keiner Weise kombinierbar" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "block und unblock sind nicht kombinierbar" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "lcase und ucase sind nicht kombinierbar" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "excl und nocreat sind nicht kombinierbar" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "direct und nocache sind nicht kombinierbar" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3628,62 +3677,62 @@ msgstr "" "Warnung: Umgehe lseek‐Kernelbug für Datei (%s)\n" " des Typs mt_type=0x%0lx – siehe für die Liste der Typen" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: überspringen nicht möglich" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: das Springen zu Position ist nicht möglich" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "Offset‐Überlauf beim Lesen der Datei %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "Warnung: ungültiger Datei‐Offset nach fehlgeschlagenem Lesen" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "ein Kernel‐Fehler kann nun mal nicht umgangen werden" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "die Flags für %s werden gesetzt" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: es ist nicht möglich, zum angegebenen Offset zu springen" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "das Abschneiden bei % Bytes in Ausgabedatei %s scheiterte" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync für %s ist fehlgeschlagen" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "fsync für %s ist fehlgeschlagen" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "konnte %s nicht öffnen" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3692,19 +3741,19 @@ msgstr "" "Offset zu groß: kann nicht auf eine Länge von seek=% (%lu‐Byte‐) " "Blöcke abschneiden" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "das Abschneiden bei % Bytes in Ausgabedatei %s scheiterte" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "der Zwischenspeicher für %s konnte nicht verworfen werden" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3785,13 +3834,13 @@ msgstr "Kapazität" msgid "%s-%s" msgstr "%s-%s" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" "auf %s kann nicht zugegriffen werden: dort wurde ein anderes Gerät eingehängt" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3802,13 +3851,13 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3819,12 +3868,12 @@ msgstr "" "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" +" -H, --si genauso, aber mit 1000 statt 1024 als Teiler (z." +"B 1.1G)\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3840,17 +3889,13 @@ msgstr "" "Benutzungsinformation\n" " aufrufen (Standardvorgabe)\n" -#: src/df.c:1409 +#: src/df.c:1429 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 "" " --output[=FELDLISTE] Das durch FELDLISTE definierte Ausgabeformat\n" " verwenden, oder alle Felder ausgeben, wenn\n" @@ -3858,13 +3903,27 @@ msgstr "" " -P, --portability POSIX‐Ausgabeformat verwenden\n" " --sync „sync“ vor Erlangen der Benutzungsinformation\n" " aufrufen\n" + +#: src/df.c:1435 +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr " --total Gesamtsumme erstellen\n" + +#: src/df.c:1439 +msgid "" +" -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 "" " -t, --type=TYP Liste auf Dateisysteme des Typs TYP begrenzen\n" " -T, --print-type Dateisystemtyp ausgeben.\n" " -x, --exclude-type=TYP Liste auf Dateisysteme nicht vom Typ TYP " "begrenzen.\n" " -v (ignoriert)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3877,25 +3936,25 @@ msgstr "" "„ipcent“, „size“, „used“, „avail“, „pcent“, „file“ und „target“ (siehe\n" "Infoseite).\n" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "die Optionen „%s“ und „%s“ schließen sich gegenseitig aus" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "Dateisystemtyp %s ist sowohl ausgewählt als auch ausgeschlossen" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Warnung: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "Lesen der Tabelle eingehängter Dateisysteme nicht möglich" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "keine Dateisysteme bearbeitet" @@ -4009,7 +4068,7 @@ msgstr "" " %s dir1/str dir2/str -> \"dir1\" gefolgt von \"dir2\"\n" " %s stdio.h -> \".\"\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -4019,7 +4078,8 @@ msgstr "" " oder: %s [OPTION]... --files0-from=DL\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Summierung der Plattennutzung jeder DATEI, rekursiv für Verzeichnisse\n" "\n" @@ -4165,63 +4225,57 @@ msgstr "" msgid "Infinity" msgstr "Unendlich" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "fts_read schlug fehl: %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "Ungültige maximale Tiefe %s" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "ungültiges Argument „-0“ Option --threshold" -#: src/du.c:898 +#: src/du.c:919 #, 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:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "Warnung: Zusammenfassen widerspricht --max-depth=%lu" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" "Warnung: Die Optionen --apparent-size und -b haben bei --inodes keine Wirkung" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "Dateioperanden können nicht mit --files0-from kombiniert werden." -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: Lesefehler" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "ungültiger Dateiname der Länge 0" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "insgesamt" @@ -4364,14 +4418,10 @@ msgid "cannot specify --null (-0) with command" msgstr "--null (-0) kann nicht zusammen mit einem Befehl angegeben werden" #: 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\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" +"schreiben.\n" #: src/expand.c:114 msgid "" @@ -4415,7 +4465,7 @@ msgid "input line is too long" msgstr "Eingabezeile zu lang" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4573,12 +4623,12 @@ msgstr "Fehler bei Suche mit regulären Ausdrücken" msgid "non-integer argument" msgstr "Argument, das keine Zahl ist" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "Teilung durch Null" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "setzen Sie LC_ALL=C, um das Problem zu umgehen" @@ -4589,31 +4639,31 @@ msgid "the strings compared were %s and %s" msgstr "die verglichenen Zeichenketten waren %s und %s" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "Niels Möller" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "Lucas-Primzahlentest scheiterte. Dies sollte nicht vorkommen" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "Überlauf der Warteschlange in squfof" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s ist keine gültige positive ganze Zahl" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s ist zu groß" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4622,7 +4672,7 @@ msgstr "" "Aufruf: %s [ZAHL...]\n" " oder: %s OPTION\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -4667,7 +4717,7 @@ msgstr "" "Jeden Absatz in DATEI(en) formatieren, auf Standardausgabe schreiben.\n" "Die Option -BREITE ist eine abgekürzte Form von --width=BREITE.\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4681,7 +4731,7 @@ msgstr "" " -s, --split-only lange Zeilen umbrechen, aber nicht auffüllen\n" # no-c-format -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4695,7 +4745,7 @@ msgstr "" " -w, --width=BREITE maximale Zeilenbreite (Vorgabe: 75 Spalten)\n" " -g, --goal=BREITE Zielbreite (Vorgabe sind 93% der Breite)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4704,20 +4754,17 @@ msgstr "" "ungültige Option -- %c; -BREITE wird nur erkannt, wenn es die erste\n" "Option ist; benutzen Sie stattdessen -W N" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" -msgstr "ungültige Zeilenbreite: %s" +#: src/fmt.c:400 src/fmt.c:407 +msgid "invalid width" +msgstr "ungültige Zeilenbreite" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "Eingabezeilen jeder DATEI umbrechen (Vorgabe: Standardeingabe),\n" "das Ergebnis auf Standardausgabe ausgeben.\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4727,10 +4774,9 @@ msgstr "" " -s, --spaces Umbruch bei Leerzeichen\n" " -w, --width=BREITE BREITE Spalten anstatt 80 benutzen\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" -msgstr "Ungültige Anzahl Spalten: %s" +#: src/fold.c:283 src/pr.c:831 +msgid "invalid number of columns" +msgstr "Ungültige Anzahl Spalten" #. This is a proper name. See the gettext manual, section Names. #: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 @@ -4802,17 +4848,15 @@ msgstr "die echte GID kann nicht ermittelt werden" msgid "%s: no such user" msgstr "%s: Einen solchen Benutzer gibt es nicht" -#: src/head.c:109 +#: src/head.c:110 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 "" "Die ersten 10 Zeilen jeder DATEI auf Standardausgabe ausgeben.\n" "Mit mehr als einer DATEI, vorab den Dateinamen ausgeben.\n" -"Ohne DATEI oder wenn DATEI „-“ ist, Standardeingabe lesen.\n" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4829,7 +4873,7 @@ msgstr "" " mit führendem „-“, alle außer den letzten\n" " K Zeilen jeder Datei\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4837,7 +4881,7 @@ msgstr "" " -q, --quiet, --silent nie Dateinamen vorab ausgeben\n" " -v, --verbose immer Dateinamen vorab ausgeben\n" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4849,48 +4893,36 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: Datei zu stark geschrumpft" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: Anzahl Bytes ist zu groß" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: es ist nicht möglich, zum Offset %s zu springen" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: es ist nicht möglich, zum relativen Offset %s zu springen" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "Anzahl Zeilen" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "Anzahl Bytes" +msgid "%s: number of bytes is too large" +msgstr "%s: Anzahl Bytes ist zu groß" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "ungültige Anzahl von Zeilen" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "ungültige Anzahl von Bytes" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "ungültige folgende Option -- %c" @@ -5085,7 +5117,7 @@ msgstr "der Eigentümer von %s kann nicht geändert werden" msgid "cannot set time stamps for %s" msgstr "Setzen der Zeitstempel für %s nicht möglich" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "Systemruf fork fehlgeschlagen" @@ -5251,7 +5283,7 @@ msgid "target directory not allowed when installing a directory" msgstr "" "Zielverzeichnis darf nicht bei Installation von Verzeichnissen benutzt werden" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "Ungültiger Modus %s" @@ -5290,19 +5322,22 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"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" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" msgstr "" "Für jedes Eingabezeilenpaar mit identischen Verschmelzungsfeldern eine " "Zeile\n" "auf Standardausgabe schreiben. Das voreingestellte Verschmelzungsfeld ist " "das\n" -"erste durch Leerzeichen/Tabulator begrenzte Feld. Wenn DATEI1 oder DATEI2\n" -"(nicht beide) „-“ ist, Standardeingabe lesen.\n" +"erste durch Leerzeichen/Tabulator begrenzte Feld.\n" + +#: src/join.c:204 +msgid "" +"\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 "" "\n" " -a DATEINR nicht‐passende Zeilen aus der Datei DATEINR ausgeben, " "wobei\n" @@ -5310,7 +5345,7 @@ msgstr "" "DATEI2\n" " -e LEER fehlende Eingabefelder durch LEER ersetzen\n" -#: src/join.c:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5324,7 +5359,7 @@ msgstr "" " -t ZEICHEN ZEICHEN als Trennzeichen für Ein‐ und Ausgabefelder " "nehmen\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5346,13 +5381,13 @@ msgstr "" "verwenden\n" " und sie ausgeben, ohne zu versuchen, sie zu kombinieren\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated Zeilen mit Nullbyte beenden, nicht mit\n" " Zeilenvorschub\n" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5387,47 +5422,47 @@ msgstr "" "Wenn die Eingabe nicht sortiert ist und einige Zeilen nicht verschmolzen\n" "werden können, so wird eine Warnmeldung ausgegeben.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:%: ist nicht sortiert: %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "Ungültige Feldnummer: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "Ungültiger Feldbezeichner: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "Ungültige Feldnummer in Feldbezeichner: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "inkompatible Verschmelzungsfelder: %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "einander widersprechende Leerfeld‐Ersetzungszeichenketten" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "Multi-Zeichen-Tabulator %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "inkompatible Tabulatoren" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "Alle beide Dateien können nicht Standardeingabe sein" @@ -5506,19 +5541,19 @@ msgstr "es ist nicht möglich, Signale mit -l oder -t zu kombinieren" msgid "no process ID specified" msgstr "keine Prozess‐ID angegeben" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" "ein % Bytes großer Puffer für die Standardeingabe konnte nicht\n" "angelegt werden\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "ungültiger Pufferungsmodus %s für %s\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "die Pufferung von %s konnte nicht auf Modus %s gesetzt werden\n" @@ -5723,7 +5758,7 @@ msgstr "--relative ist ohne --symbolic nicht zulässig" msgid "FIXME: unknown" msgstr "FIXME: unbekannt" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Aufruf: %s [OPTION]\n" @@ -5736,7 +5771,7 @@ msgstr "" "Den Namen des aktuellen Benutzers ausgeben.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "kein Loginname" @@ -5746,7 +5781,7 @@ msgstr "kein Loginname" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%e. %b %Y " @@ -5755,95 +5790,93 @@ msgstr "%e. %b %Y " #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%e. %b %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "Ungültiger Wert der Umgebungsvariable QUOTING_STYLE wird ignoriert: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "Ungültige Breite in Umgebungsvariable COLUMNS wird ignoriert: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "Ungültige Tabulator‐Größe in Umgebungsvariable TABSIZE wird ignoriert: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" -msgstr "ungültige Zeilenbreite: %s" +#: src/ls.c:1747 +msgid "invalid line width" +msgstr "ungültige Zeilenbreite" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" -msgstr "ungültige Tabulatorgröße: %s" +#: src/ls.c:1815 +msgid "invalid tab size" +msgstr "ungültige Tabulatorgröße" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "Ungültiges Zeitformat %s" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "Gültige Argumente sind:\n" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr " - +FORMAT (zB. +H:%M) für ein Format im Stil von „date“\n" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "Fehler beim Initialisieren der Monats-Zeichenketten" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "Präfix nicht erkannt: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "Wert für Umgebungsvariable LS_COLORS ist syntaktisch fehlerhaft." -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "Ungültiger Wert der Umgebungsvariable QUOTING_STYLE wird ignoriert: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "Öffnen von Verzeichnis %s nicht möglich" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "Gerät und INode von %s können nicht bestimmt werden" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: schon angezeigtes Verzeichnis wird nicht erneut aufgeführt" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "das Verzeichnis %s wird gelesen" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "das Verzeichnis %s wird geschlossen" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "Die Dateinamen %s und %s können nicht verglichen werden" -#: src/ls.c:4781 +#: src/ls.c:4775 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" @@ -5852,7 +5885,7 @@ msgstr "" "momentane Verzeichnis). Alphabetisches Sortieren der Einträge, falls weder\n" "-cftuvSUX noch --sort angegeben wurden.\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5865,7 +5898,7 @@ msgstr "" " --author mit -l, den Urheber jeder Datei ausgeben\n" " -b, --escape nicht‐druckbare Zeichen oktale ausgeben\n" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5891,12 +5924,13 @@ msgstr "" "nach\n" " Namen sortieren\n" -#: src/ls.c:4804 +#: src/ls.c:4798 msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5912,7 +5946,7 @@ msgstr "" " -D, --dired Ausgabe für den „dired“‐Modus im Emacs " "formatieren\n" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5930,11 +5964,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time wie -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr " -g wie -l, aber Eigentümer nicht auflisten\n" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5947,7 +5981,7 @@ msgstr "" " kann zusammen mit Sortierung benutzt werden,\n" " doch --sort=none schaltet Gruppierung ab\n" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5959,7 +5993,7 @@ msgstr "" " Format ausgeben (z. B. 1K 234M 2G)\n" " --si genauso, aber mit 1000 statt 1024 als Teiler\n" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5982,7 +6016,7 @@ msgstr "" " nicht auflisten (überschrieben durch -a oder -" "A)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -6003,7 +6037,7 @@ msgstr "" " passt, nicht auflisten\n" " -k, --kibibytes benutzt 1024 Byte Blöcke\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -6019,7 +6053,7 @@ msgstr "" " -m so viele Einträge wie möglich, durch Kommata\n" " getrennt, in eine Zeile packen\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -6035,7 +6069,7 @@ msgstr "" " -o wie -l, aber ohne Gruppen‐Informationen\n" " -p, --indicator-style=slash an Verzeichnisse ein „/“ anhängen\n" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -6056,7 +6090,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -6067,18 +6101,18 @@ msgstr "" " -R, --recursive Unterverzeichnissen rekursiv ausgeben\n" " -s, --size die Größe jeder Datei in Blöcken ausgeben\n" -#: src/ls.c:4886 +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S nach Dateigröße sortieren\n" " --sort=WORT nach WORT anstatt nach Name sortieren: none -U\n" @@ -6089,7 +6123,7 @@ msgstr "" " die angegebene Zeit als Sortierkriterium\n" " bei --sort=time verwenden\n" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -6113,7 +6147,7 @@ msgstr "" "„posix-“,\n" " ist STIL nur außerhalb der POSIX‐Locale gültig\n" -#: src/ls.c:4908 +#: src/ls.c:4904 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -6122,11 +6156,11 @@ msgstr "" " -T, --tabsize=SPALTEN Tabstops statt alle 8 alle SPALTEN Zeichen " "setzen\n" -#: src/ls.c:4912 +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -6140,13 +6174,14 @@ msgstr "" "innerhalb\n" " von Text\n" -#: src/ls.c:4919 +#: src/ls.c:4915 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 security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=SPALTEN gegebene Bildschirmbreite statt des momentanen\n" " Wertes annehmen\n" @@ -6156,7 +6191,7 @@ msgstr "" "anzeigen\n" " -1 eine Datei pro Zeile auflisten\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6172,7 +6207,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:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6206,48 +6241,50 @@ msgstr "David Madore" 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 "" "Aufruf: %s [OPTION]... [DATEI]...\n" "%s‐Prüfsummen (%d Bits) ausgeben oder überprüfen.\n" -"Ohne DATEI oder wenn DATEI „-“ ist, Standardeingabe lesen.\n" -"\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" +"\n" " -b, --binary im Binärmodus lesen (Voreinstellung außer beim Lesen\n" " aus an eine Konsole gebundenen Standardeingabe)\n" -#: src/md5sum.c:178 -msgid " -b, --binary read in binary mode\n" -msgstr " -b, --binary im Binärmodus lesen\n" +#: src/md5sum.c:180 +msgid "" +"\n" +" -b, --binary read in binary mode\n" +msgstr "" +"\n" +" -b, --binary im Binärmodus lesen\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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" +" -c, --check %s‐Prüfsummen aus DATEIen lesen und überprüfen\n" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr " --tag Prüfsummen im BSD-Stil erzeugen\n" -#: src/md5sum.c:188 +#: src/md5sum.c:191 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:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text im Textmodus lesen (Voreinstellung)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -6269,14 +6306,15 @@ msgstr "" " -w, --warn bei ungeeignet formatierten Prüfsummenzeilen warnen\n" "\n" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "Die Summen werden wie in %s beschrieben berechnet. Beim Überprüfen\n" @@ -6285,42 +6323,42 @@ msgstr "" "anzeigt („*“ für binär, „ “ für Text), und dem Namen jeder Datei " "auszugeben.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: zu viele Prüfsummenzeilen" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: nicht korrekt formatierte %s‐Prüfsummenzeile" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: FEHLSCHLAG bei open oder read\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "FEHLSCHLAG" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "OK" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: keine korrekt formatierte %s‐Prüfsummenzeile gefunden" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "WARNUNG: % Zeile ist nicht korrekt formatiert" msgstr[1] "WARNUNG: % Zeilen sind nicht korrekt formatiert" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" @@ -6328,24 +6366,24 @@ msgstr[0] "WARNUNG: die aufgeführte Datei konnte nicht gelesen werden" msgstr[1] "" "WARNUNG: % aufgeführte Dateien konnten nicht gelesen werden" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "WARNUNG: die % berechnete Prüfsumme passte NICHT" msgstr[1] "WARNUNG: % berechnete Prüfsummen passten NICHT" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "--tag unterstützt nicht den --text Modus" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, 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:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6353,23 +6391,23 @@ msgstr "" "Die Optionen --binary und --text sind bei der Kontrolle von Prüfsummen " "nutzlos" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -6410,23 +6448,23 @@ msgstr "" "SMACK-\n" " Kontext auf KTXT setzen\n" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "" "der Standard-Kontext zur Dateierstellung von %s konnte nicht gesetzt werden" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" msgstr "der Kontext von %s konnten nicht wiederhergestellt werden" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "Verzeichnis %s angelegt" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6650,7 +6688,7 @@ msgstr "zu viele Schablonen" msgid "with --suffix, template %s must end in X" msgstr "bei --suffix muss die Schablone %s mit einem X enden" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "ungültige Endung %s, sie enthält einen Verzeichnistrenner" @@ -6789,12 +6827,8 @@ msgid "Scott Bartram" msgstr "Scott Bartram" #: 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 "" -"Jede DATEI mit Zeilennummern nach Standardausgabe schreiben.\n" -"Ohne DATEI oder wenn DATEI „-“ ist, Standardeingabe lesen.\n" +msgid "Write each FILE to standard output, with line numbers added.\n" +msgstr "Jede DATEI mit Zeilennummern nach Standardausgabe schreiben.\n" #: src/nl.c:186 msgid "" @@ -6901,27 +6935,23 @@ msgstr "ungültiger Stil für Textkörpernummerierung: %s" msgid "invalid footer numbering style: %s" msgstr "ungültiger Stil für Fußzeilennummerierung: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" -msgstr "ungültiger anfängliche Zeilennummer: %s" +#: src/nl.c:501 +msgid "invalid starting line number" +msgstr "ungültige anfängliche Zeilennummer" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" -msgstr "ungültiges Inkrement für Zeilennummer: %s" +#: src/nl.c:506 +msgid "invalid line number increment" +msgstr "ungültiges Inkrement für Zeilennummer" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" -msgstr "ungültige Anzahl von Leerzeilen: %s" +#: src/nl.c:513 +msgid "invalid line number of blank lines" +msgstr "ungültige Anzahl von Leerzeilen" -#: 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:520 +msgid "invalid line number field width" +msgstr "ungültige Breite des Feldes für die Zeilennummer" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "ungültiges Zeilennummerformat: %s" @@ -6947,7 +6977,7 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6968,44 +6998,44 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "Die Standardeingabe konnte nicht unbrauchbar gemacht werden" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "ignoriere Eingabe" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "ignoriere Eingabe und hänge Ausgabe an %s an" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "hänge Ausgabe an %s an" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "konnte die Kopie von stderr bei Exec nicht auf Schließen setzen" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" "ignoriere Eingabe und leite Standardfehlerausgabe auf Standardausgabe um" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "leite Standardfehlerausgabe auf Standardausgabe um" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -7034,79 +7064,77 @@ msgstr "" " --all Anzahl der installierten Prozessoren ausgeben\n" " --ignore=N wenn möglich N Verarbeitungseinheiten ausschließen\n" -#: 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "Assaf Gordon" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "der Wert ist für eine Umwandlung zu groß: „%s“" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, c-format msgid "invalid number: %s" msgstr "ungültige Zahl %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, 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:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" msgstr "ungültige Endung in Eingabe: „%s“" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, 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:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "der Wert „%Lf“ konnte nicht für Ausgabe aufbereitet werden" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, c-format msgid "invalid unit size: %s" msgstr "ungültige Einheitengröße: „%s“" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Aufruf: %s [OPTION]... [NUMMER]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 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:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr " --debug Warnungen bei ungültigen Eingaben ausgeben.\n" -#: src/numfmt.c:824 +#: src/numfmt.c:890 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:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -" --field N ersetzt die Zahl in Eingabefeld N (Vorgabe ist 1)\n" +" --field=FELDER ersetzt die Zahl in Eingabefeld N (Vorgabe ist 1)\n" +" Siehe FELDER weier unten\n" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" @@ -7114,17 +7142,17 @@ msgstr "" " --format=FORMAT verwendet Fließkomma-FORMAT im Stil von printf.\n" " Siehe FORMAT weiter unten für Details.\n" -#: src/numfmt.c:834 +#: src/numfmt.c:901 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" +" --from=EINHEIT die Eingaben automatisch auf EINHEIT skalieren; " +"Vorgabe ist „none“.\n" " Siehe EINHEIT weiter unten\n" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" @@ -7132,7 +7160,7 @@ msgstr "" " --from-unit=N Angabe der Einheit der Eingabe (statt der Vorgabe " "1).\n" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -7143,7 +7171,7 @@ msgstr "" " Ziffern, z.B. 1.000.000 (hat also in C/POSIX\n" " Locales keine Auswirkung).\n" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" @@ -7151,7 +7179,7 @@ msgstr "" " --header[=N] Ausgabe (ohne Umwandlung) der ersten N Kopfzeilen.\n" " N ist 1 wenn es nicht ausdrücklich angegeben wird.\n" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" @@ -7159,7 +7187,7 @@ msgstr "" " --invalid=MODUS Verhalten bei ungültigen Zahlen: MODUS kann sein:\n" " abort (Vorgabe), fail, warn, ignore.\n" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -7176,7 +7204,7 @@ msgstr "" " Leerzeichen, Tabulator oder Zeilenumbruch gefunden\n" " werden.\n" -#: src/numfmt.c:860 +#: src/numfmt.c:927 msgid "" " --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" " up, down, from-zero (default), towards-zero, " @@ -7188,7 +7216,7 @@ msgstr "" " up, down, from-zero (Vorgabe), towards-zero, " "nearest\n" -#: src/numfmt.c:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" @@ -7198,21 +7226,21 @@ msgstr "" "Zahlen\n" " akzeptieren.\n" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -" --to=EIONHEIT auto-skaliert auszugebende Zahlen in EINHEITen.\n" +" --to=EINHEIT auto-skaliert auszugebende Zahlen in EINHEITen.\n" " Siehe EINHEIT weiter unten.\n" -#: src/numfmt.c:871 +#: src/numfmt.c:938 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:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" @@ -7220,14 +7248,14 @@ msgstr "" "\n" "EINHEIT-Optionen:\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -" none Keine auto-skalierung erfolgt. Endungen lösen einen " +" none Keine Auto-Skalierung erfolgt. Endungen lösen einen " "Fehler\n" " aus.\n" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -7241,7 +7269,7 @@ msgstr "" " 1M = 1000000\n" " 1Mi = 1048576\n" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -7253,7 +7281,7 @@ msgstr "" " 1M = 1000000\n" " ...\n" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7265,7 +7293,7 @@ msgstr "" " 1M = 1048576\n" " ...\n" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7277,7 +7305,28 @@ msgstr "" " 1Mi = 1048576\n" " ...\n" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"\n" +"FELDER unterstützt Feldbereiche im Stil von cut(1):\n" +"\n" +" N Ntes Feld, beginnend von 1\n" +" N- vom Nten Byte bis zum Ende der Zeile\n" +" N-M vom Nten zum Mten (einschl.) Feld\n" +" -M vom ersten zum Mten (einschl.) Feld\n" +" - alle Felder\n" +"Mehrere Felder/Bereiche können durch Kommata getrennt weden\n" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -7286,6 +7335,7 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" "\n" "FORMAT muß geeignet sein, ein Fließkomma-Argument „%f“ auszugeben.\n" @@ -7293,9 +7343,10 @@ msgstr "" "aktuellen Locale unterstützt wird). Eine angegebene Breite (%10f) bewirkt\n" "das Auffüllen der Ausgabe. Das angeben einer Breite von Null (%010f) füllt\n" "die Zahl mit Nullen aus. Wird die Breite negativ angegeben (%-10f),\n" -"wird nach links aufgefüllt.\n" +"wird nach links aufgefüllt. Eine angegebene Genauigkeit (%.1f) hat Vorrang\n" +"vor der von der Eingabe abgeleiteten.\n" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7320,7 +7371,7 @@ msgstr "" "nicht angegeben und das Programm mit 0 beendet.\n" "\n" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -7335,8 +7386,8 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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 "" @@ -7352,119 +7403,133 @@ msgstr "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "das Format %s enthält keine %%-Anweisung" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "ungültiges Format %s (Überlauf der Breite)" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "Auffüllen mittels --format hat Vorrang vor --padding" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "das Format %s endet mit %%" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, c-format +msgid "invalid precision in format %s" +msgstr "ungültige Genauigkeit in Format %s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" -msgstr "ungültiges Formt %s, die Anweisung muss die Form %%[0]['][-][N]f haben" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" +msgstr "" +"ungültiges Formt %s, die Anweisung muss die Form %%[0]['][-][N][.][N]f haben" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "das Format %s enthält zu viele %%-Direktiven" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, c-format msgid "invalid suffix in input %s: %s" msgstr "ungültige Endung in Eingabe „%s“: „%s“" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" +"Wert/Genauigkeit zu groß um ausgegeben zu werden: „%Lg/" +"%“ (verwenden Sie evtl. --to)" + +#: src/numfmt.c:1210 #, 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:1111 +#: src/numfmt.c:1219 #, 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:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "großer Eingabewert „%s“: möglicher Verlust von Präzision" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, 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" +msgid "invalid field value %s" +msgstr "Ungültiger Feldwert: %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, c-format msgid "invalid padding value %s" msgstr "Ungültiger Wert für Auffüllung „%s“" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, c-format -msgid "invalid field value %s" -msgstr "Ungültiger Feldwert: %s" +msgid "multiple field specifications" +msgstr "mehrere Feldangaben" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, c-format msgid "invalid header value %s" msgstr "ungültiger Kopf-Wert „%s“" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "--grouping kann nicht mit --format kombiniert werden" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "es wurde keine Umwandlungsoption angegeben" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "Gruppierung kann nicht mit --to kombiniert werden" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "Gruppierung hat in dieser Locale keine Auswirkung" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "--header wird bei Eingabe über Kommandozeile ignoriert" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "Fehler beim Lesen der Eingabe" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "einige der eingegebenen Zahlen konnten nicht umgewandelt werden" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7477,24 +7542,22 @@ msgstr "" " oder: %s --traditional [OPTION]... [DATEI] [[+]OFFSET[.][b] [+][LABEL][.]" "[b]]\n" -#: src/od.c:326 +#: src/od.c:327 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" "Eine eindeutige Darstellung der DATEI, auf Standardausgabe ausgeben " "(Vorgabe:\n" "Oktalzahlen). Bei mehr als einem Argument DATEI, die Dateien in der\n" -"angegebenen Folge verketten und die Eingabe bilden.\n" -"Ohne DATEI oder wenn DATEI „-“ ist, Standardeingabe lesen.\n" +"angegebenen Reihenfolge einlesen.\n" -#: src/od.c:333 +#: src/od.c:335 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" @@ -7502,6 +7565,7 @@ 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" "Wenn die erste und zweite Aufrufform beide zutreffen, wird das zweite " "Format\n" "angenommen, wenn der letzte Operand mit + oder (wenn es zwei Operanden " @@ -7514,7 +7578,7 @@ msgstr "" "Vielfaches\n" "von 512 sein.\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7530,7 +7594,7 @@ msgstr "" " -j, --skip-bytes=BYTES BYTES Eingabebytes am Anfang jeder Datei\n" " übergehen\n" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -7555,7 +7619,7 @@ msgstr "" " --traditional Argumente in dritter, oben angegebener Form\n" " akzeptieren\n" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -7575,7 +7639,7 @@ msgstr "" "wählen\n" " -d dasselbe wie -t u2, dezimale vorzeichenlose 2‐Byte‐Zahlen wählen\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7591,7 +7655,7 @@ 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:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -7606,7 +7670,7 @@ msgstr "" " a ein benanntes Zeichen, oberstes Bit ignorieren\n" " c ASCII‐Zeichen oder Rückschrägstrich‐Escape\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7620,7 +7684,7 @@ msgstr "" " u[ANZAHL] dezimal ohne Vorzeichen, ANZAHL Bytes pro Zahl\n" " x[ANZAHL] hexadezimal, ANZAHL Bytes pro Zahl\n" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -7636,7 +7700,7 @@ msgstr "" "sizeof(float), „D“ für sizeof(double) oder „L“ für sizeof(long double) " "sein.\n" -#: src/od.c:401 +#: src/od.c:404 msgid "" "\n" "Adding a z suffix to any type displays printable characters at the end of\n" @@ -7647,7 +7711,7 @@ msgstr "" "ausgegebe-\n" "nen Zeile druckbare Zeichen angezeigt.\n" -#: src/od.c:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -7670,12 +7734,12 @@ msgstr "" " M 1024×1024\n" "und so weiter für G, T, P, E, Z, Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "Ungültige Typbezeichnung %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7684,7 +7748,7 @@ msgstr "" "Ungültige Typbezeichnung %s;\n" "dieses System hat keinen Typ für %lu‐Byte große Ganzzahlen" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7693,38 +7757,38 @@ msgstr "" "Ungültige Typbezeichnung %s;\n" "dieses System hat keinen Typ für %lu-Byte große Gleitkommazahlen" -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" msgstr "Ungültiges Zeichen „%c“ in Typenbezeichnung %s" -#: src/od.c:1094 +#: src/od.c:1105 #, 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:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, 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:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "Der Kompatibilitätsmodus unterstützt höchstens eine Datei." -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "skip-bytes + read-bytes ist zu groß" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "Warnung: ungültige Breite %lu; %d wird benutzt" @@ -7743,12 +7807,10 @@ msgstr "Standardeingabe ist geschlossen" 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 "" "Zeilen auf Standardausgabe ausgeben, die aus sequenziell sich " "entsprechenden\n" "Zeilen jeder DATEI bestehen, getrennt durch Tabulatoren.\n" -"Ohne DATEI oder wenn DATEI „-“ ist, wird die Standardeingabe gelesen.\n" "\n" #: src/paste.c:447 @@ -7889,12 +7951,12 @@ msgstr "Wann" msgid "Where" msgstr "Wo " -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Aufruf: %s [OPTION]... [BENUTZER]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7911,7 +7973,7 @@ msgstr "" " -p ohne Plan‐Datei der Benutzer (bei langem Format)\n" " -s kurzes Format erzeugen (dies ist die Vorgabe)\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7926,7 +7988,7 @@ msgstr "" " -q ohne volle Namen, entfernte Rechner und Idle‐Zeit der " "Benutzer\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -7937,7 +7999,7 @@ msgstr "" "Ein abgespecktes „finger“‐Programm zum Anzeigen von Benutzerinformationen.\n" "Als utmp‐Datei wird %s genommen.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7946,96 +8008,91 @@ msgstr "" "Option -l verwendet wird" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "„--pages=ERSTE_SEITE[:LETZTE_SEITE]“ fehlendes Argument" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "Ungültiger Seitenbereich %s" -#: 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:967 +msgid "'-l PAGE_LENGTH' invalid number of lines" +msgstr "„-l SEITEN_LÄNGE“ ungültige Anzahl von Zeilen" -#: 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:982 +msgid "'-N NUMBER' invalid starting line number" +msgstr "„-N ZAHL“ ungültige Angabe der Startzeilennummer" -#: 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:986 +msgid "'-o MARGIN' invalid line offset" +msgstr "„-o RAND“ ungültige Angabe des Zeilenoffsets" -#: 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:1023 +msgid "'-w PAGE_WIDTH' invalid number of characters" +msgstr "„-w SEITEN_BREITE“ ungültige Anzahl von Zeichen" -#: 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:1032 +msgid "'-W PAGE_WIDTH' invalid number of characters" +msgstr "„-W SEITEN_BREITE“ ungültige Anzahl von Zeichen" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, 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:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "Seitenbreite zu schmal" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "Anfangsseitennummer % übersteigt Seitenzahl %" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "Überlauf bei den Seitennummern" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Seite %" -#: src/pr.c:2757 +#: src/pr.c:2727 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:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -8053,7 +8110,7 @@ msgstr "" "Spalte\n" " ausbalancieren.\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -8071,7 +8128,7 @@ msgstr "" " -d, --double-space\n" " doppelter Zeilenvorschub in der Ausgabe\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -8092,7 +8149,7 @@ msgstr "" " trennen (durch einen 3‐Zeilen‐Seitenkopf bei -F oder einen\n" " 5‐Zeilen‐Seitenkopf und ‐fuß ohne -F)\n" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -8115,22 +8172,27 @@ msgstr "" " veranlasste Zeilenbeschneidung abschalten, keine\n" " Spaltenausrichtung, --sep-string[=ZKETTE] setzt Trennzeichen\n" -#: src/pr.c:2798 +#: src/pr.c:2769 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" msgstr "" " -l, --length=SEITENLÄNGE\n" " Seitenlänge auf SEITENLÄNGE (66) Zeilen setzen\n" " (Vorgabe: 56 Zeilen, und mit -F 63)\n" + +#: src/pr.c:2775 +msgid "" +" -m, --merge print all files in parallel, one in each column,\n" +" truncate lines, but join lines of full length with -J\n" +msgstr "" " -m, --merge alle Dateien parallel ausgeben, eine in jeder Spalte,\n" " Zeilen abschneiden, aber Zeilen voller Länge bei -J " "vereinigen\n" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -8148,7 +8210,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:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -8163,7 +8225,7 @@ msgstr "" " Warnung unterdrücken, wenn eine Datei nicht geöffnet werden " "kann\n" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -8181,23 +8243,27 @@ msgstr "" " -s[ZEICHEN] schaltet Zeilenabschneidung bei allen drei\n" " Spaltenoptionen (-SPALTE|-a -SPALTE|-m) ab, außer bei -w\n" -#: src/pr.c:2828 +#: src/pr.c:2802 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -S[ZKETTE], --sep-string[=ZKETTE]\n" " Spalten durch eine ZKETTE trennen,\n" " ohne -S: Vorgabetrennzeichen ist Tabulator mit -J und\n" " sonst Leerzeichen (dasselbe wie -S\" \"), hat keine\n" " Auswirkung auf Spaltenoptionen\n" -" -t, --omit-header Kopf‐ und Fußzeilen unterdrücken\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr " -t, --omit-header Kopf‐ und Fußzeilen unterdrücken\n" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -8222,7 +8288,7 @@ msgstr "" " mehrfacher Textspalten setzen, -s[Zeichen] schaltet ab " "(72)\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -8236,16 +8302,6 @@ msgstr "" " Zeilen abschneiden, es sei denn -J ist gesetzt, keine\n" " gegenseitige Störung mit -S oder -s\n" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"-t wird impliziert, wenn PAGE_LENGTH <= 10. Ohne DATEI oder wenn\n" -"DATEI „-“ ist, Standardeingabe lesen.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -8403,18 +8459,23 @@ msgstr "" "ausgeben.\n" "\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 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 automatisch generierte Referenzen ausgeben\n" " -G, --traditional mehr wie „ptx“ von System V funktionieren\n" + +#: src/ptx.c:1835 +msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" " -F, --flag-truncation=ZKETTE ZKETTE benutzen, um Abschneidungen " "anzuzeigen\n" -#: src/ptx.c:1835 +#: src/ptx.c:1839 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -8429,7 +8490,7 @@ msgstr "" " -S, --sentence-regexp=REGEXP für Zeilen‐ oder Satzende\n" " -T, --format=tex Ausgabe als TeX‐Anweisungen erzeugen\n" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8448,7 +8509,7 @@ msgstr "" "lesen\n" " -o, --only-file=DATEI Wortliste nur aus dieser DATEI lesen\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8461,20 +8522,16 @@ msgstr "" "die\n" " Referenzen\n" -#: src/ptx.c:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Ohne DATEI oder wenn DATEI „-“ ist, Standardeingabe lesen. Vorgabe ist „-" -"F /“.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "ungültige Lückenbreite: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "ungültige Zeilenbreite: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8506,7 +8563,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "konnte nicht nach %s wechseln" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "konnte auf %s nicht zugreifen" @@ -8526,8 +8583,8 @@ msgstr "Argumente, die keine Optionen sind, werden ignoriert" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Aufruf: %s [OPTION]... DATEI...\n" @@ -8804,17 +8861,17 @@ msgstr "" #: src/rm.c:342 #, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " -msgstr[0] "%s: %zu Argument rekursiv entfernen? " -msgstr[1] "%s: Alle %zu Argumente rekursiv entfernen? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " +msgstr[0] "%s: % Argument rekursiv entfernen? " +msgstr[1] "%s: Alle % Argumente rekursiv entfernen? " #: src/rm.c:345 #, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " -msgstr[0] "%s: %zu Argument entfernen? " -msgstr[1] "%s: %zu Argumente entfernen? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " +msgstr[0] "%s: % Argument entfernen? " +msgstr[1] "%s: % Argumente entfernen? " # XLATE_REMARK: Check this out! is the %s replaced by the name of the directory? #: src/rmdir.c:134 src/rmdir.c:233 @@ -9038,12 +9095,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "ungültiges Fließkommaargument: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "das Format %s enthält die unbekannte Direktive %%%c" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -9065,7 +9122,15 @@ msgstr "" "selbst mit aufwändigen und teuren Hardware‐Analysemitteln die Daten\n" "wieder herzustellen.\n" -#: src/shred.c:177 +#: src/shred.c:174 +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Wenn DATEI „-“ ist, die Standardausgabe schreddern.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -9079,7 +9144,7 @@ msgstr "" " -s, --size=N diese Anzahl Bytes zerhacken (Endungen wie K, M, G sind " "zulässig)\n" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -9087,7 +9152,9 @@ 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 Datei nach dem Überschreiben abschneiden und entfernen\n" +" -u, --remove[=WIE] Datei nach dem Überschreiben abschneiden und " +"entfernen;\n" +" Siehe auch weiter unten\n" " -v, --verbose Fortschritt anzeigen\n" " -x, --exact Dateigrößen nicht auf den nächsten vollen Block runden;\n" " dies ist für nicht‐reguläre Dateien die Voreinstellung\n" @@ -9095,11 +9162,9 @@ msgstr "" "um\n" " Zerhacken zu verbergen.\n" -#: src/shred.c:192 +#: src/shred.c:196 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.\n" @@ -9111,17 +9176,19 @@ msgid "" "\n" msgstr "" "\n" -"Wenn die DATEI „-“ ist, die Standardausgabe zerhacken.\n" -"\n" "DATEI(en) löschen, wenn --remove (-u) angegeben ist. Die Standardvorgabe\n" "ist es, die Dateien nicht zu löschen, da man oft auf Gerätedateien wie /dev/" "hda\n" "arbeitet, und diese Dateien nicht gelöscht werden sollten. Bei der " "Benutzung\n" "mit normalen Dateien verwenden die meisten Anwender die Option --remove.\n" +"Der optionale Parameter WIE gibt an, wie ein Verzeichniseintrag gelöscht\n" +"werden soll:\n" +"„unlink“ => einen normalen Unlink-Aufruf verwenden.n„wipe“ => zusätzlich " +"zuerst die Bytes im Namen unleserlikch machen.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -9140,7 +9207,7 @@ msgstr "" "alle Dateisystemmodi eine Wirkung garantiert werden kann:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -9162,7 +9229,7 @@ msgstr "" "von Network Appliance\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -9176,7 +9243,7 @@ msgstr "" "* komprimierte Dateisysteme\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -9197,7 +9264,7 @@ msgstr "" "bestimmtes\n" "Dateisystem in der /etc/fstab, wie es in der Manpage zu mount erklärt ist.\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -9208,127 +9275,125 @@ msgstr "" "enthalten, die nicht entfernt werden können, und die es erlauben, eine\n" "zerhackte Datei wieder herzustellen.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync fehlgeschlagen" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync fehlgeschlagen" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: Zurückspulen nicht möglich" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: Durchgang %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: Fehler beim Schreiben an Verschiebung %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek fehlgeschlagen" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: Datei zu groß" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: Durchgang %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: Durchgang %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat fehlgeschlagen" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: ungültiger Dateityp" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: Datei hat negative Größe" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: Fehler beim Abschneiden" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl fehlgeschlagen" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: ein Nur‐Anfügen‐Dateideskriptor kann nicht vernichtet werden" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: wird entfernt" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: in %s umbenannt" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: konnte nicht entfernt werden" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: entfernt" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: konnte nicht geschloßen werden" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: konnte nicht zum Schreiben geöffnet werden" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" -msgstr "%s: ungültige Anzahl von Durchgängen" +msgid "invalid number of passes" +msgstr "ungültige Anzahl von Durchgängen" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "mehrere Zufallsquellen angegeben" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" -msgstr "%s: ungültige Dateigröße" +#: src/shred.c:1255 +msgid "invalid file size" +msgstr "ungültige Dateigröße" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -9339,14 +9404,14 @@ msgstr "" " oder: %s -e [OPTION]... [ARG]...\n" " oder: %s -i VON-BIS [OPTION]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 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:73 +#: src/shuf.c:75 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 " @@ -9365,37 +9430,36 @@ msgstr "" " --random-source=DATEI zufällige Bytes aus DATEI nehmen\n" " -r, --repeat Ausgabezeilen können wiederholt werden\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "zu viele Eingabezeilen" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "mehrfach die Optionen -i angegeben" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" -msgstr "ungültiger Eingabebereich: %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +msgid "invalid input range" +msgstr "ungültiger Eingabebereich" -#: src/shuf.c:465 +#: src/shuf.c:459 #, c-format -msgid "invalid line count %s" +msgid "invalid line count: %s" msgstr "ungültige Zeilenanzahl: %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "mehrere Ausgabedateien angegeben" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "Optionen -e und -i können nicht kombiniert werden." -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "keine zu wiederholenden Zeilen" @@ -9425,12 +9489,12 @@ msgstr "" "wird für eine Zeit pausiert, die der Summe der Werte entspricht.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "ungültiges Zeitintervall %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "die Echtzeit‐Uhr kann nicht gelesen werden" @@ -9442,7 +9506,7 @@ msgstr "" "schreiben.\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -9450,7 +9514,7 @@ msgstr "" "Sortieroptionen:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9462,7 +9526,7 @@ msgstr "" "beachten\n" " -f, --ignore-case Klein‐ als Großbuchstaben behandeln\n" -#: src/sort.c:443 +#: src/sort.c:444 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -9474,14 +9538,14 @@ msgstr "" " -M, --month-sort Reihenfolge: (unbekannt) < „JAN“ < ... < " "„DEZ“\n" -#: src/sort.c:448 +#: src/sort.c:449 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:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9494,7 +9558,7 @@ msgstr "" " --random-source=DATEI zufällige Bytes aus DATEI nehmen\n" " -r, --reverse das Ergebnis der Sortierung umkehren\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9511,7 +9575,7 @@ msgstr "" "innerhalb\n" " des Textes\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -9519,7 +9583,7 @@ msgstr "" "Andere Optionen:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9528,7 +9592,7 @@ msgstr "" " zusammenführen; für mehr benutzen Sie temporäre\n" " Dateien\n" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -9543,7 +9607,7 @@ msgstr "" " --compress-program=PROG temporäre Dateien mit PROG komprimieren;\n" " mit PROG -d wieder entpacken\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9559,7 +9623,7 @@ msgstr "" " NULL-terminiert in DATEI aufgeführt sind;\n" " ist D „-“, so wird die Standardeingabe gelesen\n" -#: src/sort.c:487 +#: src/sort.c:488 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -9570,7 +9634,7 @@ msgstr "" " -m, --merge schon sortierte Dateien zusammenführen; nicht\n" " sortieren\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9584,7 +9648,7 @@ msgstr "" " deaktivieren)\n" " -S, --buffer-size=GRÖßE GRÖßE für Hauptspeicherpuffer benutzen\n" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9610,7 +9674,7 @@ msgstr "" "nur\n" " das erste von mehreren Gleichen ausgeben\n" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9642,12 +9706,10 @@ msgstr "" "\n" "GRÖẞE kann eine der folgenden multiplikativen Endungen folgen:\n" -#: src/sort.c:524 +#: src/sort.c:525 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" @@ -9657,279 +9719,276 @@ msgstr "" "Z,\n" "Y.\n" "\n" -"Ohne DATEI, oder wenn DATEI „-“ ist, Standardeingabe lesen.\n" -"\n" "*** WARNUNG ***\n" "Die eingestellte Locale beeinflusst die Sortierreihenfolge.\n" "Setzen Sie LC_ALL=C, um die traditionelle Sortierreihenfolge zu aktivieren, " "bei\n" "der native Bytewerte verwendet werden.\n" -#: src/sort.c:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "Warte auf %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] beendete sich auf ungute Weise" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "temporäre Datei konnte nicht in %s angelegt werden" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "Öffnen fehlgeschlagen" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "fflush fehlgeschlagen" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "Schließen fehlgeschlagen" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "konnte temporäre Datei nicht anlegen" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "konnte keinen Prozess für %s -d anlegen" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "Warnung: %s kann nicht entfernt werden" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "ungültiges Argument %2$s für Option --%1$s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "kleinstes Argument für Option --%s ist %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "Argument %2$s für Option --%1$s zu groß" -#: src/sort.c:1359 +#: src/sort.c:1358 #, 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:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "parallele Anzahl darf nicht Null sein" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "stat fehlgeschlagen" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "Lesen fehlgeschlagen" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "Zeichenkettentransformation fehlgeschlagen" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "die untransformierte Zeichenkette war %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "^ passt nicht zu Schlüssel\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, 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:2428 +#: src/sort.c:2427 #, 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:2439 +#: src/sort.c:2438 #, 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:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "Schlüssel %lu ist numerisch und überspannt mehrere Felder" -#: src/sort.c:2484 +#: src/sort.c:2483 #, 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:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "Option „-r“ gilt nur für Notlösungsvergleiche" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "Schreiben fehlgeschlagen" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: ungeordnet: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "Standardfehler" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "Lesen unmöglich" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: ungültige Feldangabe %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "Optionen „-%s“ sind inkompatibel" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: ungültige Zähler am Anfang von %s" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "ungültige Zahl hinter „-“" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "ungültige Zahl hinter „.“" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "verirrte Buchstaben in Feldspezifikation" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "mehrere Komprimierungsprogramme angegeben" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "ungültige Zahl am Feldanfang" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "Feldnummer ist Null" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "Zeichenversatz ist Null" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" msgstr "ungültige Zahl hinter „,“" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "leerer Tabulator" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "Kann Dateinamen nicht aus %s lesen." -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: ungültiger Dateiname der Länge 0" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "keine Eingabe aus %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "es werden die Sortierregeln für %s verwendet" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "es wird ein einfacher Bytevergleich verwendet" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "zusätzlicher Operand %s nicht erlaubt mit -%c" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" -msgstr "die Endungslänge muss mindestens %zu betragen" +msgid "the suffix length needs to be at least %" +msgstr "die Endungslänge muss mindestens % betragen" -#: src/split.c:203 +#: src/split.c:224 #, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Aufruf: %s [OPTION]... [EINGABE [PRÄFIX]]\n" -#: src/split.c:207 +#: src/split.c:228 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" "Stücke fester Größe der EINGABE auf PRÄFIXaa, PRÄFIXab, ... ausgeben; " "Vorgabe\n" -"für die Größe ist 1000 Zeilen und für PRÄFIX „x“. Wenn keine EINGABE " -"angegeben\n" -"wurde oder die EINGABE „-“ ist, wird von der Standardeingabe gelesen.\n" +"für die Größe ist 1000 Zeilen und für PRÄFIX „x“.\n" "\n" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" " -a, --suffix-length=N Endungen mit Länge N verwenden (Vorgabe %d)\n" @@ -9948,7 +10007,7 @@ msgstr "" " -u, --unbuffered kopiere die Eingabe direkt mit „-n r/...“ zur\n" " Ausgabe\n" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9956,152 +10015,153 @@ msgstr "" " --verbose Meldung ausgeben, bevor\n" " jede Ausgabedatei geöffnet wird\n" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" "\n" "ABSCHITTE können sein:\n" -"N in N Dateien aufspalten basierend auf Größe der Eingabe\n" -"K/N Kten Teil von N auf Standardausgabe ausgeben\n" -"l/N in N Dateien aufteilen ohne Teilung von Zeilen\n" -"l/K/N Kten Teil von N auf Standardausgabe ohne Zeilentrennung ausgeben\n" -"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" +" N in N Dateien aufspalten basierend auf Größe der Eingabe\n" +" K/N Kten Teil von N auf Standardausgabe ausgeben\n" +" l/N in N Dateien aufteilen ohne Teilung von Zeilen\n" +" l/K/N Kten Teil von N auf Standardausgabe ohne Zeilentrennung ausgeben\n" +" 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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "keine Endungen für Ausgabedateien mehr verfügbar" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "Datei %s wird angelegt\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "%s würde die Eingabe überschreiben; Abbruch" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "die Umgebungsvariable FILE konnte nicht gesetzt werden" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "Ausführung mit DATEI=%s\n" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "Die Pipe konnte nicht erzeugt werden" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "die vorherige Pipe wird geschlossen" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "Die Ausgabepipe wird geschlossen" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "die Eingabepipe wird verschoben" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "die Eingabepipe wird geschlossen" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "der Befehl „%s -c %s” konnte nicht ausgeführt werden" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "die Eingabepipe konnte nicht geschlossen werden" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "es wird auf den Kindprozess gewartet" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "mit FILE=%s, Signal %s von Befehl: %s" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "mit FILE=%s, Ende mit %d in Befehl: %s" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "unbekannter Status von Befehl (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, 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:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" -msgstr "%s: ungültige Anzahl von Abschnitten" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +msgid "invalid number of chunks" +msgstr "ungültige Anzahl von Abschnitten" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" -msgstr "%s: ungültige Abschnittsnummer" +#: src/split.c:1212 +msgid "invalid chunk number" +msgstr "ungültige Abschnittsnummer" -#: src/split.c:1169 +#: src/split.c:1259 +msgid "invalid suffix length" +msgstr "ungültige Endungslänge" + +#: src/split.c:1333 #, c-format -msgid "%s: invalid suffix length" -msgstr "%s: ungültige Endungslänge" +msgid "empty record separator" +msgstr "leerer Datensatz-Trenner" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1344 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: ungültige Anzahl von Bytes" +msgid "multi-character separator %s" +msgstr "Multi-Zeichen-Tabulator %s" -#: src/split.c:1213 src/split.c:1360 +#: src/split.c:1352 #, c-format -msgid "%s: invalid number of lines" -msgstr "%s: ungültige Anzahl von Zeilen" +msgid "multiple separator characters specified" +msgstr "mehrere Trennzeichen wurden angegeben" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "Zeilenanzahloption -%s%c... ist zu groß" -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: ungültiger Startwert für eine numerische Endung" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" -msgstr "%s: ungültige E/A Blockgröße" +#: src/split.c:1419 +msgid "invalid IO block size" +msgstr "ungültige E/A Blockgröße" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" @@ -10109,62 +10169,62 @@ msgstr "" "ausgegeben\n" "werden" -#: src/split.c:1384 +#: src/split.c:1477 #, 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:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "%s konnte nicht in kanonische Form gebracht werden" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "Warnung: unbekannte Flucht‐Sequenz „\\%c“" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: ungültige Anweisung" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "Warnung: ungültiger Rückschrägstrich (\\) am Ende der Zeichenkette" -#: src/stat.c:1262 +#: src/stat.c:1265 #, 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:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "die Dateisysteminformation für %s kann nicht gelesen werden" -#: src/stat.c:1290 +#: src/stat.c:1293 #, c-format msgid "cannot stat standard input" msgstr "der Status der Standardeingabe kann nicht abgefragt werden" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' with --file-system, and NOT from printf. -#: src/stat.c:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -10180,7 +10240,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -10190,30 +10250,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "Kontext: %C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -10225,11 +10285,11 @@ msgstr "" "Geändert : %z\n" " Geburt : %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "Status einer Datei oder eines Dateisystems anzeigen.\n" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" @@ -10237,7 +10297,7 @@ msgstr "" " -L, --dereference Verknüpfungen folgen\n" " -f, --file-system Dateisystemstatus anstelle von Dateistatus anzeigen\n" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -10255,7 +10315,7 @@ msgstr "" " mittels \\n in FORMAT eingefügt werden\n" " -t, --terse die Information in knapper Form ausgeben\n" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -10275,7 +10335,7 @@ msgstr "" " %B die Größe in Bytes jedes mit „%b“ gemeldeten Blocks\n" " %C SELinux-Sicherheitskontext-Zeichenkette\n" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -10291,7 +10351,7 @@ msgstr "" " %g Gruppen‐ID des Eigners\n" " %G Gruppenname des Eigners\n" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -10313,7 +10373,7 @@ msgstr "" " %t Major‐Gerätetyp in Hex\n" " %T Minor‐Gerätetyp in Hex\n" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -10339,7 +10399,7 @@ msgstr "" " %Z Zeit der letzten Änderung in Sekunden seit der Epoche\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -10357,7 +10417,7 @@ msgstr "" " %d Freie Dateiknoten im Dateisystem\n" " %f Freie Blöcke im Dateisystem\n" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -10437,8 +10497,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -10471,7 +10530,7 @@ msgstr "die zeilenweise Pufferung von Stdin hat keinen Sinn" msgid "you must specify a buffering mode option" msgstr "Sie müssen einen Pufferungsmodus angeben" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10482,11 +10541,11 @@ msgstr "" " oder: %s [-F GERÄT | --file=GERÄT] [-a|--all]\n" " oder: %s [-F GERÄT | --file=GERÄT] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "Eigenschaften eines Terminals ausgeben oder ändern.\n" -#: src/stty.c:528 +#: src/stty.c:536 msgid "" " -a, --all print all current settings in human-readable form\n" " -g, --save print all current settings in a stty-readable form\n" @@ -10498,7 +10557,7 @@ msgstr "" "öffnen\n" " und benutzen\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10509,117 +10568,159 @@ msgstr "" "nicht POSIX‐konforme Einstellungen. Das Wirtssystem bestimmt, welche\n" "Einstellungen zur Verfügung stehen.\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" +"\n" +"Zeichen mit besonderer Bedeutung:\n" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr " * discard ZEICHEN Zeichen aktiviert verwerfen der Ausgabe\n" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" +" * dsusp ZEICHEN ZEICHEN löst ein Terminalstoppsignal aus, wenn die\n" +" Eingabe geleert ist\n" + +#: src/stty.c:561 +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" -"\n" -"Besondere Zeichen:\n" -"* dsusp CHAR CHAR sendet ein Terminalstoppsignal, wenn Eingabe " -"erforderlich\n" -" eof CHAR CHAR sendet Ende‐der‐Datei (Eingabe beenden)\n" -" eol CHAR CHAR beendet Zeile\n" +" eof ZEICHEN ZEICHEN sendet Ende‐der‐Datei (Eingabe beenden)\n" +" eol ZEICHEN ZEICHEN beendet Zeile\n" + +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "* eol2 ZEICHEN alternatives ZEICHEN für Zeilenende\n" -#: src/stty.c:547 +#: src/stty.c:570 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 alternatives CHAR für Zeilenende\n" -" erase CHAR CHAR löscht das zuletzt eingegebene Zeichen\n" -" intr CHAR CHAR sendet Unterbrechungssignal (Interrupt)\n" -" kill CHAR CHAR löscht aktuelle Zeile\n" +" erase ZEICHEN ZEICHEN löscht das zuletzt eingegebene Zeichen\n" +" intr ZEICHEN ZEICHEN sendet Unterbrechungssignal (Interrupt)\n" +" kill ZEICHEN ZEICHEN löscht aktuelle Zeile\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" -msgstr "" -"* lnext CHAR CHAR nimmt das nächste Zeichen uninterpretiert auf\n" -" quit CHAR CHAR sendet ein Quit‐Signal\n" -"* rprnt CHAR CHAR gibt die aktuelle Zeile neu aus\n" -" start CHAR CHAR startet die Ausgabe erneut nach einem Stopp\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr " * lnext ZEICHEN ZEICHEN will enter the next character quoted\n" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr " * status ZEICHEN ZEICHEN sendet ein Infosignal\n" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr " quit ZEICHEN ZEICHEN sendet ein Quit‐Signal\n" -#: src/stty.c:559 +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr " * rprnt ZEICHEN ZEICHEN gibt die aktuelle Zeile neu aus\n" + +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 stoppt die Ausgabe\n" -" susp CHAR CHAR sendet ein Terminalstoppsignal\n" -"* swtch CHAR CHAR wechselt zu einer anderen Shell‐Ebene\n" -"* werase CHAR CHAR löscht das zuletzt eingegebene Wort\n" +" start ZEICHEN ZEICHEN startet die Ausgabe erneut nach einem Stopp\n" +" stop ZEICHEN ZEICHEN stoppt die Ausgabe\n" +" susp ZEICHEN ZEICHEN sendet ein Terminalstoppsignal\n" + +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr " * swtch ZEICHEN ZEICHEN wechselt zu einer anderen Shell‐Ebene\n" -#: src/stty.c:565 +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr " * werase ZEICHEN ZEICHEN löscht das zuletzt eingegebene Wort\n" + +#: src/stty.c:608 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 "" "\n" "Spezielle Einstellungen:\n" " N Eingabe‐ und Ausgabegeschwindigkeit auf N Baud setzen\n" -"* cols N an den Kernel melden, dass dieses Terminal N Spalten hat\n" -"* columns N dasselbe wie cols N\n" -#: src/stty.c:572 +#: src/stty.c:614 +msgid "" +" * cols N tell the kernel that the terminal has N columns\n" +" * columns N same as cols N\n" +msgstr "" +" * cols N an den Kernel melden, dass dieses Terminal N Spalten hat\n" +" * columns N dasselbe wie cols N\n" + +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr " ispeed N Eingabegeschwindigkeit auf N setzen\n" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr " * line N \"line discipline\" N benutzen\n" + +#: src/stty.c:627 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 "" -" ispeed N Eingabegeschwindigkeit auf N setzen\n" -"* line N \"line discipline\" N benutzen\n" " min N mit -icanon, N Zeichen Minimum für ein vollständiges Lesen " "setzen\n" " ospeed N Ausgabegeschwindigkeit auf N setzen\n" -#: src/stty.c:578 +#: src/stty.c:632 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" +msgstr "" +" * rows N an den Kernel melden, dass dieses Terminal N Zeilen hat\n" +" * size die Anzahl Zeilen und Spalten ausgeben\n" + +#: src/stty.c:637 +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -"* rows N an den Kernel melden, dass dieses Terminal N Zeilen hat\n" -"* size die Anzahl Zeilen und Spalten ausgeben\n" -" speed die Terminal‐Geschwindigkeit ausgeben\n" -" time N mit -icanon, die Lesewartezeit auf N Zehntelsekunden setzen\n" +" speed die Terminal‐Geschwindigkeit ausgeben\n" +" time N mit -icanon, die Lesewartezeit auf N Zehntelsekunden setzen\n" -#: src/stty.c:584 +#: src/stty.c:641 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" "Einstellungen für die Flusskontrolle:\n" " [-]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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "* [-]crtscts RTS/CTS‐Handshaking erlauben\n" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "* [-]cdtrdsr DTR/DSR-Handshaking erlauben\n" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr " csN Zeichengröße auf N Bits setzen, N in [5..8]\n" + +#: src/stty.c:660 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -10627,7 +10728,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb zwei Stopp‐Bits pro Zeichen benutzen (eins mit „-“)\n" " [-]hup ein Hangup‐Signal senden, wenn der letzte Prozess das " @@ -10637,9 +10737,12 @@ msgstr "" " [-]parenb Paritätsbit in der Ausgabe erzeugen und Paritätsbit in der\n" " Eingabe erwarten\n" " [-]parodd ungerade Parität setzen (oder gerade Parität „-“)\n" -" * [-]cmspar \"haftende\" (mark/space) Parität verwenden\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr " * [-]cmspar \"haftende\" (mark/space) Parität verwenden\n" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -10647,6 +10750,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Einstellungen für die Eingabe:\n" @@ -10654,208 +10758,301 @@ msgstr "" " [-]icrnl Wagenrücklauf (CR) in Zeilenvorschub wandeln\n" " [-]ignbrk Breaks ignorieren\n" " [-]igncr Wagenrücklauf ignorieren\n" +" [-]ignpar Parity‐Fehler ignorieren\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" +" * [-]imaxbel piepen und vollen Eingabepuffer leeren;\n" +" nicht bei Eingabe eines Zeichens\n" + +#: src/stty.c:686 +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -" [-]ignpar Parity‐Fehler ignorieren\n" -"* [-]imaxbel piepen und vollen Eingabepuffer leeren;\n" -" nicht bei Eingabe eines Zeichens\n" " [-]inlcr Zeilenvorschub in Wagenrücklauf (CR) wandeln\n" " [-]inpck Eingabeprüfung der Parity erlauben\n" " [-]istrip höchstes Bit (das 8.) der Eingabezeichen löschen\n" -#: src/stty.c:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" -msgstr "* [-]iutf8 Eingabezeichen als UTF-8 annehmen\n" +msgstr "* [-]iutf8 annehemen,dassEingabezeichen als UTF-8 kodiert sind\n" -#: src/stty.c:619 +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr " * [-]iuclc Groß- in Kleinbuchstaben wandeln\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" +" * [-]ixany jedes Zeichen startet Ausgabe neu, nicht nur das " +"Startzeichen\n" + +#: src/stty.c:706 +msgid "" " [-]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 "" -"* [-]iuclc Groß- in Kleinbuchstaben wandeln\n" -"* [-]ixany jedes Zeichen startet Ausgabe neu, nicht nur das " -"Startzeichen\n" " [-]ixoff das Senden von Start‐/Stoppzeichen erlauben\n" " [-]ixon XON/XOFF‐Flusskontrolle erlauben\n" " [-]parmrk Parity‐Fehler markieren (mit einer 255‐0‐Zeichenfolge)\n" " [-]tandem dasselbe wie [-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" "\n" "Einstellungen für die Ausgabe:\n" -"* bsN Verzögerungsstil für Backspace, N in [0..1]\n" -"* crN Verzögerungsstil für Wagenrücklauf (CR), N in [0..3]\n" -"* 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:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr " * bsN Verzögerungsstil für Backspace, N in [0..1]\n" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" +" * crN Verzögerungsstil für Wagenrücklauf (CR), N in [0..3]\n" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr " * ffN Verzögerungsstil für Seitenvorschub, N in [0..1]\n" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr " * nlN Verzögerungsstil für Zeilenvorschub, N in [0..1]\n" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr " * [-]ocrnl Wagenrücklauf (CR) in Zeilenvorschub wandeln\n" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" -" * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" msgstr "" -"* [-]ocrnl Wagenrücklauf (CR) in Zeilenvorschub wandeln\n" -"* [-]ofdel Löschzeichen zum Auffüllen anstelle von Nullzeichen " +" * [-]ofdel Löschzeichen zum Auffüllen anstelle von Nullzeichen " "benutzen\n" -"* [-]ofill Füllzeichen anstelle von Zeitverzögerungen benutzen\n" -"* [-]olcuc Klein‐ in Großbuchstaben wandeln\n" -"* [-]onlcr Zeilenvorschub in Wagenrücklauf (CR) wandeln\n" -"* [-]onlret Zeilenvorschub bedingt Wagenrücklauf (CR)\n" -#: src/stty.c:643 +#: src/stty.c:747 +msgid "" +" * [-]ofill use fill (padding) characters instead of timing for delays\n" +msgstr " * [-]ofill Füllzeichen anstelle von Zeitverzögerungen benutzen\n" + +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr " * [-]olcuc Klein‐ in Großbuchstaben wandeln\n" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr " * [-]onlcr Zeilenvorschub in Wagenrücklauf (CR) wandeln\n" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr " * [-]onlret Zeilenvorschub bedingt Wagenrücklauf (CR)\n" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr " * [-]onocr kein Wagenrücklauf (CR) in der ersten Spalte\n" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr " [-]opost Ausgabe nachbehandeln\n" + +#: src/stty.c:775 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 "" -"* [-]onocr kein Wagenrücklauf (CR) in der ersten Spalte\n" -" [-]opost Ausgabe nachbehandeln\n" -"* tabN horizontale Tabulatorverzögerung, N in [0..3]\n" -"* tabs dasselbe wie tab0\n" -"* -tabs dasselbe wie tab3\n" -"* vtN vertikale Tabulatorverzögerung, N in [0..1]\n" +" * tabN horizontale Tabulatorverzögerung, N in [0..3]\n" +" * tabs dasselbe wie tab0\n" +" * -tabs dasselbe wie tab3\n" + +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr " * vtN vertikale Tabulatorverzögerung, N in [0..1]\n" -#: src/stty.c:651 +#: src/stty.c:786 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 "" "\n" "Lokale Einstellungen:\n" " [-]crterase Löschzeichen als Backspace‐Leerzeichen‐Backspace ausgeben\n" + +#: src/stty.c:792 +msgid "" +" * 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 "" "* crtkill Zeile mit echoprt‐ und echoe‐Einstellungen löschen\n" "* -crtkill Zeile mit echoctl‐ und echok‐Einstellungen löschen\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr " * [-]ctlecho Sonderzeichen in Hutnotation ausgeben („^c“)\n" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr " [-]echo eingegebene Zeichen ausgeben\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr " * [-]echoctl dasselbe wie [-]ctlecho\n" + +#: src/stty.c:810 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 "" -"* [-]ctlecho Sonderzeichen in Hutnotation ausgeben („^c“)\n" -" [-]echo Eingabezeichen ausgeben\n" -"* [-]echoctl dasselbe wie [-]ctlecho\n" -" [-]echoe dasselbe wie [-]crterase\n" -" [-]echok Zeilenvorschub nach Killzeichen ausgeben\n" +" [-]echoe dasselbe wie [-]crterase\n" +" [-]echok Zeilenvorschub nach Killzeichen ausgeben\n" + +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr " * [-]echoke dasselbe wie [-]crtkill\n" -#: src/stty.c:665 +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" +" [-]echonl Zeilenvorschub ausgeben, auch wenn keine Zeichen " +"ausgegeben\n" +" werden\n" + +#: src/stty.c:823 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" +msgstr "" +" * [-]echoprt gelöschte Zeichen rückwärts ausgeben, zwischen „\\“ und " +"„/“\n" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" +" * [-]extproc „LEITUNGSMODUS“ aktivieren; nützlich bei Verbindungen mit " +"hoher Latenz\n" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -"* [-]echoke dasselbe wie [-]crtkill\n" -" [-]echonl Zeilenvorschub ausgeben, auch wenn keine Zeichen ausgegeben\n" -" werden\n" -"* [-]echoprt gelöschte Zeichen rückwärts ausgeben, zwischen „\\“ und „/“\n" -" [-]icanon erase‐, kill‐, werase‐ und rprnt‐Sonderzeichen erlauben\n" -" [-]iexten Sonderzeichen erlauben, die nicht POSIX‐konform sind\n" +" [-]icanon folgende Sonderzeichen erlauben: %s\n" +" [-]iexten Sonderzeichen erlauben, die nicht POSIX‐konform sind\n" -#: src/stty.c:672 +#: src/stty.c:843 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 "" " [-]isig interrupt‐, quit‐ und suspend‐Sonderzeichen erlauben\n" " [-]noflsh Ausgabeentleerung nach interrupt‐ und quit‐Sonderzeichen\n" " verhindern\n" -"* [-]prterase dasselbe wie [-]echoprt\n" -"* [-]tostop Hintergrundjobs stoppen, die auf das Terminal schreiben\n" -"* [-]xcase mit icanon, Großbuchstaben mit „\\“ maskieren\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr " * [-]prterase dasselbe wie [-]echoprt\n" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" +" * [-]tostop Hintergrundjobs stoppen, die auf das Terminal schreiben\n" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "* [-]xcase mit icanon, Großbuchstaben mit „\\“ maskieren\n" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" -" cbreak same as -icanon\n" -" -cbreak same as icanon\n" msgstr "" "\n" "Kombinierte Einstellungen:\n" -"* [-]LCASE dasselbe wie [-]lcase\n" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr " * [-]LCASE dasselbe wie [-]lcase\n" + +#: src/stty.c:871 +msgid "" +" cbreak same as -icanon\n" +" -cbreak same as icanon\n" +msgstr "" " cbreak dasselbe wie -icanon\n" " -cbreak dasselbe wie icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 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 dasselbe wie brkint ignpar istrip icrnl ixon opost isig\n" " icanon, und eof‐ und eol‐Zeichen mit den Vorgabewerten\n" " -cooked dasselbe wie raw\n" -" crt dasselbe wie echoe echoctl echoke\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr " crt dasselbe wie %s\n" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr " dec dasselbe wie %s intr ^c erase 0177\n" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr " * [-]decctlq dasselbe wie [-]ixany\n" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -" dec dasselbe wie echoe echoctl echoke -ixany intr ^c erase 0177\n" -" kill ^u\n" -"* [-]decctlq dasselbe wie [-]ixany\n" -" ek Erase‐ und Killzeichen auf Vorgabewert setzen\n" -" evenp dasselbe wie parenb -parodd cs7\n" +" ek Erase‐ und Killzeichen auf Vorgabewert setzen\n" +" evenp dasselbe wie parenb -parodd cs7\n" +" -evenp dasselbe wie -parenb cs8\n" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr " * [-]lcase dasselbe wie xcase iuclc olcuc\n" + +#: src/stty.c:919 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 "" -" -evenp dasselbe wie -parenb cs8\n" -"* [-]lcase dasselbe wie xcase iuclc olcuc\n" -" litout dasselbe wie -parenb -istrip -opost cs8\n" -" -litout dasselbe wie parenb istrip opost cs7\n" -" nl dasselbe wie -icrnl -onlcr\n" -" -nl dasselbe wie icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" +" litout dasselbe wie -parenb -istrip -opost cs8\n" +" -litout dasselbe wie parenb istrip opost cs7\n" + +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +" nl dasselbe wie %s\n" +" -nl dasselbe wie %s\n" -#: src/stty.c:707 +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10869,36 +11066,37 @@ msgstr "" " pass8 dasselbe wie -parenb -istrip cs8\n" " -pass8 dasselbe wie parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw dasselbe wie -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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -post\n" +" -isig%s min 1 time 0\n" " -raw dasselbe wie cooked\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -" sane dasselbe wie 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" -" alle Sonderzeichen auf ihren Vorgabewert\n" +" sane dasselbe wie cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" alle Sonderzeichen auf ihren Vorgabewert\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10915,12 +11113,12 @@ msgstr "" "^c, 0x37, 0177 oder 127; spezielle Werte ^- oder undef werden benutzt, um\n" "Sonderzeichen zu unterbinden.\n" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "nur ein Gerät darf angegeben werden" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10929,46 +11127,50 @@ msgstr "" "Die Optionen für ausführliche und stty‐lesbare Ausgabe\n" "können nicht gleichzeitig benutzt werden" -#: src/stty.c:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, 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:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "ungültiges Argument %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "fehlendes Argument für %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, c-format +msgid "%s: error setting %s" +msgstr "%s: Fehler beim Setzen von %s" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "ungültige Line‐Disziplin %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, 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:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: Keine Information zur Größe dieses Gerätes" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" -msgstr "ungültiges Ganzzahlargument %s" +#: src/stty.c:2279 +msgid "invalid integer argument" +msgstr "ungültiges Ganzzahlargument" #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 @@ -10976,33 +11178,79 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +msgid "Print checksum and block counts for each FILE.\n" +msgstr "CRC-Checksumme und Blockanzahl für jede DATEI ausgeben.\n" + +#: src/sum.c:68 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 "" -"Prüfsumme und Blockanzahl für jede DATEI ausgeben.\n" "\n" " -r BSD‐Summenalgorithmus benutzen, 1K Blöcke verwenden\n" " -s, --sysv System‐V‐Summenalgorithmus benutzen, 512‐Byte‐Blöcke\n" " verwenden\n" +"Prüfsumme und Blockanzahl für jede DATEI ausgeben.\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Aufruf: %s [OPTION]... [DATEI]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" +"\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" msgstr "" -"Das Schreiben geänderter Blöcke auf die Platte erzwingen,\n" -"den Super‐Block aktualisieren.\n" +"Zwischengespeicherte Schreiboperationen mit dem dem dauerhaften Speicher\n" +"synchronisieren.\n" "\n" +"Werden eine oder mehrere Dateien angegeben werden nur diese oder das sie\n" +"enthaltende Dateisystem synchronisiert.\n" +"\n" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" +" -d, --data nur die zu den Dateien gehörenden Daten\n" +" synchronisieren und keien unnötigen Metadaten\n" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" +" -f, --filesystem nur die Dateisysteme synchronisieren, auf denen\n" +" die Dateien gespeichert wurden\n" -#: src/sync.c:69 +#: src/sync.c:114 #, c-format -msgid "ignoring all arguments" -msgstr "ignoriere alle Argumente" +msgid "error opening %s" +msgstr "Fehler beim Öffnen von %s" -#: src/system.h:343 +#: src/sync.c:124 +#, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "Zurücksetzen des nicht-blockierenden Modus %s ist nicht möglich" + +#: src/sync.c:154 +#, c-format +msgid "error syncing %s" +msgstr "Fehler beim Synchronisieren von %s" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "--data und --file-system können nicht beide angegeben werden" + +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "--data benötigt mindestens ein Argument" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -11017,15 +11265,23 @@ msgstr "" "auf die Dokumentation der Shell zurück, um die dort unterstützten Optionen\n" "in Erfahrung zu bringen.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help diese Hilfe anzeigen und beenden\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version Versionsinformation anzeigen und beenden\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Ohne DATEI oder wenn DATEI „-“ ist, Standardeingabe lesen.\n" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -11034,7 +11290,7 @@ msgstr "" "Erforderliche Argumente für lange Optionen sind auch für kurze " "erforderlich.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -11047,7 +11303,7 @@ msgstr "" "oder\n" "KB, MB, ... (Potenzen von 1000).\n" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -11061,7 +11317,7 @@ msgstr "" "Andernfalls ist die Vorgabe Einheiten von 1024 Bytes \t(oder 512 wenn\n" "POSIXLY_CORRECT gesetzt wurde).\n" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -11074,26 +11330,29 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" "Melden Sie Übersetzungsfehler für %s an \n" -#: src/system.h:584 +#: src/system.h:604 #, 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" +msgid "Full documentation at: <%s%s>\n" +msgstr "Die vollständige Dokumentation ist hier: <%s%s>\n" + +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "oder auch lokal mittels „info '(coreutils) %s%s'“\n" -#: src/system.h:591 +#: src/system.h:613 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "„%s --help“ liefert weitere Informationen.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -11114,12 +11373,8 @@ msgid "Jay Lepreau" msgstr "Jay Lepreau" #: 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 "" -"Jede DATEI nach Standardausgabe schreiben, die letzte Zeile zuerst.\n" -"Wurde keine DATEI angegeben oder ist DATEI „-“, Standardeingabe lesen.\n" +msgid "Write each FILE to standard output, last line first.\n" +msgstr "Jede DATEI nach Standardausgabe schreiben, die letzte Zeile zuerst.\n" #: src/tac.c:144 msgid "" @@ -11133,64 +11388,61 @@ msgstr "" " -s, --separator=ZKETTE ZKETTE als Trennzeichen statt Zeilenumbruch " "benutzen\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: Seek fehlgeschlagen" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "Datensatz zu groß" -#: src/tac.c:450 +#: src/tac.c:459 #, c-format msgid "failed to create temporary file in %s" msgstr "die temporäre Datei konnte in %s nicht angelegt werden" -#: src/tac.c:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" msgstr "%s konnte nicht zum Schreiben geöffnet werden" -#: src/tac.c:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" msgstr "Der Strom für %s konnte nicht zurückgesetzt werden" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: Schreibfehler" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "%s konnte nicht zum Lesen geöffnet werden" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "Trennzeichen darf nicht leer sein" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 +#: src/tail.c:257 #, 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 "" "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 wird von der Standardeingabe gelesen.\n" -"\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" @@ -11199,7 +11451,7 @@ msgstr "" "benutzen,\n" " um Bytes ab dem Kten jeder Datei auszugeben\n" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -11214,7 +11466,7 @@ msgstr "" " äquivalent\n" " -F gleichbedeutend mit „--follow=name --retry“\n" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -11239,7 +11491,7 @@ msgstr "" " (das ist normalerweise der Fall bei rotierten\n" " Logdateien)\n" -#: src/tail.c:293 +#: src/tail.c:288 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -11255,7 +11507,7 @@ msgstr "" " verfolgt wird, also mit --follow=Name\n" # -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -11269,7 +11521,7 @@ msgstr "" " mindestens alle N Sekunden geprüft.\n" " -v, --verbose immer Kopfzeilen mit Dateinamen ausgeben\n" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -11289,7 +11541,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:316 +#: src/tail.c:311 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" @@ -11310,24 +11562,24 @@ msgstr "" "ob\n" "die Datei gelöscht und von einem anderen Programm neu angelegt wurde.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "%s wird geschlossen (df=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, 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:898 +#: src/tail.c:893 #, 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:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -11337,154 +11589,152 @@ msgstr "" "(in\n" "Englisch) an %s. Es wird auf Pollen zurückgefallen" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" "%s wurde durch eine symbolishce Verknüpfung erstezt, kein weiterer Versuch" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "auf %s kann nicht mehr zugegriffen werden" -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "%s wurde durch eine ungeeignete Datei ersetzt, kein weiterer Versuch" -#: src/tail.c:1006 +#: src/tail.c:999 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" "%s wurde durch eine entfernt liegenden Datei ersetzt , kein weiterer Versuch" -#: src/tail.c:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "auf „%s“ kann jetzt zugegriffen werden" -#: src/tail.c:1035 +#: src/tail.c:1032 #, c-format -msgid "%s has appeared; following end of new file" -msgstr "%s ist aufgetaucht; folge Ende der neuen Datei" +msgid "%s has appeared; following new file" +msgstr "%s ist aufgetaucht; folge der neuen Datei" -#: src/tail.c:1046 +#: src/tail.c:1042 #, c-format -msgid "%s has been replaced; following end of new file" -msgstr "%s wurde ersetzt; folge Ende der neuen Datei" +msgid "%s has been replaced; following new file" +msgstr "%s wurde ersetzt; folge der neuen Datei" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: Ändern desf nicht‐blockierenden Modus ist nicht möglich" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: Datei abgeschnitten" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "Keine Dateien mehr übrig" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "das Elternverzeichnis von %s kann nicht beobachtet werden" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "die Inotify-Resourcen sind erschöpft" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "%s nicht beobachtet werden" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, c-format +msgid "%s was replaced" +msgstr "%s wurde ersetzet" + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "Fehler beim Überwachen der Inotify-Events" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "Fehler beim Lesen des Inotify-Events" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: es ist nicht möglich, bis zum Ende dieses Dateityps vorgehen;\n" " kein weiterer Versuch für diesen Namen" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "Zahl in %s ist zu groß" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +msgid "invalid maximum number of unchanged stats between opens" msgstr "" -"%s: ungültige maximale Anzahl von ungeänderten „stats“ zwischen Öffnungen" +"ungültige maximale Anzahl von ungeänderten Stat-Aufrufen zwischen Öffnungen" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +msgid "invalid PID" msgstr "%s: ungültige PID" -#: src/tail.c:2068 +#: src/tail.c:2107 #, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: ungültige Anzahl von Sekunden" +msgid "invalid number of seconds: %s" +msgstr "Ungültige Anzahl Sekunden: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "Option in ungültigen Kontext benutzt – %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" "Warnung: --retry wurde ignoriert; --retry ist nur bei Verfolgung sinnvoll" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "Warnung: --retry hat nur beim ersten Öffnen eine Wirkung" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "Warnung: PID ignoriert; --pid=PID ist nur sinnvoll, wenn es folgt" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "Warnung: --pid=PID wird auf diesem System nicht unterstützt" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "%s nicht nach Namen verfolgt werden" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "Warnung: die Standardausgabe stetig zu verfolgen ist nicht wirksam" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" "Inotify kann nicht verwendet werden, es wird auf Pollen zurückgegriffen" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -11498,60 +11748,88 @@ msgstr "" " überschreiben\n" " -i, --ignore-interrupts Unterbrechungssignale (Interrupts) ignorieren\n" -#: src/tee.c:71 +#: src/tee.c:93 +msgid "" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" +msgstr "" +" -p, --output-error[=MODUS] Verhalten bei Schreibfehlern. Siehe MODUS-" +"Details\n" +" weiter unten\n" + +#: src/tee.c:98 msgid "" "\n" -"If a FILE is -, copy again to standard output.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" msgstr "" "\n" -"Wenn DATEI „-“ ist, wieder in Standardausgabe kopieren.\n" +"MODUS bestimmt das Verhalten bei Schreibfehlern während der Ausgabe:\n" +" 'warn' Meldung bei Fehlern auf beliebigem Ausgabekanal\n" +" 'warn-nopipe' Meldung bei Fehlern auf beliebigem Ausgabekanal ausser\n" +" Pipelines\n" +" 'exit' Programm beenden bei Fehlern auf beliebigem Ausgabekanal\n" +" 'exit-nopipe' Programm beenden Fehlern auf beliebigem Ausgabekanal " +"ausser\n" +" Pipelines\n" +"Der Standardmodus für die Option -p ist 'warn-nopipe'.\n" +"Wird --output-error nicht angegeben, endet das Programm sofort bei Fehlern\n" +"während der Ausgabe auf Pipelines und gibt eine Meldung aus, wenn Fehler\n" +"bei allen anderen möglichen Ausgabekanälen.\n" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "fehlendes Argument hinter „%s“" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "ungültige Zahl %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "„)“ erwartet" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "„)“ erwartet, %s gefunden" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: Operator mit einem Argument erwartet" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt erlaubt kein -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef erlaubt kein -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot erlaubt kein -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "unbekannter binärer Operator" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: binärer Operator erwartet" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11565,7 +11843,7 @@ msgstr "" " oder: [ ]\n" " oder: [ OPTION\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11573,7 +11851,7 @@ msgstr "" "Programm mit Status gemäß AUSDRUCK beenden.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11583,7 +11861,7 @@ msgstr "" "Ein weggelassener AUSDRUCK ergibt falsch. Ansonsten ist\n" "AUSDRUCK wahr oder falsch und setzt den Exit‐Status. Er kann sein:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11597,7 +11875,7 @@ msgstr "" " AUSDRUCK1 -a AUSDRUCK2 sowohl AUSDRUCK1 als auch AUSDRUCK2 ist wahr\n" " AUSDRUCK1 -o AUSDRUCK2 AUSDRUCK1 oder AUSDRUCK2 ist wahr\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11613,7 +11891,7 @@ msgstr "" " ZKETTE1 = ZKETTE2 die ZKETTEn sind gleich\n" " ZKETTE1 != ZKETTE2 die ZKETTEn sind nicht gleich\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11631,7 +11909,7 @@ msgstr "" " GANZZAHL1 -lt GANZZAHL2 GANZZAHL1 ist kleiner als GANZZAHL2\n" " GANZZAHL1 -ne GANZZAHL2 GANZZAHL1 ist nicht gleich GANZZAHL2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11644,7 +11922,7 @@ msgstr "" " DATEI1 -nt DATEI2 DATEI1 ist neuer (Änderungsdatum) als DATEI2\n" " DATEI1 -ot DATEI2 DATEI1 ist älter als DATEI2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11658,7 +11936,7 @@ msgstr "" " -d DATEI DATEI existiert und ist ein Verzeichnis\n" " -e DATEI DATEI existiert\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11673,7 +11951,7 @@ msgstr "" "L)\n" " -k DATEI DATEI existiert und hat das Sticky‐Bit gesetzt\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11688,7 +11966,7 @@ msgstr "" " -r DATEI DATEI existiert und ist lesbar\n" " -s DATEI DATEI existiert und ist größer als Null\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11703,7 +11981,7 @@ msgstr "" " -w DATEI DATEI existiert und ist schreibbar\n" " -x DATEI DATEI existiert und ist ausführbar\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11718,7 +11996,7 @@ msgstr "" "einem Rückschrägstrich).\n" "GANZZAHL kann auch -l ZKETTE sein, was die Länge der ZKETTE ist.\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11729,25 +12007,25 @@ msgstr "" "nicht.\n" "test behandelt diese beiden wie jede andere nichtleere Zeichenkette.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test und/oder [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "„]“ fehlt" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "zusätzliches Argument %s" @@ -11767,7 +12045,7 @@ msgstr "Warnung: timer_settime" msgid "warning: timer_create" msgstr "Warnung: timer_create" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11776,13 +12054,13 @@ msgstr "" "Aufruf: %s [OPTION] ZEITSPANNE BEFEHL [ARGUMENT]...\n" " oder: %s [OPTION]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" "Starte BEFEHL und beende ihn zwangsweise, wenn er nach ZEITSPANNE noch " "läuft.\n" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11817,7 +12095,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:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11829,7 +12107,7 @@ msgstr "" "„s“ für Sekunden für Sekunden (Voreinstellung), „m“ für Minuten, „h“ für\n" "Stunden oder „d“ für Tage.\n" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -11849,7 +12127,7 @@ 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:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "Warnung: das Verhindern von Coredumps scheiterte" @@ -11864,6 +12142,11 @@ msgstr "Fehler beim Warten auf den Befehl" msgid "the monitored command dumped core" msgstr "der beobachtete Befehl erzeugte einen Speicherauszug" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "unbekannter Status des Befehls (%d)" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -12244,12 +12527,12 @@ msgstr "Mit einem Status beenden, der Erfolg signalisiert." msgid "Exit with a status code indicating failure." msgstr "Mit einem Status beenden, der Misserfolg signalisiert." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Aufruf: %s OPTION... DATEI...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -12269,18 +12552,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:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create keine Dateien erstellen\n" -#: src/truncate.c:112 +#: src/truncate.c:85 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:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" @@ -12288,7 +12571,7 @@ msgstr "" " -r, --reference=DATEI die Größe dieser DATEI nehmen\n" " -s, --size=GRÖßE diese GRÖßE benutzen\n" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -12300,57 +12583,61 @@ msgstr "" "‚+‘ erweitern um, ‚-‘ verkleinern um, ‚<‘ höchstens, ‚>‘ mindestens,\n" "‚/‘ abrunden zu Vielfachem von, ‚%‘ aufrunden zu Vielfachem von.\n" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "Überlauf in % * % Byte-Blöcken für Datei %s" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s has nicht nutzbare, scheinbar negative Größe" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "die Größe von %s kann nicht ermittelt werden" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "Überlauf beim Aufrunden der Größe der Datei %s" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "Überlauf bei erweitern der Größe der Datei %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "Beschneiden von %s bei % Bytes ist misslungen" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "mehrere relative Modifikatoren angegeben" -#: src/truncate.c:333 +#: src/truncate.c:285 +msgid "Invalid number" +msgstr "ungültige Zahl" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "Sie müssen entweder %s oder %s angeben" -#: src/truncate.c:340 +#: src/truncate.c:314 #, 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:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "%s wurde angegeben, %s aber nicht" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "%s kann nicht zum Schreiben geöffnet werden" @@ -12360,26 +12647,28 @@ msgstr "%s kann nicht zum Schreiben geöffnet werden" msgid "Mark Kettenis" msgstr "Mark Kettenis" +# c-format #: 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 "" "Aufruf: %s [OPTION] [DATEI]\n" "Vollkommen geordnete Liste in Übereinstimmung mit der partiellen Ordnung in\n" "DATEI schreiben.\n" -"Ohne DATEI, oder falls DATEI „-“ ist, Standardeingabe lesen.\n" -"\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: Eingabe enthält eine ungerade Anzahl Token" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: Eingabe enthält eine Schleife:" @@ -12398,7 +12687,7 @@ msgstr "" #: src/tty.c:120 msgid "not a tty" -msgstr "kein Ausgabegerät" +msgstr "kein Terminal" #: src/uname.c:124 msgid "" @@ -12447,14 +12736,11 @@ msgid "cannot get system name" msgstr "es ist nicht möglich, den Namen des Betriebssystems zu ermitteln" #: 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "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" +"schreiben.\n" #: src/unexpand.c:124 msgid "" @@ -12509,8 +12795,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" " -D, --all-repeated[=TRENNMETHODE] alle doppelten Zeilen ausgeben\n" @@ -12525,7 +12811,7 @@ msgstr " -f, --skip-fields=N die ersten N Felder überspringen\n" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" " --group[=METHODE] alle Fundstellen ausgeben, wobei Gruppen durch " @@ -12691,11 +12977,6 @@ msgstr "" " Prozesse in einem nicht unterbrechbaren\n" "Schlafzustand tragen ebenfalls zur Durchschnittslast bei.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -12718,17 +12999,11 @@ msgstr "" "%s ist als DATEI üblich.\n" "\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" msgstr "" "Zeilen‐, Wort‐ und Byteanzahl für jede DATEI ausgeben und eine Zeile mit " "der\n" @@ -12736,6 +13011,16 @@ msgstr "" "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" + +#: src/wc.c:126 +msgid "" +"\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 "" "\n" "Die unten angeführten Optionen erlauben es, die auszugebenden Zähler aus-\n" "zuwählen, wobei sie immer in dieser Reihenfolge ausgegeben werden:\n" @@ -12745,12 +13030,12 @@ msgstr "" " -m, --chars Zeichenanzahl ausgeben\n" " -l, --lines Zeilenanzahl ausgeben\n" -#: src/wc.c:128 +#: src/wc.c:134 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=D Eingabe aus den Dateien lesen, die mit NULL\n" @@ -12921,10 +13206,10 @@ msgstr "" "gehört. Dasselbe wie „id -un“.\n" "\n" -#: src/whoami.c:91 +#: src/whoami.c:87 #, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: Es ist kein Name zur Nutzer‐ID %lu zu finden\n" +msgid "cannot find name for user ID %lu" +msgstr "Für Benutzerkennung %lu kann kein Name gefunden werden" #: src/yes.c:41 #, c-format @@ -12943,3 +13228,238 @@ msgstr "" "Eine Zeile mit allen angegebenen ZEICHENKETTEn oder „y“ wiederholt " "ausgeben.\n" "\n" + +#~ msgid "failed to %s supplemental groups" +#~ msgstr "es konnten keine %s erweiterte Gruppe(n) gesetzt werden" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: ungültige Zahl" + +#~ 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 "" +#~ "\n" +#~ "Schickt man einem laufenden „dd“‐Prozess ein %s‐Signal, gibt dieser\n" +#~ "auf der Standardfehlerausgabe Eingabe‐/Ausgabe‐Statistiken aus und fährt\n" +#~ "mit dem Kopieren fort.\n" +#~ "\n" +#~ " $ dd if=/dev/zero of=/dev/null& pid=$!\n" +#~ " $ kill -%s $pid; sleep 1; kill $pid\n" +#~ " 18335302+0 Datensätze ein\n" +#~ " 18335302+0 Datensätze aus\n" +#~ " 9387674624 Bytes (9,4 GB) kopiert, 34,6279 Sekunden, 271 MB/s\n" +#~ "\n" +#~ "Optionen sind:\n" +#~ "\n" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s ist so groß, dass es nicht dargestellt werden kann" + +#~ msgid "number of lines" +#~ msgstr "Anzahl Zeilen" + +#~ msgid "number of bytes" +#~ msgstr "Anzahl Bytes" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: ungültige zu ignorierende Anzahl" + +#~ 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" + +#~ 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" +#~ "DATEI „-“ ist, Standardeingabe lesen.\n" + +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Ohne DATEI oder wenn DATEI „-“ ist, Standardeingabe lesen. Vorgabe ist „-" +#~ "F /“.\n" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: ungültige Anzahl von Bytes" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: ungültige Anzahl von Zeilen" + +#~ 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 nimmt das nächste Zeichen uninterpretiert auf\n" +#~ " quit CHAR CHAR sendet ein Quit‐Signal\n" +#~ "* rprnt CHAR CHAR gibt die aktuelle Zeile neu aus\n" +#~ " start CHAR CHAR startet die Ausgabe erneut nach einem Stopp\n" + +#~ 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" +#~ "Einstellungen für die Flusskontrolle:\n" +#~ " [-]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" + +#~ 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 "" +#~ "\n" +#~ "Einstellungen für die Ausgabe:\n" +#~ "* bsN Verzögerungsstil für Backspace, N in [0..1]\n" +#~ "* crN Verzögerungsstil für Wagenrücklauf (CR), N in [0..3]\n" +#~ "* ffN Verzögerungsstil für Seitenvorschub, N in [0..1]\n" +#~ "* nlN Verzögerungsstil für Zeilenvorschub, N in [0..1]\n" + +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ "* [-]ocrnl Wagenrücklauf (CR) in Zeilenvorschub wandeln\n" +#~ "* [-]ofdel Löschzeichen zum Auffüllen anstelle von Nullzeichen " +#~ "benutzen\n" +#~ "* [-]ofill Füllzeichen anstelle von Zeitverzögerungen benutzen\n" +#~ "* [-]olcuc Klein‐ in Großbuchstaben wandeln\n" +#~ "* [-]onlcr Zeilenvorschub in Wagenrücklauf (CR) wandeln\n" +#~ "* [-]onlret Zeilenvorschub bedingt Wagenrücklauf (CR)\n" + +#~ 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 "" +#~ "* [-]onocr kein Wagenrücklauf (CR) in der ersten Spalte\n" +#~ " [-]opost Ausgabe nachbehandeln\n" +#~ "* tabN horizontale Tabulatorverzögerung, N in [0..3]\n" +#~ "* tabs dasselbe wie tab0\n" +#~ "* -tabs dasselbe wie tab3\n" +#~ "* vtN vertikale Tabulatorverzögerung, N in [0..1]\n" + +#~ 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 "" +#~ "* [-]ctlecho Sonderzeichen in Hutnotation ausgeben („^c“)\n" +#~ " [-]echo Eingabezeichen ausgeben\n" +#~ "* [-]echoctl dasselbe wie [-]ctlecho\n" +#~ " [-]echoe dasselbe wie [-]crterase\n" +#~ " [-]echok Zeilenvorschub nach Killzeichen ausgeben\n" + +#~ 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 "" +#~ "* [-]echoke dasselbe wie [-]crtkill\n" +#~ " [-]echonl Zeilenvorschub ausgeben, auch wenn keine Zeichen " +#~ "ausgegeben\n" +#~ " werden\n" +#~ "* [-]echoprt gelöschte Zeichen rückwärts ausgeben, zwischen „\\“ und " +#~ "„/“\n" +#~ " [-]icanon erase‐, kill‐, werase‐ und rprnt‐Sonderzeichen erlauben\n" +#~ " [-]iexten Sonderzeichen erlauben, die nicht POSIX‐konform sind\n" + +#~ 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 "" +#~ " dec dasselbe wie echoe echoctl echoke -ixany intr ^c erase " +#~ "0177\n" +#~ " kill ^u\n" +#~ "* [-]decctlq dasselbe wie [-]ixany\n" +#~ " ek Erase‐ und Killzeichen auf Vorgabewert setzen\n" +#~ " evenp dasselbe wie parenb -parodd cs7\n" + +#~ 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 "" +#~ " -evenp dasselbe wie -parenb cs8\n" +#~ "* [-]lcase dasselbe wie xcase iuclc olcuc\n" +#~ " litout dasselbe wie -parenb -istrip -opost cs8\n" +#~ " -litout dasselbe wie parenb istrip opost cs7\n" +#~ " nl dasselbe wie -icrnl -onlcr\n" +#~ " -nl dasselbe wie icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Das Schreiben geänderter Blöcke auf die Platte erzwingen,\n" +#~ "den Super‐Block aktualisieren.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "ignoriere alle Argumente" + +#~ 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" + +#~ msgid "number in %s is too large" +#~ msgstr "Zahl in %s ist zu groß" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: ungültige Anzahl von Sekunden" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: Es ist kein Name zur Nutzer‐ID %lu zu finden\n" diff --git a/po/el.gmo b/po/el.gmo index a701ba24..8781ed93 100644 Binary files a/po/el.gmo and b/po/el.gmo differ diff --git a/po/el.po b/po/el.po index 492d8ff3..c793d5b4 100644 --- a/po/el.po +++ b/po/el.po @@ -3,11 +3,12 @@ # This file is distributed under the same license as the coreutils package. # Simos Xenitellis , 1999, 2000, 2001, 2002, 2008, 2009. # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils 7.2\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2009-04-29 22:18+0200\n" "Last-Translator: Simos Xenitellis \n" "Language-Team: Greek \n" @@ -39,19 +40,19 @@ msgid "error closing file" msgstr "σφάλμα κατά το κλείσιμο του αρχείου" # -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "σφάλμα εγγραφής" # -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, fuzzy, c-format msgid "preserving permissions for %s" msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s" @@ -260,67 +261,73 @@ msgid "Unknown error" msgstr "Άγνωστο σφάλμα" # -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: η επιλογή `%s' είναι ασαφής\n" # -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: η επιλογή `-W %s' είναι ασαφής\n" + +# +#: lib/getopt.c:654 lib/getopt.c:658 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: η επιλογή `--%s' δεν επιτρέπει ορίσματα\n" # -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: η επιλογή `%c%s' δεν επιτρέπει ορίσματα\n" # -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, fuzzy, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: η επιλογή `-%s' απαιτεί ένα όρισμα\n" # -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: μη αναγνωρίσιμη επιλογή `--%s'\n" # -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: μη αναγνωρίσιμη επιλογή `%c%s'\n" # -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: μη έγκυρη επιλογή -- %c\n" # -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: η επιλογή απαιτεί ένα όρισμα -- %c\n" # -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: η επιλογή `-W %s' είναι ασαφής\n" # -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: η επιλογή `-W %s' δεν επιτρέπει ορίσματα\n" # -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, fuzzy, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: η επιλογή `-%s' απαιτεί ένα όρισμα\n" @@ -332,14 +339,14 @@ msgid "cannot change permissions of %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων του %s" # -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "αδύνατη η δημιουργία καταλόγου %s" # -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "η μνήμη εξαντλήθηκε" @@ -392,6 +399,13 @@ msgstr "»" msgid "%s: end of file" msgstr "%s: τέλος αρχείου" +# +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: σφάλμα ανάγνωσης" + #: lib/regcomp.c:131 msgid "Success" msgstr "Επιτυχία" @@ -515,7 +529,7 @@ msgid "^[nN]" msgstr "^[nNοΟ]" # -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, fuzzy, c-format msgid "setting permissions for %s" msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s" @@ -979,7 +993,7 @@ msgstr "" " --help εμφάνιση αυτής της βοήθειας και έξοδος\n" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -989,14 +1003,7 @@ msgid "" "\n" msgstr "" -# -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -1006,39 +1013,39 @@ msgid "" msgstr "" # -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "σφάλμα ανάγνωσης" # -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "Μη έγκυρη είσοδος" # -#: src/base64.c:268 +#: src/base64.c:266 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "" # -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, fuzzy, c-format msgid "closing standard input" msgstr "κανονική είσοδος" @@ -1046,15 +1053,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:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 #, fuzzy msgid "David MacKenzie" @@ -1102,32 +1109,32 @@ msgstr "" # #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, fuzzy, c-format msgid "missing operand" msgstr "%s: αναμενόταν ακέραιος μετά το `%c'" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "" # -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n" @@ -1135,8 +1142,13 @@ msgstr "Χρήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n" # #: src/cat.c:92 #, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "κανονική είσοδος" + +# +#: src/cat.c:98 +#, fuzzy 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" @@ -1164,7 +1176,7 @@ msgstr "" "Χωρίς ΑΡΧΕΙΟ ή όταν το αρχείο είναι το -, ανάγνωση από την κανονική είσοδο.\n" # -#: src/cat.c:102 +#: src/cat.c:107 #, fuzzy msgid "" " -t equivalent to -vT\n" @@ -1190,7 +1202,7 @@ msgstr "" "\n" "Χωρίς ΑΡΧΕΙΟ ή όταν το αρχείο είναι το -, ανάγνωση από την κανονική είσοδο.\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1200,19 +1212,20 @@ msgid "" msgstr "" # -#: src/cat.c:326 +#: src/cat.c:327 #, fuzzy, c-format msgid "cannot do ioctl on %s" msgstr "αδυναμία εκτέλεσης ioctl στο `%s'" # -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "κανονική έξοδος" # -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: το αρχείο εισόδου είναι το αρχείο εξόδου" @@ -1224,10 +1237,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "" @@ -1241,8 +1254,8 @@ msgstr "διατήρηση ωρών στο %s" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "διατήρηση ωρών στο %s" @@ -1259,14 +1272,14 @@ msgid "failed to change context of %s to %s" msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s" # -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, fuzzy, c-format msgid "cannot access %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" # -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" @@ -1285,7 +1298,7 @@ msgid "fts_read failed" msgstr "αποτυχία ανάγνωσης" # -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, fuzzy, c-format msgid "fts_close failed" @@ -1373,7 +1386,7 @@ msgstr "" # #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1391,9 +1404,8 @@ msgid "conflicting security context specifiers given" msgstr "" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, fuzzy, c-format msgid "failed to get attributes of %s" msgstr "διατήρηση ωρών στο %s" @@ -1675,82 +1687,94 @@ msgid "Roland McGrath" msgstr "" # -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "μη έγκυρη ομάδα %s" # -#: src/chroot.c:150 +#: src/chroot.c:152 #, fuzzy, c-format msgid "invalid group list %s" msgstr "μη έγκυρη ομάδα %s" # -#: src/chroot.c:186 +#: src/chroot.c:185 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" " or: %s OPTION\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" msgstr "" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" msgstr "" +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + # -#: src/chroot.c:311 +#: src/chroot.c:329 #, fuzzy, c-format msgid "cannot change root directory to %s" msgstr "αδύνατη η αλλαγή στο κατάλογο %s" # -#: src/chroot.c:315 +#: src/chroot.c:333 #, fuzzy, c-format msgid "cannot chdir to root directory" msgstr "αδύνατη η αλλαγή στο κατάλογο %s" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "Δεν μπορεί να παρθεί ο συμπληρωματικός κατάλογος ομάδων." -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" +msgid "failed to set supplemental groups" msgstr "Δεν μπορεί να παρθεί ο συμπληρωματικός κατάλογος ομάδων." -#: src/chroot.c:402 +#: src/chroot.c:418 #, fuzzy, c-format msgid "failed to set group-ID" msgstr "διατήρηση ωρών στο %s" -#: src/chroot.c:405 +#: src/chroot.c:421 #, fuzzy, c-format msgid "failed to set user-ID" msgstr "διατήρηση ωρών στο %s" # -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, fuzzy, c-format msgid "failed to run command %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" @@ -1791,7 +1815,30 @@ msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]... ΑΡΧΕΙΟ1 ΑΡΧΕΙΟ2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "" -#: src/comm.c:110 +# +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"Μετατροπή διαστημάτων σε κάθε ΑΡΧΕΙΟ σε στηλοθέτες, γράφοντας στην κανονική " +"έξοδο.\n" +"Χωρίς ΑΡΧΕΙΟ, ή όταν το αρχείο είναι το -, ανάγνωση από την κανονική " +"είσοδο.\n" +"\n" +" -a, --all μετατροπή όλων των λευκών χαρακτήρων, αντί μόνο των " +"αρχικών\n" +" -t, --tabs=ΑΡΙΘΜΟΣ οι στηλοθέτες να έχουν απόσταση ΑΡΙΘΜΟΣ αντί 8\n" +" -t, --tabs=ΛΙΣΤΑ χρήση λίστας χωρισμένης με κόμμα για τη δήλωση της " +"θέσης των στηλοθετών\n" +" --help εμφάνιση αυτής της βοήθειας και έξοδος\n" +" --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" +"\n" +"Αντί για -t ΑΡΙΘΜΟΣ ή -t ΛΙΣΤΑ, -ΑΡΙΘΜΟΣ ή -ΛΙΣΤΑ μπορούν να " +"χρησιμοποιηθούν.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1800,7 +1847,7 @@ msgid "" msgstr "" # -#: src/comm.c:116 +#: src/comm.c:120 #, fuzzy msgid "" "\n" @@ -1817,7 +1864,7 @@ msgstr "" " --help εμφάνιση αυτής της βοήθειας και έξοδος\n" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1825,17 +1872,17 @@ msgid "" " --nocheck-order do not check that the input is correctly sorted\n" msgstr "" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1844,243 +1891,254 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "" -#: src/comm.c:407 +#: src/comm.c:411 #, fuzzy, c-format msgid "multiple delimiters specified" msgstr "\\%c: Μη έγκυρη διαφυγή." -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "" # -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 -#, c-format -msgid "error reading %s" -msgstr "σφάλμα ανάγνωσης %s" - -# -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:181 src/copy.c:452 #, fuzzy, c-format msgid "cannot lseek %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" # -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" +msgstr "σφάλμα ανάγνωσης %s" + +# +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 +#, c-format +msgid "error reading %s" +msgstr "σφάλμα ανάγνωσης %s" + +# +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "σφάλμα εγγραφής %s" -#: src/copy.c:323 +# +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "σφάλμα ανάγνωσης %s" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "διατήρηση ωρών στο %s" # -#: src/copy.c:383 +#: src/copy.c:478 #, fuzzy, c-format msgid "%s: write failed" msgstr "αποτυχία εγγραφής" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "διατήρηση ωρών στο %s" # -#: src/copy.c:687 +#: src/copy.c:789 #, fuzzy, c-format msgid "clearing permissions for %s" msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, fuzzy, c-format msgid "failed to preserve ownership for %s" msgstr "διατήρηση ιδιοκτήτη για το %s" -#: src/copy.c:748 +#: src/copy.c:850 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "διατήρηση ωρών στο %s" -#: src/copy.c:753 +#: src/copy.c:855 #, fuzzy, c-format msgid "failed to preserve authorship for %s" msgstr "διατήρηση ιδιοκτήτη για το %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, fuzzy, c-format msgid "failed to set default file creation context to %s" msgstr "διατήρηση ωρών στο %s" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "διατήρηση ωρών στο %s" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "αδυναμία ανοίγματος του %s προς ανάγνωση" # -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, fuzzy, c-format msgid "cannot fstat %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "" # -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, fuzzy, c-format msgid "cannot remove %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, fuzzy, c-format msgid "removed %s\n" msgstr "διαγραφή καταλόγου %s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "" # -#: src/copy.c:1070 +#: src/copy.c:1172 #, fuzzy, c-format msgid "cannot create regular file %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" msgstr "αδύνατη η αλλαγή στο κατάλογο %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "διατήρηση ωρών στο %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "διατήρηση ωρών στο %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, fuzzy, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: αντικατάσταση του `%s', παράκαμψη δικαιωμάτων %04o; " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" # -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: αντικατάσταση %s; " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (αντίγραφο ασφαλείας: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "" # -#: src/copy.c:1706 +#: src/copy.c:1795 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, fuzzy, c-format msgid "cannot stat %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" # -#: src/copy.c:1777 +#: src/copy.c:1866 #, fuzzy, c-format msgid "omitting directory %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, fuzzy, c-format msgid "%s and %s are the same file" msgstr "τα `%s' και `%s' είναι το ίδιο αρχείο" # -#: src/copy.c:1939 +#: src/copy.c:2019 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "αδύνατη η αλλαγή στο κατάλογο %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, fuzzy, c-format msgid "will not overwrite just-created %s with %s" msgstr "%s: δε μπορεί να γραφτεί μη-κατάλογος πάνω σε κατάλογο" # -#: src/copy.c:1975 +#: src/copy.c:2055 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" "αδύνατη η μετακίνηση του καταλόγου σε κάτι που δεν είναι κατάλογος: %s -> %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" "η δημιουργία αντιγράφου ασφαλείας του `%s' θα κατέστρεφε τη πηγή· το `%s' δε " "μετακινείται" -#: src/copy.c:2020 +#: src/copy.c:2100 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" @@ -2088,51 +2146,56 @@ msgstr "" "δεν αντιγράφεται" # -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, fuzzy, c-format msgid "cannot backup %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, fuzzy, c-format msgid "will not copy %s through just-created symlink %s" msgstr "%s: δε μπορεί να γραφτεί μη-κατάλογος πάνω σε κατάλογο" # -#: src/copy.c:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "αδύνατη η αντιγραφή του καταλόγου %s μέσα στον εαυτό του, %s" +#: src/copy.c:2272 +#, c-format +msgid "warning: source directory %s specified more than once" +msgstr "" + # -#: src/copy.c:2201 +#: src/copy.c:2294 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "αδύνατη η αλλαγή στο κατάλογο %s" # -#: src/copy.c:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "αδύνατη η μετακίνηση του %s σε υποκατάλογο του εαυτού του, %s" # -#: src/copy.c:2301 +#: src/copy.c:2394 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:2357 +#: src/copy.c:2450 #, fuzzy, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "%s: αδυναμία αντιγραφής κυκλίκού συμβολικού συνδέσμου" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" @@ -2140,48 +2203,48 @@ msgstr "" "κατάλογο" # -#: src/copy.c:2484 +#: src/copy.c:2577 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "αδυναμία δημιουργίας του ειδικού αρχείου %s" # -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "συμβολικός σύνδεσμος" # -#: src/copy.c:2583 +#: src/copy.c:2676 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" -#: src/copy.c:2615 +#: src/copy.c:2708 #, fuzzy, c-format msgid "%s has unknown file type" msgstr "%s: άγνωστο είδος αρχείου" # -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, fuzzy, c-format msgid "cannot un-backup %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" # src/copy.c:924 -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (χρήση αντιγράφου ασφαλείας)\n" @@ -2191,18 +2254,18 @@ msgstr "%s -> %s (χρήση αντιγράφου ασφαλείας)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" @@ -2210,7 +2273,7 @@ msgid "" msgstr "" # -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, fuzzy, c-format msgid "unknown program %s" msgstr "Άγνωστο σφάλμα συστήματος" @@ -2551,8 +2614,8 @@ msgid "failed to access %s" msgstr "διατήρηση ωρών στο %s" # -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, fuzzy, c-format msgid "missing file operand" msgstr "προσπέρασμα ορίσματος" @@ -2629,96 +2692,96 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "" # -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "η είσοδος εξαφανίστηκε" # -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: αριθμός γραμμής έξω από τα όρια" # -#: src/csplit.c:713 +#: src/csplit.c:714 #, fuzzy, c-format msgid "%s: %s: line number out of range" msgstr "%s: `%s': αριθμός γραμμής έξω από τα όρια" # -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, fuzzy, c-format msgid " on repetition %s\n" msgstr " στην επανάληψη %d\n" # -#: src/csplit.c:766 +#: src/csplit.c:767 #, fuzzy, c-format msgid "%s: %s: match not found" msgstr "%s: `%s': δεν βρέθηκε ταίριασμα" # -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "σφάλμα στην ανεύρεση μέσω κανονικής έκφρασης" # -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, fuzzy, c-format msgid "write error for %s" msgstr "σφάλμα εγγραφής για το `%s'" # -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: αναμενόταν ακέραιος μετά τον οριοθέτη" # -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: το `}' απαιτείται όταν δηλώνονται οι επαναλήψεις" # -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: απαιτείται ακέραιος μεταξύ των `{' και `}'" # -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: ο τελεστής τερματισμού `%c' έχει παραληφθεί" # -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: μη έγκυρη κανονική έκφραση: %s" # -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: μη έγκυρη μορφή" # -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: ο αριθμός γραμμής πρέπει να είναι μεγαλύτερος από το μηδέν" # -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, fuzzy, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "" @@ -2726,7 +2789,7 @@ msgstr "" "%s" # -#: src/csplit.c:1200 +#: src/csplit.c:1201 #, fuzzy, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "" @@ -2734,60 +2797,68 @@ msgstr "" "γραμμής" # -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "έχει παραληφθεί ο δηλωτής μετατροπής στην κατάληξη" # -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "μη έγκυρος δηλωτής μετατροπής στην κατάληξη: %c" # -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "μη έγκυρος δηλωτής μετατροπής στην κατάληξη: \\%.3o" # -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "μη έγκυρη δήλωση πεδίου `%s'" # -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "πάρα πολλές δηλώσεις μετατροπής στην κατάληξη" # -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "έχει παραληφθεί η δήλωση μετατροπής %% στην κατάληξη" # -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: μη έγκυρος αριθμός" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "μη έγκυρος αριθμός %s" # -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]... ΑΡΧΕΙΟ ΜΟΡΦΗ...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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:1490 +# +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "η κανονική είσοδος είναι κλεισμένη" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2795,28 +2866,22 @@ msgid "" " -k, --keep-files do not remove output files on errors\n" msgstr "" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" # -#: src/csplit.c:1498 +#: src/csplit.c:1500 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:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 msgid "" "\n" +"Each PATTERN may be:\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" @@ -2842,7 +2907,7 @@ msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" # -#: src/cut.c:182 +#: src/cut.c:183 #, fuzzy msgid "" " -b, --bytes=LIST select only these bytes\n" @@ -2858,7 +2923,7 @@ msgstr "" " --help εμφάνιση αυτής της βοήθειας και έξοδος\n" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2866,21 +2931,21 @@ msgid "" " -n (ignored)\n" msgstr "" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" # -#: src/cut.c:197 +#: src/cut.c:198 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:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2888,7 +2953,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:210 +#: src/cut.c:211 msgid "" "Each range is one of:\n" "\n" @@ -2896,68 +2961,66 @@ msgid "" " 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:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "μη έγκυρο byte ή λίστα πεδίων" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "" # -#: src/cut.c:320 +#: src/cut.c:319 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" # -#: src/cut.c:334 -#, fuzzy +#: src/cut.c:333 src/numfmt.c:1417 +#, fuzzy, c-format msgid "invalid decreasing range" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" # -#: src/cut.c:383 +#: src/cut.c:382 #, fuzzy, c-format msgid "byte offset %s is too large" msgstr "το %s είναι πολύ μεγάλο" # -#: src/cut.c:386 +#: src/cut.c:385 #, fuzzy, c-format msgid "field number %s is too large" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" # -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "μόνο ένα είδος λίστας μπορεί να οριστεί" # -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "ο διαχωριστής πρέπει να είναι ένας μόνο χαρακτήρας" # -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "πρέπει να ορίσετε λίστα από bytes, χαρακτήρες ή πεδία" # -#: src/cut.c:790 +#: src/cut.c:789 #, fuzzy msgid "an input delimiter may be specified only when operating on fields" msgstr "ένας διαχωριστής μπορεί να οριστεί μόνο όταν λειτουργούμε με πεδία" # -#: src/cut.c:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2966,12 +3029,12 @@ msgstr "" "\tμόνο όταν λειτουργούμε με πεδία" # -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "έχει παραληφθεί η λίστα με τα πεδία" # -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "έχει παραληφθεί η λίστα με τις θέσεις" @@ -2989,35 +3052,65 @@ msgid "Display the current time in the given FORMAT, or set the system date.\n" msgstr "" #: src/date.c:134 +#, fuzzy +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" +"Εκτυπώνη την ημερομηνία στη δοσμένη μορφή, ή θέτει την ώρα του συστήματος.\n" +"\n" +" -d, --date=ΜΟΡΦΗ Εκτυπώνει την ώρα που καθορίζεται απο την ΜΟΡΦΗ,\n" +" εκτός της δεσμευμένης λέξης `now'\n" +" -f, --file=ΑΡΧΕΙΟ Ομοια με την --date για κάθε γραμμη του αρχείου\n" +" που περιέχει τις ημερομηνίες\n" +" -r, --reference=ΑΡΧΕΙΟ Εκτυπώνει την τελευταία ημερομηνία τροποποίησης\n" +" του αρχείου\n" +" -R, --rfc-822 Εκτυπώνει την ημερομηνία σύμφωνα με το RFC-822\n" +" -s, --set=ΜΟΡΦΗ Θέτει την ημερομηνία που περιγράφεται απο την\n" +" ΜΟΡΦΗ\n" +" -u, --utc, --universal Εκτυπώνει ή θέτει την παγκόσμια ώρα(UTC)\n" +" --help Εκτυπώνει αυτή την βοήθεια και τερματίζει\n" +" --version Εκτυπώνει πληροφορίες για την έκδοση και " +"τερματίζει\n" + +#: src/date.c:138 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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" -#: src/date.c:142 +#: src/date.c:145 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" -#: src/date.c:147 +#: src/date.c:149 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" +msgstr "" + +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" msgstr "" #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -3025,7 +3118,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -3033,7 +3126,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -3041,14 +3134,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:177 +#: src/date.c:183 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 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -3056,7 +3149,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -3064,7 +3157,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -3075,7 +3168,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3083,7 +3176,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:209 +#: src/date.c:215 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" @@ -3091,7 +3184,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3099,7 +3192,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3111,7 +3204,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3122,7 +3215,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3131,7 +3224,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3146,39 +3239,39 @@ msgid "" msgstr "" # -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "κανονική είσοδος" # -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, fuzzy, c-format msgid "invalid date %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, fuzzy, c-format msgid "multiple output formats specified" msgstr "\\%c: Μη έγκυρη διαφυγή." # -#: src/date.c:430 +#: src/date.c:436 #, fuzzy, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "οι επιλογές --string και --check είναι αμοιβαίως αποκλειόμενες" -#: src/date.c:437 +#: src/date.c:443 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" "Οι επιλογές για να εκτυπωθεί και να οριστεί η ώρα δεν μπορούν να\n" "χρησιμοποιηθούν παράλληλα." -#: src/date.c:458 +#: src/date.c:464 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3190,25 +3283,25 @@ msgstr "" "κάθε παράμετρος που δεν είναι επιλογή πρέπει να είναι διαμορφωμένη έτσι\n" "ώστε να ξεκινάει με το `+'." -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "Δεν μπορεί να τεθεί η ημερομηνία." # -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "" # -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3217,7 +3310,7 @@ msgstr "" "Χρήση: %s [ΤΕΛΕΣΤΗΣ]...\n" " ή: %s ΕΠΙΛΟΓΗ\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3228,7 +3321,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:570 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3237,11 +3330,13 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3252,7 +3347,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3267,7 +3362,7 @@ msgid "" " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3277,7 +3372,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3286,125 +3381,105 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr "" # -#: src/dd.c:593 +#: src/dd.c:624 #, fuzzy msgid " directory fail unless a directory\n" msgstr "το `%s' υπάρχει ήδη άλλα δεν είναι κατάλογος" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 +#: src/dd.c:661 #, 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:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" - -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:754 -#, fuzzy, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "μηδενισμένη εγγραφή και γράψιμο πάνω σε αυτή (truncated)" -msgstr[1] "μηδενισμένη εγγραφή και γράψιμο πάνω σε αυτή (truncated)" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "" @@ -3418,178 +3493,192 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr "" +#: src/dd.c:809 +#, c-format +msgid ", %.6f s, %s/s" +msgstr "" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" + +#: src/dd.c:834 +#, fuzzy, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "μηδενισμένη εγγραφή και γράψιμο πάνω σε αυτή (truncated)" +msgstr[1] "μηδενισμένη εγγραφή και γράψιμο πάνω σε αυτή (truncated)" + # -#: src/dd.c:877 +#: src/dd.c:920 #, fuzzy, c-format msgid "closing input file %s" msgstr "δημιουργία αρχείου `%s'\n" -#: src/dd.c:884 +#: src/dd.c:927 #, fuzzy, c-format msgid "closing output file %s" msgstr "διαγραφή καταλόγου %s\n" -#: src/dd.c:1089 +#: src/dd.c:1142 #, fuzzy, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n" # -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, fuzzy, c-format msgid "writing to %s" msgstr "σφάλμα εγγραφής %s" # -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "άγνωστος τελεστής %s" # -#: src/dd.c:1285 +#: src/dd.c:1376 #, fuzzy msgid "invalid conversion" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" # -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 #, fuzzy msgid "invalid input flag" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" # -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "μη έγκυρη σημαία εξόδου" # -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "μη έγκυρη σημαία κατάστασης" -# -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "μη έγκυρος αριθμός %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" # -#: src/dd.c:1417 +#: src/dd.c:1520 #, fuzzy, c-format msgid "cannot combine block and unblock" msgstr "δεν είναι δυνατό να παραληφθεί χρήστης και ομάδα" -#: src/dd.c:1419 +#: src/dd.c:1522 #, fuzzy, c-format msgid "cannot combine lcase and ucase" msgstr "δεν είναι δυνατό να δημιουργηθεί το %s `%s' στο `%s'" # -#: src/dd.c:1421 +#: src/dd.c:1524 #, fuzzy, c-format msgid "cannot combine excl and nocreat" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/dd.c:1424 +#: src/dd.c:1527 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" " of mt_type=0x%0lx -- see for the list of types" msgstr "" -#: src/dd.c:1670 +#: src/dd.c:1773 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: δε μπορεί να διαγραφεί" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, fuzzy, c-format msgid "%s: cannot seek" msgstr "%s: δε μπορεί να διαγραφεί" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1903 +#: src/dd.c:2006 #, fuzzy, c-format msgid "setting flags for %s" msgstr "διατήρηση ωρών στο %s" # -#: src/dd.c:1957 +#: src/dd.c:2060 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" -#: src/dd.c:2172 +#: src/dd.c:2288 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "διαγραφή καταλόγου %s\n" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, fuzzy, c-format msgid "failed to open %s" msgstr "διατήρηση ωρών στο %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2306 +#: src/dd.c:2422 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "διαγραφή καταλόγου %s\n" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, fuzzy, c-format msgid "failed to discard cache for: %s" msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "" @@ -3672,12 +3761,12 @@ msgstr "" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3685,18 +3774,18 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3705,20 +3794,30 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:1409 +#: src/df.c:1429 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" +msgstr "" + +#: src/df.c:1435 +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" + +#: src/df.c:1439 +msgid "" " -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:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3727,26 +3826,26 @@ msgid "" msgstr "" # -#: src/df.c:1460 +#: src/df.c:1486 #, fuzzy, c-format msgid "options %s and %s are mutually exclusive" msgstr "οι επιλογές --string και --check είναι αμοιβαίως αποκλειόμενες" -#: src/df.c:1610 +#: src/df.c:1636 #, fuzzy, c-format msgid "file system type %s both selected and excluded" msgstr "το σύστημα αρχείων `%s' είναι και επελεγμένο και αποκλειώμενο" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Προειδοποίηση:" -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 #, fuzzy msgid "cannot read table of mounted file systems" msgstr "%sαδυναμία ανάγνωσης πίνακα προσαρτημένων συστήματος αρχείων" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "" @@ -3868,7 +3967,7 @@ msgid "" msgstr "" # -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3878,7 +3977,8 @@ msgstr "" " ή: %s --traditional [ΑΡΧΕΙΟ] [[+]ΘΕΣΗ [[+]ΧΑΡΑΚΤΗΡΙΣΤΙΚΟ]]\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" #: src/du.c:291 @@ -3969,68 +4069,61 @@ msgid "Infinity" msgstr "" # -#: src/du.c:636 +#: src/du.c:657 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "αποτυχία ανάγνωσης" # -#: src/du.c:787 +#: src/du.c:808 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" # -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "μη έγκυρο όρισμα %s για %s" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "" "δεν είναι δυνατό να δειχτεί περίληψη και να εμφανιστούν όλες οι καταχωρίσεις" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "προειδοποίηση: η περίληψη είναι όμοιο με --max-depth=0" -#: src/du.c:911 +#: src/du.c:932 #, fuzzy, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "προειδοποίηση: η περίληψη έρχεται σε αντίφαση με το --max-depth=%d" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "" -# -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: σφάλμα ανάγνωσης" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" # -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 #, fuzzy msgid "invalid zero-length file name" msgstr "μη έγκυρη ομάδα" # -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "σύνολο" @@ -4156,9 +4249,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "Μετατροπή διαστημάτων σε κάθε ΑΡΧΕΙΟ σε στηλοθέτες, γράφοντας στην κανονική " "έξοδο.\n" @@ -4219,7 +4310,7 @@ msgid "input line is too long" msgstr "το αρχείο μηδενίστηκε" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "" @@ -4337,13 +4428,13 @@ msgstr "σφάλμα στην ανεύρεση μέσω κανονικής έκ msgid "non-integer argument" msgstr "όριο ορίσματος" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "" # -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Θέστε LC_ALL='C' για να παρακάμψετε το πρόβλημα." @@ -4354,40 +4445,40 @@ msgid "the strings compared were %s and %s" msgstr "δεν είναι δυνατό να δημιουργηθεί το %s `%s' στο `%s'" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, fuzzy, c-format msgid "%s is not a valid positive integer" msgstr "%s' δεν είναι ισχύων θετικός ακέραιος." # -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "το %s είναι πολύ μεγάλο" # -#: src/factor.c:2438 +#: src/factor.c:2528 #, fuzzy, c-format msgid "" "Usage: %s [NUMBER]...\n" " or: %s OPTION\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n" -#: src/factor.c:2443 +#: src/factor.c:2533 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4440,7 +4531,7 @@ msgid "" msgstr "" # -#: src/fmt.c:278 +#: src/fmt.c:279 #, fuzzy msgid "" " -c, --crown-margin preserve indentation of first two lines\n" @@ -4471,7 +4562,7 @@ msgstr "" "Στο -wΑΡΙΘΜΟΣ, το γράμμα `w' μπορεί να παραληφθεί.\n" # -#: src/fmt.c:287 +#: src/fmt.c:288 #, fuzzy, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4501,7 +4592,7 @@ msgstr "" "\n" "Στο -wΑΡΙΘΜΟΣ, το γράμμα `w' μπορεί να παραληφθεί.\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4509,19 +4600,17 @@ msgid "" msgstr "" # -#: src/fmt.c:405 src/fmt.c:416 -#, fuzzy, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" # -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4529,9 +4618,9 @@ msgid "" msgstr "" # -#: src/fold.c:288 src/pr.c:832 -#, fuzzy, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "μη έγκυρος αριθμός από στήλες: `%s'" #. This is a proper name. See the gettext manual, section Names. @@ -4604,12 +4693,11 @@ msgid "%s: no such user" msgstr "%s: Δεν υπάρχει τέτοιος χρήστης." # -#: src/head.c:109 +#: src/head.c:110 #, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Εμφάνιση των 10 πρώτων γραμμών από κάθε ΑΡΧΕΙΟ στην κανονική έξοδο.\n" "Με περισσότερα από ένα ΑΡΧΕΙΟ, να προηγηθεί επισέλιδο με το όνομα του " @@ -4632,7 +4720,7 @@ msgstr "" "ένας από τους πολλαπλασιαστές bkm ακολουθεί συνενωμένος, διαφορετικά " "ανάγνωσε -n ΤΙΜΗ\n" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4643,13 +4731,13 @@ msgid "" msgstr "" # -#: src/head.c:125 +#: src/head.c:126 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 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4657,57 +4745,42 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "" # -#: src/head.c:237 src/head.c:1052 -#, fuzzy, c-format -msgid "%s: number of bytes is too large" -msgstr "μη έγκυρος αριθμός από bytes προς σύγκριση: `%s'" - -# -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, fuzzy, c-format msgid "%s: cannot seek to offset %s" msgstr "αδυναμία εκτέλεσης ioctl στο `%s'" # -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, fuzzy, c-format msgid "%s: cannot seek to relative offset %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/head.c:886 -#, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "%s: το %s είναι τόσο μεγάλο που δε μπορεί να αναπαρασταθεί" - -# -#: src/head.c:887 -msgid "number of lines" -msgstr "αριθμός γραμμών" - -# -#: src/head.c:887 -msgid "number of bytes" -msgstr "αριθμός από bytes" +#: src/head.c:267 +#, fuzzy, c-format +msgid "%s: number of bytes is too large" +msgstr "μη έγκυρος αριθμός από bytes προς σύγκριση: `%s'" # -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "μη έγκυρος αριθμός από γραμμές" # -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "μη έγκυρος αριθμός από bytes" # -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "%s: μη έγκυρη επιλογή -- %c\n" @@ -4914,7 +4987,7 @@ msgid "cannot set time stamps for %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, fuzzy, c-format msgid "fork system call failed" msgstr "ειδικό αρχείο μπλοκ" @@ -5041,7 +5114,7 @@ msgstr "" "αλυσίδες με ίσα μήκη." # -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, fuzzy, c-format msgid "invalid mode %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" @@ -5078,15 +5151,19 @@ msgstr "" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +msgid "" "\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:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5095,7 +5172,7 @@ msgid "" msgstr "" # -#: src/join.c:210 +#: src/join.c:216 #, fuzzy msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" @@ -5116,11 +5193,11 @@ msgstr "" " --help εμφάνιση αυτής της βοήθειας και έξοδος\n" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5139,52 +5216,52 @@ msgid "" "warning message will be given.\n" msgstr "" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" # -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, fuzzy, c-format msgid "invalid field number: %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" # -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, fuzzy, c-format msgid "invalid field specifier: %s" msgstr "μη έγκυρος δηλωτής πεδίου: `%s'" # -#: src/join.c:884 +#: src/join.c:890 #, fuzzy, c-format msgid "invalid file number in field spec: %s" msgstr "μη έγκυρος αριθμός αρχείου στη δήλωση πεδίου: `%s'" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "" # -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, fuzzy, c-format msgid "multi-character tab %s" msgstr "μη έγκυρη τάξη χαρακτήρων `%s'" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "" # -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "και τα δύο αρχεία δε μπορεί να είναι η κανονική είσοδος" @@ -5258,18 +5335,18 @@ msgstr "" msgid "no process ID specified" msgstr "" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" # -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, fuzzy, c-format msgid "invalid buffering mode %s for %s\n" msgstr "μη έγκυρο όρισμα %s για %s" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -5429,7 +5506,7 @@ msgid "FIXME: unknown" msgstr "" # -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, fuzzy, c-format msgid "Usage: %s [OPTION]\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ] [ΑΡΧΕΙΟ]...\n" @@ -5441,7 +5518,7 @@ msgid "" msgstr "" # -#: src/logname.c:84 +#: src/logname.c:79 #, fuzzy, c-format msgid "no login name" msgstr "%s: μη έγκυρος αριθμός" @@ -5452,7 +5529,7 @@ msgstr "%s: μη έγκυρος αριθμός" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 #, fuzzy msgid "%b %e %Y" msgstr "%b %e %H:%M %Y" @@ -5463,22 +5540,17 @@ msgstr "%b %e %H:%M %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 #, fuzzy msgid "%b %e %H:%M" msgstr "%b %e %H:%M %Y" -#: src/ls.c:1590 -#, fuzzy, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "αγνοείται μη έγκυρο πλάτος στη μεταβλητή περιβάλλοντος COLUMNS: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "αγνοείται μη έγκυρο πλάτος στη μεταβλητή περιβάλλοντος COLUMNS: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" @@ -5486,92 +5558,97 @@ msgstr "" "TABSIZE: %s" # -#: src/ls.c:1760 src/ptx.c:1978 -#, fuzzy, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" # -#: src/ls.c:1834 -#, fuzzy, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" # -#: src/ls.c:2043 +#: src/ls.c:2021 #, fuzzy, c-format msgid "invalid time style format %s" msgstr "μη έγκυρο όρισμα %s για %s" # -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "Έγκυρα ορίσματα είναι:" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "" # -#: src/ls.c:2450 +#: src/ls.c:2428 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "απαράδεκτη επιλογή `-%c'" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "" "τιμή που δε μπορεί να αναγνωριστεί στη μεταβλητή περιβάλλοντος LS_COLORS" +#: src/ls.c:2488 +#, fuzzy, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "αγνοείται μη έγκυρο πλάτος στη μεταβλητή περιβάλλοντος COLUMNS: %s" + # -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2554 src/pwd.c:164 #, fuzzy, c-format msgid "cannot open directory %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/ls.c:2572 +#: src/ls.c:2569 #, fuzzy, c-format msgid "cannot determine device and inode of %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/ls.c:2581 +#: src/ls.c:2578 #, fuzzy, c-format msgid "%s: not listing already-listed directory" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, fuzzy, c-format msgid "reading directory %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/ls.c:2673 +#: src/ls.c:2670 #, fuzzy, c-format msgid "closing directory %s" msgstr "αδύνατη η αλλαγή στο κατάλογο %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, fuzzy, c-format msgid "cannot compare file names %s and %s" msgstr "δεν είναι δυνατό να δημιουργηθεί το %s `%s' στο `%s'" -#: src/ls.c:4781 +#: src/ls.c:4775 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:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5580,7 +5657,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5594,18 +5671,19 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4798 msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5615,11 +5693,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5628,7 +5706,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5636,7 +5714,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5649,7 +5727,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5661,7 +5739,7 @@ msgid "" " -k, --kibibytes default to 1024-byte blocks for disk usage\n" msgstr "" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5671,7 +5749,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5682,7 +5760,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4871 +#: src/ls.c:4866 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" @@ -5736,7 +5814,7 @@ msgstr "" " -R, --recursive εμφάνιση υποκαταλόγων αναδρομικά\n" " -s, --size εμφάνιση μεγέθους κάθε αρχείου, σε μπλοκ\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5744,21 +5822,21 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4886 +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -5772,31 +5850,32 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4908 +#: src/ls.c:4904 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:4912 +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4919 +#: src/ls.c:4915 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 security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5805,7 +5884,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5835,8 +5914,6 @@ msgstr "" 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 "" "Χρήση: %s [ΕΠΙΛΟΓΗ] [ΑΡΧΕΙΟ]\n" "Εγγραφή πλήρους ταξινομημένης λίστας σε συμφωνία με τη μερική ταξινόμηση\n" @@ -5847,9 +5924,10 @@ msgstr "" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" # -#: src/md5sum.c:174 +#: src/md5sum.c:175 #, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" @@ -5859,31 +5937,33 @@ msgstr "" "\n" # -#: src/md5sum.c:178 +#: src/md5sum.c:180 #, fuzzy -msgid " -b, --binary read in binary mode\n" +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr "" "\n" " -B, --binary χρήση δυαδικών γραψιμάτων στη συσκευή της " "κονσόλας.\n" "\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" # -#: src/md5sum.c:192 +#: src/md5sum.c:195 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr "" @@ -5892,7 +5972,7 @@ msgstr "" "κονσόλας.\n" "\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -5904,54 +5984,55 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" # -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, fuzzy, c-format msgid "%s: too many checksum lines" msgstr "" "%s: δε βρέθηκαν κανονικά μορφοποιημένες γραμμές αθροισμάτων ελέγχου MD5" # -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, fuzzy, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %lu: εσφαλμένα μορφοποιημένη γραμμή αθροίσματος ελέγχου MD5" # -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: ΑΝΕΠΙΤΥΧΕΣ άνοιγμα ή ανάγνωση\n" # -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "ΑΝΕΠΙΤΥΧΕΣ" # -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "ΕΝΤΑΞΕΙ" # -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, fuzzy, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" "%s: δε βρέθηκαν κανονικά μορφοποιημένες γραμμές αθροισμάτων ελέγχου MD5" # -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, fuzzy, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" @@ -5959,7 +6040,7 @@ msgstr[0] "%s: %lu: εσφαλμένα μορφοποιημένη γραμμή msgstr[1] "%s: %lu: εσφαλμένα μορφοποιημένη γραμμή αθροίσματος ελέγχου MD5" # -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, fuzzy, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" @@ -5969,27 +6050,27 @@ msgstr[1] "" "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: %d από %d αναφερόμενα %s δεν ήταν δυνατό να αναγνωστούν" # -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, fuzzy, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: %d από %d υπολόγισαν σε %s ΔΕΝ ταίριαξαν" msgstr[1] "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: %d από %d υπολόγισαν σε %s ΔΕΝ ταίριαξαν" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" # -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, fuzzy, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "" "η επιλογή --status έχει έννοια μόνο στην επιβεβαίωση αθροισμάτων ελέγχου" # -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -5998,27 +6079,27 @@ msgstr "" "αθροίσματα ελέγχου" # -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" "η επιλογή --status έχει έννοια μόνο στην επιβεβαίωση αθροισμάτων ελέγχου" # -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "η επιλογή --warn έχει έννοια μόνο στην επιβεβαίωση αθροισμάτων ελέγχου" # -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, fuzzy, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "" "η επιλογή --status έχει έννοια μόνο στην επιβεβαίωση αθροισμάτων ελέγχου" # -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -6061,23 +6142,23 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "διατήρηση ωρών στο %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "διατήρηση ωρών στο %s" # -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, fuzzy, c-format msgid "created directory %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6284,7 +6365,7 @@ msgstr "πάρα πολλά ορίσματα" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" @@ -6423,9 +6504,7 @@ 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" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "Μετατροπή διαστημάτων σε κάθε ΑΡΧΕΙΟ σε στηλοθέτες, γράφοντας στην κανονική " "έξοδο.\n" @@ -6531,31 +6610,31 @@ msgid "invalid footer numbering style: %s" msgstr "μη έγκυρος αριθμός αρχείου στη δήλωση πεδίου: `%s'" # -#: src/nl.c:503 -#, fuzzy, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "μη έγκυρος αρχικός αριθμός γραμμής: `%s'" # -#: src/nl.c:512 -#, fuzzy, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "μη έγκυρη αύξηση στον αριθμό εντολής: `%s'" # -#: src/nl.c:524 -#, fuzzy, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "μη έγκυρος αριθμός από κενές γραμμές: `%s'" # -#: src/nl.c:538 -#, fuzzy, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "μη έγκυρος μήκος πεδίου αριθμού γραμμής: `%s'" # -#: src/nl.c:557 +#: src/nl.c:531 #, fuzzy, c-format msgid "invalid line numbering format: %s" msgstr "μη έγκυρη αύξηση στον αριθμό εντολής: `%s'" @@ -6578,7 +6657,7 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6592,44 +6671,44 @@ msgid "failed to render standard input unusable" msgstr "και τα δύο αρχεία δε μπορεί να είναι η κανονική είσοδος" # -#: src/nohup.c:131 +#: src/nohup.c:129 #, fuzzy, c-format msgid "ignoring input" msgstr "πάρα πολλά ορίσματα" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "" # -#: src/nohup.c:176 +#: src/nohup.c:174 #, fuzzy, c-format msgid "appending output to %s" msgstr "δεν είναι δυνατό να παραληφθεί χρήστης και ομάδα" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "" @@ -6652,102 +6731,98 @@ msgid "" " --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: μη έγκυρος αριθμός γραμμών" - #. This is a proper name. See the gettext manual, section Names. -#: src/numfmt.c:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, fuzzy, c-format msgid "value too large to be converted: %s" msgstr "%s: η τιμή δεν έχει πλήρως μετατραπεί." # -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "μη έγκυρος αριθμός %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" # -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "μη έγκυρη αύξηση στον αριθμό εντολής: `%s'" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" # -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "το αρχείο μηδενίστηκε" # -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" # -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6755,19 +6830,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -6777,40 +6852,40 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" msgstr "" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6819,7 +6894,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -6827,7 +6902,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -6835,7 +6910,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -6843,7 +6918,19 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -6852,9 +6939,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -6866,7 +6954,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -6881,127 +6969,141 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, fuzzy, c-format msgid "format %s has no %% directive" msgstr "το `%s' υπάρχει ήδη άλλα δεν είναι κατάλογος" # -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "μη έγκυρο όρισμα %s για %s" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +# +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" # -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "μη έγκυρη αύξηση στον αριθμό εντολής: `%s'" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +# +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "μη έγκυρος αριθμός πεδίου: `%s'" # -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" # -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "μη έγκυρος αριθμός πεδίου: `%s'" +msgid "multiple field specifications" +msgstr "μη έγκυρη δήλωση πεδίου `%s'" # -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "\\%c: Μη έγκυρη διαφυγή." -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" # -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "σφάλμα ανάγνωσης %s" # -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, fuzzy, c-format msgid "failed to convert some of the input numbers" msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s" # -#: src/od.c:320 +#: src/od.c:321 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7012,19 +7114,17 @@ msgstr "" "Χρήση: %s [ΕΠΙΛΟΓΗ]... [ΑΡΧΕΙΟ]...\n" " ή: %s --traditional [ΑΡΧΕΙΟ] [[+]ΘΕΣΗ [[+]ΧΑΡΑΚΤΗΡΙΣΤΙΚΟ]]\n" -# -#: src/od.c:326 +#: src/od.c:327 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:333 +#: src/od.c:335 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" @@ -7033,7 +7133,7 @@ msgid "" "suffixes may be . for octal and b for multiply by 512.\n" msgstr "" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7042,7 +7142,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -7055,7 +7155,7 @@ msgid "" " --traditional accept arguments in third form above\n" msgstr "" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -7066,7 +7166,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7076,7 +7176,7 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -7086,7 +7186,7 @@ msgid "" msgstr "" # -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7095,7 +7195,7 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -7104,14 +7204,14 @@ msgid "" "for sizeof(double) or L for sizeof(long double).\n" msgstr "" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -7125,13 +7225,13 @@ msgid "" msgstr "" # -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, fuzzy, c-format msgid "invalid type string %s" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" # -#: src/od.c:690 +#: src/od.c:693 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -7141,7 +7241,7 @@ msgstr "" "αυτό το σύστημα δεν παρέχει τον εσωτερικό τύπο δεδομένων %lu-byte" # -#: src/od.c:811 +#: src/od.c:814 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -7152,41 +7252,41 @@ msgstr "" "υποδιαστολής %lu-byte" # -#: src/od.c:869 +#: src/od.c:872 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "μη έγκυρος χαρακτήρας `%c' στο τύπο αλφαριθμητικού `%s'" # -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "αδυναμία προσπέρασης μετά το τέλος της συνδυασμένης εισόδου" -#: src/od.c:1650 +#: src/od.c:1658 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" # -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "κανένα είδος δε μπορεί να δηλωθεί όταν τυπώνονται αλφαριθμητικά" # -#: src/od.c:1863 +#: src/od.c:1871 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "η κατάσταση συμβατότητας υποστηρίζει το πολύ τρία ορίσματα" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" # -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "" @@ -7209,7 +7309,6 @@ msgstr "η κανονική είσοδος είναι κλεισμένη" msgid "" "Write lines consisting of the sequentially corresponding lines from\n" "each FILE, separated by TABs, to standard output.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Μετατροπή διαστημάτων σε κάθε ΑΡΧΕΙΟ σε στηλοθέτες, γράφοντας στην κανονική " "έξοδο.\n" @@ -7364,12 +7463,12 @@ msgid "Where" msgstr "" # -#: src/pinky.c:495 +#: src/pinky.c:494 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7379,7 +7478,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7388,7 +7487,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -7397,110 +7496,110 @@ msgid "" msgstr "" # -#: src/pinky.c:597 +#: src/pinky.c:596 #, fuzzy, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "δε μπορούν να δηλώνονται αρχεία όταν γίνεται χρήση του --string" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "" # #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 #, fuzzy msgid "Roland Huebner" msgstr "Πιτ ΤερΜάτ και Ρόλαντ Χέμπνερ" # -#: src/pr.c:908 +#: src/pr.c:905 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "`--pages=ΠΡΩΤΗ_ΣΕΛΙΔΑ[:ΤΕΛΕΥΤΑΙΑ_ΣΕΛΙΔΑ]' απουσία ορίσματος" # -#: src/pr.c:910 +#: src/pr.c:907 #, fuzzy, c-format msgid "invalid page range %s" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" # -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "`-l ΜΗΚΟΣ_ΣΕΛΙΔΑΣ' μη έγκυρος αριθμός γραμμών: `%s'" # -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "`-N ΑΡΙΘΜΟΣ' μη έγκυρος αριθμός αρχικής σελίδας: `%s'" # -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "`-o ΠΕΡΙΘΩΡΙΟ' μη έγκυρη θέση γραμμής: `%s'" # -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "`-w ΠΛΑΤΟΣ_ΣΕΛΙΔΑΣ' μη έγκυρος αριθμός χαρακτήρων : `%s'" # -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "`-W ΠΛΑΤΟΣ_ΣΕΛΙΔΑΣ' μη έγκυρος αριθμός χαρακτήρων : `%s'" # -#: src/pr.c:1096 +#: src/pr.c:1059 #, fuzzy, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "Δεν είναι δυνατό να δηλωθεί αριθμός στηλών στην παράλληλη εκτύπωση." # -#: src/pr.c:1100 +#: src/pr.c:1063 #, fuzzy, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "Δεν είναι δυνατό να δηλωθεί σειριακή και παράλληλη εκτύπωση." # -#: src/pr.c:1196 +#: src/pr.c:1166 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "`-%c' επιπλέον χαρακτήρες ή μη έγκυρος αριθμός στο όρισμα: `%s'" # -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "το πλάτος σελίδας είναι πολύ στενό" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" # -#: src/pr.c:2380 +#: src/pr.c:2350 #, fuzzy, c-format msgid "page number overflow" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7511,7 +7610,7 @@ msgid "" msgstr "" # -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7522,7 +7621,7 @@ msgid "" msgstr "" # -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7534,7 +7633,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7547,16 +7646,31 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2798 +# +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +"Σύγκριση ταξινομημένων αρχείων ΑΡΙΣΤΕΡΌ_ΑΡΧΕΊΟ και ΔΕΞΙΌ_ΑΡΧΕΊΟ, ανά " +"γραμμή.\n" +"\n" +" -1 απόκρυψη μοναδικών γραμμών στο αριστερό αρχείο\n" +" -2 απόκρυψη μοναδικών γραμμών στο δεξιό αρχείο\n" +" -3 απόκρυψη μοναδικών γραμμών και στα δύο αρχεία\n" +" --help εμφάνιση αυτής της βοήθειας και έξοδος\n" +" --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" + +#: src/pr.c:2775 +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7566,7 +7680,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7575,7 +7689,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7586,17 +7700,22 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2828 +#: src/pr.c:2802 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7611,7 +7730,7 @@ msgid "" msgstr "" # -#: src/pr.c:2845 +#: src/pr.c:2822 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -7629,30 +7748,6 @@ msgstr "" " --help εμφάνιση αυτής της βοήθειας και έξοδος\n" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" -# -#: src/pr.c:2853 -#, fuzzy -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"Μετατροπή διαστημάτων σε κάθε ΑΡΧΕΙΟ σε στηλοθέτες, γράφοντας στην κανονική " -"έξοδο.\n" -"Χωρίς ΑΡΧΕΙΟ, ή όταν το αρχείο είναι το -, ανάγνωση από την κανονική " -"είσοδο.\n" -"\n" -" -a, --all μετατροπή όλων των λευκών χαρακτήρων, αντί μόνο των " -"αρχικών\n" -" -t, --tabs=ΑΡΙΘΜΟΣ οι στηλοθέτες να έχουν απόσταση ΑΡΙΘΜΟΣ αντί 8\n" -" -t, --tabs=ΛΙΣΤΑ χρήση λίστας χωρισμένης με κόμμα για τη δήλωση της " -"θέσης των στηλοθετών\n" -" --help εμφάνιση αυτής της βοήθειας και έξοδος\n" -" --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" -"\n" -"Αντί για -t ΑΡΙΘΜΟΣ ή -t ΛΙΣΤΑ, -ΑΡΙΘΜΟΣ ή -ΛΙΣΤΑ μπορούν να " -"χρησιμοποιηθούν.\n" - #: src/printenv.c:62 #, fuzzy, c-format msgid "" @@ -7791,15 +7886,20 @@ msgid "" "files.\n" msgstr "" -#: src/ptx.c:1830 +#: src/ptx.c:1831 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:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -7808,7 +7908,7 @@ msgid "" msgstr "" # -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7819,7 +7919,7 @@ msgid "" msgstr "" # -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7827,35 +7927,18 @@ msgid "" "excluded\n" msgstr "" -# -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"Μετατροπή διαστημάτων σε κάθε ΑΡΧΕΙΟ σε στηλοθέτες, γράφοντας στην κανονική " -"έξοδο.\n" -"Χωρίς ΑΡΧΕΙΟ, ή όταν το αρχείο είναι το -, ανάγνωση από την κανονική " -"είσοδο.\n" -"\n" -" -a, --all μετατροπή όλων των λευκών χαρακτήρων, αντί μόνο των " -"αρχικών\n" -" -t, --tabs=ΑΡΙΘΜΟΣ οι στηλοθέτες να έχουν απόσταση ΑΡΙΘΜΟΣ αντί 8\n" -" -t, --tabs=ΛΙΣΤΑ χρήση λίστας χωρισμένης με κόμμα για τη δήλωση της " -"θέσης των στηλοθετών\n" -" --help εμφάνιση αυτής της βοήθειας και έξοδος\n" -" --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" -"\n" -"Αντί για -t ΑΡΙΘΜΟΣ ή -t ΛΙΣΤΑ, -ΑΡΙΘΜΟΣ ή -ΛΙΣΤΑ μπορούν να " -"χρησιμοποιηθούν.\n" - # #: src/ptx.c:1951 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" +# +#: src/ptx.c:1978 +#, fuzzy, c-format +msgid "invalid line width: %s" +msgstr "μη έγκυρος αριθμός πεδίου: `%s'" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -7879,7 +7962,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, fuzzy, c-format msgid "failed to stat %s" msgstr "διατήρηση ωρών στο %s" @@ -7901,8 +7984,8 @@ msgid "Dmitry V. Levin" msgstr "" # -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n" @@ -8098,15 +8181,15 @@ msgstr "" #: src/rm.c:342 #, fuzzy, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: διαγραφή του `%s'; " msgstr[1] "%s: διαγραφή του `%s'; " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: διαγραφή του `%s'; " msgstr[1] "%s: διαγραφή του `%s'; " @@ -8327,13 +8410,13 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "μη έγκυρος αρχικός αριθμός γραμμής: `%s'" -#: src/seq.c:234 +#: src/seq.c:248 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s: άγνωστο είδος αρχείου" # -#: src/seq.c:557 +#: src/seq.c:603 #, fuzzy, c-format msgid "format string may not be specified when printing equal width strings" msgstr "κανένα είδος δε μπορεί να δηλωθεί όταν τυπώνονται αλφαριθμητικά" @@ -8349,7 +8432,13 @@ msgid "" "for even very expensive hardware probing to recover the data.\n" msgstr "" -#: src/shred.c:177 +#: src/shred.c:174 +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8358,7 +8447,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -8367,11 +8456,9 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:192 +#: src/shred.c:196 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.\n" @@ -8383,7 +8470,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8394,7 +8481,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8406,7 +8493,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8415,7 +8502,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -8427,153 +8514,153 @@ msgid "" "\n" msgstr "" -#: src/shred.c:241 +#: src/shred.c:243 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:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:461 +#: src/shred.c:463 #, fuzzy, c-format msgid "%s: cannot rewind" msgstr "Δεν είναι δυνατόν να εκτελεστεί το %s" # src/shred.c:1067 -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: πέρασμα %lu/%lu (%s)..." # -#: src/shred.c:529 +#: src/shred.c:531 #, fuzzy, c-format msgid "%s: error writing at offset %s" msgstr "σφάλμα εγγραφής %s" # -#: src/shred.c:549 +#: src/shred.c:551 #, fuzzy, c-format msgid "%s: lseek failed" msgstr "σφάλμα κλεισίματος αρχείου" # -#: src/shred.c:561 +#: src/shred.c:563 #, fuzzy, c-format msgid "%s: file too large" msgstr "το αρχείο μηδενίστηκε" # src/shred.c:1154 -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: πέρασμα %lu/%lu (%s)...%s" # src/shred.c:1149 -#: src/shred.c:601 +#: src/shred.c:603 #, fuzzy, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: πέρασμα %lu/%lu (%s)...%s/%s" # -#: src/shred.c:859 +#: src/shred.c:861 #, fuzzy, c-format msgid "%s: fstat failed" msgstr "αποτυχία εγγραφής" # -#: src/shred.c:870 +#: src/shred.c:872 #, fuzzy, c-format msgid "%s: invalid file type" msgstr "%s: μη έγκυρος αριθμός γραμμών" # src/shred.c:1424 -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: το αρχείο έχει αρνητικό μέγεθος" # -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, fuzzy, c-format msgid "%s: error truncating" msgstr "το αρχείο μηδενίστηκε" # -#: src/shred.c:989 +#: src/shred.c:991 #, fuzzy, c-format msgid "%s: fcntl failed" msgstr "αποτυχία εγγραφής" # src/shred.c:1483 -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: αδυναμία διάλυσης μόνο-προσθήκη περιγραφέα αρχείου" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: διαγράφεται" # -#: src/shred.c:1102 +#: src/shred.c:1104 #, fuzzy, c-format msgid "%s: renamed to %s" msgstr "%s: σφάλμα ανάγνωσης" # -#: src/shred.c:1124 +#: src/shred.c:1126 #, fuzzy, c-format msgid "%s: failed to remove" msgstr "το αρχείο μηδενίστηκε" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: διεγράφει" # -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, fuzzy, c-format msgid "%s: failed to close" msgstr "το αρχείο μηδενίστηκε" # -#: src/shred.c:1171 +#: src/shred.c:1173 #, fuzzy, c-format msgid "%s: failed to open for writing" msgstr "το αρχείο μηδενίστηκε" # #: src/shred.c:1236 -#, fuzzy, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: μη έγκυρος αριθμός δευτερολέπτων" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, fuzzy, c-format msgid "multiple random sources specified" msgstr "\\%c: Μη έγκυρη διαφυγή." # -#: src/shred.c:1264 -#, fuzzy, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: μη έγκυρος αριθμός γραμμών" # -#: src/shuf.c:61 +#: src/shuf.c:62 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -8583,11 +8670,11 @@ msgstr "" "Χρήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ]... (χωρίς -G)\n" " ή: %s -G [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -8599,40 +8686,40 @@ msgid "" msgstr "" # -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "πάρα πολλά ορίσματα" -#: src/shuf.c:431 +#: src/shuf.c:428 #, fuzzy, c-format msgid "multiple -i options specified" msgstr "\\%c: Μη έγκυρη διαφυγή." # -#: src/shuf.c:452 -#, fuzzy, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "μη έγκυρος αριθμός" # -#: src/shuf.c:465 +#: src/shuf.c:459 #, fuzzy, c-format -msgid "invalid line count %s" +msgid "invalid line count: %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, fuzzy, c-format msgid "multiple output files specified" msgstr "\\%c: Μη έγκυρη διαφυγή." # -#: src/shuf.c:502 +#: src/shuf.c:496 #, fuzzy, c-format msgid "cannot combine -e and -i options" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -8658,12 +8745,12 @@ msgstr "" " --version Εκτυπώνει πληροφορίες έκδοσης και τερματίζει\n" # -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, fuzzy, c-format msgid "invalid time interval %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "" @@ -8672,13 +8759,13 @@ msgstr "" msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8686,19 +8773,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:443 +#: src/sort.c:444 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:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8706,7 +8793,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8716,19 +8803,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -8738,7 +8825,7 @@ msgid "" msgstr "" # -#: src/sort.c:480 +#: src/sort.c:481 #, fuzzy msgid "" " --debug annotate the part of the line used to sort,\n" @@ -8752,13 +8839,13 @@ msgstr "" " --help εμφάνιση αυτής της βοήθειας και έξοδος\n" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8766,7 +8853,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8782,7 +8869,7 @@ msgid "" msgstr "" # -#: src/sort.c:511 +#: src/sort.c:512 #, fuzzy msgid "" "\n" @@ -8809,13 +8896,10 @@ msgstr "" "γραμμής για κλειδί. Χωρίς ΑΡΧΕΙΟ, ή όταν το ARXEIO είναι το -, ανάγνωση\n" "από την κανονική είσοδο.\n" -# -#: src/sort.c:524 +#: src/sort.c:525 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" @@ -8823,525 +8907,531 @@ msgid "" msgstr "" # -#: src/sort.c:725 +#: src/sort.c:724 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "σφάλμα εγγραφής %s" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" # -#: src/sort.c:884 +#: src/sort.c:883 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "αποτυχία ανοίγματος" # -#: src/sort.c:998 +#: src/sort.c:997 #, fuzzy msgid "fflush failed" msgstr "ολοκλήρωση αρχείου" # -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 #, fuzzy msgid "close failed" msgstr "σφάλμα κλεισίματος αρχείου" # -#: src/sort.c:1140 +#: src/sort.c:1139 #, fuzzy msgid "couldn't create temporary file" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/sort.c:1179 +#: src/sort.c:1178 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/sort.c:1252 +#: src/sort.c:1251 #, fuzzy, c-format msgid "warning: cannot remove: %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" # -#: src/sort.c:1338 +#: src/sort.c:1337 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "μη έγκυρο όρισμα %s για %s" # -#: src/sort.c:1341 +#: src/sort.c:1340 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "μη έγκυρο όρισμα %s για %s" # -#: src/sort.c:1356 +#: src/sort.c:1355 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "το %s είναι πολύ μεγάλο" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" # -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "" # -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "αποτυχία ανάγνωσης" # -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "Η μετατροπή της συμβολοσειράς απέτυχε" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" # -#: src/sort.c:2484 +#: src/sort.c:2483 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "%s: η επιλογή `-W %s' είναι ασαφής\n" msgstr[1] "%s: η επιλογή `-W %s' είναι ασαφής\n" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" # -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "αποτυχία εγγραφής" # -#: src/sort.c:2816 +#: src/sort.c:2815 #, fuzzy, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%d: όχι σε σειρά: " # -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "κανονικό σφάλμα" # -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" # -#: src/sort.c:4017 +#: src/sort.c:4016 #, fuzzy, c-format msgid "%s: invalid field specification %s" msgstr "μη έγκυρη δήλωση πεδίου `%s'" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "" # -#: src/sort.c:4079 +#: src/sort.c:4078 #, fuzzy, c-format msgid "%s: invalid count at start of %s" msgstr "μη έγκυρο όρισμα %s για `%s'" # -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "μη έγκυρος αριθμός από bytes" # -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "μη έγκυρος αριθμός από bytes" # -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "" -#: src/sort.c:4403 +#: src/sort.c:4402 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "\\%c: Μη έγκυρη διαφυγή." # -#: src/sort.c:4420 +#: src/sort.c:4419 #, fuzzy msgid "invalid number at field start" msgstr "μη έγκυρος αριθμός από γραμμές" # -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 #, fuzzy msgid "field number is zero" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" # -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "" # -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "μη έγκυρος αριθμός από bytes" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, fuzzy, c-format msgid "cannot read file names from %s" msgstr "δεν είναι δυνατό να δημιουργηθεί το %s `%s' στο `%s'" # -#: src/sort.c:4613 +#: src/sort.c:4612 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "μη έγκυρη ομάδα" # -#: src/sort.c:4619 +#: src/sort.c:4618 #, fuzzy, c-format msgid "no input from %s" msgstr "δημιουργία αρχείου `%s'\n" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" # -#: src/split.c:203 +#: src/split.c:224 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ] [ΕΙΣΟΔΟΣ [ΠΡΟΘΕΜΑ]]\n" -#: src/split.c:207 +#: src/split.c:228 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "" # -#: src/split.c:365 +#: src/split.c:419 #, fuzzy, c-format msgid "creating file %s\n" msgstr "δημιουργία αρχείου `%s'\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "διατήρηση ωρών στο %s" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" # -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" # -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" msgstr "αδύνατη η αλλαγή στο κατάλογο %s" -#: src/split.c:410 +#: src/split.c:464 #, fuzzy, c-format msgid "closing output pipe" msgstr "διαγραφή καταλόγου %s\n" # -#: src/split.c:414 +#: src/split.c:468 #, fuzzy, c-format msgid "moving input pipe" msgstr "δημιουργία αρχείου `%s'\n" # -#: src/split.c:416 +#: src/split.c:470 #, fuzzy, c-format msgid "closing input pipe" msgstr "δημιουργία αρχείου `%s'\n" # -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s" # -#: src/split.c:427 +#: src/split.c:481 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "αδύνατη η αλλαγή στο κατάλογο %s" # -#: src/split.c:463 +#: src/split.c:517 #, fuzzy, c-format msgid "waiting for child process" msgstr "σφάλμα εγγραφής %s" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" # -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "δεν είναι δυνατό να γίνει διαχωρισμός σε περισσότερους από ένα τρόπο" # -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: μη έγκυρος αριθμός δευτερολέπτων" # -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: μη έγκυρος αριθμός" # -#: src/split.c:1169 -#, fuzzy, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: μη έγκυρος αριθμός γραμμών" -# -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: μη έγκυρος αριθμός από bytes" +msgid "empty record separator" +msgstr "" # -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: μη έγκυρος αριθμός γραμμών" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "μη έγκυρη τάξη χαρακτήρων `%s'" + +# +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "ειδικό αρχείο χαρακτήρων" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "" # -#: src/split.c:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "μη έγκυρος αρχικός αριθμός γραμμής: `%s'" # -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: μη έγκυρος αριθμός γραμμών" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, fuzzy, c-format msgid "%s: cannot determine file size" msgstr "Δεν μπορεί να καθοριστεί το όνομα του συστήματος" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "" -#: src/stat.c:887 +#: src/stat.c:890 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "διατήρηση ωρών στο %s" # -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "%s: μη αναγνωρίσιμη επιλογή `-%c'\n" # -#: src/stat.c:1184 +#: src/stat.c:1187 #, fuzzy, c-format msgid "%s: invalid directive" msgstr "%s: μη έγκυρη μορφή" # -#: src/stat.c:1231 +#: src/stat.c:1234 #, fuzzy, c-format msgid "warning: backslash at end of format" msgstr "μη έγκυρη διαφυγή με πισωκάθετο στο τέλος του αλφαριθμητικού" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" # -#: src/stat.c:1269 +#: src/stat.c:1272 #, fuzzy, c-format msgid "cannot read file system information for %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9352,7 +9442,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9360,31 +9450,31 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, fuzzy, c-format msgid "Context: %C\n" msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9392,17 +9482,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9412,7 +9502,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9424,7 +9514,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9434,7 +9524,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9447,7 +9537,7 @@ msgid "" " %T minor device type in hex, for character/block device special files\n" msgstr "" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9462,7 +9552,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9473,7 +9563,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9529,8 +9619,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -9555,7 +9644,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9563,11 +9652,11 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 #, fuzzy msgid "" " -a, --all print all current settings in human-readable form\n" @@ -9585,85 +9674,138 @@ msgstr "" "Προεραιτικό - πριν την ΕΚΛΟΓΗ σημαίνει άρνηση. Το * σημαίνει μια\n" "ΕΚΛΟΓΗ μη POSIX. Το σύστημα καθορίζει ποιές επιλογές είναι διαθέσιμες.\n" -#: src/stty.c:535 +#: src/stty.c:543 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:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +msgid "" " 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 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:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" msgstr "" -#: src/stty.c:559 +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" + +#: src/stty.c:614 +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 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:578 +#: src/stty.c:632 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" +msgstr "" + +#: src/stty.c:637 +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:584 +#: src/stty.c:641 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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -9672,7 +9814,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" "\n" "Επιλογές ελέγχου:\n" @@ -9689,7 +9830,11 @@ msgstr "" " ισότημίας στην είσοδο\n" " [-]parodd Θέτει περιτή ισοτημία (ακόμα και με `-')\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -9697,159 +9842,249 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +msgid "" " [-]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:616 -msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" +#: src/stty.c:692 +msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" +msgstr "" + +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" msgstr "" -#: src/stty.c:619 +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +msgid "" " [-]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:627 +#: src/stty.c:712 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:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]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 "" -"\n" -"Επιλογές εξόδου:\n" -"* bsN Τύπος καθυστέρησης πισωδιαστήματος, N μεταξύ [0..1]\n" -"* crN Τύπος καθυστέρησης επιστροφής δρομέα, N μεταξύ [0..3]\n" -"* ffN Τύπος καθυστέρησης αλλαγής σελίδας, N μεταξύ [0..1]\n" -"* nlN Τύπος καθυστέρησης αλλαγής σειράς, N μεταξύ [0..1]\n" -"* [-]ocrnl Μετατρέπει την `επιστροφή δρομέα' σε `νέα γραμμή'\n" -"* [-]ofdel Χρησιμοποιεί χαρακτήρες σβησίματος για γέμισμα αντί\n" -" των κενών χαρακτήρων\n" -"* [-]ofill Χρησιμοποιεί χαρακτήρες γεμίσματος αντί χρονομέτρησης για\n" -" τις καθυστερήσεις\n" -"* [-]olcuc Μετατρέπει τα μικρά σε κεφαλαία\n" -"* [-]onlcr Μετατρέπει την `νεα γραμμή' σε `επιστροφή δρομέα-νεα " -"γραμμή'\n" -"* [-]onlret Η `νεα γραμμή' προκαλεί `επιστροφή δρομέα'\n" -"* [-]onocr Δεν εκτυπώνει `επιστροφή δρομέα' στην πρώτη στήλη\n" -" [-]opost Εκτελεί μια προ-επεξεργασμένη έξοδο\n" -"* tabN Τύπος καθυστέρησης της οριζόντιας πινακοποίησης, \n" -" N μεταξύ [0..3]\n" -"* tabs Ομοιο με tab0\n" -"* -tabs Ομοιο με tab3\n" -"* vtN Τύπος καθυστέρησης της κάθετης πινακοποίησης, N μεταξύ " -"[0..1]\n" - -#: src/stty.c:643 -msgid "" -" * [-]onocr do not print carriage returns in the first column\n" -" [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 +msgid "" " * 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:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +msgid "" " * 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr "" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:672 +#: src/stty.c:843 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" +msgstr "" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:875 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:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 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:707 +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -9858,25 +10093,27 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -9893,66 +10130,72 @@ msgstr "" "χαρακτήρες.\n" # -#: src/stty.c:800 +#: src/stty.c:1124 #, fuzzy, c-format msgid "only one device may be specified" msgstr "μόνο ένα όρισμα μπορεί να δηλωθεί" # -#: src/stty.c:830 +#: src/stty.c:1154 #, fuzzy, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "οι επιλογές --string και --check είναι αμοιβαίως αποκλειόμενες" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" "Οταν καθορίζεται ένας τύπος εξόδου, οι καταστάσεις λειτουργίας (modes)\n" "δεν είναι δυνατόν να οριστούν" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" # -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, fuzzy, c-format msgid "invalid argument %s" msgstr "μη έγκυρο όρισμα %s για %s" # -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, fuzzy, c-format msgid "missing argument to %s" msgstr "ασαφές όρισμα %s για %s" # -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "το αρχείο μηδενίστηκε" + +# +#: src/stty.c:1331 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "μη έγκυρος αριθμός πεδίου: `%s'" -#: src/stty.c:1057 +#: src/stty.c:1401 #, fuzzy, c-format msgid "%s: unable to perform all requested operations" msgstr "" "Τυπική είσοδος: αδύνατον να πραγματοποιήθουν όλες τις ζητούμενες\n" "λειτουργίες" -#: src/stty.c:1403 +#: src/stty.c:1747 #, fuzzy, c-format msgid "%s: no size information for this device" msgstr "Δεν υπάρχουν πληροφορίες μεγέθους γι'αυτό το περιφερειακό" # -#: src/stty.c:1924 -#, fuzzy, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "μη έγκυρη αύξηση στον αριθμό εντολής: `%s'" #. This is a proper name. See the gettext manual, section Names. @@ -9960,11 +10203,14 @@ msgstr "μη έγκυρη αύξηση στον αριθμό εντολής: `%s msgid "Kayvan Aghaiepour" msgstr "" -# #: src/sum.c:62 +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" + +# +#: src/sum.c:68 #, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -9981,19 +10227,58 @@ msgstr "" "Χωρίς ΑΡΧΕΙΟ, ή όταν το αρχείο είναι το -, ανάγνωση από την κανονική " "είσοδο.\n" -#: src/sync.c:41 +# +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ] [ΑΡΧΕΙΟ]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" +"\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" msgstr "" +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + # -#: src/sync.c:69 +#: src/sync.c:114 #, fuzzy, c-format -msgid "ignoring all arguments" -msgstr "πάρα πολλά ορίσματα" +msgid "error opening %s" +msgstr "σφάλμα ανάγνωσης %s" -#: src/system.h:343 +# +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "δεν είναι δυνατό να παραληφθεί χρήστης και ομάδα" + +# +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "σφάλμα ανάγνωσης %s" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "" + +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10003,14 +10288,14 @@ msgid "" msgstr "" # -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr "" " --help εμφάνιση αυτής της βοήθειας και έξοδος\n" "\n" # -#: src/system.h:351 +#: src/system.h:345 #, fuzzy msgid " --version output version information and exit\n" msgstr "" @@ -10019,13 +10304,20 @@ msgstr "" " --help εμφάνιση αυτής της βοήθειας και έξοδος\n" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" -#: src/system.h:543 +# +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10033,7 +10325,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10042,7 +10334,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -10053,23 +10345,28 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" # -#: src/system.h:591 +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Δοκιμάστε `%s --help' για περισσότερη βοήθεια.\n" -#: src/system.h:633 +#: src/system.h:655 #, fuzzy, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10091,9 +10388,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "Μετατροπή διαστημάτων σε κάθε ΑΡΧΕΙΟ σε στηλοθέτες, γράφοντας στην κανονική " "έξοδο.\n" @@ -10131,63 +10426,62 @@ msgstr "" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" # -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, fuzzy, c-format msgid "%s: seek failed" msgstr "σφάλμα κλεισίματος αρχείου" # -#: src/tac.c:263 +#: src/tac.c:277 #, fuzzy, c-format msgid "record too large" msgstr "το αρχείο μηδενίστηκε" # -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "το αρχείο μηδενίστηκε" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "διατήρηση ωρών στο %s" # -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, fuzzy, c-format msgid "%s: write error" msgstr "σφάλμα εγγραφής" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "αδυναμία ανοίγματος του %s προς ανάγνωση" # -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "ο διαχωριστής δε μπορεί να είναι κενός" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "" # -#: src/tail.c:262 +#: src/tail.c:257 #, 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" msgstr "" "Εμφάνιση των 10 πρώτων γραμμών από κάθε ΑΡΧΕΙΟ στην κανονική έξοδο.\n" "Με περισσότερα από ένα ΑΡΧΕΙΟ, να προηγηθεί επισέλιδο με το όνομα του " @@ -10210,13 +10504,13 @@ msgstr "" "ένας από τους πολλαπλασιαστές bkm ακολουθεί συνενωμένος, διαφορετικά " "ανάγνωσε -n ΤΙΜΗ\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10224,7 +10518,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10237,14 +10531,14 @@ msgid "" " with inotify, this option is rarely useful\n" msgstr "" -#: src/tail.c:293 +#: src/tail.c:288 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 if it is inaccessible\n" msgstr "" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -10253,7 +10547,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -10264,7 +10558,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -10275,22 +10569,22 @@ msgid "" msgstr "" # -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "κλείσιμο του %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -10298,149 +10592,149 @@ msgid "" msgstr "" # -#: src/tail.c:965 +#: src/tail.c:958 #, fuzzy, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" "%s: αδύνατη η ακολούθηση του τέλους αυτού του είδους αρχείου· παράκαμψη" # -#: src/tail.c:980 +#: src/tail.c:973 #, fuzzy, c-format msgid "%s has become inaccessible" msgstr "το `%s' είναι μη-προσπελάσιμο" # -#: src/tail.c:997 +#: src/tail.c:990 #, fuzzy, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" "%s: αδύνατη η ακολούθηση του τέλους αυτού του είδους αρχείου· παράκαμψη" # -#: src/tail.c:1006 +#: src/tail.c:999 #, fuzzy, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" "%s: αδύνατη η ακολούθηση του τέλους αυτού του είδους αρχείου· παράκαμψη" # -#: src/tail.c:1027 +#: src/tail.c:1020 #, fuzzy, c-format msgid "%s has become accessible" msgstr "το `%s' έχει γίνει προσπελάσιμο" # -#: src/tail.c:1035 +#: src/tail.c:1032 #, fuzzy, c-format -msgid "%s has appeared; following end of new file" +msgid "%s has appeared; following new file" msgstr "το `%s' εμφανίστηκε· ακολούθηση τέλους νέου αρχείου" # -#: src/tail.c:1046 +#: src/tail.c:1042 #, fuzzy, c-format -msgid "%s has been replaced; following end of new file" +msgid "%s has been replaced; following new file" msgstr "το `%s' έχει αντικατασταθεί· ακολούθηση τέλους νέου αρχείου" # -#: src/tail.c:1163 +#: src/tail.c:1159 #, fuzzy, c-format msgid "%s: cannot change nonblocking mode" msgstr "δεν είναι δυνατό να παραληφθεί χρήστης και ομάδα" # -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, fuzzy, c-format msgid "%s: file truncated" msgstr "το αρχείο μηδενίστηκε" # -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "δεν υπολείπονται αρχεία" # -#: src/tail.c:1424 +#: src/tail.c:1440 #, fuzzy, c-format msgid "cannot watch parent directory of %s" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, fuzzy, c-format msgid "inotify resources exhausted" msgstr "η ιδεατή μνήμη εξαντλήθηκε" # -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, fuzzy, c-format msgid "cannot watch %s" msgstr "αδύνατη η αλλαγή δικαιωμάτων στο %s" -#: src/tail.c:1529 +# +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "το `%s' εμφανίστηκε ξανά" + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "" # -#: src/tail.c:1549 +#: src/tail.c:1597 #, fuzzy, c-format msgid "error reading inotify event" msgstr "σφάλμα ανάγνωσης %s" # -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: αδύνατη η ακολούθηση του τέλους αυτού του είδους αρχείου· παράκαμψη" # -#: src/tail.c:1961 -#, fuzzy, c-format -msgid "number in %s is too large" -msgstr "το %s είναι πολύ μεγάλο" - -# -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "" "%s: μη έγκυρος μέγιστος αριθμός από χωρίς μεταβολή `stats' μεταξύ ανοιγμάτων" # -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: μη έγκυρος περιγραφέας διεργασίας (PID)" # -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: μη έγκυρος αριθμός δευτερολέπτων" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "μη έγκυρος αριθμός από στήλες: `%s'" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "" # -#: src/tail.c:2096 +#: src/tail.c:2135 #, fuzzy, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" "προειδοποίηση: ο περιγραφέας διεργασίας αγνοείτε· το --pid=PID είναι χρήσιμο " "μόνο σε παρακολούθηση" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" # -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" @@ -10448,28 +10742,28 @@ msgstr "" "μόνο σε παρακολούθηση" # -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "προειδοποίηση: το --pid=PID δεν υποστηρίζεται σε αυτό το σύστημα" # -#: src/tail.c:2209 +#: src/tail.c:2250 #, fuzzy, c-format msgid "cannot follow %s by name" msgstr "αδύνατη η δημιουργία καταλόγου `%s'" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 #, fuzzy msgid "" "Copy standard input to each FILE, and also to standard output.\n" @@ -10485,67 +10779,81 @@ msgstr "" " --help Εκτυπώνει αυτή την βοήθεια και τερματίζει\n" " --version Εκτυπώνει πληροφορίες έκδοσης και τερματίζει\n" -#: src/tee.c:71 +#: src/tee.c:93 +msgid "" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" +msgstr "" + +#: src/tee.c:98 msgid "" "\n" -"If a FILE is -, copy again to standard output.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" msgstr "" # -#: src/test.c:123 +#: src/test.c:125 #, fuzzy, c-format msgid "missing argument after %s" msgstr "ασαφές όρισμα %s για %s" # -#: src/test.c:159 +#: src/test.c:161 #, fuzzy, c-format msgid "invalid integer %s" msgstr "μη έγκυρος αριθμός" -#: src/test.c:241 +#: src/test.c:243 #, fuzzy msgid "')' expected" msgstr "αναμενόταν ')'\n" -#: src/test.c:244 +#: src/test.c:246 #, fuzzy, c-format msgid "')' expected, found %s" msgstr "αναμενόταν ')', αλλά βρέθηκε %s\n" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, fuzzy, c-format msgid "%s: unary operator expected" msgstr "%s: Αναμενόταν μοναδιαίος χειριστής.\n" -#: src/test.c:329 +#: src/test.c:331 #, fuzzy msgid "-nt does not accept -l" msgstr "-nt δεν δέχεται -l\n" -#: src/test.c:342 +#: src/test.c:344 #, fuzzy msgid "-ef does not accept -l" msgstr "-ef δεν δέχεται -l\n" -#: src/test.c:358 +#: src/test.c:360 #, fuzzy msgid "-ot does not accept -l" msgstr "-nt δεν δέχεται -l\n" # -#: src/test.c:367 +#: src/test.c:369 #, fuzzy msgid "unknown binary operator" msgstr "Άγνωστο σφάλμα συστήματος" -#: src/test.c:646 +#: src/test.c:648 #, fuzzy, c-format msgid "%s: binary operator expected" msgstr "%s: Αναμενόταν δυαδικός χειριστής.\n" # -#: src/test.c:704 +#: src/test.c:706 #, fuzzy msgid "" "Usage: test EXPRESSION\n" @@ -10555,14 +10863,14 @@ msgid "" " or: [ OPTION\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" msgstr "" # -#: src/test.c:717 +#: src/test.c:719 #, fuzzy msgid "" "\n" @@ -10574,7 +10882,7 @@ msgstr "" " --help εμφάνιση αυτής της βοήθειας και έξοδος\n" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -10583,7 +10891,7 @@ msgid "" " EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n" msgstr "" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -10593,7 +10901,7 @@ msgid "" " STRING1 != STRING2 the strings are not equal\n" msgstr "" -#: src/test.c:737 +#: src/test.c:739 #, fuzzy msgid "" "\n" @@ -10625,7 +10933,7 @@ msgstr "" " ΑΚΕΡΑΙΟΣ1 -lt ΑΚΕΡΑΙΟΣ2 O ΑΚΕΡΑΙΟΣ1 είναι μικρότερος του ΑΚΕΡΑΙΟΥ2\n" " ΑΚΕΡΑΙΟΣ1 -ne ΑΚΕΡΑΙΟΣ2 Ο ΑΚΕΡΑΙΟΣ1 δεν είναι ίσος με τον ΑΚΕΡΑΙΟ2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -10633,7 +10941,7 @@ msgid "" " FILE1 -ot FILE2 FILE1 is older than FILE2\n" msgstr "" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -10642,7 +10950,7 @@ msgid "" " -e FILE FILE exists\n" msgstr "" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -10651,7 +10959,7 @@ msgid "" " -k FILE FILE exists and has its sticky bit set\n" msgstr "" -#: src/test.c:766 +#: src/test.c:768 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" @@ -10660,7 +10968,7 @@ msgid "" " -s FILE FILE exists and has a size greater than zero\n" msgstr "" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -10670,7 +10978,7 @@ msgid "" msgstr "" # ___ -#: src/test.c:780 +#: src/test.c:782 #, fuzzy msgid "" "\n" @@ -10685,34 +10993,34 @@ msgstr "" "Ενας ΑΚΕΡΑΙΟΣ μπορεί επίσης να είναι -l ΑΛΥΣΙΔΑ, το οποίο εκτιμάται\n" "στο μήκος της ΑΛΥΣΙΔΑΣ.\n" -#: src/test.c:786 +#: src/test.c:788 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 +#: src/test.c:793 msgid "test and/or [" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "" -#: src/test.c:858 +#: src/test.c:860 #, fuzzy msgid "missing ']'" msgstr "το `]' λείπει\n" # -#: src/test.c:872 +#: src/test.c:874 #, fuzzy, c-format msgid "extra argument %s" msgstr "πάρα πολλά ορίσματα" @@ -10733,18 +11041,18 @@ msgid "warning: timer_create" msgstr "" # -#: src/timeout.c:228 +#: src/timeout.c:230 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" " or: %s [OPTION]\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]... [ΕΙΣΟΔΟΣ [ΕΞΟΔΟΣ]]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -10762,7 +11070,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -10770,7 +11078,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -10781,7 +11089,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -10797,6 +11105,11 @@ msgstr "σφάλμα εγγραφής %s" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -11145,12 +11458,12 @@ msgid "Exit with a status code indicating failure." msgstr "" # -#: src/truncate.c:96 +#: src/truncate.c:69 #, fuzzy, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΕΣ]... [ΑΡΧΕΙΟ]...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -11161,22 +11474,22 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11184,59 +11497,65 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" # src/shred.c:1424 -#: src/truncate.c:173 +#: src/truncate.c:146 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: το αρχείο έχει αρνητικό μέγεθος" # -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "δεν είναι δυνατό να γίνει διαχωρισμός σε περισσότερους από ένα τρόπο" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:230 +#: src/truncate.c:203 #, fuzzy, c-format msgid "failed to truncate %s at % bytes" msgstr "διαγραφή καταλόγου %s\n" -#: src/truncate.c:303 +#: src/truncate.c:276 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "\\%c: Μη έγκυρη διαφυγή." -#: src/truncate.c:333 +# +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "μη έγκυρος αριθμός %s" + +#: src/truncate.c:307 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n" -#: src/truncate.c:340 +#: src/truncate.c:314 #, fuzzy, c-format msgid "you must specify a relative %s with %s" msgstr "αποτυχία αλλαγής της ομάδας από %s σε %s\n" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, fuzzy, c-format msgid "cannot open %s for writing" msgstr "αδυναμία μεταφοράς του `%s' στο `%s'" @@ -11252,8 +11571,6 @@ msgstr "" 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 "" "Χρήση: %s [ΕΠΙΛΟΓΗ] [ΑΡΧΕΙΟ]\n" "Εγγραφή πλήρους ταξινομημένης λίστας σε συμφωνία με τη μερική ταξινόμηση\n" @@ -11263,14 +11580,19 @@ msgstr "" " --help εμφάνιση αυτής της βοήθειας και έξοδος\n" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "" + # -#: src/tsort.c:471 +#: src/tsort.c:475 #, fuzzy, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: η είσοδος περιέχει βρόχο:" # -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: η είσοδος περιέχει βρόχο:" @@ -11344,9 +11666,7 @@ msgstr "αδύνατη η δημιουργία καταλόγου `%s'" # #: 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "Μετατροπή διαστημάτων σε κάθε ΑΡΧΕΙΟ σε στηλοθέτες, γράφοντας στην κανονική " "έξοδο.\n" @@ -11405,8 +11725,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -11417,7 +11737,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -11571,11 +11891,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "" - #: src/uptime.c:214 #, fuzzy, c-format msgid "" @@ -11603,14 +11918,18 @@ msgstr "" " --help Εκτυπώνει αυτή την βοήθεια και τερματίζει\n" " --version Εκτυπώνει πληροφορίες έκδοσης και τερματίζει\n" +#: src/wc.c:118 +msgid "" +"Print newline, word, and byte counts for each FILE, and a total line if\n" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + # -#: src/wc.c:117 +#: src/wc.c:126 #, fuzzy msgid "" -"Print newline, word, and byte counts for each FILE, and a total line if\n" -"more than one FILE is specified. With no FILE, or when FILE is -,\n" -"read standard input. A word is a non-zero-length sequence of characters\n" -"delimited by white space.\n" +"\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" @@ -11630,13 +11949,13 @@ msgstr "" " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" # -#: src/wc.c:128 +#: src/wc.c:134 #, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" "Εμφάνιση άθροισμα ελέγχου CRC και αριθμό bytes για κάθε ΑΡΧΕΙΟ.\n" @@ -11795,9 +12114,9 @@ msgstr "" " --help Εκτυπώνει αυτή την βοήθεια και τερματίζει\n" " --version Εκτυπώνει πληροφορίες έκδοσης και τερματίζει\n" -#: src/whoami.c:91 +#: src/whoami.c:87 #, fuzzy, c-format -msgid "%s: cannot find name for user ID %lu\n" +msgid "cannot find name for user ID %lu" msgstr "%s: δεν μπορει να βρεθεί όνομα χρήστη για το 'UID' %u\n" # @@ -11814,6 +12133,117 @@ msgid "" "\n" msgstr "" +# +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "Μετατροπή διαστημάτων σε κάθε ΑΡΧΕΙΟ σε στηλοθέτες, γράφοντας στην " +#~ "κανονική έξοδο.\n" +#~ "Χωρίς ΑΡΧΕΙΟ, ή όταν το αρχείο είναι το -, ανάγνωση από την κανονική " +#~ "είσοδο.\n" +#~ "\n" +#~ " -a, --all μετατροπή όλων των λευκών χαρακτήρων, αντί μόνο των " +#~ "αρχικών\n" +#~ " -t, --tabs=ΑΡΙΘΜΟΣ οι στηλοθέτες να έχουν απόσταση ΑΡΙΘΜΟΣ αντί 8\n" +#~ " -t, --tabs=ΛΙΣΤΑ χρήση λίστας χωρισμένης με κόμμα για τη δήλωση της " +#~ "θέσης των στηλοθετών\n" +#~ " --help εμφάνιση αυτής της βοήθειας και έξοδος\n" +#~ " --version εμφάνιση πληροφοριών έκδοσης και έξοδος\n" +#~ "\n" +#~ "Αντί για -t ΑΡΙΘΜΟΣ ή -t ΛΙΣΤΑ, -ΑΡΙΘΜΟΣ ή -ΛΙΣΤΑ μπορούν να " +#~ "χρησιμοποιηθούν.\n" + +# +#, fuzzy +#~ msgid "ignoring all arguments" +#~ msgstr "πάρα πολλά ορίσματα" + +# +#~ msgid "%s: invalid number" +#~ msgstr "%s: μη έγκυρος αριθμός" + +# +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: το %s είναι τόσο μεγάλο που δε μπορεί να αναπαρασταθεί" + +# +#~ msgid "number of lines" +#~ msgstr "αριθμός γραμμών" + +# +#~ msgid "number of bytes" +#~ msgstr "αριθμός από bytes" + +# +#, fuzzy +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: μη έγκυρος αριθμός γραμμών" + +# +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: μη έγκυρος αριθμός από bytes" + +# +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: μη έγκυρος αριθμός γραμμών" + +# +#, fuzzy +#~ msgid "number in %s is too large" +#~ msgstr "το %s είναι πολύ μεγάλο" + +# +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: μη έγκυρος αριθμός δευτερολέπτων" + +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "Δεν μπορεί να παρθεί ο συμπληρωματικός κατάλογος ομάδων." + +#, fuzzy +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ "\n" +#~ "Επιλογές εξόδου:\n" +#~ "* bsN Τύπος καθυστέρησης πισωδιαστήματος, N μεταξύ [0..1]\n" +#~ "* crN Τύπος καθυστέρησης επιστροφής δρομέα, N μεταξύ [0..3]\n" +#~ "* ffN Τύπος καθυστέρησης αλλαγής σελίδας, N μεταξύ [0..1]\n" +#~ "* nlN Τύπος καθυστέρησης αλλαγής σειράς, N μεταξύ [0..1]\n" +#~ "* [-]ocrnl Μετατρέπει την `επιστροφή δρομέα' σε `νέα γραμμή'\n" +#~ "* [-]ofdel Χρησιμοποιεί χαρακτήρες σβησίματος για γέμισμα αντί\n" +#~ " των κενών χαρακτήρων\n" +#~ "* [-]ofill Χρησιμοποιεί χαρακτήρες γεμίσματος αντί χρονομέτρησης " +#~ "για\n" +#~ " τις καθυστερήσεις\n" +#~ "* [-]olcuc Μετατρέπει τα μικρά σε κεφαλαία\n" +#~ "* [-]onlcr Μετατρέπει την `νεα γραμμή' σε `επιστροφή δρομέα-νεα " +#~ "γραμμή'\n" +#~ "* [-]onlret Η `νεα γραμμή' προκαλεί `επιστροφή δρομέα'\n" +#~ "* [-]onocr Δεν εκτυπώνει `επιστροφή δρομέα' στην πρώτη στήλη\n" +#~ " [-]opost Εκτελεί μια προ-επεξεργασμένη έξοδο\n" +#~ "* tabN Τύπος καθυστέρησης της οριζόντιας πινακοποίησης, \n" +#~ " N μεταξύ [0..3]\n" +#~ "* tabs Ομοιο με tab0\n" +#~ "* -tabs Ομοιο με tab3\n" +#~ "* vtN Τύπος καθυστέρησης της κάθετης πινακοποίησης, N μεταξύ " +#~ "[0..1]\n" + +#, fuzzy +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: δεν μπορει να βρεθεί όνομα χρήστη για το 'UID' %u\n" + # #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: μη αναγνωρίσιμη επιλογή -- %c\n" @@ -11897,34 +12327,6 @@ msgstr "" #~ msgid "invalid format precision" #~ msgstr "μη έγκυρο είδος αλφαριθμητικού `%s'" -#, fuzzy -#~ msgid "" -#~ "Display the current time in the given FORMAT, or set the system date.\n" -#~ "\n" -#~ " -d, --date=STRING display time described by STRING, not `now'\n" -#~ " -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -#~ msgstr "" -#~ "Εκτυπώνη την ημερομηνία στη δοσμένη μορφή, ή θέτει την ώρα του " -#~ "συστήματος.\n" -#~ "\n" -#~ " -d, --date=ΜΟΡΦΗ Εκτυπώνει την ώρα που καθορίζεται απο την " -#~ "ΜΟΡΦΗ,\n" -#~ " εκτός της δεσμευμένης λέξης `now'\n" -#~ " -f, --file=ΑΡΧΕΙΟ Ομοια με την --date για κάθε γραμμη του " -#~ "αρχείου\n" -#~ " που περιέχει τις ημερομηνίες\n" -#~ " -r, --reference=ΑΡΧΕΙΟ Εκτυπώνει την τελευταία ημερομηνία " -#~ "τροποποίησης\n" -#~ " του αρχείου\n" -#~ " -R, --rfc-822 Εκτυπώνει την ημερομηνία σύμφωνα με το " -#~ "RFC-822\n" -#~ " -s, --set=ΜΟΡΦΗ Θέτει την ημερομηνία που περιγράφεται απο την\n" -#~ " ΜΟΡΦΗ\n" -#~ " -u, --utc, --universal Εκτυπώνει ή θέτει την παγκόσμια ώρα(UTC)\n" -#~ " --help Εκτυπώνει αυτή την βοήθεια και τερματίζει\n" -#~ " --version Εκτυπώνει πληροφορίες για την έκδοση και " -#~ "τερματίζει\n" - # #, fuzzy #~ msgid "opening %s" @@ -12165,10 +12567,6 @@ msgstr "" #~ "Note that the -r and -s options are mutually exclusive.\n" #~ msgstr "οι επιλογές --string και --check είναι αμοιβαίως αποκλειόμενες" -# -#~ msgid "Usage: %s [OPTION] [FILE]...\n" -#~ msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ] [ΑΡΧΕΙΟ]...\n" - #, fuzzy #~ msgid "" #~ "The backup suffix is `~', unless set with --suffix or " @@ -16349,10 +16747,6 @@ msgstr "" #~ "\n" #~ "Αναφέρατε σφάλματα στο ." -# -#~ msgid "`%s' has reappeared" -#~ msgstr "το `%s' εμφανίστηκε ξανά" - # #, fuzzy #~ msgid "" diff --git a/po/eo.gmo b/po/eo.gmo index 1c915797..af154b32 100644 Binary files a/po/eo.gmo and b/po/eo.gmo differ diff --git a/po/eo.po b/po/eo.po index 8d64104d..899a7d13 100644 --- a/po/eo.po +++ b/po/eo.po @@ -1,5 +1,5 @@ # Esperanto translations for GNU coreutils. -# Copyright (C) 2013 Free Software Foundation, Inc. +# Copyright (C) 2014 Free Software Foundation, Inc. # This file is distributed under the same license as the coreutils package. # # Eta klarigo pri la stilo de la tradukoj: @@ -9,21 +9,22 @@ # # 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 +# that only a few of the original phrases remain unmodified. To note: +# just a handful from Aisano, Goren, and Kristjan Schmidt. -- Benno # # Ekde septembro 2012 mi ofte bazigis miajn aldonajn tradukojn # sur la tradukojn de Sian Mountbatten. Mi dankas. -- Benno # # "Blauwbloemen greuit veural op akkers, tussen 't groan." # -# Benno Schulenberg , 2011, 2012, 2013. +# Benno Schulenberg , 2011, 2012, 2013, 2014. +#: src/stty.c:941 msgid "" msgstr "" -"Project-Id-Version: coreutils-8.22-pre4\n" +"Project-Id-Version: coreutils-8.23-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" -"PO-Revision-Date: 2013-12-10 22:42+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" +"PO-Revision-Date: 2014-07-21 15:15+0200\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Esperanto \n" "Language: eo\n" @@ -51,18 +52,18 @@ msgstr "Validaj argumentoj estas:" msgid "error closing file" msgstr "eraro dum fermado de dosiero" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "skrib-eraro" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "konserviĝas permesoj pri %s" @@ -113,7 +114,7 @@ msgstr "signoaparatdosiero" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "koneksaj datumoj" #: lib/file-type.c:75 msgid "fifo" @@ -121,44 +122,39 @@ msgstr "vicmemoro" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "door-o" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "blokaparatdosiero" +msgstr "multipleksorata blokaparatdosiero" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "signoaparatdosiero" +msgstr "multipleksorata signoaparatdosiero" #: lib/file-type.c:87 -#, fuzzy msgid "multiplexed file" -msgstr "pluraj roloj" +msgstr "multipleksorata dosiero" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "stranga dosiero" +msgstr "nomata dosiero" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "blokaparatdosiero" +msgstr "retaparatdosiero" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "migrita dosiero kun datumoj" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "migrita dosiero sen datumoj" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "pordo" #: lib/file-type.c:105 msgid "socket" @@ -248,57 +244,62 @@ msgstr "Parametra ĉeno ne estas ĝuste kodita" msgid "Unknown error" msgstr "Nekonata eraro" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: opcio «%s» estas plursenca; eblaĵoj estas:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: opcio «-W %s» estas plursenca\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: opcio «--%s» ne toleras argumenton\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: opcio «%c%s» ne toleras argumenton\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "--%s: opcio «%s» bezonas argumenton\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: nekonata opcio «--%s»\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: nekonata opcio «%c%s»\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: nevalida opcio -- «%c»\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opcio bezonas argumenton -- «%c»\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: opcio «-W %s» estas plursenca\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: opcio «-W %s» ne toleras argumenton\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: opcio «-W %s» bezonas argumenton\n" @@ -308,13 +309,13 @@ msgstr "%s: opcio «-W %s» bezonas argumenton\n" msgid "cannot change permissions of %s" msgstr "ne eblas ŝanĝi permesojn de %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "ne eblas krei dosierujon %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "mankas sufiĉa memoro" @@ -363,6 +364,12 @@ msgstr "»" msgid "%s: end of file" msgstr "%s: fino de dosiero" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: leg-eraro" + #: lib/regcomp.c:131 msgid "Success" msgstr "Sukceso" @@ -470,7 +477,7 @@ msgstr "^[jJyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "agordiĝas permesoj pri %s" @@ -924,7 +931,7 @@ msgstr "" "\n" # XXX -- Please don't use periods; use semicolons. -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -938,15 +945,7 @@ msgstr "" " -w, --wrap=NOMBRO faldi koditajn liniojn post NOMBRO (defaŭlte 76)\n" " da signoj; uzu 0 por malŝalti linifaldadon\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -960,51 +959,51 @@ 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:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "leg-eraro" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "nevalida enigaĵo" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "nevalida faldiga grando: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "superflua argumento: %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "fermiĝas ĉefenigujo" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MEKENZI (David MacKenzie)" @@ -1028,7 +1027,6 @@ msgstr "" "\n" #: src/basename.c:60 -#, fuzzy msgid "" " -a, --multiple support multiple arguments and treat each as a NAME\n" " -s, --suffix=SUFFIX remove a trailing SUFFIX; implies -a\n" @@ -1057,38 +1055,45 @@ msgstr "" " %s -a ia/ĉeno1 ia/ĉeno2 -> «ĉeno1» kaj poste «ĉeno2»\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "mankas argumento" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjern GRANLUND (Torbjörn Granlund)" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Riĉard STOLMEN (Richard M. Stallman)" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Uzmaniero: %s [OPCIO...] [DOSIERO...]\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"Eligas ordigitan kunmeton de ĉiuj DOSIEROj al ĉefeligujo.\n" +"\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1107,7 +1112,7 @@ msgstr "" " -n, --number numerigi ĉiujn eligliniojn\n" " -s, --squeeze-blank forlasi ripetitajn vakajn eligliniojn\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1120,7 +1125,7 @@ msgstr "" " -v, --show-nonprinting uzi «^» kaj «M-» notigon, escepte por LFD kaj " "TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1133,17 +1138,18 @@ msgstr "" " %s f - g Eligas enhavon de f, poste ĉefenigujon, poste enhavon de g.\n" " %s Kopias ĉefenigujon al ĉefeligujo.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "ne eblas fari 'ioctl' al %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "ĉefeligujo" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "eniga dosiero %s estas la eliga dosiero; ĝi ignoriĝas" @@ -1155,10 +1161,10 @@ msgstr "Rosel KUKER (Russell Coker)" #. This is a proper name. See the gettext manual, section Names. #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58 -#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Ĝim MEJERING (Jim Meyering)" @@ -1172,8 +1178,8 @@ msgstr "malsukcesis krei sekurecan kuntekston: %s" msgid "failed to set %s security context component to %s" msgstr "malsukcesis agordi elementon %s de sekureca kunteksto al %s" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "malsukcesis eltrovi sekurecan kuntekston de %s" @@ -1188,13 +1194,13 @@ msgstr "ne eblas apliki partan kuntekston al sen-etikeda dosiero %s" 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:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "ne eblas atingi %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "ne eblas legi dosierujon %s" @@ -1210,7 +1216,7 @@ msgstr "ŝanĝiĝas sekureca kunteksto de %s\n" msgid "fts_read failed" msgstr "malsukcesis 'fts_read()'" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1325,7 +1331,7 @@ msgid "-R -h requires -P" msgstr "'-R -h' bezonas '-P'" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1342,9 +1348,8 @@ msgid "conflicting security context specifiers given" msgstr "konfliktas la indikoj de sekureca kunteksto" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "malsukcesis eltrovi atributojn de %s" @@ -1656,17 +1661,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland MEKGRAF (Roland McGrath)" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "nevalida grupo: %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "nevalida gruplisto: %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1675,7 +1680,7 @@ msgstr "" "Uzmaniero: %s [OPCIO] CELDOSIERUJO [KOMANDO [ARGUMENTO...]]\n" " aŭ: %s OPCIO\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1683,16 +1688,28 @@ msgstr "" "Rulas KOMANDOn kun CELDOSIERUJO kiel radika dosierujo.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --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:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\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:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" @@ -1700,42 +1717,47 @@ msgstr "" "\n" "Sen KOMANDO, lanĉiĝas '${SHELL} -i' (defaŭlte: '/bin/sh -i').\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "ne eblas ŝanĝi radikan dosierujon al %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "ne eblas iri al radika dosierujo" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" -msgstr "" +msgstr "neniu grupo indikitas por nekonata UID-o: %d" -#: src/chroot.c:383 -#, fuzzy, c-format +#: src/chroot.c:400 +#, c-format msgid "failed to get supplemental groups" -msgstr "malsukcesis agordi la pluajn grupojn" +msgstr "malsukcesis obteni la pluajn grupojn" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" -msgstr "malsukcesis agordi la pluajn grupojn" +msgid "failed to set supplemental groups" +msgstr "malsukcesis obteni la pluajn grupojn" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "malsukcesis agordi grupnumeron" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "malsukcesis agordi uzantnumeron" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "malsukcesis ruli komandon %s" @@ -1776,7 +1798,16 @@ msgstr "Uzmaniero: %s [OPCIO...] DOSIERO1 DOSIERO2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Komparas ordigitajn dosierojn DOSIERO1 kaj DOSIERO2 po-linie.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1788,7 +1819,7 @@ msgstr "" "liniojn unikajn al DOSIERO1, la dua kolumno liniojn unikajn al DOSIERO2,\n" "kaj la tria kolumno liniojn komunajn al ambaŭ dosierojn.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1801,7 +1832,7 @@ msgstr "" " -3 forlasi kolumnon 3 (liniojn kiuj aperas en ambaŭ " "dosieroj)\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1813,11 +1844,11 @@ msgstr "" " se ĉiuj enigaj linioj estas pareblaj\n" " --nocheck-order ne kontroli ke la enigo estas ĝuste ordigita\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=ĈENO disigi kolumnojn kun ĈENO\n" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" @@ -1825,7 +1856,7 @@ msgstr "" "\n" "Notu ke komparoj honoras la regulojn indikatajn de 'LC_COLLATE'.\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1841,309 +1872,323 @@ msgstr "" "ne\n" " en la alia.\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "dosiero %d ne estas en ordigita sekvo" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "pluraj limigiloj indikatas" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "vaka %s ne permesatas" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "ne eblas 'lseek' sur %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "eraro dum legado de %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "ne eblas 'lseek' sur %s" +msgid "error reading %s" +msgstr "eraro dum legado de %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "eraro dum skribado de %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "eraro dum legado de %s" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s: malsukcesis eltrovi informon pri 'extents'" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: malsukcesis skribo" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "malsukcesis etendi %s" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "vakigiĝas permesoj pri %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "malsukcesis konservi posedanton pri %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "malsukcesis trovi dosieron %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "malsukcesis konservi aŭtorecon pri %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "malsukcesis agordi defaŭltan dosierkrean kuntekston al %s" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "malsukcesis agordi defaŭltan dosierkrean kuntekston por %s" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "malsukcesis agordi sekurecan kuntekston de %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "ne eblas malfermi %s por legi" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "malsukcesis eltrovi statinformon pri malferma %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "ignoratas dosiero %s, ĉar ĝi estis substituata dum kopiado" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "ne eblas forigi %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "forigiĝis %s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "ne skribiĝos tra sencela simbola ligo %s" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "ne eblas krei regulan dosieron %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "malsukcesis kloni %s el %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "konserviĝas tempoj pri %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "malsukcesis malfermi %s" -#: src/copy.c:1580 -#, fuzzy, c-format +#: src/copy.c:1669 +#, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: ĉu anstataŭigi %s, ignorante moduson %04lo (%s)? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " -msgstr "" +msgstr "%s: %s ne estas skribebla (moduso %04lo, %s); ĉu provi tamen? " -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: ĉu anstataŭigi %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (savkopio: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "malsukcesis restaŭri defaŭltan dosierkrean kuntekston" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "ne eblas krei senperan ligon %s al %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "malsukcesis eltrovi statinformon pri %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "preterpasiĝas dosierujo %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "averto: fontdosiero %s indikatas plurfoje" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s kaj %s estas la sama dosiero" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "ne eblas anstataŭigi nedosierujon %s per dosierujo %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "ne anstataŭiĝos ĵuskreita %s per %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "ne eblas anstataŭigi dosierujon %s per nedosierujo" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "ne eblas movi dosierujon al nedosierujo: %s -> %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "ne eblas krei savkopion de %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, 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:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "averto: fontdosiero %s indikatas plurfoje" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "ne eblas movi %s al %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "ne eblas kopii ciklan simbolan ligon %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "ne eblas krei simbolan ligon %s al %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "ne eblas krei vicmemoron %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "ne eblas krei specialan dosieron %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "ne eblas legi simbolan ligon %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "ne eblas krei simbolan ligon %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s havas nekonatan dosiertipon" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "ne eblas restaŭri savkopion %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (restaŭro)\n" @@ -2151,30 +2196,34 @@ msgstr "%s -> %s (restaŭro)\n" #. This is a proper name. See the gettext manual, section Names. #: src/coreutils.c:47 msgid "Alex Deymo" -msgstr "" +msgstr "Aleks DEJMO (Alex Deymo)" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" -msgstr "" +msgstr "Uzmaniero: %s --coreutils-prog=PROGRAMO [ARGUMENTOJ] \n" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" +"Rulas la internan PROGRAMOn kun la indikataj ARGUMENTOJ.\n" +"\n" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" +"\n" +"Uzu '%s --coreutils-prog=PROGRAMNOMO --help' por helpo pri iu programo.\n" -#: src/coreutils.c:178 src/coreutils.c:202 -#, fuzzy, c-format +#: src/coreutils.c:177 src/coreutils.c:201 +#, c-format msgid "unknown program %s" -msgstr "nekonata fluaĵo" +msgstr "nekonata programo %s" #: src/cp.c:157 src/mv.c:288 #, c-format @@ -2448,8 +2497,8 @@ msgstr "%s ekzistas sed ne estas dosierujo" msgid "failed to access %s" msgstr "malsukcesis atingi %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "mankas dosiera argumento" @@ -2525,132 +2574,132 @@ msgstr "" "'xattr'" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stjuŭart KEMP (Stuart Kemp)" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "enigo malaperis" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: lininumero estas ekster gamo" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: lininumero estas ekster gamo" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " ĉe ripeto %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: paron ne trovatas" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "eraro en regulesprima serĉo" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "skrib-eraro por %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: post disigilo atendiĝas entjero" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: '}' nepras en ripeta nombro" # La '}' endas, ĉar %s komencas per '{'. -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: entjero nepras inter '{' kaj '}'" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: mankas ferma disigilo '%c'" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: nevalida regulesprimo: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: nevalida serĉa ŝablono" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: lininumero devas esti pli ol nulo" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "mankas konvertindiko en sufikso" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "nevalida konvertindiko en sufikso: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "nevalida konvertindiko en sufikso: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "nevalidaj flagoj en konvertindiko:: %%%c%c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "tro multaj konvertindikoj %% en sufikso" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "mankas konvertindiko %% en sufikso" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: nevalida numero" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "nevalida numero %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Uzmaniero: %s [OPCIO...] DOSIERO ŜABLONO...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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" @@ -2659,7 +2708,16 @@ msgstr "" "'xx00', 'xx01', ...; kaj eligas la bajtnombron de ĉiu peco al ĉefeligujo.\n" "\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Kiam DOSIERO estas «-», ĉefenigujo legiĝas. Ĉiu ŜABLONO povas esti:\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2671,12 +2729,12 @@ msgstr "" " -f, --prefix=PREFIKSO uzi ĉi tiun PREFIKSOn anstataŭ 'xx'\n" " -k, --keep-files ne forigi eligajn dosierojn kiam eraro okazas\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" " -m, --suppress-matched subpremi la liniojn kiuj kongruas kun ŜABLONO\n" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2687,17 +2745,11 @@ msgstr "" "dosieroj\n" " -z, --elide-empty-files forigi vakajn eligajn dosierojn\n" -#: src/csplit.c:1505 -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:1509 +#: src/csplit.c:1507 +#, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2731,7 +2783,7 @@ msgstr "" "Eligas al ĉefeligujo elektitajn partojn de linioj de ĉiu DOSIERO.\n" "\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2741,7 +2793,7 @@ msgstr "" " -c, --characters=LISTO elekti nur ĉi tiujn signojn\n" " -d, --delimiter=SIGNO uzi SIGNOn anstataŭ TAB-on por kampdisigilo\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2754,7 +2806,7 @@ msgstr "" " krom se la opcio «-s» indikatas\n" " -n (ignoriĝas)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2762,7 +2814,7 @@ msgstr "" " --complement komplementi la aron de elektitaj bajtoj, signoj,\n" " aŭ kampoj\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2772,7 +2824,7 @@ msgstr "" " --output-delimter=ĈENO uzi tiun ĉi ĈENOn kiel eligan disigilon;\n" " defaŭlte uziĝas la eniga disigilo\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2784,7 +2836,8 @@ msgstr "" "unu gamo, aŭ multaj gamoj disigitaj per komoj. Elektita enigo skribiĝas\n" "en la sama ordo en kiu ĝi legiĝas, kaj skribiĝas ekzakte unufoje.\n" -#: src/cut.c:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2792,8 +2845,6 @@ msgid "" " 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 "" "Ĉiu gamo povas esti unu el:\n" "\n" @@ -2804,61 +2855,62 @@ msgstr "" "\n" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "nevalida listo de bajtoj, signoj, aŭ kampoj" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "kampoj kaj pozicioj komencas ekde 1" # La originalo malklaras, la traduko ĝustas. -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "nevalida gamo, sen finpunktoj: «-»" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "nevalida gamo, ĝi malkreskas" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "bajtpozicio %s estas tro granda" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "kampnumero %s estas tro granda" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "eblas indiki nur unu tipon de listo" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "la disigilo devas esti ununura signo" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "nepras indiki liston de bajtoj, signoj, aŭ kampoj" -#: src/cut.c:790 +#: src/cut.c:789 msgid "an input delimiter may be specified only when operating on fields" msgstr "eblas indiki enigan disigilon nur kiam traktante kampojn" -#: src/cut.c:794 +#: src/cut.c:793 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:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "mankas listo de kampoj" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "mankas listo de pozicioj" @@ -2877,34 +2929,48 @@ 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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" + +#: src/date.c:138 +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" +msgstr "" + +#: src/date.c:145 +msgid "" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" -#: src/date.c:142 +#: src/date.c:149 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" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" -#: src/date.c:147 +#: src/date.c:155 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 (UTC)\n" +" -r, --reference=FILE display the last modification time of FILE\n" msgstr "" #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2912,7 +2978,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2920,7 +2986,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2928,14 +2994,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:177 +#: src/date.c:183 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 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2943,7 +3009,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2951,7 +3017,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2962,7 +3028,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2970,7 +3036,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:209 +#: src/date.c:215 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" @@ -2978,7 +3044,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2986,7 +3052,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2998,7 +3064,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3009,7 +3075,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3018,7 +3084,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3032,35 +3098,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "ĉefenigujo" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "nevalida dato %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "pluraj eligaj aranĝoj indikatas" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3071,23 +3137,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:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "ne eblas agordi daton" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, c-format msgid "time %s is out of range" msgstr "tempo %s estas ekster gamo" #. 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 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paŭl RUBIN (Paul Rubin)" -#: src/dd.c:527 +#: src/dd.c:556 #, fuzzy, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3096,7 +3162,7 @@ msgstr "" "Uzmaniero: %s [ARGUMENTO...]\n" " aŭ: %s OPCIO\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3107,7 +3173,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:570 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3116,11 +3182,13 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3131,7 +3199,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3146,7 +3214,7 @@ msgid "" " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3156,7 +3224,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3165,125 +3233,103 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 +#: src/dd.c:661 #, 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:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +#: src/dd.c:699 +#, fuzzy, c-format +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "mankas sufiĉa memoro por eniga bufro de %zu bajtoj (%s)" -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +#: src/dd.c:721 +#, fuzzy, c-format +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "mankas sufiĉa memoro por eliga bufro de %zu bajtoj (%s)" -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" -"%+% rikordo eniĝis\n" -"%+% rikordoj eliĝis\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% trunkita rikordo\n" -msgstr[1] "% trunkitaj rikordoj\n" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "% bajto (%s) kopiiĝis" msgstr[1] "% bajtoj (%s) kopiiĝis" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "senfino" @@ -3297,145 +3343,162 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% rikordo eniĝis\n" +"%+% rikordoj eliĝis\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% trunkita rikordo\n" +msgstr[1] "% trunkitaj rikordoj\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "fermiĝas eniga dosiero %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "fermiĝas eliga dosiero %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "malsukcesis malŝalti O_DIRECT: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "skribiĝas al %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "ne rekonatas argumento %s" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "nevalida konverto" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "nevalida enigflago" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "nevalida eligflago" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "nevalida statflago" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "nevalida numero %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "ne eblas kombini iujn ajn el {ascii,ebcdic,ibm}" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "ne eblas kombini 'block' kaj 'unblock'" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "ne eblas kombini 'lcase' kaj 'ucase'" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "ne eblas kombini 'excl' kaj 'nocreat'" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "ne eblas kombini 'direct' kaj 'nocache'" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" " of mt_type=0x%0lx -- see for the list of types" msgstr "" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: ne eblas transsalti" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: 'seek' ne eblas" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "pozicio trograndiĝis dum legado de dosiero %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "averto: nevalida dosiera pozicio post malsukcesa lego" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "tamen rezultas ke maleblas preterpasi kern-eraron" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "agordiĝas flagoj pri %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: ne eblas salti al indikata pozicio" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "malsukcesis trunki al % bajtoj en eliga dosiero %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "malsukcesis 'fdatasync' por %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "malsukcesis 'fsync' por %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "malsukcesis malfermi %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3444,19 +3507,19 @@ msgstr "" "pozicio estas tro granda: ne eblas trunki al longeco de seek=% (%lu-" "bajtaj) blokoj" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "malsukcesis trunki al % bajtoj en eliga dosiero %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "malsukcesis forĵeti kaŝmemoron por %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paŭl EGERT (Paul Eggert)" @@ -3539,12 +3602,12 @@ msgstr "Kapacito" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" -msgstr "" +msgstr "ne eblas atingi %s: ĝi supermetiĝis per alia aparato" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3555,14 +3618,14 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 #, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3571,11 +3634,10 @@ msgstr "" " '-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" +" -h, --human-readable eligi grandojn en potencoj de 1024 (ekzemple: 234M)\n" +" -H, --si eligi grandojn en potencoj de 1000 (ekzemple: 245M)\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3590,13 +3652,33 @@ msgstr "" " --no-sync ne voki 'sync' antaŭ kapti diskuzad-informojn " "(defaŭlto)\n" -#: src/df.c:1409 +#: src/df.c:1429 +#, 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" +msgstr "" +" --output[=KAMPLISTO] uzi elig-aranĝon difinita per KAMPLISTO,\n" +" aŭ montri ĉiujn kampojn se KAMPLISTO mankas\n" +" -P, --portability uzi la POSIX-an eligan aranĝon\n" +" --sync voki 'sync' antaŭ kapti diskuzad-informojn\n" +" -t, --type=TIPO nur listigi dosiersistemojn de ĉi tiu TIPO\n" +" -T, --print-type eligi tipo de dosiersistemo\n" +" -x, --exclude-type=TIPO ne listigi dosiersistemojn de ĉi tiu TIPO\n" +" -v (ignoriĝas)\n" + +#: src/df.c:1435 +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3611,7 +3693,7 @@ msgstr "" " -x, --exclude-type=TIPO ne listigi dosiersistemojn de ĉi tiu TIPO\n" " -v (ignoriĝas)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3625,25 +3707,25 @@ msgstr "" "'used', 'avail', 'pcent', 'file' kaj 'target' (vidu manlibron kun «info " "df»).\n" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "nekombineblas opcioj '%s' kaj '%s'" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "dosiersistema tipo %s estas ambaŭ elektita kaj ekskluzivita" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Averto: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "ne eblas legi tabelon de surmetitaj dosiersistemoj" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "neniu dosiersistemo pritraktatas" @@ -3737,7 +3819,6 @@ msgstr "" "dosierujo).\n" #: src/dirname.c:59 -#, fuzzy msgid " -z, --zero end each output line with NUL, not newline\n" msgstr " -z, --zero disigi eligon per nulbajtoj anstataŭ per novlinioj\n" @@ -3756,7 +3837,7 @@ msgstr "" " %s ujo1/ĉeno ujo2/ĉeno -> «ujo1» kaj poste «ujo2»\n" " %s stdio.h -> «.».\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3766,7 +3847,9 @@ msgstr "" " aŭ: %s [OPCIO...] --files0-from=LISTDOSIERO\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +#, fuzzy +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Resumas uzon de disko por ĉiu indikata DOSIERO; rikure por dosierujoj.\n" "\n" @@ -3857,62 +3940,56 @@ msgstr "" msgid "Infinity" msgstr "senfino" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "malsukcesis 'fts_read()': %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "nevalida maksimuma profundo %s" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "nevalida argumento por opcio «--threshold»: '-0'" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "ne eblas ambaŭ resumi kaj montri ĉiujn elementojn" -#: src/du.c:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "averto: resumi konfliktas kun opcio «--max-depth=%lu»" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" "averto: opcioj '--apparent-size' kaj '-b' ne efikas kune kun '--inodes'" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "nekombineblas dosieraj argumentoj kun opcio «--files0-from»" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: leg-eraro" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "nevalida dosiernomo (longo nulas)" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "totalo" @@ -4023,15 +4100,14 @@ msgstr "" "\n" #: src/env.c:61 -#, fuzzy msgid "" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with NUL, not newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" " -i, --ignore-environment komenci kun vaka ĉirkaŭaĵo\n" -" -0, --null fini ĉiun linion per nulbajto anstataŭ per " -"novlinio\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:68 @@ -4058,9 +4134,8 @@ msgid "cannot specify --null (-0) with command" msgstr "ne eblas indiki opcio '--null' (-0) kune kun komando" #: 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" +#, fuzzy +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "Konvertas tabojn en ĉiu DOSIERO al spacetoj, skribante al ĉefeligujo.\n" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" @@ -4104,7 +4179,7 @@ msgid "input line is too long" msgstr "eniga linio tro longas" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Majk PARKER (Mike Parker)" @@ -4259,12 +4334,12 @@ msgstr "eraro en regulesprima serĉo" msgid "non-integer argument" msgstr "argumento estas ne-entjera" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "divido per nulo" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Agordu LC_ALL='C' por eviti la problemon." @@ -4275,31 +4350,31 @@ msgid "the strings compared were %s and %s" msgstr "la komparitaj ĉenoj estis %s kaj %s" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "Nils MOLER (Niels Moller)" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, fuzzy, c-format msgid "Lucas prime test failure. This should not happen" msgstr "Malsukcesis ... Ĉi tiu ne devus okazi." -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "troo en atendovico de «SQUFOF»" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s ne estas valida pozitiva entjero" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s estas tro granda" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4308,7 +4383,7 @@ msgstr "" "Uzmaniero: %s [ENTJERO...]\n" " aŭ: %s OPCIO\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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,7 +4427,7 @@ msgstr "" "La opcio '-CIFEROJ' estas mallongigo de '--width=CIFEROJ'.\n" "\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4365,7 +4440,7 @@ msgstr "" "linioj\n" " -s, --split-only fendi longajn liniojn, sed ne rerektigi ilin\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4380,7 +4455,7 @@ msgstr "" "kolumnoj)\n" " -g, --goal=LARĜO cela larĝo (defaŭlto: 93% de maksimuma larĝo)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4390,20 +4465,19 @@ msgstr "" "opcio '-LARĜO' nur rekoniĝas kiam ĝi esta la unua;\n" "alie uzu '-w LARĜO' anstataŭe" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "nevalida larĝo: %s" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +#, fuzzy +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "Faldas enigliniojn el ĉiu DOSIERO, skribante al ĉefeligujo.\n" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4413,9 +4487,9 @@ 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:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "nevalida nombro da kolumnoj: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4487,11 +4561,11 @@ msgstr "malsukcesis eltrovi realan GID-on" msgid "%s: no such user" msgstr "%s: tiu uzanto ne ekzistas" -#: src/head.c:109 +#: src/head.c:110 +#, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Eligas la unuajn dek liniojn de ĉiu DOSIERO al ĉefeligujo.\n" "\n" @@ -4499,7 +4573,7 @@ msgstr "" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" "\n" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4516,7 +4590,7 @@ msgstr "" " kun komenca «-», eligi ĉiujn liniojn krom la\n" " NOMBRO lastaj\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4524,7 +4598,7 @@ msgstr "" " -q, --quiet, --silent neniam eligi ĉapojn kun dosiernomoj\n" " -v, --verbose ĉiam eligi ĉapojn kun dosiernomoj\n" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4536,48 +4610,36 @@ msgstr "" "b = 512, kB = 1000, K = 1024, MB = 1000*1000, M = 1024*1024,\n" "GB = 1000*1000*1000, G = 1024*1024*1024, ktp por T, P, E, Z, Y.\n" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: dosiero ŝrumpis troe" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: nombro de bajtoj tro grandas" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: ne eblas fari 'seek' al pozicio %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: ne eblas fari 'seek' al relativa pozicio %s" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "nombro da linioj" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "nombro da bajtoj" +msgid "%s: number of bytes is too large" +msgstr "%s: nombro de bajtoj tro grandas" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "nevalida nombro da linioj" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "nevalida nombro da bajtoj" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "nevalida opcio je la fino -- %c" @@ -4645,7 +4707,6 @@ msgstr "" # XXX 0 byte anstataŭ NUL char #: src/id.c:90 -#, fuzzy msgid "" " -a ignore, for compatibility with other versions\n" " -Z, --context print only the security context of the process\n" @@ -4658,7 +4719,7 @@ msgid "" " not permitted in default format\n" msgstr "" " -a ignoriĝas (rekoniĝas nur por kongrui kun aliaj versioj)\n" -" -Z, --context eligi nur la sekurecan kuntekston de la aktuala uzanto\n" +" -Z, --context eligi nur la sekurecan kuntekston de la procezo\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" @@ -4770,7 +4831,7 @@ msgstr "ne eblas ŝanĝi posedanton de %s" msgid "cannot set time stamps for %s" msgstr "ne eblas agordi tempojn pri %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "ne eblas krei novan procezon" @@ -4935,7 +4996,7 @@ msgstr "opcio '--strip' malpermesatas dum instalado al dosierujo" msgid "target directory not allowed when installing a directory" msgstr "celdosierujo malpermesatas dum instalado al dosierujo" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "nevalida moduso %s" @@ -4972,8 +5033,13 @@ msgstr "Majk HERTEL (Mike Haertel)" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -4990,7 +5056,7 @@ msgstr "" "DOSIERO2\n" " -e SIGNOĈENO anstataŭigi mankantajn enigajn kampojn per SIGNOĈENO\n" -#: src/join.c:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5002,7 +5068,7 @@ msgstr "" " -o ARANĜO obei ARANĜOn dum konstruo de eliglinio\n" " -t SIGNO uzi SIGNOn kiel eniga kaj eliga kampdisigilo\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5022,14 +5088,13 @@ msgstr "" " --header trakti la unuan linion en ĉiu dosiero kiel kampĉapojn,\n" " kaj eligi ilin sen provi ilin parigi\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 -#, fuzzy +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated disigi eligon per nulbajtoj anstataŭ per " "novlinioj\n" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5070,47 +5135,47 @@ msgstr "" "Se la enigo ne estas ordigita kaj kelkaj linioj ne povas esti kunigitaj,\n" "averta mesaĝo montriĝos.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:%: ne estas ordigita: %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "nevalida kampnumero: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "nevalida kampindiko: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "nevalida dosiernumero en kampindiko: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "nekongruaj kunigkampoj %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "konfliktas la anstataŭigaj ĉenoj por vakaj kampoj" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "plursigna tabo %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "nekongruaj taboj" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "ne ambaŭ dosieroj povas esti ĉefenigujo" @@ -5188,17 +5253,17 @@ msgstr "maleblas kombini signalon kun opcio '-l' aŭ '-t'" msgid "no process ID specified" msgstr "neniu proceznumero indikatas" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "malsukcesis disponigi enigan/eligan bufron de % bajtoj\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "nevalida bufra moduso %s por %s\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "malsukcesis agordi bufran moduson de %s al %s\n" @@ -5276,6 +5341,10 @@ msgid "" " or: %s [OPTION]... TARGET... DIRECTORY (3rd form)\n" " or: %s [OPTION]... -t DIRECTORY TARGET... (4th form)\n" msgstr "" +"Uzmaniero: %s [OPCIO...] [-T] CELO LIGNOMO (unua formo)\n" +" aŭ: %s [OPCIO...] CELO (dua formo)\n" +" aŭ: %s [OPCIO...] CELO... DOSIERUJO (tria formo)\n" +" aŭ: %s [OPCIO...] -t DOSIERUJO CELO... (kvara formo)\n" #: src/ln.c:398 msgid "" @@ -5288,6 +5357,15 @@ msgid "" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" msgstr "" +"En la unua formo, kreiĝas ligo al CELO kun nomo LIGNOMO.\n" +"En la dua formo, kreiĝas ligo en la nuna dosierujo al CELO.\n" +"En la tria kaj kvara formoj, kreiĝas ligoj en DOSIERUJO al ĉiu CELO.\n" +"\n" +"Defaŭlte kreiĝas rektaj ligoj, simbolaj ligoj nur kun «--symbolic».\n" +"Defaŭlte ĉiu nomo de nova ligo devus ne jam ekzisti.\n" +"Dum kreado de rektaj ligoj, ĉiu CELO devas ekzisti.\n" +"Simbolaj ligoj povas enhavi iun ajn tekston; dum posta sekvado,\n" +"relativa ligo interpretiĝas baze de sia patra dosierujo.\n" #: src/ln.c:411 msgid "" @@ -5321,6 +5399,13 @@ msgid "" "location\n" " -s, --symbolic make symbolic links instead of hard links\n" msgstr "" +" -i, --interactive demandi ĉu forigi jam ekzistantajn nomojn\n" +" -L, --logical sekvi CELOjn kiuj estas simbolaj ligoj\n" +" -n, --no-dereference trakti LIGNOMOn kiel normalan dosieron se ĝi\n" +" estas simbola ligo al dosierujo\n" +" -P, --physical krei rektajn ligojn rekte al simbolaj ligoj\n" +" -r, --relative krei simbolajn ligojn relative al ligloko\n" +" -s, --symbolic krei simbolajn ligojn anstataŭ rektajn\n" #: src/ln.c:428 msgid "" @@ -5331,6 +5416,11 @@ 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=SUFIKSO uzi ĉi tiun anstataŭ kutiman savkopian " +"sufikson\n" +" -t, --target-directory=UJO krei la ligojn en ĉi tiu dosierujo\n" +" -T, --no-target-directory ĉiam trakti LIGNOMOn kiel normalan dosieron\n" +" -v, --verbose montri nomon de ĉiu ligata dosiero\n" #: src/ln.c:450 #, c-format @@ -5361,7 +5451,7 @@ msgstr "maleblas '--relative' sen '--symbolic'" msgid "FIXME: unknown" msgstr "(nekonato)" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Uzmaniero: %s [OPCIO]\n" @@ -5374,7 +5464,7 @@ msgstr "" "Eligas nomon de aktuala uzanto.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "neniu ensaluta nomo" @@ -5384,7 +5474,7 @@ msgstr "neniu ensaluta nomo" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -5393,94 +5483,94 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "ignoriĝas nevalida valoro (%s) de ĉirkaŭaĵa variablo QUOTING_STYLE" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "ignoriĝas nevalida larĝo (%s) en ĉirkaŭaĵa variablo COLUMNS" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "ignoriĝas nevalida grando de tabo (%s) en ĉirkaŭaĵa variablo TABSIZE" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "nevalida linia larĝo: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "nevalida taba grando: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "nevalida temparanĝo: %s" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "Validaj argumentoj estas:\n" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "eraro dum estigo de monataj signoĉenoj" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "nerekonata prefikso: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "valoro de ĉirkaŭaĵa variablo LS_COLORS ne analizeblas " -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "ignoriĝas nevalida valoro (%s) de ĉirkaŭaĵa variablo QUOTING_STYLE" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "ne eblas malfermi dosierujon %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "ne eblas eltrovi aparaton kaj indeksnodon de %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: ne listiĝas jam listita dosierujo" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "legiĝas dosierujo %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "fermiĝas dosierujo %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "ne eblas kompari dosiernomojn %s kaj %s" -#: src/ls.c:4781 +#: src/ls.c:4775 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" @@ -5489,7 +5579,7 @@ msgstr "" "Alfabetigas la termojn se neniu de '-cftuvSUX' nek '--sort' indikatas.\n" "\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5498,7 +5588,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5512,18 +5602,19 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4798 msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5533,11 +5624,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5546,7 +5637,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5554,7 +5645,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5567,7 +5658,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5579,7 +5670,7 @@ msgid "" " -k, --kibibytes default to 1024-byte blocks for disk usage\n" msgstr "" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5589,7 +5680,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5600,7 +5691,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -5612,7 +5703,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5620,21 +5711,21 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4886 +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -5648,31 +5739,32 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4908 +#: src/ls.c:4904 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:4912 +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4919 +#: src/ls.c:4915 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 security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5681,7 +5773,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5706,12 +5798,10 @@ msgid "David Madore" msgstr "David MADOR (David Madore)" #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" "Uzmaniero: %s [OPCIO...] [DOSIERO...]\n" "\n" @@ -5720,41 +5810,46 @@ msgstr "" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -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:178 -msgid " -b, --binary read in binary mode\n" +#: src/md5sum.c:180 +#, fuzzy +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary legi en duuma moduso\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr " --tag krei kontrolsumon en BSD-stilo\n" -#: src/md5sum.c:188 +#: src/md5sum.c:191 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:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text legi en teksta moduso (defaŭlte)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -5774,14 +5869,15 @@ msgstr "" " -w, --warn averti pri malĝuste formitaj kontrolsumaj linioj\n" "\n" -#: src/md5sum.c:206 -#, c-format +#: src/md5sum.c:209 +#, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "La kontrolsumoj kalkuliĝas kiel estas priskribita en %s. Dum kontrolo,\n" @@ -5789,89 +5885,89 @@ msgstr "" "estas eligi por ĉiu DOSIERO linion kiu konsistas de: kontrolsumo, signo kiu\n" "indikas la enigan moduson («*» por duuma, spaceto por teksta), kaj la nomo.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: tro multaj linioj de kontrolsumoj" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: linio %: nevalida %s-kontrolsumo" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: malsukcesis malfermo aŭ lego\n" # Ĉi tiu priskribas malsaman kontrolsumon. -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "MALSAMAS" # Ĉi tiu priskribas kongruan kontrolsumon. -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "bonas" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: neniu valida %s-kontrolsumo troviĝas" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "AVERTO: % linio malbone aranĝatas" msgstr[1] "AVERTO: % linioj malbone aranĝatas" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "AVERTO: % listita dosiero ne legeblas" msgstr[1] "AVERTO: % listitaj dosieroj ne legeblas" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "AVERTO: % kalkulita kontrolsumo NE kongruas" msgstr[1] "AVERTO: % kalkulitaj kontrolsumoj NE kongruas" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "opcioj '--tag' kaj '--text' ne kombineblas" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "opcio '--tag' ne havas sencon dum sumkontrolo" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, 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:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "opcio '--status' nur havas sencon dum sumkontrolo" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "opcio '--warn' nur havas sencon dum sumkontrolo" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "opcio '--quiet' nur havas sencon dum sumkontrolo" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "opcio '--strict' nur havas sencon dum sumkontrolo" @@ -5888,7 +5984,6 @@ msgstr "" "\n" #: src/mkdir.c:65 -#, fuzzy msgid "" " -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" " -p, --parents no error if existing, make parent directories as needed\n" @@ -5899,12 +5994,9 @@ msgstr "" " -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[=KUNTEKSTO] agordi sekurecan kuntekston de ĉiu kreita " -"dosierujo\n" -" al defaŭlta tipo, aŭ al KUNTEKSTO se ĝi " -"indikatas\n" #: src/mkdir.c:70 +#, fuzzy msgid "" " -Z set SELinux security context of each created " "directory\n" @@ -5912,23 +6004,27 @@ msgid "" " --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n" " or SMACK security context to CTX\n" msgstr "" +" -Z, --context[=KUNTEKSTO] agordi sekurecan kuntekston de ĉiu kreita " +"dosierujo\n" +" al defaŭlta tipo, aŭ al KUNTEKSTO se ĝi " +"indikatas\n" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "malsukcesis agordi defaŭltan krean kuntekston por %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" msgstr "malsukcesis restaŭri kuntekston por %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "kreiĝas dosierujo %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -5954,11 +6050,16 @@ msgstr "" "umask'\n" #: src/mkfifo.c:63 src/mknod.c:65 +#, fuzzy msgid "" " -Z set the SELinux security context to default type\n" " --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n" " or SMACK security context to CTX\n" msgstr "" +" -Z, --context[=KUNTEKSTO] agordi sekurecan kuntekston de ĉiu kreita " +"dosierujo\n" +" al defaŭlta tipo, aŭ al KUNTEKSTO se ĝi " +"indikatas\n" #: src/mkfifo.c:153 src/mknod.c:150 #, c-format @@ -6116,7 +6217,7 @@ msgstr "tro multaj ŝablonoj" msgid "with --suffix, template %s must end in X" msgstr "kun opcio '--suffix', ŝablono %s devas fini per X" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "nevalida sufikso %s; ĝi enhavas apartigilon de dosierujoj" @@ -6245,9 +6346,8 @@ msgid "Scott Bartram" msgstr "Skot BARTREM (Scott Bartram)" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "Skribas kun inversa liniordo ĉiun indikatan DOSIEROn al ĉefeligujo.\n" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" @@ -6322,27 +6422,27 @@ msgstr "nevalida stilo por numeri korpliniojn: %s" msgid "invalid footer numbering style: %s" msgstr "nevalida stilo por numeri piedliniojn: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "nevalida komenca lininumero: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "nevalida lininumera alkremento: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "nevalida nombro da malplenaj linioj: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "nevalida lininumera kampgrando: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "nevalida lininumera aranĝo: %s" @@ -6365,10 +6465,10 @@ msgstr "" "\n" #: src/nohup.c:65 -#, c-format +#, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6387,43 +6487,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "malsukcesis fari ĉefenigujon neuzebla" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "enigo ignoratas" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "enigo ignoratas, kaj eligo aldoniĝas al %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "eligo aldoniĝas al %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "malsukcesis agordi kopion de ĉeferar-eligujo fermiĝi je rulo" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "enigo ignoratas, kaj ĉeferar-eligujo alidirektiĝas al ĉefeligujo" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "ĉeferar-eligujo alidirektiĝas al ĉefeligujo" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Ĝusepe SKRIVANO (Giuseppe Scrivano)" @@ -6450,97 +6550,94 @@ 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "Asaf GORDON (Assaf Gordon)" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "valoro tro grandas por konverti: %s" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, c-format msgid "invalid number: %s" msgstr "nevalida nombro: %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "sufikso en enigo rifuziĝis: %s (konsideru uzon de «--from»)" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" msgstr "nevalida sufikso en enigo: %s" -# XXX mankas punkto post e.g -#: src/numfmt.c:675 +# FIXME: mankas punkto post e.g +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "mankas sufikso «i» en enigo: %s (ekzemple Ki/Mi/Gi)" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "malsukcesis prepari valoron '%Lf' por montrado" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, c-format msgid "invalid unit size: %s" msgstr "nevalida unueca grando: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Uzmaniero: %s [OPCIO...] [NOMBRO...]\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr " --debug montri avertojn je nevalida enigo\n" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6548,19 +6645,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -6570,30 +6667,30 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 #, fuzzy msgid "" "\n" @@ -6602,11 +6699,11 @@ msgstr "" "Aliaj opcioj:\n" "\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6615,7 +6712,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -6623,7 +6720,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -6631,7 +6728,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -6639,7 +6736,28 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\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/numfmt.c:983 #, c-format msgid "" "\n" @@ -6648,9 +6766,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -6662,7 +6781,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -6677,119 +6796,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "aranĝo %s ne enhavas %%-indikon" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "nevalida aranĝo %s (troo de larĝo)" -#: src/numfmt.c:1008 -#, c-format -msgid "--format padding overridding --padding" -msgstr "" +#: src/numfmt.c:1085 +#, fuzzy, c-format +msgid "--format padding overriding --padding" +msgstr "ŝtopado de «--format» transpasas «--padding»" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "aranĝo %s finiĝas per %%" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "nevalida precizo: %s" + +#: src/numfmt.c:1126 #, fuzzy, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" -msgstr "nevalida aranĝo %s; indiko devas esti «%%['][-][N]f»" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" +msgstr "nevalida aranĝo %s; indiko devas esti «%%[0]['][-][N]f»" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "aranĝo %s enhavas tro multajn %%-indikojn" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, c-format msgid "invalid suffix in input %s: %s" msgstr "nevalida sufikso en enigo %s: %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, fuzzy, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "valoro tro grandas por montri: '%Lg' (pripensu uzi «--to»)" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "valoro tro grandas por montri: '%Lg' (pripensu uzi «--to»)" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "valoro tro grandas por montri: '%Lg' (valoroj > 999Y ne trakteblas)" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "granda eniga valoro %s: eblas perdo de precizeco" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" -"eniga linio tro mallongas; ne troviĝis konvertendaj nombroj en kampo %ld" +msgid "invalid field value %s" +msgstr "nevalida kampvaloro %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, c-format msgid "invalid padding value %s" msgstr "nevalida ŝtopvaloro %s" -#: src/numfmt.c:1417 -#, c-format -msgid "invalid field value %s" -msgstr "nevalida kampvaloro %s" +#: src/numfmt.c:1646 +#, fuzzy, c-format +msgid "multiple field specifications" +msgstr "%s: nevalida kampindiko %s" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, c-format msgid "invalid header value %s" msgstr "nevalida ĉapvaloro %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "nekombineblas opcioj «--grouping» kaj «--format»" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "neniu konverta opcio indikatas" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "nekombineblas opcioj «--grouping» kaj «--to»" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" -msgstr "" +msgstr "grupado ne havas efekton en tiu ĉi lokaĵo" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" -msgstr "" +msgstr "opcio «--header» ignoratas sen komandlinia enigo" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "eraro dum legado de enigo" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "malsukcesis konverti kelkajn enigajn nombrojn" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6802,14 +6932,13 @@ msgstr "" " aŭ: %s --traditional [OPCIO...] [DOSIERO] [[+]DEŜOVO[.][b]] " "[[+]ETIKEDO[.][b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Eligas neambiguan reprezenton (per okumaj bajtoj defaŭlte)\n" @@ -6817,8 +6946,9 @@ msgstr "" "ili kunmetiĝas en la indikata ordo por formi la enigon.\n" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" -#: src/od.c:333 +#: src/od.c:335 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" @@ -6827,7 +6957,7 @@ msgid "" "suffixes may be . for octal and b for multiply by 512.\n" msgstr "" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -6836,7 +6966,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -6849,7 +6979,7 @@ msgid "" " --traditional accept arguments in third form above\n" msgstr "" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -6860,7 +6990,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6870,7 +7000,7 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -6879,7 +7009,7 @@ msgid "" " c printable character or backslash escape\n" msgstr "" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6888,7 +7018,7 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -6897,14 +7027,14 @@ msgid "" "for sizeof(double) or L for sizeof(long double).\n" msgstr "" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -6922,12 +7052,12 @@ msgstr "" " b = 512, kB = 1000, K = 1024, MB = 1000*1000, M = 1024*1024,\n" " GB = 1000*1000*1000, G = 1024*1024*1024, ktp por T, P, E, Z, Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "nevalida tipa ĉeno: %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -6936,7 +7066,7 @@ msgstr "" "nevalida tipa ĉeno: %s\n" "ĉi tiu sistemo ne provizas entjertipon de %lu bajtoj" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -6945,36 +7075,36 @@ msgstr "" "nevalida tipa ĉeno: %s\n" "ĉi tiu sistemo ne provizas glitkomtipon de %lu bajtoj" -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" msgstr "nevalida signo '%c' en tipa ĉeno %s" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "maleblas transsalti la finon de kombinata enigo" -#: src/od.c:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "ne eblas indiki tipon kiam ŝutendas ĉenoj" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "kongrua moduso permesas maksimume unu dosieron" -#: src/od.c:1884 +#: src/od.c:1892 #, 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:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "averto: nevalida larĝo %lu; uzatas %d anstataŭe" @@ -6990,10 +7120,10 @@ 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" msgstr "" "Skribas liniojn kiuj konsistas de la kungluo de la sekve korespondaj linioj\n" "de ĉiu indikata DOSIERO, disigitaj per TABOJ, al ĉefeligujo.\n" @@ -7138,12 +7268,12 @@ msgstr "Ensalutis" msgid "Where" msgstr "Kie" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Uzmaniero: %s [OPCIO...] [UZANTO...]\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7162,7 +7292,7 @@ msgstr "" " -s produkti eligon en mallonga aranĝo (ĉi tio estas la " "defaŭlto)\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7175,7 +7305,7 @@ msgstr "" " -i kiel '-w' sed ankaŭ forlasi foran gastiganton\n" " -q kiel '-i' sed ankaŭ forlasi vakan tempon\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -7186,97 +7316,97 @@ msgstr "" "Malpeza 'finger'-programo; eligas informon pri uzantoj.\n" "La uzita 'utmp'-dosiero estos %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" "neniu uzantnomo indikatas; endas indiki almenaŭ unu nomo kiam '-l' uzatas" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pit TERMAT (Pete TerMaat)" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland HIBNER (Roland Huebner)" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "mankas argumento en '--page=UNUA_PAĜO[:LASTA_PAĜO]'" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "nevalida gamo de paĝoj: %s" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "nevalida nombro da linioj je opcio '-l': %s" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "nevalida komenca lininumero je opcio '-N': %s" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "nevalida marĝeno je opcio '-o': %s" -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "nevalida nombro da signoj je opcio '-w': %s" -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "nevalida nombro da signoj je opcio '-W': %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "ne eblas printi ambaŭ vertikale kaj horizontale" -#: src/pr.c:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "tro malgrandas paĝa larĝo" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "komenca paĝnumero % pligrandas ol nombro da paĝoj %" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "troo de paĝnumero" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Paĝo %" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7286,7 +7416,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7296,7 +7426,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7308,7 +7438,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7321,16 +7451,21 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2798 +#: src/pr.c:2769 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2775 +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7340,7 +7475,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7349,7 +7484,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7360,17 +7495,22 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2828 +#: src/pr.c:2802 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7384,7 +7524,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7393,13 +7533,6 @@ msgid "" " with -S or -s\n" msgstr "" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" - #: src/printenv.c:62 #, c-format msgid "" @@ -7415,7 +7548,6 @@ msgstr "" "\n" #: src/printenv.c:69 -#, fuzzy msgid " -0, --null end each output line with NUL, not newline\n" msgstr " -0, --null disigi eligon per nulbajtoj anstataŭ per novlinioj\n" @@ -7556,11 +7688,11 @@ msgstr "" "Eligas ordigitan liston de la vortoj en la enigdosieroj,\n" "inkluzivante la kuntekston de tiuj vortoj.\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 +#, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" " -G, --traditional behave more like System V 'ptx'\n" -" -F, --flag-truncation=STRING use STRING for flagging line truncations\n" msgstr "" " -A, --auto-reference aldoni linireferencojn\n" " -G, --traditional konduti pli kiel Sistema V 'ptx'\n" @@ -7568,6 +7700,12 @@ msgstr "" #: src/ptx.c:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -7581,7 +7719,7 @@ msgstr "" " -S, --sentence-regexp=REGESP por linifinoj aŭ fino de frazoj\n" " -T, --format=tex generi eligon en formo de 'TeX'-direktivoj\n" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7601,7 +7739,7 @@ msgstr "" "DOSIERO\n" " -o, --only-file=DOSIERO legi nuran vortliston el ĉi tiu DOSIERO\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7613,20 +7751,16 @@ msgstr "" " -w, --width=NOMBRO eliglarĝo en kolumnoj (ekskluzive " "referenco)\n" -#: src/ptx.c:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" -"Defaŭlte uziĝas opcio «-F /».\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "nevalida larĝo de fendo: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "nevalida linia larĝo: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -7649,13 +7783,15 @@ msgid "" "\n" "If no option is specified, -P is assumed.\n" msgstr "" +"\n" +"Sen iu opcio, '-P' supozatas.\n" #: src/pwd.c:169 #, c-format msgid "failed to chdir to %s" msgstr "malsukcesis ŝanĝi aktualan dosierujon al %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "malsukcesis eltrovi statinformon pri %s" @@ -7675,8 +7811,8 @@ msgstr "ignoratas ne-opciaj argumentoj" msgid "Dmitry V. Levin" msgstr "Dmitri LEVIN (Dmitry V. Levin)" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Uzmaniero: %s [OPCIO...] DOSIERO...\n" @@ -7763,19 +7899,19 @@ msgstr "%s: ĉu eniri en dosierujon %s? " #: src/remove.c:291 #, c-format msgid "%s: remove write-protected %s %s? " -msgstr "%s: ĉu forigi kontraŭskribe protektatan %s %s? " +msgstr "%1$s: ĉu forigi %3$s? (ĝi estas kontraŭskribe protektata %2$s) " #: src/remove.c:292 #, c-format msgid "%s: remove %s %s? " -msgstr "%s: ĉu forigi %s %s? " +msgstr "%1$s: ĉu forigi %3$s? (ĝi estas %2$s) " #: src/remove.c:375 #, c-format msgid "removed directory: %s\n" msgstr "forigiĝis dosierujo %s\n" -# Temas pri . kaj .. (mem kaj patro). +# Temas pri «.» kaj «..» (mema kaj patra ujo). #: src/remove.c:447 #, c-format msgid "refusing to remove %s or %s directory: skipping %s" @@ -7873,16 +8009,16 @@ msgid "" msgstr "" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: ĉu forigi %zu argumenton rikure? " msgstr[1] "%s: ĉu forigi %zu argumentojn rikure? " #: src/rm.c:345 -#, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +#, fuzzy, c-format +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: ĉu forigi %zu argumenton? " msgstr[1] "%s: ĉu forigi %zu argumentojn? " @@ -8071,12 +8207,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "nevalida glitkoma argumento: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "aranĝo %s enhavas nekonatan %%%c-indikon" -#: src/seq.c:557 +#: src/seq.c:603 #, 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" @@ -8092,7 +8228,16 @@ msgid "" "for even very expensive hardware probing to recover the data.\n" msgstr "" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Kiam DOSIERO estas «-», kopii denove al ĉefeligujo.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8101,7 +8246,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -8110,11 +8255,9 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:192 +#: src/shred.c:196 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.\n" @@ -8126,7 +8269,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8137,7 +8280,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8149,7 +8292,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8158,7 +8301,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -8170,134 +8313,134 @@ msgid "" "\n" msgstr "" -#: src/shred.c:241 +#: src/shred.c:243 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:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "malsukcesis 'fdatasync' por %s" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "malsukcesis 'fsync' por %s" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "malsukcesis 'lseek' ĝis komenco sur %s" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: paŝo %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: skrib-eraro je pozicio %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "malsukcesis 'lseek' sur %s" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: dosiero tro grandas" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: paŝo %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: paŝo %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "malsukcesis eltrovi statinformon pri malferma %s" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: nevalida dosiertipo" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: dosiero havas negativan grandon" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: eraro dum trunkado" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "malsukcesis fcntl() sur %s" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "maleblas tutviŝi nur-aldonan dosieron %s" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "forigiĝas %s" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s renomiĝis al %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "malsukcesis forigi %s" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "forigiĝis %s" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "malsukcesis fermi %s" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "malsukcesis malfermi %s por skribado" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "nevalida nombro de paŝoj: %s" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "pluraj aleatoraj fontoj indikatas" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: nevalida dosiergrando" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -8308,15 +8451,13 @@ msgstr "" " aŭ: %s -e [OPCIO...] [ARGUMENTO...]\n" " aŭ: %s -i DE-ĜIS [OPCIO...]\n" -#: src/shuf.c:67 +#: src/shuf.c:68 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" -# XXX don't use periods -#: src/shuf.c:73 -#, fuzzy +#: src/shuf.c:75 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 " @@ -8334,43 +8475,41 @@ msgstr "" "ĉefeligujo\n" " --random-source=DOSIERO preni hazardajn bajtojn el DOSIERO\n" " -r, --repeat permesi ke la eniglinioj uziĝas plurfoje\n" -" -z, --zero-terminated disigi eligon per nulbajtoj anstataŭ per " -"novlinioj\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "tro multaj eniglinioj" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "pluraj opcioj '-i' indikatas" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "nevalida gamo: %s" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "nevalida nombro de linioj: %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "pluraj eligaj dosieroj indikatas" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "nekombineblas opcioj '-e' kaj '-i'" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" -msgstr "" +msgstr "neniu linio por ripeti" #: src/sleep.c:44 #, c-format @@ -8386,12 +8525,12 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "nevalida tempintervalo: %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "malsukcesis legi realtempan horloĝon" @@ -8402,7 +8541,7 @@ msgstr "" "Eligas ordigitan kunmeton de ĉiuj DOSIEROj al ĉefeligujo.\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -8410,7 +8549,7 @@ msgstr "" "Ordigantaj opcioj:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8418,19 +8557,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:443 +#: src/sort.c:444 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:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8438,7 +8577,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8448,7 +8587,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -8456,13 +8595,13 @@ msgstr "" "Aliaj opcioj:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -8471,7 +8610,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8480,13 +8619,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8494,7 +8633,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8509,7 +8648,7 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -8528,478 +8667,482 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:524 +#: src/sort.c:525 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:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "atendado pri '%s [-d]'" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "'%s [-d]' finiĝis nenormale" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "malsukcesis krei provizoran dosieron en %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "malsukcesis malfermo" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "malsukcesis fflush()" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "malsukcesis fermo" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "malsukcesis krei provizoran dosieron" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "malsukcesis krei novan procezon por '%s -d'" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "averto: malsukcesis forigi %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "nevalida argumento por opcio '--%s': %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "minimuma argumento por opcio '--%s' estas %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "argumento por opcio '--%s' tro grandas: %s" -#: src/sort.c:1359 +#: src/sort.c:1358 #, 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:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "paralelnombro devas esti pli ol nulo" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "malsukcesis eltrovi statinformon" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "malsukcesis lego" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "malsukcesis transformi signoĉenon" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "la neŝanĝita ĉeno estas %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "^ neniu kongruo por klavo\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "uziĝis olda klavo %s; pripensu uzi %s anstataŭe" -#: src/sort.c:2428 +#: src/sort.c:2427 #, 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:2439 +#: src/sort.c:2438 #, 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:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "klavo %lu estas numera kaj ampleksas plurajn kampojn" -#: src/sort.c:2484 +#: src/sort.c:2483 #, 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:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "opcio «-r» aplikas nur al lastebla komparo" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "malsukcesis skribo" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: malordo: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "ĉeferar-eligujo" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "ne eblas legi" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: nevalida kampindiko %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "nekombineblas opcioj «-%s»" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: nevalida nombro je komenco de %s" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "nevalida numero post '-'" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "nevalida numero post '.'" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "hazarda signo en kampindiko" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "pluraj kunpremaj programoj indikatas" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "nevalida numero je kampkomenco" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "kampnumero estas nulo" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "signopozicio estas nulo" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" msgstr "nevalida numero post ','" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "vaka tabo" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "malsukcesis legi dosiernomojn el %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: nevalida dosiernomo (longo nulas)" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "neniu enigo el %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "uzatas %s ordigaj reguloj" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "uzatas simpla bajtkomparo" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "aldona argumento %s ne permesatas por '-%c'" -#: src/split.c:186 -#, c-format -msgid "the suffix length needs to be at least %zu" +#: src/split.c:207 +#, fuzzy, c-format +msgid "the suffix length needs to be at least %" msgstr "longo de sufikso nepras esti almenaŭ %zu" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Uzmaniero: %s [OPCIO...] [ENIGO [PREFIKSO]]\n" -#: src/split.c:207 +#: src/split.c:228 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "elirdosieraj sufiksoj elĉerpiĝis" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "kreiĝas dosiero %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "%s anstataŭigus la enigon -- abortiĝas" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "malsukcesis agordi ĉirkaŭaĵan variablon FILE" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "plenumiĝas kun FILE=%s\n" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "malsukcesis krei dukton" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "fermiĝas antaŭa dukto" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "fermiĝas eliga dukto" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "moviĝas eniga dukto" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "fermiĝas eniga dukto" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "malsukcesis ruli komandon \"%s -c %s\"" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "malsukcesis fermi enigan dukton" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "atendado pri ida procezo" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "kun FILE=%s, signalo %s el komando %s" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "kun FILE=%s, eliro %d el komando %s" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "nekonata rezulto (0x%X) el komando" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "maleblas dividi en pluraj manieroj" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "nevalida nombro da pecoj: %s" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "nevalida pecnumero: %s" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "nevalida sufikslongo: %s" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "nevalida nombro da bajtoj: %s" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "nevalida nombro da linioj: %s" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "plursigna tabo %s" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "multipleksorata signoaparatdosiero" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "lininombro '-%s%c...' tro grandas" -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: nevalida komenca valoro por numera sufikso" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "nevalida grando por IO-bloko: %s" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "opcio «--filter» ne pritraktas pecon eligatan al ĉefeligujo" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "komenca valoro de numereca sufikso tro grandas por sufikslongo" -#: src/split.c:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Majkel MESKES (Michael Meskes)" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "malsukcesis normaligi %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "averto: nerekonata eskapsigno '\\%c'" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "nevalida indiko: %s" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "averto: malsuprenstreko je aranĝofino" -#: src/stat.c:1262 +#: src/stat.c:1265 #, 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:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "malsukcesis legi en dosiersistemo informon pri %s" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9015,7 +9158,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9025,30 +9168,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "Kunteksto: %C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9060,17 +9203,17 @@ msgstr "" "Ŝanĝo: %z\n" "Kreo: %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9080,7 +9223,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9092,7 +9235,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9102,7 +9245,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9115,7 +9258,7 @@ msgid "" " %T minor device type in hex, for character/block device special files\n" msgstr "" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9130,7 +9273,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9141,7 +9284,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9196,8 +9339,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -9222,7 +9364,7 @@ msgstr "sensencas linibufrado de ĉefenigujo" msgid "you must specify a buffering mode option" msgstr "nepras indiki opcion por bufra moduso" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9233,96 +9375,149 @@ msgstr "" " aŭ: %s [-F APARATO | --file=APARATO] [-a|--all]\n" " aŭ: %s [-F APARATO | --file=APARATO] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 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:535 +#: src/stty.c:543 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:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +msgid "" " 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 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:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" msgstr "" -#: src/stty.c:559 +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" + +#: src/stty.c:614 +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 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:578 +#: src/stty.c:632 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" +msgstr "" + +#: src/stty.c:637 +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:584 +#: src/stty.c:641 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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -9330,10 +9525,13 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -9341,135 +9539,249 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +msgid "" " [-]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:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:619 +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +msgid "" " [-]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:627 +#: src/stty.c:712 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:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]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:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +msgid "" " * 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr "" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:672 +#: src/stty.c:843 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" +msgstr "" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:875 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:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 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:707 +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -9478,25 +9790,27 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -9510,12 +9824,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:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "eblas indiki nur unu aparaton" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -9523,45 +9837,50 @@ msgid "" msgstr "" "nekombineblas opcioj '-a' kaj '-g' (por hom-legebla kaj stty-legebla eligo)" -#: src/stty.c:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: malsukcesis reagordi nebarantan moduson" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "nevalida argumento %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "mankas argumento al %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: eraro dum trunkado" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "nevalida protokolo %s por lineo" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: ne eblas efiki ĉiujn petatajn operaciojn" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: mankas informo pri grando de ĉi tiu aparato" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "nevalida entjerargumento %s" #. This is a proper name. See the gettext manual, section Names. @@ -9570,8 +9889,15 @@ msgid "Kayvan Aghaiepour" msgstr "Kejven AGEJPUR (Kayvan Aghaiepour)" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Montras la CRC-kontrolsumon kaj bajtnombrojn de ĉiu DOSIERO.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -9581,20 +9907,54 @@ msgstr "" " -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 +#: src/sync.c:64 +#, fuzzy, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Uzmaniero: %s [OPCIO...] [DOSIERO...]\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Devigas skribon de ŝanĝitaj blokoj al disko, kaj ĝisdatigas la ĉefblokon.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "eraro dum legado de %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: malsukcesis reagordi nebarantan moduson" -#: src/sync.c:69 +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "eraro dum legado de %s" + +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "ignoriĝas ĉiuj argumentoj" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -9603,15 +9963,23 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help montri ĉi tiun helpon kaj eliri\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version montri programversion kaj eliri\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -9619,7 +9987,7 @@ msgstr "" "\n" "(Endaj argumentoj por longaj opcioj ankaŭ endas por la mallongaj.)\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -9627,7 +9995,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -9636,7 +10004,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -9649,24 +10017,29 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" "Sciigu tradukerarojn en «%s» al .\n" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" -msgstr "Por kompleta dokumentado rulu: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "" -#: src/system.h:591 +#: src/system.h:613 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Tajpu '%s --help' por pli da informoj.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9682,9 +10055,8 @@ msgid "Jay Lepreau" msgstr "Ĝej LEPRO (Jay Lepreau)" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "Skribas kun inversa liniordo ĉiun indikatan DOSIEROn al ĉefeligujo.\n" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" @@ -9696,69 +10068,68 @@ msgid "" " -s, --separator=STRING use STRING as the separator instead of newline\n" msgstr "" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "malsukcesis 'seek' sur %s" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "rikordo tro grandas" -#: src/tac.c:450 +#: src/tac.c:459 #, c-format msgid "failed to create temporary file in %s" msgstr "malsukcesis krei provizoran dosieron en %s" -#: src/tac.c:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" msgstr "malsukcesis malfermi %s por skribado" -#: src/tac.c:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" msgstr "malsukcesis revolvi fluon por %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: skrib-eraro" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "malsukcesis malfermi %s por legi" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "disigilo ne povas esti vaka" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ien Lans TEJLOR (Ian Lance Taylor)" -#: src/tail.c:262 -#, c-format +#: src/tail.c:257 +#, 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" msgstr "" "Eligas la %d lastajn liniojn de ĉiu indikata DOSIERO al ĉefeligujo.\n" "Kun pli ol unu DOSIERO, eligas la dosiernomon antaŭ la liniojn.\n" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -9766,7 +10137,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -9779,14 +10150,14 @@ msgid "" " with inotify, this option is rarely useful\n" msgstr "" -#: src/tail.c:293 +#: src/tail.c:288 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 if it is inaccessible\n" msgstr "" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -9795,7 +10166,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -9806,7 +10177,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -9816,169 +10187,169 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "fermiĝas %s (dosiernumero=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: ne eblas fari 'seek' al finrelativa pozicio %s" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "ne eblas eltrovi lokon de %s; uzatas nun skrutinio" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "%s anstataŭiĝis per simbola ligo; rezignatas pri ĉi tiu nomo" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s iĝis neatingebla" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s iĝis atingebla" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s aperis; sekvatas fino de nova dosiero" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s anstataŭiĝis; sekvatas fino de nova dosiero" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: ne eblas ŝanĝi nebarantan moduson" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: dosiero trunkitas" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "ne restas dosieroj" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "ne eblas rigardadi patran dosierujon de %s" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "mankas sufiĉaj risurcoj por 'inotify'" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "ne eblas rigardadi %s" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: ĉu anstataŭigi %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "eraro dum rigardado de 'inotify'-evento" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "eraro dum legado de 'inotify'-evento" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "%s anstataŭiĝis per fora dosiero; rezignatas pri ĉi tiu nomo" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "nombro en %s tro grandas" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "nevalida nombro da senŝanĝaj statinformoj inter malfermoj: %s" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: nevalida PID" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: nevalida nombro da sekundoj" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "nevalida nombro da kolumnoj: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "opcio uzatas en nevalida kunteksto -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "averto: opcio '--retry' ignoriĝas; ĝi utilas nur dum sekvado" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "averto: opcio '--retry' efikas nur dum unua malfermo" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "averto: PID ignoriĝas; opcio '--pid=PID' utilas nur dum sekvado" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "averto: opcio '--pid=PID' ne subtenatas en ĉi tiu sistemo" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "ne eblas sekvi %s je nomo" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "averto: sekvi senĉese ĉefenigujon ne efikas" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "ne eblas uzi 'inotify'; uzatas nun skrutinio" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -9991,60 +10362,72 @@ msgstr "" "anstataŭigi\n" " -i, --ignore-interrrupts ignori interrompsignalojn\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Kiam DOSIERO estas «-», kopii denove al ĉefeligujo.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "mankas argumento post %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "nevalida entjero %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "')' atendatas" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "')' atendatas, %s trovitas" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "unuloka operacisigno atendatas, %s trovitas" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "'-nt' ne akceptas '-l'" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "'-ef' ne akceptas '-l'" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "'-ot' ne akceptas '-l'" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "nekonata duloka operacisigno" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "duloka operacisigno atendatas, %s trovitas" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -10058,20 +10441,20 @@ msgstr "" " aŭ: [ ]\n" " aŭ: [ OPCIO\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" msgstr "" -#: src/test.c:717 +#: src/test.c:719 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 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -10080,7 +10463,7 @@ msgid "" " EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n" msgstr "" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -10090,7 +10473,7 @@ msgid "" " STRING1 != STRING2 the strings are not equal\n" msgstr "" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -10101,7 +10484,7 @@ msgid "" " INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n" msgstr "" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -10109,7 +10492,7 @@ msgid "" " FILE1 -ot FILE2 FILE1 is older than FILE2\n" msgstr "" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -10118,7 +10501,7 @@ msgid "" " -e FILE FILE exists\n" msgstr "" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -10127,7 +10510,7 @@ msgid "" " -k FILE FILE exists and has its sticky bit set\n" msgstr "" -#: src/test.c:766 +#: src/test.c:768 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" @@ -10136,7 +10519,7 @@ msgid "" " -s FILE FILE exists and has a size greater than zero\n" msgstr "" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -10145,7 +10528,7 @@ msgid "" " -x FILE FILE exists and execute (or search) permission is granted\n" msgstr "" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -10154,32 +10537,32 @@ msgid "" "INTEGER may also be -l STRING, which evaluates to the length of STRING.\n" msgstr "" -#: src/test.c:786 +#: src/test.c:788 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 +#: src/test.c:793 msgid "test and/or [" msgstr "'test' kajaŭ '['" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin BRAŬNSDORF (Kevin Braunsdorf)" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Mefju BREDBORN (Matthew Bradburn)" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "mankas ']'" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "superflua argumento: %s" @@ -10199,7 +10582,7 @@ msgstr "averto: malsukcesis agordi horloĝtempon" msgid "warning: timer_create" msgstr "averto: malsukcesis krei horloĝon" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -10208,11 +10591,11 @@ msgstr "" "Uzmaniero: %s [OPCIO] DAŬRO KOMANDO [ARGUMENTO...]\n" " aŭ: %s [OPCIO]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 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" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -10230,7 +10613,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -10238,7 +10621,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -10249,7 +10632,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "averto: malsukcesis malŝalti nekropsiojn" @@ -10264,6 +10647,11 @@ msgstr "eraro dum atendado je komando" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "nekonata rezulto (0x%X) el komando" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -10553,13 +10941,13 @@ msgstr "Eliras kun rezultkodo kiu indikas sukceson." msgid "Exit with a status code indicating failure." msgstr "Eliras kun rezultkodo kiu indikas malsukceson." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Uzmaniero: %s OPCIO... DOSIERO...\n" # XXX -- Please add period. -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -10576,18 +10964,18 @@ msgstr "" "Se DOSIERO estas malpli longa, ĝi etendiĝas, kaj la parto etendata (truo)\n" "legiĝas kiel nulbajtoj. Se iu argumenta DOSIERO ne ekzistas, ĝi kreiĝas.\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create ne krei iun ajn dosieron\n" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" " -o, --io-blocks trakti GRANDOn kiel nombro de en-eligaj blokoj\n" " anstataŭ kiel bajtoj\n" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" @@ -10596,7 +10984,7 @@ msgstr "" " -s. --size=GRANDO agordi aŭ adapti la dosiergrandon laŭ ĉi tiu " "GRANDO\n" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -10608,57 +10996,62 @@ msgstr "" "'+' etendi kun, '-' ŝrumpigi kun, '<' maksimume, '>' minimume,\n" "'/' subrondigi al multoblo de, '%' superrondigi al multoblo de.\n" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "troo en % * %-bajtaj blokoj por dosiero %s" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s havas neuzeblan, ŝajne negativan grandon" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "ne eblas eltrovi grandon de %s" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "troo dum rondigo de grando de dosiero %s" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "troo dum etendo de grando de dosiero %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "malsukcesis trunki %s al % bajtoj" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "pluraj relativaj modifiloj indikatas" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "nevalida numero %s" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "nepras indiki aŭ %s aŭ %s" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "nepras indiki relativan %s kun %s" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "indikatas %s sen %s" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "malsukcesis malfermi %s por skribi" @@ -10669,12 +11062,10 @@ msgid "Mark Kettenis" msgstr "Mark KETENIS (Mark Kettenis)" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Uzmaniero: %s [OPCIO] [DOSIERO]\n" "\n" @@ -10682,12 +11073,17 @@ msgstr "" "\n" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: enigo enhavas malparecan nombron de simboloj" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: enigo enhavas iteracion:" @@ -10755,9 +11151,8 @@ msgid "cannot get system name" msgstr "malsukcesis eltrovi la nomon de la sistemo" #: 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" +#, fuzzy +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "Konvertas spacetojn en ĉiu DOSIERO al taboj, skribante al ĉefeligujo.\n" "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" @@ -10814,9 +11209,10 @@ msgstr "" " -d, --repeated montri nur la ripetitajn liniojn, unu por ĉiu grupo\n" #: src/uniq.c:187 +#, fuzzy msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" " -D, --all-repeated[=DISIGMETODO] montri ĉiujn ripetitajn liniojn;\n" @@ -10829,9 +11225,10 @@ msgid " -f, --skip-fields=N avoid comparing the first N fields\n" msgstr " -f, --skip-fields=N eviti kompari la unuajn N kampojn\n" #: src/uniq.c:195 +#, fuzzy msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" " --group[=DISIGMETODO] montri ĉiujn erojn, disigante grupojn per " @@ -10842,7 +11239,6 @@ msgstr "" " aŭ 'both' (ambaŭ)\n" #: src/uniq.c:199 -#, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing\n" " -s, --skip-chars=N avoid comparing the first N characters\n" @@ -10851,7 +11247,6 @@ msgstr "" " -i, --ignore-case ignori usklecajn malsamecojn je komparo\n" " -s, --skip-chars=N eviti kompari la unuajn N signojn\n" " -u, --unique montri nur unikajn liniojn\n" -" -z, --zero-terminated fini liniojn per nulbajto anstataŭ per novlinio\n" #: src/uniq.c:207 msgid " -w, --check-chars=N compare no more than N characters in lines\n" @@ -10992,11 +11387,6 @@ msgstr "" " Procezoj en ne-interrompebla dormstato ankaŭ kontribuas\n" "al la meznombra ŝarĝo.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -11017,12 +11407,17 @@ msgstr "" "Se DOSIERO ne indikatas, %s uzatas. Kiel DOSIERO kutimas %s.\n" "\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -11041,12 +11436,13 @@ msgstr "" " -m, --chars montri la nombron de signoj\n" " -l, --lines montri la nombron de novlinioj\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=DOS legi la enigon el la dosieroj kiuj indikatas en la\n" @@ -11212,10 +11608,10 @@ msgstr "" "Samas al 'id -un'.\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: ne eblas eltrovi nomon por uzanta ID-o %lu\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "ne eblas eltrovi nomon por uzantnumero %s" #: src/yes.c:41 #, c-format @@ -11234,6 +11630,66 @@ msgstr "" "Daŭre eligas linion kun (ĉiuj) indikata(j) ĈENO(j), aŭ 'y'.\n" "\n" +#~ msgid "input line is too short, no numbers found to convert in field %ld" +#~ msgstr "" +#~ "eniga linio tro mallongas; ne troviĝis konvertendaj nombroj en kampo %ld" + +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Sen DOSIERO, aŭ kiam DOSIERO estas «-», ĉefenigujo legiĝas.\n" +#~ "Defaŭlte uziĝas opcio «-F /».\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Devigas skribon de ŝanĝitaj blokoj al disko, kaj ĝisdatigas la " +#~ "ĉefblokon.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "ignoriĝas ĉiuj argumentoj" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: nevalida numero" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s estas tiel granda ke ĝi ne prezentiĝeblas" + +#~ msgid "number of lines" +#~ msgstr "nombro da linioj" + +#~ msgid "number of bytes" +#~ msgstr "nombro da bajtoj" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: nevalida ignorenda nombro" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "nevalida nombro da bajtoj: %s" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "nevalida nombro da linioj: %s" + +#~ msgid "number in %s is too large" +#~ msgstr "nombro en %s tro grandas" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: nevalida nombro da sekundoj" + +#~ msgid "failed to %s supplemental groups" +#~ msgstr "malsukcesis «%s» la pluajn grupojn" + +#~ msgid "For complete documentation, run: info coreutils '%s invocation'\n" +#~ msgstr "Por kompleta dokumentado rulu: info coreutils '%s invocation'\n" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: ne eblas eltrovi nomon por uzanta ID-o %lu\n" + #~ msgid "cannot create pipe" #~ msgstr "ne eblas krei dukton" diff --git a/po/es.gmo b/po/es.gmo index 9236a89e..28787fe3 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index 6a2eeae7..1193ef19 100644 --- a/po/es.po +++ b/po/es.po @@ -7,12 +7,13 @@ # existentes de fileutils, textutils y sh-utils, en las cuales también # colaboraron Enrique Melero Gómez y Cristian Othón Martínez Vera. # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: GNU coreutils 8.23-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" -"PO-Revision-Date: 2014-07-16 20:12+0200\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" +"PO-Revision-Date: 2014-07-20 14:16+0200\n" "Last-Translator: Santiago Vila Doncel \n" "Language-Team: Spanish \n" "Language: es\n" @@ -39,18 +40,18 @@ msgstr "Los argumentos válidos son:" msgid "error closing file" msgstr "error al cerrar el fichero" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "error de escritura" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "se conservan los permisos de %s" @@ -101,60 +102,58 @@ msgstr "fichero especial de caracteres" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "datos contiguos" #: lib/file-type.c:75 msgid "fifo" msgstr "`fifo'" +# ¿Qué es un "fichero puerta"? sv #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "puerta" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "fichero especial de bloques" +msgstr "fichero especial de bloques multiplexado" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "fichero especial de caracteres" +msgstr "fichero especial de caracteres multiplexado" #: lib/file-type.c:87 -#, fuzzy msgid "multiplexed file" -msgstr "se han especificado varios roles" +msgstr "fichero multiplexado" +# ¿no será un fifo creado con mkfifo? sv #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "fichero extraño" +msgstr "fichero nombrado" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "fichero especial de bloques" +msgstr "fichero especial de red" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "fichero migrado con datos" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "fichero migrado sin datos" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "puerto" #: lib/file-type.c:105 msgid "socket" msgstr "`socket'" +# ¿Se llama así en español? ¿Alguna literatura al respecto? sv #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "blanqueo" #: lib/file-type.c:110 msgid "weird file" @@ -261,57 +260,62 @@ msgstr "Cadena de parámetro no codificada correctamente" msgid "Unknown error" msgstr "Error desconocido" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: la opción '%s' es ambigua; posibilidades:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: la opción '-W %s' es ambigua\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: la opción '--%s' no admite ningún argumento\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: la opción '%c%s' no admite ningún argumento\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: la opción '--%s' requiere un argumento\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: opción no reconocida '--%s'\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: opción no reconocida '%c%s'\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opción inválida -- '%c'\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: la opción requiere un argumento -- '%c'\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: la opción '-W %s' es ambigua\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: la opción '-W %s' no admite ningún argumento\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: la opción '-W %s' requiere un argumento\n" @@ -321,13 +325,13 @@ msgstr "%s: la opción '-W %s' requiere un argumento\n" msgid "cannot change permissions of %s" msgstr "no se pueden cambiar los permisos de %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "no se puede crear el directorio %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "memoria agotada" @@ -378,6 +382,12 @@ msgstr "»" msgid "%s: end of file" msgstr "%s: fin de fichero" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: error de lectura" + #: lib/regcomp.c:131 msgid "Success" msgstr "Éxito" @@ -489,7 +499,7 @@ msgstr "^[sSyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "estableciendo los permisos de %s" @@ -995,7 +1005,7 @@ msgstr "" "Codifica o descodifica en base64 FICHERO, o la entrada estándar, a la\n" "salida estándar.\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -1012,15 +1022,7 @@ msgstr "" " Utilice 0 para desactivar el corte de líneas\n" "\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Sin FICHERO, o cuando FICHERO es -, lee la entrada estándar.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -1035,51 +1037,51 @@ msgstr "" "Utilice --ignore-garbage para descartar cualesquiera bytes del flujo\n" "de entrada que no pertenezcan al alfabeto.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "error de lectura" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "entrada inválida" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "tamaño del `wrap' inválido: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "operando extra %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "cierre de la entrada estándar" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1103,7 +1105,6 @@ msgstr "" "Si se especifica, también elimina un SUFIJO final.\n" #: src/basename.c:60 -#, fuzzy msgid "" " -a, --multiple support multiple arguments and treat each as a NAME\n" " -s, --suffix=SUFFIX remove a trailing SUFFIX; implies -a\n" @@ -1111,8 +1112,8 @@ msgid "" msgstr "" " -a, --multiple admite varios argumentos y trata cada uno como un " "NOMBRE\n" -" -s, --suffix=SUFIJO elimina el SUFIJO final\n" -" -z, --zero separa la salida con NUL en vez de con nueva línea\n" +" -s, --suffix=SUFIJO elimina el SUFIJO final; implica -a\n" +" -z, --zero termina cada línea con NUL, no con nueva línea\n" #: src/basename.c:67 #, c-format @@ -1132,38 +1133,45 @@ msgstr "" " %s -a algo/str1 algo/str2 -> \"str1\" seguido por \"str2\"\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "falta un operando" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Modo de empleo: %s [OPCIÓN]... [FICHERO]...\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"Muestra la concatenación ordenada de todos los FICHERO(s) en la salida\n" +"estándar.\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1182,7 +1190,7 @@ msgstr "" " -n, --number numera todas las líneas\n" " -s, --squeeze-blank suprime líneas vacías repetidas\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1194,7 +1202,7 @@ msgstr "" " -u (sin efecto)\n" " -v, --show-nonprinting utiliza la notación ^ y M-, salvo para LFD y TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1215,17 +1223,18 @@ msgstr "" # creo que es más "self-explanatory" # Sí, tienes razón em+ # FIXME: Comunicar al autor. sv -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "no se puede ejecutar la función `ioctl' sobre %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "salida estándar" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: los ficheros de entrada y salida son el mismo" @@ -1237,10 +1246,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1254,8 +1263,8 @@ msgstr "fallo al crear el contexto de seguridad: %s" msgid "failed to set %s security context component to %s" msgstr "fallo al establecer componente %s del contexto de seguridad a %s" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "fallo al obtener el contexto de seguridad de %s" @@ -1270,13 +1279,13 @@ msgstr "no se puede aplicar contexto parcial al fichero sin etiquetar %s" 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:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "no se puede acceder a %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "no se puede leer el directorio %s" @@ -1292,7 +1301,7 @@ msgstr "cambiando el contexto de seguridad de %s\n" msgid "fts_read failed" msgstr "fts_read falló" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1439,7 +1448,7 @@ msgid "-R -h requires -P" msgstr "-R -h requiere -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1456,9 +1465,8 @@ msgid "conflicting security context specifiers given" msgstr "se han dado especificadores de contexto de seguridad conflictivos" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "fallo al obtener los permisos de %s" @@ -1810,17 +1818,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "grupo inválido %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "lista de grupos inválida %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1829,16 +1837,26 @@ msgstr "" "Modo de empleo: %s [OPCIÓN] NUEVO_RAÍZ [ORDEN [ARG]...]\n" " o bien: %s OPCIÓN\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" msgstr "Ejecuta ORDEN siendo NUEVO_RAÍZ el directorio raíz.\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" +" --userspec=USUARIO:GRUPO especifica el usuario y grupo (ID o nombre) que " +"se\n" +" usará\n" +" --groups=LISTA_G especifica g1,g2,...,gN como grupos " +"suplementarios\n" +"\n" + +#: src/chroot.c:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" " --userspec=USUARIO:GRUPO especifica el usuario y grupo (ID o nombre) que " "se\n" @@ -1847,7 +1865,12 @@ msgstr "" "suplementarios\n" "\n" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" @@ -1856,42 +1879,47 @@ msgstr "" "Si no se especifica ninguna orden, ejecuta '${SHELL} -i'\n" "(por omisión: '/bin/sh -i').\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "no se puede cambiar el directorio raíz a %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "no se puede cambiar al directorio raíz" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" -msgstr "" +msgstr "no se ha especificado ningún grupo para el uid desconocido: %d" -#: src/chroot.c:383 -#, fuzzy, c-format +#: src/chroot.c:400 +#, c-format msgid "failed to get supplemental groups" -msgstr "fallo al establecer el grupo o grupos suplementarios" +msgstr "fallo al obtener los grupos suplementarios" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" -msgstr "fallo al establecer el grupo o grupos suplementarios" +msgid "failed to set supplemental groups" +msgstr "fallo al obtener los grupos suplementarios" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "fallo al establecer el ID del grupo" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "fallo al establecer el ID del usuario" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "fallo al ejecutar la orden %s" @@ -1962,7 +1990,16 @@ msgstr "Modo de empleo: %s [OPCIÓN]... FICHERO1 FICHERO2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Compara los ficheros ordenados FICHERO1 y FICHERO2 línea por línea.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Sin FICHERO, o cuando FICHERO es -, lee la entrada estándar.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1977,7 +2014,7 @@ msgstr "" # ¿¿cómo se puede explicar esto mejor?? # A mí me parece que está bien ... :-? ipg -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1989,7 +2026,7 @@ msgstr "" " -2 suprime la columna 2 (líneas que sólo están en FICHERO2)\n" " -3 suprime la columna 3 (líneas que aparecen en los dos)\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -2002,11 +2039,11 @@ msgstr "" "emparejables\n" " --nocheck-order no comprueba que la entrada está correctamente ordenada\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=CAD separa columnas con CAD\n" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" @@ -2015,7 +2052,7 @@ msgstr "" "Note que las comparaciones obedecen las reglas especificadas por " "'LC_COLLATE'.\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -2030,144 +2067,153 @@ msgstr "" " %s -3 fichero1 fichero2 Muestra las líneas de fichero1 que no están en\n" " fichero2, y viceversa.\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "el fichero %d no está ordenado" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "se han especificado varios delimitadores" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "no se permite un %s vacío" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "no se puede efectuar `lseek' sobre %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "error al leer %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "no se puede efectuar `lseek' sobre %s" +msgid "error reading %s" +msgstr "error al leer %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "error al escribir en %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "error al leer %s" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s: fallo al obtener la información de `extents'" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: error al escribir" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "fallo al extender %s" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "borrando los permisos de %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "fallo al conservar el propietario de %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "fallo al buscar el fichero %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "fallo al conservar el autor de %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "" "fallo al obtener el contexto de creación de ficheros predeterminado a %s" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "" "fallo al obtener el contexto de creación de ficheros predeterminado para %s" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "fallo al establecer el contexto de seguridad de %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "no se puede abrir %s para lectura" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "no se puede efectuar `fstat' sobre %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "saltando el fichero %s, ya que fue reemplazado mientras se copiaba" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "no se puede borrar %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "%s borrado\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "no se escribirá a través del enlace colgado %s" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "no se puede crear el fichero regular %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "fallo al clonar %s a partir de %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "se conserva las fechas de %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "fallo al cerrar %s" @@ -2186,122 +2232,129 @@ msgstr "fallo al cerrar %s" # Creo que tal y como está, está bien. sv # SIoNO # -#: src/copy.c:1580 -#, fuzzy, c-format +#: src/copy.c:1669 +#, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " -msgstr "%s: ¿reemplazar `%s', sustituyendo el modo %04o? (s/n) " +msgstr "%s: ¿reemplazar %s, sustituyendo el modo %04lo? (%s) (s/n) " -#: src/copy.c:1581 +# SIoNO +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" +"%s: %s no escribible (modo %04lo, %s); ¿se intenta a pesar de todo? (s/n) " # SIoNO -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: ¿sobreescribir %s? (s/n) " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (respaldo: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, 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:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "crea el enlace duro %s a %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "no se puede efectuar `stat' sobre %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "se omite el directorio %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, 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:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s y %s son el mismo fichero" -#: src/copy.c:1939 +#: src/copy.c:2019 #, 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:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "no se sobreescribirá el fichero %s recién creado con %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, 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:1989 +#: src/copy.c:2069 #, 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:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "no se puede respaldar %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, 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:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "atención: se ha especificado el fichero origen %s más de una vez" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "no se puede mover %s a %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" @@ -2314,19 +2367,19 @@ msgstr "" # mkdir aa # cp -d bb aa # ls -l aa -#: src/copy.c:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "no se puede copiar el enlace simbólico cíclico %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "no se puede crear el enlace simbólico %s a %s" @@ -2365,27 +2418,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:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "no se puede crear el fichero `fifo' %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "no se puede crear el fichero especial %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "no se puede leer el enlace simbólico %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "no se puede crear el enlace simbólico %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s tiene un tipo de fichero desconocido" @@ -2393,12 +2446,12 @@ 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:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "no se puede restaurar %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (restauración)\n" @@ -2408,28 +2461,34 @@ msgstr "%s -> %s (restauración)\n" msgid "Alex Deymo" msgstr "Alex Deymo" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" +"Modo de empleo: %s --coreutils-prog=NOMBRE_DEL_PROGRAMA [PARÁMETROS]... \n" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" +"Ejecuta el programa empotrado NOMBRE_DEL_PROGRAMA con los PARÁMETROS dados.\n" +"\n" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" +"\n" +"Use: '%s --coreutils-prog=NOMBRE_DEL_PROGRAMA --help' para ayuda sobre un " +"programa en concreto.\n" -#: src/coreutils.c:178 src/coreutils.c:202 -#, fuzzy, c-format +#: src/coreutils.c:177 src/coreutils.c:201 +#, c-format msgid "unknown program %s" -msgstr "flujo desconocido" +msgstr "programa %s desconocido" #: src/cp.c:157 src/mv.c:288 #, c-format @@ -2600,18 +2659,22 @@ msgstr "" " -v, --verbose da detalles sobre lo que se va haciendo\n" " -x, --one-file-system permanece en este sistema de ficheros\n" +# FIXME: Sería más claro si --context (sin CTX) estuviera junto +# con la primera forma. sv #: src/cp.c:232 -#, fuzzy msgid "" " -Z set SELinux security context of destination\n" " file to default type\n" " --context[=CTX] like -Z, or if CTX is specified then set the\n" " SELinux or SMACK security context to CTX\n" msgstr "" -" -Z, --context[=CTX] establece el contexto de seguridad SELinux " +" -Z establece el contexto de seguridad SELinux " "del fichero de\n" -" destino al tipo predeterminado, o a CTX si " -"se especifica\n" +" destino al tipo predeterminado\n" +" --context[=CTX] como -Z, o si se especifica CTX entonces " +"establece\n" +" el contexto de seguridad SELinux o SMACK a " +"CTX\n" # ¿"crude" es simple o sencillo? # @@ -2759,8 +2822,8 @@ msgstr "%s existe pero no es un directorio" msgid "failed to access %s" msgstr "fallo al acceder a %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "falta un fichero como operando" @@ -2849,37 +2912,37 @@ msgstr "" "soporte de xattr" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "la entrada dejó de existir" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: número de línea fuera de rango" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: número de línea fuera de rango" # ??? -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " repetido %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: ocurrencia no encontrada" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "error en la búsqueda de la expresión regular" @@ -2887,98 +2950,98 @@ 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:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "error de escritura para %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: se esperaba un número entero después del delimitador" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: se requiere un '}' después del número de repeticiones" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: entre '{' y '}' debe especificarse un número entero" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: falta el delimitador de cierre '%c'" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: la expresión regular no es válida: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: plantilla inválida" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, 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:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "falta el especificador de conversión en el sufijo" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, 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:1287 +#: src/csplit.c:1288 #, 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:1292 +#: src/csplit.c:1293 #, 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:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "demasiados especificadores de conversión %% en el sufijo" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "falta el especificador de conversión %% en el sufijo" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: número inválido" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "número inválido %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Modo de empleo: %s [OPCIÓN]... FICHERO PLANTILLA...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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" @@ -2988,7 +3051,16 @@ msgstr "" "'xx00', 'xx01', ..., y muestra el tamaño de cada trozo en la salida " "estándar.\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Lee la entrada estándar si FICHERO es -. Cada PLANTILLA puede ser:\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2999,12 +3071,12 @@ 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:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" " -m, --suppress-matched suprime las líneas que encajan con PATRÓN\n" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -3015,17 +3087,11 @@ 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:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Lee la entrada estándar si FICHERO es -. Cada PLANTILLA puede ser:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 +#, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -3060,7 +3126,7 @@ 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" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -3071,7 +3137,7 @@ msgstr "" " -d, --delimiter=DELIM usa DELIM en vez de caracteres de tabulación\n" " para delimitar los campos\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -3085,7 +3151,7 @@ msgstr "" " opción -s\n" " -n (no tiene efecto)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -3094,7 +3160,7 @@ msgstr "" "campos\n" " seleccionados\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -3106,7 +3172,7 @@ msgstr "" " resultado. Por omisión se utiliza el\n" " delimitador de la entrada\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -3122,7 +3188,8 @@ 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:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -3130,8 +3197,6 @@ msgid "" " 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 "" "Los rangos pueden ser:\n" "\n" @@ -3145,52 +3210,53 @@ msgstr "" "\n" "Si no hay FICHERO, o cuando FICHERO es -, lee la entrada estándar.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "byte, carácter o lista de campos inválido" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "los campos y posiciones se numeran a partir de 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "rango inválido sin punto de final: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "rango decreciente inválido" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "el desplazamiento de bytes %s es demasiado grande" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "el número de campo %s es demasiado grande" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "solamente se puede especificar un tipo de lista" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "el delimitador debe ser un sólo carácter" -#: src/cut.c:787 +#: src/cut.c:786 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:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -3198,11 +3264,11 @@ msgstr "" "suprimir las líneas no delimitadas solamente tiene sentido\n" "cuando se procesan campos" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "falta la lista de campos" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "falta la lista de posiciones" @@ -3225,12 +3291,19 @@ 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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" + +#: src/date.c:138 +#, fuzzy +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" " -d, --date=CADENA muestra la hora descrita por CADENA, no 'now'\n" " -f, --file=FICHERO_FECHA igual que --date por cada línea de " @@ -3242,26 +3315,25 @@ msgstr "" " 'seconds', o 'ns' para la fecha y la hora en la\n" " precisión indicada.\n" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=FICHERO muestra la fecha de última modificación de " "FICHERO\n" " -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:147 +#: src/date.c:149 +#, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=ESPTIEMPO muestra la fecha y hora en formato RFC 3339.\n" " ESPTIEMPO='date', 'seconds', o 'ns' para\n" @@ -3272,8 +3344,19 @@ msgstr "" " -u, --utc, --universal muestra o establece el Tiempo Universal " "Coordinado (UTC)\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -3286,7 +3369,7 @@ msgstr "" " %% un % literal\n" " %a el nombre local abreviado de la semana (p. ej., dom)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -3298,7 +3381,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:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -3311,7 +3394,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:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -3321,7 +3404,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:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -3333,7 +3416,7 @@ msgstr "" " %I la hora (01..12)\n" " %j el día del año (001..366)\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -3345,7 +3428,7 @@ msgstr "" " %m el mes (01..12)\n" " %M los minutos (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -3363,7 +3446,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:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3376,7 +3459,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:209 +#: src/date.c:215 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" @@ -3391,7 +3474,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:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3403,7 +3486,7 @@ msgstr "" " %y los últimos dos dígitos del año (00..99)\n" " %Y el año\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3423,7 +3506,7 @@ msgstr "" "\n" "Por omisión, date rellena los campos numéricos con ceros.\n" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3441,7 +3524,7 @@ msgstr "" " ^ utiliza mayúsculas si es posible\n" " # utiliza mayúsculas/minúsculas en sentido contrario si es posible\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3461,7 +3544,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:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3486,37 +3569,37 @@ msgstr "" "hora peninsular española\n" " $ date --date='TZ=\"Europe/Madrid\" 09:00 next Fri'\n" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "entrada estándar" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "fecha inválida %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, 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:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3527,23 +3610,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:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "no se puede establecer la fecha" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3553,7 +3636,7 @@ msgstr "" " o bien: %s OPCIÓN\n" # Tenía un fuzzy pero no sé de qué. -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3573,7 +3656,8 @@ msgstr "" " count=N copia solamente N bloques de entrada\n" " ibs=BYTES lee BYTES bytes cada vez (por omision: 512)\n" -#: src/dd.c:541 +#: src/dd.c:570 +#, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3582,8 +3666,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\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" @@ -3598,7 +3684,7 @@ msgstr "" " 'noxfer' suprime estadísticas sobre la transferencia,\n" " 'none' lo suprime todo\n" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3619,7 +3705,7 @@ msgstr "" "\n" # Tampoco le encuentro el fuzzy -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3652,7 +3738,7 @@ msgstr "" " cuando se utiliza con block o unblock, rellena con espacios\n" " en lugar de con NULos\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3668,7 +3754,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:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3682,140 +3768,106 @@ msgstr "" " append modo de adición (solamente tiene sentido para salida,\n" " se sugiere conv=notrunc)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio utiliza E/S concurrente para los datos\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct utiliza E/S directa para los datos\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory falla a menos que sea un directorio\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync utiliza E/S sincronizada para los datos\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync similar, pero también para metadatos\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock acumula bloques llenos de entrada (solamente iflag)\n" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock utiliza E/S no bloqueante\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime no actualiza la fecha de acceso\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nocache descarta los datos en caché\n" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty no asigna una terminal controladora del fichero\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow no sigue los enlaces simbólicos\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks falla si está enlazado varias veces\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary utiliza E/S binaria para los datos\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text utiliza E/S de texto para los datos\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" " count_bytes trata 'count=N' como contador de bytes (solamente iflag)\n" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" " skip_bytes trata 'skip=N' como contador de bytes (solamente iflag)\n" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" " seek_bytes trata 'seek=N' como contador de bytes (solamente oflag)\n" -#: src/dd.c:631 +#: src/dd.c:661 #, 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 "" -"\n" -"Enviar la señal %s a un proceso 'dd' en marcha hace que muestre\n" -"estadísticas de E/S en la salida de error estándar, y luego continúa\n" -"con la copia.\n" -"\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ kill -%s $pid; sleep 1; kill $pid\n" -" 18335302+0 registros leídos\n" -" 18335302+0 registros escritos\n" -" 9387674624 bytes (9.4 GB) copiados, 34.6279 segundos, 271 MB/s\\n\"\n" -"\n" -"Las opciones son:\n" -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +#: src/dd.c:699 +#, fuzzy, c-format +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "memoria agotada por búfer de entrada de %zu bytes (%s)" -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +#: src/dd.c:721 +#, fuzzy, c-format +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "memoria agotada por un búfer de salida de %zu bytes (%s)" -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" -"%+% registros leídos\n" -"%+% registros escritos\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% registro truncado\n" -msgstr[1] "% registros truncado\n" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "% byte (%s) copiado" msgstr[1] "% bytes (%s) copiados" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "Infinito B" @@ -3829,85 +3881,102 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% registros leídos\n" +"%+% registros escritos\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% registro truncado\n" +msgstr[1] "% registros truncado\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "cerrando el fichero de entrada %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "cerrando el fichero de salida %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "fallo al desactivar O_DIRECT: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "escribiendo en %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "operando no reconocido %s" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "conversión inválida" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "opción de entrada inválida" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "opción de salida inválida" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "opción de estado inválida" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "número inválido %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, 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:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "no se puede combinar block y unblock" # Lo mismo de antes. -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "no se puede combinar lcase y ucase" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "no se puede combinar excl y nocreat" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "no se puede combinar direct y nocache" # Se admiten sugerencias. -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3917,62 +3986,62 @@ msgstr "" "relacionado con lseek para el fichero (%s) de mt_type=0x%0lx;\n" "consulte la lista de tipos en " -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: no se puede saltar" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: desplazamiento imposible" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "desbordamiento de desplazamiento leyendo el fichero %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, 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:1760 +#: src/dd.c:1863 #, 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:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "estableciendo opciones para %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: no se puede saltar al desplazamiento especificado" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "fallo al truncar a % bytes el fichero de salida %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync falló para %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "falló fsync para %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "No se puede abrir %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3981,19 +4050,19 @@ msgstr "" "desplazamiento demasiado grande: no se puede truncar a una longitud de\n" "seek=% bloques (%lu bytes)" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "fallo al truncar a % bytes el fichero de salida %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "fallo al descartar el caché para: %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -4074,12 +4143,12 @@ msgstr "Capacidad" msgid "%s-%s" msgstr "%2$s de %1$s" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" -msgstr "" +msgstr "no se puede acceder a %s: hay montado otro dispositivo encima" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -4091,14 +4160,14 @@ msgstr "" # Se aceptan sugerencias para lo de "dummy" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 #, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -4108,12 +4177,12 @@ msgstr "" " 1.048.576 bytes; vea el formato de TAMAÑO más " "abajo.\n" " --total imprime la suma total\n" -" -h, --human-readable imprime los tamaños en formato legible (p.e. 1K 234M " -"2G)\n" -" -H, --si análogo, pero utiliza potencias de 1000 y no de " -"1024\n" +" -h, --human-readable muestra los tamaños en potencias de 1024 (p.e. " +"1023M)\n" +" -H, --si muestra los tamaños en potencias de 1000 (p.e. " +"1.1G)\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -4129,13 +4198,41 @@ msgstr "" " --no-sync no llama a sync antes de obtener el modo de empleo\n" " (por defecto)\n" -#: src/df.c:1409 +#: src/df.c:1429 +#, 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" +msgstr "" +" --output[=LISTA_DE_CAMPOS] usa el formato de salida definido por\n" +" LISTA_DE_CAMPOS, o muestra todos los " +"campos\n" +" si se omite LISTA_DE_CAMPOS.\n" +" -P, --portability utiliza el formato POSIX para el resultado\n" +" --sync llama a sync antes de obtener el modo de empleo\n" +" -t, --type=TIPO restringe el listado a sistemas de ficheros de tipo " +"TIPO\n" +" -T, --print-type muestra el tipo del sistema de ficheros\n" +" -x, --exclude-type=TIPO restringe el listado a los sistemas de ficheros " +"que\n" +" no son del tipo TIPO\n" +" -v (no tiene efecto)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose muestra un diagnóstico justo antes de abrir cada\n" +" fichero\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -4155,7 +4252,7 @@ msgstr "" " no son del tipo TIPO\n" " -v (no tiene efecto)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -4169,25 +4266,25 @@ msgstr "" "'iavail', 'ipcent', 'size', 'used', 'avail', 'pcent', 'file' y 'target'\n" "(véase la página info).\n" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "las opciones %s y %s son mutuamente excluyentes" -#: src/df.c:1610 +#: src/df.c:1636 #, 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:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Atención: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "no se puede leer la tabla de sistemas de ficheros montados" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "no se ha procesado ningún sistema de ficheros" @@ -4288,10 +4385,9 @@ msgstr "" "\n" #: src/dirname.c:59 -#, fuzzy msgid " -z, --zero end each output line with NUL, not newline\n" msgstr "" -" -z, --zero separa el resultado con NUL en vez de con nueva línea\n" +" -z, --zero termina cada línea de salida con NUL, no con nueva línea\n" "\n" #: src/dirname.c:64 @@ -4309,7 +4405,7 @@ msgstr "" " %s dir1/str dir2/str -> \"dir1\" seguido por \"dir2\"\n" " %s stdio.h -> \".\"\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -4327,13 +4423,14 @@ msgstr "" # # Lo pensaré despacito. sv #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +#, fuzzy +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Muestra un resumen del uso de disco para cada FICHERO, recursivamente para\n" "directorios.\n" #: src/du.c:291 -#, fuzzy msgid "" " -0, --null end each output line with NUL, not newline\n" " -a, --all write counts for all files, not just directories\n" @@ -4343,8 +4440,7 @@ msgid "" " larger due to holes in ('sparse') files, internal\n" " fragmentation, indirect blocks, and the like\n" msgstr "" -" -0, --null termina cada línea con un byte 0 en vez de con nueva " -"línea\n" +" -0, --null termina cada línea con NUL, no con nueva línea\n" " -a, --all muestra resultados para todos los ficheros, no sólo\n" " para los directorios\n" " --apparent-size muestra los tamaños aparentes, en lugar del uso de\n" @@ -4481,64 +4577,58 @@ msgstr "" msgid "Infinity" msgstr "Infinito" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "fts_read falló: %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "profundidad máxima inválida %s" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "argumento --threshold inválido '-0'" -#: src/du.c:898 +#: src/du.c:919 #, 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:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "atención: resumir entra en conflicto con --max-depth=%lu" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" "atención: las opciones --apparent-size y -b no tienen efecto con --inodes" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "los ficheros operando no se pueden combinar con --files0-from." -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: error de lectura" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "nombre de fichero de longitud cero inválido" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "total" @@ -4646,16 +4736,15 @@ msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" msgstr "Asigna a cada NOMBRE el VALOR en el entorno y ejecuta ORDEN.\n" #: src/env.c:61 -#, fuzzy msgid "" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with NUL, not newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" " -i, --ignore-environment comienza con un entorno vacío\n" -" -0, --null termina cada línea de salida con un byte 0\n" -" en lugar de con nueva línea\n" -" -u, --unset=NOMBRE borra la variable del entorno\n" +" -0, --null termina cada línea de salida con NUL, no con nueva " +"línea\n" +" -u, --unset=NOMBRE borra la variable del entorno\n" #: src/env.c:68 msgid "" @@ -4681,9 +4770,8 @@ msgid "cannot specify --null (-0) with command" msgstr "no se puede especificar --null (-0) con la orden" #: 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" +#, fuzzy +msgid "Convert tabs in each FILE to spaces, writing to standard output.\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" @@ -4733,7 +4821,7 @@ msgid "input line is too long" msgstr "la línea de entrada es demasiado larga" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4921,12 +5009,12 @@ msgstr "error en el comparador de expresiones regulares" msgid "non-integer argument" msgstr "argumento no entero" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "división por cero" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "establezca LC_ALL='C' para solucionar este problema de forma temporal." @@ -4937,31 +5025,31 @@ msgid "the strings compared were %s and %s" msgstr "las cadenas comparadas eran %s y %s." #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "Niels Moller" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "Fallo en el test de primalidad de Lucas. Esto no debería ocurrir" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "desbordamiento en la cola squfof" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s no es un entero positivo válido" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s es demasiado grande" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4970,7 +5058,7 @@ msgstr "" "Modo de empleo: %s [NÚMERO]...\n" " o bien: %s OPCIÓN\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -5014,7 +5102,7 @@ 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" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -5028,7 +5116,7 @@ msgstr "" # FIXME: El % debería ser en realidad %%. # De momento dejo eso en inglés y así al menos no se queja. -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -5046,7 +5134,7 @@ msgstr "" " 75 columnas)\n" " -g, --goal=ANCHO objetivo de ancho (default of 93% of width)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -5055,22 +5143,21 @@ 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:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" 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 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +#, fuzzy +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "Ajusta el ancho de las líneas en cada FICHERO (por omisión la entrada\n" "estándar), y escribe el resultado en la salida estándar\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -5080,9 +5167,9 @@ 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:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "el número de columnas no es válido %s" #. This is a proper name. See the gettext manual, section Names. @@ -5158,17 +5245,17 @@ msgstr "no se puede obtener el GID real" msgid "%s: no such user" msgstr "%s: no existe ese usuario" -#: src/head.c:109 +#: src/head.c:110 +#, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "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" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -5184,7 +5271,7 @@ msgstr "" " primeras 10; con el '-' inicial, muestra todas\n" " menos las últimas K líneas de cada fichero\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -5194,7 +5281,7 @@ msgstr "" " -v, --verbose muestra siempre las cabeceras con el nombre del\n" " fichero\n" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -5207,53 +5294,36 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024, y así sucesivamente para T, P, E, Z, " "Y.\n" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: el fichero ha encogido demasiado" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: el número de bytes es demasiado grande" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: no se puede desplazar a la posición %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: no se puede desplazar a la posición relativa %s" -# Eso de "representable" no me suena muy bien, ¿podrías explicar a qué se -# refiere?, incluso me parecen dos mensajes distintos... -# -# Pues un número, es un concepto abstracto, y su representación son -# cosas como 1, 2 3i em+ -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "número de líneas" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "número de bytes" +msgid "%s: number of bytes is too large" +msgstr "%s: el número de bytes es demasiado grande" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "el número de líneas no es válido" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "el número de bytes no es válido" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "opción inválida al final -- %c" @@ -5338,7 +5408,6 @@ msgstr "" "\n" #: src/id.c:90 -#, fuzzy msgid "" " -a ignore, for compatibility with other versions\n" " -Z, --context print only the security context of the process\n" @@ -5351,7 +5420,7 @@ msgid "" " not permitted in default format\n" msgstr "" " -a sin efecto, para compatibilidad con otras versiones\n" -" -Z, --context muestra sólo el contexto de seguridad del usuario actual\n" +" -Z, --context muestra sólo el contexto de seguridad del proceso\n" " -g, --group muestra sólo el ID de grupo\n" " -G, --groups muestra sólo los grupos suplementarios\n" " -n, --name muestra un nombre en lugar de un número, para -ugG\n" @@ -5482,7 +5551,7 @@ 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:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "falló la llamada al sistema `fork'" @@ -5623,7 +5692,6 @@ msgstr "" " van creando\n" #: src/install.c:648 -#, fuzzy msgid "" " --preserve-context preserve SELinux security context\n" " -Z set SELinux security context of destination\n" @@ -5632,9 +5700,11 @@ msgid "" " SELinux or SMACK security context to CTX\n" msgstr "" " --preserve-context conserva el contexto de seguridad de SELinux\n" -" -Z, --context=CONTEXTO establece el contexto de seguridad SELinux del\n" -" fichero de destino al tipo predeterminado,\n" -" o a CONTEXTO si se especifica\n" +" -Z establece el contexto de seguridad SELinux del\n" +" fichero de destino al tipo predeterminado\n" +" --context[=CTX] como -Z, o si se especifica CTX entonces\n" +" establece el contexto de seguridad SELinux o\n" +" SMACK a CTX\n" # Otra posibilidad sería "no se puede borrar el enlace `%s'". # Mirarlo con calma. sv @@ -5672,7 +5742,7 @@ msgstr "la opción strip no se puede usar cuando se instala un directorio" 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:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "modo inválido %s" @@ -5711,16 +5781,21 @@ msgstr "" msgid "Mike Haertel" msgstr "Mike Haertel" +#: src/join.c:195 +msgid "" +"For each pair of input lines with identical join fields, write a line to\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + # Sugerencia: no los dos a la vez -> pero no ambos. sv # ¿Pero no ambos a la vez? em # Eso es repetir el "both". sv # En lugar de `no los dos a la vez' ¿`nunca los dos a la vez'? ipg # Eso está mucho mejor em -#: src/join.c:195 +#: src/join.c:204 +#, 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" -"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" @@ -5737,7 +5812,7 @@ msgstr "" " FICHERO1 o FICHERO2\n" " -e VACÍO reemplaza los campos inexistentes por VACÍO\n" -#: src/join.c:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5752,7 +5827,7 @@ msgstr "" "en\n" " la salida\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5771,16 +5846,14 @@ msgstr "" "emparejables\n" " --nocheck-order no comprueba que la entrada está correctamente ordenada\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 -#, fuzzy +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" -" -z, --zero-terminated termina las líneas con el byte 0, no con nueva " -"línea\n" +" -z, --zero-terminated el delimitador de líneas es NUL, no nueva línea\n" # Creo que "si no, los campos se separan con CARÁCTER" es redundante, # por supuesto al igual que en la versión english. -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5821,42 +5894,42 @@ msgstr "" "Si la entrada no está ordenada y no se pueden juntar algunas líneas, se\n" "dará un mensaje de aviso.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:%: no está ordenado: %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "número de campo inválido: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "la especificación del campo no es válida: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "número de fichero inválido en la especificación del campo: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "campos de unión %lu, %lu incompatibles" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "cadenas de reemplazo de campos vacíos conflictivas" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "tab multicarácter %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "tabulaciones incompatibles" @@ -5866,7 +5939,7 @@ msgstr "tabulaciones incompatibles" # ¿¿Acaso hay sistemas con stdin1 y stdin2?? :-) # # Eso es lo de menos :) em+ -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "los dos ficheros no pueden ser a la vez la entrada estándar" @@ -5945,17 +6018,17 @@ msgstr "no se puede combinar la señal con -l o -t" msgid "no process ID specified" msgstr "no se ha especificado ningún ID de proceso" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "fallo al asignar espacio para un búfer stdio de % bytes\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "modo de búfer %s inválido para %s\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "no se pudo establecer el búfer de %s al modo %s\n" @@ -6164,7 +6237,7 @@ msgstr "no se puede usar --relative sin --symbolic" msgid "FIXME: unknown" msgstr "FIXME: desconocido" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Modo de empleo: %s [OPCIÓN]\n" @@ -6186,7 +6259,7 @@ msgstr "" # acredita con el nombre de usuario y la clave. Pero bueno, si creéis # que es mejor dejar la palabra en inglés, me callo. gerardo # No me parece mal del todo. Lo pensaré. sv -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "no hay ningún nombre de `login'" @@ -6196,7 +6269,7 @@ msgstr "no hay ningún nombre de `login'" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -6205,56 +6278,50 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" -"se descarta el valor inválido de la variable de entorno QUOTING_STYLE: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "se descarta el ancho inválido de la variable de entorno COLUMNS: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "se descarta el tamaño de `tab' inválido de la variable de entorno TABSIZE: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "ancho de línea inválido: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "tamaño del `tab' inválido: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "formato de estilo de fecha inválido %s" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "Los argumentos válidos son:\n" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr " - +FORMATO (p. ej., +%H:%M) para un formato en estilo 'date'\n" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "error al inicializar las cadenas de meses" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "prefijo no reconocido: %s" @@ -6272,38 +6339,44 @@ msgstr "prefijo no reconocido: %s" # es ininteligible... (Si de verdad no fuera analizable, no daría # error, sino que produciría un "core dump" o algo así). sv # -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "valor ininteligible para la variable de entorno LS_COLORS" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" +"se descarta el valor inválido de la variable de entorno QUOTING_STYLE: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "no se puede abrir el directorio %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "no se puede determinar el dispositivo y el nodo-i de %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: no se muestra el directorio ya mostrado" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "leyendo el directorio %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "cerrando el directorio %s" # Lo mismo de antes. -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "no se pueden comparar los nombres de fichero %s y %s" @@ -6328,7 +6401,7 @@ msgstr "no se pueden comparar los nombres de fichero %s y %s" # pero para lo que aquí se quiere decir le toca la segunda... ¿no? uac # # Eso es lo que me parece. Gracias. sv -#: src/ls.c:4781 +#: src/ls.c:4775 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" @@ -6338,7 +6411,7 @@ msgstr "" "Ordena las entradas alfabéticamente si no se especifica ninguna de las\n" "opciones -cftuvSUX ni --sort.\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -6353,7 +6426,7 @@ msgstr "" "no\n" " gráficos\n" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -6381,12 +6454,14 @@ msgstr "" " en cualquier otro caso: ordena por ctime, el\n" " más reciente primero\n" -#: src/ls.c:4804 +#: src/ls.c:4798 +#, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -6400,7 +6475,7 @@ msgstr "" " -D, --dired genera el resultado para el modo 'dired' de " "Emacs\n" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -6417,11 +6492,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time como -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr " -g como -l, pero no lista el propietario\n" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -6437,8 +6512,7 @@ msgstr "" "agrupación\n" # Se aceptan sugerencias para lo de "dummy" -#: src/ls.c:4829 -#, fuzzy +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -6447,12 +6521,13 @@ msgid "" msgstr "" " -G, --no-group en un listado largo, no muestra nombres de " "grupo\n" -" -h, --human-readable con -l, imprime los tamaños en formato legible\n" +" -h, --human-readable con -l y/o -s, muestra los tamaños en formato " +"legible\n" " (p. ej. 1K 234M 2G)\n" " -H, --si análogo, pero utiliza potencias de 1000 y no de " "1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -6474,7 +6549,7 @@ msgstr "" " con el patrón de shell PATRÓN\n" " (las opciones -a o -A tienen prioridad)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -6497,7 +6572,7 @@ msgstr "" " -k, --kibibytes utiliza bloques de 1024 bytes para el uso de " "disco\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -6516,7 +6591,7 @@ msgstr "" " -m rellena el ancho con una lista de entradas\n" " separadas por comas\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -6546,7 +6621,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:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -6570,7 +6645,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -6584,18 +6659,19 @@ 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:4886 +#: src/ls.c:4881 +#, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S ordena los ficheros por tamaño\n" " --sort=PALABRA ordena por PALABRA en vez de por nombre: none (-" @@ -6611,7 +6687,7 @@ msgstr "" "clave de\n" " ordenación si --sort=time\n" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -6639,7 +6715,7 @@ msgstr "" "fuera\n" " del local POSIX\n" -#: src/ls.c:4908 +#: src/ls.c:4904 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -6649,11 +6725,12 @@ msgstr "" " -T, --tabsize=COLS establece los topes de tabulación a cada COLS\n" " en lugar de 8\n" -#: src/ls.c:4912 +#: src/ls.c:4908 +#, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -6668,14 +6745,15 @@ msgstr "" " -v orden natural de números (de versión) dentro\n" " del texto\n" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=COLS establece el ancho de la pantalla en lugar del\n" " valor actual\n" @@ -6683,12 +6761,11 @@ msgstr "" " columnas\n" " -X ordena alfabéticamente por la extensión de la\n" " entrada\n" -" -Z, --context muestra el contexto de seguridad SELinux de " -"cada\n" -" fichero\n" +" -Z, --context muestra cualquier contexto de seguridad de\n" +" cada fichero\n" " -1 muestra un fichero por cada línea\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6703,7 +6780,7 @@ msgstr "" "terminal. La variable de entorno LS_COLORS puede cambiar las opciones.\n" "Utilice la orden dircolors para establecerla.\n" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6736,46 +6813,49 @@ msgid "David Madore" msgstr "David Madore" #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" "Modo de empleo: %s [OPCIÓN]... [FICHERO]...\n" "Muestra o comprueba sumas de comprobación %s (de %d bits).\n" "Si no se especifica FICHERO o FICHERO es -, lee la entrada estándar.\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" 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:178 -msgid " -b, --binary read in binary mode\n" +#: src/md5sum.c:180 +#, fuzzy +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary lee en modo binario\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr " --tag crea una suma de comprobación de estilo BSD\n" -#: src/md5sum.c:188 +#: src/md5sum.c:191 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:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text lee en modo de texto (por omisión)\n" @@ -6783,7 +6863,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:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -6807,14 +6887,15 @@ msgstr "" " que no están correctamente formateadas\n" "\n" -#: src/md5sum.c:206 -#, c-format +#: src/md5sum.c:209 +#, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "Las sumas se calculan tal y como se describe en %s. Al comprobar, la\n" @@ -6825,7 +6906,7 @@ msgstr "" "de entrada ('*' para binario, espacio para texto), y el nombre de cada " "FICHERO.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: demasiadas líneas de suma de comprobación" @@ -6838,14 +6919,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:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: 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:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: FALLO al abrir o leer\n" @@ -6853,7 +6934,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:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "La suma no coincide" @@ -6862,12 +6943,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:595 +#: src/md5sum.c:598 msgid "OK" msgstr "La suma coincide" # Me pregunto y no me contesto: ¿Qué podrá ser el segundo %s? -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" @@ -6881,39 +6962,39 @@ msgstr "" # "...de comprobación MD5 con formato erróneo." # # ipg: ¿y crece por allí? ¡con el frío que hace! }:-) -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "ATENCIÓN: %: línea tiene un formato erróneo" msgstr[1] "ATENCIÓN: %: líneas tienen un formato erróneo" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "ATENCIÓN: no se pudo leer % fichero listado" msgstr[1] "ATENCIÓN: no se pudieron leer % ficheros listados" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "ATENCIÓN: % suma calculada NO coincidió" msgstr[1] "ATENCIÓN: % sumas calculadas NO coincidieron" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "--tag no admite modo --text" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "" "la opción --tag sólo tiene sentido cuando se verifican sumas de comprobación" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6921,27 +7002,27 @@ msgstr "" "las opciones --binary y --text no tienen sentido cuando se verifican sumas\n" "de comprobación" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -6958,7 +7039,6 @@ msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "Crea los DIRECTORIO(s), si no existen ya.\n" #: src/mkdir.c:65 -#, fuzzy msgid "" " -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" " -p, --parents no error if existing, make parent directories as needed\n" @@ -6969,9 +7049,6 @@ msgstr "" " -p, --parents no hay error si existen, crea los directorios padres en\n" " caso necesario\n" " -v, --verbose muestra un mensaje por cada directorio creado\n" -" -Z, --context[=CTX] establece el contexto de seguridad SELinux de cada\n" -" directorio creado al tipo predeterminado o a CTX si\n" -" se especifica\n" #: src/mkdir.c:70 msgid "" @@ -6981,23 +7058,28 @@ msgid "" " --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n" " or SMACK security context to CTX\n" msgstr "" +" -Z establece el contexto de seguridad SELinux de cada\n" +" directorio creado al tipo predeterminado\n" +" --context[=CTX] como -Z, o si se especifica CTX entonces establece " +"el\n" +" contexto de seguridad SELinux o SMACK a CTX\n" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "fallo al establecer el contexto de creación predeterminado para %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" msgstr "fallo al restaurar el contexto para %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "se ha creado el directorio %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -7063,6 +7145,11 @@ msgid "" " --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n" " or SMACK security context to CTX\n" msgstr "" +" -Z establece el contexto de seguridad SELinux al tipo " +"predeterminado\n" +" --context[=CTX] como -Z, o si se especifica CTX entonces establece el " +"contexto de\n" +" seguridad SELinux o SMACK a CTX\n" # Utilizo "inválido" en lugar de "no válido", porque la palabra existe, # y no usarla es empobrecer el idioma. @@ -7256,7 +7343,7 @@ msgstr "demasiadas plantillas" msgid "with --suffix, template %s must end in X" msgstr "con --suffix, la plantilla %s debe terminar en X" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "sufijo inválido %s, contiene el separador de directorios" @@ -7402,9 +7489,8 @@ msgid "Scott Bartram" msgstr "Scott Bartram" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, with line numbers added.\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" @@ -7513,27 +7599,27 @@ msgstr "estilo de numeración de cuerpo inválido: %s" msgid "invalid footer numbering style: %s" msgstr "estilo de numeración de pie inválido: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "número de comienzo de línea inválido: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "incremento de línea inválido: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "número de líneas vacías inválido: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "ancho para el número de línea inválido: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "formato de numeración de líneas inválido: %s" @@ -7556,10 +7642,10 @@ msgstr "" "\n" #: src/nohup.c:65 -#, c-format +#, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -7577,44 +7663,44 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "fallo al establecer la salida estándar como no utilizable" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "no se tendrá en cuenta la entrada" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "se descarta la entrada y se añade la salida a %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "se añade la salida a %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "fallo al establecer que la copia de stderr se cierre al hacer `exec'" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" "se descarta la entrada y se redirige la salida de error a la salida estándar" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "se redirige la salida de error a la salida estándar" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -7641,57 +7727,52 @@ msgstr "" " --all muestra el número de procesadores instalados\n" " --ignore=N si es posible, excluye N unidades de proceso\n" -#: 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "Assaf Gordon" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "valor demasiado grande para ser convertido: %s" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, c-format msgid "invalid number: %s" msgstr "número inválido: %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "se rechaza el sufijo en la entrada: %s (considere utilizar --from)" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" msgstr "sufijo inválido en la entrada: %s" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "falta el sifijo 'i' en la entrada: %s (p. ej. Ki/Mi/Gi)" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "fallo al preparar la impresión del valor '%Lf'" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, c-format msgid "invalid unit size: %s" msgstr "tamaño de unidades inválido: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Modo de empleo: %s [OPCIÓN]... [NÚMERO]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" @@ -7699,25 +7780,28 @@ msgstr "" "Reformatea NÚMERO(s), o los números de la entrada estándar si no se " "especifica ninguno.\n" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr " --debug muestra avisos sobre entrada inválida\n" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" " -d, --delimiter=X utiliza X en lugar de espacio como delimitador de " "campos\n" -#: src/numfmt.c:827 +#: src/numfmt.c:893 +#, fuzzy msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" " --field N reemplaza el número en el campo en entrada N (1 por " "omisión)\n" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" @@ -7726,7 +7810,7 @@ msgstr "" "FORMATO.\n" " Véase FORMATO debajo para detalles.\n" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" @@ -7736,7 +7820,7 @@ msgstr "" "defecto\n" " es 'none'. Véase UNIDAD más abajo\n" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" @@ -7744,7 +7828,7 @@ msgstr "" " --from-unit=N especifica el tamaño de la unidad de entrada\n" " (en lugar del valor predeterminado que es 1)\n" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -7755,7 +7839,7 @@ msgstr "" "1.000.000\n" " (es decir, no tiene efectos en locales C/POSIX)\n" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" @@ -7764,7 +7848,7 @@ msgstr "" "cabecera;\n" " N es 1 si no se especifica\n" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" @@ -7772,7 +7856,7 @@ msgstr "" " --invalid=MODO modo de fallo para los números inválidos: MODO puede\n" " ser: abort (predeterminado), fail, warn, ignore\n" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -7789,7 +7873,7 @@ msgstr "" " Por omisión se rellena automáticamente si se\n" " encuentran espacios\n" -#: src/numfmt.c:860 +#: src/numfmt.c:927 msgid "" " --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" " up, down, from-zero (default), towards-zero, " @@ -7800,7 +7884,7 @@ msgstr "" " puede ser: up, down, from-zero (predeterminado),\n" " towards-zero, nearest\n" -#: src/numfmt.c:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" @@ -7809,19 +7893,19 @@ msgstr "" "SUFIJO\n" " opcional en los números de entrada\n" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" " --to=UNIDAD autoescala los números de salida a UNIDADes;\n" " véase UNIDAD más abajo\n" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr " --to-unit=N tamaño de la unidad de salida (en lugar de 1)\n" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" @@ -7829,11 +7913,11 @@ msgstr "" "\n" "opciones de UNIDAD:\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr " none no se autoescala; los sufijos provocan un error\n" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -7847,7 +7931,7 @@ msgstr "" " 1M = 1000000,\n" " 1Mi = 1048576,\n" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -7859,7 +7943,7 @@ msgstr "" " 1M = 1000000,\n" " ...\n" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7871,7 +7955,7 @@ msgstr "" " 1M = 1048576,\n" " ...\n" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7883,7 +7967,33 @@ msgstr "" " 1Mi = 1048576,\n" " ...\n" -#: src/numfmt.c:906 +# Pregunta: ¿por qué se ha eliminado lo de "N-ésimo byte..."? ¿Por espacio? +# Respuesta: en la posicion N = enésimo em+ +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Los rangos pueden ser:\n" +"\n" +" N El byte, carácter o campo en la posición N contado desde 1\n" +" N- A partir del byte, carácter o campo en la posición N, hasta el " +"final\n" +" de la línea\n" +" N-M Desde el byte, carácter o campo que ocupa la posición N hasta el de\n" +" la posición M\n" +" -M desde el primero hasta el byte, carácter o campo de la posición M\n" +"\n" +"Si no hay FICHERO, o cuando FICHERO es -, lee la entrada estándar.\n" + +#: src/numfmt.c:983 #, fuzzy, c-format msgid "" "\n" @@ -7892,16 +8002,18 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" "\n" "FORMATO debe ser apropiado para imprimir un argumento de coma flotante " "'%f'.\n" "La coma opcional (%'f) activará --grouping (si está soportado por el " "local).\n" -"Un valor de ancho opcional (%10f) rellenará la salida. Los valores de\n" -"ancho negativo (%-10f) rellenarán la salida por la izquierda.\n" +"Un valor de ancho opcional (%10f) rellenará la salida. Un valor de ancho\n" +"opcional cero (%010f) rellenará la salida con ceros. Los valores de\n" +"ancho negativo (%-10f) alinearán la salida por la izquierda.\n" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7922,8 +8034,8 @@ msgstr "" "y el estado de salida es 0.\n" # FIXME: Habrá que ver si eso eso es así con el local es_ES o similar -#: src/numfmt.c:922 -#, c-format +#: src/numfmt.c:1000 +#, fuzzy, c-format msgid "" "\n" "Examples:\n" @@ -7937,8 +8049,8 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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 "" @@ -7959,117 +8071,129 @@ msgstr "" " $ ls -lh | %s --header --field 5 --from=iec --padding=10\n" " $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n" -#: src/numfmt.c:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "el formato %s no tiene ninguna directiva %%" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "formato inválido %s (desbordamiento en el ancho)" -#: src/numfmt.c:1008 -#, c-format -msgid "--format padding overridding --padding" -msgstr "" +# No se entiende muy bien que digamos. sv +#: src/numfmt.c:1085 +#, fuzzy, c-format +msgid "--format padding overriding --padding" +msgstr "el relleno con --format tiene preferencia sobre --padding" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "el formato %s termina en %%" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 #, fuzzy, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" -msgstr "formato inválido %s, la directiva debe ser %%['][-][N]f" +msgid "invalid precision in format %s" +msgstr "precisión inválida: %s" + +#: src/numfmt.c:1126 +#, fuzzy, c-format +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" +msgstr "formato inválido %s, la directiva debe ser %%[0]['][-][N]f" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "el formato %s tiene demasiadas directivas %%" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, c-format msgid "invalid suffix in input %s: %s" msgstr "sufijo inválido en la entrada %s: %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, fuzzy, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" +"valor demasiado grande para ser mostrado: '%Lg' (considere utilizar --to)" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" "valor demasiado grande para ser mostrado: '%Lg' (considere utilizar --to)" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" "valor demasiado grande para ser mostrado: '%Lg' (no se pueden manejar " "valores > 999Y)" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "valor de entrada grande %s: posible pérdida de precisión" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" -"la línea de entrada es demasiado corta, no se encontraron números para " -"convertir en el campo %ld" +msgid "invalid field value %s" +msgstr "valor de campo inválido: %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, c-format msgid "invalid padding value %s" msgstr "valor de relleno inválido %s" -#: src/numfmt.c:1417 -#, c-format -msgid "invalid field value %s" -msgstr "valor de campo inválido: %s" +#: src/numfmt.c:1646 +#, fuzzy, c-format +msgid "multiple field specifications" +msgstr "%s: especificación de campo inválida %s" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, c-format msgid "invalid header value %s" msgstr "valor de cabecera inválido %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "..grouping no se puede combinar con --format" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "no se ha especificado ninguna opción de conversión" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "grouping no se puede combinar con --to" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "grouping no tiene ningún efecto en este local" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "no se tiene en cuenta --header con la entrada de la línea de órdenes" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "error al leer la entrada" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "fallo al convertir alguno de los números de entrada" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -8085,14 +8209,13 @@ msgstr "" # Creo que si pones `-' en vez de -, deberías consultarlo primero con # el autor. Además, no lo has cambiado en todas partes. sv+ -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Escribe una representación inequívoca, por defecto en base ocho, de FICHERO\n" @@ -8100,8 +8223,10 @@ msgstr "" "entrada estándar.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 +#, 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" @@ -8118,8 +8243,7 @@ msgstr "" "hexadecimal, los sufijos pueden ser . para octal y b para bloques\n" "de 512 bytes.\n" -#: src/od.c:344 -#, fuzzy +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -8131,10 +8255,12 @@ msgstr "" "fichero;\n" " BASE es uno de [doxn], para decimal, octal,\n" " hexadecimal o ninguno\n" +" --endian={big|little} intercambia bytes de entrada según el orden " +"especificado\n" " -j, --skip-bytes=BYTES descarta los primeros BYTES bytes de cada " "fichero\n" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -8159,7 +8285,7 @@ msgstr "" " predeterminado es 32\n" " --traditional acepta los argumentos en formato tradicional\n" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -8181,7 +8307,7 @@ msgstr "" " -d lo mismo que -t u2, selecciona unidades decimales de 2 bytes sin " "signo\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -8197,7 +8323,7 @@ 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:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -8211,7 +8337,7 @@ msgstr "" " a un determinado carácter, descartando el bit más significativo\n" " c carácter imprimible o secuencia de escape\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -8225,7 +8351,7 @@ msgstr "" " u[TAMAÑO] decimal sin signo, TAMAÑO bytes por cada entero\n" " x[TAMAÑO] hexadecimal, TAMAÑO bytes por cada entero\n" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -8241,7 +8367,7 @@ msgstr "" "`sizeof(float)',\n" " D para `sizeof(double)' ó L para `sizeof(long double)'.\n" -#: src/od.c:401 +#: src/od.c:404 msgid "" "\n" "Adding a z suffix to any type displays printable characters at the end of\n" @@ -8251,7 +8377,7 @@ msgstr "" "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:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -8273,12 +8399,12 @@ msgstr "" " M 1024*1024\n" "y así sucesivamente para G, T, P, E, Z, Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "tipo de cadena inválido %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -8287,7 +8413,7 @@ msgstr "" "tipo de cadena inválido %s;\n" "este sistema no posee el tipo de entero de %lu bytes" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -8296,12 +8422,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:869 +#: src/od.c:872 #, 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:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "" @@ -8309,27 +8435,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:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "no se puede especificar tipo cuando se vuelcan cadenas" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "el modo de compatibilidad admite un fichero como mucho" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "skip-bytes + read-bytes es demasiado grande" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "atención: ancho %lu inválido; se usará %d en su lugar" @@ -8345,10 +8471,10 @@ 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" msgstr "" "Escribe secuencialmente en la salida estándar cada línea de los FICHEROs\n" "especificados, separadas por tabuladores.\n" @@ -8499,12 +8625,12 @@ msgstr "Cuándo" msgid "Where" msgstr "Dónde" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Modo de empleo: %s [OPCIÓN]... [USUARIO]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -8522,7 +8648,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:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -8537,7 +8663,7 @@ msgstr "" " -q omite el nombre completo del usuario, el `host' remoto\n" " y el tiempo inactivo en formato corto\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -8548,7 +8674,7 @@ msgstr "" "Un programa 'finger' sencillo; muestra información del usuario.\n" "El fichero utmp será %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -8556,94 +8682,94 @@ msgstr "" "menos uno cuando se usa -l" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "'--pages=PRIMERA_PÁGINA[:ÚLTIMA_PÁGINA]' falta un argumento" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "rango de páginas inválido %s" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "'-l LONGITUD_PÁGINA' el número de líneas no es válido: %s" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "'-N NÚMERO' número de comienzo de línea inválido: %s" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "'-o MARGEN' el desplazamiento de línea no es válido: %s" -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "'-w ANCHO_PÁGINA' número inválido de caracteres: %s" -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "'-W ANCHO_PÁGINA' número de caracteres inválido: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, 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:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "ancho de página demasiado estrecho" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" "el número de página de comienzo % sobrepasa el número de páginas " "%" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "desbordamiento del número de página" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Página %" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "Pagina o encolumna FICHERO(s) para su impresión.\n" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -8660,7 +8786,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:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -8678,7 +8804,7 @@ msgstr "" " -d, --double-space\n" " salida con espaciado doble\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -8702,7 +8828,7 @@ msgstr "" " líneas con -f o una cabecera y una cola de 5 líneas sin -" "F)\n" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -8727,11 +8853,26 @@ msgstr "" "string[=CADENA]\n" " establece los separadores\n" -#: src/pr.c:2798 +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l, --length=LONG_PÁGINA\n" +" establece la longitud de la página en el número " +"indicado\n" +" por defecto 66, o 56 si se especifica -F 63\n" +" -m, --merge muestra todos los ficheros en paralelo, uno en cada " +"columna,\n" +" trunca líneas, pero une líneas de longitud completa con -" +"J\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -8744,7 +8885,7 @@ msgstr "" " trunca líneas, pero une líneas de longitud completa con -" "J\n" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -8762,7 +8903,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:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -8777,8 +8918,7 @@ msgstr "" " -r, --no-file-warnings\n" " omite el aviso cuando no se puede abrir un fichero\n" -#: src/pr.c:2820 -#, fuzzy +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -8795,14 +8935,14 @@ 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:2828 +#: src/pr.c:2802 +#, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -S[CADENA], --sep-string[=CADENA]\n" " separa las columnas mediante CADENA,\n" @@ -8811,7 +8951,13 @@ msgstr "" " no hay ningún efecto en las opciones de columnas\n" " -t, --omit-header no muestra cabeceras ni colas\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -8836,7 +8982,7 @@ msgstr "" "varias\n" " columnas, -s[car] lo desactiva (72)\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -8851,17 +8997,6 @@ msgstr "" " se usa la opción -J, no interfiere con las opciones -S o " "-s\n" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"-t es implícito si LONGITUD_PÁGINA <= 10. Si no se especifica ningún " -"FICHERO,\n" -"o cuando FICHERO es -, lee la entrada estándar.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -8876,10 +9011,9 @@ msgstr "" "todas ellas.\n" #: src/printenv.c:69 -#, fuzzy msgid " -0, --null end each output line with NUL, not newline\n" msgstr "" -" -0, --null termina cada línea por un byte 0 en vez de nueva línea\n" +" -0, --null termina cada línea de salida con NUL, no con nueva línea\n" #: src/printf.c:79 #, c-format @@ -9095,11 +9229,11 @@ 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:1830 +#: src/ptx.c:1831 +#, fuzzy 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 muestra automáticamente las referencias\n" " generadas\n" @@ -9109,6 +9243,12 @@ msgstr "" #: src/ptx.c:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -9127,7 +9267,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:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -9149,7 +9289,7 @@ msgstr "" " -o, --only-file=ARCHIVO lee la lista de palabras a mantener de\n" " ARCHIVO\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -9162,20 +9302,16 @@ msgstr "" " -w, --width=NÚMERO anchura de la salida en columnas,\n" " excluyendo referencias\n" -#: src/ptx.c:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Sin FICHERO, o cuando FICHERO es -, lee la entrada estándar. Por omisión es " -"'-F /'.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "ancho de salto inválido: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "ancho de línea inválido: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -9198,13 +9334,15 @@ msgid "" "\n" "If no option is specified, -P is assumed.\n" msgstr "" +"\n" +"Si no se especifica ninguna opción, se supone -P.\n" #: src/pwd.c:169 #, c-format msgid "failed to chdir to %s" msgstr "fallo al cambiar a %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "fallo al efectuar stat sobre %s" @@ -9226,8 +9364,8 @@ msgstr "los argumentos que no son opciones no serán tenidos en cuenta" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Modo de empleo: %s [OPCIÓN]... FICHERO...\n" @@ -9265,7 +9403,6 @@ 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 " @@ -9286,8 +9423,8 @@ msgstr "" " -q, --quiet,\n" " -s, --silent suprime la mayor parte de mensajes de error\n" " -v, --verbose muestra los mensajes de error\n" -" -z, --zero separate la salida con NUL en vez de nueva " -"línea\n" +" -z, --zero termina cada línea de salida con NUL, no con " +"nueva línea\n" #: src/readlink.c:152 #, c-format @@ -9305,7 +9442,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" @@ -9332,7 +9468,7 @@ msgstr "" "por\n" " debajo de FICHERO\n" " -s, --strip, --no-symlinks no expande los enlaces simbólicos\n" -" -z, --zero separa la salida con NULs en vez de con\n" +" -z, --zero termina cada línea de salida con NUL, no con\n" " caracteres de nueva línea\n" #: src/relpath.c:130 @@ -9518,9 +9654,9 @@ msgstr "" # SIoNO #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: ¿borrar el argumento %zu argument recursivamente? (s/n) " msgstr[1] "%s: ¿borrar los argumentos %zu recursivamente? (s/n) " @@ -9530,9 +9666,9 @@ msgstr[1] "%s: ¿borrar los argumentos %zu recursivamente? (s/n) " # # SIoNO #: src/rm.c:345 -#, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +#, fuzzy, c-format +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: ¿borrar el argumento %zu? (s/n) " msgstr[1] "%s: ¿borrar los argumentos %zu? (s/n) " @@ -9761,12 +9897,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "argumento de coma flotante inválido: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "el formato %s tiene una directiva %%%c desconocida" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -9787,7 +9923,16 @@ msgstr "" "difícil\n" "la recuperación de los datos incluso utilizando hardware muy costoso.\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Si un FICHERO es -, copia de nuevo a la salida estándar.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -9802,7 +9947,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:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -9820,11 +9965,10 @@ msgstr "" " -z, --zero añade una sobreescritura final con ceros para ocultar la\n" " acción de esta orden\n" -#: src/shred.c:192 +#: src/shred.c:196 +#, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -9851,7 +9995,7 @@ msgstr "" "costoso.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -9872,7 +10016,7 @@ msgstr "" "que sea efectivo en todos los modos de sistemas de ficheros:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -9894,7 +10038,7 @@ msgstr "" "Network Appliance\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -9907,7 +10051,7 @@ msgstr "" "\n" "* sistemas de ficheros comprimidos\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -9928,7 +10072,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:241 +#: src/shred.c:243 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" @@ -9939,127 +10083,127 @@ msgstr "" "un\n" "fichero al que se le haya hecho shred.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync falló" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync falló" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: no se puede rebobinar" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: paso %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: error al escribir en el desplazamiento %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek falló" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: fichero demasiado grande" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: paso %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: paso %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: fallo en `fstat'" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: tipo de fichero inválido" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: el fichero tiene un tamaño negativo" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: error al truncar" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl falló" -#: src/shred.c:994 +#: src/shred.c:996 #, 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:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: borrando" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: renombrado a %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: fallo al borrar" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: borrado" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: fallo al cerrar" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: fallo al abrir para escritura" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: número inválido de pasos" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "se han especificado varios ficheros de origen" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: tamaño de fichero inválido" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -10070,14 +10214,13 @@ msgstr "" " o bien: %s -e [OPCIÓN]... [ARGUMENTO]...\n" " o bien: %s -i IN-SU [OPCIÓN]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 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:73 -#, fuzzy +#: src/shuf.c:75 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 " @@ -10095,43 +10238,41 @@ msgstr "" " salida estándar\n" " --random-source=FICHERO obtiene bytes aleatorios de FICHERO\n" " -r, --repeat las líneas de salida se pueden repetir\n" -" -z, --zero-terminated termina las líneas con un byte 0, no con nueva " -"línea\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "demasiadas líneas de entrada" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "se han especificado varias opciones -i" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "rango de entrada inválido %s" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "contador de líneas inválido %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "se han especificado varios ficheros de salida" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "no se pueden combinar las opciones -e y -i" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" -msgstr "" +msgstr "no hay líneas que repetir" #: src/sleep.c:44 #, c-format @@ -10157,12 +10298,12 @@ msgstr "" "de tiempo especificada por la suma de sus valores.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "intervalo de tiempo inválido %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "no se puede leer el reloj de tiempo real" @@ -10173,7 +10314,7 @@ msgstr "" "Muestra la concatenación ordenada de todos los FICHERO(s) en la salida\n" "estándar.\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -10181,7 +10322,7 @@ msgstr "" "Opciones de ordenación:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -10193,7 +10334,7 @@ msgstr "" " y los espacios\n" " -f, --ignore-case convierte las minúsculas en mayúsculas\n" -#: src/sort.c:443 +#: src/sort.c:444 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -10204,14 +10345,14 @@ msgstr "" " -i, --ignore-nonprinting considera solamente caracteres imprimibles\n" " -M, --month-sort compara (desconocido) < 'JAN' < ... < 'DEC'\n" -#: src/sort.c:448 +#: src/sort.c:449 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:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -10224,7 +10365,7 @@ msgstr "" " --random-source=FICHERO obtiene bytes aleatorios de FICHERO\n" " -r, --reverse invierte el resultado de las comparaciones\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -10241,7 +10382,7 @@ msgstr "" "dentro\n" " del texto\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -10249,7 +10390,7 @@ msgstr "" "Otras opciones:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -10257,7 +10398,7 @@ msgstr "" " --batch-size=NCOMBI combina como mucho NCOMBI entradas cada vez;\n" " para más use ficheros temporales\n" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -10273,7 +10414,7 @@ msgstr "" " --compress-program=PROG comprime temporales con PROG;\n" " los descomprime con PROG -d\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -10291,7 +10432,7 @@ msgstr "" " Si F es - entonces lee los nombre de la entrada\n" " estándar\n" -#: src/sort.c:487 +#: src/sort.c:488 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -10305,7 +10446,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:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -10319,7 +10460,7 @@ msgstr "" " -S, --buffer-size=TAMAÑO utiliza TAMAÑO para el búfer de memoria " "principal\n" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -10345,7 +10486,7 @@ msgstr "" " sin -c; muestra solamente la primera de\n" " una tanda igual\n" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -10379,12 +10520,11 @@ msgstr "" "\n" "TAMAÑO puede estar seguido por lo siguientes sufijos multiplicativos:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -10400,108 +10540,108 @@ 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:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "esperando a %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] terminó anormalmente" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "no se puede crear un fichero temporal en %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "fallo al abrir" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "fflush falló" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "error al cerrar" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "no se pudo crear un fichero temporal" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "no se pudo crear el proceso para %s -d" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "atención: no se puede borrar: %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "argumento --%s inválido %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, 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:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "el argumento --%s %s es demasiado grande" -#: src/sort.c:1359 +#: src/sort.c:1358 #, 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:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "el número en paralelo debe ser distinto de cero" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "fallo en `stat'" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "fallo al leer" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "la transformación de cadenas falló" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "la cadena sin transformar era %s." -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "^ no hay ninguna coincidencia para la clave\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, 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:2428 +#: src/sort.c:2427 #, 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:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" @@ -10509,143 +10649,142 @@ msgstr "" "especificar\n" "también 'b'" -#: src/sort.c:2452 +#: src/sort.c:2451 #, 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:2484 +#: src/sort.c:2483 #, 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:2490 +#: src/sort.c:2489 #, 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:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "error al escribir" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: fuera de secuencia: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "salida de error estándar" # FIXME: ¿Por qué no "fork system call failed", como antes? -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "no se puede leer" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: especificación de campo inválida %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "las opciones '-%s' son incompatibles" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: contador inválido al comienzo de %s" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "número inválido después de '-'" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "número inválido después de '.'" # No estoy muy seguro. Comprobar. -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "carácter extraño en el especificador de campo" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "se han especificado varios programas de compresión" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "número inválido al comienzo del campo" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "el número de campo es cero" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "el desplazamiento de caracteres es cero" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" msgstr "número inválido después de ','" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "tabulación vacía" # Lo mismo de antes. -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "no se pueden leer los nombres de fichero de %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: nombre de fichero de longitud cero inválido" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "no hay entrada desde %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "se utilizan las reglas de ordenación %s" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "se utiliza la comparación simple de bytes" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "el operando extra %s no está permitido con -%c" -#: src/split.c:186 -#, c-format -msgid "the suffix length needs to be at least %zu" +#: src/split.c:207 +#, fuzzy, c-format +msgid "the suffix length needs to be at least %" msgstr "la longitud del sufijo debe ser al menos %zu" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Modo de empleo: %s [OPCIÓN]... [ENTRADA [PREFIJO]]\n" -#: src/split.c:207 +#: src/split.c:228 +#, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\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" @@ -10654,21 +10793,24 @@ msgstr "" # FIXME: ¿Ahora dos espacios es el estándar para mensajes de continuación? # (before each output file...) -#: src/split.c:215 -#, c-format +#: src/split.c:236 +#, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file names\n" " -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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" " -a, --suffix-length=N utiliza sufijos de longitud N (por omisión %d)\n" @@ -10689,7 +10831,7 @@ msgstr "" " -u, --unbuffered copia inmediatamente la entrada a la salida\n" " con '-n r/...'\n" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -10697,16 +10839,17 @@ msgstr "" " --verbose muestra un diagnóstico justo antes de abrir cada\n" " fichero\n" -#: src/split.c:235 +#: src/split.c:258 +#, fuzzy 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" "\n" "TROZOS puede ser:\n" @@ -10718,176 +10861,181 @@ 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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "se han agotado los sufijos para los ficheros de salida" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "creando fichero %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "%s sobreescribiría la entrada; abortando" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "fallo al establecer la variable de entorno FILE" -#: src/split.c:392 +#: src/split.c:446 #, 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:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "fallo al crear tubería" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "cerrando la tubería anterior" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "cerrando la tubería de salida" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "moviendo la tubería de entrada" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "cerrando la tubería de entrada" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "fallo al ejecutar la orden: \"%s -c %s" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "fallo al cerrar la tubería de entrada" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "esperando al proceso hijo" -#: src/split.c:473 +#: src/split.c:527 #, 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:481 +#: src/split.c:535 #, 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:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "estado desconocido de la orden (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "no se puede trocear de varias formas distintas" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: número de trozos inválido" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: número de trozo inválido" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: longitud del sufijo inválida" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: número de bytes inválido" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: número de líneas inválido" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "tab multicarácter %s" -#: src/split.c:1286 +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "fichero especial de caracteres multiplexado" + +#: src/split.c:1383 #, 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:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: valor de comienzo inválido para el sufijo numérico" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: tamaño de bloque de E/S inválido" -#: src/split.c:1347 +#: src/split.c:1437 #, 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:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" "el valor de comienzo del sufijo numérico es demasiado grande para la " "longitud del sufijo" -#: src/split.c:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "fallo al canonicalizar %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "atención: escape no reconocido '\\%c'" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: directiva inválida" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "atención: barra invertida al final del formato" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" @@ -10895,19 +11043,19 @@ msgstr "" "de\n" "ficheros" -#: src/stat.c:1269 +#: src/stat.c:1272 #, 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:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -10923,7 +11071,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -10933,7 +11081,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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," @@ -10941,24 +11089,24 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "Contexto: %C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -10970,11 +11118,11 @@ msgstr "" " Cambio: %z\n" " Creación: %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "Muestra el estado del fichero o del sistema de ficheros.\n" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" @@ -10984,7 +11132,7 @@ msgstr "" "del\n" " estado del fichero\n" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -11004,7 +11152,7 @@ msgstr "" " línea, incluya \\n en el FORMATO\n" " -t, --terse muestra la información de manera escueta\n" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -11024,7 +11172,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:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -11040,7 +11188,7 @@ msgstr "" " %g ID del grupo del propietario\n" " %G nombre de grupo del propietario\n" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -11067,8 +11215,7 @@ msgstr "" "especiales\n" " de caracteres o dispositivos de bloques\n" -#: src/stat.c:1461 -#, fuzzy +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -11088,12 +11235,12 @@ msgstr "" " %W fecha de creación, segundos desde la Época, 0 si es desconocido\n" " %x fecha de último acceso, formato legible\n" " %X fecha de último acceso, segundos desde la Época\n" -" %y fecha de última modificación, formato legible\n" -" %Y fecha de última modificación, segundos desde la Época\n" -" %z fecha de último cambio, formato legible\n" -" %Z fecha de último cambio, segundos desde la Época\n" +" %y fecha de última modificación en los datos, formato legible\n" +" %Y fecha de última modificación en los datos, segundos desde la Época\n" +" %z fecha de último cambio en el estado, formato legible\n" +" %Z fecha de último cambio en el estado, segundos desde la Época\n" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -11111,7 +11258,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:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -11186,11 +11333,11 @@ msgstr "" "con el tamaño del búfer establecido en MODO bytes.\n" #: src/stdbuf.c:116 +#, fuzzy msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" -"for e.g.) then that will override corresponding settings changed by " -"'stdbuf'.\n" +"for example) then that will override corresponding changes 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 "" @@ -11222,7 +11369,7 @@ msgstr "no tiene sentido un búfer de línea con la entrada estándar" msgid "you must specify a buffering mode option" msgstr "debe especificar una opción para el modo de búfer" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -11233,7 +11380,7 @@ msgstr "" " o bien: %s [-F DISPOSITIVO | --file=DISPOSITIVO] [-a|--all]\n" " o bien: %s [-F DISPOSITIVO | --file=DISPOSITIVO] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "Muestra o establece las características de la terminal\n" @@ -11243,7 +11390,7 @@ msgstr "Muestra o establece las características de la terminal\n" # FIXME. Comunicar primero al autor. sv+ # Sistema subyacente ?? , mejor dejar 'sistema' a secas em+ # Depende, ¿qué ocurre con los compiladores cruzados? -#: src/stty.c:528 +#: src/stty.c:536 msgid "" " -a, --all print all current settings in human-readable form\n" " -g, --save print all current settings in a stty-readable form\n" @@ -11256,7 +11403,7 @@ msgstr "" " -F, --file=DISP abre y utiliza el DISPositivo especificado en lugar de la\n" " entrada estándar\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -11266,14 +11413,27 @@ msgstr "" "Un - opcional antes de VALOR indica negación. Un * marca valores no POSIX.\n" "El sistema subyacente define qué valores están disponibles.\n" -# Contexto del shell ? , ¿qué es eso? em+ -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * 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 "" + +# Contexto del shell ? , ¿qué es eso? em+ +#: src/stty.c:561 +#, fuzzy +msgid "" +" eof CHAR CHAR will send an end of file (terminate the input)\n" +" eol CHAR CHAR will end the line\n" msgstr "" "\n" "Caracteres especiales:\n" @@ -11283,9 +11443,13 @@ 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -11295,37 +11459,60 @@ 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:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" msgstr "" -" * lnext CAR el CARácter introducirá el siguiente carácter comentado\n" -" quit CAR el CARácter enviará una señal de salida\n" -" * rprnt CAR el CARácter redibujará la línea actual\n" -" start CAR el CARácter reiniciará la salida después de haberla " -"detenido\n" -#: src/stty.c:559 +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 CAR el CARácter detendrá la salida\n" " susp CAR el CARácter enviará una señal de alto a la terminal\n" " * swtch CAR el CARácter establecerá un contexto diferente de shell\n" " * werase CAR el CARácter borrará la última palabra tecleada\n" +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + # FIXME: Falta un espacio ¿? -#: src/stty.c:565 +#: src/stty.c:608 +#, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Valores especiales:\n" +" N establece la velocidad de entrada y salida a N baudios\n" +" * cols N dice al núcleo que la terminal tiene N columnas\n" +" * columns N igual que cols N\n" + +# FIXME: Falta un espacio ¿? +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -11335,10 +11522,17 @@ msgstr "" " * cols N dice al núcleo que la terminal tiene N columnas\n" " * columns N igual que cols N\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -11349,11 +11543,23 @@ msgstr "" " lectura completada\n" " ospeed N establece la velocidad de salida a N\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N dice al núcleo que la terminal tiene N líneas\n" +" * size muestra el número de líneas y columnas de acuerdo con el " +"núcleo\n" +" speed muestra la velocidad de la terminal\n" +" time N con -icanon, establece el tiempo fuera de lectura en N\n" +" décimas de segundo\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -11364,27 +11570,30 @@ msgstr "" " time N con -icanon, establece el tiempo fuera de lectura en N\n" " décimas de segundo\n" -#: src/stty.c:584 +#: src/stty.c:641 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" -"Valores de control:\n" -" [-]clocal desactiva las señales de control del módem\n" -" [-]cread permite que se reciba entrada\n" -" * [-]crtscts permite negociación RTS/CTS\n" -" * [-]cdtrdsr permite negociación DTR/DSR\n" -" csN establece el tamaño del carácter en N bits, N en [5..8]\n" + +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" # ## en -cread -> permite que se reciba entrada # ## vale. -#: src/stty.c:593 +#: src/stty.c:660 +#, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -11392,7 +11601,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb utiliza dos bits de paro por carácter (uno con '-')\n" " [-]hup manda una señal de colgar cuando el último proceso cierra\n" @@ -11403,7 +11611,12 @@ msgstr "" " [-]parodd establece paridad impar (o paridad par con '-')\n" " * [-]cmspar utiliza paridad \"stick\" (marca/espacio)\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -11411,6 +11624,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Valores de entrada:\n" @@ -11419,10 +11633,14 @@ msgstr "" " [-]ignbrk descarta los caracteres de `break'\n" " [-]igncr descarta los retornos de carro\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -11435,14 +11653,23 @@ 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:616 +#: src/stty.c:692 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:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr " * [-]iutf8 supone que los caracteres de entrada son UTF-8\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -11457,65 +11684,86 @@ msgstr "" "255-0)\n" " [-]tandem igual que [-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Valores de salida:\n" -" * bsN estilo de retardo de retroceso, N en [0..1]\n" -" * crN estilo de retardo de retorno de carro, N en [0..3]\n" -" * 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:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" -msgstr "" -" * [-]ocrnl traduce retorno de carro a nueva línea\n" -" * [-]ofdel utiliza caracteres de borrado para relleno en lugar de\n" -" caracteres nulos\n" -" * [-]ofill utiliza caracteres de relleno en lugar de tiempo para " -"retardos\n" -" * [-]olcuc traduce caracteres en minúscula a mayúscula\n" -" * [-]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:643 -msgid "" -" * [-]onocr do not print carriage returns in the first column\n" -" [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 +msgid "" " * 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 "" -" * [-]onocr no muestra retornos de carro en la primera columna\n" -" [-]opost postprocesa salida\n" -" * tabN estilo de retardo de tabulador horizontal, N en [0..3]\n" -" * tabs igual que tab0\n" -" * -tabs igual que tab3\n" -" * vtN estilo de retardo de tabulador vertical, N en [0..1]\n" -# 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:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +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:792 +#, fuzzy +msgid "" " * 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 "" @@ -11526,45 +11774,63 @@ 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +#, fuzzy +msgid " [-]echo echo input characters\n" +msgstr " * [-]iutf8 supone que los caracteres de entrada son UTF-8\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]ctlecho repite los caracteres de control en notación gorro ('^c')\n" -" [-]echo repite los caracteres de entrada\n" -" * [-]echoctl igual que [-]ctlecho\n" -" [-]echoe igual que [-]crterase\n" -" [-]echok repite una nueva línea después de un carácter de matar\n" -#: src/stty.c:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]echoke igual que [-]crtkill\n" -" [-]echonl repite nueva línea aún si no está repitiendo otros " -"caracteres\n" -" * [-]echoprt repite los caracteres borrados en orden inverso, entre\n" -" '\\' y '/'\n" -" [-]icanon permite los caracteres especiales erase, kill, werase,\n" -" y rprnt\n" -" [-]iexten permite caracteres especiales no-POSIX\n" +" [-]isig permite los caracteres especiales interrupt, quit, y " +"suspend\n" +" [-]noflsh no permite limpieza después de los caracteres especiales\n" +" interrupt y quit\n" +" * [-]prterase igual que [-]echoprt\n" +" * [-]tostop detiene trabajos en `background' que tratan de escribir a\n" +" la terminal\n" +" * [-]xcase con icanon, escapa con '\\' para caracteres en mayúscula\n" -#: src/stty.c:672 +#: src/stty.c:843 +#, fuzzy 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 "" " [-]isig permite los caracteres especiales interrupt, quit, y " "suspend\n" @@ -11575,11 +11841,33 @@ msgstr "" " la terminal\n" " * [-]xcase con icanon, escapa con '\\' para caracteres en mayúscula\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -11589,40 +11877,50 @@ msgstr "" " cbreak igual que -icanon\n" " -cbreak igual que icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 igual que caracteres brkint ignpar istrip icrnl ixon\n" " opost isig icanon, eof y eol a sus valores por omisión\n" " -cooked igual que raw\n" " crt igual que echoe echoctl echoke\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -" dec igual que echoe echoctl echoke -ixany intr ^c erase 0177\n" -" kill ^u\n" -" * [-]decctlq igual que [-]ixany\n" -" ek caracteres erase y kill a sus valores por omisión\n" -" evenp igual que parenb -parodd cs7\n" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 +#, fuzzy 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 "" " -evenp igual que -parenb cs8\n" " * [-]lcase igual que xcase iuclc olcuc\n" @@ -11631,7 +11929,19 @@ msgstr "" " nl igual que -icrnl -onlcr\n" " -nl igual que icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"Valores de combinación:\n" +" * [-]LCASE igual que [-]lcase\n" +" cbreak igual que -icanon\n" +" -cbreak igual que icanon\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -11645,11 +11955,12 @@ msgstr "" " pass8 igual que -parenb -istrip cs8\n" " -pass8 igual que parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw igual que -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" @@ -11657,14 +11968,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw igual que cooked\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane igual que cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -11673,7 +11985,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, y todos los\n" " caracteres especiales a sus valores por omisión.\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -11688,12 +12000,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:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "sólo se puede especificar un dispositivo" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -11702,46 +12014,51 @@ msgstr "" "las opciones para estilos de salida explícitos y legibles para terminal son\n" "mutuamente excluyentes" -#: src/stty.c:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: no se pudo reiniciar el modo `non-blocking'" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "argumento inválido %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "falta el argumento de %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: error al truncar" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "disciplina de línea inválida %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: no se pudieron realizar todas las operaciones solicitadas" -#: src/stty.c:1403 +#: src/stty.c:1747 #, 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:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "argumento entero inválido %s" #. This is a proper name. See the gettext manual, section Names. @@ -11749,11 +12066,48 @@ msgstr "argumento entero inválido %s" msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" +# ¿¿?? ¿¿Porqué has reformateado para que tengan la misma longitud? ipg +# Me parece que queda más bonito, después de instalar el .po y ver +# un par de mensajes tal y como aparecían creí necesario formatearlo +# un poco. Todavía no hay una regla de formateo oficial para GNU, pero +# es de esperar que dentro de poco la haya. em+ +# +# A mí, la verdad, se me hace harto difícil leer con más de un espacio +# entre medias ... *lo odio* ;). ipg +# +# A ver qué os parece la siguiente regla, nunca la había escrito, pero no +# me la acabo de inventar, creo que es la regla implícita que he estado +# usando desde el principio: +# +# Regla de formateo: Ninguna línea excederá de 80 columnas. Cuando haya un +# especificador de formato (tal y como %s) se debe tener en cuenta que +# resultará sustituido por una palabra cuya longitud habrá que estimar. +# +# Hay algunas que pueden ser más largas aposta, porque sean reformateadas +# a pelo. Además, en muchos casos será casi imposible hacer una estimación. +# ipg +# +# En los textos que explican para qué sirve cada opción, se respetará en la +# medida de lo posible la distancia de tabulación del original. Solamente está +# justificado cambiar dicha distancia cuando haya dificultad en respetar +# el límite de 80 columnas. +# +# Ok. ipg +# +# De acuerdo con la regla, *no* está justificado disminuir la distancia +# en la siguiente cadena, así que la dejo como el original. sv +#: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Muestra la suma de comprobación CRC y el número de bytes de cada FICHERO.\n" +"\n" + # usa bloques -> con bloques ... así no se repite tanto :) ipg # Creo que está bien así em+ -#: src/sum.c:62 +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -11764,20 +12118,54 @@ msgstr "" " -s, --sysv usa el algoritmo de sum de System V, con bloques de 512 " "bytes\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, fuzzy, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Modo de empleo: %s [OPCIÓN]... [FICHERO]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Guarda los bloques cambiados en el disco, actualiza el superbloque.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "error al leer %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: no se pudo reiniciar el modo `non-blocking'" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "error al leer %s" -#: src/sync.c:69 +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "no se tendrá en cuenta ningún argumento" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -11807,15 +12195,23 @@ msgstr "" # dejarlo (daño no hace, eso sí es verdad) ipg # # Lo dejaremos para otra ocasión. Ya os avisaré. sv -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help muestra esta ayuda y finaliza\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version informa de la versión y finaliza\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Sin FICHERO, o cuando FICHERO es -, lee la entrada estándar.\n" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -11825,8 +12221,7 @@ msgstr "" "obligatorios\n" "para las opciones cortas.\n" -#: src/system.h:551 -#, fuzzy +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -11834,11 +12229,12 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" "\n" -"TAM es un entero y una unidad opcional (ejemplo: 10M es 10*1024*1024). Las\n" -"unidades son K, M, G, T, P, E, Z, Y (potencias de 1024) o KB, MB, ...\n" -"(potencias de 1000).\n" +"El argumento TAM es un entero y una unidad opcional (ejemplo: 10M es " +"10*1024*1024).\n" +"Las unidades son K,M,G,T,P,E,Z,Y (potencias de 1024) o KB,MB, ... (potencias " +"de 1000).\n" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -11853,7 +12249,7 @@ msgstr "" "En caso contrario, las unidades son 1024 bytes (o 512 si se ha\n" "establecido POSIXLY_CORRECT).\n" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -11867,22 +12263,24 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" "Informe de errores de traducción en %s a \n" -# Nota: En este caso es importante usar apóstrofos como en el original, -# pues es para escribirlo literalmente en la línea de órdenes. -#: src/system.h:584 +#: src/system.h:604 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "Full documentation at: <%s%s>\n" msgstr "" -"Para la documentación completa, ejecute: info coreutils '%s invocation'\n" -#: src/system.h:591 +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "" + +#: src/system.h:613 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Pruebe '%s --help' para más información.\n" @@ -11895,7 +12293,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:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -11916,9 +12314,8 @@ msgid "Jay Lepreau" msgstr "Jay Lepreau" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, last line first.\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" @@ -11937,37 +12334,37 @@ msgstr "" "de\n" " línea\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: seek falló" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "registro demasiado grande" -#: src/tac.c:450 +#: src/tac.c:459 #, c-format msgid "failed to create temporary file in %s" msgstr "fallo al crear un fichero temporal en %s" -#: src/tac.c:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" msgstr "fallo al abrir %s para escritura" -#: src/tac.c:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" msgstr "fallo al rebobinar el flujo para %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: error de escritura" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "fallo al abrir %s para lectura" @@ -11983,28 +12380,27 @@ msgstr "fallo al 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:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "el separador no puede ser nulo" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 -#, c-format +#: src/tail.c:257 +#, 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" 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" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" @@ -12013,7 +12409,7 @@ msgstr "" " para mostrar los bytes que comienzan en\n" " el K-ésimo de cada fichero\n" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -12024,7 +12420,7 @@ msgstr "" " sin opción significa 'descriptor'\n" " -F lo mismo que --follow=name --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -12047,7 +12443,7 @@ msgstr "" " de registro que rotan); con inotify, esta opción\n" " raramente es útil\n" -#: src/tail.c:293 +#: src/tail.c:288 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -12060,7 +12456,7 @@ msgstr "" " --retry sigue intentando abrir el fichero si es " "inaccesible\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -12075,7 +12471,7 @@ msgstr "" " menos una vez cada N segundos\n" " -v, --verbose presenta siempre las cabeceras para cada fichero\n" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -12095,7 +12491,7 @@ msgstr "" "Y.\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -12116,22 +12512,22 @@ msgstr "" "borrado o recreado por algún otro programa.\n" # df=descriptor de fichero, por supuesto... sv -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "cerrando %s (df=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, 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:898 +#: src/tail.c:893 #, 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:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -12140,157 +12536,158 @@ msgstr "" "tipo de sistema de ficheros 0x%08lx no reconocido para %s. Por favor informe " "de esto a %s. Se usará `polling' de nuevo" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" "%s ha sido reemplazado por un enlace simbólico. abandono con este nombre" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s se ha vuelto inaccesible" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s se ha vuelto accesible" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s ha aparecido; siguiendo el final del nuevo fichero" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s ha sido reemplazado; siguiendo el final del nuevo fichero" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: no se puede cambiar el modo `non-blocking'" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: fichero truncado" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "no queda ningún fichero" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "no se puede vigilar el directorio padre de %s" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "se han agotado los recursos `inotify'" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "no se puede vigilar %s" -#: src/tail.c:1529 +# SIoNO +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: ¿reemplazar %s? (s/n) " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "error al monitorizar evento inotify" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "error al leer evento inotify" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: no se puede seguir el final de este tipo de fichero; abandono\n" "con este nombre" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "el número en %s es demasiado grande" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "%s: número máximo de stats entre aperturas inválido" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: PID inválido" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: número de segundos inválido" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "el número de columnas no es válido %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "opción utilizada en un contexto inválido -- %c" # FIXME: "when following"? when following by what? sv -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" "atención: se descarta --retry; --retry solamente es útil cuando se sigue" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "atención: --retry solamente es efectivo para la apertura inicial" # FIXME: "when following"? when following by what? sv -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "atención: se descarta PID; --pid=PID solamente es útil cuando se sigue" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "atención: no se admite --pid=PID en este sistema" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "no se puede seguir %s por el nombre" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "atención: seguir la entrada estándar indefinidamente no es efectivo" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "no se puede usar `inotify', se vuelve a `polling'" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -12302,60 +12699,72 @@ msgstr "" " -a, --append añade a los FICHEROs dados, no los sobreescribe\n" " -i, --ignore-interrupts no hace caso a las señales de interrupción\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Si un FICHERO es -, copia de nuevo a la salida estándar.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "falta un argumento después de %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "entero inválido %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "se esperaba ')'" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "se esperaba ')', se encontró %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: se esperaba un operador unario" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt no acepta -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef no acepta -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot no acepta -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "operador binario desconocido" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: se esperaba un operador binario" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -12369,13 +12778,13 @@ msgstr "" " o bien: [ ]\n" " o bien: [ OPCIÓN\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" msgstr "Sale con el estado determinado por EXPRESIÓN.\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -12385,7 +12794,7 @@ msgstr "" "Si se omite una EXPRESIÓN entonces se considera falsa. En caso contrario,\n" "EXPRESIÓN es verdadera o falsa y determina el estado de salida. Es una de:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -12399,7 +12808,7 @@ msgstr "" " EXPRESIÓN1 -a EXPRESIÓN2 la EXPRESIÓN1 y la EXPRESIÓN2 son verdaderas\n" " EXPRESIÓN1 -o EXPRESIÓN2 la EXPRESIÓN1 o la EXPRESIÓN2 es verdadera\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -12415,7 +12824,7 @@ msgstr "" " CADENA1 = CADENA2 las cadenas son iguales\n" " CADENA1 != CADENA2 las cadenas no son iguales\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -12470,7 +12879,7 @@ msgstr "" # Este también es un poco fuerte. ¿Conoces a alguien (además de a tí mismo) # que utilice este término y se quede tan ancho? # ¿Por qué enchufe y no (por ejemplo) conector? sv -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -12486,7 +12895,7 @@ msgstr "" " que FICHERO2\n" " FICHERO1 -ot FICHERO2 el FICHERO1 es más antiguo que FICHERO2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -12500,7 +12909,7 @@ msgstr "" " -d FICHERO el FICHERO existe y es un directorio\n" " -e FICHERO el FICHERO existe\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -12514,7 +12923,7 @@ msgstr "" " -h FICHERO el FICHERO existe y es un enlace simbólico (igual que -L)\n" " -k FICHERO el FICHERO existe y tiene activo su bit `sticky'\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -12529,7 +12938,7 @@ msgstr "" " -r FICHERO el FICHERO existe y puede leerse\n" " -s FICHERO el FICHERO existe y tiene un tamaño mayor que cero\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -12546,7 +12955,7 @@ msgstr "" " -x FICHERO el FICHERO existe y puede ejecutarse (o atravesarse)\n" # No me acaba de gustar el "Advierta". Se admiten sugerencias. -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -12561,7 +12970,7 @@ msgstr "" "invertidas) para los shells. ENTERO también puede ser -l CADENA, que\n" "evalúa la longitud de la CADENA.\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -12571,25 +12980,25 @@ msgstr "" "NOTA: [ obedece las opciones --help y --version, pero test no.\n" "test trata cada uno de los anteriores como cualquier otra CADENA no vacía.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test y/o [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "falta un ']'" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "sobra el argumento %s" @@ -12609,7 +13018,7 @@ msgstr "atención: timer_settime" msgid "warning: timer_create" msgstr "atención: timer_create" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -12618,11 +13027,11 @@ msgstr "" "Modo de empleo: %s [OPCIÓN] DURACIÓN ORDEN [ARG]...\n" " o bien: %s [OPCIÓN]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 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" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -12657,7 +13066,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:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -12669,7 +13078,7 @@ msgstr "" "'s' para segundos (por omisión), 'm' para minutos, 'h' para horas o\n" "'d' para días.\n" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -12688,7 +13097,7 @@ msgstr "" "esta señal no se puede capturar. Si se envía la señal KILL (9), el\n" "estado de salida es 128+9 en lugar de 124.\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "atención: la desactivación de volcados de core ha fallado" @@ -12703,6 +13112,11 @@ msgstr "error esperando a la orden" msgid "the monitored command dumped core" msgstr "la orden monitorizada ha volcado un 'core'" +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "estado desconocido de la orden (0x%X)" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -13104,12 +13518,12 @@ msgstr "Sale con un estado de saldia que indica éxito." msgid "Exit with a status code indicating failure." msgstr "Sale con un estado de saldia que indica fracaso." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Modo de empleo: %s OPCIÓN... FICHERO...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -13129,11 +13543,11 @@ msgstr "" "(hueco)\n" "se lee como bytes cero.\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create no crea ningún fichero\n" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" @@ -13141,7 +13555,7 @@ msgstr "" "lugar\n" " de bytes\n" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" @@ -13150,7 +13564,7 @@ msgstr "" " -s, --size=TAMAÑO establece o ajusta el tamaño del fichero en " "TAMAÑO bytes\n" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -13165,58 +13579,63 @@ msgstr "" "'/' redondeo hacia abajo al múltiplo de, '%' redondeo hacia arriba al\n" "múltiplo de\n" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" "desbordamiento en bloques de % * % bytes para el fichero %s" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "no se puede usar %s, aparentemente tiene un tamaño negativo" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "no se puede obtener el tamaño de %s" -#: src/truncate.c:205 +#: src/truncate.c:178 #, 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:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "desbordamiento al extender el tamaño del fichero %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "fallo al truncar %s a % bytes" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "se han especificado varios modificadores relativos" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "número inválido %s" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "debe especificar o bien %s o bien %s" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "debe especificar un %s relativo con %s" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "%s estaba especificado pero %s no" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "no se puede abrir %s para escritura" @@ -13227,12 +13646,10 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Modo de empleo: %s [OPCIÓN] [FICHERO]\n" "Escribe una lista completamente ordenada consistente con el orden parcial " @@ -13241,12 +13658,17 @@ msgstr "" "estándar.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: la entrada contiene un número impar de elementos" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: la entrada contiene un bucle:" @@ -13347,9 +13769,8 @@ msgid "cannot get system name" msgstr "no se puede obtener el nombre del sistema" #: 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" +#, fuzzy +msgid "Convert blanks in each FILE to tabs, writing to standard output.\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" @@ -13410,9 +13831,10 @@ msgstr "" "grupo\n" #: src/uniq.c:187 +#, fuzzy msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" " -D, --all-repeated[=MÉTODO] muestra todas las líneas duplicadas\n" @@ -13427,9 +13849,10 @@ msgstr "" "campos\n" #: src/uniq.c:195 +#, fuzzy msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" " --group[=MÉTODO] muestra todos los elementos, separando grupos con " @@ -13438,7 +13861,6 @@ msgstr "" "both}\n" #: src/uniq.c:199 -#, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing\n" " -s, --skip-chars=N avoid comparing the first N characters\n" @@ -13449,7 +13871,6 @@ msgstr "" " -s, --skip-chars=N pasa por alto la comparación de los primeros N\n" " caracteres\n" " -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:207 msgid " -w, --check-chars=N compare no more than N characters in lines\n" @@ -13595,11 +14016,6 @@ msgstr "" " Los procesos que están en un estado de sueño no interrumpible también\n" "contribuyen a la carga del sistema.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - # Nota: El primer %s era /etc/utmp y el segundo /etc/wtmp. #: src/uptime.c:214 #, c-format @@ -13624,12 +14040,17 @@ msgstr "" "FICHERO es %s\n" "\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -13650,12 +14071,13 @@ msgstr "" " -m, --chars muestra el número de caracteres\n" " -l, --lines muestra el número de líneas\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=F lee la entrada de los fichero especificados por\n" @@ -13864,10 +14286,10 @@ msgstr "" "Equivalente a id -un.\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: no se puede encontrar el nombre para el usuario con ID %lu\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "no se puede encontrar el nombre para el usuario con ID %s" #: src/yes.c:41 #, c-format @@ -13901,3 +14323,233 @@ msgstr "" "Muestra repetidamente una línea con todas las CADENA(s) especificadas, o " "'y'.\n" "\n" + +#~ msgid "input line is too short, no numbers found to convert in field %ld" +#~ msgstr "" +#~ "la línea de entrada es demasiado corta, no se encontraron números para " +#~ "convertir en el campo %ld" + +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "-t es implícito si LONGITUD_PÁGINA <= 10. Si no se especifica ningún " +#~ "FICHERO,\n" +#~ "o cuando FICHERO es -, lee la entrada estándar.\n" + +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Sin FICHERO, o cuando FICHERO es -, lee la entrada estándar. Por omisión " +#~ "es '-F /'.\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Guarda los bloques cambiados en el disco, actualiza el superbloque.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "no se tendrá en cuenta ningún argumento" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: número inválido" + +# Eso de "representable" no me suena muy bien, ¿podrías explicar a qué se +# refiere?, incluso me parecen dos mensajes distintos... +# +# Pues un número, es un concepto abstracto, y su representación son +# cosas como 1, 2 3i em+ +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s es tan grande que no es representable" + +#~ msgid "number of lines" +#~ msgstr "número de líneas" + +#~ msgid "number of bytes" +#~ msgstr "número de bytes" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: número que se descarta inválido" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: número de bytes inválido" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: número de líneas inválido" + +#~ msgid "number in %s is too large" +#~ msgstr "el número en %s es demasiado grande" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: número de segundos inválido" + +# FIXME: Intraducible +#~ msgid "failed to %s supplemental groups" +#~ msgstr "fallo al %s grupos suplementarios" + +#~ 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 "" +#~ "\n" +#~ "Enviar la señal %s a un proceso 'dd' en marcha hace que muestre\n" +#~ "estadísticas de E/S en la salida de error estándar, y luego continúa\n" +#~ "con la copia.\n" +#~ "\n" +#~ " $ dd if=/dev/zero of=/dev/null& pid=$!\n" +#~ " $ kill -%s $pid; sleep 1; kill $pid\n" +#~ " 18335302+0 registros leídos\n" +#~ " 18335302+0 registros escritos\n" +#~ " 9387674624 bytes (9.4 GB) copiados, 34.6279 segundos, 271 MB/s\\n\"\n" +#~ "\n" +#~ "Las opciones son:\n" + +#~ 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 CAR el CARácter introducirá el siguiente carácter comentado\n" +#~ " quit CAR el CARácter enviará una señal de salida\n" +#~ " * rprnt CAR el CARácter redibujará la línea actual\n" +#~ " start CAR el CARácter reiniciará la salida después de haberla " +#~ "detenido\n" + +#~ 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" +#~ "Valores de control:\n" +#~ " [-]clocal desactiva las señales de control del módem\n" +#~ " [-]cread permite que se reciba entrada\n" +#~ " * [-]crtscts permite negociación RTS/CTS\n" +#~ " * [-]cdtrdsr permite negociación DTR/DSR\n" +#~ " csN establece el tamaño del carácter en N bits, N en [5..8]\n" + +#~ 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 "" +#~ "\n" +#~ "Valores de salida:\n" +#~ " * bsN estilo de retardo de retroceso, N en [0..1]\n" +#~ " * crN estilo de retardo de retorno de carro, N en [0..3]\n" +#~ " * 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" + +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl traduce retorno de carro a nueva línea\n" +#~ " * [-]ofdel utiliza caracteres de borrado para relleno en lugar de\n" +#~ " caracteres NUL\n" +#~ " * [-]ofill utiliza caracteres de relleno en lugar de tiempo para " +#~ "retardos\n" +#~ " * [-]olcuc traduce caracteres en minúscula a mayúscula\n" +#~ " * [-]onlcr traduce nueva línea a retorno de carro-nueva línea\n" +#~ " * [-]onlret nueva línea realiza un retorno de carro\n" + +#~ 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 "" +#~ " * [-]onocr no muestra retornos de carro en la primera columna\n" +#~ " [-]opost postprocesa salida\n" +#~ " * tabN estilo de retardo de tabulador horizontal, N en [0..3]\n" +#~ " * tabs igual que tab0\n" +#~ " * -tabs igual que tab3\n" +#~ " * vtN estilo de retardo de tabulador vertical, N en [0..1]\n" + +#~ 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 "" +#~ " * [-]ctlecho repite los caracteres de control en notación gorro " +#~ "('^c')\n" +#~ " [-]echo repite los caracteres de entrada\n" +#~ " * [-]echoctl igual que [-]ctlecho\n" +#~ " [-]echoe igual que [-]crterase\n" +#~ " [-]echok repite una nueva línea después de un carácter de matar\n" + +#~ 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 "" +#~ " * [-]echoke igual que [-]crtkill\n" +#~ " [-]echonl repite nueva línea aún si no está repitiendo otros " +#~ "caracteres\n" +#~ " * [-]echoprt repite los caracteres borrados en orden inverso, entre\n" +#~ " '\\' y '/'\n" +#~ " [-]icanon permite los caracteres especiales erase, kill, werase,\n" +#~ " y rprnt\n" +#~ " [-]iexten permite caracteres especiales no-POSIX\n" + +#~ 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 "" +#~ " dec igual que echoe echoctl echoke -ixany intr ^c erase " +#~ "0177\n" +#~ " kill ^u\n" +#~ " * [-]decctlq igual que [-]ixany\n" +#~ " ek caracteres erase y kill a sus valores por omisión\n" +#~ " evenp igual que parenb -parodd cs7\n" + +# Nota: En este caso es importante usar apóstrofos como en el original, +# pues es para escribirlo literalmente en la línea de órdenes. +#~ msgid "For complete documentation, run: info coreutils '%s invocation'\n" +#~ msgstr "" +#~ "Para la documentación completa, ejecute: info coreutils '%s invocation'\n" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: no se puede encontrar el nombre para el usuario con ID %lu\n" diff --git a/po/et.gmo b/po/et.gmo index df865f64..6ec65a93 100644 Binary files a/po/et.gmo and b/po/et.gmo differ diff --git a/po/et.po b/po/et.po index 0d6c3410..e54ca59e 100644 --- a/po/et.po +++ b/po/et.po @@ -1,14 +1,15 @@ # This file is distributed under the same license as the coreutils package. # Estonian translations for coreutils # Copyright (C) 2000 Free Software Foundation, Inc. -# Toomas Soome , 2014. +# Toomas Soome , 2015. # +#: src/stty.c:941 msgid "" msgstr "" -"Project-Id-Version: coreutils 8.23-pre1\n" +"Project-Id-Version: coreutils 8.24-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" -"PO-Revision-Date: 2014-07-14 13:25+0300\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" +"PO-Revision-Date: 2015-06-29 23:43+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" "Language: et\n" @@ -35,18 +36,18 @@ msgstr "Lubatud argumendid on:" msgid "error closing file" msgstr "viga faili sulgemisel" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "viga kirjutamisel" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "säilitan %s õigused" @@ -227,57 +228,62 @@ msgstr "Parameetersõne ei ole korrektselt kodeeritud" msgid "Unknown error" msgstr "Tundmatu viga" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: võti '%s' on segane; variandid:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: võti '%s' on segane\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: võti '--%s' ei luba kasutada argumenti\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: võti '%c%s' ei luba kasutada argumenti\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: võti '%s' nõuab argumenti\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: tundmatu võti '--%s'\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: tundmatu võti '%c%s'\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: vigane võti -- '%c'\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: võti nõuab argumenti -- '%c'\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: võti '-W %s' on segane\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: võti '-W %s' ei luba kasutada argumenti\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: võti '-W %s' nõuab argumenti\n" @@ -287,13 +293,13 @@ msgstr "%s: võti '-W %s' nõuab argumenti\n" msgid "cannot change permissions of %s" msgstr "ei õnnestu muuta %s õigusi" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "kataloogi `%s' ei õnnestu luua" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "mälu on otsas" @@ -342,6 +348,12 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: faili lõpp" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: viga lugemisel" + #: lib/regcomp.c:131 msgid "Success" msgstr "Õnnestumine" @@ -449,7 +461,7 @@ msgstr "^[jJ]" msgid "^[nN]" msgstr "^[eE]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "sean %s õigusi" @@ -883,7 +895,7 @@ msgstr "" "Base64 kodeeri või dekodeeri faile või standardsisenit väljastades\n" "standardväljundisse.\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -900,15 +912,7 @@ msgstr "" " kasutage väärtust 0\n" "\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Kui FAIL puudub või on -, loe standardsisendit.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -922,51 +926,51 @@ msgstr "" "ka reavahetusi. Andmevoos tähestikuväliste sümbolite eemaldamiseks\n" "kasutage --ignore-garbage.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "viga lugemisel" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "vigane sisend" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "vigane murdmise veerg: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "liigne operand %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "sulen standardsisendi" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1016,38 +1020,41 @@ msgstr "" " %s -a any/str1 any/str2 -> \"str1\" millele järgneb \"str2\"\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "puudub operand" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Kasutamine: %s [VÕTI]... [FAIL]...\n" #: src/cat.c:92 +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "Kirjuta FAILide ühend standardväljundisse.\n" + +#: src/cat.c:98 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" @@ -1056,7 +1063,6 @@ msgid "" " -n, --number number all output lines\n" " -s, --squeeze-blank suppress repeated empty output lines\n" msgstr "" -"Liida FAILID või standardsisend standardväljundisse.\n" "\n" " -A, --show-all sama, kui -vET\n" " -b, --number-nonblank mittetühjade väljundridade arv, tühistab -n\n" @@ -1065,7 +1071,7 @@ msgstr "" " -n, --number kõikide väljundridade arv\n" " -s, --squeeze-blank korraga ei väljasta üle ühe tühja rea\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1078,7 +1084,7 @@ msgstr "" " -v, --show-nonprinting kasuta ^ ja M- notatsiooni, v.a LFD ja TAB " "korral\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1091,17 +1097,18 @@ msgstr "" " %s f - g Väljasta f'i sisu, siis standardsisend, siis g sisu.\n" " %s Kopeeri standardsisend standardväljundisse.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "%s peal ioctl ei õnnestu" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "standardväljund" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: sisendfail on väljundfail" @@ -1113,10 +1120,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1130,8 +1137,8 @@ msgstr "turvakonteksti loomine ebaõnnestus: %s" msgid "failed to set %s security context component to %s" msgstr "turvakonteksti %s komponendi %s seadmine ebaõnnestus" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "%s turvakonteksti lugemine ebaõnnestus" @@ -1146,13 +1153,13 @@ msgstr "osalist konteksti ei saa rakendada märgendamata failile %s" msgid "failed to change context of %s to %s" msgstr "%s konteksti seadmine %s ei õnnestu" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "%s ei saa kasutada" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "kataloogi %s ei õnnestu lugeda" @@ -1168,7 +1175,7 @@ msgstr "muudan %s turvakonteksti\n" msgid "fts_read failed" msgstr "fts_read ebaõnnestus" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1279,7 +1286,7 @@ msgid "-R -h requires -P" msgstr "-R -h nõuab -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1296,9 +1303,8 @@ msgid "conflicting security context specifiers given" msgstr "anti konfliktne turvakontekst" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "%s atribuutide lugemine ebaõnnestus" @@ -1597,17 +1603,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "vigane grupp %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "vigane grupi nimekiri %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1616,7 +1622,7 @@ msgstr "" "Kasutamine: %s [VÕTI] UUSJUUR [KÄSK [ARG]...]\n" " või: %s VÕTI\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1624,17 +1630,24 @@ msgstr "" "Käivita KÄSK kasutades juurkataloogina kataloogi UUSJUUR.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" +" --groups=G_LOEND määra täiendav gruppide nimekiri kujul g1,g2,..,gN\n" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" " --userspec=KASUTAJA:GRUPP määra kasutatav kasutaja ja grupp (ID või " "nimi)\n" -" --groups=G_LOEND määra täiendav gruppide nimekiri kujul g1,g2,..," -"gN\n" +"\n" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr " --skip-chdir ära mine kataloogi %s\n" -#: src/chroot.c:203 +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" @@ -1642,42 +1655,47 @@ msgstr "" "\n" "Kui käsklust ei antud, käivita '${SHELL} -i'' (vaikimisi: '/bin/sh -i').\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "võti --skip-chdir on ainult lubatud kui NEWROOT on vana %s" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "%s ei õnnestu juurkataloogiks seada" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "ei saa minna juurkataloogi" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "undmatu uid jaoks ei ole gruppi määratud: %d" -#: src/chroot.c:383 +#: src/chroot.c:400 #, c-format msgid "failed to get supplemental groups" msgstr "lisagruppide nimekirja ei õnnestu seada" -#: src/chroot.c:395 +#: src/chroot.c:412 #, c-format -msgid "failed to %s supplemental groups" -msgstr "failed to %s supplemental groups" +msgid "failed to set supplemental groups" +msgstr "lisagruppide nimekirja ei õnnestu seada" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "grupi ID seadmine ebaõnnestus" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "kasutaja ID seadmine ebaõnnestus" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "käsklust %s ei saa käivitada" @@ -1718,7 +1736,15 @@ msgstr "Kasutamine: %s [VÕTI]... FAIL1 FAIL2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Võrdle järjestatud faile FAIL1 ja FAIL2 rida haaval.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Kui FAIL1 või FAIL2 (mitte mõlemad) on -, loe standardsisendit.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1730,7 +1756,7 @@ msgstr "" "unikaalsed read, teises veerus on faili FAIL2 unikaalsed read ja\n" "kolmandas veerus on nende kahe faili ühised read.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1742,7 +1768,7 @@ msgstr "" " -2 blokeeri veerg 2 (read, mis on ainult failis FAIL2)\n" " -3 blokeeri veerg 3 (read, mis on mõlemas failis)\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1755,11 +1781,11 @@ msgstr "" " kõik sisendread on paaris\n" " --nocheck-order ära kontrolli sisendi järjestatud\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=SÕNE kasuta veergude eraldamiseks sõne\n" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" @@ -1767,7 +1793,7 @@ msgstr "" "\n" "Märkus, võrdlused kasutavad 'LC_COLLATE' reegleid.\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1780,311 +1806,325 @@ msgstr "" " %s -12 fail1 fail2 Väljasta ainult read mis on olemas mõlemas failis.\n" " %s -3 fail1 fail2 Väljasta read, mis on ainult ühes failis.\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "fail %d ei ole järjestatud" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "kasutati mitut eraldajat" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "tühi %s pole lubatud" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 -#, c-format -msgid "error reading %s" -msgstr "viga %s lugemisel" - -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:181 src/copy.c:452 #, c-format msgid "cannot lseek %s" msgstr "lseek %s ei õnnestu" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:191 src/copy.c:554 +#, c-format +msgid "error deallocating %s" +msgstr "viga %s vabastamisel" + +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 +#, c-format +msgid "error reading %s" +msgstr "viga %s lugemisel" + +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "viga %s kirjutamisel" -#: src/copy.c:323 +#: src/copy.c:302 +#, c-format +msgid "overflow reading %s" +msgstr "ület'itumine %s lugemisel" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s: laienduste info lugemine ebaõnnestus" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: kirjutamine ebaõnnestus" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "%s laiendamine ebaõnnestus" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "puhastan %s õigused" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "%s omanikku ei õnnestu säilitada" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "ei õnnestu leida faili %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "%s autorit ei õnnestu säilitada" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "vaikimisi faili loomise konteksti %s seadmine ebaõnnestus" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "vaikimisi faili loomise konteksti seadmine failile %s ebaõnnestus" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "%s turvakonteksti seadmine ebaõnnestus" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "ei õnnestu avada %s lugemiseks" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "fstat %s ei õnnestu" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "jätan %s vahele, kuna see asendati kopeerimise ajal" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "%s ei saa kustutada" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "%s eemaldatud\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "ei kirjuta läbi rippuva nimeviite %s" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "ei õnnestu luua tavalist faili %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "%s kloonimine kloonitavast %s ebaõnnestus" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "jätan %s ajad muutmata" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "%s sulgemine ebaõnnestus" -#: src/copy.c:1580 +#: src/copy.c:1669 #, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: kirjutan %s üle, kirjutan üle ka õigused %04lo (%s)? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "%s: mittekirjutatav %s (mood %04lo, %s); proovin ikka? " -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: kirjutan %s üle? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (varukoopia: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "vaikimisi faili loomise konteksti ei õnnestunud taastada" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "ei õnnestu luua viidet %s -> %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "stat %s ei õnnestu" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "jätan kataloogi %s vahele" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" -msgstr "hoiatus: lähtefail %s on esitatur enam kui korra" +msgstr "hoiatus: lähtefail %s on esitatud enam kui korra" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s ja %s on üks ja sama fail" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "ei saa üle kirjutada mitte-katataloogi %s kataloogiga %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "ei kirjuta üle just loodud faili %s failiga %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "kataloogi %s ei saa üle kirjutada mitte kataloogiga" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "kataloogi ei saa tõsta mitte-kataloogi: %s -> %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "%s varundamine hävitaks allika; %s ei teisaldatud" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "%s varundamine hävitaks allika; %s ei kopeeritud" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "ei õnnestu luua %s varukoopiat" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "kataloogi %s ei saa iseendasse, %s, kopeerida" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, c-format +msgid "warning: source directory %s specified more than once" +msgstr "hoiatus: lähte kataloog %s on esitatud enam kui korra" + +#: src/copy.c:2294 #, c-format msgid "will not create hard link %s to directory %s" msgstr "ei loo viidet %s kataloogile %s" -#: src/copy.c:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "%s ei saa tõsta iseenda alamkataloogi %s" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "ei õnnestu tõsta %s -> %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "tsüklilist nimeviita %s ei õnnestu kopeerida" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "ei õnnestu luua nimeviidet %s -> %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "ei õnnestu luua fifot %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "ei õnnestu luua seadmefaili %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "ei õnnestu lugeda nimeviidet %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "ei õnnestu luua nimeviidet %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s on tundmatut tüüpi fail" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "%s ei saa taastada" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (taastamine)\n" @@ -2094,12 +2134,12 @@ msgstr "%s -> %s (taastamine)\n" msgid "Alex Deymo" msgstr "Alex Deymo" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "Kasutamine: %s --coreutils-prog=PROGRAMMI_NIMI [PARAMEETRID]... \n" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" @@ -2107,7 +2147,7 @@ msgstr "" "Käivita PROGRAMMI_NIMI sisse ehitatud programm antud PARAMEETRITEGA.\n" "\n" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" @@ -2117,7 +2157,7 @@ msgstr "" "Kasutamine: '%s --coreutils-prog=PROGRAMMI_NIMI --help' annab programmi " "abiinfo.\n" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, c-format msgid "unknown program %s" msgstr "tundmatu programm %s" @@ -2379,8 +2419,8 @@ msgstr "`%s' on olemas, aga ei ole kataloog" msgid "failed to access %s" msgstr "%s kasutamine ebaõnnestus" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "argumentides puudub failinimi" @@ -2454,131 +2494,130 @@ msgstr "" "laiendatud atribuute ei saa säilitada kuna cp on kompileeritud xattr toeta" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "sisend kadus" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: rea number on piirkonnast väljas" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: rea number on piirkonnast väljas" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " %s kordamisel\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: sobivat ei leitud" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "viga regulaaravaldisega otsingul" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "viga %s kirjutamisel" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: eraldaja järel oodati täisarvu" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: korduste arvuga peab kasutama '}'" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: '{' ja '}' vahel peab olema täisarv" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: puudub sulgev eraldaja '%c'" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: vigane regulaaravaldis: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: vigane muster" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: rea number peab olema suurem kui null" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "sufiksis puudub teisenduse määrang" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "vigane teisenduse määraja sufiksis: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "vigane teisenduse määraja sufiksis: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "vigased lipud teisenduse määrangus: %%%c%c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "sufiksis on liiga palju %% teisenduse määranguid" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "sufiksis puudub %% teisenduse määrang" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: vigane number" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +msgid "invalid number" +msgstr "vigane number" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Kasutamine: %s [VÕTI]... FAIL MUSTER...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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" @@ -2587,7 +2626,15 @@ msgstr "" "'xx02', ...\n" "ja väljasta standardväljundisse iga osa suurus baitides.\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Kui FAIL on -, loe standardsisendit.\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2598,11 +2645,11 @@ msgstr "" " -f, --prefix=PREFIKS kasuta 'xx' asemel PREFIKS\n" " -k, --keep-files vigade korral jäta väljundfailid kustutamata\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr " -m, --suppress-matched blokeeri mustrile vastavad read\n" -#: src/csplit.c:1498 +#: src/csplit.c:1500 msgid "" " -n, --digits=DIGITS use specified number of digits instead of 2\n" " -s, --quiet, --silent do not print counts of output file sizes\n" @@ -2612,17 +2659,10 @@ msgstr "" " -s, --quiet, --silent ära väljasta väljundfailide mahte\n" " -z, --elide-empty-files kustuta tühjad väljundfailid\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Kui FAIL on -, loe standardsisendit. Iga MUSTER võib olla:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 msgid "" "\n" +"Each PATTERN may be:\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" @@ -2632,6 +2672,7 @@ msgid "" "A line OFFSET is a required '+' or '-' followed by a positive integer.\n" msgstr "" "\n" +"Iga MUSTER võib olla:\n" " TÄISARV kopeeri kuni, aga mitte kaasa arvatud, antud " "reanumbrini\n" " /REGAV/[NIHE] kopeeri kuni, aga mitte kaasa arvatud, sobiva reani\n" @@ -2656,7 +2697,7 @@ msgstr "Kasutamine: %s VÕTI... [FAIL]...\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:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2666,7 +2707,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:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2678,7 +2719,7 @@ msgstr "" " välja arvatu juhul, kui kasutati võtit -s\n" " -n (ignoreerin)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2686,7 +2727,7 @@ msgstr "" " --complement täienda valitud baitide, sümbolite või väljade " "hulka.\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2696,7 +2737,7 @@ msgstr "" " --output-delimiter=SÕNE kasuta väljundis eraldajana SÕNE\n" " vaikimisi kasutatakse sisendi eraldajat\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2708,7 +2749,7 @@ msgstr "" "koosneb vahemikust või komadega eraldatud vahemikest. Valitud sisend\n" "kirjutatakse täpselt üks kord lugemise järjekorras.\n" -#: src/cut.c:210 +#: src/cut.c:211 msgid "" "Each range is one of:\n" "\n" @@ -2716,8 +2757,6 @@ msgid "" " 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 "" "Iga vahemik on üks järgnevaist:\n" "\n" @@ -2725,53 +2764,52 @@ msgstr "" " N- N-indast baidist, sümbolist või väljast rea lõpuni\n" " N-M alates N kuni M (kaasa arvatud) baiti, sümbolit või välja\n" " -M esimesest kuni M-nda (kaasa arvatud) baidi, sümboli või väljani\n" -"\n" -"Kui FAIL puudub või on -, loeb standardsisendit.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "vigane baitide, sümbolite või väljade loend" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "väljad ja positsioonid nummerdatakse alates numbrist 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "vigane vahemik, lõpp puudub: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "vigane vähenev vahemik" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "baidi nihe %s on liiga suur" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "välja number %s on liiga suur" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "lubatud on ainult sama tüüpi loend" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "eraldaja peab olema üks sümbol" -#: src/cut.c:787 +#: src/cut.c:786 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:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2779,11 +2817,11 @@ msgstr "" "eraldamata ridade blokeerimine omab mõtet ainult\n" "\tväljadega töötamise puhul" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "puudub väljade loend" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "puudub asukohtade loend" @@ -2802,48 +2840,64 @@ msgstr "Näita hetke aega antud vormingus või sea süsteemi aeg.\n" #: 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 "" -" -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" -" TIMESPEC='date' näitab kuupäeva (vaikimisi),\n" -" 'hours', 'minutes', 'seconds' või 'ns' määravad\n" -" vastava täpsuse.\n" - -#: 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=FAIL näita FAILi viimast muutmise aega\n" -" -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: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 (UTC)\n" -msgstr "" -" --rfc-3339=MÄÄRANG väljasta RFC-3339 ühilduv kuupäeva sõne.\n" -" MÄÄRANG võib olla 'date', 'seconds' või 'ns'.\n" -" -s, --set=SÕNE sea SÕNEga määratud aeg\n" -" -u, --utc, --universal esita või sea koordineeritud universaalaeg " -"(UTC)\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 "" +" -d, --date=SÕNE näita aega vastavalt sõnele, mitte 'now'\n" +" -f, --file=DATEFILE nagu --date; sõned on failis eraldi ridadel\n" + +#: src/date.c:138 +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" +msgstr "" +" -I[VORM], --iso-8601[=VORM] väljasta aeg in ISO 8601 vormingus.\n" +" VORM='date' näitab kuupäeva (vaikimisi),\n" +" 'hours', 'minutes', 'seconds' või 'ns' " +"määravad\n" +" vastava täpsuse.\n" +" Näiteks: 2006-08-14T02:34:56-0600\n" + +#: src/date.c:145 +msgid "" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" +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:149 +msgid "" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" +msgstr "" +" --rfc-3339=VORM väljasta RFC-3339 ühilduv kuupäeva sõne.\n" +" VORM='date', 'seconds' või 'ns'.\n" +" Näiteks: 2006-08-14 02:34:56-06:00\n" + +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr " -r, --reference=FAIL näita FAILi viimast muutmise aega\n" #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" +" -s, --set=SÕNE sea SÕNEga määratud aeg\n" +" -u, --utc, --universal esita või sea koordineeritud universaalaeg " +"(UTC)\n" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2856,7 +2910,7 @@ msgstr "" " %% sümbol %\n" " %a lokaadi lühendatud nädalapäeva nimi (näiteks P)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2869,7 +2923,7 @@ msgstr "" " %c lokaadi kuupäev ja aeg (nt. teisipäev, 25. juuni 2002. 12:11:55 " "EEST)\n" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2881,7 +2935,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:177 +#: src/date.c:183 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 +2945,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:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2903,7 +2957,7 @@ msgstr "" " %I tund (01..12)\n" " %j päev aastas (001..366)\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2915,7 +2969,7 @@ msgstr "" " %m kuu (01..12)\n" " %M minut (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2933,7 +2987,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:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2945,7 +2999,7 @@ msgstr "" " %T aeg, sama kui %H:%M:%S\n" " %u nädalapäev (1..7); 1 esitab esmaspäeva\n" -#: src/date.c:209 +#: src/date.c:215 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" @@ -2957,7 +3011,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:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2969,7 +3023,7 @@ msgstr "" " %y aasta kaks viimast numbrit (00..99)\n" " %Y aasta\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2988,7 +3042,7 @@ msgstr "" "\n" "Vaikimisi täidab date numbriväljad nullidega.\n" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3006,7 +3060,7 @@ msgstr "" " ^ kui võimalik, kasuta suurtähti\n" " # kui võimalik, kasuta vastupidi tähesuurust\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3020,7 +3074,7 @@ msgstr "" "E et kasutada lokaadi alternatiivesitust või\n" "O et kasutada lokaadi alternatiivset numbrilist esitust\n" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3044,35 +3098,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:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "standardsisend" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "vigane kuupäev %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "määrati mitu väljundvormingut" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3083,23 +3137,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:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "kuupäeva ja kellaaega ei õnnestu seada" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3108,7 +3162,7 @@ msgstr "" "Kasutamine: %s [OPERAND]...\n" " või: %s VÕTI\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3126,7 +3180,7 @@ msgstr "" " count=N kopeeri ainult N sisendplokki\n" " ibs=BAITI loe BAITI baiti korraga (vaikimisi: 512)\n" -#: src/dd.c:541 +#: src/dd.c:570 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3135,8 +3189,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=FAIL loe standardsisendi asemel faili\n" " iflag=LIPUD loe vastavalt komadega eraldatud võtmetele\n" @@ -3145,11 +3201,12 @@ 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=MIS MIS infot standarveavoogu ei kirjutata;\n" -" 'noxfer' blokeerib ülekande statistika, 'none' blokeerib " -"kõik\n" +" status=TASE mis tasemel infot kirjutada standarveavoogu;\n" +" 'none' blokeerib kõik peale veateadete,\n" +" 'noxfer' blokeerib ülekande statistika, \n" +" 'progress' näitab jooksvat statistikat\n" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3168,7 +3225,7 @@ msgstr "" "Iga VÕTMESÕNA võib olla:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3194,7 +3251,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:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3210,7 +3267,7 @@ msgstr "" " fdatasync enne lõpetamist kindlusta andmete faili kirjutamine\n" " fsync nagu eelmine, aga kirjuta ka metainfo\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3224,138 +3281,109 @@ msgstr "" " append lisamise mood (omab mõtet ainult väljundil; soovitame " "conv=notrunc)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio kasuta andmete käsitlemisel samaaegset S/V\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct kasuta andmete käsitlemisel puhverdamata S/V\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory katkesta kui ei ole kataloog\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync kasuta andmete käsitlemisel sünkroonmoodi S/V\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync sama, aga ka metainfo korral\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock kasuta sisendit täisblokkidena (ainult iflag)\n" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock kasuta mitteblokeeruvat S/V\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime ära uuenda kasutamise aega\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nocache ära kasuta puhverdatud andmeid\n" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty ei seosta kontrollivat terminali\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow ei järgi nimeviiteid\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks katkesta, kui on viiteid\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary kasuta andmete käsitlemisel binaarmoodi\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text kasuta andmete käsitlemisel tekstimoodi\n" -#: src/dd.c:620 +#: src/dd.c:651 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:623 +#: src/dd.c:654 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:626 +#: src/dd.c:657 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:631 +#: src/dd.c:661 #, 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 "" "\n" -"Kui saadate töötavale 'dd' protsessile signaali %s,\n" -"kirjutab dd standard veavoogu seni loetud ja kirjutatud kirjete arvud\n" -"ja jätkab kopeerimist.\n" -"\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ kill -%s $pid; sleep 1; kill $pid\n" -" 18335302+0 kirjet loetud\n" -" 18335302+0 kirjet kirjutatud\n" -" 9387674624 baiti (9.4 GB) kopeeritud, 34.6279 sekundit, 271 MB/s\n" +"Kui saadate töötavale 'dd' protsessile signaali %s, kirjutab dd standard\n" +"veavoogu seni loetud ja kirjutatud kirjete arvud ja jätkab kopeerimist.\n" "\n" "Võtmed on:\n" "\n" -#: src/dd.c:676 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "sisendpuhver suurusega %zu baiti (%s) põhjustas mälu täis saamise" - -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" -msgstr "väljundpuhver suurusega %zu baiti (%s) põhjustas mälu täis saamise" - -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" -"%+% kirjet sisse\n" -"%+% kirjet välja\n" +msgid "memory exhausted by input buffer of size % bytes (%s)" +msgstr "sisendpuhver suurusega % baiti ei mahu mällu (%s)" -#: src/dd.c:754 +#: src/dd.c:721 #, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% lühendatud kirje\n" -msgstr[1] "% lühendatud kirjet\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" +msgstr "väljundpuhver suurusega % baiti ei mahu mällu (%s)" -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "% bait (%s) kopeeritud" msgstr[1] "% baiti (%s) kopeeritud" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "Lõpmatu B" @@ -3369,83 +3397,99 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, c-format +msgid ", %.6f s, %s/s" +msgstr ", %.6f s, %s/s" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% kirjet sisse\n" +"%+% kirjet välja\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% lühendatud kirje\n" +msgstr[1] "% lühendatud kirjet\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "sulgen sisendfaili %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "sulgen väljundfaili %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "O_DIRECT välja lülitamine ebaõnnestus: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "kirjutan faili %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "tundmatu operand %s" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "vigane teisendus" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "vigane sisendi lipp" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "vigane väljundi lipp" -#: src/dd.c:1294 -msgid "invalid status flag" -msgstr "vigane oleku lipp" - -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "vigane number %s" +#: src/dd.c:1385 +msgid "invalid status level" +msgstr "vigane oleku tase" -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "hulgast {ascii,ebcdic,ibm} ei saa ühtegi paari kasutada" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "block ja unblock ei saa koos kasutada" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "lcase ja ucase ei saa koos kasutada" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "excl ja nocreat ei saa koos kasutada" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "direct ja nocache ei saa koos kasutada" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3454,62 +3498,62 @@ msgstr "" "hoiatus: kasutan lseek funktsiooni tuuma vea tõttu alternatiivset meetodit,\n" "fail (%s) mt_type=0x%0lx -- tüüpide nimekirja leiate " -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: skip ebaõnnestus" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: seek ebaõnnestus" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "failiviida ületäitumine %s lugemisel" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "hoiatus: peale lugemisviga ei pruugi failiviit olla õige" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "ei õnnestu tuuma veast mööda minna" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "sean %s lipud" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: ei õnnestu liikuda antud nihkele" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "% baidini väljundfailis %s lühendamine ebaõnnestus" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync %s ebaõnnestus" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "fsync %s ebaõnnestus" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "%s avamine ebaõnnestus" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3518,19 +3562,19 @@ msgstr "" "indeks on liiga suur: ei õnnestu lühendada pikkuseni seek=% (%lu-" "baiti) blokki" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "% baiti väljundfailis %s lühendamine ebaõnnestus" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "puhvist loobumine ebaõnnestus: %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3611,12 +3655,12 @@ msgstr "Maht" msgid "%s-%s" msgstr "%s-%s" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "%s ei ole kasutatav: teise seadme poolt üle haagitud" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3626,13 +3670,13 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3642,11 +3686,10 @@ msgstr "" " suurused 1 048 576 baidiste blokkidena. MAHT " "vorming\n" " on kirjeldatud allpool\n" -" --total väljasta kogusumma\n" " -h, --human-readable väljasta suurused 1024 kordsetena (n. 1023M)\n" " -H, --si väljasta suurused 1000 kordseten (n. 1.1G)\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3659,27 +3702,37 @@ msgstr "" " -l, --local näita ainult lokaalseid failisüsteeme\n" " --no-sync enne info lugemist ära kasuta synci (vikimisi)\n" -#: src/df.c:1409 +#: src/df.c:1429 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" +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" + +#: src/df.c:1435 +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr " --total näita ainult lõppsuurust\n" + +#: src/df.c:1439 +msgid "" " -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 "" -" --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" " -T, --print-type väljasta failisüsteemi tüüp\n" " -x, --exclude-type=TÜÜP ära väljasta infot antud tüüpi failisüsteemidest\n" " -v (ignoreeritakse)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3691,25 +3744,25 @@ msgstr "" "'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n" "'size', 'used', 'avail', 'pcent', 'file' ja 'target' (vaadake info lehte).\n" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "võtmed %s ja %s on üksteist välistavad" -#: src/df.c:1610 +#: src/df.c:1636 #, 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:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Hoiatus: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "ei õnnestu lugeda haagitud failisüsteemide tabelit" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "ühtegi failisüsteemi ei töödeldud" @@ -3821,7 +3874,7 @@ msgstr "" " %s dir1/str dir2/str -> \"dir1\" millele järgneb \"dir2\" \n" " %s stdio.h -> \".\".\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3831,8 +3884,9 @@ msgstr "" " või: %s [VÕTI]... --files0-from=F\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" -msgstr "Summeeri iga faili kettakasutus, kataloogid rekursiivselt.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" +msgstr "Summeeri failide kettakasutus, kataloogid rekursiivselt.\n" #: src/du.c:291 msgid "" @@ -3965,63 +4019,57 @@ msgstr "" msgid "Infinity" msgstr "Lõpmatu" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "fts_read ebaõnnestus: %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "vigane maksimaalne sügavus %s" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "vigane --threshold argument '-0'" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "korraga ei saa summeerida ja näidata kõiki" -#: src/du.c:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "hoiatus: summeerimine on konfliktne võtmega --max-depth=%lu" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" "hoiatus: võtmed --apparent-size ja -b ei ole võtmega --inodes efektiivsed" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "faili operande ei saa võtmega --files0-from koos kasutada" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: viga lugemisel" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "vigane null-pikkusega faili nimi" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "kokku" @@ -4160,12 +4208,9 @@ msgid "cannot specify --null (-0) with command" msgstr "käsuga koos ei saa --null (-0) kasutada" #: 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "Teisenda igas FAILIS tabulaatorid tühikuteks, väljasta standardväljundisse.\n" -"Kui FAIL puudub või on -, loeb standardsisendit.\n" #: src/expand.c:114 msgid "" @@ -4209,7 +4254,7 @@ msgid "input line is too long" msgstr "sisendi rida on liiga pikk" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4359,12 +4404,12 @@ msgstr "viga regulaaravaldisega otsingul" msgid "non-integer argument" msgstr "mitte-numbriline argument" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "nulliga jagamine" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "probleemi lahendamiseks seadke LC_ALL=C." @@ -4375,31 +4420,31 @@ msgid "the strings compared were %s and %s" msgstr "võrreldi sõnesid %s ja %s" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "Niels Moller" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "Lucas algarvu testi tõrge. Seda et peaks juhtuma" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "squfof järjekorra ületäitumine" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s ei ole korrektne positiivne täisarv" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s on liiga suur" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4408,7 +4453,7 @@ msgstr "" "Kasutamine: %s [NUMBER]...\n" " või: %s VÕTI\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -4451,7 +4496,7 @@ msgstr "" "Vormista ümber iga lõik FAILides, kirjuta tulemus standardväljundisse.\n" "Võti -NUMBRID on lühivorm võtmest --width=NUMBRID.\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4463,7 +4508,7 @@ msgstr "" " prefiks säilitatakse\n" " -s, --split-only tükelda pikad read, aga ära täida\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4476,7 +4521,7 @@ msgstr "" " -w, --width=NUMBER maksimaalne rea pikkus (vaikimisi 75 veergu)\n" " -g, --goal=NUMBER eelistatav laius (vaikimisi 93% rea pikkusest)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4485,20 +4530,15 @@ msgstr "" "vigane võti -- %c; -NUMBRID tuntakse ainult juhul, kui see on esimene võti;\n" "kasutage parem -w N" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" -msgstr "vigane laius: %s" +#: src/fmt.c:400 src/fmt.c:407 +msgid "invalid width" +msgstr "vigane laius" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" -msgstr "" -"Murra iga FAILI (vaikimisi standardsisend) rida, väljasta " -"standardväljundisse.\n" +#: src/fold.c:69 +msgid "Wrap input lines in each FILE, writing to standard output.\n" +msgstr "Murra iga FAILI rida, väljasta standardväljundisse.\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4508,10 +4548,9 @@ msgstr "" " -s, --spaces poolita tühikute kohal\n" " -w, --width=LAIUS kasuta 80 asemel use LAIUS sümbolit\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" -msgstr "vigane veergude arv: %s" +#: src/fold.c:283 src/pr.c:831 +msgid "invalid number of columns" +msgstr "vigane veergude arv" #. This is a proper name. See the gettext manual, section Names. #: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 @@ -4582,17 +4621,15 @@ msgstr "ei õnnestu lugeda reaalset GID" msgid "%s: no such user" msgstr "%s: sellist kasutajat pole" -#: src/head.c:109 +#: src/head.c:110 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 "" "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" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4608,7 +4645,7 @@ msgstr "" " kui ees on '-', väljasta igast failist kõik,\n" " välja arvatud viimased K rida\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4616,7 +4653,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:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4628,48 +4665,36 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: fail on liiga palju lühenenud" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: baitide arv on liiga suur" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: ei õnnestu liikuda nihkele %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: ei õnnestu liikuda suhtelisele nihkele %s" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "ridu" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "baite" +msgid "%s: number of bytes is too large" +msgstr "%s: baitide arv on liiga suur" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "vigane ridade arv" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "vigane baitide arv" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "vigane võti lõpus -- %c" @@ -4858,7 +4883,7 @@ msgstr "ei õnnestu muuta %s omanikku" msgid "cannot set time stamps for %s" msgstr "ei õnnestu seada %s ajatempleid" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "süsteemifunktsioon fork ebaõnnestus" @@ -5011,7 +5036,7 @@ msgstr "kataloogi installeerimisel ei saa kasutada võtit strip" msgid "target directory not allowed when installing a directory" msgstr "kataloogi installeerimisel ei saa sihtkataloogi määrata" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "vigane mood %s" @@ -5048,23 +5073,26 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" +"Iga identsete ühendatavate väljadega sisendrea paari korral väljastab rea\n" +"standardväljundisse. Vaikimisi ühendatav väli on esimene, eraldajaks " +"tühemik.\n" + +#: src/join.c:204 +msgid "" "\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 "" -"Iga identsete ühendatavate väljadega sisendrea paari korral väljastab rea \n" -"standardväljundisse. Vaikimisi ühendatav väli on esimene, väljad " -"eraldatakse\n" -"tühemikuga. Kui FAIL1 või FAIL2 (aga mitte mõlemad) on -, loe standard-\n" -"sisendit.\n" "\n" -" -a FAILINUM samuti väljasta paariliseta read failist FAILINUM\n" +" -a FAILINUM samuti väljasta paariliseta read failist FAILINUM,\n" +" kus FILENUM on 1 või 2, vastavalt FAIL1 või FAIL2\n" " -e TÜHI asenda puuduvad sisendväljad sõnaga TÜHI\n" -#: src/join.c:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5076,7 +5104,7 @@ msgstr "" " -o VORMING väljundrea koostamise VORMING\n" " -t SÜMBOL kasuta SÜMBOLit sisend- ja väljundväljade eraldajana\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5096,11 +5124,11 @@ msgstr "" " --header käsitle iga faili esimest rida väljade päistena,\n" " väljasta need muutmata\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr " -z, --zero-terminated lõpeta read reavahetuse asemel baidiga 0\n" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5137,47 +5165,47 @@ msgstr "" "Kui sisend pole järjestatud ja mõningaid ridu ei saa ühendada,\n" "väljastatakse hoiatus.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:%: ei ole järjestatud: %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "vigane välja number: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "vigane välja määrang: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "vigane faili number välja määrangus: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "ühildamatud väljad %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "konfliktsed tühja-välja asendamise sõned" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "mitme-sümboliline tabulaator %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "mitteühilduvad tabulaatorid" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "mõlemad failid ei saa olla standardsisendid" @@ -5252,17 +5280,17 @@ msgstr "signaali ei saa kombineerida võtmetega -l või -t" msgid "no process ID specified" msgstr "puudub protsessi ID" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "stdio puhvri haaramine mahus % ebaõnnestus\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "vigane puhverdamise mood %s argumendil %s\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "%s puhverdust ei saa seada moodi %s\n" @@ -5449,7 +5477,7 @@ msgstr "--relative ei saa kasutada võtmeta --symbolic" msgid "FIXME: unknown" msgstr "FIXME: tundmatu" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Kasutamine: %s [VÕTI]\n" @@ -5462,7 +5490,7 @@ msgstr "" "Väljasta jooksva kasutaja nimi.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "kasutajanime pole" @@ -5472,7 +5500,7 @@ msgstr "kasutajanime pole" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%e. %b %Y" @@ -5481,94 +5509,92 @@ msgstr "%e. %b %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%e. %b %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "eiran vigast keskkonnamuutuja QUOTING_STYLE väärtust: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "eiran vigast laiuse kirjeldust keskkonnamuutujas COLUMNS: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "eiran vigast tabulaatori kirjeldust keskkonnamuutujas TABSIZE: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" -msgstr "vigane rea laius: %s" +#: src/ls.c:1747 +msgid "invalid line width" +msgstr "vigane rea laius" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" -msgstr "vigane tabulaatori suurus: %s" +#: src/ls.c:1815 +msgid "invalid tab size" +msgstr "vigane tabulaatori suurus" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "vigane ajamäärang %s" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "Lubatud argumendid on:\n" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr " - +VORMING (n., +%H:%M) 'date'-stiilis vorming\n" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "viga kuu sõnede initsialiseerimisel" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "tundmatu prefiks: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "arusaamatu väärtus keskkonnamuutuja LS_COLORS jaoks" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "eiran vigast keskkonnamuutuja QUOTING_STYLE väärtust: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "kataloogi %s ei saa avada" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "ei õnnestu tuvastada %s seadet ja i-kirje numbrit" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: ei näita juba näidatud kataloogi" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "loen kataloogi %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "sulen kataloogi %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "failide %s ja %s nimesid ei õnnestu võrrelda" -#: src/ls.c:4781 +#: src/ls.c:4775 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" @@ -5577,7 +5603,7 @@ msgstr "" "Kui ei ole kasutatud võtmeid -cftuvSUX ega --sort, järjesta väljund\n" "tähestikuliselt\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5591,7 +5617,7 @@ msgstr "" " -b, --escape väljasta mitte-esitatavad sümbolid\n" " C-style vormingus\n" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5616,27 +5642,26 @@ msgstr "" "järgi\n" " muidu: järjesta ctime järgi, uusim esimesena\n" -#: src/ls.c:4804 +#: src/ls.c:4798 msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" " -C esita väljund veergudena\n" -" --color[=MILLAL] määra, millal kasutada failitüüpide " -"eristamiseks\n" -" värve; MILLAL on vaikimisi 'always',\n" +" --color[=MILLAL] värvi väljund; MILLAL on vaikimisi 'always',\n" " võib olla ka 'never' või 'auto', Rohkem infot\n" " allpool\n" " -d, --directory näita kataloogide sisu asemel neid endid, ei\n" " lahenda nimeviiteid\n" " -D, --dired vorminda väljund Emacs dired moodile\n" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5652,11 +5677,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time nagu -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr " -g nagu -l, aga ei näita omanikku\n" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5669,7 +5694,7 @@ msgstr "" " täienda võtmega --sort, aga --sort=none (-U)\n" " blokeerib grupeerimise\n" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5682,7 +5707,7 @@ msgstr "" " (n. 1K 234M 2G)\n" " --si sama, kui kasuta 1000 kordseid, mitte 1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5703,7 +5728,7 @@ msgstr "" " --hide=MUSTER ära näita mustrile vastavaid elemente\n" " (-a või -A tühistab)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5721,7 +5746,7 @@ msgstr "" " -I, --ignore=MUSTER ära näita shelli mustrile vastavaid nimesid\n" " -k, --kibibytes vaikimisi kasuta 1024 baidiseid blokke\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5735,7 +5760,7 @@ msgstr "" " asemel infot viidatavast failist\n" " -m väljasta nimed komadega eraldatult\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5752,7 +5777,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:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -5772,7 +5797,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5783,20 +5808,20 @@ msgstr "" " -R, --recursive esita alamkataloogid rekursiivselt\n" " -s, --size väljasta iga faili suurus plokkides\n" -#: src/ls.c:4886 +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" -" -S järjesta faili suuruse järgi\n" +" -S järjesta faili suuruse järgi, suurim enne\n" " --sort=SÕNA kasuta järjestamisel nime asemel sõna: none (-" "U),\n" " size (-S), time (-t), version (-v), extension (-" @@ -5807,7 +5832,7 @@ msgstr "" " status (-c); samuti kasuta antud aega\n" " järjestamise võtmena, kui kasutati --sort=time\n" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -5829,7 +5854,7 @@ msgstr "" " kasutatakse SONA ainult mitte-POSIX lokaadi\n" " muutmise aegade järjestamisel\n" -#: src/ls.c:4908 +#: src/ls.c:4904 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -5838,11 +5863,11 @@ msgstr "" "esimesena\n" " -T, --tabsize=VEERGE sea tabulaatori pikkus (vaikimisi 8 veergu)\n" -#: src/ls.c:4912 +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -5851,26 +5876,29 @@ msgstr "" " võtmega -l: näita kasutamise aega ja " "järjesta\n" " nime järgi;\n" -" muidu: järjesta kasutamise aja järgi\n" +" muidu: järjesta kasutamise aja järgi, uusim " +"enne\n" " -U ära järjesta; väljasta kirjed nagu on " "kataloogis\n" " -v järjesta versiooni järgi\n" -#: src/ls.c:4919 +#: src/ls.c:4915 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 security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=VEERGE määra ekraani laius\n" " -x väljasta nimed ridadesse, mitte veergusesse\n" " -X järjesta tähestikuliselt laiendite järgi\n" " -Z, --context väljasta iga faili kohta turvakontekst\n" -" -1 väljasta üks nimi rea kohta\n" +" -1 väljasta üks nimi rea kohta.\n" +" Väldi '\\n' võtmetega -q või -b\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5885,7 +5913,7 @@ msgstr "" "LS_COLORS mõjutab värviseadeid. Selle muutuja seadmiseks kasutage dircolors\n" "käsku.\n" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5919,46 +5947,48 @@ msgstr "David Madore" 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 "" "Kasutamine: %s [VÕTI]... [FAIL]...\n" "Väljasta või kontrolli %s (%d-bitti) kontrollsummasid.\n" -"Kui FAIL puudub või on -, loe standardsisendit.\n" -"\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" +"\n" " -b, --binary loe binaarmoodis (vaikimisi, kui ei loeta tty stdin)\n" -#: src/md5sum.c:178 -msgid " -b, --binary read in binary mode\n" -msgstr " -b, --binary loe binaarmoodis\n" +#: src/md5sum.c:180 +msgid "" +"\n" +" -b, --binary read in binary mode\n" +msgstr "" +"\n" +" -b, --binary loe binaarmoodis\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr " --tag loo BSD-stiilis kontrollsumma\n" -#: src/md5sum.c:188 +#: src/md5sum.c:191 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:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text loe tekstimoodis (vaikimisi)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -5977,102 +6007,103 @@ msgstr "" " -w, --warn hoiata vigaselt vormindatud kontrollsummadest\n" "\n" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "Summad arvutatakse vastavalt %s kirjeldusele. Summade kontrollimisel\n" "tuleb kasutada selle programmi väljundit. Vaikimisi mood on väljastada\n" -"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" +"rida kontrollsummaga, tühik, seejärel sümbol, mis märgib faili tüüpi\n" +" ('*' binaar- ja tühik tekstifaili korral) ja seejärel iga faili nimi.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: liiga palju kontrollsumma ridu" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: vigaselt vormindatud %s kontrollsumma rida" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: avamine või lugemine ebaõnnestus\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "EBAÕNNESTUS" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "OK" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: korrektselt vormindatud %s kontrollsumma ridu pole" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "HOIATUS: %: vigaselt vormindatud kontrollsumma rida" msgstr[1] "HOIATUS: %: vigaselt vormindatud kontrollsumma read" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "HOIATUS: % näidatud faili ei saanud lugeda" msgstr[1] "HOIATUS: % näidatud faile ei saanud lugeda" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "HOIATUS: % arvutatud kontrollsumma EI klappinud" msgstr[1] "HOIATUS: % arvutatud kontrollsummad EI klappinud" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "--tag ei toeta --text moodi" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "võti --tag ei oma mõtet kontrollsummade kontrollimisel" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, 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:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "võtit --strict on mõtet kasutada ainult kontrollsummade kontrollimisel" @@ -6110,22 +6141,22 @@ msgstr "" " --context[=KTST] nagu -Z, või kui CTX on antud, sea SELinux\n" " või SMACK turvakontekst\n" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "vaikimisi loomise konteksti %s seadmine ebaõnnestus" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" msgstr "ei õnnestu taastada %s konteksti" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "kataloog %s on loodud" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6331,7 +6362,7 @@ msgstr "liiga palju maatrikseid" msgid "with --suffix, template %s must end in X" msgstr "võtmega --suffix, maatriks %s peab lõppema tähega X" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "vigane sufiks %s, sisaldab kataloogi eraldajat" @@ -6464,12 +6495,8 @@ msgid "Scott Bartram" msgstr "Scott Bartram" #: 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 "" -"Väljasta iga FAIL standardväljundisse lisades reanumbrid.\n" -"Kui FAIL puudub või on -, loe standardsisendit.\n" +msgid "Write each FILE to standard output, with line numbers added.\n" +msgstr "Väljasta iga FAIL standardväljundisse lisades reanumbrid.\n" #: src/nl.c:186 msgid "" @@ -6572,27 +6599,23 @@ msgstr "vigane keha nummerdamise stiil: %s" msgid "invalid footer numbering style: %s" msgstr "vigane jaluse nummerdamise stiil: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" -msgstr "vigane alustamise rea number: %s" +#: src/nl.c:501 +msgid "invalid starting line number" +msgstr "vigane alustamise rea number" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" -msgstr "vigane rea numbri samm: %s" +#: src/nl.c:506 +msgid "invalid line number increment" +msgstr "vigane rea numbri samm" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" -msgstr "vigane tühjade ridade arv: %s" +#: src/nl.c:513 +msgid "invalid line number of blank lines" +msgstr "vigane tühjade ridade arv" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" -msgstr "vigane rea numbri välja laius: %s" +#: src/nl.c:520 +msgid "invalid line number field width" +msgstr "vigane rea numbri välja laius" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "vigane rea numbri vorming: %s" @@ -6618,61 +6641,61 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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 "" "\n" -"Kui standardsisend on terminal, suuna see ümber /dev/null pealt.\n" +"Kui standardsisend on terminal, suuna see mitteloetafa faili pealt ümber.\n" "Kui standard väljund on terminal, saada väljund faili 'nohup.out',\n" "kui see võimalik pole, siis faili '$HOME/nohup.out'.\n" "Kui standard veavoog on terminal, suuna see standard väljundisse.\n" -"Väljundi faili suunamiseks, kasutage '%s KÄSKLUS > FAIL'.\n" +"Väljundi faili suunamiseks kasutage '%s KÄSKLUS > FAIL'.\n" #: src/nohup.c:127 #, c-format msgid "failed to render standard input unusable" msgstr "standardsisendi muutmine mittekasutatavaks ebaõnnestus" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "ignoreerin sisendit" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "ignoreerin sisendit ja lisan väljundi faili %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "lisan väljundi faili %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "stderr koopiale ei õnnestu seada omadust 'close on exec'" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "ignoreerin sisendit ja suunan stderr standardväljundisse" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "suunan standardveavoo standardväljundisse" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -6699,101 +6722,100 @@ msgstr "" " --all väljasta installeeritud protsessorite arv\n" " --ignore=N kui võimalik, välista N protsessorit\n" -#: 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "Assaf Gordon" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "väärtus on teisendamiseks liiga suur: %s" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, c-format msgid "invalid number: %s" msgstr "vigane number: %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "ei kasuta sisendi sufiksit: %s (kaaluge --from kasutamist)" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" msgstr "vigane sufiks sisendis: %s" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, 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:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "väärtuse '%Lf' väljastamiseks ettevalmistamine ebaõnnestus" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, c-format msgid "invalid unit size: %s" msgstr "vigane ühiku suurus: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Kasutamine: %s [VÕTI]... [NUMBER]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 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:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr " --debug väljasta hoiatused vigase sisendi kohta\n" -#: src/numfmt.c:824 +#: src/numfmt.c:890 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:827 +#: src/numfmt.c:893 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" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" +msgstr "" +" --field=VÄLJAD asenda numbrid nendel sisendväljadel (vaikimisi 1)\n" +" vaata VÄLJAD allpool\n" -#: src/numfmt.c:830 +#: src/numfmt.c:897 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" +" --format=VORMING kasuta printf stiilis ujukoma vormingut;\n" " detailid leiate allpool\n" -#: src/numfmt.c:834 +#: src/numfmt.c:901 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 " +" --from=ÜHIK määra sisendnumbritele ühiku suurus; vaikimisi " "'none'\n" " ühikute kirjeldus on allpool\n" -#: src/numfmt.c:838 +#: src/numfmt.c:905 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:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6803,7 +6825,7 @@ msgstr "" " --grouping grupeeri numbrid kasutades lokaadi reegleid,\n" " näiteks. 1,000,000\n" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" @@ -6811,7 +6833,7 @@ msgstr "" " --header[=N] väljastab (teisendamata) esimesed N päiserida\n" " vaikimisi N on 1\n" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" @@ -6820,7 +6842,7 @@ msgstr "" "väärtused:\n" " abort (vaikimisi), fail, warn, ignore\n" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -6836,7 +6858,7 @@ msgstr "" "automaatselt\n" " juhul, kui leitakse tühemik\n" -#: src/numfmt.c:860 +#: src/numfmt.c:927 msgid "" " --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" " up, down, from-zero (default), towards-zero, " @@ -6848,7 +6870,7 @@ msgstr "" "zero,\n" " nearest\n" -#: src/numfmt.c:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" @@ -6857,19 +6879,19 @@ msgstr "" "mittekohustuslik\n" " sufiks sisendnumbritel\n" -#: src/numfmt.c:868 +#: src/numfmt.c:935 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:871 +#: src/numfmt.c:938 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:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" @@ -6877,11 +6899,11 @@ msgstr "" "\n" "Ühiku võtmed:\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 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:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6895,7 +6917,7 @@ msgstr "" " 1M = 1000000,\n" " 1Mi = 1048576,\n" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -6907,7 +6929,7 @@ msgstr "" " 1M = 1000000,\n" " ...\n" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -6919,7 +6941,7 @@ msgstr "" " 1M = 1048576,\n" " ...\n" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -6931,7 +6953,27 @@ msgstr "" " 1Mi = 1048576,\n" " ...\n" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"\n" +"VÄLJAD toetavad cut(1) stiilis väljade vahemikke:\n" +" N N-is bait, sümbol või väli, loendamist alustatakse ühest\n" +" N- N-indast baidist, sümbolist või väljast rea lõpuni\n" +" N-M alates N kuni M (kaasa arvatud) baiti, sümbolit või välja\n" +" -M esimesest kuni M-nda (kaasa arvatud) baidi, sümboli või väljani\n" +"\n" +"VÄLJAD/vahemikud eraldatakse komadega\n" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -6940,6 +6982,7 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" "\n" "VORMING peab olema sobiv ühe ujukoma argumendi väljastamiseks '%f'.\n" @@ -6949,8 +6992,9 @@ msgstr "" "Mittekohustuslik null (%010f) laius täidab numbri nullidega.\n" "Mittekohustuslik negatiivne laiuse väärtus (%-10f) määrab väljundi vasakult\n" "joondamise.\n" +"Mittekohustuslik täpsus (%.1f) määrab väljundi täpsuse.\n" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -6969,7 +7013,7 @@ msgstr "" "iga teisendamise vea korral hoiatus, aga lõpetamise kood on 0. Võtme\n" "--invalid='ignore' korral vigadest ei teatata ja lõpetamise kood on 0.\n" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -6984,8 +7028,8 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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 "" @@ -7001,118 +7045,132 @@ msgstr "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "vormingus %s puudub %% direktiiv" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "vigane vorming %s (laius on liiga suur)" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "--format täitmine kirjutab --padding üle" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "vormingu %s lõpus on %%" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" -msgstr "vigane vorming %s, direktiiv peab olema %%[0]['][-][N]f" +msgid "invalid precision in format %s" +msgstr "vigane täpsus vormingus %s" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1126 +#, c-format +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" +msgstr "vigane vorming %s, direktiiv peab olema %%[0]['][-][N][.][N]f" + +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "vormingus %s on liiga palju %% direktiive" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, c-format msgid "invalid suffix in input %s: %s" msgstr "vigane sufiks sisendis %s: %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" +"väärtus/täpsus on väljastamiseks liiga suur: '%Lg/%' (kaaluge --to " +"kasutamist)" + +#: src/numfmt.c:1210 #, 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:1111 +#: src/numfmt.c:1219 #, 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:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "suur sisendväärtus %s: võimalik on täpsuse kadu" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, 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" +msgid "invalid field value %s" +msgstr "vigane välja väärtus: %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, c-format msgid "invalid padding value %s" msgstr "vigane täitmise väärtus %s" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, c-format -msgid "invalid field value %s" -msgstr "vigane välja väärtus: %s" +msgid "multiple field specifications" +msgstr "mitmete väljade määrangud" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, c-format msgid "invalid header value %s" msgstr "vigane päise väärtus %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "--grouping ei saa võtmega --format koos kasutada" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "teisendamise võtit ei antud" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "grupeerimist ei saa kasutada võtmega --to" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "selles lokaadis grupeerimine ei mõju" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "käsurea sisendi korral ignoreetitakse võtit --header" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "viga sisendi lugemisel" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "osade sisendnumbrite teisendamine ebaõnnestus" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7125,24 +7183,21 @@ msgstr "" " või: %s --traditional [VÕTI]... [FAIL] [[+]INDEKS[.][b] [+]MÄRGEND[.]" "[b]]\n" -#: src/od.c:326 +#: src/od.c:327 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" "Väljasta faili üheselt mõistetav esitus (vaikimisi kaheksandbaidid)\n" "standardväljundisse. Enam, kui ühe faili korral väljastatakse nende\n" "sisud järjest vastavalt esitatud järjekorrale.\n" -"Kui FAIL puudub või on -, loe standardsisendit.\n" -"\n" -#: src/od.c:333 +#: src/od.c:335 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" @@ -7150,6 +7205,7 @@ 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" "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" @@ -7157,7 +7213,7 @@ msgstr "" "Indeksi ja märgendi puhul tähistab 0x või 0X kuueteistkümnendesitust,\n" "sufiks võib olla . kaheksandesituse korral ja b tähistab 512 kordseid.\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7172,7 +7228,7 @@ msgstr "" " --endian={big|little} vaheta baidid vastavalt antud järjekorrale\n" " -j, --skip-bytes=BAIDID jäta esimesed BAIDID baiti vahele\n" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -7193,7 +7249,7 @@ msgstr "" " vaikimisi 32\n" " --traditional kasuta traditsioonilisel kujul argumente\n" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -7212,7 +7268,7 @@ msgstr "" " -c sama, kui -t c, vali trükitavad sümbolid või langkriipsuga paojada\n" " -d sama, kui -t u2, vali märgita 2-baidised kümnendarvud\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7228,7 +7284,7 @@ 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:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -7242,7 +7298,7 @@ msgstr "" " a sümbolid nimedega, ülemist bitti ignoreeritakse\"\n" " c trükitav sümbol või langkriipsuga paojada\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7256,7 +7312,7 @@ msgstr "" " u[SUURUS] märgita kümnendarv, SUURUS baiti\n" " x[SUURUS] kuueteiskümnendarv, SUURUS baiti\n" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -7271,7 +7327,7 @@ msgstr "" "sizeof(float), D tähistamaks sizeof(double) või L tähistamaks\n" "sizeof(long double).\n" -#: src/od.c:401 +#: src/od.c:404 msgid "" "\n" "Adding a z suffix to any type displays printable characters at the end of\n" @@ -7281,7 +7337,7 @@ msgstr "" "Lisades igale tüübile sufiksi z, väljastatakse iga rea lõpus olevad\n" "prinditavad sümbolid.\n" -#: src/od.c:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -7304,12 +7360,12 @@ msgstr "" " M 1024*1024\n" "ja nii edasi G, T, P, E, Z, Y korral.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "vigane tüübisõne %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7318,7 +7374,7 @@ msgstr "" "vigane tüübisõne %s;\n" "see süsteem ei realiseeri %lu-baidist sisetüüpi" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7327,37 +7383,37 @@ msgstr "" "vigane tüübisõne %s;\n" "see süsteem ei realiseeri %lu-baidist ujukoma tüüpi" -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" msgstr "vigane sümbol '%c' tüübisõnes %s" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "kombineeritud sisendi lõpust kaugemale liikuda ei saa" -#: src/od.c:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, 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:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "ühilduvuse mood toetab ülimalt ühte faili" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "skip-bytes + read-bytes on liiga suur" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "hoiatus: vigane laius %lu; kasutan selle asemel %d" @@ -7376,11 +7432,9 @@ msgstr "standardsisend suleti" 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 "" "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" #: src/paste.c:447 msgid "" @@ -7518,12 +7572,12 @@ msgstr "Millal" msgid "Where" msgstr "Kust" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Kasutamine: %s [VÕTI]... [KASUTAJA]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7539,7 +7593,7 @@ msgstr "" " -p ära esita kogu infos kasutaja plaani faili\n" " -s väljasta lühiinfo, seda kasutatakse vaikimisi\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7553,7 +7607,7 @@ msgstr "" " -q ära väljasta lühiinfos kasutaja täisnime, masinat ja\n" " eemalolekut\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -7564,97 +7618,92 @@ msgstr "" "Kerge 'finger' programm; väljastab kasutaja kohta infot.\n" "Kasutatakse utmp faili %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" "kasutajanimi puudub; -l kasutamisel peab olema vähemalt üks kasutajanimi" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "'--pages=ESIMENE[:VIIMANE]' puudub argument" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "vigane lehekülgede vahemik %s" -#: 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:967 +msgid "'-l PAGE_LENGTH' invalid number of lines" +msgstr "'-l LEHE_PIKKUS' vigane ridade arv" -#: 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:982 +msgid "'-N NUMBER' invalid starting line number" +msgstr "'-N NUMBER' vigane alustamise rea number" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" -msgstr "'-o ÄÄR' vigane rea nihe: %s" +#: src/pr.c:986 +msgid "'-o MARGIN' invalid line offset" +msgstr "'-o ÄÄR' vigane rea nihe" -#: 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:1023 +msgid "'-w PAGE_WIDTH' invalid number of characters" +msgstr "'-w LEHE_LAIUS' vigane arv sümboleid" -#: 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:1032 +msgid "'-W PAGE_WIDTH' invalid number of characters" +msgstr "'-W LEHE_LAIUS' vigane arv sümboleid" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, 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:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "leht on liiga kitsas" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "alguslege number % ületab lehekülgede arvu %" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "lehekülje numbri ületäitumine" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Lehekülg %" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "Küljenda FAILid trükkimiseks lehekülgedeks või veergudeks.\n" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7671,7 +7720,7 @@ msgstr "" " välja arvatud juhul, kui kasutatakse võtit -a.\n" " Ühtlusta ridade arv veergudes igal lehel.\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7687,7 +7736,7 @@ msgstr "" " -d, --double-space\n" " topeltreavahe väljundis\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7707,7 +7756,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:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7729,22 +7778,28 @@ msgstr "" "veerge\n" " ei joondata, --sep-string[=SÕNE] määrab eraldaja\n" -#: src/pr.c:2798 +#: src/pr.c:2769 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" msgstr "" " -l, --length=LEHE_PIKKUS\n" " sea lehe pikkuseks LEHE_PIKKUS (66) rida (vaikimisi\n" " on teksti ridu 56, võtmega -F 63)\n" +" kui PAGE_LENGTH <= 10, kasutatakse -t\n" + +#: src/pr.c:2775 +msgid "" +" -m, --merge print all files in parallel, one in each column,\n" +" truncate lines, but join lines of full length with -J\n" +msgstr "" " -m, --merge väljasta kõik failid paralleelselt, üks veeru kohta,\n" " lühenda read, ridade kogupikkuses ühendamiseks\n" " kasutage -J\n" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7761,7 +7816,7 @@ msgstr "" " alusta loendamist ühe asemel antud numbrist esimese\n" " trükitava lehe esimesel real (vaata ka +ESIMENE_LEHT)\n" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7775,7 +7830,7 @@ msgstr "" " -r, --no-file-warnings\n" " ära hoiata, kui faili ei saa avada\n" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7792,24 +7847,29 @@ msgstr "" " veergudega seotud võtmete puhul (-VEERG|-a -VEERG|-m),\n" " välja arvatud juhul, kui kasutatakse võtit -w\n" -#: src/pr.c:2828 +#: src/pr.c:2802 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -S[SÕNE], --sep-string[=SÕNE]\n" " eralda veerud SÕNEga,\n" -" võtmeta -S: -J ja korral on vaikimisi eraldaja " -"\n" -" muidu (sama, kui -S\" \"), ei kasutata veergudega\n" -" seotud võtmetega\n" -" -t, --omit-header blokeeri lehe päised ja sabad\n" +" võtmeta -S: -J ja korral on vaikimisi\n" +" eraldaja muidu (sama, kui -S\" \"), ei kasutata\n" +" veergudega seotud võtmetega\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" +" -t, --omit-header blokeeri lehe päised ja sabad;\n" +" vaikimisi kui PAGE_LENGTH <= 10\n" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7832,7 +7892,7 @@ msgstr "" "tekstiveeru\n" " väljundis, -s[sümbol] lülitab välja (72)\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7845,16 +7905,6 @@ 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:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"Kui LEHE_PIKKUS <= 10, kasutatakse -t. Kui FAIL puudub või on -,\n" -"loe standardsisendit.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -8007,18 +8057,25 @@ msgid "" "files.\n" msgstr "Väljasta sisendfailide sõnade kontekstregister.\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 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 väljasta automaatselt loodud viited\n" " -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:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" +" -F, --flag-truncation=SÕNE kasuta ridade lühendamise märkimiseks " +"SÕNE.\n" +" Vaikimisi '/'\n" + +#: src/ptx.c:1839 +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" @@ -8032,7 +8089,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:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8048,7 +8105,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:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8059,19 +8116,16 @@ msgstr "" " -t, --typeset-mode - ei ole realiseeritud -\n" " -w, --width=NUMBER väljasta veergudena, viideteta\n" -#: src/ptx.c:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Kui FAIL puudub või on -, loe standardsisendit. Vaikimisi on '-F /'.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "vigane tühemiku laius: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "vigane rea laius: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8102,7 +8156,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "chdir %s ebaõnnestus" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "stat %s ebaõnnestus" @@ -8122,8 +8176,8 @@ msgstr "ignoreerin argumente, mis ei ole võtmed" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Kasutamine: %s [VÕTI]... [FAIL]...\n" @@ -8379,17 +8433,17 @@ msgstr "" #: src/rm.c:342 #, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " -msgstr[0] "%s: eemaldada %zu argument rekursiivselt? " -msgstr[1] "%s: eemaldada %zu argumenti rekursiivselt? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " +msgstr[0] "%s: eemaldada % argument rekursiivselt? " +msgstr[1] "%s: eemaldada % argumenti rekursiivselt? " #: src/rm.c:345 #, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " -msgstr[0] "%s: eemaldan %zu argumendi? " -msgstr[1] "%s: eemaldan %zu argumenti? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " +msgstr[0] "%s: eemaldan % argumendi? " +msgstr[1] "%s: eemaldan % argumenti? " #: src/rmdir.c:134 src/rmdir.c:233 #, c-format @@ -8604,12 +8658,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "vigane murdarv: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "vormingus %s on tundmatu %%%c direktiiv" -#: src/seq.c:557 +#: src/seq.c:603 #, 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" @@ -8627,7 +8681,15 @@ msgstr "" "Kirjuta antud failid korduvalt üle, et muuta raskemaks andmete taastamine\n" "isegi väga kalli riistvara abil.\n" -#: src/shred.c:177 +#: src/shred.c:174 +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Kui FAIL on -, töötle standard väljundit.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8640,7 +8702,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:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -8655,11 +8717,9 @@ msgstr "" " see on mitte-tavafailide puhul vaikimisi käitumine\n" " -z, --zero varja töötlemist, kirjutades viimase tegevusena nulle\n" -#: src/shred.c:192 +#: src/shred.c:196 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.\n" @@ -8671,8 +8731,6 @@ msgid "" "\n" msgstr "" "\n" -"Kui FAIL on -, töötle standardväljundit.\n" -"\n" "Kustuta failid, kui kasutati võtit --remove (-u). Vaikimisi faile ei\n" "kustutata, kuna enamasti töötatakse seadmefailidega, näiteks /dev/hda,\n" "ja enamasti ei soovita nende eemaldamist. Mittekohustuslik parameeter " @@ -8684,7 +8742,7 @@ msgstr "" "Vaikimisi mood on 'wipesync', aga see võib olla kallis.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8700,7 +8758,7 @@ msgstr "" "ei ole shred efektiivne või ei ole efektiivne kõikides moodides:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8721,7 +8779,7 @@ msgstr "" " Network Appliance NFS server\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8733,7 +8791,7 @@ msgstr "" "\n" "* tihendavad failisüsteemid\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -8753,7 +8811,7 @@ msgstr "" "käsu manualist (man mount).\n" "\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -8763,127 +8821,125 @@ 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:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync ebaõnnestus" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync ebaõnnestus" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: ei saa ümber kerida" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: läbimine %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: viga kirjutamisel aadressile %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek ebaõnnestus" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: fail on liiga suur" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: läbimine %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: läbimine %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat ebaõnnestus" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: vigane failitüüp" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: fail on negatiivse suurusega" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: viga lühendamisel" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl ebaõnnestus" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: ei õnnestu töödelda ainult lisamiseks mõeldud faili" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: eemaldan" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: uus nimi %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: kustutamine ebaõnnestus" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: eemaldatud" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: sulgemine ebaõnnestus" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: faili ei saa kirjutamiseks avada" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" -msgstr "%s: vigane läbimiste arv" +msgid "invalid number of passes" +msgstr "vigane läbimiste arv" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "määrati mitu juhuarvude allikat" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" -msgstr "%s: vigane faili suurus" +#: src/shred.c:1255 +msgid "invalid file size" +msgstr "vigane faili suurus" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -8894,12 +8950,12 @@ msgstr "" " või: %s -e [VÕTI]... [ARG]...\n" " või: %s -i ALG-LÕPP [VÕTI]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" "Kirjuta sisendfailide read juhuslikus permutatsioonis standardväljundisse.\n" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -8916,37 +8972,36 @@ msgstr "" " --random-source=FAIL loe juhuslikud baidid FAIList\n" " -r, --repeat väljundridu võib korrata\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "liiga palju sisendi ridu" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "kasutati mitut -i võtit" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" -msgstr "vigane sisendi vahemik: %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +msgid "invalid input range" +msgstr "vigane sisendi vahemik" -#: src/shuf.c:465 +#: src/shuf.c:459 #, c-format -msgid "invalid line count %s" +msgid "invalid line count: %s" msgstr "vigane ridade arv: %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "määrati mitu väljundfaili" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "-e ja -i võtmeid ei saa kombineerida" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "korratavaid ridu pole" @@ -8972,12 +9027,12 @@ msgstr "" "argumenti, on pausi pikkus kõikide argumentide summa.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "vigane ajaintervall %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "ei õnnestu lugeda reaalaja kella" @@ -8986,7 +9041,7 @@ msgstr "ei õnnestu lugeda reaalaja kella" msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "Kirjuta järjestatud FAILide ühend standardväljundisse.\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -8994,7 +9049,7 @@ msgstr "" "Võtmed järjestamiseks:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9006,7 +9061,7 @@ msgstr "" "numbreid\n" " -f, --ignore-case tööta tõstutundetult\n" -#: src/sort.c:443 +#: src/sort.c:444 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -9016,14 +9071,14 @@ msgstr "" " -i, --ignore-nonprinting kasuta ainult trükitavaid sümboleid\n" " -M, --month-sort võrdle (tundmatu) < 'JAAN' < ... < 'DETS'\n" -#: src/sort.c:448 +#: src/sort.c:449 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:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9036,7 +9091,7 @@ msgstr "" " -r, --reverse pööra võrdluste tulemus\n" "\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9053,7 +9108,7 @@ msgstr "" "tekstis\n" "\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -9061,7 +9116,7 @@ msgstr "" "Muud võtmed:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9069,7 +9124,7 @@ msgstr "" " --batch-size=NMESTI mesti korraga ülimalt NMESTI sisendit;\n" " paremaks ajutiste failide kasutamiseks\n" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -9083,7 +9138,7 @@ msgstr "" " --compress-program=PROG tihenda ajutised failid programmiga PROG;\n" " taastamiseks PROG -d\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9098,7 +9153,7 @@ msgstr "" " nimedega failist F;\n" " Kui F on - siis loe nimed standardsisendist\n" -#: src/sort.c:487 +#: src/sort.c:488 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -9107,7 +9162,7 @@ msgstr "" " ja tüübi.\n" " -m, --merge mesti juba järjestatud failid; ei järjesta\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9119,7 +9174,7 @@ msgstr "" "võrdlus\n" " -S, --buffer-size=MAHT määra mälupuhvri suurus\n" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9142,7 +9197,7 @@ msgstr "" " -u, --unique võtmega -c: kontrolli ranget järjestatust\n" " muidu: väljasta võrdsetest ainult üks\n" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9173,12 +9228,10 @@ msgstr "" "\n" "MAHT järel võib kasutada järgnevaid kordavaid sufikseid:\n" -#: src/sort.c:524 +#: src/sort.c:525 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" @@ -9186,271 +9239,269 @@ msgid "" msgstr "" "% 1% mälust, b 1, K 1024 (vaikimisi), jne tähtedega M, G, T, P, E, Z, Y.\n" "\n" -"Kui FAIL puudub või on -, loe standardsisendit.\n" -"\n" "*** HOIATUS ***\n" "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:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "ootan %s [-d] järel" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] lõpetas ebanormaalselt" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "%s sees ei õnnestu ajutist faili luua" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "open ebaõnnestus" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "fflush ebaõnnestus" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "close ebaõnnestus" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "ajutist faili ei õnnestu luua" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "%s -d jaoks ei õnnestunud protsessi luua" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "hoiatus: ei saa kustutada: %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "vigane --%s argument %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "miinimum --%s argument on %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "--%s argument %s on liiga suur" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "maksimaalne --%s argument praeguse rlimit piiranguga on %s" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "paralleelsuse number peab olema mittenull" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "stat ebaõnnestus" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "lugemine ebaõnnestus" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "sõnede teisendamine ebaõnnestus" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "teisendamata sõne oli %s." -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "^ võtit ei leitud\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "kasutati aeguvat võtit %s; kasutage selle asemel %s" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "võtme %lu laius on null ja ignoreeritakse" -#: src/sort.c:2439 +#: src/sort.c:2438 #, 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:2452 +#: src/sort.c:2451 #, 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:2484 +#: src/sort.c:2483 #, 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:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "võti '-r' rakendub ainult viimase võrdluse korral" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "kirjutamine ebaõnnestus" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: korratu: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "standard veavoog" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "ei saa lugeda" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: vigane välja määrang %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "võtmed '-%s' ei sobi kokku" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: vigane loendur %s alguses" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "vigane kuupäev peale '-'" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "vigane number peale '.'" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "juhuslik sümbol välja määrangus" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "määrati mitu tihendusprogrammi" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "vigane number välja alguses" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "välja number on null" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "sümboli nihe on null" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" msgstr "vigane number peale ','" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "tühi tabulaator" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "failist %s ei õnnestu failide nimesid lugeda" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: vigane null-pikkusega faili nimi" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "%s sisend puudub" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "kasutan %s järjestamise reegleid" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" -msgstr "kasutan lihtsat baidivõrdlust" +msgstr "kasutan lihtsat baitide võrdlust" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "täiendav operand %s pole võtmega -%c lubatud" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" -msgstr "sufiksi pikkus peab olema vähemalt %zu" +msgid "the suffix length needs to be at least %" +msgstr "sufiksi pikkus peab olema vähemalt %" -#: src/split.c:203 +#: src/split.c:224 #, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" -msgstr "Kasutamine: %s [VÕTI]... [SISEND [PREFIKS]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" +msgstr "Kasutamine: %s [VÕTI]... [FAIL [PREFIKS]]\n" -#: src/split.c:207 +#: src/split.c:228 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\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" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" " -a, --suffix-length=N kasuta sufikseid pikkusega N (vaikimisi %d)\n" @@ -9463,10 +9514,12 @@ msgstr "" " -e, --elide-empty-files ära loo tühje faile võtmega '-n'\n" " --filter=KÄSKLUS saada programmi; faili nimi on $FILE\n" " -l, --lines=NUMBER väljasta väljundfaili kohta NUMBER rida\n" +" -t, --separator=E määra kirjete eraldaja;\n" +" '\\0' (null) tähistab NUL sümbolit\n" " -n, --number=TÜKKI loo TÜKKI väljundfaili. Vaata allpoolt\n" " -u, --unbuffered kopeeri sisend kohe väljundiks võtmega '-n r/...'\n" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9474,209 +9527,210 @@ msgstr "" " --verbose väljasta enne iga faili avamist standard veavoogu\n" " diagnostilist infot\n" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" "\n" "TÜKKI võib olla:\n" "N tükelda N failiks vastavalt sisendi mahule\n" "K/N väljasta standardväljundisse N'i K's osa\n" -"l/N tükelda N failiks ridasid poolitamata\n" -"l/K/N väljasta standardväljundisse N'i K's osa ridasid poolitamata\n" +"l/N tükelda N failiks ridu/kirjeid poolitamata\n" +"l/K/N väljasta standardväljundisse N'i K's osa ridu/kirjeid poolitamata\n" "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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "väljundfailide sufiksid said otsa" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "loon faili %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "%s kirjutab sisendi üle; katkestan" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "keskkonna muutuja FILE väärtustamine ei õnnestunud" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "käivitan muutujaga FILE=%s\n" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "ei õnnestu luua toru" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "sulen eelneva toru" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "sulgen väljundtoru" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "liigutan sisendtoru" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "sulgen sisendtoru" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "viga käivitamisel: \"%s -c %s\"" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "sisendtoru sulgemine ebaõnnestus" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "ootan alamprotsessi lõpetamist" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "failiga FILE=%s, signaal %s käsult: %s" -#: src/split.c:481 +#: src/split.c:535 #, 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:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "tundmatu olek käsult (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "ei saa tükeldada enam kui ühel viisil" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" -msgstr "%s: vigane osade arv" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +msgid "invalid number of chunks" +msgstr "vigane osade arv" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" -msgstr "%s: vigane osa number" +#: src/split.c:1212 +msgid "invalid chunk number" +msgstr "vigane osa number" -#: src/split.c:1169 +#: src/split.c:1259 +msgid "invalid suffix length" +msgstr "vigane sufiksi pikkus" + +#: src/split.c:1333 #, c-format -msgid "%s: invalid suffix length" -msgstr "%s: vigane sufiksi pikkus" +msgid "empty record separator" +msgstr "tühi kirjete eraldaja" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1344 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: vigane baitide arv" +msgid "multi-character separator %s" +msgstr "mitme-sümboliline eraldaja %s" -#: src/split.c:1213 src/split.c:1360 +#: src/split.c:1352 #, c-format -msgid "%s: invalid number of lines" -msgstr "%s: vigane ridade arv" +msgid "multiple separator characters specified" +msgstr "määrati mitu eraldamis sümbolit" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "ridade arvu võti -%s%c... on liiga suur" -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: vigane sufiksi alustamise number" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" -msgstr "%s: vigane IO bloki suurus" +#: src/split.c:1419 +msgid "invalid IO block size" +msgstr "vigane IO bloki suurus" -#: src/split.c:1347 +#: src/split.c:1437 #, 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:1384 +#: src/split.c:1477 #, 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:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "%s kanoniseerimine ebaõnnestus" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "hoiatus: tundmatu jada '\\%c'" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: vigane direktiiv" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "hoiatus: langkriips vormingu lõpus" -#: src/stat.c:1262 +#: src/stat.c:1265 #, 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:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "ei õnnestu lugeda %s failisüsteemi informatsiooni" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9692,7 +9746,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9702,30 +9756,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "Kontekst=%C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9737,11 +9791,11 @@ msgstr "" "Muutmine: %z\n" " Sünd: %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "Näita faili või failisüsteemi olekut.\n" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" @@ -9749,7 +9803,7 @@ msgstr "" " -L, --dereference järgi viiteid\n" " -f, --filesystem esita faili oleku asemel failisüsteemi olek\n" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9766,7 +9820,7 @@ msgstr "" " Kui soovite reavahetust, kasutage \\n.\n" " -t, --terse esita info lakooniliselt\n" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9786,7 +9840,7 @@ msgstr "" " %B iga `%b' poolt antud bloki maht baitides\n" " %C SELinux turvakontekst\n" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9802,7 +9856,7 @@ msgstr "" " %g omaniku grupi ID\n" " %G omaniku grupi nimi\n" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9824,7 +9878,7 @@ msgstr "" " %t sümbol/blokk seadme kuueteistkümnendsüsteemis põhinumber\n" " %T sümbol/blokk seadme kuueteistkümnendsüsteemis alamnumber\n" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9850,7 +9904,7 @@ msgstr "" " %Z viimane oleku muutmine, sekundites alates epohhist\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9868,7 +9922,7 @@ msgstr "" " %d vabu failikirjeid failisüsteemis\n" " %f vabu blokke failisüsteemis\n" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9942,8 +9996,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -9973,7 +10026,7 @@ msgstr "reapuhver standardsisendil ei oma mõtet" msgid "you must specify a buffering mode option" msgstr "peab olema määratud puhverdamise mood" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9984,11 +10037,11 @@ msgstr "" " või: %s [-F SEADE] [--file=SEADE] [-a|--all]\n" " või: %s [-F SEADE] [--file=SEADE] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "Näita või muuda terminali seadistust.\n" -#: src/stty.c:528 +#: src/stty.c:536 msgid "" " -a, --all print all current settings in human-readable form\n" " -g, --save print all current settings in a stty-readable form\n" @@ -9999,7 +10052,7 @@ msgstr "" "loetavalt\n" " -F, --file=SEADE ava ja kasuta standardsisendi asemel antud seadet\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10010,118 +10063,159 @@ msgstr "" "mittevastavat seadet. Seadete kasutatavuse määrab kasutatav\n" "operatsioonisüsteem.\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" +"\n" +"Erisümbolid:\n" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr " * discard SÜMBOL lülitab väljundist loobumist\n" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" +" * dsusp SÜMBOL saadab terminali peatamise signaali, kui sisend on loetud\n" + +#: src/stty.c:561 +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" -"\n" -"Spetsiaalsümbolid:\\n\"\n" -" * dsusp SÜMBOL SÜMBOL saadab terminali peatamise signaali, kui sisend on " -"loetud\n" " 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr " * eol2 SÜMBOL alternatiivne SÜMBOL rea lõpetamiseks\n" + +#: src/stty.c:570 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 SÜMBOL alternatiivne SÜMBOL rea lõpetamiseks\n" " erase SÜMBOL SÜMBOL kustutab viimati kirjutatud sümboli\n" " intr SÜMBOL SÜMBOL saadab katkestamise signaali\n" " kill SÜMBOL SÜMBOL kustutab jooksva rea\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" -msgstr "" -" * lnext SÜMBOL SÜMBOL sisestab järgmise sümboli kvoodituna\n" -" quit SÜMBOL SÜMBOL saadab väljumise signaali\n" -" * 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:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr " * lnext SÜMBOL SÜMBOL sisestab järgmise sümboli kvoodituna\n" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr " * status SÜMBOL SÜMBOL saadab info signaali\n" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr " quit SÜMBOL SÜMBOL saadab väljumise signaali\n" -#: src/stty.c:559 +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr " * rprnt SÜMBOL SÜMBOL joonistab jooksva rea uuesti\n" + +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 "" +" start SÜMBOL SÜMBOL jätkab väljundit peale peatamist\n" " stop SÜMBOL SÜMBOL peatab väljundi\n" " susp SÜMBOL SÜMBOL saadab terminali peatamise signaali\n" -" * swtch SÜMBOL SÜMBOL vahetab käsuinterpretaatori taset\n" -" * werase SÜMBOL SÜMBOL kustutab viimati kirjutatud sõna\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr " * swtch SÜMBOL SÜMBOL vahetab käsuinterpretaatori taset\n" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr " * werase SÜMBOL SÜMBOL kustutab viimati kirjutatud sõna\n" + +#: src/stty.c:608 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 "" "\n" "Spetsiaalseaded:\n" " N sea sisendi ja väljundi kiiruseks N boodi\n" + +#: src/stty.c:614 +msgid "" +" * cols N tell the kernel that the terminal has N columns\n" +" * columns N same as cols N\n" +msgstr "" " * cols N teata tuumale, et terminalil on N veergu\n" " * columns N sama, kui cols N\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr " ispeed N sea sisendi kiiruseks N\n" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr " * line N kasuta liiniseadeid N\n" + +#: src/stty.c:627 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 "" -" ispeed N sea sisendi kiiruseks N\n" -" * line N kasuta liiniseadeid N\n" " min N -icanon omadusega, sea lugemise lõpetamiseks min, N " "sümbolit\n" " ospeed N sea väljundi kiiruseks N\n" -#: src/stty.c:578 +#: src/stty.c:632 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 "" " * rows N teata tuumale, et terminalil on N rida\n" " * size väljasta terminali veerud ja read, vastavalt tuuma infole\n" + +#: src/stty.c:637 +msgid "" +" speed print the terminal speed\n" +" time N with -icanon, set read timeout of N tenths of a second\n" +msgstr "" " speed väljasta terminali kiirus\n" " time N -icanon omadusega, sea lugemise taimout N sekundi " "kümnendikku\n" -#: src/stty.c:584 +#: src/stty.c:641 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" -" * [-]cdtrdsr luba DRT/DSR vookontroll\n" -" csN sea sümboli suuruseks N bitti, N vahemikust [5..8]\n" -#: src/stty.c:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr " * [-]crtscts luba RTS/CTS vookontroll\n" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr " * [-]cdtrdsr luba DTR/DSR vookontroll\n" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr " csN sea sümboli suuruseks N bitti, N vahemikust [5..8]\n" + +#: src/stty.c:660 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -10129,16 +10223,18 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb kasuta sümboli kohta kaht stop bitti (üks '-' korral)\n" " [-]hup saada hangup signaal, kui viimane protsess suleb tty\n" " [-]hupcl sama, kui [-]hup\n" " [-]parenb genereeri väljundis paarsusbitt ja eelda paarsust sisendis\n" " [-]parodd sea paaritu paarsus (paaris '-' korral)\n" -" * [-]cmspar kasuta \\\"stick\\\" (mark/space) paarsust\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr " * [-]cmspar kasuta \"stick\" (mark/space) paarsust\n" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -10146,6 +10242,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Sisendiseaded:\n" @@ -10153,206 +10250,295 @@ msgstr "" " [-]icrnl tõlgi rea algusse sümbol reavahetuseks\n" " [-]ignbrk ignoreeri break sümbolit\n" " [-]igncr ignoreeri rea algusse sümbolit\n" +" [-]ignpar ignoreeri paarsusveaga sümboleid\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr " * [-]imaxbel piiksu ja ära tühjenda täis sisendpuhvrit\n" + +#: src/stty.c:686 +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -" [-]ignpar ignoreeri paarsusveaga sümboleid\n" -" * [-]imaxbel piiksu ja ära tühjenda täis sisendpuhvrit\n" " [-]inlcr tõlgi reavahetus rea algusse sümboliks\n" " [-]inpck luba sisendi paarsuse kontroll\n" " [-]istrip eemalda sisendsümbolitelt ülemine (8-s) bitt\n" -#: src/stty.c:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" " * [-]iutf8 eelda et sisendsümbolid kasutavad UTF-8 kooditabelit\n" -#: src/stty.c:619 +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr " * [-]iuclc tõlgi suurtähed väikesteks\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" +" * [-]ixany luba väljundit alustada igal, mitte ainult start sümbolil\n" + +#: src/stty.c:706 +msgid "" " [-]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 "" -" * [-]iuclc tõlgi suurtähed väiketähtedeks\n" -" * [-]ixany luba väljundit alustada igal, mitte ainult start sümbolil\n" " [-]ixoff luba start/stop sümbolite edastus\n" " [-]ixon luba XON/XOFF vookontroll\n" " [-]parmrk märgi paarsusvead (kasutatakse 255-0-sümbol järjendis)\n" " [-]tandem sama, kui [-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" "\n" "Väljundi seaded:\n" -" * bsN samm tagasi viivitus, N vahemikust [0..1]\n" -" * crN rea algusse viivitus, N vahemikust [0..3]\n" -" * ffN lehevahetuse viivitus, N vahemikust [0..1]\n" -" * nlN reavahetuse viivitus, N vahemikust [0..1]\n" -#: src/stty.c:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr " * bsN samm tagasi viivitus, N vahemikust [0..1]\n" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr " * crN rea algusse viivitus, N vahemikust [0..3]\n" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr " * ffN lehevahetuse viivitus, N vahemikust [0..1]\n" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr " * nlN reavahetuse viivitus, N vahemikust [0..1]\n" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr " * [-]ocrnl tõlgi rea algusse sümbol reavahetuseks\n" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" -" * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" msgstr "" -" * [-]ocrnl tõlgi rea algusse sümbol reavahetuseks\n" " * [-]ofdel kasuta täitesümbolitena NUL asemel kustutamise sümbolit\n" -" * [-]ofill kasuta viivitustel ootamise asemel täitesümboleid\n" -" * [-]olcuc tõlgi väiketähed suurtähtedeks\n" -" * [-]onlcr tõlgi reavahetus paariks rea algusse-reavahetus\n" -" * [-]onlret reavahetus käitub, nagu rea algusse sümbol\n" -#: src/stty.c:643 +#: src/stty.c:747 +msgid "" +" * [-]ofill use fill (padding) characters instead of timing for delays\n" +msgstr " * [-]ofill kasuta viivitustel ootamise asemel täitesümboleid\n" + +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr " * [-]olcuc tõlgi väiketähed suurtähtedeks\n" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr " * [-]onlcr tõlgi reavahetus paariks rea algusse-reavahetus\n" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr " * [-]onlret reavahetus käitub, nagu rea algusse sümbol\n" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr " * [-]onocr ära väljasta esimesel veerul rea algusse sümbolit\n" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr " [-]opost väljundi järeltöötlus\n" + +#: src/stty.c:775 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 "" -" * [-]onocr ära väljasta esimesel veerul rea algusse sümbolit\n" -" [-]opost väljundi järeltöötlus\n" " * tabN horisontaalse tabulaatori viivitus, N vahemikust [0..3]\n" -" * tabs sama, kui tab0\n" -" * -tabs sama, kui tab3\n" +" * tabs sama kui tab0\n" +" * -tabs sama kui tab3\n" + +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" " * vtN vertikaalse tabulaatori viivitus, N vahemikust [0..1]\n" -#: src/stty.c:651 +#: src/stty.c:786 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 "" "\n" "Lokaalsed seaded:\n" " [-]crterase korda kustutamise sümbolit kui samm tagasi-tühik-samm " "tagasi\n" + +#: src/stty.c:792 +msgid "" +" * 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 "" " * crtkill surma terve rida vastavalt echoprt ja echoe seadetele\n" " * -crtkill surma terve rida vastavalt echoctl ja echok seadetele\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr " * [-]ctlecho korda kontrollsümboleid katus notatsioonis ('^c')\n" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr " [-]echo väljasta sisendsümbolid\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr " * [-]echoctl sama kui [-]ctlecho\n" + +#: src/stty.c:810 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 "" -" * [-]ctlecho korda kontrollsümboleid katus notatsioonis ('^c')\n" -" [-]echo korda sisendi sümboleid\n" -" * [-]echoctl sama, kui [-]ctlecho\n" -" [-]echoe sama, kui [-]crterase\n" +" [-]echoe sama kui [-]crterase\n" " [-]echok väljasta kill sümboli järel reavahetus\n" -#: src/stty.c:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr " * [-]echoke sama kui [-]crtkill\n" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" +" [-]echonl korda reavahetust isegi, kui teisi sümboleid ei korrata\n" + +#: src/stty.c:823 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 "" -" * [-]echoke sama, kui [-]crtkill\n" -" [-]echonl korda reavahetust isegi, kui teisi sümboleid ei korrata\n" " * [-]echoprt korda kustutatud sümboleid esitades neid '\\' ja '/' vahel\n" -" [-]icanon luba spetsiaalsümbolid erase, kill, werase ja rprnt\n" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr " * [-]extproc luba \"LINEMODE\"; kasulik suure latentsi korral\n" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" +" [-]iexten enable non-POSIX special characters\n" +msgstr "" +" [-]icanon luba spetsiaalsümbolid: %s\n" " [-]iexten luba POSIX mittevastavad spetsiaalsümbolid\n" -#: src/stty.c:672 +#: src/stty.c:843 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 "" " [-]isig luba spetsiaalsümbolid interrupt, quit ja suspend\n" " [-]noflsh keela tühjendamine peale katkestamise ja väljumise " "sümboleid\n" -" * [-]prterase sama, kui [-]echoprt\n" -" * [-]tostop peata taustatööd, mis üritavad terminalile kirjutada\n" -" * [-]xcase icanon omadusega, kasuta suurtähtede ees '\\'\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr " * [-]prterase sama kui [-]echoprt\n" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr " * [-]tostop peata taustatööd mis üritavad terminalile kirjutada\n" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr " * [-]xcase icanon omadusega, kasuta suurtähtede ees '\\'\n" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" -" cbreak same as -icanon\n" -" -cbreak same as icanon\n" msgstr "" "\n" "Kombineeritud seaded:\n" -" * [-]LCASE sama, kui [-]lcase\n" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr " * [-]LCASE sama kui [-]lcase\n" + +#: src/stty.c:871 +msgid "" +" cbreak same as -icanon\n" +" -cbreak same as icanon\n" +msgstr "" " cbreak sama, kui -icanon\n" " -cbreak sama, kui icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 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 sama, kui brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof ja eol sümbolid seatakse vaikimisi väärtustele\n" " -cooked sama, kui raw\n" -" crt sama, kui echoe echoctl echoke\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr " crt sama kui %s\n" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" +" kill ^u\n" +msgstr "" +" dec sama kui %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr " * [-]decctlq sama kui [-]ixany\n" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -" dec sama, kui echoe echoctl echoke -ixany intr ^c erase 0177\n" -" kill ^u\n" -" * [-]decctlq sama, kui [-]ixany\n" " ek erase ja kill sümbolid seatakse vaikimisi väärtustele\n" -" evenp sama, kui parenb -parodd cs7\n" +" evenp sama kui parenb -parodd cs7\n" +" -evenp sama kui -parenb cs8\n" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr " * [-]lcase sama kui xcase iuclc olcuc\n" -#: src/stty.c:699 +#: src/stty.c:919 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 "" -" -evenp sama, kui -parenb cs8\n" -" * [-]lcase sama, kui xcase iuclc olcuc\n" -" litout sama, kui -parenb -istrip -opost cs8\n" -" -litout sama, kui parenb istrip opost cs7\n" -" nl sama, kui -icrnl -onlcr\n" -" -nl sama, kui icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" +" litout sama kui -parenb -istrip -opost cs8\n" +" -litout sama kui parenb istrip opost cs7\n" + +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +" nl sama kui %s\n" +" -nl sama kui %s\n" -#: src/stty.c:707 +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10366,35 +10552,37 @@ msgstr "" " pass8 sama, kui -parenb -istrip cs8\n" " -pass8 sama, kui parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw sama, kui -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 sama, kui cooked\n" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" +" -raw sama kui cooked\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -" sane sama, kui 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, kõik\n" -" spetsiaalsümbolid seatakse vaikimisi väärtustele\n" +" sane sama kui cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" kõik spetsiaalsümbolid seatakse vaikimisi väärtustele\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10409,12 +10597,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:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "lubatud on ainult üks seade" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10423,46 +10611,50 @@ msgstr "" "inimesele loetava ja programmile loetava väljundi seaded on üksteist " "välistavad" -#: src/stty.c:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: ei õnnestu eemaldada mitte-blokeeruvat moodi" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "vigane argument %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "%s nõuab argumenti" -#: src/stty.c:987 +#: src/stty.c:1283 +#, c-format +msgid "%s: error setting %s" +msgstr "%s: viga %s seadmisel" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "vigane liini määrang %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: kõiki nõutud operatsioone ei õnnestunud sooritada" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: sellel seadmel puudub info suuruse kohta" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" -msgstr "vigane numbriline argument %s" +#: src/stty.c:2279 +msgid "invalid integer argument" +msgstr "vigane numbriline argument" #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 @@ -10470,32 +10662,76 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +msgid "Print checksum and block counts for each FILE.\n" +msgstr "Väljasta iga FAILI kohta kontrollsumma ja blokkide arv.\n" + +#: src/sum.c:68 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 "" -"Väljasta iga faili kohta kontrollsumma ja blokkide arv.\n" "\n" " -r kasuta BSD sum algoritmi, kasuta 1K blokke\n" " -s, --sysv kasuta System V sum algoritmi, kasuta 512 baidiseid " "blokke\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Kasutamine: %s [VÕTI] [FAIL]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" +"\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" msgstr "" -"Salvesta muutused kettale, uuenda superplokki.\n" +"Sünkroniseeri puhverdatud kirjutamised püsivale kandjale\n" +"\n" +"Kui on näidatud faile, sünkroniseeri ainult need või neid sisaldavad\n" +"failisüsteemid.\n" "\n" -#: src/sync.c:69 +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" +" -d, --data sünkroniseeri ainult failide andmed, mitte " +"metainfo\n" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" +" -f, --file-system sünkroniseeri faile sisaldavad failisüsteemid\n" + +#: src/sync.c:114 #, c-format -msgid "ignoring all arguments" -msgstr "ignoreerin kõiki argumente" +msgid "error opening %s" +msgstr "viga %s avamisel" -#: src/system.h:343 +#: src/sync.c:124 +#, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "ei õnnestu eemaldada mitte-blokeeruvat moodi %s" + +#: src/sync.c:154 +#, c-format +msgid "error syncing %s" +msgstr "viga %s sünkroniseerimisel" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "--data ja --file-system ei saa korraga kasutada" + +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "--data vajab vähemalt üht argumenti" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10509,15 +10745,23 @@ msgstr "" "eelistatakse siinkirjeldatule. Täpsemat infot ja kasutusjuhendi leiate\n" "oma käsuinterpretaatori dokumentatsioonist.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help väljasta see abiinfo ja lõpeta töö\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version väljasta versiooniinfo ja lõpeta töö\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Kui FAIL puudub või on -, loe standardsisendit.\n" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -10526,7 +10770,7 @@ msgstr "" "Kohustuslikud argumendid pikkadele võtmetele on kohustuslikud ka " "lühikestele.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10537,7 +10781,7 @@ msgstr "" "SUURUS on täisarv ja võimalik ühik (näiteks: 10K on 10*1024). Ühikud\n" "on K, M, G, T, P, E, Z, Y (1024 kordsed) või KB, MB, ... (1000 kordsed).\n" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10551,7 +10795,7 @@ msgstr "" "keskkonnamuutujatest. Muidu on ühik vaikimisi 1024 (või 512, kui \n" "POSIXLY_CORRECT on seatud).\n" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -10564,24 +10808,28 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" "Teatage %s tõlkevigadest aadressil \n" -#: src/system.h:584 +#: src/system.h:604 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" -msgstr "" -"Täieliku dokumentatsiooni saate käsuga: info coreutils '%s invocation'\n" +msgid "Full documentation at: <%s%s>\n" +msgstr "Kogu dokumentatsioon: <%s%s>\n" -#: src/system.h:591 +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "või lokaalselt: info '(coreutils) %s%s'\n" + +#: src/system.h:613 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Lisainfo saamiseks proovige '%s --help'.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10602,12 +10850,8 @@ msgid "Jay Lepreau" msgstr "Jay Lepreau" #: 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 "" -"Kirjuta iga FAIL standardväljundisse, viimane rida esimesena.\n" -"Kui FAIL puudub või on -, loe standardsisendit.\n" +msgid "Write each FILE to standard output, last line first.\n" +msgstr "Kirjuta iga FAIL standardväljundisse, viimane rida esimesena.\n" #: src/tac.c:144 msgid "" @@ -10619,63 +10863,61 @@ msgstr "" " -r, --regex interpreteeri eraldajat regulaaravaldisena\n" " -s, --separator=SÕNE kasuta reavahetuse asemel eraldajana SÕNE\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: seek ebaõnnestus" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "kirje on liiga suur" -#: src/tac.c:450 +#: src/tac.c:459 #, c-format msgid "failed to create temporary file in %s" msgstr "%s sees ei õnnestu ajutist faili luua" -#: src/tac.c:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" msgstr "faili %s ei saa kirjutamiseks avada" -#: src/tac.c:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" msgstr "%s voogu ei saa kerida" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: viga kirjutamisel" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "%s ei õnnestu lugemiseks avada" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "eraldaja ei või olla tühi" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 +#: src/tail.c:257 #, 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 "" "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" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" @@ -10684,7 +10926,7 @@ msgstr "" " et väljastada baidid igast failist alustades\n" " K-ndast baidist\n" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10696,7 +10938,7 @@ msgstr "" " puuduv argument tähendab 'descriptor'\n" " -F sama, kui --follow=nimi --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10721,7 +10963,7 @@ msgstr "" " logifailidega); inotify korral pole seda võtit\n" " eriti vaja\n" -#: src/tail.c:293 +#: src/tail.c:288 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10732,7 +10974,7 @@ msgstr "" " --retry jätka faili avamise üritamist, isegi kui see\n" " on mittekasutatav\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -10747,7 +10989,7 @@ msgstr "" " protsessi P vähemalt N sekundi järel\n" " -v, --verbose väljasta alati päised faili nimega\n" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -10766,7 +11008,7 @@ msgstr "" "G 1024*1024*1024 ja nii edasi tähtedega T, P, E, Z, Y.\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -10783,22 +11025,22 @@ msgstr "" "seda perioodiliselt uuesti, millega testitakse faili ümber nimetatmist,\n" "kustutamist ja uuesti loomist.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "sulen %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: ei õnnestu liikuda lõpu-suhtelisele nihkele %s" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "%s asukohta ei õnnestu tuvastada. kasutan pollimist" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -10807,149 +11049,147 @@ msgstr "" "tundmatu failisüsteemi tüüp 0x%08lx %s jaoks. Palun saatke raport: %s. " "kasutan pollimist" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "%s asendati nimeviitega; ei jälgi seda enam" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s pole enam kasutatav" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s on jälle kasutatav" -#: src/tail.c:1035 +#: src/tail.c:1032 #, c-format -msgid "%s has appeared; following end of new file" -msgstr "%s tekkis; järgin uue faili lõppu" +msgid "%s has appeared; following new file" +msgstr "%s tekkis; järgin uut faili" -#: src/tail.c:1046 +#: src/tail.c:1042 #, c-format -msgid "%s has been replaced; following end of new file" -msgstr "%s asendati; järgin uue faili lõppu" +msgid "%s has been replaced; following new file" +msgstr "%s asendati; järgin uut faili" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: ei õnnestu muuta mitte-blokeeruvat moodi" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: fail on lühendatud" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "rohkem faile pole" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "ei õnnestu jälgida %s vanemkataloogi" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "inotify ressursid said otsa" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "%s ei õnnestu jälgida" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, c-format +msgid "%s was replaced" +msgstr "%s: on asendatud" + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "viga inotify sündmuse monitoorimisel" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "viga inotify sündmuse lugemisel" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "%s: seda tüüpi faili lõppu ei saa järgida; annan alla" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "%s number on liiga suur" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" -msgstr "%s: vigane maksimum arv mittemuutunud atribuute avamiste vahel" +#: src/tail.c:2083 +msgid "invalid maximum number of unchanged stats between opens" +msgstr "vigane maksimum arv mittemuutunud atribuute avamiste vahel" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" -msgstr "%s: vigane PID" +#: src/tail.c:2091 +msgid "invalid PID" +msgstr "vigane PID" -#: src/tail.c:2068 +#: src/tail.c:2107 #, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: vigane arv sekundeid" +msgid "invalid number of seconds: %s" +msgstr "vigane sekundite arv: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "võtit kasutati vales kontekstis -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" "hoiatus: --retry ignoreeritakse; --retry on kasulik ainult failide jälgimisel" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "hoiatus: --retry mõjub ainult algsele avamisele" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" "hoiatus: PID ignoreeritakse; --pid=PID on kasulik ainult failide jälgimisel" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "hoiatus: --pid=PID ei ole selles süsteemis toetatud" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "ei õnnestu %s nime järgi leida" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "hoiatus: standardsisendi lõpmatu jälgimine ei toimi" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "inotify ei saa kasutada, kasutan pollimist" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -10961,60 +11201,82 @@ msgstr "" " -a, --append lisa antud FAILidesse, ära kirjuta üle\n" " -i, --ignore-interrupts ignoreeri katkestusi\n" -#: src/tee.c:71 +#: src/tee.c:93 +msgid "" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" +msgstr "" +" -p, --output-error[=MOOD] käitumine kirjutamise vea korral. Vaata edasi\n" + +#: src/tee.c:98 msgid "" "\n" -"If a FILE is -, copy again to standard output.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" msgstr "" "\n" -"Kui FAIL on -, kopeeri uuesti standardväljundisse.\n" +"MOOD määrab käitumise kirjutamise vigade korral:\n" +" 'warn' diagnoosi vead igal kirjutamisel\n" +" 'warn-nopipe' diagnoosi vead igal kirjutamisel v.a. torru kirjutamisel\n" +" 'exit' lõpeta töö iga vea korral\n" +" 'exit-nopipe' lõpeta töö iga vea korral, v.a. torru kirjutamisel\n" +"Vaikimisi MOOD võtmele -p on 'warn-nopipe'.\n" +"Kui --output-error pole antud, on vaikimisi operatsioon lõpetada töö kohe\n" +"vea korral torru kirjutamisel ja muidu anda diagnoos.\n" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "%s nõuab argumenti" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "vigane täisarv %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "')' puudub" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "')' puudub, leidsin %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: oodati unaarset operaatorit" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt ei luba -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef ei luba -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot ei luba -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "tundmatu binaarne operaator" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: oodati binaarset operaatorit" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11028,7 +11290,7 @@ msgstr "" " või: [ ]\n" " või: [ VÕTI\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11036,7 +11298,7 @@ msgstr "" "Lõpeta olekuga, mille määrab AVALDIS.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11047,7 +11309,7 @@ msgstr "" "AVALDIS on kas tõene või väär ja seab lõpetamise oleku.\n" "Avaldis on üks järgnevaist:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11061,7 +11323,7 @@ msgstr "" " AVALDIS1 -a AVALDIS2 nii AVALDIS1, kui ka AVALDIS2 on tõesed\n" " AVALDIS1 -o AVALDIS2 kas AVALDIS1 või AVALDIS2 on tõene\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11077,7 +11339,7 @@ msgstr "" " SÕNE1 = SÕNE2 sõned on võrdsed\n" " SÕNE1 != SÕNE2 sõned ei ole võrdsed\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11095,7 +11357,7 @@ msgstr "" " NUMBER1 -lt NUMBER2 NUMBER1 on väiksem, KUI NUMBER2\n" " NUMBER1 -ne NUMBER2 NUMBER1 ja NUMBER2 ei ole võrdsed\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11107,7 +11369,7 @@ msgstr "" " FAIL1 -nt FAIL2 FAIL1 on uuem (muutmise aeg), kui FAIL2\n" " FAIL1 -ot FAIL2 FAIL1 on vanem, kui FAIL2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11121,7 +11383,7 @@ msgstr "" " -d FAIL FAIL on olemas ja on kataloog\n" " -e FAIL FAIL on olemas\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11135,7 +11397,7 @@ msgstr "" " -h FAIL FAIL on olemas ja on nimeviide (sama, kui -L)\n" " -k FAIL FAIL on olemas ja omab kleepimisõigust\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11149,7 +11411,7 @@ msgstr "" " -r FAIL FAIL on olemas ja on loetav\n" " -s FAIL FAIL on olemas ja tema suurus on suurem kui null\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11163,7 +11425,7 @@ msgstr "" " -w FAIL FAIL on olemas ja on kirjutatav\n" " -x FAIL FAIL on olemas ja on käivitatav (või otsitav)\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11179,7 +11441,7 @@ msgstr "" "kvootimise või langkriipsuga kaitsmise näol. NUMBER võib olla ka -l SÕNE,\n" "mis tähistab siis SÕNE pikkust.\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11189,25 +11451,25 @@ msgstr "" "MÄRKUS: [ arvestab --help ja --version võtmeid, aga test mitte.\n" "test käsitleb neid nagu igat teist mittetühja sõne.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test ja/või [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "puudub ']'" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "liigne argument: %s" @@ -11227,7 +11489,7 @@ msgstr "hoiatus: timer_settime" msgid "warning: timer_create" msgstr "hoiatus: timer_create" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11236,12 +11498,12 @@ msgstr "" "Kasutamine: %s [VÕTI] KESTUS KÄSKLUS [ARGUMENT]...\n" " või: %s [VÕTI]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" "Käivita käsk ja tapa see, kui see pole peale antud aega veel lõpetanud.\n" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11273,7 +11535,7 @@ msgstr "" " SIGNAAL võib olla nimi, nagu 'HUP', või number;\n" " signaalide nimekirja saate käsuga 'kill -l`\n" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11284,7 +11546,7 @@ msgstr "" "KESTUS on ujukomaarv järgneva võimaliku sufiksiga:\n" "'s' on sekundit(vikimisi), 'm' on minutit, 'h' on tunde ja 'd' on päevi.\n" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -11306,7 +11568,7 @@ msgstr "" "KILL (9) signaali, sest seda signaali ei saa kinni püüda. KILL (9) korral\n" "on lõpetamise kood 128+9, mitte 124.\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "hoiatus: mälupildi salvaestamise keelamine ei õnnestunud" @@ -11321,6 +11583,11 @@ msgstr "viga käsu järele ootamisel" msgid "the monitored command dumped core" msgstr "jälgitav käsk salvestas core faili" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "tundmatu olek käsult (%d)" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -11683,12 +11950,12 @@ msgstr "Lõpeta koodiga, mis tähistab õnnestumist." msgid "Exit with a status code indicating failure." msgstr "Lõpeta koodiga, mis tähistab viga." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Kasutamine: %s VÕTI... [FAIL]...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -11706,18 +11973,18 @@ msgstr "" "Kui fail on väiksem, seda kasvatatakse ja täiendav osa loetakse null " "baitidena.\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create ära loo ühtegi faili\n" -#: src/truncate.c:112 +#: src/truncate.c:85 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:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" @@ -11725,7 +11992,7 @@ msgstr "" " -r, --reference=FAIL kasuta selle faili suurust\n" " -s, --size=SUURUS sea või muuda faili suurust baitides\n" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11737,57 +12004,61 @@ msgstr "" "'+' suurenda, '-' vähenda, '<' kuni, '>' vähemalt,\n" "'/' ümarda alla kordseks, '%' ümarda üles kordseks.\n" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "ületäitumine % * % baiti blokke faili %s kohta" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s pole kasutatav, negatiivne suurus" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "ei õnnestu lugeda %s suurust" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "faili %s suuruse ümardamisel tekkis ületäitumine" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "faili %s suurendamisel tekkis ületäitumine" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "%s lühendamine % baidile ebaõnnestus" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "määrati mitu suhtelist modifikaatorit" -#: src/truncate.c:333 +#: src/truncate.c:285 +msgid "Invalid number" +msgstr "Vigane number" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "peab olema määratud kas %s või %s" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "peab olema määratud suhteline %s %s korral" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "%s on antud, aga %s mitte" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "%s ei õnnestu kirjutamiseks avada" @@ -11802,21 +12073,22 @@ msgstr "Mark Kettenis" 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 "" "Kasutamine: %s [VÕTI] [FAIL]\n" "Väljasta FAIL totaalses järjestuses kooskõlas elementide osalise " "järjestusega.\n" -"Kui FAIL puudub või on -, loe standardsisendit.\n" -"\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: sisend sisaldab juhusliku arvu märke" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: sisend sisaldab tsüklit:" @@ -11880,12 +12152,9 @@ msgid "cannot get system name" msgstr "ei õnnestu leida süsteemi nime" #: 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "Teisenda igas FAILis tühikud tabulaatoriteks, väljasta standardväljundisse.\n" -"Kui FAIL puudub, või on -, loe standardsisendit.\n" #: src/unexpand.c:124 msgid "" @@ -11938,13 +12207,13 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" " -D, --all-repeated[=MEETOD] väljasta kõik duplikaat read\n" " gruppe saab eraldada tühja reaga\n" -" METHOD={none(vaikimisi),prepend,separate}\n" +" MEETOD={none(vaikimisi),prepend,separate}\n" #: src/uniq.c:192 msgid " -f, --skip-fields=N avoid comparing the first N fields\n" @@ -11953,11 +12222,11 @@ msgstr " -f, --skip-fields=N ära võrdle esimest N välja\n" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" " --group[=MEETOD] näita kõiki elemente, eraldades grupid tühja reaga\n" -" METHOD={separate(vaikimisi),prepend,append,both}\n" +" MEETOD={separate(vaikimisi),prepend,append,both}\n" #: src/uniq.c:199 msgid "" @@ -12108,11 +12377,6 @@ msgstr "" " Protsess\n" "mittekatkestatava magamise olekus suurendab samuti koormust.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -12133,22 +12397,27 @@ msgstr "" "Kui FAILi ei ole määratud, kasuta %s. Tavaliselt kasutatakse %s.\n" "\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" +"Väljasta iga FAILi baitide, sõnade ja ridade arv ning kui faile oli antud\n" +"enam kui üks, siis ka kõikide summa. Kui fail puudub või on -, loe\n" +"standardsisendit. Sõna on mittetühi sümbolite järjend, mis on eraldatud\n" +"tühemikuga.\n" + +#: src/wc.c:126 +msgid "" +"\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 "" -"Väljasta iga FAILi baitide, sõnade ja ridade arv ning kui faile oli antud\n" -"enam kui üks, siis ka kõikide summa. Kui fail puudub või on -, loe\n" -"standardsisendit. Sõna on mittetühi sümbolite järjend, mis on eraldatud\n" -"tühemikuga.\n" +"\n" "Järgnevad võtmed määravad milliseid loendureid väljastatakse, alati\n" "järgnevas järjestuses: reavahetus, sõna, sümbol, bait, maksimaalne " "reapikkus.\n" @@ -12156,12 +12425,12 @@ msgstr "" " -m, --chars väljasta sümbolite arv\n" " -l, --lines väljasta ridade arv\n" -#: src/wc.c:128 +#: src/wc.c:134 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=F loe sisend failidest, mille NUL-sümboliga " @@ -12327,10 +12596,10 @@ msgstr "" "Sama, kui id -un.\n" "\n" -#: src/whoami.c:91 +#: src/whoami.c:87 #, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: ei leia UID %lu vastavat kasutajanime\n" +msgid "cannot find name for user ID %lu" +msgstr "ei leia kasutaja ID %lu vastavat kasutajanime" #: src/yes.c:41 #, c-format diff --git a/po/eu.gmo b/po/eu.gmo index d36b0f18..d968182a 100644 Binary files a/po/eu.gmo and b/po/eu.gmo differ diff --git a/po/eu.po b/po/eu.po index 8c19e690..879214a1 100644 --- a/po/eu.po +++ b/po/eu.po @@ -3,11 +3,12 @@ # This file is distributed under the same license as the Coreutils-8.3 package. # Mikel Olasagasti Uranga , 2004, 2009, 2010. # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils-8.3\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2010-01-08 12:38+0100\n" "Last-Translator: Mikel Olasagasti Uranga \n" "Language-Team: Basque \n" @@ -35,18 +36,18 @@ msgstr "Baliozko argumentuak hauek dira:" msgid "error closing file" msgstr "errorea fitxategia itxitzerakoan" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "idazketa errorea" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, fuzzy, c-format msgid "preserving permissions for %s" msgstr "baimenak errepikatu arte" @@ -234,57 +235,62 @@ msgstr "" msgid "Unknown error" msgstr "Errore ezezaguna" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: '%s' aukera anbiguoa da\n" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: '-W %s' aukera anbiguoa da\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: '--%s' aukerak ez du argumenturik onartzen\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: '%c%s' aukerak ez du argumenturik onartzen\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, fuzzy, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: '%s' aukerak argumentu bat behar du\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: '--%s' aukera ezezaguna\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: '%c%s' aukera ezezaguna\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: '%c' aukera baliogabea\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: '%c' aukerak argumentu bat behar du\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: '-W %s' aukera anbiguoa da\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: '-W.%s' aukerak ez du argumenturik onartzen\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, fuzzy, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: '%s' aukerak argumentu bat behar du\n" @@ -294,13 +300,13 @@ msgstr "%s: '%s' aukerak argumentu bat behar du\n" msgid "cannot change permissions of %s" msgstr "ezin da %s-(r)en baimenak aldatu" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "ezin da %s direktorioa sortu" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "memoria agortuta" @@ -349,6 +355,12 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: fixategiaren amaiera" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: irakurketa errorea" + #: lib/regcomp.c:131 msgid "Success" msgstr "Arrakasta" @@ -461,7 +473,7 @@ msgstr "^[bB]" msgid "^[nN]" msgstr "^[eE]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "%s-(r)en baimenak ezartzen" @@ -895,7 +907,7 @@ msgstr "" "FITXATEGIA\n" " edo FITXATEGIA edo ez FITXATEGIA edo FITXATEGIA da e" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -905,14 +917,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 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:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -921,51 +926,51 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "irakurketa errorea" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "baliogabeko sarrera" -#: src/base64.c:268 +#: src/base64.c:266 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "baliogabea tamaina" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, fuzzy, c-format msgid "extra operand %s" msgstr "`%s' eragigai extra" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "sarrera estandarra itxitzen" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1005,39 +1010,43 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Erabilera: %s [AUKERA]... [FITXATEGIA]...\n" #: src/cat.c:92 #, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "Idatzi - FITXATEGIA e e e" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1054,7 +1063,7 @@ msgstr "" " e lerroz behin\n" " e" -#: src/cat.c:102 +#: src/cat.c:107 #, fuzzy msgid "" " -t equivalent to -vT\n" @@ -1067,7 +1076,7 @@ msgstr "" " enoratua\n" " erabili eta M errepikatu arte eta e" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1076,17 +1085,18 @@ msgid "" " %s Copy standard input to standard output.\n" msgstr "" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "ezin zaio %s-(e)ri ioctil egin" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "irteera estandarra" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: sarrera fitxategia irteera fitxategia da" @@ -1098,10 +1108,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1115,8 +1125,8 @@ msgstr "-" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "-" @@ -1131,13 +1141,13 @@ msgstr "" msgid "failed to change context of %s to %s" msgstr "- e" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "ezin da %s-ra sartu" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "" @@ -1153,7 +1163,7 @@ msgstr "%s-ren baimenak aldatzen" msgid "fts_read failed" msgstr "`fts_read'-ek huts egin du" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1257,7 +1267,7 @@ msgid "-R -h requires -P" msgstr "-R -h aukerak -P behar du" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, fuzzy, c-format msgid "missing operand after %s" @@ -1274,9 +1284,8 @@ msgid "conflicting security context specifiers given" msgstr "" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, fuzzy, c-format msgid "failed to get attributes of %s" msgstr "-" @@ -1550,17 +1559,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "baliogabea taldea %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "baliogabea talde zerrenda %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1569,62 +1578,74 @@ msgstr "" "Erabilera: %s [AUKERA] ERRO-BERRIA [KOMANDOA [ARGUMENTUA]...]\n" " edo: %s AUKERA\n" -#: src/chroot.c:191 +#: src/chroot.c:190 #, fuzzy msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" msgstr "Exekutatu KOMANDOA honekin e e" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:207 #, fuzzy msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" msgstr "ez da lehenetsia e" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "taldea" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" +msgid "failed to set supplemental groups" msgstr "taldea" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "huts egin da talde-id-a ezartzen" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "huts egin da erabiltzaile-id-a ezartzen" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "huts egin da %s komandoa exekutatzen" @@ -1665,7 +1686,14 @@ msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "" "Ordenatutako 1FITXATEGIA eta 2FITXATEGIA alderatzen ditu lerroz lerro.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "ez FITXATEGIA edo FITXATEGIA da e" + +#: src/comm.c:114 #, fuzzy msgid "" "\n" @@ -1676,7 +1704,7 @@ msgstr "" "ez hirukoa Zutabea hau daukana esklusiboa bikoa hau daukana lerroz behin " "esklusiboa hirukoa hau daukana lerroz behin e" -#: src/comm.c:116 +#: src/comm.c:120 #, fuzzy msgid "" "\n" @@ -1689,7 +1717,7 @@ msgstr "" " lerroz behin esklusiboa\n" " lerroz behin in e" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1697,17 +1725,17 @@ msgid "" " --nocheck-order do not check that the input is correctly sorted\n" msgstr "" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1716,309 +1744,323 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "" -#: src/comm.c:407 +#: src/comm.c:411 #, fuzzy, c-format msgid "multiple delimiters specified" msgstr "irteera fitxategi anitz espezifikatu dira" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "%s hutsa ez da onartzen" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "ezin zaio `lseek' egin %s-ri" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "errorea %s irakurtzen" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "ezin zaio `lseek' egin %s-ri" +msgid "error reading %s" +msgstr "errorea %s irakurtzen" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "errorea %s idazten" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "errorea %s irakurtzen" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "-" -#: src/copy.c:383 +#: src/copy.c:478 #, fuzzy, c-format msgid "%s: write failed" msgstr "idazketak huts egin du" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "huts egin da %s irekitzen" -#: src/copy.c:687 +#: src/copy.c:789 #, fuzzy, c-format msgid "clearing permissions for %s" msgstr "baimenak errepikatu arte" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, fuzzy, c-format msgid "failed to preserve ownership for %s" msgstr "errepikatu arte" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "" -#: src/copy.c:753 +#: src/copy.c:855 #, fuzzy, c-format msgid "failed to preserve authorship for %s" msgstr "errepikatu arte" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, fuzzy, c-format msgid "failed to set default file creation context to %s" msgstr "-" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "-" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "taldea - e" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, fuzzy, c-format msgid "cannot open %s for reading" msgstr "errepikatu arte" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "ezin zaio `fstat' egin %s-(e)ri" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "ezin da %s kendu" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "%s ezabatua\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "" -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" msgstr "huts egin da %s klonatzen" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, fuzzy, c-format msgid "preserving times for %s" msgstr "errepikatu arte" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "huts egin da %s klonatzen" -#: src/copy.c:1580 +#: src/copy.c:1669 #, fuzzy, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "modua " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: %s gainidatzi?" -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (babeskopia: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1706 +#: src/copy.c:1795 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "lotura" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "ezin da `stat' egin %s-(r)engan" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, fuzzy, c-format msgid "%s and %s are the same file" msgstr "eta" -#: src/copy.c:1939 +#: src/copy.c:2019 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "honekin" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, fuzzy, c-format msgid "will not overwrite just-created %s with %s" msgstr "honekin" -#: src/copy.c:1975 +#: src/copy.c:2055 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "honekin" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" -#: src/copy.c:2019 +#: src/copy.c:2099 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "gora" -#: src/copy.c:2020 +#: src/copy.c:2100 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "gora" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "ezin da %s-(r)en babeskopia egin" -#: src/copy.c:2107 +#: src/copy.c:2187 #, fuzzy, c-format msgid "will not copy %s through just-created symlink %s" msgstr "honekin" -#: src/copy.c:2184 +#: src/copy.c:2264 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "kopiatu a bere gainera" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, c-format +msgid "warning: source directory %s specified more than once" +msgstr "" + +#: src/copy.c:2294 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "lotura" -#: src/copy.c:2258 +#: src/copy.c:2351 #, fuzzy, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "a - bere gainera" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "ezin izan da %s %s-(r)a mugitu" -#: src/copy.c:2317 +#: src/copy.c:2410 #, fuzzy, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "gailua" -#: src/copy.c:2357 +#: src/copy.c:2450 #, fuzzy, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "kopiatu lotura" -#: src/copy.c:2477 +#: src/copy.c:2570 #, fuzzy, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "erlatiboa in" -#: src/copy.c:2484 +#: src/copy.c:2577 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "lotura" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "ezin da %s fifo-a sortu" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "ezin da %s fitxategi berezia sortu" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "lotura" -#: src/copy.c:2583 +#: src/copy.c:2676 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "lotura" -#: src/copy.c:2615 +#: src/copy.c:2708 #, fuzzy, c-format msgid "%s has unknown file type" msgstr "ezezaguna mota" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "ezin da %s babeskopia kendu" -#: src/copy.c:2782 +#: src/copy.c:2875 #, fuzzy, c-format msgid "%s -> %s (unbackup)\n" msgstr "e" @@ -2028,25 +2070,25 @@ msgstr "e" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, fuzzy, c-format msgid "unknown program %s" msgstr "Sistema-errore ezezaguna" @@ -2287,8 +2329,8 @@ msgstr "%s badago baina ez da direktorio bat" msgid "failed to access %s" msgstr "huts egin da %s klonatzen" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, fuzzy, c-format msgid "missing file operand" msgstr "zerrenda -" @@ -2360,138 +2402,145 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "sarrera desagertu da" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, fuzzy, c-format msgid "%s: line number out of range" msgstr "-" -#: src/csplit.c:713 +#: src/csplit.c:714 #, fuzzy, c-format msgid "%s: %s: line number out of range" msgstr "-" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, fuzzy, c-format msgid " on repetition %s\n" msgstr "aktibatuta e" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: ez da parekiderik topatu" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, fuzzy, c-format msgid "error in regular expression search" msgstr "in bilatu" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "idazketa errorea %s-(r)entzat" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, fuzzy, c-format msgid "%s: integer expected after delimiter" msgstr "geroago" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "da in" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "eta" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, fuzzy, c-format msgid "%s: invalid regular expression: %s" msgstr "baliogabea" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: baliogabeko eredua" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, fuzzy, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "da" -#: src/csplit.c:1200 +#: src/csplit.c:1201 #, fuzzy, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "da" -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, fuzzy, c-format msgid "missing conversion specifier in suffix" msgstr "in" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, fuzzy, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "baliogabea in" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, fuzzy, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "baliogabea in" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "baliogabea" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, fuzzy, c-format msgid "too many %% conversion specifications in suffix" msgstr "in" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, fuzzy, c-format msgid "missing %% conversion specification in suffix" msgstr "in" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: baliogabeko zenbakia" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "baliogabea" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Erabilera: %s [AUKERA]... FITXATEGI EREDUA...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 #, fuzzy msgid "" "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n" "and output byte counts of each piece to standard output.\n" msgstr "Irteera - FITXATEGIA bider - e e" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "FITXATEGIA da maiatzak e" + +#: src/csplit.c:1492 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2502,11 +2551,11 @@ msgstr "" " AURRIZKIA erabili AURRIZKIA horren ordez -\n" " aktibatuta e" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 #, fuzzy msgid "" " -n, --digits=DIGITS use specified number of digits instead of 2\n" @@ -2517,17 +2566,11 @@ msgstr "" " -\n" " hutsik hutsik e" -#: src/csplit.c:1505 -#, fuzzy -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "FITXATEGIA da maiatzak e" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 #, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2558,7 +2601,7 @@ msgstr "Erabilera: %s [AUKERA]... [FITXATEGIA]...\n" msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "Inprimatu - lerroz behin FITXATEGIA e e" -#: src/cut.c:182 +#: src/cut.c:183 #, fuzzy msgid "" " -b, --bytes=LIST select only these bytes\n" @@ -2569,7 +2612,7 @@ msgstr "" "\n" " erabili horren ordez - errepikatu arte e" -#: src/cut.c:187 +#: src/cut.c:188 #, fuzzy msgid "" " -f, --fields=LIST select only these fields; also print any line\n" @@ -2582,7 +2625,7 @@ msgstr "" " da\n" " e enoratua e" -#: src/cut.c:193 +#: src/cut.c:194 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2591,7 +2634,7 @@ msgstr "" "a\n" " lehenago da e" -#: src/cut.c:197 +#: src/cut.c:198 #, fuzzy msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" @@ -2602,7 +2645,7 @@ msgstr "" " KATEA erabili KATEA\n" " lehenetsia da erabili e" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2610,7 +2653,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:210 +#: src/cut.c:211 #, fuzzy msgid "" "Each range is one of:\n" @@ -2619,8 +2662,6 @@ msgid "" " 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 "" "eta - edo da gora - edo bider da - e\n" " I I edo\n" @@ -2628,68 +2669,68 @@ msgstr "" " I M I M edo\n" " M lehen M edo e ez FITXATEGIA edo FITXATEGIA da e" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "baliogabea edo zerrenda" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "" -#: src/cut.c:320 +#: src/cut.c:319 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "baliogabea zabalera" -#: src/cut.c:334 -#, fuzzy +#: src/cut.c:333 src/numfmt.c:1417 +#, fuzzy, c-format msgid "invalid decreasing range" msgstr "baliogabea modua" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "%s byte offset-a luzeegia da" -#: src/cut.c:386 +#: src/cut.c:385 #, fuzzy, c-format msgid "field number %s is too large" msgstr "da" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 #, fuzzy msgid "only one type of list may be specified" msgstr "mota - zerrenda maiatzak" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, fuzzy, c-format msgid "the delimiter must be a single character" msgstr "a" -#: src/cut.c:787 +#: src/cut.c:786 #, fuzzy msgid "you must specify a list of bytes, characters, or fields" msgstr "a zerrenda - edo" -#: src/cut.c:790 +#: src/cut.c:789 #, fuzzy msgid "an input delimiter may be specified only when operating on fields" msgstr "maiatzak aktibatuta" -#: src/cut.c:794 +#: src/cut.c:793 #, fuzzy msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" msgstr "lerroz behin e aktibatuta" -#: src/cut.c:800 +#: src/cut.c:799 #, fuzzy msgid "missing list of fields" msgstr "zerrenda -" -#: src/cut.c:802 +#: src/cut.c:801 #, fuzzy msgid "missing list of positions" msgstr "zerrenda -" @@ -2708,14 +2749,20 @@ 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" +msgstr "" + +#: src/date.c:138 #, fuzzy msgid "" -" -d, --date=STRING display time described by STRING, not 'now'\n" -" -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -" -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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" "Bistaratu in edo e\n" " KATEA bider KATEA orain\n" @@ -2726,30 +2773,38 @@ msgstr "" "\n" " e" -#: src/date.c:142 +#: src/date.c:145 #, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" "FITXATEGIA azken - FITXATEGIA\n" " G\n" " KATEA bider KATEA\n" " edo Unibertsala Ordua e" -#: src/date.c:147 +#: src/date.c:149 +msgid "" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" +msgstr "" + +#: src/date.c:155 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 (UTC)\n" +" -r, --reference=FILE display the last modification time of FILE\n" msgstr "" #: src/date.c:158 +msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 #, fuzzy msgid "" "\n" @@ -2762,7 +2817,7 @@ msgstr "" " a\n" " a Ig. Lr. e" -#: src/date.c:165 +#: src/date.c:171 #, fuzzy msgid "" " %A locale's full weekday name (e.g., Sunday)\n" @@ -2775,7 +2830,7 @@ msgstr "" " B hilabetea urtarrila abendua\n" " eta Lr. e" -#: src/date.c:171 +#: src/date.c:177 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2788,14 +2843,14 @@ msgstr "" " mm dd\n" " eguna - hilabetea e" -#: src/date.c:177 +#: src/date.c:183 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 +#: src/date.c:188 #, fuzzy msgid "" " %h same as %b\n" @@ -2808,7 +2863,7 @@ msgstr "" " jn. ordu\n" " eguna - urtea e" -#: src/date.c:188 +#: src/date.c:194 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2821,7 +2876,7 @@ msgstr "" " m hilabetea\n" " M minutu e" -#: src/date.c:194 +#: src/date.c:200 #, fuzzy msgid "" " %n a newline\n" @@ -2840,7 +2895,7 @@ msgstr "" " G ordu mm\n" " segundo UTC a e" -#: src/date.c:203 +#: src/date.c:209 #, fuzzy msgid "" " %S second (00..60)\n" @@ -2853,7 +2908,7 @@ msgstr "" " ordu mm\n" " eguna - astea Astelehena e" -#: src/date.c:209 +#: src/date.c:215 #, fuzzy msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" @@ -2866,7 +2921,7 @@ msgstr "" " eguna - astea Igandea\n" " M astea - urtea honekin Astelehena lehen eguna - astea e" -#: src/date.c:215 +#: src/date.c:221 #, fuzzy msgid "" " %x locale's date representation (e.g., 12/31/99)\n" @@ -2879,7 +2934,7 @@ msgstr "" " b azken bikoa - urtea\n" " Y urtea e" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2891,7 +2946,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2902,7 +2957,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2911,7 +2966,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -2925,35 +2980,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "sarrera estandarra" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr " %s baliogabeko data" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, fuzzy, c-format msgid "multiple output formats specified" msgstr "irteera fitxategi anitz espezifikatu dira" -#: src/date.c:430 +#: src/date.c:436 #, fuzzy, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "errepikatu arte" -#: src/date.c:437 +#: src/date.c:443 #, fuzzy, c-format msgid "the options to print and set the time may not be used together" msgstr "eta maiatzak" -#: src/date.c:458 +#: src/date.c:464 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2961,23 +3016,23 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "a edozein a honekin." -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "ezin da data ezarri" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2986,7 +3041,7 @@ msgstr "" "Erabilera: %s [ERAGIGAI]...\n" " edo: %s AUKERA\n" -#: src/dd.c:532 +#: src/dd.c:561 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3004,7 +3059,7 @@ msgstr "" " kopiatu\n" " a e" -#: src/dd.c:541 +#: src/dd.c:570 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3014,8 +3069,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" "FITXATEGIA FITXATEGIA horren ordez -\n" " a\n" @@ -3023,7 +3080,7 @@ msgstr "" " hasi -\n" " hasi - e" -#: src/dd.c:552 +#: src/dd.c:583 #, fuzzy msgid "" "\n" @@ -3036,7 +3093,7 @@ msgid "" msgstr "" "eta maiatzak bider M MB M B eta aktibatuta errepikatu arte E Y maiatzak e e" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3051,7 +3108,7 @@ msgid "" " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3061,7 +3118,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3070,129 +3127,104 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:593 +#: src/dd.c:624 #, fuzzy msgid " directory fail unless a directory\n" msgstr "da a" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 -#, fuzzy, c-format +#: src/dd.c:661 +#, 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 "" -"a SIGUSR1 a martxan dd - eta e\n" -" dd -\n" -"\n" -" in\n" -" e" - -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "" -msgstr[1] "" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "Infinity B" @@ -3206,87 +3238,101 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "" +msgstr[1] "" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "%s sarrera fitxategia itxitzen" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "%s irteera fitxategia itxitzen" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "%s-ra idazten" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, fuzzy, c-format msgid "unrecognized operand %s" msgstr "%s: '--%s' aukera ezezaguna\n" -#: src/dd.c:1285 +#: src/dd.c:1376 #, fuzzy msgid "invalid conversion" msgstr "baliogabea" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 #, fuzzy msgid "invalid input flag" msgstr "baliogabea hasi" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 #, fuzzy msgid "invalid output flag" msgstr "baliogabeko taldea" -#: src/dd.c:1294 +#: src/dd.c:1385 #, fuzzy -msgid "invalid status flag" -msgstr "baliogabea" - -#: src/dd.c:1333 src/truncate.c:310 -#, fuzzy, c-format -msgid "invalid number %s" +msgid "invalid status level" msgstr "baliogabea" -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1417 +#: src/dd.c:1520 #, fuzzy, c-format msgid "cannot combine block and unblock" msgstr "ezin dira biak, erabiltzailea eta taldea, alde batera utzi" -#: src/dd.c:1419 +#: src/dd.c:1522 #, fuzzy, c-format msgid "cannot combine lcase and ucase" msgstr "eta" -#: src/dd.c:1421 +#: src/dd.c:1524 #, fuzzy, c-format msgid "cannot combine excl and nocreat" msgstr "honekin edo" -#: src/dd.c:1424 +#: src/dd.c:1527 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "honekin edo" -#: src/dd.c:1582 +#: src/dd.c:1685 #, fuzzy, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3295,81 +3341,81 @@ msgstr "" "errepikatu arte\n" " - mota errepikatu arte zerrenda -" -#: src/dd.c:1670 +#: src/dd.c:1773 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: ezin da kendu" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, fuzzy, c-format msgid "%s: cannot seek" msgstr "%s: ezin da kendu" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1756 +#: src/dd.c:1859 #, fuzzy, c-format msgid "warning: invalid file offset after failed read" msgstr "baliogabea zabalera horren ordez" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1903 +#: src/dd.c:2006 #, fuzzy, c-format msgid "setting flags for %s" msgstr "-" -#: src/dd.c:1957 +#: src/dd.c:2060 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "erlatiboa" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "`fdatasync'-ek huts egin du %s-(r)entzat" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "%s-(r)entzat fsync-ek huts egin du" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "huts egin da %s irekitzen" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, fuzzy, c-format msgid "failed to discard cache for: %s" msgstr "huts egin da %s-(r)i `chdir' egiten" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3450,12 +3496,12 @@ msgstr "Edukiera" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 #, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" @@ -3468,14 +3514,14 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 #, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3486,7 +3532,7 @@ msgstr "" " -H, --si analogoa, but 1000 erabiliz potentzia bezala 1024 " "beharrean\n" -#: src/df.c:1402 +#: src/df.c:1422 #, fuzzy msgid "" " -i, --inodes list inode information instead of block usage\n" @@ -3501,7 +3547,7 @@ msgstr "" " --no-sync ez deitu sync-i erabilera datuak lortu aurretik " "(lehenetsia)\n" -#: src/df.c:1409 +#: src/df.c:1429 #, fuzzy msgid "" " --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" @@ -3509,6 +3555,28 @@ msgid "" "omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" +msgstr "" +" -P, --portability erabili POSIX irteera formatua\n" +" --sync deitu sync-i erabilera datuak jaso aurretik\n" +" -t, --type=MOETA mugatu fitxategi-sistema zerrendaketa MOTA " +"moetakoetara\n" +" -T, --print-type inprimatu fitxategi-sistema moeta\n" +" -x, --exclude-type=MOETA mugatu fitxategi-sistema zerrendaketa MOETA " +"moetakoa ez direnera\n" +" -v (ignoratua)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +"a\n" +" lehenago da e" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3523,7 +3591,7 @@ msgstr "" "moetakoa ez direnera\n" " -v (ignoratua)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3531,26 +3599,26 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, fuzzy, c-format msgid "options %s and %s are mutually exclusive" msgstr "errepikatu arte" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "%s fitxategi-sistema moeta aukeratuta eta eskludituta" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Abisua:" -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 #, fuzzy msgid "cannot read table of mounted file systems" msgstr "%sezin da irakurri muntaturiko fitxategi-sistemen taula" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "ez da fitxategi sistemarik prozesatu" @@ -3648,7 +3716,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3659,7 +3727,8 @@ msgstr "" #: src/du.c:285 #, fuzzy -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "- FITXATEGIA errepikatu arte e e" #: src/du.c:291 @@ -3775,62 +3844,56 @@ msgstr "" msgid "Infinity" msgstr "Infinity B" -#: src/du.c:636 +#: src/du.c:657 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "`fts_read'-ek huts egin du" -#: src/du.c:787 +#: src/du.c:808 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "baliogabea gehienezkoa" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "baliogabeko argumentua: %s" -#: src/du.c:898 +#: src/du.c:919 #, fuzzy, c-format msgid "cannot both summarize and show all entries" msgstr "eta" -#: src/du.c:905 +#: src/du.c:926 #, fuzzy, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "da 0" -#: src/du.c:911 +#: src/du.c:932 #, fuzzy, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "honekin" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: irakurketa errorea" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 #, fuzzy msgid "invalid zero-length file name" msgstr "baliogabea taldea" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "guztira" @@ -3960,9 +4023,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "Bihurtu in FITXATEGIA ez FITXATEGIA edo FITXATEGIA da e e" #: src/expand.c:114 @@ -4006,7 +4067,7 @@ msgid "input line is too long" msgstr "sarrera lerroa luzeegia da" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4146,12 +4207,12 @@ msgstr "in bilatu" msgid "non-integer argument" msgstr "baliogabea" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, fuzzy, c-format msgid "division by zero" msgstr "bider" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "ezarri LC_ALL='C' arazo hau une batez konpontzeko" @@ -4162,31 +4223,31 @@ msgid "the strings compared were %s and %s" msgstr "Alderatutako bi kateak %s eta %s izan dira." #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s ez da zenbaki positibo zuzena" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s luzeegia da" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4195,7 +4256,7 @@ msgstr "" "Erabilera: %s [ZENBAKIA]...\n" " edo: %s AUKERA\n" -#: src/factor.c:2443 +#: src/factor.c:2533 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4239,7 +4300,7 @@ msgid "" "The option -WIDTH is an abbreviated form of --width=DIGITS.\n" msgstr "paragrafoa in FITXATEGIA ez FITXATEGIA edo FITXATEGIA da e e" -#: src/fmt.c:278 +#: src/fmt.c:279 #, fuzzy msgid "" " -c, --crown-margin preserve indentation of first two lines\n" @@ -4251,7 +4312,7 @@ msgstr "" " KATEA lerroz behin KATEA\n" " lerroz behin e" -#: src/fmt.c:287 +#: src/fmt.c:288 #, fuzzy, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4263,26 +4324,24 @@ msgstr "" " bikoa geroago\n" " zabalera gehienezkoa zabalera lehenetsia - zutabetan e" -#: src/fmt.c:359 +#: src/fmt.c:356 #, 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:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "baliogabeko zabalera: %s" -#: src/fold.c:70 +#: src/fold.c:69 #, fuzzy -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "Itzulbiratu lerroz behin in FITXATEGIA bider lehenetsia e e" -#: src/fold.c:77 +#: src/fold.c:76 #, fuzzy msgid "" " -b, --bytes count bytes rather than columns\n" @@ -4293,9 +4352,9 @@ msgstr "" "\n" " zabalera erabili zutabetan horren ordez - e" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "baliogabeko zutabe kopurua: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4362,17 +4421,16 @@ msgstr "ezin da erabiltzailearen id-a ezarri" msgid "%s: no such user" msgstr "%s: Ez dago alako erabiltzailerik" -#: src/head.c:109 +#: src/head.c:110 #, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Inprimatu lehen lerroz behin - FITXATEGIA FITXATEGIA honekin a goiburua ez " "FITXATEGIA edo FITXATEGIA da e e" -#: src/head.c:117 +#: src/head.c:118 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4389,7 +4447,7 @@ msgstr "" " honekin azken\n" " I lerroz behin - e" -#: src/head.c:125 +#: src/head.c:126 #, fuzzy msgid "" " -q, --quiet, --silent never print headers giving file names\n" @@ -4398,7 +4456,7 @@ msgstr "" "\n" " e" -#: src/head.c:131 +#: src/head.c:132 #, fuzzy msgid "" "\n" @@ -4408,48 +4466,36 @@ msgid "" msgstr "" "eta maiatzak bider M MB M B eta aktibatuta errepikatu arte E Y maiatzak e e" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:237 src/head.c:1052 -#, fuzzy, c-format -msgid "%s: number of bytes is too large" -msgstr "- da" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, fuzzy, c-format msgid "%s: cannot seek to relative offset %s" msgstr "erlatiboa" -#: src/head.c:886 +#: src/head.c:267 #, fuzzy, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "da da" - -#: src/head.c:887 -msgid "number of lines" -msgstr "lerro kopurua" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "byte kopurua" +msgid "%s: number of bytes is too large" +msgstr "- da" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "lerro kopuru okerra" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "byte kopuru okerra" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "baliogabea" @@ -4629,7 +4675,7 @@ msgstr "ezin da aldatu %s-(r)en jabegoa" msgid "cannot set time stamps for %s" msgstr "errepikatu arte" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "" @@ -4769,7 +4815,7 @@ msgstr "maiatzak a" msgid "target directory not allowed when installing a directory" msgstr "maiatzak a" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "%s baliogabeko modua" @@ -4802,11 +4848,15 @@ msgid "Mike Haertel" msgstr "Mike Haertel" #: src/join.c:195 -#, 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" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -4817,7 +4867,7 @@ msgstr "" " da edo edo\n" " honekin e" -#: src/join.c:204 +#: src/join.c:210 #, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" @@ -4830,7 +4880,7 @@ msgstr "" "\n" " erabili eta bereizlea e" -#: src/join.c:210 +#: src/join.c:216 #, fuzzy msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" @@ -4846,12 +4896,12 @@ msgstr "" " aktibatuta uneko -\n" " aktibatuta uneko - e" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 #, fuzzy msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "lerroz behin honekin e" -#: src/join.c:225 +#: src/join.c:231 #, fuzzy msgid "" "\n" @@ -4872,47 +4922,47 @@ msgid "" msgstr "" "da eta enoratua bider da a da edo edo edo Lehenetsia bider e eta aktibatuta e" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, fuzzy, c-format msgid "invalid field number: %s" msgstr "baliogabea" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, fuzzy, c-format msgid "invalid field specifier: %s" msgstr "baliogabea" -#: src/join.c:884 +#: src/join.c:890 #, fuzzy, c-format msgid "invalid file number in field spec: %s" msgstr "baliogabea in" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, fuzzy, c-format msgid "multi-character tab %s" msgstr "baliogabea" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "" @@ -4986,17 +5036,17 @@ msgstr "honekin edo" msgid "no process ID specified" msgstr "ez IDa" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, fuzzy, c-format msgid "invalid buffering mode %s for %s\n" msgstr "%s baliogabeko argumentua da %s-(r)entzat" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -5166,7 +5216,7 @@ msgstr "lotura" msgid "FIXME: unknown" msgstr "FIXME: unknown" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Erabilera: %s [AUKERA]\n" @@ -5178,7 +5228,7 @@ msgid "" "\n" msgstr "Inprimatu - e e" -#: src/logname.c:84 +#: src/logname.c:79 #, fuzzy, c-format msgid "no login name" msgstr "ez" @@ -5188,7 +5238,7 @@ msgstr "ez" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%Y %b %e" @@ -5197,102 +5247,102 @@ msgstr "%Y %b %e" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, fuzzy, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "baliogabea balioa - ESTILOA" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, fuzzy, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "baliogabea zabalera in" -#: src/ls.c:1639 +#: src/ls.c:1629 #, fuzzy, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "baliogabea tamaina in" -#: src/ls.c:1760 src/ptx.c:1978 -#, fuzzy, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "baliogabea zabalera" -#: src/ls.c:1834 -#, fuzzy, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "baliogabea tamaina" -#: src/ls.c:2043 +#: src/ls.c:2021 #, fuzzy, c-format msgid "invalid time style format %s" msgstr "baliogabea" -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "Baliozko argumentuak hauek dira:" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "aurrizki ezezaguna: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, fuzzy, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "balioa errepikatu arte" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, fuzzy, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "baliogabea balioa - ESTILOA" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "ezin da %s direktorioa ireki" -#: src/ls.c:2572 +#: src/ls.c:2569 #, fuzzy, c-format msgid "cannot determine device and inode of %s" msgstr "gailua eta -" -#: src/ls.c:2581 +#: src/ls.c:2578 #, fuzzy, c-format msgid "%s: not listing already-listed directory" msgstr "lotura errepikatu arte" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "%s direktorioa irakurtzen" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "%s direktorioa itxitzen" -#: src/ls.c:3362 +#: src/ls.c:3355 #, fuzzy, c-format msgid "cannot compare file names %s and %s" msgstr "eta" -#: src/ls.c:4781 +#: src/ls.c:4775 #, fuzzy msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" msgstr "Zerrenda bider lehenetsia bat ere ez - e e" -#: src/ls.c:4788 +#: src/ls.c:4782 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5306,7 +5356,7 @@ msgstr "" " egilea egilea -\n" " errepikatu arte e" -#: src/ls.c:4794 +#: src/ls.c:4788 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." @@ -5327,13 +5377,14 @@ msgstr "" " honekin eta bider\n" " bider e" -#: src/ls.c:4804 +#: src/ls.c:4798 #, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5345,7 +5396,7 @@ msgstr "" " eta\n" " errepikatu arte Emacs modua e" -#: src/ls.c:4812 +#: src/ls.c:4807 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5361,11 +5412,11 @@ msgstr "" " C\n" " e" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5374,7 +5425,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 +#: src/ls.c:4824 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5389,7 +5440,7 @@ msgstr "" " -H, --si analogoa, but 1000 erabiliz potentzia bezala 1024 " "beharrean\n" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5402,7 +5453,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4840 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5420,7 +5471,7 @@ msgstr "" " jn. ez ikusi egin zerrenda\n" " tamaina e" -#: src/ls.c:4855 +#: src/ls.c:4850 #, fuzzy msgid "" " -l use a long listing format\n" @@ -5436,7 +5487,7 @@ msgstr "" " errepikatu arte lotura bere gainera\n" " m zabalera honekin a zerrenda - e" -#: src/ls.c:4863 +#: src/ls.c:4858 #, fuzzy msgid "" " -n, --numeric-uid-gid like -l, but list numeric user and group IDs\n" @@ -5453,7 +5504,7 @@ msgstr "" " zerrenda taldea\n" " mota - e" -#: src/ls.c:4871 +#: src/ls.c:4866 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" @@ -5472,7 +5523,7 @@ msgstr "" " erabili errepikatu arte\n" " e" -#: src/ls.c:4881 +#: src/ls.c:4876 #, fuzzy msgid "" " -r, --reverse reverse order while sorting\n" @@ -5484,19 +5535,19 @@ msgstr "" " G zerrenda\n" " tamaina tamaina - in e" -#: src/ls.c:4886 +#: src/ls.c:4881 #, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" "S bider tamaina\n" " X bat ere ez tamaina S\n" @@ -5506,7 +5557,7 @@ msgstr "" " erabili edo erabili\n" " e" -#: src/ls.c:4896 +#: src/ls.c:4892 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5530,18 +5581,18 @@ msgstr "" " bider\n" " horren ordez - e" -#: src/ls.c:4908 +#: src/ls.c:4904 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:4912 +#: src/ls.c:4908 #, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -5551,21 +5602,22 @@ msgstr "" " zerrenda in\n" " bider e" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" "zabalera zabalera horren ordez - balioa\n" " x zerrenda bider lerroz behin horren ordez - bider zutabetan\n" " X bider\n" " zerrenda e" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5574,7 +5626,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5603,50 +5655,51 @@ msgstr "David Madore" 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 "" "FITXATEGIA\n" " edo FITXATEGIA edo ez FITXATEGIA edo FITXATEGIA da e" -#: src/md5sum.c:174 +#: src/md5sum.c:175 #, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" "\n" " B erabili gailua e e" -#: src/md5sum.c:178 +#: src/md5sum.c:180 #, fuzzy -msgid " -b, --binary read in binary mode\n" +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr "" "\n" " B erabili gailua e e" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:192 +#: src/md5sum.c:195 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr "" "\n" " B erabili gailua e e" -#: src/md5sum.c:195 +#: src/md5sum.c:198 #, fuzzy msgid "" "\n" @@ -5662,99 +5715,100 @@ msgstr "" "\n" " lerroz behin e e" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "in Noiz a - uneko programa lehenetsia modua da honekin a mota errepikatu " "arte errepikatu arte eta errepikatu arte FITXATEGIA e" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, fuzzy, c-format msgid "%s: too many checksum lines" msgstr "ez lerroz behin" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, fuzzy, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "ez lerroz behin" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: HUTS egin du irekitzeak edo irakurtzeak\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "HUTS EGIN DA" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "ongi" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, fuzzy, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "ez lerroz behin" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, fuzzy, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "ez lerroz behin" msgstr[1] "ez lerroz behin" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, fuzzy, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "ABISUA -" msgstr[1] "ABISUA -" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, fuzzy, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "ABISUA -" msgstr[1] "ABISUA -" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, fuzzy, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "da" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, fuzzy, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "eta testua" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, fuzzy, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "da" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, fuzzy, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "da" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, fuzzy, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "da" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "da" @@ -5791,22 +5845,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "-" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "errepikatu arte" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "%s direktorioa sortua" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -5988,7 +6042,7 @@ msgstr "txantiloi gehiegi" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" @@ -6120,9 +6174,7 @@ msgstr "Scott Bartram" #: src/nl.c:179 #, fuzzy -msgid "" -"Write each FILE to standard output, with line numbers added.\n" -"With no FILE, or when FILE is -, read standard input.\n" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "Idatzi FITXATEGIA honekin ez FITXATEGIA edo FITXATEGIA da e e" #: src/nl.c:186 @@ -6219,27 +6271,27 @@ msgstr "baliogabea" msgid "invalid footer numbering style: %s" msgstr "baliogabea orri-oina" -#: src/nl.c:503 -#, fuzzy, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "baliogabea" -#: src/nl.c:512 -#, fuzzy, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "baliogabea" -#: src/nl.c:524 -#, fuzzy, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "baliogabea - lerroz behin" -#: src/nl.c:538 -#, fuzzy, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "baliogabea zabalera" -#: src/nl.c:557 +#: src/nl.c:531 #, fuzzy, c-format msgid "invalid line numbering format: %s" msgstr "baliogabea" @@ -6264,7 +6316,7 @@ msgstr "Exekutatu KOMANDOA e e" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6276,43 +6328,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "stderr berbideratzeak huts egin du" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "sarrerari ezikusiarena egiten" -#: src/nohup.c:175 +#: src/nohup.c:173 #, fuzzy, c-format msgid "ignoring input and appending output to %s" msgstr "irteera %s-ri eransten" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "irteera %s-ri eransten" -#: src/nohup.c:193 +#: src/nohup.c:191 #, fuzzy, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "kopiatu - aktibatuta" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "sarrerari ezikusiarena egiten eta stderr stdout-era berbideratzen" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "stderr stdout-era berbideratzen" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -6334,96 +6386,93 @@ msgid "" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, fuzzy, c-format msgid "value too large to be converted: %s" msgstr "balioa" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "baliogabea" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "baliogabeko atzizkia %s%s argumentua `%s'" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "%s: huts egin da idazteko irekitzean" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "baliogabea tamaina" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Erabilera: %s [AUKERA]... [ERABILTZAILEA]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6431,19 +6480,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -6453,30 +6502,30 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 #, fuzzy msgid "" "\n" @@ -6485,11 +6534,11 @@ msgstr "" "Beste aukerak:\n" "\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6498,7 +6547,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -6506,7 +6555,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -6514,7 +6563,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -6522,7 +6571,25 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"eta - edo da gora - edo bider da - e\n" +" I I edo\n" +" I I edo -\n" +" I M I M edo\n" +" M lehen M edo e ez FITXATEGIA edo FITXATEGIA da e" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -6531,9 +6598,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -6545,7 +6613,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -6560,118 +6628,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "baliogabea zabalera" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "baliogabea" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "baliogabeko atzizkia %s%s argumentua `%s'" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "baliogabea" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "baliogabea mota" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" +msgid "multiple field specifications" msgstr "baliogabea" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr " %s baliogabeko data" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, fuzzy, c-format msgid "--grouping cannot be combined with --format" msgstr "honekin edo" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "-l edo -t aukera anitz espezifikatu dira" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, fuzzy, c-format msgid "grouping cannot be combined with --to" msgstr "honekin edo" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "errorea %s irakurtzen" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, fuzzy, c-format msgid "failed to convert some of the input numbers" msgstr "stderr berbideratzeak huts egin du" -#: src/od.c:320 +#: src/od.c:321 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6682,21 +6762,20 @@ msgstr "" "FITXATEGIA\n" " edo FITXATEGIA e" -#: src/od.c:326 +#: src/od.c:327 #, fuzzy 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 "" "bider lehenetsia FITXATEGIA FITXATEGIA in ez FITXATEGIA edo FITXATEGIA da e e" -#: src/od.c:333 +#: src/od.c:335 #, 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" @@ -6709,7 +6788,7 @@ msgstr "" " a\n" " ASCII edo e" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -6718,7 +6797,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 #, fuzzy msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" @@ -6738,7 +6817,7 @@ msgstr "" " zabalera\n" " in e" -#: src/od.c:363 +#: src/od.c:366 #, fuzzy msgid "" "\n" @@ -6755,7 +6834,7 @@ msgstr "" " ASCII edo\n" " e" -#: src/od.c:372 +#: src/od.c:375 #, fuzzy msgid "" " -f same as -t fF, select floats\n" @@ -6772,7 +6851,7 @@ msgstr "" "\n" " x e" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -6781,7 +6860,7 @@ msgid "" " c printable character or backslash escape\n" msgstr "" -#: src/od.c:387 +#: src/od.c:390 #, fuzzy msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" @@ -6796,7 +6875,7 @@ msgstr "" " TAMAINA TAMAINA\n" " x TAMAINA TAMAINA e" -#: src/od.c:394 +#: src/od.c:397 #, fuzzy msgid "" "\n" @@ -6809,14 +6888,14 @@ msgstr "" "errepikatu arte edo errepikatu arte Baldintzak MOTA da TAMAINA maiatzak " "errepikatu arte bikoitza edo errepikatu arte bikoitza e" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 #, fuzzy msgid "" "\n" @@ -6831,56 +6910,56 @@ msgid "" msgstr "" "eta maiatzak bider M MB M B eta aktibatuta errepikatu arte E Y maiatzak e e" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, fuzzy, c-format msgid "invalid type string %s" msgstr "baliogabea mota" -#: src/od.c:690 +#: src/od.c:693 #, 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:811 +#: src/od.c:814 #, 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:869 +#: src/od.c:872 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "baliogabea in mota" -#: src/od.c:1094 +#: src/od.c:1105 #, fuzzy, c-format msgid "cannot skip past end of combined input" msgstr "-" -#: src/od.c:1650 +#: src/od.c:1658 #, fuzzy, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "baliogabea" -#: src/od.c:1788 +#: src/od.c:1796 #, fuzzy, c-format msgid "no type may be specified when dumping strings" msgstr "ez mota maiatzak" -#: src/od.c:1863 +#: src/od.c:1871 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "modua hirukoa" -#: src/od.c:1884 +#: src/od.c:1892 #, fuzzy, c-format msgid "skip-bytes + read-bytes is too large" msgstr "da" -#: src/od.c:1927 +#: src/od.c:1935 #, fuzzy, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "baliogabea zabalera horren ordez" @@ -6900,7 +6979,6 @@ msgstr "sarrera estandarra itxita dago" 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 "" "Idatzi lerroz behin - lerroz behin FITXATEGIA bider ez FITXATEGIA edo " "FITXATEGIA da e e" @@ -7037,12 +7115,12 @@ msgstr "Noiz" msgid "Where" msgstr "Non" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Erabilera: %s [AUKERA]... [ERABILTZAILEA]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 #, fuzzy msgid "" "\n" @@ -7059,7 +7137,7 @@ msgstr "" " in\n" " uneko da lehenetsia e" -#: src/pinky.c:504 +#: src/pinky.c:503 #, fuzzy msgid "" " -f omit the line of column headings in short format\n" @@ -7074,7 +7152,7 @@ msgstr "" " urrunekoa eta\n" " in e" -#: src/pinky.c:513 +#: src/pinky.c:512 #, fuzzy, c-format msgid "" "\n" @@ -7082,97 +7160,97 @@ msgid "" "The utmp file will be %s.\n" msgstr "programa e" -#: src/pinky.c:597 +#: src/pinky.c:596 #, fuzzy, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "ez" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" -#: src/pr.c:910 +#: src/pr.c:907 #, fuzzy, c-format msgid "invalid page range %s" msgstr "baliogabea mota" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "baliogabea - lerroz behin" -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "I KOPURUA baliogabea" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "baliogabea" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "baliogabea -" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "M baliogabea -" -#: src/pr.c:1096 +#: src/pr.c:1059 #, fuzzy, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "- zutabetan in." -#: src/pr.c:1100 +#: src/pr.c:1063 #, fuzzy, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "eta in." -#: src/pr.c:1196 +#: src/pr.c:1166 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "edo baliogabea in" -#: src/pr.c:1293 +#: src/pr.c:1263 #, fuzzy, c-format msgid "page width too narrow" msgstr "zabalera" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" -#: src/pr.c:2380 +#: src/pr.c:2350 #, fuzzy, c-format msgid "page number overflow" msgstr "da" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "" -#: src/pr.c:2757 +#: src/pr.c:2727 #, fuzzy msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "edo FITXATEGIA errepikatu arte e e" -#: src/pr.c:2763 +#: src/pr.c:2734 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -7189,7 +7267,7 @@ msgstr "" " a da - lerroz behin in\n" " zutabetan aktibatuta e" -#: src/pr.c:2771 +#: src/pr.c:2742 #, fuzzy msgid "" " -a, --across print columns across rather than down, used together\n" @@ -7206,7 +7284,7 @@ msgstr "" " bikoitza\n" " bikoitza e" -#: src/pr.c:2779 +#: src/pr.c:2750 #, fuzzy msgid "" " -D, --date-format=FORMAT\n" @@ -7227,7 +7305,7 @@ msgstr "" " bider a goiburua honekin edo a goiburua\n" " eta e" -#: src/pr.c:2789 +#: src/pr.c:2760 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -7248,12 +7326,23 @@ msgstr "" " lerroz behin lerroz behin desaktibatuta M ez\n" " KATEA e" -#: src/pr.c:2798 +#: src/pr.c:2769 #, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +"\n" +" lerroz behin\n" +" lehenetsia - lerroz behin - testua eta honekin\n" +" m in in\n" +" lerroz behin lerroz behin - honekin e" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -7263,7 +7352,7 @@ msgstr "" " m in in\n" " lerroz behin lerroz behin - honekin e" -#: src/pr.c:2805 +#: src/pr.c:2779 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -7280,7 +7369,7 @@ msgstr "" " hasi honekin KOPURUA 1. - lehen\n" " e" -#: src/pr.c:2813 +#: src/pr.c:2787 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -7295,7 +7384,7 @@ msgstr "" " ez\n" " a e" -#: src/pr.c:2820 +#: src/pr.c:2794 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -7312,7 +7401,7 @@ msgstr "" " desaktibatuta -\n" " a m da e" -#: src/pr.c:2828 +#: src/pr.c:2802 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7320,14 +7409,19 @@ msgid "" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" "zutabetan bider KATEA\n" " S Lehenetsia bereizlea honekin eta\n" " S ez aktibatuta\n" " goiburua eta e" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -7350,7 +7444,7 @@ msgstr "" " zabalera errepikatu arte\n" " testua desaktibatuta e" -#: src/pr.c:2845 +#: src/pr.c:2822 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -7364,14 +7458,6 @@ msgstr "" " lerroz behin da ez\n" " honekin S edo e" -#: src/pr.c:2853 -#, fuzzy -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "e bider edo honekin ez FITXATEGIA edo da e" - #: src/printenv.c:62 #, fuzzy, c-format msgid "" @@ -7518,12 +7604,11 @@ msgid "" "files.\n" msgstr "Irteera a - in e e" -#: src/ptx.c:1830 +#: src/ptx.c:1831 #, fuzzy 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\n" " C copyright-a Copyright eta\n" @@ -7531,6 +7616,12 @@ msgstr "" " KATEA erabili KATEA errepikatu arte e" #: src/ptx.c:1835 +msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -7545,7 +7636,7 @@ msgstr "" " S errepikatu arte - lerroz behin edo -\n" " e" -#: src/ptx.c:1842 +#: src/ptx.c:1846 #, fuzzy msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" @@ -7562,7 +7653,7 @@ msgstr "" " ez ikusi egin FITXATEGIA ez ikusi egin zerrenda FITXATEGIA\n" " FITXATEGIA zerrenda uneko FITXATEGIA e" -#: src/ptx.c:1850 +#: src/ptx.c:1854 #, fuzzy msgid "" " -r, --references first field of each line is a reference\n" @@ -7574,18 +7665,16 @@ msgstr "" " modua\n" " zabalera KOPURUA zabalera in zutabetan e" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "ez FITXATEGIA edo FITXATEGIA da e" - #: src/ptx.c:1951 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "baliogabea zabalera" +#: src/ptx.c:1978 +#, fuzzy, c-format +msgid "invalid line width: %s" +msgstr "baliogabea zabalera" + #: src/pwd.c:57 #, fuzzy msgid "" @@ -7610,7 +7699,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "huts egin da %s-(r)i `chdir' egiten" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "huts egin da %s-(r) `stat' egiten" @@ -7630,8 +7719,8 @@ msgstr "aukera ez diren argumentuak baztertzen" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Erabilera: %s [AUKERA]... FITXATEGIA...\n" @@ -7838,15 +7927,15 @@ msgstr "erabili a da - Baldintzak e" #: src/rm.c:342 #, fuzzy, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: ezabatu argumentu guztiak errekurtsiboki?" msgstr[1] "%s: ezabatu argumentu guztiak errekurtsiboki?" #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: ezabatu argumentu guztiak?" msgstr[1] "%s: ezabatu argumentu guztiak?" @@ -8043,12 +8132,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "baliogabea puntu" -#: src/seq.c:234 +#: src/seq.c:248 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "ezezaguna mota" -#: src/seq.c:557 +#: src/seq.c:603 #, fuzzy, c-format msgid "format string may not be specified when printing equal width strings" msgstr "maiatzak zabalera" @@ -8065,7 +8154,14 @@ msgid "" "for even very expensive hardware probing to recover the data.\n" msgstr "Gainidatzi FITXATEGIA in e e" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "ez FITXATEGIA edo FITXATEGIA da e" + +#: src/shred.c:181 #, fuzzy, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8077,7 +8173,7 @@ msgstr "" " e I Gainidatzi I horren ordez - lehenetsia\n" " tamaina I uneko M B e" -#: src/shred.c:183 +#: src/shred.c:187 #, fuzzy msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" @@ -8093,12 +8189,10 @@ msgstr "" " a honekin\n" " e" -#: src/shred.c:192 +#: src/shred.c:196 #, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -8111,7 +8205,7 @@ msgid "" msgstr "" "FITXATEGIA da lehenetsia da da aktibatuta gailua Noiz aktibatuta erabili e e" -#: src/shred.c:206 +#: src/shred.c:208 #, fuzzy msgid "" "CAUTION: Note that shred relies on a very important assumption:\n" @@ -8123,7 +8217,7 @@ msgid "" "\n" msgstr "Oharra aktibatuta a garrantzitsua in da uneko - aktibatuta da e e" -#: src/shred.c:214 +#: src/shred.c:216 #, fuzzy msgid "" "* log-structured or journaled file systems, such as those supplied with\n" @@ -8139,7 +8233,7 @@ msgstr "" " eta Solaris eta e e eta aktibatuta\n" " e e Sarea zerbitzaria e e" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8148,7 +8242,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -8160,7 +8254,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:241 +#: src/shred.c:243 #, fuzzy msgid "" "In addition, file system backups and remote mirrors may contain copies\n" @@ -8170,127 +8264,127 @@ msgstr "" "in\n" " e e e eta urrunekoa maiatzak eta a e" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "" -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek-ek huts egin du" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: fitxategi luzeegia" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat-ek huts egin du" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: fitxategi moeta baliogabea" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: fitxategiak luzeera negatiboa dauka" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: fnctl-ek huts egin du" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: kentzen" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: %s-(e)ra izena aldatu da" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: huts egin da ezabatzen" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: kenduta" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: huts egin da itxitzean" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: huts egin da idazteko irekitzean" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: baliogabeko pausu kopurua" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, fuzzy, c-format msgid "multiple random sources specified" msgstr "irteera fitxategi anitz espezifikatu dira" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s; fitxategi tamaina baliogabea" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -8301,12 +8395,12 @@ msgstr "" " edo: %s -e [AUKERA]... [ARGUMENTUA]...\n" " edo: %s -i LO-HI [AUKERA]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 #, fuzzy msgid "Write a random permutation of the input lines to standard output.\n" msgstr "Inprimatu - lerroz behin FITXATEGIA e e" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -8317,37 +8411,37 @@ msgid "" " -r, --repeat output lines can be repeated\n" msgstr "" -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "errepikatutako lerro gehiegi" -#: src/shuf.c:431 +#: src/shuf.c:428 #, fuzzy, c-format msgid "multiple -i options specified" msgstr "-l edo -t aukera anitz espezifikatu dira" -#: src/shuf.c:452 -#, fuzzy, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "baliogabea" -#: src/shuf.c:465 +#: src/shuf.c:459 #, fuzzy, c-format -msgid "invalid line count %s" +msgid "invalid line count: %s" msgstr "baliogabea zabalera" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "irteera fitxategi anitz espezifikatu dira" -#: src/shuf.c:502 +#: src/shuf.c:496 #, fuzzy, c-format msgid "cannot combine -e and -i options" msgstr "honekin edo" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -8370,12 +8464,12 @@ 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:323 +#: src/sleep.c:135 src/timeout.c:325 #, fuzzy, c-format msgid "invalid time interval %s" msgstr "baliogabea" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "" @@ -8385,7 +8479,7 @@ msgstr "" msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "Idatzi - FITXATEGIA e e e" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -8393,7 +8487,7 @@ msgstr "" "Aukerak ordenatzen:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 #, fuzzy msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" @@ -8405,7 +8499,7 @@ msgstr "" " eta\n" " ez ikusi egin e" -#: src/sort.c:443 +#: src/sort.c:444 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -8418,12 +8512,12 @@ msgstr "" " e balioa\n" " - e e" -#: src/sort.c:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 #, fuzzy msgid "" " -n, --numeric-sort compare according to string numerical value\n" @@ -8437,7 +8531,7 @@ msgstr "" " e balioa\n" " - e e" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8447,7 +8541,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -8455,13 +8549,13 @@ msgstr "" "Beste aukerak:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -8470,7 +8564,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8479,13 +8573,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 #, fuzzy msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" @@ -8501,7 +8595,7 @@ msgstr "" " bider azken\n" " S tamaina TAMAINA erabili TAMAINA errepikatu arte e" -#: src/sort.c:497 +#: src/sort.c:498 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8521,7 +8615,7 @@ msgstr "" " esklusiboa honekin errepikatu arte\n" " lehen - e" -#: src/sort.c:511 +#: src/sort.c:512 #, fuzzy msgid "" "\n" @@ -8543,13 +8637,11 @@ msgstr "" "da C da eta C da edo errepikatu arte Baldintzak ez da erabili e maiatzak " "bider e" -#: src/sort.c:524 +#: src/sort.c:525 #, fuzzy 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" @@ -8558,275 +8650,276 @@ 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:725 +#: src/sort.c:724 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "%s-ra idazten" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:884 +#: src/sort.c:883 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "ezin da %s esteka sortu" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "irekitzeak huts egin du" -#: src/sort.c:998 +#: src/sort.c:997 #, fuzzy msgid "fflush failed" msgstr "itxierak huts egin du" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "itxierak huts egin du" -#: src/sort.c:1140 +#: src/sort.c:1139 #, fuzzy msgid "couldn't create temporary file" msgstr "ezin izan da abio ordua lortu" -#: src/sort.c:1179 +#: src/sort.c:1178 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "ezin da %s direktorioa sortu" -#: src/sort.c:1252 +#: src/sort.c:1251 #, fuzzy, c-format msgid "warning: cannot remove: %s" msgstr "ezin da %s kendu" -#: src/sort.c:1338 +#: src/sort.c:1337 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "baliogabeko argumentua: %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "%s argumentu anbiguoa da %s-(r)entzat" -#: src/sort.c:1356 +#: src/sort.c:1355 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s luzeegia da" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "uneko rlimit-arekin gehienezko --%s argumentu kopurua %s da " -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "`stat'-ek huts egin du" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "irakurtzeak huts egin du" -#: src/sort.c:2076 +#: src/sort.c:2075 #, fuzzy, c-format msgid "string transformation failed" msgstr "kate konparaketak huts egin du" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "%s: '%s' aukera anbiguoa da\n" msgstr[1] "%s: '%s' aukera anbiguoa da\n" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "idazketak huts egin du" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: desordena: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "errore estandarra" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "ezin da data ezarri" -#: src/sort.c:4017 +#: src/sort.c:4016 #, fuzzy, c-format msgid "%s: invalid field specification %s" msgstr "baliogabea" -#: src/sort.c:4028 +#: src/sort.c:4027 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "`-%s' aukerak ez dira bateragarriak" -#: src/sort.c:4079 +#: src/sort.c:4078 #, fuzzy, c-format msgid "%s: invalid count at start of %s" msgstr "baliogabea hasi -" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "baliogabeko zenbakia `-'-ren ondoren" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "baliogabeko zenbakia `.'-ren ondoren" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 #, fuzzy msgid "stray character in field spec" msgstr "in" -#: src/sort.c:4403 +#: src/sort.c:4402 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "-l edo -t aukera anitz espezifikatu dira" -#: src/sort.c:4420 +#: src/sort.c:4419 #, fuzzy msgid "invalid number at field start" msgstr "baliogabea hasi" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 #, fuzzy msgid "field number is zero" msgstr "da" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "offset karakterea zero da" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "`,' ondoren zenbaki baliogabea" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "tabulazioa hutsa" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, fuzzy, c-format msgid "cannot read file names from %s" msgstr "eta" -#: src/sort.c:4613 +#: src/sort.c:4612 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s: fitxategi moeta baliogabea" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "ez dago sarrearik %s-(e)tik" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, fuzzy, c-format msgid "extra operand %s not allowed with -%c" msgstr "-c-rekin baimendu gabeko `%s' eragigai extra" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Erabilera: %s [AUKERA]... [SARRERA [AURRIZKIA]]\n" -#: src/split.c:207 +#: src/split.c:228 #, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "Irteera finkoa tamaina - lehenetsia da x ez edo da e e" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 #, fuzzy msgid "" " --verbose print a diagnostic just before each\n" @@ -8835,201 +8928,206 @@ msgstr "" "a\n" " lehenago da e" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "Irteera" -#: src/split.c:365 +#: src/split.c:419 #, fuzzy, c-format msgid "creating file %s\n" msgstr "`%s' fitxategia sortzen\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "huts egin da %s irekitzen" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "huts egin da %s irekitzen" -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" msgstr "%s direktorioa itxitzen" -#: src/split.c:410 +#: src/split.c:464 #, fuzzy, c-format msgid "closing output pipe" msgstr "%s irteera fitxategia itxitzen" -#: src/split.c:414 +#: src/split.c:468 #, fuzzy, c-format msgid "moving input pipe" msgstr "%s sarrera fitxategia itxitzen" -#: src/split.c:416 +#: src/split.c:470 #, fuzzy, c-format msgid "closing input pipe" msgstr "%s sarrera fitxategia itxitzen" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "huts egin da %s komandoa exekutatzen" -#: src/split.c:427 +#: src/split.c:481 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "huts egin da %s klonatzen" -#: src/split.c:463 +#: src/split.c:517 #, fuzzy, c-format msgid "waiting for child process" msgstr "%s-ra idazten" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, fuzzy, c-format msgid "cannot split in more than one way" msgstr "in" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "baliogabea - segundo" -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: baliogabeko zenbakia" -#: src/split.c:1169 -#, fuzzy, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "baliogabea" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 +#, c-format +msgid "empty record separator" +msgstr "" + +#: src/split.c:1344 #, fuzzy, c-format -msgid "%s: invalid number of bytes" -msgstr "baliogabea -" +msgid "multi-character separator %s" +msgstr "baliogabea" -#: src/split.c:1213 src/split.c:1360 +#: src/split.c:1352 #, fuzzy, c-format -msgid "%s: invalid number of lines" -msgstr "baliogabea - lerroz behin" +msgid "multiple separator characters specified" +msgstr "karaktere fitxategi berezia" -#: src/split.c:1286 +#: src/split.c:1383 #, fuzzy, c-format msgid "line count option -%s%c... is too large" msgstr "da" -#: src/split.c:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "baliogabea" -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s; fitxategi tamaina baliogabea" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "huts egin da %s klonatzen" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "%s: '%c%s' aukera ezezaguna\n" -#: src/stat.c:1184 +#: src/stat.c:1187 #, fuzzy, c-format msgid "%s: invalid directive" msgstr "%%%c. direktiba baliogabea" -#: src/stat.c:1231 +#: src/stat.c:1234 #, fuzzy, c-format msgid "warning: backslash at end of format" msgstr "baliogabea -" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, fuzzy, c-format msgid "cannot read file system information for %s" msgstr "errepikatu arte" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9040,7 +9138,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9048,30 +9146,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, fuzzy, c-format msgid "Context: %C\n" msgstr " kontestua=%s" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9079,17 +9177,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9099,7 +9197,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1433 +#: src/stat.c:1436 #, fuzzy msgid "" "\n" @@ -9117,7 +9215,7 @@ msgstr "" " B tamaina in - bider\n" " Zenbakia - B e" -#: src/stat.c:1442 +#: src/stat.c:1445 #, fuzzy msgid "" " %d device number in decimal\n" @@ -9134,7 +9232,7 @@ msgstr "" " B Taldea - jabea\n" " Taldea IDa - jabea e" -#: src/stat.c:1450 +#: src/stat.c:1453 #, fuzzy msgid "" " %h number of hard links\n" @@ -9156,7 +9254,7 @@ msgstr "" " gailua mota in\n" " gailua mota in e" -#: src/stat.c:1461 +#: src/stat.c:1464 #, fuzzy msgid "" " %u user ID of owner\n" @@ -9180,7 +9278,7 @@ msgstr "" " Ordua - azken segundo\n" " Ordua - azken e e" -#: src/stat.c:1475 +#: src/stat.c:1478 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -9198,7 +9296,7 @@ msgstr "" " Libre in\n" " Libre in e" -#: src/stat.c:1484 +#: src/stat.c:1487 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -9260,8 +9358,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -9286,7 +9383,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "a zerrenda - edo" -#: src/stty.c:516 +#: src/stty.c:524 #, fuzzy, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9297,11 +9394,11 @@ msgstr "" " edo GAILUA GAILUA a\n" " edo GAILUA GAILUA e" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 #, fuzzy msgid "" " -a, --all print all current settings in human-readable form\n" @@ -9313,7 +9410,7 @@ msgstr "" " in a\n" " GAILUA eta erabili GAILUA horren ordez - e" -#: src/stty.c:535 +#: src/stty.c:543 #, fuzzy msgid "" "\n" @@ -9321,12 +9418,24 @@ msgid "" "settings. The underlying system defines which settings are available.\n" msgstr "lehenago e" -#: src/stty.c:540 -#, fuzzy +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -9335,10 +9444,13 @@ msgstr "" " -\n" " e" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 #, fuzzy 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" @@ -9348,38 +9460,57 @@ msgstr "" "\n" " e" -#: src/stty.c:553 -#, fuzzy -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" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" msgstr "" -"hurrengo\n" -" a\n" -"\n" -" hasi geroago e" -#: src/stty.c:559 +#: src/stty.c:593 #, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 "" "gelditu gelditu\n" " a terminala gelditu\n" " a\n" " azken e" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 #, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +" I eta I\n" +" I terminala I zutabetan\n" +" zutabetan I I e" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -9388,11 +9519,17 @@ msgstr "" " I terminala I zutabetan\n" " zutabetan I I e" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 #, fuzzy 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" @@ -9402,12 +9539,21 @@ msgstr "" " min I honekin I gutxienekoa errepikatu arte a\n" " I I e" -#: src/stty.c:578 +#: src/stty.c:632 #, fuzzy 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" +msgstr "" +"errenkadatan I terminala I errenkadatan\n" +" tamaina - errenkadatan eta zutabetan\n" +" terminala\n" +" I honekin - I - a segundo e" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -9416,24 +9562,27 @@ msgstr "" " terminala\n" " I honekin - I - a segundo e" -#: src/stty.c:584 -#, fuzzy +#: src/stty.c:641 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" -" desgaitu modem\n" -" jasota\n" -" gaitu\n" -" tamaina I I in e" -#: src/stty.c:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -9442,7 +9591,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" "erabili bikoa gelditu honekin\n" " a azken\n" @@ -9450,7 +9598,11 @@ msgstr "" " in eta in\n" " honekin e" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 #, fuzzy msgid "" "\n" @@ -9459,6 +9611,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "\n" @@ -9466,11 +9619,14 @@ msgstr "" " ez ikusi egin\n" " ez ikusi egin e" -#: src/stty.c:609 -#, fuzzy +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -9481,15 +9637,22 @@ msgstr "" " gaitu\n" " garbitu handia 8. - e" -#: src/stty.c:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:619 -#, fuzzy +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -9502,62 +9665,83 @@ msgstr "" " honekin a\n" " e" -#: src/stty.c:627 -#, fuzzy +#: src/stty.c:712 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 "" -"\n" -" I in\n" -" I in\n" -" I in\n" -" I in e" -#: src/stty.c:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]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 "" -"\n" -" erabili errepikatu arte horren ordez -\n" -" erabili horren ordez - errepikatu arte\n" -"\n" -"\n" -" a e" -#: src/stty.c:643 -#, fuzzy +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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 "" -"hau ematen du in lehen\n" -"\n" -" I in\n" -"\n" -"\n" -" I in e" -#: src/stty.c:651 -#, fuzzy +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -9566,45 +9750,59 @@ msgstr "" " bider eta\n" " bider eta e" -#: src/stty.c:658 -#, fuzzy +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr "" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -"in\n" -"\n" -"\n" -"\n" -" a geroago a e" -#: src/stty.c:665 -#, fuzzy +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" +"gaitu eta\n" +" desgaitu geroago eta\n" "\n" -" bestelakoa\n" -" gorantz eta\n" -" gaitu eta\n" -" gaitu e" +" gelditu atzeko planoa terminala\n" +" honekin honekin errepikatu arte e" -#: src/stty.c:672 +#: src/stty.c:843 #, fuzzy 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 "" "gaitu eta\n" " desgaitu geroago eta\n" @@ -9612,12 +9810,33 @@ msgstr "" " gelditu atzeko planoa terminala\n" " honekin honekin errepikatu arte e" -#: src/stty.c:679 -#, fuzzy +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -9626,43 +9845,50 @@ msgstr "" "\n" " e" -#: src/stty.c:686 +#: src/stty.c:875 #, fuzzy 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 "" "\n" " eta lehenetsia\n" "\n" " e" -#: src/stty.c:692 -#, fuzzy +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -"\n" -"\n" -"\n" -" eta lehenetsia\n" -" e" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 #, fuzzy 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 "" "\n" "\n" @@ -9671,7 +9897,18 @@ msgstr "" "\n" " e" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"\n" +"\n" +" e" + +#: src/stty.c:943 #, fuzzy msgid "" " oddp same as parenb parodd cs7\n" @@ -9686,12 +9923,12 @@ msgstr "" "\n" " e" -#: src/stty.c:714 -#, fuzzy +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" "\n" @@ -9699,15 +9936,15 @@ msgstr "" " min\n" " e" -#: src/stty.c:720 -#, fuzzy +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" "\n" "\n" @@ -9716,7 +9953,7 @@ msgstr "" "\n" " lehenetsia e" -#: src/stty.c:728 +#: src/stty.c:1052 #, fuzzy msgid "" "\n" @@ -9726,57 +9963,62 @@ 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:800 +#: src/stty.c:1124 #, fuzzy, c-format msgid "only one device may be specified" msgstr "gailua maiatzak" -#: src/stty.c:830 +#: src/stty.c:1154 #, fuzzy, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "errepikatu arte eta" -#: src/stty.c:836 +#: src/stty.c:1160 #, fuzzy, c-format msgid "when specifying an output style, modes may not be set" msgstr "maiatzak" -#: src/stty.c:851 +#: src/stty.c:1175 #, fuzzy, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "berrezarri modua" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "baliogabeko argumentua: %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "argumentua falta da %s-(r)entzat" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "errorea %s idazten" + +#: src/stty.c:1331 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "baliogabea zabalera" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1403 +#: src/stty.c:1747 #, fuzzy, c-format msgid "%s: no size information for this device" msgstr "ez tamaina errepikatu arte uneko gailua" -#: src/stty.c:1924 -#, fuzzy, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "baliogabea" #. This is a proper name. See the gettext manual, section Names. @@ -9786,8 +10028,12 @@ msgstr "Kayvan Aghaiepour" #: src/sum.c:62 #, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "Inprimatu eta - FITXATEGIA e e" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -9796,19 +10042,54 @@ msgstr "" " erabili batuketa erabili\n" " erabili Sistema B batuketa erabili e" -#: src/sync.c:41 -#, fuzzy +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Erabilera: %s [AUKERA] [FITXATEGIA]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "Behartu e e" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" +"\n" +msgstr "" -#: src/sync.c:69 +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "errorea %s irakurtzen" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "berrezarri modua" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "errorea %s irakurtzen" + +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "argumentu guztiak ignoratzen" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -9817,15 +10098,22 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help mezu hau erakutsi eta irten\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version bertsioari buruzko informazioa atera eta irten\n" -#: src/system.h:543 +#: src/system.h:537 +#, fuzzy +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "ez FITXATEGIA edo FITXATEGIA da e" + +#: src/system.h:544 #, fuzzy msgid "" "\n" @@ -9834,7 +10122,7 @@ msgstr "" "Beharrezkoak diren argumentuak aukera luzeetan, beharrezkoak dira aukera " "txikietan ere.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -9842,7 +10130,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -9851,7 +10139,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, fuzzy, c-format msgid "" "\n" @@ -9862,22 +10150,27 @@ msgstr "%s-(r)en orri nagusia: <%s>\n" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "Full documentation at: <%s%s>\n" msgstr "" -#: src/system.h:591 +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "" + +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Saiatu `%s --help' erabiltzen informazio gehiagorako.\n" -#: src/system.h:633 +#: src/system.h:655 #, fuzzy, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9896,9 +10189,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "Idatzi FITXATEGIA azken lehen ez FITXATEGIA edo FITXATEGIA da e e" #: src/tac.c:144 @@ -9912,68 +10203,67 @@ msgstr "" " bereizlea a\n" " bereizlea KATEA erabili KATEA bereizlea horren ordez - e" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: seek-ek huts egin du" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "erregistroa luzeegia da" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "ezin da %s esteka sortu" -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: huts egin da idazteko irekitzean" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "errepikatu arte" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: idazketa errorea" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "errepikatu arte" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "bereizlea-k ezin du hutsunea izan" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 +#: src/tail.c:257 #, 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" msgstr "" "Inprimatu azken lerroz behin - FITXATEGIA FITXATEGIA honekin a goiburua ez " "FITXATEGIA edo FITXATEGIA da e e" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 #, fuzzy msgid "" " -f, --follow[={name|descriptor}]\n" @@ -9987,7 +10277,7 @@ msgstr "" "\n" " e" -#: src/tail.c:280 +#: src/tail.c:275 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10006,7 +10296,7 @@ msgstr "" " edo\n" " uneko da - e" -#: src/tail.c:293 +#: src/tail.c:288 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -10019,7 +10309,7 @@ msgstr "" " lehenetsia\n" " e" -#: src/tail.c:298 +#: src/tail.c:293 #, fuzzy msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" @@ -10034,7 +10324,7 @@ msgstr "" " lehenetsia\n" " e" -#: src/tail.c:307 +#: src/tail.c:302 #, fuzzy msgid "" "\n" @@ -10048,7 +10338,7 @@ msgstr "" "lehen - I - edo lerroz behin da a honekin hasi - azken I in I maiatzak a m e " "e" -#: src/tail.c:316 +#: src/tail.c:311 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -10059,169 +10349,169 @@ 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:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "%s itxitzen (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, fuzzy, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "erlatiboa" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, fuzzy, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "honekin gora aktibatuta uneko" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "" -#: src/tail.c:1035 +#: src/tail.c:1032 #, fuzzy, c-format -msgid "%s has appeared; following end of new file" +msgid "%s has appeared; following new file" msgstr "- berria" -#: src/tail.c:1046 +#: src/tail.c:1042 #, fuzzy, c-format -msgid "%s has been replaced; following end of new file" +msgid "%s has been replaced; following new file" msgstr "- berria" -#: src/tail.c:1163 +#: src/tail.c:1159 #, fuzzy, c-format msgid "%s: cannot change nonblocking mode" msgstr "berrezarri modua" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: fitxategia trunkatu da" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "ez da fitxategirik geratzen" -#: src/tail.c:1424 +#: src/tail.c:1440 #, fuzzy, c-format msgid "cannot watch parent directory of %s" msgstr "ezin da 'stat' egin uneko direktorioan (unekoa %s)" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, fuzzy, c-format msgid "inotify resources exhausted" msgstr "Irteera" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "ezin zaio %s-(r)i watch egin" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: %s ordezkatu?" + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "errorea inotify gertakariak irakurtzen" -#: src/tail.c:1844 +#: src/tail.c:1902 #, fuzzy, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "- uneko mota - gora aktibatuta uneko" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "zenbakia %s-(e)-n luzeegia da" - -#: src/tail.c:2033 -#, fuzzy, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "baliogabea gehienezkoa -" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: baliogabeko PIDa" -#: src/tail.c:2068 +#: src/tail.c:2107 #, fuzzy, c-format -msgid "%s: invalid number of seconds" -msgstr "baliogabea - segundo" +msgid "invalid number of seconds: %s" +msgstr "baliogabeko zutabe kopurua: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "" -#: src/tail.c:2096 +#: src/tail.c:2135 #, fuzzy, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "PID enoratua PID da" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, fuzzy, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "PID enoratua PID da" -#: src/tail.c:2108 +#: src/tail.c:2147 #, fuzzy, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "PID da aktibatuta uneko" -#: src/tail.c:2209 +#: src/tail.c:2250 #, fuzzy, c-format msgid "cannot follow %s by name" msgstr "bider" -#: src/tail.c:2215 +#: src/tail.c:2256 #, fuzzy, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "da" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 #, fuzzy msgid "" "Copy standard input to each FILE, and also to standard output.\n" @@ -10233,59 +10523,72 @@ msgstr "" " a\n" " ez ikusi egin ez ikusi egin e" -#: src/tee.c:71 -#, fuzzy +#: src/tee.c:93 +msgid "" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" +msgstr "" + +#: src/tee.c:98 msgid "" "\n" -"If a FILE is -, copy again to standard output.\n" -msgstr "ez FITXATEGIA edo FITXATEGIA da e" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "argumentua falta da %s-(r)en ondoren" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "baliogabeko %s osokoa" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "')' espero zen" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "')' espero zen, eta %s aurkitu da" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, fuzzy, c-format msgid "%s: unary operator expected" msgstr "e" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt aukerak ez du -l onartzen" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef aukerak ez du -l onartzen" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot aukerak ez du -l onartzen" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "operatzaile binario ezezaguna" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: operatzaile binarioa espero zen" -#: src/test.c:704 +#: src/test.c:706 #, fuzzy msgid "" "Usage: test EXPRESSION\n" @@ -10298,7 +10601,7 @@ msgstr "" " edo ADIERAZPENA\n" " edo honekin bider ADIERAZPENA e e" -#: src/test.c:711 +#: src/test.c:713 #, fuzzy msgid "" "Exit with the status determined by EXPRESSION.\n" @@ -10308,7 +10611,7 @@ msgstr "" " edo ADIERAZPENA\n" " edo honekin bider ADIERAZPENA e e" -#: src/test.c:717 +#: src/test.c:719 #, fuzzy msgid "" "\n" @@ -10316,7 +10619,7 @@ msgid "" "EXPRESSION is true or false and sets exit status. It is one of:\n" msgstr "da edo eta da - e" -#: src/test.c:722 +#: src/test.c:724 #, fuzzy msgid "" "\n" @@ -10331,7 +10634,7 @@ msgstr "" " a eta\n" " edo da e" -#: src/test.c:729 +#: src/test.c:731 #, fuzzy msgid "" "\n" @@ -10347,7 +10650,7 @@ msgstr "" "\n" " e" -#: src/test.c:737 +#: src/test.c:739 #, fuzzy msgid "" "\n" @@ -10366,7 +10669,7 @@ msgstr "" " da\n" " da e" -#: src/test.c:746 +#: src/test.c:748 #, fuzzy msgid "" "\n" @@ -10379,7 +10682,7 @@ msgstr "" " da\n" " da e" -#: src/test.c:752 +#: src/test.c:754 #, fuzzy msgid "" "\n" @@ -10394,7 +10697,7 @@ msgstr "" " FITXATEGIA FITXATEGIA badago eta da a\n" " FITXATEGIA FITXATEGIA badago e" -#: src/test.c:759 +#: src/test.c:761 #, fuzzy msgid "" " -f FILE FILE exists and is a regular file\n" @@ -10409,7 +10712,7 @@ msgstr "" " B FITXATEGIA FITXATEGIA badago eta da bider taldea IDa\n" " FITXATEGIA FITXATEGIA badago eta e" -#: src/test.c:766 +#: src/test.c:768 #, fuzzy msgid "" " -L FILE FILE exists and is a symbolic link (same as -h)\n" @@ -10424,7 +10727,7 @@ msgstr "" " FITXATEGIA FITXATEGIA badago eta da\n" " FITXATEGIA FITXATEGIA badago eta a tamaina e" -#: src/test.c:773 +#: src/test.c:775 #, fuzzy msgid "" " -S FILE FILE exists and is a socket\n" @@ -10439,7 +10742,7 @@ msgstr "" " FITXATEGIA FITXATEGIA badago eta da\n" " x FITXATEGIA FITXATEGIA badago eta da e" -#: src/test.c:780 +#: src/test.c:782 #, fuzzy msgid "" "\n" @@ -10449,33 +10752,33 @@ msgid "" "INTEGER may also be -l STRING, which evaluates to the length of STRING.\n" msgstr "bider errepikatu arte maiatzak KATEA - KATEA e" -#: src/test.c:786 +#: src/test.c:788 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 +#: src/test.c:793 msgid "test and/or [" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 #, fuzzy msgid "missing ']'" msgstr "`]' falta da" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "argumentu gehigarria: %s" @@ -10495,7 +10798,7 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -10504,11 +10807,11 @@ msgstr "" "Erabilera: %s [AUKERA] ERRO-BERRIA [KOMANDOA [ARGUMENTUA]...]\n" " edo: %s AUKERA\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -10526,7 +10829,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -10534,7 +10837,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -10545,7 +10848,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -10560,6 +10863,11 @@ msgstr "errorea komandoari itxaroten" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -10896,12 +11204,12 @@ msgstr "" msgid "Exit with a status code indicating failure." msgstr "" -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Erabilera: %s AUKERA... FITXATEGIA...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -10912,22 +11220,22 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -10935,57 +11243,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: fitxategiak luzeera negatiboa dauka" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "- eguna" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "" -#: src/truncate.c:303 +#: src/truncate.c:276 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "irteera fitxategi anitz espezifikatu dira" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "baliogabea" + +#: src/truncate.c:307 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "a zerrenda - edo" -#: src/truncate.c:340 +#: src/truncate.c:314 #, fuzzy, c-format msgid "you must specify a relative %s with %s" msgstr "a zerrenda - edo" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "ezin da %s ireki idazketarako" @@ -11000,17 +11313,20 @@ msgstr "Mark Kettenis" 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 "" "FITXATEGIA zerrenda honekin in FITXATEGIA ez FITXATEGIA edo FITXATEGIA da e e" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, fuzzy, c-format msgid "%s: input contains an odd number of tokens" msgstr "hau daukana -" -#: src/tsort.c:517 +#: src/tsort.c:521 #, fuzzy, c-format msgid "%s: input contains a loop:" msgstr "hau daukana a:" @@ -11074,9 +11390,7 @@ msgstr "ezin da sistemaren izena lortu" #: 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "Bihurtu in FITXATEGIA ez FITXATEGIA edo FITXATEGIA da e e" #: src/unexpand.c:124 @@ -11126,8 +11440,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -11138,7 +11452,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -11282,11 +11596,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, fuzzy, c-format msgid "" @@ -11302,13 +11611,17 @@ msgid "" "\n" msgstr "Irteera da in FITXATEGIA FITXATEGIA da erabili FITXATEGIA da e e" -#: src/wc.c:117 -#, fuzzy +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -11321,14 +11634,21 @@ msgstr "" " m\n" " lerroz behin e" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" +"T a\n" +"\n" +" h in\n" +" h erabili -\n" +" tamaina\n" +" e" #: src/who.c:210 msgid " old " @@ -11483,10 +11803,10 @@ msgid "" "\n" msgstr "Inprimatu honekin e e" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: ezin da izenik aurkitu %lu IDa duen erabiltzailearentzat\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "errepikatu arte IDa" #: src/yes.c:41 #, c-format @@ -11506,6 +11826,210 @@ msgstr "" "Errepikatu lerro berri batean espezifikatutako KATEA(k), edo `y'.\n" "\n" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "e bider edo honekin ez FITXATEGIA edo da e" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "ez FITXATEGIA edo FITXATEGIA da e" + +#, fuzzy +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "Behartu e e" + +#~ msgid "ignoring all arguments" +#~ msgstr "argumentu guztiak ignoratzen" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: baliogabeko zenbakia" + +#, fuzzy +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "da da" + +#~ msgid "number of lines" +#~ msgstr "lerro kopurua" + +#~ msgid "number of bytes" +#~ msgstr "byte kopurua" + +#, fuzzy +#~ msgid "%s: invalid number to ignore" +#~ msgstr "baliogabea - lerroz behin" + +#, fuzzy +#~ msgid "%s: invalid number of bytes" +#~ msgstr "baliogabea -" + +#, fuzzy +#~ msgid "%s: invalid number of lines" +#~ msgstr "baliogabea - lerroz behin" + +#~ msgid "number in %s is too large" +#~ msgstr "zenbakia %s-(e)-n luzeegia da" + +#, fuzzy +#~ msgid "%s: invalid number of seconds" +#~ msgstr "baliogabea - segundo" + +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "taldea" + +#, fuzzy +#~ 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 "" +#~ "a SIGUSR1 a martxan dd - eta e\n" +#~ " dd -\n" +#~ "\n" +#~ " in\n" +#~ " e" + +#, fuzzy +#~ 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 "" +#~ "hurrengo\n" +#~ " a\n" +#~ "\n" +#~ " hasi geroago e" + +#, 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" +#~ " desgaitu modem\n" +#~ " jasota\n" +#~ " gaitu\n" +#~ " tamaina I I in e" + +#, fuzzy +#~ 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 "" +#~ "\n" +#~ " I in\n" +#~ " I in\n" +#~ " I in\n" +#~ " I in e" + +#, fuzzy +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ "\n" +#~ " erabili errepikatu arte horren ordez -\n" +#~ " erabili horren ordez - errepikatu arte\n" +#~ "\n" +#~ "\n" +#~ " a e" + +#, fuzzy +#~ 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 "" +#~ "hau ematen du in lehen\n" +#~ "\n" +#~ " I in\n" +#~ "\n" +#~ "\n" +#~ " I in e" + +#, fuzzy +#~ 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 "" +#~ "in\n" +#~ "\n" +#~ "\n" +#~ "\n" +#~ " a geroago a e" + +#, fuzzy +#~ 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 "" +#~ "\n" +#~ " bestelakoa\n" +#~ " gorantz eta\n" +#~ " gaitu eta\n" +#~ " gaitu e" + +#, fuzzy +#~ 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 "" +#~ "\n" +#~ "\n" +#~ "\n" +#~ " eta lehenetsia\n" +#~ " e" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: ezin da izenik aurkitu %lu IDa duen erabiltzailearentzat\n" + #~ msgid "%s" #~ msgstr "%s" @@ -11931,9 +12455,6 @@ msgstr "" #~ msgid "too few arguments" #~ msgstr "argumentu gutxiegi" -#~ msgid "Usage: %s [OPTION] [FILE]...\n" -#~ msgstr "Erabilera: %s [AUKERA] [FITXATEGIA]...\n" - #~ msgid "closing standard output" #~ msgstr "irteera estandarra itxitzen" diff --git a/po/fi.gmo b/po/fi.gmo index 68f67d83..c4e0ace9 100644 Binary files a/po/fi.gmo and b/po/fi.gmo differ diff --git a/po/fi.po b/po/fi.po index 47d5d8eb..5f781b18 100644 --- a/po/fi.po +++ b/po/fi.po @@ -17,12 +17,13 @@ # group ID = ... # ################################ # +#: src/stty.c:941 msgid "" msgstr "" -"Project-Id-Version: coreutils 8.5\n" +"Project-Id-Version: coreutils 8.23-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" -"PO-Revision-Date: 2010-07-18 00:17+0300\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" +"PO-Revision-Date: 2015-04-26 19:22+0200\n" "Last-Translator: Lauri Nurmi \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -30,6 +31,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.8beta1\n" #: lib/argmatch.c:133 #, c-format @@ -51,18 +53,18 @@ msgstr "Kelvolliset argumentit:" msgid "error closing file" msgstr "virhe tiedoston sulkemisessa" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "kirjoitusvirhe" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "säilytettäessä tiedoston %s oikeuksia" @@ -113,7 +115,7 @@ msgstr "merkkierikoistiedosto" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "yhtenäistä dataa" #: lib/file-type.c:75 msgid "fifo" @@ -121,7 +123,7 @@ msgstr "putkitiedosto" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "ovi" #: lib/file-type.c:81 #, fuzzy @@ -134,30 +136,31 @@ msgid "multiplexed character special file" msgstr "merkkierikoistiedosto" #: lib/file-type.c:87 +#, fuzzy msgid "multiplexed file" -msgstr "" +msgstr "[TIEDOSTO]" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "outo tiedosto" +msgstr "nimetty tiedosto" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "lohkoerikoistiedosto" +msgstr "verkkoerikoistiedosto" #: lib/file-type.c:96 +#, fuzzy msgid "migrated file with data" -msgstr "" +msgstr "tiedoston dataa ei voi lukea" #: lib/file-type.c:99 +#, fuzzy msgid "migrated file without data" -msgstr "" +msgstr "tiedoston dataa ei voi lukea" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "portti" #: lib/file-type.c:105 msgid "socket" @@ -174,15 +177,16 @@ msgstr "outo tiedosto" #: lib/gai_strerror.c:57 #, fuzzy msgid "Address family for hostname not supported" -msgstr "fifo-tiedostot eivät ole tuettuja" +msgstr "Konenimen osoiteperhe ei ole tuettu" #: lib/gai_strerror.c:58 msgid "Temporary failure in name resolution" msgstr "Väliaikainen häiriö nimenselvityksessä" #: lib/gai_strerror.c:59 +#, fuzzy msgid "Bad value for ai_flags" -msgstr "" +msgstr "Väärä arvo kentälle ai_flags" #: lib/gai_strerror.c:60 msgid "Non-recoverable failure in name resolution" @@ -191,28 +195,30 @@ msgstr "Korjautumaton häiriö nimenselvityksessä" #: lib/gai_strerror.c:61 #, fuzzy msgid "ai_family not supported" -msgstr "fifo-tiedostot eivät ole tuettuja" +msgstr "ai_family ei ole tuettu" #: lib/gai_strerror.c:62 msgid "Memory allocation failure" msgstr "Muistinvarausvirhe" #: lib/gai_strerror.c:63 +#, fuzzy msgid "No address associated with hostname" -msgstr "" +msgstr "Konenimeen ei liity osoitetta" #: lib/gai_strerror.c:64 msgid "Name or service not known" msgstr "Nimi tai palvelu on tuntematon" #: lib/gai_strerror.c:65 +#, fuzzy msgid "Servname not supported for ai_socktype" -msgstr "" +msgstr "”Servname” ei ole tuettu ”ai_socktype”:lle" #: lib/gai_strerror.c:66 #, fuzzy msgid "ai_socktype not supported" -msgstr "fifo-tiedostot eivät ole tuettuja" +msgstr "ai_socktype ei ole tuettu" #: lib/gai_strerror.c:67 msgid "System error" @@ -220,103 +226,109 @@ msgstr "Järjestelmävirhe" #: lib/gai_strerror.c:68 msgid "Argument buffer too small" -msgstr "" +msgstr "Argumenttipuskuri on liian pieni" #: lib/gai_strerror.c:70 +#, fuzzy msgid "Processing request in progress" -msgstr "" +msgstr "Pyynnön käsittely käynnissä" #: lib/gai_strerror.c:71 msgid "Request canceled" -msgstr "" +msgstr "Pyyntö peruttu" #: lib/gai_strerror.c:72 msgid "Request not canceled" -msgstr "" +msgstr "Pyyntöä ei peruttu" #: lib/gai_strerror.c:73 msgid "All requests done" -msgstr "" +msgstr "Kaikki pyynnöt suoritettu" #: lib/gai_strerror.c:74 msgid "Interrupted by a signal" -msgstr "" +msgstr "Signaalin keskeyttämä" #: lib/gai_strerror.c:75 msgid "Parameter string not correctly encoded" -msgstr "" +msgstr "Parametrimerkkijono on väärin koodattu" #: lib/gai_strerror.c:87 msgid "Unknown error" msgstr "Tuntematon virhe" -#: lib/getopt.c:547 lib/getopt.c:576 -#, fuzzy, c-format +#: lib/getopt.c:575 lib/getopt.c:604 +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: valitsin ”%s” ei ole yksiselitteinen\n" +msgstr "%s: valitsin ”%s” on moniselitteinen; vaihtoehdot:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 #, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: valitsin ”-W %s” on moniselitteinen\n" + +#: lib/getopt.c:654 lib/getopt.c:658 +#, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: valitsin ”--%s” ei salli argumenttia\n" -#: lib/getopt.c:637 lib/getopt.c:642 -#, fuzzy, c-format +#: lib/getopt.c:667 lib/getopt.c:672 +#, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: valitsin ”%c%s” ei salli argumenttia\n" -#: lib/getopt.c:685 lib/getopt.c:704 -#, fuzzy, c-format +#: lib/getopt.c:715 lib/getopt.c:734 +#, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: valitsin ”%s” vaatii argumentin\n" +msgstr "%s: valitsin ”--%s” vaatii argumentin\n" -#: lib/getopt.c:742 lib/getopt.c:745 -#, fuzzy, c-format +#: lib/getopt.c:772 lib/getopt.c:775 +#, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: tunnistamaton valitsin ”--%s”\n" -#: lib/getopt.c:753 lib/getopt.c:756 -#, fuzzy, c-format +#: lib/getopt.c:783 lib/getopt.c:786 +#, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: tunnistamaton valitsin ”%c%s”\n" -#: lib/getopt.c:805 lib/getopt.c:808 -#, fuzzy, c-format +#: lib/getopt.c:835 lib/getopt.c:838 +#, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: epäkelpo valitsin – %c\n" +msgstr "%s: virheellinen valitsin -- ”%c”\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 -#, fuzzy, c-format +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: valitsin vaatii argumentin – %c\n" +msgstr "%s: valitsin vaatii argumentin -- ”%c”\n" -#: lib/getopt.c:934 lib/getopt.c:950 -#, fuzzy, c-format +#: lib/getopt.c:964 lib/getopt.c:980 +#, c-format msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: valitsin ”-W %s” ei ole yksiselitteinen\n" +msgstr "%s: valitsin ”-W %s” on moniselitteinen\n" -#: lib/getopt.c:974 lib/getopt.c:992 -#, fuzzy, c-format +#: lib/getopt.c:1004 lib/getopt.c:1022 +#, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: valitsin ”-W %s” ei salli argumenttia\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 -#, fuzzy, c-format +#: lib/getopt.c:1043 lib/getopt.c:1061 +#, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: valitsin ”%s” vaatii argumentin\n" +msgstr "%s: valitsin ”-W %s” vaatii argumentin\n" #: lib/mkdir-p.c:181 src/install.c:487 #, c-format msgid "cannot change permissions of %s" msgstr "kohteen %s oikeuksien muuttaminen ei onnistu" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "hakemiston %s luominen ei onnistu" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "muisti loppu" @@ -365,13 +377,19 @@ msgstr "”" msgid "%s: end of file" msgstr "%s: tiedoston loppu" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: lukuvirhe" + #: lib/regcomp.c:131 msgid "Success" -msgstr "" +msgstr "Onnistui" #: lib/regcomp.c:134 msgid "No match" -msgstr "" +msgstr "Ei vastaavuutta" #: lib/regcomp.c:137 msgid "Invalid regular expression" @@ -380,7 +398,7 @@ msgstr "Virheellinen säännöllinen lauseke" #: lib/regcomp.c:140 #, fuzzy msgid "Invalid collation character" -msgstr "virheellinen merkkiluokka %s" +msgstr "Virheellinen vertailumerkki" #: lib/regcomp.c:143 msgid "Invalid character class name" @@ -388,28 +406,27 @@ msgstr "Virheellinen merkkiluokan nimi" #: lib/regcomp.c:146 msgid "Trailing backslash" -msgstr "" +msgstr "Kenoviiva lopussa" #: lib/regcomp.c:149 -#, fuzzy msgid "Invalid back reference" -msgstr "Virheellinen sivuväli %s" +msgstr "Virheellinen takaisinviittaus" #: lib/regcomp.c:152 msgid "Unmatched [ or [^" -msgstr "" +msgstr "Pariton [ tai [^" #: lib/regcomp.c:155 msgid "Unmatched ( or \\(" -msgstr "" +msgstr "Pariton ( tai \\(" #: lib/regcomp.c:158 msgid "Unmatched \\{" -msgstr "" +msgstr "Pariton \\{" #: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" -msgstr "" +msgstr "Virheellinen \\{\\}:n sisältö" #: lib/regcomp.c:164 msgid "Invalid range end" @@ -420,28 +437,24 @@ msgid "Memory exhausted" msgstr "Muisti loppu" #: lib/regcomp.c:170 -#, fuzzy msgid "Invalid preceding regular expression" -msgstr "%s: virheellinen säännöllinen lauseke: %s" +msgstr "Virheellinen edeltävä säännöllinen lauseke" #: lib/regcomp.c:173 -#, fuzzy msgid "Premature end of regular expression" -msgstr "virhe säännöllisen lausekkeen haussa" +msgstr "Ennenaikainen säännöllisen lausekkeen loppu" #: lib/regcomp.c:176 -#, fuzzy msgid "Regular expression too big" -msgstr "virhe säännöllisen lausekkeen haussa" +msgstr "Liian suuri säännöllinen lauseke" #: lib/regcomp.c:179 msgid "Unmatched ) or \\)" -msgstr "" +msgstr "Pariton ) tai \\)" #: lib/regcomp.c:707 -#, fuzzy msgid "No previous regular expression" -msgstr "virhe säännöllisen lausekkeen haussa" +msgstr "Ei aiempaa säännöllistä lauseketta" #: lib/root-dev-ino.h:37 #, c-format @@ -478,164 +491,156 @@ msgstr "^[kKyY]" msgid "^[nN]" msgstr "^[eEnN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "asetettaessa tiedoston %s oikeuksia" #: lib/siglist.h:31 msgid "Hangup" -msgstr "" +msgstr "Linjankatkaisu" #: lib/siglist.h:34 msgid "Interrupt" -msgstr "" +msgstr "Keskeytys" #: lib/siglist.h:37 msgid "Quit" -msgstr "" +msgstr "Lopetettu" #: lib/siglist.h:40 msgid "Illegal instruction" -msgstr "" +msgstr "Virheellinen käsky" #: lib/siglist.h:43 msgid "Trace/breakpoint trap" -msgstr "" +msgstr "Jäljitys-/katkaisupisteansa" #: lib/siglist.h:46 msgid "Aborted" -msgstr "" +msgstr "Keskeytetty" #: lib/siglist.h:49 msgid "Floating point exception" -msgstr "" +msgstr "Liukulukupoikkeus" #: lib/siglist.h:52 -#, fuzzy msgid "Killed" -msgstr "tiedosto" +msgstr "Tapettu" #: lib/siglist.h:55 -#, fuzzy msgid "Bus error" -msgstr "Järjestelmävirhe" +msgstr "Väylävirhe" #: lib/siglist.h:58 msgid "Segmentation fault" -msgstr "" +msgstr "Muistialueen ylitys" #: lib/siglist.h:61 msgid "Broken pipe" -msgstr "" +msgstr "Katkennut putki" #: lib/siglist.h:64 msgid "Alarm clock" -msgstr "" +msgstr "Herätyskello" #: lib/siglist.h:67 msgid "Terminated" -msgstr "" +msgstr "Päätetty" #: lib/siglist.h:70 msgid "Urgent I/O condition" -msgstr "" +msgstr "Kiireellinen I/O-ehto" #: lib/siglist.h:73 msgid "Stopped (signal)" -msgstr "" +msgstr "Pysäytetty (signaali)" #: lib/siglist.h:76 msgid "Stopped" -msgstr "" +msgstr "Pysäytetty" #: lib/siglist.h:79 msgid "Continued" -msgstr "" +msgstr "Jatkettu" #: lib/siglist.h:82 msgid "Child exited" -msgstr "" +msgstr "Lapsi lopetti" #: lib/siglist.h:85 msgid "Stopped (tty input)" -msgstr "" +msgstr "Pysäytetty (päätteen syöte)" #: lib/siglist.h:88 msgid "Stopped (tty output)" -msgstr "" +msgstr "Pysäytetty (päätteen tuloste)" #: lib/siglist.h:91 msgid "I/O possible" -msgstr "" +msgstr "I/O mahdollista" #: lib/siglist.h:94 msgid "CPU time limit exceeded" -msgstr "" +msgstr "Suoritinaikaraja ylittynyt" #: lib/siglist.h:97 msgid "File size limit exceeded" -msgstr "" +msgstr "Tiedoston kokoraja ylitetty" #: lib/siglist.h:100 msgid "Virtual timer expired" -msgstr "" +msgstr "Virtuaaliajastin vanhentunut" #: lib/siglist.h:103 msgid "Profiling timer expired" -msgstr "" +msgstr "Profilointiajastin vanhentunut" #: lib/siglist.h:106 -#, fuzzy msgid "Window changed" -msgstr "kellon siirto" +msgstr "Ikkuna vaihtunut" #: lib/siglist.h:109 -#, fuzzy msgid "User defined signal 1" -msgstr "%s: virheellinen signaali" +msgstr "Käyttäjän määrittelemä signaali 1" #: lib/siglist.h:112 -#, fuzzy msgid "User defined signal 2" -msgstr "%s: virheellinen signaali" +msgstr "Käyttäjän määrittelemä signaali 2" #: lib/siglist.h:117 msgid "EMT trap" -msgstr "" +msgstr "EMT-ansa" #: lib/siglist.h:120 -#, fuzzy msgid "Bad system call" -msgstr "järjestelmäkutsu fork epäonnistui" +msgstr "Virheellinen järjestelmäkutsu" #: lib/siglist.h:123 msgid "Stack fault" -msgstr "" +msgstr "Pinovirhe" #: lib/siglist.h:126 msgid "Information request" -msgstr "" +msgstr "Tietopyyntö" #: lib/siglist.h:128 -#, fuzzy msgid "Power failure" -msgstr "outo tiedosto" +msgstr "Sähkökatko" #: lib/siglist.h:131 -#, fuzzy msgid "Resource lost" -msgstr "ennen operaattoria -lt" +msgstr "Resurssi menetetty" #: lib/strsignal.c:114 -#, fuzzy, c-format +#, c-format msgid "Real-time signal %d" -msgstr "ajanjakso ei kelpaa: %s" +msgstr "Reaaliaikasignaali %d" #: lib/strsignal.c:118 #, c-format msgid "Unknown signal %d" -msgstr "" +msgstr "Tuntematon signaali %d" #: lib/unicodeio.c:102 msgid "iconv function not usable" @@ -675,17 +680,17 @@ msgstr "virheellinen käyttäjä" #: lib/verror.c:73 #, c-format msgid "unable to display error message" -msgstr "" +msgstr "ei voi näyttää virhesanomaa" #: lib/version-etc.c:74 #, c-format msgid "Packaged by %s (%s)\n" -msgstr "" +msgstr "Paketoinut %s (%s)\n" #: lib/version-etc.c:77 #, c-format msgid "Packaged by %s\n" -msgstr "" +msgstr "Paketoinut %s\n" #. TRANSLATORS: Translate "(C)" to the copyright symbol #. (C-in-a-circle), if this symbol is available in the user's @@ -703,6 +708,12 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" msgstr "" +"\n" +"Lisenssi GPLv3+: GNU GPL versio 3 tai myöhempi .\n" +"Tämä on vapaa ohjelmisto; sitä saa vapaasti muuttaa ja levittää edelleen.\n" +"Siinä määrin kuin laki sallii, TAKUUTA EI OLE.\n" +"\n" #. TRANSLATORS: %s denotes an author name. #: lib/version-etc.c:102 @@ -818,61 +829,54 @@ 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" -"Ilmoita ohjelmistovioista (englanniksi) osoitteeseen\n" -"<%s>.\n" -"Ilmoita suomennoksen vioista listalle\n" -".\n" +"Ilmoita ohjelmistovioista (englanniksi) osoitteeseen: %s\n" #: lib/version-etc.c:247 -#, fuzzy, c-format +#, c-format msgid "Report %s bugs to: %s\n" -msgstr "" -"\n" -"Ilmoita ohjelmistovioista (englanniksi) osoitteeseen\n" -"<%s>.\n" +msgstr "Ilmoita %s-vioista (englanniksi) osoitteeseen: %s.\n" #: lib/version-etc.c:251 -#, fuzzy, c-format +#, c-format msgid "%s home page: <%s>\n" -msgstr "Käyttö: %s\n" +msgstr "%s-kotisivu: <%s>\n" #: lib/version-etc.c:253 #, c-format msgid "%s home page: \n" -msgstr "" +msgstr "%s-kotisivu: \n" #: lib/version-etc.c:256 msgid "General help using GNU software: \n" msgstr "" +"Yleisohjeita GNU-ohjelmistojen käyttöön: \n" #: lib/xfreopen.c:35 msgid "stdin" -msgstr "" +msgstr "vakiosyöte" #: lib/xfreopen.c:36 msgid "stdout" -msgstr "" +msgstr "vakiotuloste" #: lib/xfreopen.c:37 -#, fuzzy msgid "stderr" -msgstr "vakiovirhe" +msgstr "vakiovirhetuloste" #: lib/xfreopen.c:38 -#, fuzzy msgid "unknown stream" -msgstr "Tuntematon järjestelmävirhe" +msgstr "tuntematon virta" #: lib/xfreopen.c:39 #, fuzzy, c-format msgid "failed to reopen %s with mode %s" -msgstr "tiedoston %s avaaminen epäonnistui" +msgstr "virheelliset oikeudet: %s" #: lib/xmemcoll.c:39 src/expr.c:878 #, c-format @@ -890,19 +894,19 @@ msgid "The strings compared were %s and %s." msgstr "Vertaillut merkkijonot olivat %s ja %s." #: lib/xprintf.c:50 lib/xprintf.c:76 -#, c-format +#, fuzzy, c-format msgid "cannot perform formatted output" -msgstr "" +msgstr "tulostiedostoa ei voi avata" #: lib/xstrtol-error.c:63 #, fuzzy, c-format msgid "invalid %s%s argument '%s'" -msgstr "argumentti ”%s” ei kelpaa" +msgstr "virheellinen argumentti %s %s:lle" #: lib/xstrtol-error.c:68 #, fuzzy, c-format msgid "invalid suffix in %s%s argument '%s'" -msgstr "argumentti ”%s” ei kelpaa" +msgstr "%s: virheellinen jälkiliitteen pituus" #: lib/xstrtol-error.c:72 #, fuzzy, c-format @@ -924,7 +928,7 @@ msgstr "" "Base64-koodaa tai -pura TIEDOSTO tai vakiosyöte vakiotulosteeseen.\n" "\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -934,15 +938,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -951,51 +947,51 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "lukuvirhe" -#: src/base64.c:231 -#, fuzzy, c-format +#: src/base64.c:229 +#, c-format msgid "invalid input" -msgstr "virheellinen leveys: %s" +msgstr "virheellinen syöte" -#: src/base64.c:268 +#: src/base64.c:266 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "virheellinen sarkainkoko: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "ylimääräinen operandi %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "suljetaan vakiosyöte" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1038,39 +1034,45 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "operandi puuttuu" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Käyttö: %s [VALITSIN]... [TIEDOSTO]...\n" #: src/cat.c:92 #, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"Kirjoita kaikkien TIEDOSTO(jen) yhdistelmä lajiteltuna vakiotulosteeseen.\n" +"\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1088,7 +1090,7 @@ msgstr "" " -n, --number numeroi kaikki tulosterivit\n" " -s, --squeeze-blank älä tulosta peräkkäisiä tyhjiä rivejä\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1102,7 +1104,7 @@ msgstr "" "rivinvaihdolle\n" " ja sarkaimelle\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1115,17 +1117,18 @@ msgstr "" " %s f - g Tulosta f:n sisältö, sitten vakiosyöte, sitten g:n sisältö.\n" " %s Kopioi vakiosyötteestä vakiotulosteeseen.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "tiedostolle %s ei voi käyttää ioctl:ää" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "vakiotuloste" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: syötetiedosto on tulostiedosto" @@ -1137,25 +1140,25 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 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:237 #, fuzzy, c-format msgid "failed to create security context: %s" -msgstr "tiedoston %s omistajuuden muuttaminen epäonnistui\n" +msgstr "kovan linkin %s luominen epäonnistui" #: 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:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu" @@ -1168,15 +1171,15 @@ msgstr "" #: src/chcon.c:190 #, fuzzy, c-format msgid "failed to change context of %s to %s" -msgstr "tiedoston %s omistajan vaihtaminen arvoon %s epäonnistui\n" +msgstr "tiedoston %s omistajuuden muuttaminen epäonnistui\n" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "tiedostoa %s ei voi käsitellä" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "hakemistoa %s ei voi lukea" @@ -1184,7 +1187,7 @@ msgstr "hakemistoa %s ei voi lukea" #: src/chcon.c:292 #, fuzzy, c-format msgid "changing security context of %s\n" -msgstr "muutettaessa tiedoston %s oikeuksia" +msgstr "Vaihdetaan käyttäjän %s kuori.\n" #: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567 #: src/selinux.c:323 @@ -1192,11 +1195,11 @@ msgstr "muutettaessa tiedoston %s oikeuksia" msgid "fts_read failed" msgstr "fts_read epäonnistui" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 -#, fuzzy, c-format +#, c-format msgid "fts_close failed" -msgstr "sulkeminen epäonnistui" +msgstr "fts_close epäonnistui" #: src/chcon.c:351 #, fuzzy, c-format @@ -1309,16 +1312,16 @@ msgid "-R -h requires -P" msgstr "-R -h vaatii -P:n" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" -msgstr "%s:n jälkeen puuttuu operandi" +msgstr "%s:n perästä puuttuu operandi" #: src/chcon.c:560 src/runcon.c:250 -#, fuzzy, c-format +#, c-format msgid "invalid context: %s" -msgstr "virheelliset oikeudet: %s" +msgstr "virheellinen konteksti: %s" #: src/chcon.c:566 #, c-format @@ -1326,9 +1329,8 @@ msgid "conflicting security context specifiers given" msgstr "" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu" @@ -1468,9 +1470,15 @@ msgstr "" " --dereference muuta symbolisen linkin kohdetta, ei linkkiä\n" " itseään (tämä on oletus)\n" +# Onko rekursiivisuudelle suomenkielisempää sanaa? #: src/chmod.c:394 +#, 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:397 msgid " -R, --recursive change files and directories recursively\n" @@ -1483,9 +1491,9 @@ msgid "" msgstr "" #: src/chmod.c:516 -#, c-format +#, fuzzy, c-format msgid "cannot combine mode and --reference options" -msgstr "" +msgstr "valitsimia -e ja -i ei voi käyttää yhdessä" #: src/chmod.c:547 #, c-format @@ -1500,7 +1508,7 @@ msgstr "tiedoston %s omistajaksi vaihdettiin %s\n" #: src/chown-core.c:159 #, fuzzy, c-format msgid "changed group of %s from %s to %s\n" -msgstr "tiedoston %s ryhmäksi vaihdettiin %s\n" +msgstr "Ryhmämerkintä ryhmälle ”%s.%s”:\n" #: src/chown-core.c:160 #, c-format @@ -1636,17 +1644,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "virheellinen ryhmä %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, fuzzy, c-format msgid "invalid group list %s" -msgstr "virheellinen ryhmä %s" +msgstr "virheellinen ryhmä: %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1655,7 +1663,7 @@ msgstr "" "Käyttö: %s UUSIJUURI [KOMENTO [ARG]...]\n" " tai: %s VALITSIN\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1663,13 +1671,20 @@ msgstr "" "Aja KOMENTO siten, että UUSIJUURI on asetettuna juurihakemistoksi.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 #, fuzzy msgid "" "\n" @@ -1678,45 +1693,50 @@ msgstr "" "\n" "Jos komentoa ei anneta, ajetaan ”${SHELL} -i” (oletus: /bin/sh).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "hakemiston %s asettaminen juurihakemistoksi ei onnistu" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "juurihakemistoon siirtyminen ei onnistu" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" -msgstr "lisäryhmän asetus ei onnistu" +msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" -msgstr "lisäryhmän asetus ei onnistu" +msgid "failed to set supplemental groups" +msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu" -#: src/chroot.c:402 -#, fuzzy, c-format +#: src/chroot.c:418 +#, c-format msgid "failed to set group-ID" -msgstr "tiedoston %s avaaminen epäonnistui" +msgstr "ryhmä-ID:n asettaminen epäonnistui" -#: src/chroot.c:405 -#, fuzzy, c-format +#: src/chroot.c:421 +#, c-format msgid "failed to set user-ID" -msgstr "tiedoston %s avaaminen epäonnistui" +msgstr "käyttäjä-ID:n asettaminen epäonnistui" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, fuzzy, c-format msgid "failed to run command %s" -msgstr "komentoa %s ei voi ajaa" +msgstr "Ohjelman nscd ajaminen käyttäjän ”%s” oikeuksilla epäonnistui" #. This is a proper name. See the gettext manual, section Names. #: src/cksum.c:40 @@ -1754,7 +1774,16 @@ msgstr "Käyttö: %s [VALITSIN]... TIEDOSTO1 TIEDOSTO2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Vertaa lajiteltuja tiedostoja TIEDOSTO1 ja TIEDOSTO2 rivi riviltä.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1767,7 +1796,7 @@ msgstr "" "TIEDOSTO2:ssa esiintyvät rivit, ja sarake kolme molemmissa esiintyvät " "rivit.\n" -#: src/comm.c:116 +#: src/comm.c:120 #, fuzzy msgid "" "\n" @@ -1781,7 +1810,7 @@ msgstr "" " -3 älä tulosta rivejä, jotka esiintyvät molemmissa " "tiedostoissa\n" -#: src/comm.c:122 +#: src/comm.c:126 #, fuzzy msgid "" "\n" @@ -1794,17 +1823,17 @@ msgstr "" " -1 SARAKE yhdistä tämä tiedoston 1 SARAKE\n" " -2 SARAKE yhdistä tämä tiedoston 2 SARAKE\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1813,317 +1842,331 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 -#, c-format +#: src/comm.c:226 +#, fuzzy, c-format msgid "file %d is not in sorted order" -msgstr "" +msgstr "[Ei tiedosto] rivi %d" -#: src/comm.c:407 +#: src/comm.c:411 #, fuzzy, c-format msgid "multiple delimiters specified" -msgstr "useita tulostiedostoja annettu" +msgstr "useita tulostusmuotoja annettu" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" -msgstr "" - -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 -#, c-format -msgid "error reading %s" -msgstr "virhe luettaessa tiedostoa %s" +msgstr "tyhjä %s ei ole sallittu" # Onko seek nyt sitten siirtymistä, selaamista, vaiko muuta. # Saa ehdottaa myös vastavaa substantiivia. -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:181 src/copy.c:452 #, c-format msgid "cannot lseek %s" msgstr "siirtyminen tiedostossa %s ei onnistu" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" +msgstr "virhe luettaessa tiedostoa %s" + +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 +#, c-format +msgid "error reading %s" +msgstr "virhe luettaessa tiedostoa %s" + +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "virhe kirjoitettaessa tiedostoa %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "virhe luettaessa tiedostoa %s" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu" -#: src/copy.c:383 -#, fuzzy, c-format +#: src/copy.c:478 +#, c-format msgid "%s: write failed" -msgstr "kirjoitus epäonnistui" +msgstr "%s: kirjoittaminen epäonnistui" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "tiedoston %s avaaminen epäonnistui" -#: src/copy.c:687 -#, fuzzy, c-format +#: src/copy.c:789 +#, c-format msgid "clearing permissions for %s" -msgstr "asetettaessa tiedoston %s oikeuksia" +msgstr "tyhjennetään tiedoston %s oikeudet" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "tiedoston %s omistajuuden säilytys ei onnistu" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "tiedostoa %s ei löytynyt" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "tiedoston %s tekijän tietojen säilytys ei onnistunut" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, fuzzy, c-format msgid "failed to set default file creation context to %s" msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" -msgstr "tiedoston %s ryhmän vaihtaminen arvoon %s epäonnistui\n" +msgstr "ioctl(RTC_EPOCH_SET) laitteelle %s epäonnistui" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, 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:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "tiedoston %s tilan lukeminen ei onnistu" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "ohitetaan tiedosto %s, sillä se korvattiin kopioinnin aikana" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "tiedostoa %s ei voi poistaa" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "poistettiin tiedosto %s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "ei kirjoiteta rikkinäisen symlinkin %s kautta" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "tavallisen tiedoston %s luominen ei onnistu" -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" -msgstr "tiedoston %s avaaminen epäonnistui" +msgstr "EPÄONNISTUNUT KÄYTTÄJÄN %2$s ISTUNTO OSOITTEESTA %1$s, %3$s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "säilytettäessä tiedoston %s aikoja" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 -#, fuzzy, c-format +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 +#, c-format msgid "failed to close %s" -msgstr "tiedoston %s avaaminen epäonnistui" +msgstr "%s: sulkeminen epäonnistui" -#: src/copy.c:1580 -#, fuzzy, c-format +#: src/copy.c:1669 +#, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: korvataanko tiedosto %s, ohittaen oikeudet %04lo (%s)? " -#: src/copy.c:1581 -#, c-format +#: src/copy.c:1670 +#, fuzzy, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " -msgstr "" +msgstr "%s: korvataanko tiedosto %s, ohittaen oikeudet %04lo (%s)? " -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: korvataanko tiedosto %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (varmuuskopio: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "kovan linkin %s luominen tiedostoon %s ei onnistu" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "tiedoston %s tilaa ei voi lukea" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "ohitetaan hakemisto %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "varoitus: lähdetiedosto %s annettu useammin kuin kerran" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s ja %s ovat sama tiedosto" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "ei-hakemistoa %s ei voi korvata hakemistolla %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "ei korvata juuri luotua tiedostoa %s tiedostolla %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "hakemistoa %s ei voi korvata ei-hakemistolla" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "hakemistoa ei voi siirtää ei-hakemistoon: %s -> %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "tiedostoa %s ei voi varmuuskopioida" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "hakemistoa, %s, ei voi kopioida itseensä, %s" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "varoitus: lähdetiedosto %s annettu useammin kuin kerran" + +#: src/copy.c:2294 #, c-format msgid "will not create hard link %s to directory %s" msgstr "ei luoda kovaa linkkiä %s hakemistoon %s" -#: src/copy.c:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "hakemistoa %s ei voi siirtää omaan alihakemistoonsa, %s" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "tiedostoa %s ei voi siirtää kohteeseen %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "kiertävää symbolista linkkiä %s ei voi kopioida" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "kohteeseen %2$s ei voi luoda symbolista linkkiä %1$s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "nimettyä putkea %s ei voi luoda" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "erikoistiedostoa %s ei voi luoda" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "symbolista linkkiä %s ei voi lukea" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "symbolisen linkin %s luominen ei onnistu" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "tiedostolla %s on tuntematon tiedostotyyppi" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "tiedoston %s varmuuskopion palautus ei onnistu" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (varmuuskopion palautus)\n" @@ -2131,30 +2174,30 @@ msgstr "%s -> %s (varmuuskopion palautus)\n" #. This is a proper name. See the gettext manual, section Names. #: src/coreutils.c:47 msgid "Alex Deymo" -msgstr "" +msgstr "Alex Deymo" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 -#, fuzzy, c-format +#: src/coreutils.c:177 src/coreutils.c:201 +#, c-format msgid "unknown program %s" -msgstr "Tuntematon järjestelmävirhe" +msgstr "tuntematon ohjelma %s" #: src/cp.c:157 src/mv.c:288 #, c-format @@ -2168,11 +2211,8 @@ msgstr "" " tai: %s [VALITSIN]... -t HAKEMISTO LÄHDE...\n" #: src/cp.c:163 -#, fuzzy msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -msgstr "" -"Kopioi LÄHDE KOHTEeseen, tai useita LÄHTEitä HAKEMISTOon.\n" -"\n" +msgstr "Kopioi LÄHDE KOHTEEseen, tai useita LÄHTEitä HAKEMISTOon.\n" #: src/cp.c:169 #, fuzzy @@ -2329,7 +2369,6 @@ msgid "" msgstr "" #: src/cp.c:240 -#, fuzzy msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2352,6 +2391,11 @@ msgstr "" "hajanainen\n" "KOHDEtiedosto aina, kun LÄHDE sisältää riittävän pitkän sarjan 0-tavuja.\n" "Valitsin --sparse=never estää hajanaisten tiedostojen luomisen.\n" +"Kun --reflink[=always] on annettu, suoritetaan kevytkopiointi, jolloin\n" +"vain muuttuneet datalohkot kopioidaan. Mikäli tämä ei ole mahdollista,\n" +"kopiointi epäonnistuu, tai --reflink=auto:n tapauksessa suoritetaan " +"normaali\n" +"kopiointi.\n" #: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326 #, fuzzy @@ -2421,16 +2465,16 @@ msgstr "%s on olemassa, mutta ei ole hakemisto" msgid "failed to access %s" msgstr "tiedoston %s avaaminen epäonnistui" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "puuttuva tiedosto-operandi" #: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450 -#, fuzzy, c-format +#, c-format msgid "missing destination file operand after %s" -msgstr "puuttuva kohdetiedosto" +msgstr "tiedoston %s perästä puuttuu kohdetiedosto-operandi" #: src/cp.c:608 src/install.c:968 src/mv.c:459 #, c-format @@ -2449,12 +2493,12 @@ msgstr "kohde %s ei ole hakemisto" #: src/cp.c:735 #, fuzzy, c-format msgid "with --parents, the destination must be a directory" -msgstr "polkuja säilytettäessä kohteen on oltava hakemisto" +msgstr "%s kohde ei saa olla hakemisto\n" #: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400 #, fuzzy, c-format msgid "multiple target directories specified" -msgstr "useita tulostiedostoja annettu" +msgstr "useita tulostusmuotoja annettu" #: src/cp.c:1116 src/install.c:903 #, c-format @@ -2469,7 +2513,7 @@ msgstr "linkit eivät voi olla sekä kovia että symbolisia" #: src/cp.c:1144 src/mv.c:480 #, fuzzy, c-format msgid "options --backup and --no-clobber are mutually exclusive" -msgstr "valitsimet --string ja --check ovat toisensa poissulkevia" +msgstr "päiväyksen tulostusta määräävät valitsimet ovat toisensa poissulkevia" #: src/cp.c:1150 #, c-format @@ -2496,131 +2540,131 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "syöte katosi" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: rivinumero sallitun välin ulkopuolella" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: rivinumero sallitun välin ulkopuolella" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " kierroksella %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: täsmäävyyttä ei löydy" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "virhe säännöllisen lausekkeen haussa" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "virhe kirjoitettaessa tiedostoa %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: rajoittimen jälkeen odotetaan kokonaislukua" -#: src/csplit.c:1098 -#, fuzzy, c-format +#: src/csplit.c:1099 +#, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: toistomäärässä tarvitaan merkki ”}”" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" -msgstr "%s}: merkkien ”{” ja ”}” väliin tarvitaan kokonaisluku" +msgstr "osoittimen ja kokonaisluvun välinen vertailu" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: sulkeva rajoitin ”%c” puuttuu" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: virheellinen säännöllinen lauseke: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: virheellinen hahmo" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: rivinumeron on oltava suurempi kuin nolla" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "puuttuva muunnostarkennin jälkiliitteessä" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "virheellinen muunnostarkennin jälkiliitteessä: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "virheellinen muunnostarkennin jälkiliitteessä: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" -msgstr "%s: virheellinen kenttämääritys \"%s\"" +msgstr "virheellinen muunnostarkennin jälkiliitteessä: %c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "liian monta %%-muunnosmääritystä jälkiliitteessä" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "puuttuva %%-muunnosmääritys jälkiliitteessä" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: virheellinen luku" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "virheellinen määrä %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Käyttö: %s [VALITSIN]... TIEDOSTO HAHMO...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 #, fuzzy msgid "" "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n" @@ -2630,7 +2674,16 @@ msgstr "" "”xx02”, ..., ja tulosta kunkin osan tavumäärä vakiotulosteeseen.\n" "\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Lue vakiosyötettä jos TIEDOSTO on -. Kukin HAHMO voi olla:\n" + +#: src/csplit.c:1492 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2641,11 +2694,11 @@ msgstr "" " -f, --prefix=ETULIITE käytä ETULIITEttä ”xx”:n sijaan\n" " -k, --keep-files älä poista tulostiedostoja virhetilanteessa\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2655,18 +2708,11 @@ msgstr "" " -s, --quiet, --silent älä tulosta tulostiedostojen kokoja\n" " -z, --elide-empty-files poista tyhjät tulostiedostot\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Lue vakiosyötettä jos TIEDOSTO on -. Kukin HAHMO voi olla:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 #, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2703,7 +2749,7 @@ msgstr "" "Tulosta kunkin TIEDOSTOn valitut osat vakiotulosteeseen.\n" "\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2713,7 +2759,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:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2725,7 +2771,7 @@ msgstr "" " annettu\n" " -n (ei huomioida)\n" -#: src/cut.c:193 +#: src/cut.c:194 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2734,7 +2780,7 @@ msgstr "" " --verbose tulosta ilmoitus vakiovirhetulosteeseen juuri\n" " ennen kunkin tulostiedoston avaamista\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2744,7 +2790,7 @@ msgstr "" " --output-delimiter=MERKKIJ käytä MERKKIJonoa tulosteen rajoittimena\n" " oletus on käyttää syötteen rajoitinta\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2756,7 +2802,8 @@ 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:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2764,8 +2811,6 @@ msgid "" " 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 "" "Väli on yksi seuraavista:\n" "\n" @@ -2778,53 +2823,53 @@ msgstr "" "\n" "Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "virheellinen tavu- tai kenttälista" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "" -#: src/cut.c:320 +#: src/cut.c:319 #, fuzzy msgid "invalid range with no endpoint: -" -msgstr "virheellinen leveysvalitsin: %s" +msgstr "virheellinen sivuväli %s" -#: src/cut.c:334 -#, fuzzy +#: src/cut.c:333 src/numfmt.c:1417 +#, fuzzy, c-format msgid "invalid decreasing range" -msgstr "virheellinen leveys: %s" +msgstr "virheellinen sivuväli %s" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "tavusiirtymä %s on liian suuri" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "kenttänumero %s on liian suuri" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "voidaan antaa vain yhden tyyppinen luettelo" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "rajoittimen on oltava yksittäinen merkki" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "on annettava luettelo tavuista, merkeistä tai kentistä" -#: src/cut.c:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2832,11 +2877,11 @@ msgstr "" "ei-rajoitettujen rivien vaiennus on mahdollista\n" "\tvain käsiteltäessä kenttiä" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "kenttälista puuttuu" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "sijaintilista puuttuu" @@ -2856,12 +2901,25 @@ msgstr "" #: src/date.c:134 #, fuzzy msgid "" -" -d, --date=STRING display time described by STRING, not 'now'\n" -" -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -" -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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" +"Näytä tämänhetkinen aika annetulla MUOTOILUlla, tai aseta järjestelmän " +"aika.\n" +"\n" +" -d, --date=MJONO näytä MJONOn määräämä aika ”now”:n sijaan\n" +" -f, --file=PVMTIED kuten --date, kerran kullekin PVMTIEDoston " +"riville\n" + +#: src/date.c:138 +#, fuzzy +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" "Näytä tämänhetkinen aika annetulla MUOTOILUlla, tai aseta järjestelmän " "aika.\n" @@ -2879,31 +2937,40 @@ msgstr "" " --iso-8601 ilman AIKAMÄÄREttä olettaa \"date\":" "n.\n" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=TIEDOSTO näytä TIEDOSTOn viimeisin muokkausaika\n" " -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:147 +#: src/date.c:149 #, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " -s, --set=MERKKIJONO aseta MERKKIJONOn määräämä aika\n" " -u, --utc, --universal näytä tai aseta UTC-aika\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 +msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 #, fuzzy msgid "" "\n" @@ -2919,7 +2986,7 @@ msgstr "" " %% %-merkki\n" " %a maa-asetuksen lyhyt viikonpäivän nimi (ma-su)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2933,7 +3000,7 @@ msgstr "" " %c maa-asetuksen päivämäärä ja aika (esim. la 3. maaliskuuta 2005 " "23:05:25)\n" -#: src/date.c:171 +#: src/date.c:177 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2946,7 +3013,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:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2956,7 +3023,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:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2968,7 +3035,7 @@ msgstr "" " %I tunti (01-12)\n" " %j vuoden päivä (001-366)\n" -#: src/date.c:188 +#: src/date.c:194 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2981,7 +3048,7 @@ msgstr "" " %m kuukausi (01-12)\n" " %M minuutti (00-59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2999,7 +3066,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:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3011,7 +3078,7 @@ msgstr "" " %T aika; sama kuin %H:%M:%S\n" " %u viikonpäivä (1–7); 1 on maanantai\n" -#: src/date.c:209 +#: src/date.c:215 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" @@ -3023,7 +3090,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:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3035,7 +3102,7 @@ msgstr "" " %y vuosiluvun kaksi viimeistä numeroa (00­–99)\n" " %Y vuosiluku\n" -#: src/date.c:221 +#: src/date.c:227 #, fuzzy msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" @@ -3056,7 +3123,7 @@ msgstr "" "\n" "Kentät täytetään normaalisti etunollilla.\n" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3067,7 +3134,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3076,7 +3143,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3090,35 +3157,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "vakiosyöte" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "virheellinen päiväys %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "useita tulostusmuotoja annettu" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3129,23 +3196,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:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "ajan asetus ei onnistu" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3154,8 +3221,7 @@ msgstr "" "Käyttö: %s [OPERANDI]...\n" " tai: %s VALITSIN\n" -#: src/dd.c:532 -#, fuzzy +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3167,14 +3233,14 @@ msgid "" msgstr "" "Kopioi tiedosto, muuntaen ja muotoillen operandien mukaisesti.\n" "\n" -" bs=MÄÄRÄ lue ja kirjoita MÄÄRÄ tavua kerralla (ks. myös ibs=,obs=)\n" +" bs=MÄÄRÄ lue ja kirjoita MÄÄRÄ tavua kerralla\n" " cbs=MÄÄRÄ muunna MÄÄRÄ tavua kerralla\n" " conv=MUUNNOS muunna tiedosto pilkuilla erotetun muunnosluettelon " "mukaan\n" -" count=LOHKOT kopioi vain LOHKOT-arvon verran lohkoja\n" -" ibs=MÄÄRÄ lue MÄÄRÄ tavua kerralla\n" +" count=N kopioi vain N syötelohkoa\n" +" ibs=MÄÄRÄ lue korkeintaan MÄÄRÄ tavua kerralla (oletus: 512)\n" -#: src/dd.c:541 +#: src/dd.c:570 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3184,8 +3250,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=TIEDOSTO lue TIEDOSTOsta vakiosyötteen sijaan\n" " obs=MÄÄRÄ kirjoita MÄÄRÄ tavua kerralla\n" @@ -3193,7 +3261,7 @@ msgstr "" " seek=LOHKOT ohita tulosteen alussa LOHKOT verran obs-kokoisia lohkoja\n" " skip=LOHKOT ohita syötteen alusta LOHKOT verran ibs-kokoisia lohkoja\n" -#: src/dd.c:552 +#: src/dd.c:583 #, fuzzy msgid "" "\n" @@ -3212,7 +3280,7 @@ msgstr "" "Kukin MUUNNOS voi olla:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3241,7 +3309,7 @@ msgstr "" "käytettäessä\n" " avainsanaa block tai unblock, tasataan välilyönneillä\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3257,7 +3325,7 @@ msgstr "" " fdatasync physically write output file data before finishing\n" " fsync likewise, but also write metadata\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3266,138 +3334,104 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:593 +#: src/dd.c:624 #, fuzzy msgid " directory fail unless a directory\n" msgstr "kohdehakemisto ei ole sallittu asennettaessa hakemistoa" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 -#, fuzzy, c-format +#: src/dd.c:661 +#, 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 "" -"\n" -"%s-signaalin saadessaan ajossa oleva ”dd”-ohjelma tulostaa \n" -"I/O-tilastot vakiovirhetulosteeseen ja jatkaa sitten kopiointia.\n" -"\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ kill -%s $pid; sleep 1; kill $pid\n" -" 18335302+0 tietuetta sisään\n" -" 18335302+0 tietuetta ulos\n" -" 9387674624 tavua (9,4 GB) kopioitu 34,6279 sekunnissa, 271 MB/s\n" -"\n" -"Valitsimet ovat:\n" -"\n" - -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -"%+% tietuetta sisään\n" -"%+% tietuetta ulos\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% typistetty tietue\n" -msgstr[1] "% typistettyä tietuetta\n" -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "% tavu (%s) kopioitu" msgstr[1] "% tavua (%s) kopioitu" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "" @@ -3411,86 +3445,100 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr " %g sekunnissa, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr " %g sekunnissa, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% tietuetta sisään\n" +"%+% tietuetta ulos\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% typistetty tietue\n" +msgstr[1] "% typistettyä tietuetta\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "suljetaan syötetiedosto %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "suljetaan tulostiedosto %s" -#: src/dd.c:1089 -#, fuzzy, c-format +#: src/dd.c:1142 +#, c-format msgid "failed to turn off O_DIRECT: %s" -msgstr "siirtyminen hakemistoon %s epäonnistui" +msgstr "O_DIRECTin poiskytkeminen epäonnistui: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "kirjoitettaessa tiedostoon %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "tunnistamaton operandi %s" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "virheellinen muunnos" -#: src/dd.c:1288 src/dd.c:1364 -#, fuzzy +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" -msgstr "virheellinen leveys: %s" +msgstr "virheellinen syötelippu" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 -#, fuzzy +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" -msgstr "virheellinen ryhmänimi %s" +msgstr "virheellinen tulostelippu" -#: src/dd.c:1294 +#: src/dd.c:1385 #, fuzzy -msgid "invalid status flag" -msgstr "virheellinen päiväyksen muoto %s" - -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "virheellinen määrä %s" +msgid "invalid status level" +msgstr "virheellinen tilalippu" -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1417 +#: src/dd.c:1520 #, fuzzy, c-format msgid "cannot combine block and unblock" -msgstr "sekä käyttäjää että ryhmää ei voi jättää antamatta" +msgstr "signaalin yhdistäminen valitsimen -l tai -t kanssa ei onnistu" -#: src/dd.c:1419 +#: src/dd.c:1522 #, fuzzy, c-format msgid "cannot combine lcase and ucase" -msgstr "tiedostonimiä %s ja %s ei voi vertailla" +msgstr "signaalin yhdistäminen valitsimen -l tai -t kanssa ei onnistu" -#: src/dd.c:1421 +#: src/dd.c:1524 #, fuzzy, c-format msgid "cannot combine excl and nocreat" msgstr "signaalin yhdistäminen valitsimen -l tai -t kanssa ei onnistu" -#: src/dd.c:1424 +#: src/dd.c:1527 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "signaalin yhdistäminen valitsimen -l tai -t kanssa ei onnistu" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3499,81 +3547,81 @@ msgstr "" "varoitus: ohitetaan ytimen lseek-ohjelmistovika tiedostolle (%s)\n" " mt_type=0x%0lx – katso tyyppien luettelo tiedostosta " -#: src/dd.c:1670 +#: src/dd.c:1773 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: ei voi poistaa" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, fuzzy, c-format msgid "%s: cannot seek" -msgstr "%s: ei voi poistaa" +msgstr "%s: Siirtyminen kohtaan %s ei onnistu" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1756 +#: src/dd.c:1859 #, fuzzy, c-format msgid "warning: invalid file offset after failed read" msgstr "varoitus: lähdetiedosto %s annettu useammin kuin kerran" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1903 +#: src/dd.c:2006 #, fuzzy, c-format msgid "setting flags for %s" -msgstr "asetettaessa tiedoston %s lippuja" +msgstr "Liput" -#: src/dd.c:1957 +#: src/dd.c:2060 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" -msgstr "%s: siirtyminen suhteelliseen siirtymään %s ei onnistu" +msgstr "%s: siirtyminen kohtaan %s ei onnistu" -#: src/dd.c:2172 +#: src/dd.c:2288 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "edetään %s tavun yli tulostiedostossa %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" -msgstr "" +msgstr "%s: fdatasync epäonnistui" -#: src/dd.c:2195 -#, fuzzy, c-format +#: src/dd.c:2311 +#, c-format msgid "fsync failed for %s" -msgstr "tiedoston %s avaaminen epäonnistui" +msgstr "%s: fsync epäonnistui" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "tiedoston %s avaaminen epäonnistui" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2306 +#: src/dd.c:2422 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "edetään %s tavun yli tulostiedostossa %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, fuzzy, c-format msgid "failed to discard cache for: %s" -msgstr "siirtyminen hakemistoon %s epäonnistui" +msgstr "Välimuistidatan kirjoitus epäonnistui" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3623,12 +3671,12 @@ msgstr "Liitospiste" #: src/df.c:207 msgid "File" -msgstr "" +msgstr "Tiedosto" #: src/df.c:387 #, fuzzy, c-format msgid "option --output: field %s unknown" -msgstr "suljetaan tulostiedosto %s" +msgstr "Tuntematon kenttä ”%s”" #: src/df.c:394 #, fuzzy, c-format @@ -3652,14 +3700,14 @@ msgstr "Käytetty" #: src/df.c:550 src/df.c:559 #, c-format msgid "%s-%s" -msgstr "" +msgstr "%s-%s" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 #, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" @@ -3671,14 +3719,14 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 #, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3688,7 +3736,7 @@ msgstr "" "2G)\n" " -H, --si sama kuin edellä, mutta monikerta on 1000, ei 1024\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3702,7 +3750,7 @@ msgstr "" " --no-sync älä kutsu synciä ennen tilatietojen selvittämistä " "(oletus)\n" -#: src/df.c:1409 +#: src/df.c:1429 #, fuzzy msgid "" " --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" @@ -3710,6 +3758,28 @@ msgid "" "omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" +msgstr "" +" -P, --portability käytä POSIX-tulostemuotoa\n" +" --sync kutsu synciä ennen tilatietojen selvittämistä\n" +" -t, --type=TYYPPI rajoita tiedostojärjestelmien listaus " +"tietynTYYPPIsiin\n" +" -T, --print-type tulosta tiedostojärjestelmän tyyppi\n" +" -x, --exclude-type=TYYPPI rajoita tiedostojärjestelmien listaus " +"muunTYYPPIsiin\n" +" -v (ei huomioida)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose näytä ilmoitus juuri ennen kunkin\n" +" tulostiedoston avaamista\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3724,7 +3794,7 @@ msgstr "" "muunTYYPPIsiin\n" " -v (ei huomioida)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3732,28 +3802,28 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 -#, fuzzy, c-format +#: src/df.c:1486 +#, c-format msgid "options %s and %s are mutually exclusive" -msgstr "valitsimet --string ja --check ovat toisensa poissulkevia" +msgstr "valitsimet %s ja %s ovat toisensa poissulkevat" -#: src/df.c:1610 +#: src/df.c:1636 #, 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:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Varoitus: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "liitettyjen tiedostojärjestelmien taulua ei voi lukea" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" -msgstr "" +msgstr "tiedostojärjestelmiä ei käsitelty" #. This is a proper name. See the gettext manual, section Names. #: src/dircolors.c:35 @@ -3782,7 +3852,6 @@ msgstr "" " -p, --print-database tulosta oletukset\n" #: src/dircolors.c:108 -#, fuzzy msgid "" "\n" "If FILE is specified, read it to determine which colors to use for which\n" @@ -3792,7 +3861,7 @@ msgstr "" "\n" "Jos TIEDOSTO on annettu, sitä lukemalla selvitetään, mitä värejä käytetään\n" "millekin tiedostotyypille ja -tunnisteelle. Muussa tapauksessa käytetään\n" -"esikäsiteltyä tietokantaa. Näiden tiedostojen muodosta saa tietoa\n" +"ennalta luotua tietokantaa. Näiden tiedostojen muodosta saa tietoa\n" "suorittamalla komennon ”dircolors --print-database”.\n" #: src/dircolors.c:286 @@ -3845,12 +3914,11 @@ msgstr "" "\n" #: src/dirname.c:59 -#, fuzzy msgid " -z, --zero end each output line with NUL, not newline\n" -msgstr " -z, --zero-terminated päätä rivit 0-tavuun, ei rivinvaihtoon\n" +msgstr " -z, --zero-terminated päätä rivit NUL-tavuun, ei rivinvaihtoon\n" #: src/dirname.c:64 -#, c-format +#, fuzzy, c-format msgid "" "\n" "Examples:\n" @@ -3858,8 +3926,12 @@ msgid "" " %s dir1/str dir2/str -> \"dir1\" followed by \"dir2\"\n" " %s stdio.h -> \".\"\n" msgstr "" +"\n" +"Esimerkkejä:\n" +" %s /usr/bin/sort Tuloste: ”/usr/bin”.\n" +" %s stdio.h Tuloste: ”.”.\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3870,7 +3942,8 @@ msgstr "" #: src/du.c:285 #, fuzzy -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Tee yhteenveto kunkin TIEDOSTOn levytilan käytöstä, hakemistoille\n" "rekursiivisesti.\n" @@ -3912,16 +3985,11 @@ msgid "" " 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" +" -B, --block-size=KOKO käytä KOKO-tavuisia lohkoja\n" +" -b, --bytes sama kuin ”--apparent-size --block-size=1”\n" +" -c, --total näytä myös kokonaismäärä\n" +" -D, --dereference-args laske mukaan vain komentorivillä annettujen\n" +" symlinkkien kohteiden koot\n" #: src/du.c:313 #, fuzzy @@ -4004,64 +4072,58 @@ msgstr "" #: src/du.c:398 msgid "Infinity" -msgstr "" +msgstr "Ääretön" -#: src/du.c:636 -#, fuzzy, c-format +#: src/du.c:657 +#, c-format msgid "fts_read failed: %s" -msgstr "fts_read epäonnistui" +msgstr "fts_read epäonnistui: %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "virheellinen enimmäissyvyys %s" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" -msgstr "virheellinen argumentti %s" +msgstr "Virheellinen argumentti" -#: src/du.c:898 +#: src/du.c:919 #, 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:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "" "varoitus: yhteenvedon teko on ristiriidassa valitsimen --max-depth=%lu kanssa" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: lukuvirhe" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "virheellinen tyhjä tiedostonimi" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "yhteensä" @@ -4179,12 +4241,12 @@ msgstr "" #: src/env.c:124 #, fuzzy, c-format msgid "cannot unset %s" -msgstr "ohjelmaa strip ei voi ajaa" +msgstr "tiedostoa %s ei voi siirtää kohteeseen %s" #: src/env.c:135 #, fuzzy, c-format msgid "cannot set %s" -msgstr "tiedoston %s tilaa ei voi lukea" +msgstr "konenimen %s asettaminen järjestelmälle ei onnistu" #: src/env.c:152 #, c-format @@ -4193,9 +4255,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\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" @@ -4242,7 +4302,7 @@ msgid "input line is too long" msgstr "syöterivi on liian pitkä" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4391,14 +4451,14 @@ msgstr "virhe säännöllisen lausekkeen haussa" #: src/expr.c:783 src/expr.c:820 #, fuzzy, c-format msgid "non-integer argument" -msgstr "ei-numeerinen argumentti" +msgstr "kokonaislukuargumentti %s ei kelpaa" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "nollalla jako" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "aseta LC_ALL='C' ongelman kiertämiseksi" @@ -4409,31 +4469,31 @@ msgid "the strings compared were %s and %s" msgstr "Vertaillut merkkijonot olivat %s ja %s." #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" -msgstr "" +msgstr "Niels Möller" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 -#, c-format +#: src/factor.c:2078 +#, fuzzy, c-format msgid "squfof queue overflow" -msgstr "" +msgstr "viestijono" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s ei ole kelvollinen positiivinen kokonaisluku" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s on liian suuri" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4442,7 +4502,7 @@ msgstr "" "Käyttö: %s [LUKU]...\n" " tai: %s VALITSIN\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -4489,7 +4549,7 @@ msgstr "" "Jos TIEDOSTOa ei anneta tai se on ”-”, luetaan vakiosyötettä.\n" "\n" -#: src/fmt.c:278 +#: src/fmt.c:279 #, fuzzy msgid "" " -c, --crown-margin preserve indentation of first two lines\n" @@ -4501,7 +4561,7 @@ 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:287 +#: src/fmt.c:288 #, fuzzy, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4516,7 +4576,7 @@ msgstr "" " jälkeen)\n" " -w, --width=LEVEYS enimmäisrivileveys (oletus on 75 saraketta)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4526,22 +4586,20 @@ msgstr "" "ensimmäinen\n" "valitsin; käytä -w N sen sijaan" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "virheellinen leveys: %s" -#: src/fold.c:70 +#: src/fold.c:69 #, fuzzy -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "Rivitä kustakin TIEDOSTOsta (oletuksena vakiosyöte) luetut syöterivit\n" "kirjoittaen vakiotulosteeseen.\n" "\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4551,9 +4609,9 @@ msgstr "" " -s, --spaces katkaise välien kohdalta\n" " -w, --width=LEVEYS käytä sarakeleveytenä LEVEYttä oletusarvon 80 sijaan\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "virheellinen sarakemäärä: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4574,14 +4632,14 @@ msgid "" msgstr "" #: src/group-list.c:69 src/id.c:412 -#, fuzzy, c-format +#, c-format msgid "failed to get groups for user %s" -msgstr "tiedoston %s ryhmän vaihtaminen arvoon %s epäonnistui\n" +msgstr "käyttäjän %s ryhmien noutaminen epäonnistui" #: src/group-list.c:74 src/id.c:415 -#, fuzzy, c-format +#, c-format msgid "failed to get groups for the current process" -msgstr "tiedoston %s ryhmän vaihtaminen arvoon %s epäonnistui\n" +msgstr "nykyisen prosessin ryhmien noutaminen epäonnistui" #: src/group-list.c:114 #, c-format @@ -4603,36 +4661,35 @@ msgstr "" #: src/groups.c:105 src/id.c:274 #, fuzzy, c-format msgid "cannot get real UID" -msgstr "tunnuksen id:n asetus ei onnistu" +msgstr "työhakemiston selvittäminen ei onnistu" #: src/groups.c:110 src/id.c:282 #, fuzzy, c-format msgid "cannot get effective GID" -msgstr "ajan haku ei onnistu" +msgstr "työhakemiston selvittäminen ei onnistu" #: src/groups.c:115 src/id.c:287 #, fuzzy, c-format msgid "cannot get real GID" -msgstr "tunnuksen id:n asetus ei onnistu" +msgstr "työhakemiston selvittäminen ei onnistu" #: src/groups.c:128 src/id.c:246 -#, fuzzy, c-format +#, c-format msgid "%s: no such user" -msgstr "%s: Käyttäjää ei ole" +msgstr "%s: käyttäjää ei ole" -#: src/head.c:109 +#: src/head.c:110 #, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "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:117 +#: src/head.c:118 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4653,7 +4710,7 @@ msgstr "" " koko tiedosto lukuun ottamatta N:ää viimeistä " "riviä\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4662,7 +4719,7 @@ msgstr "" "otsakkeita\n" " -v, --verbose tulosta aina tiedostonimen sisältävät otsakkeet\n" -#: src/head.c:131 +#: src/head.c:132 #, fuzzy msgid "" "\n" @@ -4678,48 +4735,36 @@ msgstr "" "Kukin MUUNNOS voi olla:\n" "\n" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: tiedosto on kutistunut liikaa" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: tavumäärä on liian suuri" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: siirtyminen kohtaan %s ei onnistu" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: siirtyminen suhteelliseen siirtymään %s ei onnistu" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "rivimäärä" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "tavumäärä" +msgid "%s: number of bytes is too large" +msgstr "%s: tavumäärä on liian suuri" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "virheellinen rivimäärä" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "virheellinen tavumäärä" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "virheellinen valitsin – %c" @@ -4771,9 +4816,9 @@ msgid "Arnold Robbins" msgstr "Arnold Robbins" #: src/id.c:84 -#, fuzzy, c-format +#, c-format msgid "Usage: %s [OPTION]... [USER]\n" -msgstr "Käyttö: %s [VALITSIN]... [TUNNUS]...\n" +msgstr "Käyttö: %s [VALITSIN]... [KÄYTTÄJÄ]\n" #: src/id.c:85 msgid "" @@ -4853,32 +4898,32 @@ msgstr "" #: src/id.c:265 #, fuzzy, c-format msgid "cannot get effective UID" -msgstr "ajan haku ei onnistu" +msgstr "työhakemiston selvittäminen ei onnistu" #: src/id.c:354 #, fuzzy, c-format msgid "cannot find name for user ID %s" -msgstr "käyttäjä-ID:tä %lu vastaavaa nimeä ei löydy" +msgstr "%s: käyttäjä-ID:tä %lu vastaavaa nimeä ei löydy\n" #: src/id.c:372 -#, fuzzy, c-format +#, c-format msgid "uid=%s" -msgstr "uid=%lu" +msgstr "uid=%s" #: src/id.c:377 -#, fuzzy, c-format +#, c-format msgid " gid=%s" -msgstr " gid=%lu" +msgstr " gid=%s" #: src/id.c:384 -#, fuzzy, c-format +#, c-format msgid " euid=%s" -msgstr " euid=%lu" +msgstr " euid=%s" #: src/id.c:392 -#, fuzzy, c-format +#, c-format msgid " egid=%s" -msgstr " egid=%lu" +msgstr " egid=%s" #: src/id.c:421 msgid " groups=" @@ -4887,12 +4932,12 @@ msgstr " ryhmät=" #: src/id.c:437 #, fuzzy, c-format msgid " context=%s" -msgstr "virheelliset oikeudet: %s" +msgstr "virheellinen konteksti: %s" #: src/install.c:376 #, fuzzy, c-format msgid "warning: %s: failed to change context to %s" -msgstr "varoitus: ei voida siirtyä hakemistoon %s" +msgstr "tiedoston %s omistajuuden muuttaminen epäonnistui\n" #: src/install.c:417 #, c-format @@ -4909,7 +4954,7 @@ msgstr "tiedoston %s omistajuuden muuttaminen ei onnistu" msgid "cannot set time stamps for %s" msgstr "tiedoston %s aikaleimojen asettaminen ei onnistu" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "järjestelmäkutsu fork epäonnistui" @@ -4917,7 +4962,7 @@ msgstr "järjestelmäkutsu fork epäonnistui" #: src/install.c:535 #, fuzzy, c-format msgid "cannot run %s" -msgstr "ohjelmaa strip ei voi ajaa" +msgstr "Ohjelman nscd ajaminen käyttäjän ”%s” oikeuksilla epäonnistui" #: src/install.c:539 #, c-format @@ -5064,7 +5109,7 @@ msgstr "strip-valitsinta ei voi käyttää asennettaessa hakemistoa" msgid "target directory not allowed when installing a directory" msgstr "kohdehakemisto ei ole sallittu asennettaessa hakemistoa" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "virheelliset oikeudet %s" @@ -5096,13 +5141,17 @@ msgstr "" msgid "Mike Haertel" msgstr "Mike Haertel" -# *** *** *** *** #: src/join.c:195 -#, 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" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +# *** *** *** *** +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5118,7 +5167,7 @@ msgstr "" " TIEDNUM on 1 tai 2 (TIEDOSTO1 tai TIEDOSTO2)\n" " -e TYHJÄ korvaa puuttuvat syötekentät TYHJÄllä\n" -#: src/join.c:204 +#: src/join.c:210 #, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" @@ -5131,7 +5180,7 @@ msgstr "" " -o MUOTO noudata MUOTOa tulosteriviä muodostettaessa\n" " -t MERKKI käytä MERKKIä syöte- ja tulostesarakkeiden erottimena\n" -#: src/join.c:210 +#: src/join.c:216 #, fuzzy msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" @@ -5148,12 +5197,12 @@ msgstr "" " -1 SARAKE yhdistä tämä tiedoston 1 SARAKE\n" " -2 SARAKE yhdistä tämä tiedoston 2 SARAKE\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 #, fuzzy msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr " -z, --zero-terminated päätä rivit 0-tavuun, ei rivinvaihtoon\n" -#: src/join.c:225 +#: src/join.c:231 #, fuzzy msgid "" "\n" @@ -5186,47 +5235,47 @@ msgstr "" "Tärkeää: TIEDOSTO1:n ja TIEDOSTO2:n on oltava lajiteltu liitossarakkeen\n" "mukaan.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "virheellinen sarakenumero: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "virheellinen saraketarkennin: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "virheellinen tiedostonumero sarakemäärityksessä: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "epäyhteensopivat liitossarakkeet %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "monimerkkinen sarkain %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "epäyhteensopivat sarkaimet" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "vakiosyötettä ei voi käyttää molempina tiedostoina" @@ -5308,17 +5357,17 @@ msgstr "signaalin yhdistäminen valitsimen -l tai -t kanssa ei onnistu" msgid "no process ID specified" msgstr "prosessi-ID:tä ei ole annettu" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, fuzzy, c-format msgid "invalid buffering mode %s for %s\n" msgstr "virheellinen argumentti %s %s:lle" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -5372,22 +5421,22 @@ msgstr "symbolisen linkin %s luominen ei onnistu" #: src/ln.c:363 #, fuzzy, c-format msgid "failed to create symbolic link %s -> %s" -msgstr "kohteeseen %2$s ei voi luoda symbolista linkkiä %1$s" +msgstr "symbolisen linkin %s luominen ei onnistu" #: src/ln.c:365 #, fuzzy, c-format msgid "failed to create hard link to %.0s%s" -msgstr "luotaessa kovaa linkkiä kohteeseen %.0s%s" +msgstr "kovan linkin %s luominen epäonnistui" #: src/ln.c:368 -#, fuzzy, c-format +#, c-format msgid "failed to create hard link %s" -msgstr "kovan linkin %s luominen tiedostoon %s ei onnistu" +msgstr "kovan linkin %s luominen epäonnistui" #: src/ln.c:369 #, fuzzy, c-format msgid "failed to create hard link %s => %s" -msgstr "kovan linkin %s luominen tiedostoon %s ei onnistu" +msgstr "kovan linkin %s luominen epäonnistui" #: src/ln.c:391 #, c-format @@ -5505,7 +5554,7 @@ msgstr "symbolisen linkin %s luominen ei onnistu" msgid "FIXME: unknown" msgstr "KORJAATÄMÄ: tuntematon" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Käyttö: %s [VALITSIN]\n" @@ -5518,7 +5567,7 @@ msgstr "" "Tulosta nykyisen käyttäjän nimi.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "ei sisäänkirjautumistunnusta" @@ -5528,105 +5577,104 @@ msgstr "ei sisäänkirjautumistunnusta" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" -msgstr "%e.%-m.%Y" +msgstr "%_e.%_m. %Y" #. TRANSLATORS: ls output needs to be aligned for ease of reading, #. so be wary of using variable width fields from the locale. #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" -msgstr "%e.%-m. %H:%M" - -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "ei huomioida virheellistä arvoa ympäristömuuttujassa QUOTING_STYLE: %s" +msgstr "%_e.%_m. %H:%M" -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "ei huomioida virheellistä leveyttä ympäristömuuttujassa COLUMNS: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "ei huomioida virheellistä sarkainkokoa ympäristömuuttujassa TABSIZE: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "virheellinen rivileveys: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "virheellinen sarkainkoko: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "virheellinen ajan muoto %s" -#: src/ls.c:2067 -#, fuzzy +#: src/ls.c:2045 msgid "Valid arguments are:\n" -msgstr "Kelvolliset argumentit:" +msgstr "Kelvolliset argumentit ovat:\n" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "virhe kuukausimerkkijonojen alustuksessa" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "tunnistamaton etuliite: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "jäsentymätön arvo LS_COLORS-ympäristömuuttujalle" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "ei huomioida virheellistä arvoa ympäristömuuttujassa QUOTING_STYLE: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "hakemiston %s avaaminen ei onnistu" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "hakemiston %s laitetta ja i-solmua ei voida määrittää" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: ei luetella jo lueteltua hakemistoa" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "luetaan hakemistoa %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "suljetaan hakemisto %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "tiedostonimiä %s ja %s ei voi vertailla" -#: src/ls.c:4781 +#: src/ls.c:4775 #, fuzzy msgid "" "List information about the FILEs (the current directory by default).\n" @@ -5637,7 +5685,7 @@ msgstr "" "tai --sort ole annettu.\n" "\n" -#: src/ls.c:4788 +#: src/ls.c:4782 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5653,7 +5701,7 @@ msgstr "" " -b, --escape tulosta oktaaliset suojaukset ei-graafisille\n" " merkeille\n" -#: src/ls.c:4794 +#: src/ls.c:4788 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." @@ -5677,13 +5725,14 @@ msgstr "" " nimen mukaan\n" " muuten: lajittele ctimen mukaan\n" -#: src/ls.c:4804 +#: src/ls.c:4798 #, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5697,7 +5746,7 @@ msgstr "" " äläkä seuraa symbolisia linkkejä\n" " -D, --dired tuota tuloste Emacsin dired-muodossa\n" -#: src/ls.c:4812 +#: src/ls.c:4807 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5714,11 +5763,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time kuten -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr " -g kuten -l, mutta älä näytä omistajia\n" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5727,7 +5776,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 +#: src/ls.c:4824 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5741,7 +5790,7 @@ msgstr "" " --si sama kuin edellä, mutta kantalukuna 1000, ei " "1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 #, fuzzy msgid "" " -H, --dereference-command-line\n" @@ -5769,7 +5818,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:4845 +#: src/ls.c:4840 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5790,7 +5839,7 @@ msgstr "" " -I, --ignore=HAHMO älä luettele HAHMOon täsmääviä merkintöjä\n" " -k sama kuin --block-size=1K\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5806,7 +5855,7 @@ msgstr "" " -m näytä tiedostonimet pilkuilla erotettuna\n" " luettelona\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5825,7 +5874,7 @@ msgstr "" " -p, --indicator-style=slash\n" " lisää hakemistoihin ilmaisin ”/”\n" -#: src/ls.c:4871 +#: src/ls.c:4866 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" @@ -5846,7 +5895,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5857,19 +5906,19 @@ msgstr "" " -R, --recursive luettele alihakemistot rekursiivisesti\n" " -s, --size tulosta kunkin tiedoston varaama koko lohkoina\n" -#: src/ls.c:4886 +#: src/ls.c:4881 #, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S lajittele tiedoston koon mukaan\n" " --sort=SANA lajittele SANAn perusteella, ei nimen mukaan:\n" @@ -5881,7 +5930,7 @@ msgstr "" "käytetään\n" " lajitteluun, jos --sort=time\n" -#: src/ls.c:4896 +#: src/ls.c:4892 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5906,7 +5955,7 @@ msgstr "" "muu\n" " kuin POSIX\n" -#: src/ls.c:4908 +#: src/ls.c:4904 #, fuzzy msgid "" " -t sort by modification time, newest first\n" @@ -5915,12 +5964,12 @@ msgstr "" " -t lajittele muutosajan mukaan\n" " -T, --tabsize=LEVEYS aseta sarkainkooksi LEVEYS, ei 8\n" -#: src/ls.c:4912 +#: src/ls.c:4908 #, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -5933,14 +5982,15 @@ msgstr "" " hakemistojärjestyksessä\n" " -v lajittele version mukaan\n" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=LEVEYS oleta ruudun leveydeksi LEVEYS\n" " -x luettele merkinnät riveittäin, ei " @@ -5948,7 +5998,7 @@ msgstr "" " -X aakkosta merkinnän päätteen mukaan\n" " -1 luettele vain yksi tiedosto yhdellä rivillä\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5957,7 +6007,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5986,46 +6036,48 @@ msgstr "David Madore" 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 "" "Käyttö: %1$s [VALITSIN] [TIEDOSTO]...\n" "Tulosta tai tarkista (%3$d-bittisiä) %2$s-tarkistussummia.\n" "Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 #, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" -msgstr " -b, --binary lue binäärimuodossa\n" +msgstr "" +" -b, --binary lue binäärimuodossa (oletus paitsi luettaessa tty-" +"vakiosyötettä)\n" -#: src/md5sum.c:178 +#: src/md5sum.c:180 #, fuzzy -msgid " -b, --binary read in binary mode\n" +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary lue binäärimuodossa\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:192 -#, fuzzy +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" -msgstr " -b, --binary lue binäärimuodossa\n" +msgstr " -t, --text lue tekstimuodossa (oletus)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 #, fuzzy msgid "" "\n" @@ -6043,14 +6095,15 @@ msgstr "" " -w, --warn varoita väärin muotoilluista summariveistä\n" "\n" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "Summien laskutapa on kuvattu dokumentissa %s. Tarkistettaessa syötteen\n" @@ -6058,49 +6111,49 @@ msgstr "" "rivi, jolla on tarkistussumma, tyyppiä ilmaiseva merkki (”*” = binääri,\n" "” ” = teksti), ja TIEDoston nimi. \n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: liian monta tarkistussummariviä" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: väärin muotoiltu %s-tarkistussummarivi" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: avaaminen tai luku EPÄONNISTUI\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "EI TÄSMÄÄ" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "OK" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: kelvollisesti muotoiltuja %s-tarkistussummarivejä ei löytynyt" -#: src/md5sum.c:629 -#, fuzzy, c-format +#: src/md5sum.c:632 +#, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" -msgstr[0] "%s: %: väärin muotoiltu %s-tarkistussummarivi" -msgstr[1] "%s: %: väärin muotoiltu %s-tarkistussummarivi" +msgstr[0] "VAROITUS: % väärin muotoiltu rivi" +msgstr[1] "VAROITUS: % väärin muotoiltua riviä" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, fuzzy, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "VAROITUS: % tiedosto % luetellusta jäi lukematta" msgstr[1] "VAROITUS: % tiedostoa % luetellusta jäi lukematta" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, fuzzy, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" @@ -6109,19 +6162,20 @@ msgstr[0] "" msgstr[1] "" "VAROITUS: % tarkistussummaa % lasketusta EI TÄSMÄNNYT" -#: src/md5sum.c:764 -#, c-format +#: src/md5sum.c:767 +#, fuzzy, c-format msgid "--tag does not support --text mode" -msgstr "" +msgstr "koodimalli %s ei tue PIC-tilaa" # onko verify tarkastamista, todentamista vai varmentamista? -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, fuzzy, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "" -"valitsin --status on merkityksellinen vain tarkastettaessa tarkistussummia" +"valitsimet --binary ja --text ovat merkityksettömiä tarkastettaessa " +"tarkistussummia" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6130,31 +6184,31 @@ msgstr "" "tarkistussummia" # onko verify tarkastamista, todentamista vai varmentamista? -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" "valitsin --status on merkityksellinen vain tarkastettaessa tarkistussummia" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" -"valitsin --status on merkityksellinen vain tarkastettaessa tarkistussummia" +"valitsin --warn on merkityksellinen vain tarkastettaessa tarkistussummia" #: src/mkdir.c:58 src/rmdir.c:164 #, c-format @@ -6190,22 +6244,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" -msgstr "tiedoston %s aikojen säilyttäminen ei onnistu" +msgstr "virheellinen konteksti: %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "luotiin hakemisto %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6294,7 +6348,7 @@ msgstr "" msgid "Special files require major and minor device numbers." msgstr "" "Major- ja minor-laitearvot on annettava luotaessa\n" -"erikoistiedostoja" +"erikoistiedostoja." #: src/mknod.c:185 msgid "Fifos do not have major and minor device numbers." @@ -6333,7 +6387,7 @@ msgstr "virheellinen laitetyyppi %s" #. This is a proper name. See the gettext manual, section Names. #: src/mktemp.c:36 msgid "Eric Blake" -msgstr "" +msgstr "Eric Blake" #: src/mktemp.c:66 #, c-format @@ -6389,22 +6443,22 @@ msgstr "" #: src/mktemp.c:210 #, fuzzy, c-format msgid "too many templates" -msgstr "liian monta argumenttia" +msgstr "%s: liian monta arvoa" #: src/mktemp.c:230 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" #: src/mktemp.c:260 -#, c-format +#, fuzzy, c-format msgid "too few X's in template %s" -msgstr "" +msgstr "%s: liian vähän arvoja kentälle ”%s”" #: src/mktemp.c:276 #, c-format @@ -6419,7 +6473,7 @@ msgstr "" #: src/mktemp.c:311 #, fuzzy, c-format msgid "failed to create directory via template %s" -msgstr "hakemiston %s sulkeminen epäonnistui" +msgstr "Väliaikaishakemiston luominen %s-mallia käyttäen ei onnistu" #: src/mktemp.c:322 #, fuzzy, c-format @@ -6517,7 +6571,7 @@ msgstr "kun säätöarvo on annettu, on komento pakollinen" #: src/nice.c:188 src/nice.c:199 #, fuzzy, c-format msgid "cannot get niceness" -msgstr "järjestelmän nimen haku ei onnistu" +msgstr "työhakemiston selvittäminen ei onnistu" #: src/nice.c:205 #, fuzzy, c-format @@ -6531,9 +6585,7 @@ msgstr "Scott Bartram" #: src/nl.c:179 #, fuzzy -msgid "" -"Write each FILE to standard output, with line numbers added.\n" -"With no FILE, or when FILE is -, read standard input.\n" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "Kirjoita kukin TIEDOSTO vakiotulosteeseen rivinumerointi lisäten.\n" "Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" @@ -6647,27 +6699,27 @@ msgstr "virheellinen rungon numerointityyli: %s" msgid "invalid footer numbering style: %s" msgstr "virheellinen alatunnisteen numerointityyli: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "virheellinen aloitusrivin numero: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "virheellinen rivinumeron lisäys: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "virheellinen tyhjien rivien määrä: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "virheellinen rivinumerokentän leveys: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "virheellinen rivinumerointimuoto: %s" @@ -6693,7 +6745,7 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6705,47 +6757,48 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "vakiotulosteen uudelleenohjaus epäonnistui" -#: src/nohup.c:131 -#, fuzzy, c-format +#: src/nohup.c:129 +#, c-format msgid "ignoring input" -msgstr "jätetään kaikki argumentit huomiotta" +msgstr "jätetään syöte huomiotta" -#: src/nohup.c:175 +#: src/nohup.c:173 #, fuzzy, c-format msgid "ignoring input and appending output to %s" -msgstr "kirjoitetaan tuloste tiedoston %s loppuun" +msgstr "%s: syötetiedosto on tulostiedosto" -#: src/nohup.c:176 +#: src/nohup.c:174 #, fuzzy, c-format msgid "appending output to %s" -msgstr "kirjoitetaan tuloste tiedoston %s loppuun" +msgstr "suljetaan tulostiedosto %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" "vakiovirhetulosteen kopion asettaminen sulkeutumaan käynnistettäessä " "epäonnistui" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" +"jätetään syöte huomioimatta ja ohjataan vakiovirhetuloste vakiotulosteeseen" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" -msgstr "" +msgstr "ohjataan vakiovirhetuloste vakiotulosteeseen" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" -msgstr "" +msgstr "Giuseppe Scrivano" #: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format @@ -6765,96 +6818,95 @@ msgid "" " --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: virheellinen rivimäärä" - #. This is a proper name. See the gettext manual, section Names. -#: src/numfmt.c:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" -msgstr "" +msgstr "Assaf Gordon" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, fuzzy, c-format msgid "value too large to be converted: %s" msgstr "%s: arvoa ei muunnettu kokonaisuudessaan" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "virheellinen määrä %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" -msgstr "argumentti ”%s” ei kelpaa" +msgstr "%s: virheellinen jälkiliitteen pituus" -#: src/numfmt.c:675 -#, c-format +#: src/numfmt.c:706 +#, fuzzy, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" -msgstr "" +msgstr "argumentti ”%s” ei kelpaa" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "%s: avaaminen kirjoitustilassa epäonnistui" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "virheellinen sarkainkoko: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" -msgstr "Käyttö: %s [VALITSIN]... [TUNNUS]...\n" +msgstr "" +"Käyttö: %s [LUKU]...\n" +" tai: %s VALITSIN\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6862,19 +6914,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -6884,43 +6936,41 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 #, fuzzy msgid "" "\n" "UNIT options:\n" -msgstr "" -"Lajitteluvalitsimet:\n" -"\n" +msgstr "Valitsimet:\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6929,7 +6979,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -6937,7 +6987,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -6945,7 +6995,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -6953,7 +7003,30 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Väli on yksi seuraavista:\n" +"\n" +" N N:s tavu, merkki tai kenttä, numerointi alkaa 1:stä\n" +" N- N:nnestä tavusta, merkistä tai kentästä rivin loppuun\n" +" N-M N:nnestä tavusta, merkistä tai kentästä M:nteen (M ja N mukaan " +"lukien)\n" +" -M ensimmäisestä tavusta, merkistä tai kentästä M:nteen (M mukaan " +"lukien)\n" +"\n" +"Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -6962,9 +7035,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -6976,7 +7050,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -6991,118 +7065,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, fuzzy, c-format msgid "format %s has no %% directive" -msgstr "kohde %s ei ole hakemisto" +msgstr "%s: säännös ei kelpaa" -#: src/numfmt.c:1003 -#, fuzzy, c-format +#: src/numfmt.c:1080 +#, c-format msgid "invalid format %s (width overflow)" -msgstr "virheellinen muodon leveys" +msgstr "virheellinen muotoilu %s (leveyden ylivuoto)" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" -msgstr "" +msgstr "muotoilu %s päättyy %%:iin" + +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "virheellinen tarkkuus: %s" -#: src/numfmt.c:1030 +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" -msgstr "" +msgstr "muotoilussa %s on liikaa %%-direktiivejä" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" -msgstr "argumentti ”%s” ei kelpaa" +msgstr "%s: virheellinen jälkiliitteen pituus" + +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" -#: src/numfmt.c:1103 +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +msgid "invalid field value %s" +msgstr "virheellinen kenttäarvo %s" -#: src/numfmt.c:1403 -#, fuzzy, c-format +#: src/numfmt.c:1631 +#, c-format msgid "invalid padding value %s" -msgstr "virheellinen sivuväli %s" +msgstr "virheellinen tasausarvo %s" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "virheellinen sarakenumero: %s" +msgid "multiple field specifications" +msgstr "%s: virheellinen kenttämääritys %s" -#: src/numfmt.c:1447 -#, fuzzy, c-format +#: src/numfmt.c:1677 +#, c-format msgid "invalid header value %s" -msgstr "virheellinen päiväys %s" +msgstr "virheellinen otsakearvo %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, fuzzy, c-format msgid "--grouping cannot be combined with --format" -msgstr "signaalin yhdistäminen valitsimen -l tai -t kanssa ei onnistu" +msgstr "yhdistetyn syötteen lopun yli ei voi ohittaa" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "useita -l tai -t -valitsimia annettu" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, fuzzy, c-format msgid "grouping cannot be combined with --to" msgstr "signaalin yhdistäminen valitsimen -l tai -t kanssa ei onnistu" -#: src/numfmt.c:1488 -#, c-format +#: src/numfmt.c:1719 +#, fuzzy, c-format msgid "grouping has no effect in this locale" -msgstr "" +msgstr "Vanhentunut. Tämä valitsin ei vaikuta mihinkään" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 -#, fuzzy, c-format +#: src/numfmt.c:1757 +#, c-format msgid "error reading input" -msgstr "virhe luettaessa tiedostoa %s" +msgstr "virhe luettaessa syötettä" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, fuzzy, c-format msgid "failed to convert some of the input numbers" msgstr "vakiotulosteen uudelleenohjaus epäonnistui" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7115,14 +7201,13 @@ msgstr "" " tai: %s --traditional [VALITSIN]... [TIEDOSTO] [[+]SIIRTYMÄ[.][b]\n" " [+][NIMIÖ][.][b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Kirjoita yksiselitteinen esitys TIEDOSTOsta vakiotulosteeseen,\n" @@ -7131,9 +7216,10 @@ msgstr "" "Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 #, 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" @@ -7154,7 +7240,8 @@ msgstr "" " a nimetty merkki\n" " c ASCII-merkki tai kenoviivasuojaus\n" -#: src/od.c:344 +#: src/od.c:347 +#, fuzzy msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7162,8 +7249,10 @@ msgid "" "order\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" +" -A, --address-radix=KANTA päätä miten tiedostosiirtymät tulostetaan\n" +" -j, --skip-bytes=MÄÄRÄ ohita aluksi MÄÄRÄ syötetavua\n" -#: src/od.c:350 +#: src/od.c:353 #, fuzzy msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" @@ -7185,7 +7274,7 @@ msgstr "" " -w, --width[=MÄÄRÄ] tulosta MÄÄRÄ tavua kullekin tulosteriville\n" " --traditional hyväksy argumentteja perinteisessä muodossa\n" -#: src/od.c:363 +#: src/od.c:366 #, fuzzy msgid "" "\n" @@ -7204,7 +7293,7 @@ msgstr "" " -d sama kuin -t u2, valitse etumerkittömät 10-kantaiset lyhyet kok." "luvut\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7220,7 +7309,7 @@ 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:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -7229,7 +7318,7 @@ msgid "" " c printable character or backslash escape\n" msgstr "" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7243,7 +7332,7 @@ msgstr "" " u[KOKO] etumerkitön kymmenkantainen luku, KOKO tavua/kokonaisluku\n" " x[KOKO] kuusitoistakantainen luku, KOKO tavua/kokonaisluku\n" -#: src/od.c:394 +#: src/od.c:397 #, fuzzy msgid "" "\n" @@ -7258,14 +7347,14 @@ msgstr "" "Jos TYYPPI on f, KOKO voi myös olla F: sizeof(float), D: sizeof(double)\n" "tai L: sizeof(long double).\n" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 #, fuzzy msgid "" "\n" @@ -7286,12 +7375,12 @@ msgstr "" "Kukin MUUNNOS voi olla:\n" "\n" -#: src/od.c:680 src/od.c:800 -#, fuzzy, c-format +#: src/od.c:683 src/od.c:803 +#, c-format msgid "invalid type string %s" -msgstr "virheellinen muotoilumerkkijono %s" +msgstr "virheellinen tyyppimerkkijono %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7300,7 +7389,7 @@ msgstr "" "virheellinen tyyppi %s;\n" "järjestelmä ei tarjoa %lu-tavuista perustyyppiä" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7309,38 +7398,37 @@ msgstr "" "virheellinen tyyppi %s;\n" "järjestelmä ei tarjoa %lu-tavuista liukulukutyyppiä" -#: src/od.c:869 -#, fuzzy, c-format +#: src/od.c:872 +#, c-format msgid "invalid character '%c' in type string %s" -msgstr "virheellinen merkki ”%c” muotoilumerkkijonossa ”%s”" +msgstr "virheellinen merkki ”%c” tyyppimerkkijonossa %s" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "yhdistetyn syötteen lopun yli ei voi ohittaa" -#: src/od.c:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "tyyppiä ei voi antaa merkkijonoja vedostettaessa" -#: src/od.c:1863 -#, fuzzy +#: src/od.c:1871 msgid "compatibility mode supports at most one file" -msgstr "Yhteensopivuustila tukee vain yhtä tiedostoa." +msgstr "yhteensopivuustila tukee korkeintaan yhtä tiedostoa" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "ohitettavat-tavut + luettavat-tavut on liian suuri" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "varoitus: virheellinen leveys %lu; käytetään arvoa %d" @@ -7360,7 +7448,6 @@ msgstr "vakiosyöte on suljettu" 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 "" "Kirjoita peräkkäisiä vastaavia rivejä kustakin TIEDOSTOsta " "vakiotulosteeseen,\n" @@ -7394,14 +7481,14 @@ msgid "" msgstr "" #: src/pathchk.c:170 -#, c-format +#, fuzzy, c-format msgid "leading '-' in a component of file name %s" -msgstr "" +msgstr "älä poista ”/”-merkkiä tiedostonimien alusta" #: src/pathchk.c:196 #, fuzzy, c-format msgid "nonportable character %s in file name %s" -msgstr "virheellinen merkki %s oikeusmerkkijonossa %s" +msgstr "%s: tiedostonimi sisältää nul-merkin" #: src/pathchk.c:272 #, c-format @@ -7414,9 +7501,9 @@ msgid "%s: unable to determine maximum file name length" msgstr "%s: tiedostonimen enimmäispituuden selvittäminen epäonnistui" #: src/pathchk.c:325 -#, c-format +#, fuzzy, c-format msgid "limit %lu exceeded by length %lu of file name %s" -msgstr "" +msgstr "%s:%lu: virheellinen tyhjä tiedostonimi" #: src/pathchk.c:411 #, c-format @@ -7436,7 +7523,7 @@ msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. #: src/pinky.c:242 msgid " ???" -msgstr "" +msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. #: src/pinky.c:266 @@ -7502,12 +7589,12 @@ msgstr "Milloin" msgid "Where" msgstr "Missä" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Käyttö: %s [VALITSIN]... [TUNNUS]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7523,7 +7610,7 @@ msgstr "" " -p älä näytä plan-tiedostoa pitkässä mallissa\n" " -s lyhyen mallin tuloste, tämä on oletus\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7539,7 +7626,7 @@ msgstr "" "joutenoloaikaa\n" " lyhyessä mallissa\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, fuzzy, c-format msgid "" "\n" @@ -7550,105 +7637,103 @@ msgstr "" "Kevyt ”finger”-ohjelma; näyttää käyttäjätietoja.\n" "utmp-tiedostona %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" "käyttäjänimeä ei annettu; valitsin -l vaatii vähintään yhden käyttäjänimen" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Hübner" -#: src/pr.c:908 +#: src/pr.c:905 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" "puuttuva argumentti valitsimelle ”--pages=ENSIMMÄINEN_SIVU[:VIIMEINEN_SIVU]”" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "virheellinen sivuväli %s" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "virheellinen rivimäärä valitsimelle ”-n SIVUN_PITUUS”: %s" -#: 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:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" +msgstr "virheellinen aloitusrivin numero: %s" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "virheellinen rivisiirtymä valitsimelle ”-o MARGINAALI”: %s" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "virheellinen merkkimäärä valitsimelle ”-w SIVUN_LEVEYS”: %s" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "virheellinen merkkimäärä valitsimelle ”-W SIVUN_LEVEYS”: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "palstojen määrää ei voi antaa tulostettaessa rinnakkain" -#: src/pr.c:1100 +#: src/pr.c:1063 #, 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." +msgstr "palstojen määrää ei voi antaa tulostettaessa rinnakkain" -#: src/pr.c:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "sivun leveys on liian pieni" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" "aloitussivunumero % on suurempi kuin sivujen kokonaismäärä " "%" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "sivunumeroinnin ylivuoto" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Sivu %" -#: src/pr.c:2757 +#: src/pr.c:2727 #, fuzzy msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "Numeroi sivut tai palstoita TIEDOSTO(t) tulostusta varten.\n" -#: src/pr.c:2763 +#: src/pr.c:2734 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -7668,7 +7753,7 @@ msgstr "" " ole annettu. Tasapainota kunkin sivun palstojen\n" " rivimäärä.\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7685,7 +7770,7 @@ msgstr "" " -d, --double-space\n" " tulosta käyttäen kaksinkertaista riviväliä\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7706,7 +7791,7 @@ msgstr "" " kanssa, tai 5-rivisellä ja otsakkeella ja lopukkeella\n" " ilman valitsinta -F)\n" -#: src/pr.c:2789 +#: src/pr.c:2760 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -7732,12 +7817,26 @@ msgstr "" "string[=MJONO]\n" " asettaa erottimet\n" -#: src/pr.c:2798 +#: src/pr.c:2769 #, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l SIVUN_PITUUS, --length=SIVUN_PITUUS\n" +" aseta sivun pituudeksi SIVUN_PITUUS (66) riviä\n" +" (tekstirivien oletusmäärä on 56, valitsimen -F kanssa " +"63)\n" +" -m, --merge tulosta kaikki tiedostot rinnakkain, yksi kullakin\n" +" palstalla, typistä rivit, mutta yhdistä täysipituiset " +"rivit\n" +" valitsimella -J\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -7750,7 +7849,7 @@ msgstr "" "rivit\n" " valitsimella -J\n" -#: src/pr.c:2805 +#: src/pr.c:2779 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -7768,7 +7867,7 @@ msgstr "" " aloita laskeminen LUVUlla ensimmäisen tulostetun sivun\n" " 1. riviltä (katso +ENSIMMÄINEN_SIVU)\n" -#: src/pr.c:2813 +#: src/pr.c:2787 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -7784,7 +7883,7 @@ msgstr "" " -r, --no-file-warnings\n" " älä varoita, jos tiedostoa ei voida avata\n" -#: src/pr.c:2820 +#: src/pr.c:2794 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -7802,7 +7901,7 @@ msgstr "" " kolmen sarakevalitsimen osalta (-SARAKE|-a -SARAKE|-m),\n" " paitsi jos -w on annettu\n" -#: src/pr.c:2828 +#: src/pr.c:2802 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7810,7 +7909,6 @@ msgid "" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " erota sarakkeet MJONOlla,\n" " ilman valitsinta -S: Oletuserotin -J:n kanssa\n" @@ -7819,7 +7917,13 @@ msgstr "" " sarakevalitsimiin\n" " -t, --omit-header jätä pois sivun otsakkeet ja lopukkeet\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -7844,7 +7948,7 @@ msgstr "" " SIVUN_LEVEYS (72) merkkiä, -s[merkki] ottaa pois\n" " käytöstä (72)\n" -#: src/pr.c:2845 +#: src/pr.c:2822 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -7858,18 +7962,6 @@ msgstr "" " katkaise rivit, paitsi jos valitsin -J on käytössä, ei\n" " vaikutusta valitsimen -S tai -s kanssa\n" -#: src/pr.c:2853 -#, fuzzy -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"Valitsin -l nn sisältää valitsimen -T, jos nn <= 10 tai <= 3, jos -F " -"käytössä.\n" -"Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" - #: src/printenv.c:62 #, fuzzy, c-format msgid "" @@ -7994,7 +8086,7 @@ msgstr "virheellinen tarkkuus: %s" #: src/printf.c:609 #, fuzzy, c-format msgid "%.*s: invalid conversion specification" -msgstr "%s: virheellinen kenttämääritys \"%s\"" +msgstr "%s: virheellinen kenttämääritys %s" #: src/printf.c:692 #, fuzzy, c-format @@ -8033,12 +8125,11 @@ msgstr "" "sanoista.\n" "\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 #, fuzzy 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 tulosta automaattisesti luodut viitteet\n" " -G, --traditional käyttäydy enemmän kuten System V:n ”ptx”\n" @@ -8046,6 +8137,12 @@ msgstr "" "merkitsemiseen\n" #: src/ptx.c:1835 +msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -8062,7 +8159,7 @@ msgstr "" " -T, --format=tex tuota tuloste TeX-käskyinä\n" # Osa on aika hämäriä. -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8081,7 +8178,7 @@ msgstr "" " -o, --only-file=TIEDOSTO lue ainoiden sanojen luettelo tästä " "TIEDOSTOsta\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8093,20 +8190,16 @@ msgstr "" " -w, --width=MÄÄRÄ tulosteleveys sarakkeina, viite " "poistettuna\n" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" - #: src/ptx.c:1951 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "virheellinen leveys: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "virheellinen rivileveys: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8122,20 +8215,21 @@ msgid "" msgstr "" #: src/pwd.c:67 +#, fuzzy msgid "" "\n" "If no option is specified, -P is assumed.\n" -msgstr "" +msgstr "%s: Annettu useampi kuin yksi -p -valitsin\n" #: src/pwd.c:169 #, c-format msgid "failed to chdir to %s" msgstr "siirtyminen hakemistoon %s epäonnistui" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, fuzzy, c-format msgid "failed to stat %s" -msgstr "tiedoston %s avaaminen epäonnistui" +msgstr "stat(%s) epäonnistui" #: src/pwd.c:238 #, c-format @@ -8153,8 +8247,8 @@ msgstr "jätetään huomiotta argumentit, jotka eivät ole valitsimia" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Käyttö: %s [VALITSIN]... TIEDOSTO...\n" @@ -8228,7 +8322,7 @@ msgstr "" #: src/relpath.c:130 msgid "generating relative path" -msgstr "" +msgstr "luodaan suhteellinen polku" #: src/remove.c:273 #, c-format @@ -8273,7 +8367,7 @@ msgstr "ohitetaan %s, koska se on toisella laitteella" #: src/remove.c:525 #, fuzzy, c-format msgid "traversal failed: %s" -msgstr "lukeminen epäonnistui" +msgstr "%s epäonnistui" #: src/remove.c:531 #, c-format @@ -8285,7 +8379,7 @@ msgstr "" #: 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" +msgstr "%s: Tiedostoa %s ei voi poistaa: %s\n" #: src/rm.c:136 msgid "" @@ -8369,15 +8463,15 @@ msgstr "" #: src/rm.c:342 #, fuzzy, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: poistetaanko %s %s? " msgstr[1] "%s: poistetaanko %s %s? " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: poistetaanko %s %s? " msgstr[1] "%s: poistetaanko %s %s? " @@ -8422,7 +8516,7 @@ msgstr "" #: src/rmdir.c:242 #, fuzzy, c-format msgid "failed to remove %s" -msgstr "tiedoston %s avaaminen epäonnistui" +msgstr "hakemiston %s poistaminen epäonnistui" #: src/runcon.c:83 #, c-format @@ -8451,27 +8545,27 @@ msgstr "" #: src/runcon.c:144 #, c-format msgid "multiple roles" -msgstr "" +msgstr "useita rooleja" #: src/runcon.c:149 #, c-format msgid "multiple types" -msgstr "" +msgstr "useita tyyppejä" #: src/runcon.c:154 #, c-format msgid "multiple users" -msgstr "" +msgstr "useita käyttäjiä" #: src/runcon.c:159 -#, c-format +#, fuzzy, c-format msgid "multiple levelranges" -msgstr "" +msgstr "useita tulostusmuotoja annettu" #: src/runcon.c:177 src/runcon.c:213 #, fuzzy, c-format msgid "failed to get current context" -msgstr "tiedoston %s ominaisuuksien hakeminen ei onnistu" +msgstr "työhakemiston selvittäminen ei onnistu" #: src/runcon.c:187 #, c-format @@ -8491,27 +8585,27 @@ msgstr "" #: src/runcon.c:226 #, fuzzy, c-format msgid "failed to compute a new context" -msgstr "tiedoston %s avaaminen epäonnistui" +msgstr "selinux-kontekstin laskeminen ei onnistunut" #: src/runcon.c:240 #, fuzzy, c-format msgid "failed to set new user %s" -msgstr "tiedoston %s avaaminen epäonnistui" +msgstr "Ohjelman nscd ajaminen käyttäjän ”%s” oikeuksilla epäonnistui" #: src/runcon.c:242 #, fuzzy, c-format msgid "failed to set new type %s" -msgstr "tiedoston %s avaaminen epäonnistui" +msgstr "ioctl(RTC_EPOCH_SET) laitteelle %s epäonnistui" #: src/runcon.c:244 #, fuzzy, c-format msgid "failed to set new range %s" -msgstr "tiedoston %s avaaminen epäonnistui" +msgstr "ioctl(RTC_EPOCH_SET) laitteelle %s epäonnistui" #: src/runcon.c:246 #, fuzzy, c-format msgid "failed to set new role %s" -msgstr "tiedoston %s avaaminen epäonnistui" +msgstr "ioctl(RTC_EPOCH_SET) laitteelle %s epäonnistui" #: src/runcon.c:254 #, fuzzy, c-format @@ -8521,7 +8615,7 @@ msgstr "tiedoston %s oikeuksien palauttaminen ei onnistu" #: src/selinux.c:127 src/selinux.c:300 #, fuzzy, c-format msgid "error canonicalizing %s" -msgstr "virhe luettaessa tiedostoa %s" +msgstr "virhe kirjoitettaessa %s: %s" #: src/seq.c:68 #, c-format @@ -8586,12 +8680,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "virheellinen liukulukuargumentti: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "tiedostolla %s on tuntematon tiedostotyyppi" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "muotoilua ei voi määritellä kun tulostetaan tasalevyisiä lukuja" @@ -8611,7 +8705,16 @@ msgstr "" "palauttaminen olisi vaikeampaa jopa hyvin kalliilla laitteilla.\n" "\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Jos TIEDOSTO on -, kopioidaan vakiotulosteeseen.\n" + +#: src/shred.c:181 #, fuzzy, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8624,7 +8727,7 @@ msgstr "" " -s, --size=N silppua näin monta tavua (jälkiliitteet kuten K, M,\n" " G hyväksytään)\n" -#: src/shred.c:183 +#: src/shred.c:187 #, fuzzy msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" @@ -8640,12 +8743,10 @@ msgstr "" " -z, --zero ylikirjoita lopuksi nollia silppuamisen kätkemiseksi\n" " - silppua vakiotuloste\n" -#: src/shred.c:192 +#: src/shred.c:196 #, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -8666,7 +8767,7 @@ msgstr "" "yleensä käsiteltäessä tavallisia tiedostoja.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8686,7 +8787,7 @@ msgstr "" "toimintatiloissa:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8708,7 +8809,7 @@ msgstr "" " Appliancen NFS-palvelin\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8722,7 +8823,7 @@ msgstr "" "* tiivistetyt tiedostojärjestelmät\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -8734,7 +8835,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:241 +#: src/shred.c:243 #, fuzzy msgid "" "In addition, file system backups and remote mirrors may contain copies\n" @@ -8750,127 +8851,127 @@ msgstr "" "tiedostosta kopioita, joita ei voida poistaa, ja jotka mahdollistavat\n" "silputun tiedoston palauttamisen myöhemmin.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync epäonnistui" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync epäonnistui" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: taaksepäin siirtyminen ei onnistu" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: ylikirjoituskerta %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: virhe kirjoitettaessa siirtymässä %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek epäonnistui" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: tiedosto on liian suuri" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: ylikirjoituskerta %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: ylikirjoituskerta %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat epäonnistui" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: virheellinen tiedostotyyppi" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: tiedoston koko on negatiivinen" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: virhe typistettäessä" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl epäonnistui" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: vain lisäykseen soveltuvaa tiedostokahvaa ei voi silputa" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: poistetaan" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: nimettiin uudelleen nimelle %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: poisto epäonnistui" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: poistettu" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: sulkeminen epäonnistui" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: avaaminen kirjoitustilassa epäonnistui" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: virheellinen ylikirjoituskertojen määrä" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, fuzzy, c-format msgid "multiple random sources specified" msgstr "useita tulostusmuotoja annettu" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: virheellinen tiedostokoko" -#: src/shuf.c:61 +#: src/shuf.c:62 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -8881,14 +8982,14 @@ msgstr "" " tai: %s [VALITSIN]... ALKU LOPPU\n" " tai: %s [VALITSIN]... ALKU LISÄYS LOPPU\n" -#: src/shuf.c:67 +#: src/shuf.c:68 #, fuzzy msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" "Kirjoita kaikkien TIEDOSTO(jen) yhdistelmä lajiteltuna vakiotulosteeseen.\n" "\n" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -8899,40 +9000,42 @@ msgid "" " -r, --repeat output lines can be repeated\n" msgstr "" -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" -msgstr "liian monta argumenttia" +msgstr "%s: liian monta tarkistussummariviä" -#: src/shuf.c:431 +#: src/shuf.c:428 #, fuzzy, c-format msgid "multiple -i options specified" msgstr "useita -l tai -t -valitsimia annettu" -#: src/shuf.c:452 -#, fuzzy, c-format -msgid "invalid input range %s" -msgstr "virheellinen leveys: %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" +msgstr "virheellinen syöteväli %s" -#: src/shuf.c:465 +#: src/shuf.c:459 #, fuzzy, c-format -msgid "invalid line count %s" -msgstr "virheellinen rivileveys: %s" +msgid "invalid line count: %s" +msgstr "virheellinen rivimäärä %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "useita tulostiedostoja annettu" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "valitsimia -e ja -i ei voi käyttää yhdessä" -#: src/shuf.c:586 -#, c-format +#: src/shuf.c:580 +#, fuzzy, c-format msgid "no lines to repeat" msgstr "" +"kaikkien vähintään kahteen kertaan esiintyvien rivien ja esiintymiskertojen " +"määrän tulostaminen on merkityksetöntä" #: src/sleep.c:44 #, fuzzy, c-format @@ -8955,12 +9058,12 @@ msgstr "" "mielivaltainen liukuluku.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "ajanjakso ei kelpaa: %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "tosiaikaisen kellon luku ei onnistu" @@ -8972,7 +9075,7 @@ msgstr "" "Kirjoita kaikkien TIEDOSTO(jen) yhdistelmä lajiteltuna vakiotulosteeseen.\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -8980,7 +9083,7 @@ msgstr "" "Lajitteluvalitsimet:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 #, fuzzy msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" @@ -8993,19 +9096,19 @@ msgstr "" "merkkien mukaan\n" " -f, --ignore-case älä huomioi kirjainkokoa\n" -#: src/sort.c:443 +#: src/sort.c:444 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:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9013,7 +9116,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9023,22 +9126,21 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 -#, fuzzy +#: src/sort.c:466 msgid "" "Other options:\n" "\n" msgstr "" -"Lajitteluvalitsimet:\n" +"Muut valitsimet:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -9047,7 +9149,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:481 #, fuzzy msgid "" " --debug annotate the part of the line used to sort,\n" @@ -9059,13 +9161,13 @@ msgstr "" " -L, --max-line-length näytä pisimmän rivin pituus\n" " -w, --words näytä sanamäärät\n" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 #, fuzzy msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" @@ -9085,7 +9187,7 @@ msgstr "" "”viimeinen oljenkorsi”-vertailu\n" " -S, --buffer-size=KOKO käytä KOKOa muistipuskurille\n" -#: src/sort.c:497 +#: src/sort.c:498 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9110,7 +9212,7 @@ msgstr "" " ilman -c:tä: tulosta vain ensimmäinen\n" " yhtäläisten joukosta\n" -#: src/sort.c:511 +#: src/sort.c:512 #, fuzzy msgid "" "\n" @@ -9137,12 +9239,11 @@ msgstr "" "\n" "KOKOon voi liittää kertoimen:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -9156,276 +9257,281 @@ msgstr "" "lajittelujärjestykseen. Asettamalla LC_ALL=C otetaan käyttöön\n" "perinteinen lajittelujärjestys, joka käyttää tavujen arvoja.\n" -#: src/sort.c:725 +#: src/sort.c:724 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "kirjoitetaan tiedostoon %s" -#: src/sort.c:730 -#, c-format +#: src/sort.c:729 +#, fuzzy, c-format msgid "%s [-d] terminated abnormally" -msgstr "" +msgstr "Komento keskeytyi signaaliin %d\n" -#: src/sort.c:884 +#: src/sort.c:883 #, fuzzy, c-format msgid "cannot create temporary file in %s" -msgstr "väliaikaistiedoston %s luominen ei onnistu" +msgstr "tilapäistiedostoa ei voi luoda: %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "avaaminen epäonnistui" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "puskurin tyhjennys epäonnistui" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "sulkeminen epäonnistui" -#: src/sort.c:1140 -#, fuzzy +#: src/sort.c:1139 msgid "couldn't create temporary file" -msgstr "väliaikaistiedoston luominen ei onnistu" +msgstr "tilapäistä tiedostoa ei voitu luoda" -#: src/sort.c:1179 +#: src/sort.c:1178 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "hakemiston %s luominen ei onnistu" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "varoitus: ei voida poistaa: %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, fuzzy, c-format msgid "invalid --%s argument %s" -msgstr "virheellinen argumentti %s" +msgstr "virheellinen argumentti %s %s:lle" -#: src/sort.c:1341 +#: src/sort.c:1340 #, fuzzy, c-format msgid "minimum --%s argument is %s" -msgstr "argumentti ”%s” ei kelpaa" +msgstr "virheellinen argumentti %s %s:lle" -#: src/sort.c:1356 +#: src/sort.c:1355 #, fuzzy, c-format msgid "--%s argument %s too large" -msgstr "%s: lukumäärä ”%.*s” on liian suuri" +msgstr "%s on liian suuri" -#: src/sort.c:1359 +#: src/sort.c:1358 #, fuzzy, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "argumentti ”%s” ei kelpaa" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "tiedoston tilan lukeminen epäonnistui" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "lukeminen epäonnistui" -#: src/sort.c:2076 +#: src/sort.c:2075 #, fuzzy, c-format msgid "string transformation failed" msgstr "merkkijonovertailu epäonnistui" -#: src/sort.c:2079 -#, c-format +#: src/sort.c:2078 +#, fuzzy, c-format msgid "the untransformed string was %s" -msgstr "" +msgstr "merkkijonoa ”%s” ei voi jakaa osiin: %s" -#: src/sort.c:2242 -#, c-format +#: src/sort.c:2241 +#, fuzzy, c-format msgid "^ no match for key\n" -msgstr "" +msgstr "Ei vastaavuutta" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" -msgstr[0] "%s: valitsin ”%s” ei ole yksiselitteinen\n" -msgstr[1] "%s: valitsin ”%s” ei ole yksiselitteinen\n" +msgstr[0] "%s: valitsin ”-W %s” ei ole yksiselitteinen\n" +msgstr[1] "%s: valitsin ”-W %s” ei ole yksiselitteinen\n" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "kirjoitus epäonnistui" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: epäjärjestys: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "vakiovirhe" -#: src/sort.c:3738 -#, fuzzy +#: src/sort.c:3737 msgid "cannot read" -msgstr "%s: taaksepäin siirtyminen ei onnistu" +msgstr "ei voida lukea" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: virheellinen kenttämääritys %s" -#: src/sort.c:4028 -#, c-format +#: src/sort.c:4027 +#, fuzzy, c-format msgid "options '-%s' are incompatible" -msgstr "" +msgstr "Valitsimet ”-Aru” eivät ole yhteensopivia valitsimen ”-f -” kanssa" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: virheellinen määrä merkkijonon %s alussa" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" -msgstr "virheellinen lukuarvo merkin ”-” jälkeen" +msgstr "roskaa numeron perässä" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" -msgstr "virheellinen lukuarvo merkin ”.” jälkeen" +msgstr "roskaa numeron perässä" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "outo merkki kenttämäärityksessä" -#: src/sort.c:4403 +#: src/sort.c:4402 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "useita tulostusmuotoja annettu" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "virheellinen lukuarvo kentän alussa" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "kentän numero on nolla" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "merkin siirtymä on nolla" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" -msgstr "virheellinen lukuarvo merkin ”,” jälkeen" +msgstr "roskaa numeron perässä" # Tarkoitetaanko tässä sarkainta? -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "tyhjä sarkain" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, fuzzy, c-format msgid "cannot read file names from %s" -msgstr "tiedostonimiä %s ja %s ei voi vertailla" +msgstr "Lue tiedostonimet TIEDOSTOsta" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: virheellinen tyhjä tiedostonimi" -#: src/sort.c:4619 +#: src/sort.c:4618 #, fuzzy, c-format msgid "no input from %s" msgstr "suljetaan syötetiedosto %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" -msgstr "" +msgstr "käytetään %s-lajittelusääntöjä" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, fuzzy, c-format msgid "extra operand %s not allowed with -%c" -msgstr "ylimääräinen operandi %s ei ole sallittu valitsimen -c kanssa" +msgstr "ylimääräinen operandi %s" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Käyttö: %s [VALITSIN]... [SYÖTE [ETULIITE]]\n" -#: src/split.c:207 +#: src/split.c:228 #, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\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:215 -#, c-format +#: src/split.c:236 +#, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file names\n" " -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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" +" -a, --suffix-length=N käytä N merkin pituisia jälkiliitteitä (oletus " +"%d)\n" +" -b, --bytes=KOKO kirjoita KOKO tavua yhteen tulostiedostoon\n" +" -C, --line-bytes=KOKO kirjoita KOKO tavua rivejä yhteen tulostiedostoon\n" +" -d, --numeric-suffixes käytä numeerisia jälkiliitteitä kirjaimien sijaan\n" +" -l, --lines=MÄÄRÄ kirjoita MÄÄRÄ riviä yhteen tulostiedostoon\n" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9433,201 +9539,206 @@ msgstr "" " --verbose näytä ilmoitus juuri ennen kunkin\n" " tulostiedoston avaamista\n" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, fuzzy, c-format msgid "output file suffixes exhausted" -msgstr "Tulostiedostojen jälkiliitteet käytetty loppuun" +msgstr "tulostiedosto" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "luodaan tiedostoa %s\n" -#: src/split.c:374 -#, c-format +#: src/split.c:428 +#, fuzzy, c-format msgid "%s would overwrite input; aborting" -msgstr "" +msgstr "%s: tuloste ylikirjoittaisi tiedoston %s\n" -#: src/split.c:390 +#: src/split.c:444 #, fuzzy, c-format msgid "failed to set FILE environment variable" -msgstr "tiedoston %s ryhmän vaihtaminen arvoon %s epäonnistui\n" +msgstr "DJGPP-ympäristömuuttuja viittaa puuttuvaan tiedostoon ”%s”" -#: src/split.c:392 -#, c-format +#: src/split.c:446 +#, fuzzy, c-format msgid "executing with FILE=%s\n" -msgstr "" +msgstr "luodaan tiedostoa %s\n" -#: src/split.c:394 -#, fuzzy, c-format +#: src/split.c:448 +#, c-format msgid "failed to create pipe" -msgstr "tiedoston %s avaaminen epäonnistui" +msgstr "putken luominen epäonnistui" -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" -msgstr "suljetaan hakemisto %s" +msgstr "(putki)" -#: src/split.c:410 -#, fuzzy, c-format +#: src/split.c:464 +#, c-format msgid "closing output pipe" -msgstr "suljetaan tulostiedosto %s" +msgstr "suljetaan tulosteputki" -#: src/split.c:414 -#, fuzzy, c-format +#: src/split.c:468 +#, c-format msgid "moving input pipe" -msgstr "suljetaan syötetiedosto %s" +msgstr "siirretään syöteputki" -#: src/split.c:416 -#, fuzzy, c-format +#: src/split.c:470 +#, c-format msgid "closing input pipe" -msgstr "suljetaan syötetiedosto %s" +msgstr "suljetaan syöteputki" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" -msgstr "komentoa %s ei voi ajaa" +msgstr "Ohjelman nscd ajaminen käyttäjän ”%s” oikeuksilla epäonnistui" -#: src/split.c:427 -#, fuzzy, c-format +#: src/split.c:481 +#, c-format msgid "failed to close input pipe" -msgstr "hakemiston %s sulkeminen epäonnistui" +msgstr "syöteputken sulkeminen epäonnistui" -#: src/split.c:463 -#, fuzzy, c-format +#: src/split.c:517 +#, c-format msgid "waiting for child process" -msgstr "odotettaessa strip-ohjelman päättymistä" +msgstr "odotetaan lapsiprosessia" -#: src/split.c:473 -#, c-format +#: src/split.c:527 +#, fuzzy, c-format msgid "with FILE=%s, signal %s from command: %s" -msgstr "" +msgstr "date-komennon vastaus = %s\n" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "voidaan jakaa vain yhdellä tavalla" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" -msgstr "%s: virheellinen sekuntimäärä" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" +msgstr "%s: virheellinen luku" -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: virheellinen luku" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: virheellinen jälkiliitteen pituus" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: virheellinen tavumäärä" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: virheellinen rivimäärä" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "monimerkkinen sarkain %s" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "merkkierikoistiedosto" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "rivimäärävalitsin -%s%c... on liian suuri" -#: src/split.c:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "virheellinen aloitusrivin numero: %s" -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" -msgstr "%s: virheellinen tiedostokoko" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" +msgstr "virheellinen sarkainkoko: %s" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, fuzzy, c-format msgid "%s: cannot determine file size" -msgstr "järjestelmän konenimen määritys ei onnistu" +msgstr "tiedostonimeä ei voi määrittää" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, fuzzy, c-format msgid "failed to canonicalize %s" -msgstr "tiedoston %s avaaminen epäonnistui" +msgstr "%s epäonnistui" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "varoitus: tunnistamaton suojaus ”\\%c”" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: säännös ei kelpaa" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "varoitus: kenoviiva muotoilun lopussa" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "tiedostojärjestelmän tietojen lukeminen tiedostolle %s ei onnistu" -#: src/stat.c:1290 +#: src/stat.c:1293 #, fuzzy, c-format msgid "cannot stat standard input" -msgstr "suljetaan vakiosyöte" +msgstr "vakiosyötettä ei voi käyttää molempina tiedostoina" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' with --file-system, and NOT from printf. -#: src/stat.c:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9638,7 +9749,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9646,30 +9757,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, fuzzy, c-format msgid "Context: %C\n" msgstr "virheelliset oikeudet: %s" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9677,11 +9788,14 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 +#, fuzzy msgid "Display file or file system status.\n" msgstr "" +"Näytä class-tiedoston sisältö luettavassa muodossa.\n" +"\n" -#: src/stat.c:1418 +#: src/stat.c:1421 #, fuzzy msgid "" " -L, --dereference follow links\n" @@ -9693,7 +9807,7 @@ msgstr "" " -f, --file-system näytä tiedostojärjestelmän tila tiedoston tilan " "sijaan\n" -#: src/stat.c:1422 +#: src/stat.c:1425 #, fuzzy msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" @@ -9711,7 +9825,7 @@ msgstr "" " Rivinvaihdon saa lisäämällä MUOTOon merkintä \\n. " "-t, --terse tulosta tiedot lyhyessä muodossa\n" -#: src/stat.c:1433 +#: src/stat.c:1436 #, fuzzy msgid "" "\n" @@ -9731,7 +9845,7 @@ msgstr "" " %b Varattujen lohkojen määrä (katso myös %B)\n" " %B Kunkin ”%b”:n ilmoittaman lohkon koko tavuina\n" -#: src/stat.c:1442 +#: src/stat.c:1445 #, fuzzy msgid "" " %d device number in decimal\n" @@ -9748,7 +9862,7 @@ msgstr "" " %G Omistajan ryhmän nimi\n" " %g Omistajan ryhmä-ID\n" -#: src/stat.c:1450 +#: src/stat.c:1453 #, fuzzy msgid "" " %h number of hard links\n" @@ -9771,7 +9885,7 @@ msgstr "" " %t Major-laitetyyppi heksadesimaalimuodossa\n" " %T Minor-laitetyyppi heksadesimaalimuodossa\n" -#: src/stat.c:1461 +#: src/stat.c:1464 #, fuzzy msgid "" " %u user ID of owner\n" @@ -9796,7 +9910,7 @@ msgstr "" " %Z Viimeisen ominaisuusmuutoksen ajankohta sekunteina vuoden epookista\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -9815,7 +9929,7 @@ msgstr "" " %d Tiedostojärjestelmän vapaiden tiedostosolmujen määrä\n" " %f Tiedostojärjestelmän vapaiden lohkojen määrä\n" -#: src/stat.c:1484 +#: src/stat.c:1487 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -9835,9 +9949,9 @@ msgstr "" " %T Tyyppi helppolukuisessa muodossa\n" #: src/stdbuf.c:90 -#, fuzzy, c-format +#, c-format msgid "Usage: %s OPTION... COMMAND\n" -msgstr "Käyttö: %s [VALITSIN]...\n" +msgstr "Käyttö: %s VALITSIN... KOMENTO\n" #: src/stdbuf.c:91 msgid "" @@ -9882,8 +9996,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -9891,7 +10004,7 @@ msgstr "" #: src/stdbuf.c:241 #, fuzzy, c-format msgid "failed to find %s" -msgstr "tiedoston %s avaaminen epäonnistui" +msgstr "%s epäonnistui" #: src/stdbuf.c:265 src/stdbuf.c:299 #, fuzzy, c-format @@ -9908,7 +10021,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "tiedoston %s ryhmän vaihtaminen arvoon %s epäonnistui\n" -#: src/stty.c:516 +#: src/stty.c:524 #, fuzzy, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9919,11 +10032,11 @@ msgstr "" " tai: %s [-F LAITE] [--file=LAITE] [-a|--all]\n" " tai: %s [-F LAITE] [--file=LAITE] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 #, fuzzy msgid "" " -a, --all print all current settings in human-readable form\n" @@ -9938,7 +10051,7 @@ msgstr "" " -F, --file=LAITE avaa ja ota käyttöön määrätty LAITE vakiosyötteen " "sijaan\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9948,11 +10061,24 @@ msgstr "" "Valinnainen ”-” ennen ASETUSta tarkoittaa vastakohtaa. Ei-POSIX-asetukset\n" "on merkitty *:lla. Käytettävissä olevat asetukset riippuvat alustasta.\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -9962,9 +10088,13 @@ msgstr "" " eof MERKKI MERKKI lähettää tiedostonlopetuksen (syöte päättyy)\n" " eol MERKKI MERKKI päättää rivin\n" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -9974,36 +10104,58 @@ msgstr "" " intr MERKKI MERKKI lähettää keskeytyssignaalin\n" " kill MERKKI MERKKI pyyhkii käsillä olevan rivin\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" msgstr "" -" * lnext MERKKI MERKKI syöttää seuraavan merkin lainattuna\n" -" quit MERKKI MERKKI lähettää lopetussignaalin\n" -" * rprnt MERKKI MERKKI uudistaa käsillä olevan rivin\n" -" start MERKKI MERKKI käynnistää tulosteen uudelleen pysäytettyään sen\n" -#: src/stty.c:559 +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 MERKKI MERKKI pysäyttää tulosteen\n" " susp MERKKI MERKKI lähettää pysäytyssignaalin\n" " * swtch MERKKI MERKKI vaihtaa toiselle kuoren tasolle\n" " * werase MERKKI MERKKI pyyhkii viimeisimmän kirjoitetun sanan\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 #, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Erityisasetukset:\n" +" N aseta syöte- ja tulostenopeuksiksi N baudia\n" +" * cols N kerro ytimelle, että päätteen leveys on N merkkiä\n" +" * columns N kuten cols N\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -10013,10 +10165,17 @@ msgstr "" " * cols N kerro ytimelle, että päätteen leveys on N merkkiä\n" " * columns N kuten cols N\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -10026,11 +10185,22 @@ msgstr "" " min N kun myös -icanon, aseta valmiin luvun merkkiminimiksi N\n" " ospeed N aseta tulostenopeudeksi N\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N kerro ytimelle, että päätteellä on N riviä\n" +" * size näytä ytimeltä saadut rivi- ja sarakemäärät\n" +" speed näytä päätteen nopeus\n" +" time N kun myös -icanon, aseta luvun aikarajaksi N " +"kymmenesosasekuntia\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -10040,25 +10210,27 @@ msgstr "" " time N kun myös -icanon, aseta luvun aikarajaksi N " "kymmenesosasekuntia\n" -#: src/stty.c:584 -#, fuzzy +#: src/stty.c:641 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" -"Ohjausasetukset:\n" -" [-]clocal poista modeemin ohjaussignaalit käytöstä\n" -" [-]cread salli syötteen vastaanotto\n" -" * [-]crtscts ota RTS/CTS-kättely käyttöön\n" -" csN aseta merkkikooksi N bittiä, N välillä [5..8]\n" -#: src/stty.c:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -10067,7 +10239,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb käytä kahta pysäytysbittiä per merkki (”-”:lla yksi)\n" " [-]hup lähetä sulkusignaali kun viimeinen prosessi sulkee tty:n\n" @@ -10076,7 +10247,12 @@ msgstr "" "syötteessä\n" " [-]parodd aseta pariton pariteetti (myös ”-”:lla)\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -10084,6 +10260,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Syöteasetukset:\n" @@ -10092,10 +10269,14 @@ msgstr "" " [-]ignbrk jätä katkosmerkit huomiotta\n" " [-]igncr jätä vaununpalautus huomiotta\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -10106,14 +10287,23 @@ msgstr "" " [-]inpck ota syötteen pariteettitarkistus käyttöön\n" " [-]istrip poista ylin (8:s) bitti syötteen merkeistä\n" -#: src/stty.c:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 oleta syötemerkit UTF-8-koodatuiksi\n" -#: src/stty.c:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr " * [-]iutf8 oleta syötemerkit UTF-8-koodatuiksi\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -10126,60 +10316,83 @@ msgstr "" " [-]parmrk merkitse pariteettivirheet (255-0-merkkisarjalla)\n" " [-]tandem kuten [-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Tulosteasetukset:\n" -" * bsN askelpalauttimen viivetyyli, N välillä [0..1]\n" -" * crN vaununpalautuksen viivetyyli, N välillä [0..3]\n" -" * ffN arkinsyötön viivetyyli, N välillä [0..1]\n" -" * nlN rivinvaihdon viivetyyli, N välillä [0..1]\n" -#: src/stty.c:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" msgstr "" -" * [-]ocrnl muunna vaununpalautus rivinvaihdoksi\n" -" * [-]ofdel käytä poistomerkkejä täyttöön tyhjien merkkien sijaan\n" -" * [-]ofill käytä täyttömerkkejä ajastuksen sijaan viivästyksille\n" -" * [-]olcuc muunna pienet kirjaimet isoiksi\n" -" * [-]onlcr muunna rivinvaihto vaununpalautus-rivinvaihdoksi\n" -" * [-]onlret rivinvaihto suorittaa vaununpalautuksen\n" -#: src/stty.c:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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 "" -" * [-]onocr ei tulosteta vaununpalautuksia ensimmäiseen sarakkeeseen\n" -" [-]opost jälkikäsittele tuloste\n" -" * tabN vaakasarkaimen viivetyyli, N välillä [0..3]\n" -" * tabs sama kuin tab0\n" -" * -tabs sama kuin tab3\n" -" * vtN pystysarkaimen viivetyyli, N välillä [0..1]\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10190,46 +10403,55 @@ 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 #, fuzzy +msgid " [-]echo echo input characters\n" +msgstr " * [-]iutf8 oleta syötemerkit UTF-8-koodatuiksi\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]ctlecho toista kontrollimerkit hattumuodossa (`^c')\n" -" [-]echo toista syötetyt merkit\n" -" * [-]echoctl sama kuin [-]ctlecho\n" -" [-]echoe sama kuin [-]crterase\n" -" [-]echok toista rivinvaihto hävitysmerkin jälkeen\n" -#: src/stty.c:665 -#, fuzzy +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]echoke sama kuin [-]crtkill\n" -" [-]echonl toista rivinvaihto vaikka muita merkkejä ei toistettaisi\n" -" * [-]echoprt toista pyyhityt merkit takaperin, ”\\” ja ”/” -merkkien " -"välissä\n" -" [-]icanon ota erase, kill, werase, ja rprnt -erikoismerkit käyttöön\n" -" [-]iexten ota ei-POSIX-erikoismerkit käyttöön\n" -#: src/stty.c:672 +#: src/stty.c:843 #, fuzzy 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 "" " [-]isig ota interrupt-, quit- ja suspend-erikoismerkit käyttöön\n" " [-]noflsh poista käytöstä interrupt- ja quit-erikoismerkkien " @@ -10238,11 +10460,33 @@ 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:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -10252,49 +10496,59 @@ msgstr "" " cbreak sama kuin -icanon\n" " -cbreak sama kuin icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 sama kuin brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof ja eol -merkit oletusarvoihinsa\n" " -cooked sama kuin raw\n" " crt sama kuin echoe echoctl echoke\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s 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 "" -" dec sama kuin echoe echoctl echoke -ixany intr ^c erase 0177\n" -" kill ^u\n" -" * [-]decctlq sama kuin [-]ixany\n" -" ek erase ja kill -merkit oletusarvoihinsa\n" -" evenp sama kuin parenb -parodd cs7\n" -#: src/stty.c:699 +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 msgid "" +" ek erase and kill characters to their default values\n" +" evenp same as parenb -parodd cs7\n" " -evenp same as -parenb cs8\n" -" * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 +msgid "" " 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 "" -" -evenp sama kuin -parenb cs8\n" -" * [-]lcase sama kuin xcase iuclc olcuc\n" -" litout sama kuin -parenb -istrip -opost cs8\n" -" -litout sama kuin parenb istrip opost cs7\n" -" nl sama kuin -icrnl -onlcr\n" -" -nl sama kuin icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr " -g kuten -l, mutta älä näytä omistajia\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10308,11 +10562,12 @@ msgstr "" " pass8 sama kuin -parenb -istrip cs8\n" " -pass8 sama kuin parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw sama kuin -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" @@ -10320,15 +10575,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw sama kuin cooked\n" -#: src/stty.c:720 -#, fuzzy +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane sama kuin cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10337,7 +10592,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, kaikki\n" " erikoismerkit oletusarvoihinsa.\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10352,12 +10607,12 @@ msgstr "" "0x37, 0177 tai 127; erikoisarvoja ”^-” ja ”undef” käytetään kun halutaan\n" "erikoismerkit pois käytöstä.\n" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "vain yhden laitteen voi määritellä" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10366,45 +10621,50 @@ msgstr "" "valitsimet verbose ja stty-readable -tulostetyyleille\n" "ovat toisensa poissulkevat" -#: src/stty.c:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: ei-estävän tilan uudelleenasetus ei onnistunut" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "virheellinen argumentti %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "%s vaatii argumentin" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: virhe typistettäessä" + +#: src/stty.c:1331 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "virheellinen rivileveys: %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: kaikkia pyydettyjä toimenpiteitä ei voida suorittaa" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: ei kokotietoja tälle laitteelle" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "kokonaislukuargumentti %s ei kelpaa" #. This is a proper name. See the gettext manual, section Names. @@ -10414,8 +10674,14 @@ msgstr "Kayvan Aghaiepour" #: src/sum.c:62 #, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Näytä kunkin TIEDOSTOn CRC-tarkistussumma ja tavumäärä.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -10425,20 +10691,54 @@ msgstr "" " -r kumoa -s, käytä BSD-summa-algoritmia ja 1k-lohkoja\n" " -s, --sysv käytä System V -summa-algoritmia ja 512-tavuisia lohkoja\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Käyttö: %s [VALITSIN] [TIEDOSTO]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Pakota muuttuneet lohkot levylle, päivitä superlohko.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "virhe luettaessa tiedostoa %s" -#: src/sync.c:69 +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: ei-estävän tilan uudelleenasetus ei onnistunut" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "virhe luettaessa tiedostoa %s" + +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "jätetään kaikki argumentit huomiotta" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10451,23 +10751,31 @@ msgstr "" "joka yleensä korvaa korvaa tässä kuvatun version. Kuoren tukemista\n" "ominaisuuksista saa lisää tietoa kuoren dokumentaatiosta.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help näytä tämä ohje ja poistu\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version tulosta versiotiedot ja poistu\n" -#: src/system.h:543 -#, fuzzy +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" +"\n" "Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10475,7 +10783,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10484,33 +10792,38 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, fuzzy, c-format msgid "" "\n" "%s online help: <%s>\n" -msgstr "Käyttö: %s\n" +msgstr "Kokeile ”%s --help” tai ”%s --usage” saadaksesi lisää tietoa.\n" #. TRANSLATORS: Replace LANG_CODE in this URL with your language code #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -#: src/system.h:591 +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" -msgstr "Lisätietoja komennolla ”%s --help”.\n" +msgstr "Kokeile ”%s --help” tai ”%s --usage” saadaksesi lisää tietoa.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10532,9 +10845,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "Tulosta kukin TIEDOSTO vakiotulosteeseen, viimeinen rivi ensimmäisenä.\n" "Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" @@ -10550,70 +10861,69 @@ msgstr "" " -r, --regex tulkitse erotin säännöllisenä lausekkeena\n" " -s, --separator=MERKKIJ käytä MERKKIJonoa erottimena rivinvaihdon sijaan\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: siirtyminen epäonnistui" -#: src/tac.c:263 -#, fuzzy, c-format +#: src/tac.c:277 +#, c-format msgid "record too large" -msgstr "%s: tiedosto on liian suuri" +msgstr "tietue on liian suuri" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" -msgstr "väliaikaistiedoston %s luominen ei onnistu" +msgstr "tilapäistiedostoa ei voi luoda: %s" -#: src/tac.c:458 -#, fuzzy, c-format +#: src/tac.c:467 +#, c-format msgid "failed to open %s for writing" -msgstr "%s: avaaminen kirjoitustilassa epäonnistui" +msgstr "ei voitu avata kohdetta %s kirjoittamista varten" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" -msgstr "tiedoston %s aikojen säilyttäminen ei onnistu" +msgstr "%s: taaksepäin siirtyminen ei onnistu" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: kirjoitusvirhe" -#: src/tac.c:571 -#, fuzzy, c-format +#: src/tac.c:587 +#, c-format msgid "failed to open %s for reading" -msgstr "tiedostoa %s ei voi avata lukemista varten" +msgstr "ei voitu avata kohdetta %s lukemista varten" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "erotin ei voi olla tyhjä" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 +#: src/tail.c:257 #, 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" 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:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 #, fuzzy msgid "" " -f, --follow[={name|descriptor}]\n" @@ -10627,7 +10937,7 @@ msgstr "" "asia\n" " -F sama kuin --follow=name --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10648,7 +10958,7 @@ msgstr "" " poistettu (tämä on yleistä syrjäytettyjen\n" " lokitiedostojen kanssa)\n" -#: src/tail.c:293 +#: src/tail.c:288 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -10663,7 +10973,7 @@ msgstr "" " (oletus 1,0) toistojen välissä.\n" " -v, --verbose tulosta aina tiedostonimen sisältävät otsakkeet\n" -#: src/tail.c:298 +#: src/tail.c:293 #, fuzzy msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" @@ -10680,7 +10990,7 @@ msgstr "" " (oletus 1,0) toistojen välissä.\n" " -v, --verbose tulosta aina tiedostonimen sisältävät otsakkeet\n" -#: src/tail.c:307 +#: src/tail.c:302 #, fuzzy msgid "" "\n" @@ -10699,7 +11009,7 @@ msgstr "" "b 512, k 1024, m 1024².\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -10715,22 +11025,22 @@ msgstr "" "seurattavan nimisen tiedoston uudelleen säännöllisesti tarkistaakseen,\n" "onko jokin toinen ohjelma poistanut ja luonut sen uudelleen.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "suljetaan %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: siirtyminen siirtymään %s suhteessa loppuun ei onnistu" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -10738,20 +11048,20 @@ msgid "" msgstr "" # Joo, untailable on vähän hankala sana. -#: src/tail.c:965 +#: src/tail.c:958 #, fuzzy, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" "%s on korvattu seuraamiskelvottamalla tiedostolla; luovutaan tämän tiedoston " "seuraamisesta" -#: src/tail.c:980 +#: src/tail.c:973 #, 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:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" @@ -10759,140 +11069,140 @@ msgstr "" "seuraamisesta" # Joo, untailable on vähän hankala sana. -#: src/tail.c:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s on nyt käytettävissä" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s on ilmaantunut; seurataan uuden tiedoston loppua" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s on korvattu; seurataan uuden tiedoston loppua" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: ei-estävän tilan muuttaminen ei onnistu" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: tiedosto typistynyt" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "tiedostoja ei ole jäljellä" -#: src/tail.c:1424 +#: src/tail.c:1440 #, fuzzy, c-format msgid "cannot watch parent directory of %s" -msgstr "nykyisen hakemiston (%s) tilaa ei voi lukea" +msgstr "hakemiston %s luominen ei onnistu" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, fuzzy, c-format msgid "inotify resources exhausted" -msgstr "Tulostiedostojen jälkiliitteet käytetty loppuun" +msgstr "Virtaresurssit lopussa" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, fuzzy, c-format msgid "cannot watch %s" -msgstr "tiedostoa %s ei voi koskettaa" +msgstr "tiedostoa %s ei voi siirtää kohteeseen %s" + +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: korvataanko tiedosto %s? " -#: src/tail.c:1529 +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1597 #, fuzzy, c-format msgid "error reading inotify event" msgstr "virhe luettaessa tiedostoa %s" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: tämän tyyppisen tiedoston loppua ei voi seurata; luovutaan tämän " "tiedoston seuraamisesta" -#: src/tail.c:1961 -#, fuzzy, c-format -msgid "number in %s is too large" -msgstr "kenttänumero %s on liian suuri" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "" "%s: virheellinen avausten välinen muuttumattomien tilan lukemisten " "enimmäismäärä" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: virheellinen PID" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: virheellinen sekuntimäärä" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "virheellinen sarakemäärä: %s" -#: src/tail.c:2084 -#, c-format +#: src/tail.c:2123 +#, fuzzy, c-format msgid "option used in invalid context -- %c" -msgstr "" +msgstr "virheellinen valitsin – %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, fuzzy, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" "warning: ei huomioida PID:tä; --pid=PID on käyttökelpoinen vain seurattaessa" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" "warning: ei huomioida PID:tä; --pid=PID on käyttökelpoinen vain seurattaessa" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "varoitus: --pid=PID ei ole tuettu tässä järjestelmässä" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "tiedostoa %s ei voi seurata nimen perusteella" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "varoitus: vakiosyötteen seuraaminen ikuisesti on tehotonta" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -10904,62 +11214,72 @@ msgstr "" " -a, --append lisää TIEDOSTOjen perään, älä korvaa\n" " -i, --ignore-interrupts jätä keskeytyssignaalit huomiotta\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Jos TIEDOSTO on -, kopioidaan vakiotulosteeseen.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "%s vaatii argumentin" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "virheellinen kokonaisluku %s" -#: src/test.c:241 -#, fuzzy +#: src/test.c:243 msgid "')' expected" -msgstr "”)” oli odotus\n" +msgstr "”)” oli odotus" -#: src/test.c:244 -#, fuzzy, c-format +#: src/test.c:246 +#, c-format msgid "')' expected, found %s" -msgstr "”)” oli odotus, saatiin %s\n" +msgstr "”)” oli odotus, löytyi %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: odotettiin unaarista operaattoria" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt ei hyväksy -l -lauseketta" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef ei hyväksy -l -lauseketta" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot ei hyväksy -l -lauseketta" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "tuntematon binäärioperaattori" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: odotettiin binääristä operaattoria" -#: src/test.c:704 -#, fuzzy +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -10968,12 +11288,12 @@ msgid "" " or: [ OPTION\n" msgstr "" "Käyttö: test LAUSEKE\n" +" tai: test\n" " tai: [ LAUSEKE ]\n" +" tai: [ ]\n" " tai: [ VALITSIN\n" -"Poistu LAUSEKKEen määräämällä poistumiskoodilla.\n" -"\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -10981,7 +11301,7 @@ msgstr "" "Poistu tilakoodilla, jonka LAUSEKE määrittelee.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 #, fuzzy msgid "" "\n" @@ -10991,7 +11311,7 @@ msgstr "" "\n" "LAUSEKE on tosi tai epätosi ja asettaa tilakoodin. Se on jokin seuraavista:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11005,7 +11325,7 @@ msgstr "" " LAUSEKE1 -a LAUSEKE2 sekä LAUSEKE1 että LAUSEKE2 ovat tosia\n" " LAUSEKE1 -o LAUSEKE2 joko LAUSEKE1 tai LAUSEKE2 on tosi\n" -#: src/test.c:729 +#: src/test.c:731 #, fuzzy msgid "" "\n" @@ -11021,7 +11341,7 @@ msgstr "" " MERKKIJONO1 = MERKKIJONO2 merkkijonot ovat yhteneväiset\n" " MERKKIJONO1 != MERKKIJONO2 merkkijonot eivät ole yhteneväiset\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11041,7 +11361,7 @@ msgstr "" " KOK.LUKU1 -lt KOK.LUKU2 KOK.LUKU1 on pienempi kuin KOK.LUKU2\n" " KOK.LUKU1 -ne KOK.LUKU2 KOK.LUKU1 on erisuuri kuin KOK.LUKU2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11054,7 +11374,7 @@ msgstr "" "TIEDOSTO2\n" " TIEDOSTO1 -ot TIEDOSTO2 TIEDOSTO1 on vanhempi kuin TIEDOSTO2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11068,7 +11388,7 @@ msgstr "" " -d TIEDOSTO TIEDOSTO on olemassa ja on hakemisto\n" " -e TIEDOSTO TIEDOSTO on olemassa\n" -#: src/test.c:759 +#: src/test.c:761 #, fuzzy msgid "" " -f FILE FILE exists and is a regular file\n" @@ -11085,7 +11405,7 @@ msgstr "" "omistuksessa\n" " -k TIEDOSTO TIEDOSTO on olemassa ja sen ”sticky bit” on päällä\n" -#: src/test.c:766 +#: src/test.c:768 #, fuzzy msgid "" " -L FILE FILE exists and is a symbolic link (same as -h)\n" @@ -11102,7 +11422,7 @@ msgstr "" " -r TIEDOSTO TIEDOSTO on olemassa ja luettavissa\n" " -s TIEDOSTO TIEDOSTO on olemassa ja kooltaan suurempi kuin nolla\n" -#: src/test.c:773 +#: src/test.c:775 #, fuzzy msgid "" " -S FILE FILE exists and is a socket\n" @@ -11118,7 +11438,7 @@ msgstr "" " -w TIEDOSTO TIEDOSTO on olemassa ja kirjoitettavissa\n" " -x TIEDOSTO TIEDOSTO on olemassa ja ajettavissa\n" -#: src/test.c:780 +#: src/test.c:782 #, fuzzy msgid "" "\n" @@ -11132,33 +11452,33 @@ msgstr "" "KOKONAISLUKU voi olla myös -l MERKKIJONO, joka laventuu MERKKIJONOn " "pituudeksi.\n" -#: src/test.c:786 +#: src/test.c:788 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 +#: src/test.c:793 +#, fuzzy msgid "test and/or [" -msgstr "" +msgstr "Järjestelmäkelloa ei aseteta, koska käytetään testitilaa.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 -#, fuzzy +#: src/test.c:860 msgid "missing ']'" msgstr "puuttuva ”]”" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "ylimääräinen argumentti %s" @@ -11166,19 +11486,19 @@ msgstr "ylimääräinen argumentti %s" #: src/timeout.c:112 #, c-format msgid "warning: sigprocmask" -msgstr "" +msgstr "varoitus: sigprocmask" #: src/timeout.c:146 #, c-format msgid "warning: timer_settime" -msgstr "" +msgstr "varoitus: timer_settime" #: src/timeout.c:151 #, c-format msgid "warning: timer_create" -msgstr "" +msgstr "varoitus: timer_create" -#: src/timeout.c:228 +#: src/timeout.c:230 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11187,13 +11507,13 @@ msgstr "" "Käyttö: %s KÄYTTÄJÄNIMI KOMENTO [ARGUMENTTI]...\n" " tai: %s VALITSIN\n" -#: src/timeout.c:232 +#: src/timeout.c:234 #, fuzzy msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" "Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11211,7 +11531,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11219,7 +11539,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -11230,21 +11550,26 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" #: src/timeout.c:474 -#, fuzzy, c-format +#, c-format msgid "error waiting for command" -msgstr "virhe kirjoitettaessa tiedostoa %s" +msgstr "virhe odotettaessa komentoa" #: src/timeout.c:485 #, c-format msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -11328,7 +11653,6 @@ msgstr "" " muuta aikaa mtime (sama kuin -m)\n" #: src/touch.c:246 -#, fuzzy msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" @@ -11343,11 +11667,11 @@ msgid "cannot specify times from more than one source" msgstr "aika voidaan määrittää vain yhdestä lähteestä" #: src/touch.c:409 -#, fuzzy, c-format +#, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" msgstr "" -"varoitus: ”touch %s” on vanhentunut; käytä komentoa ”touch -t %04ld%02d%02d" +"varoitus: ”touch %s” on vanhentunut; käytä komentoa ”'touch -t %04ld%02d%02d" "%02d%02d.%02d”" #: src/tr.c:286 @@ -11489,12 +11813,12 @@ msgid "invalid repeat count %s in [c*n] construct" msgstr "virheellinen toistomäärä %s [c*n]-rakenteessa" #: src/tr.c:910 -#, fuzzy, c-format +#, c-format msgid "missing character class name '[::]'" -msgstr "puuttuva merkkiluokan nimi ”[::]”" +msgstr "puuttuva merkkiluokan nimi '[::]'" #: src/tr.c:913 -#, fuzzy, c-format +#, c-format msgid "missing equivalence class character '[==]'" msgstr "puuttuva yhtäläisyysluokan merkki ”[==]”" @@ -11516,7 +11840,7 @@ msgstr "väärin aseteltu [:upper:]- ja/tai [:lower:]-rakenne" #: src/tr.c:1335 #, fuzzy, c-format msgid "too many characters in set" -msgstr "outo merkki kenttämäärityksessä" +msgstr "%s: liian monta arvoa" #: src/tr.c:1420 #, c-format @@ -11569,20 +11893,19 @@ msgid "the [c*] construct may appear in string2 only when translating" msgstr "rakenne [c*] saa esiintyä merkkijono2:ssa vain muunnettaessa" #: src/tr.c:1788 -#, fuzzy msgid "Two strings must be given when both deleting and squeezing repeats." msgstr "" -"poistettaessa ja puristettaessa toistoja on annettava kaksi merkkijonoa" +"Sekä poistettaessa että puristettaessa toistoja on annettava kaksi " +"merkkijonoa." #: src/tr.c:1790 -#, fuzzy msgid "Two strings must be given when translating." -msgstr "vaihdettaessa on annettava kaksi merkkijonoa" +msgstr "Vaihdettaessa on annettava kaksi merkkijonoa" #: src/tr.c:1800 -#, fuzzy msgid "Only one string may be given when deleting without squeezing repeats." -msgstr "poistettaessa toistoja puristamatta voidaan antaa vain yksi merkkijono" +msgstr "" +"Poistettaessa puristamatta toistoja voidaan antaa vain yksi merkkijono." #: src/true.c:38 #, c-format @@ -11601,12 +11924,12 @@ msgstr "" msgid "Exit with a status code indicating failure." msgstr "" -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Käyttö: %s VALITSIN... TIEDOSTO...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -11617,23 +11940,23 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 #, fuzzy msgid " -c, --no-create do not create any files\n" msgstr "kohdehakemisto ei ole sallittu asennettaessa hakemistoa" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11641,57 +11964,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: tiedoston koko on negatiivinen" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, fuzzy, c-format msgid "cannot get the size of %s" -msgstr "ajan haku ei onnistu" +msgstr "laitteen %s kokoa ei voi hakea" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:215 -#, c-format +#: src/truncate.c:188 +#, fuzzy, c-format msgid "overflow extending size of file %s" -msgstr "" +msgstr "%s: virheellinen tiedostokoko" -#: src/truncate.c:230 +#: src/truncate.c:203 #, fuzzy, c-format msgid "failed to truncate %s at % bytes" msgstr "edetään %s tavun yli tulostiedostossa %s" -#: src/truncate.c:303 +#: src/truncate.c:276 #, fuzzy, c-format msgid "multiple relative modifiers specified" -msgstr "useita tulostiedostoja annettu" +msgstr "useita tulostusmuotoja annettu" + +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "virheellinen määrä %s" -#: src/truncate.c:333 +#: src/truncate.c:307 #, fuzzy, c-format msgid "you must specify either %s or %s" -msgstr "tiedoston %s ryhmän vaihtaminen arvoon %s epäonnistui\n" +msgstr "muodostaaksesi riippuvuudet sinun täytyy antaa joko -M tai -MM" -#: src/truncate.c:340 +#: src/truncate.c:314 #, fuzzy, c-format msgid "you must specify a relative %s with %s" -msgstr "tiedoston %s ryhmän vaihtaminen arvoon %s epäonnistui\n" +msgstr "mount: et antanut tyyppiä tiedostojärjestelmälle %s\n" -#: src/truncate.c:347 -#, c-format +#: src/truncate.c:321 +#, fuzzy, c-format msgid "%s was specified but %s was not" -msgstr "" +msgstr "%s: useita signaaleja annettu" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "tiedostoa %s ei voi avata kirjoitusta varten" @@ -11702,12 +12030,10 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Käyttö: %s [VALITSIN] [TIEDOSTO]\n" "Kirjoita täysin järjestetty luettelo, joka on yhtäpitävä TIEDOSTOssa olevan\n" @@ -11716,12 +12042,17 @@ msgstr "" "vakiosyötettä.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: syöte sisältää parittoman määrän symboleja" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: syöte sisältää silmukan:" @@ -11787,9 +12118,7 @@ msgstr "järjestelmän nimen haku ei onnistu" #: 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "Muunna kunkin TIEDOSTOn sisältämät välilyönnit sarkaimiksi, kirjoittaen\n" "vakiotulosteeseen. Jos TIEDOSTOa ei anneta tai se on ”-”, luetaan " @@ -11816,7 +12145,7 @@ msgstr "" #: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" -msgstr "" +msgstr "sarkaimet ovat liian kaukana toisistaan" #: src/unexpand.c:504 #, fuzzy, c-format @@ -11847,8 +12176,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -11859,7 +12188,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -11896,7 +12225,7 @@ msgstr "" #: src/uniq.c:428 #, fuzzy, c-format msgid "too many repeated lines" -msgstr "liian monta argumenttia" +msgstr "%s: liian monta tarkistussummariviä" #: src/uniq.c:604 msgid "invalid number of fields to skip" @@ -11974,9 +12303,9 @@ msgstr[0] "käynnissä %ld vrk %2d:%02d, " msgstr[1] "käynnissä %ld vrk %2d:%02d, " #: src/uptime.c:149 -#, fuzzy, c-format +#, c-format msgid "up %2d:%02d, " -msgstr "käynnissä %ld vrk %2d:%02d, " +msgstr "käynnissä %2d:%02d, " #: src/uptime.c:151 #, c-format @@ -12008,11 +12337,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -12033,13 +12357,17 @@ msgstr "" "Oletustiedosto on %s. %s on yleinen TIEDOSTOna.\n" "\n" -#: src/wc.c:117 -#, fuzzy +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -12053,13 +12381,13 @@ msgstr "" " -m, --chars näytä merkkimäärät\n" " -l, --lines näytä rivimäärät\n" -#: src/wc.c:128 +#: src/wc.c:134 #, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " -L, --max-line-length näytä pisimmän rivin pituus\n" @@ -12070,9 +12398,8 @@ msgid " old " msgstr "kauan" #: src/who.c:440 -#, fuzzy msgid "system boot" -msgstr "Järjestelmävirhe" +msgstr "järjestelmän käynnistys" #: src/who.c:447 src/who.c:449 msgid "id=" @@ -12089,7 +12416,7 @@ msgstr "pois=" #: src/who.c:485 #, fuzzy msgid "LOGIN" -msgstr "YHTEYS" +msgstr "Tunnus" #: src/who.c:505 msgid "clock change" @@ -12224,9 +12551,9 @@ msgstr "" "Sama kuin id -un.\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" msgstr "%s: käyttäjä-ID:tä %lu vastaavaa nimeä ei löydy\n" #: src/yes.c:41 @@ -12248,129 +12575,250 @@ msgstr "" "jos merkkijonoja ei anneta.\n" "\n" +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "%s epäonnistui" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: virheellinen luku" + +#, fuzzy #~ msgid "" #~ "\n" -#~ "Examples:\n" -#~ " %s /usr/bin/sort Output \"sort\".\n" -#~ " %s include/stdio.h .h Output \"stdio\".\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 "" #~ "\n" -#~ "Esimerkkejä:\n" -#~ " %s /usr/bin/sort Tuloste: ”sort”.\n" -#~ " %s include/stdio.h .h Tuloste: ”stdio”.\n" +#~ "%s-signaalin saadessaan ajossa oleva ”dd”-ohjelma tulostaa \n" +#~ "I/O-tilastot vakiovirhetulosteeseen ja jatkaa sitten kopiointia.\n" +#~ "\n" +#~ " $ dd if=/dev/zero of=/dev/null& pid=$!\n" +#~ " $ kill -%s $pid; sleep 1; kill $pid\n" +#~ " 18335302+0 tietuetta sisään\n" +#~ " 18335302+0 tietuetta ulos\n" +#~ " 9387674624 tavua (9,4 GB) kopioitu 34,6279 sekunnissa, 271 MB/s\n" +#~ "\n" +#~ "Valitsimet ovat:\n" +#~ "\n" -#~ msgid "%s" -#~ msgstr "%s" +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s on liian suuri esitettäväksi" + +#~ msgid "number of lines" +#~ msgstr "rivimäärä" + +#~ msgid "number of bytes" +#~ msgstr "tavumäärä" + +#, fuzzy +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: virheellinen luku" +#, 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" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" #~ msgstr "" -#~ "Muuta kunkin TIEDOSTOn ryhmäksi RYHMÄ.\n" -#~ "Jos valitsin --reference on annettu, vaihda kunkin TIEDOSTOn ryhmäksi " -#~ "samat\n" -#~ "kuin VTIEDostolla.\n" #~ "\n" -#~ " -c, --changes kuten monisanaisuus, mutta ilmoitetaan vain " -#~ "tehdyt\n" -#~ " muutokset\n" -#~ " --dereference muuta symbolisen linkin kohdetta, ei linkkiä\n" -#~ " itseään (tämä on oletustoiminta)\n" +#~ "Valitsin -l nn sisältää valitsimen -T, jos nn <= 10 tai <= 3, jos -F " +#~ "käytössä.\n" +#~ "Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" -# Onko rekursiivisuudelle suomenkielisempää sanaa? +#, fuzzy #~ msgid "" -#~ " -f, --silent, --quiet suppress most error messages\n" -#~ " --reference=RFILE use RFILE's group rather than specifying a\n" -#~ " GROUP value\n" -#~ " -R, --recursive operate on files and directories recursively\n" -#~ " -v, --verbose output a diagnostic for every file processed\n" #~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" #~ msgstr "" -#~ " -f, --silent, --quiet vaienna useimmat virheilmoitukset\n" -#~ " --reference=VTIED käytä VTIEDoston ryhmää RYHMÄ-arvon antamisen\n" -#~ " sijaan\n" -#~ " -R, --recursive käsittele tiedostot ja hakemistot " -#~ "rekursiivisesti\n" -#~ " -v, --verbose näytä ilmoitus jokaisesta käsitellystä " -#~ "tiedostosta\n" +#~ "\n" +#~ "Jos TIEDOSTOa ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: virheellinen tavumäärä" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: virheellinen rivimäärä" #~ msgid "" -#~ "Change the mode of each FILE to MODE.\n" +#~ " * 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 MERKKI MERKKI syöttää seuraavan merkin lainattuna\n" +#~ " quit MERKKI MERKKI lähettää lopetussignaalin\n" +#~ " * rprnt MERKKI MERKKI uudistaa käsillä olevan rivin\n" +#~ " start MERKKI MERKKI käynnistää tulosteen uudelleen pysäytettyään " +#~ "sen\n" + +#, fuzzy +#~ msgid "" #~ "\n" -#~ " -c, --changes like verbose but report only when a change is " -#~ "made\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 "" -#~ "Vaihda kunkin TIEDOSTOn oikeuksiksi OIKEUDET.\n" #~ "\n" -#~ " -c, --changes kuten monisanaisuus, mutta ilmoita vain tehdyt\n" -#~ " muutokset\n" +#~ "Ohjausasetukset:\n" +#~ " [-]clocal poista modeemin ohjaussignaalit käytöstä\n" +#~ " [-]cread salli syötteen vastaanotto\n" +#~ " * [-]crtscts ota RTS/CTS-kättely käyttöön\n" +#~ " csN aseta merkkikooksi N bittiä, N välillä [5..8]\n" #~ msgid "" -#~ " --no-preserve-root do not treat `/' specially (the default)\n" -#~ " --preserve-root fail to operate recursively on `/'\n" +#~ "\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 "" -#~ " --no-preserve-root älä kohtele juurta (”/”) erityisesti (oletus)\n" -#~ " --preserve-root estä rekursiivinen toiminta juuressa (”/”)\n" +#~ "\n" +#~ "Tulosteasetukset:\n" +#~ " * bsN askelpalauttimen viivetyyli, N välillä [0..1]\n" +#~ " * crN vaununpalautuksen viivetyyli, N välillä [0..3]\n" +#~ " * ffN arkinsyötön viivetyyli, N välillä [0..1]\n" +#~ " * nlN rivinvaihdon viivetyyli, N välillä [0..1]\n" +#, fuzzy #~ msgid "" -#~ " -f, --silent, --quiet suppress most error messages\n" -#~ " -v, --verbose output a diagnostic for every file processed\n" -#~ " --reference=RFILE use RFILE's mode instead of MODE values\n" -#~ " -R, --recursive change files and directories recursively\n" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" #~ msgstr "" -#~ " -f, --silent, --quiet vaienna useimmat virheilmoitukset\n" -#~ " -v, --verbose näytä ilmoitus jokaisesta käsitellystä " -#~ "tiedostosta\n" -#~ " --reference=VTIED käytä VTIEDoston ryhmää annetun RYHMÄ-arvon " -#~ "sijaan\n" -#~ " -R, --recursive toimi rekursiivisesti\n" +#~ " * [-]ocrnl muunna vaununpalautus rivinvaihdoksi\n" +#~ " * [-]ofdel käytä poistomerkkejä täyttöön tyhjien merkkien sijaan\n" +#~ " * [-]ofill käytä täyttömerkkejä ajastuksen sijaan viivästyksille\n" +#~ " * [-]olcuc muunna pienet kirjaimet isoiksi\n" +#~ " * [-]onlcr muunna rivinvaihto vaununpalautus-rivinvaihdoksi\n" +#~ " * [-]onlret rivinvaihto suorittaa vaununpalautuksen\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" +#~ " * [-]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 "" -#~ "Vaihda kunkin TIEDOSTOn omistajaksi ja/tai ryhmäksi OMISTAJA ja/tai " -#~ "RYHMÄ.\n" -#~ "Jos valitsin --reference on annettu, vaihda kunkin TIEDOSTOn omistajaksi\n" -#~ "ja ryhmäksi samat kuin VTIEDostolla.\n" -#~ "\n" -#~ " -c, --changes kuin monisanaisuus, mutta ilmoita vain tehdyt\n" -#~ " muutokset\n" -#~ " --dereference muuta symbolisen linkin kohdetta, ei linkkiä\n" -#~ " itseään (tämä on oletustoimintatapa)\n" +#~ " * [-]onocr ei tulosteta vaununpalautuksia ensimmäiseen " +#~ "sarakkeeseen\n" +#~ " [-]opost jälkikäsittele tuloste\n" +#~ " * tabN vaakasarkaimen viivetyyli, N välillä [0..3]\n" +#~ " * tabs sama kuin tab0\n" +#~ " * -tabs sama kuin tab3\n" +#~ " * vtN pystysarkaimen viivetyyli, N välillä [0..1]\n" +#, fuzzy #~ msgid "" -#~ " -f, --silent, --quiet suppress most error messages\n" -#~ " --reference=RFILE use RFILE's owner and group rather than\n" -#~ " specifying OWNER:GROUP values\n" -#~ " -R, --recursive operate on files and directories recursively\n" -#~ " -v, --verbose output a diagnostic for every file processed\n" +#~ " * [-]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 "" +#~ " * [-]ctlecho toista kontrollimerkit hattumuodossa (`^c')\n" +#~ " [-]echo toista syötetyt merkit\n" +#~ " * [-]echoctl sama kuin [-]ctlecho\n" +#~ " [-]echoe sama kuin [-]crterase\n" +#~ " [-]echok toista rivinvaihto hävitysmerkin jälkeen\n" + +#, fuzzy +#~ 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 "" +#~ " * [-]echoke sama kuin [-]crtkill\n" +#~ " [-]echonl toista rivinvaihto vaikka muita merkkejä ei " +#~ "toistettaisi\n" +#~ " * [-]echoprt toista pyyhityt merkit takaperin, ”\\” ja ”/” -merkkien " +#~ "välissä\n" +#~ " [-]icanon ota erase, kill, werase, ja rprnt -erikoismerkit " +#~ "käyttöön\n" +#~ " [-]iexten ota ei-POSIX-erikoismerkit käyttöön\n" + +#~ 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 "" +#~ " dec sama kuin echoe echoctl echoke -ixany intr ^c erase " +#~ "0177\n" +#~ " kill ^u\n" +#~ " * [-]decctlq sama kuin [-]ixany\n" +#~ " ek erase ja kill -merkit oletusarvoihinsa\n" +#~ " evenp sama kuin parenb -parodd cs7\n" + +#~ 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 "" +#~ " -evenp sama kuin -parenb cs8\n" +#~ " * [-]lcase sama kuin xcase iuclc olcuc\n" +#~ " litout sama kuin -parenb -istrip -opost cs8\n" +#~ " -litout sama kuin parenb istrip opost cs7\n" +#~ " nl sama kuin -icrnl -onlcr\n" +#~ " -nl sama kuin icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" #~ "\n" #~ msgstr "" -#~ " -f, --silent, --quiet vaienna useimmat virheilmoitukset\n" -#~ " --reference=VTIED käytä VTIEDoston omistajaa ja ryhmää\n" -#~ " OMISTAJA:RYHMÄ-arvojen antamisen sijaan\n" -#~ " -R, --recursive käsittele tiedostot ja hakemistot " -#~ "rekursiivisesti\n" -#~ " -v, --verbose näytä ilmoitus jokaisesta käsitellystä " -#~ "tiedostosta\n" +#~ "Pakota muuttuneet lohkot levylle, päivitä superlohko.\n" #~ "\n" +#~ msgid "ignoring all arguments" +#~ msgstr "jätetään kaikki argumentit huomiotta" + +#~ msgid "number in %s is too large" +#~ msgstr "lukumäärä %s on liian suuri" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: virheellinen sekuntimäärä" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: käyttäjä-ID:tä %lu vastaavaa nimeä ei löydy\n" + +#~ msgid "cannot create pipe" +#~ msgstr "putkea ei voi luoda" + +#, fuzzy +#~ msgid "%s subprocess failed" +#~ msgstr "%s: siirtyminen epäonnistui" + +#, fuzzy +#~ msgid "_open_osfhandle failed" +#~ msgstr "avaaminen epäonnistui" + #, fuzzy #~ msgid "failed to set additional groups" #~ msgstr "lisäryhmän asetus ei onnistu" @@ -12381,107 +12829,206 @@ msgstr "" #~ "vakiovirhetulosteen kopion asettaminen sulkeutumaan käynnistettäessä " #~ "epäonnistui" -#~ msgid "reading %s" -#~ msgstr "luettaessa tiedostoa %s" +#~ msgid "warning: " +#~ msgstr "varoitus: " -#~ msgid "writing %s" -#~ msgstr "kirjoitettaessa tiedostoa %s" +#~ msgid "%s: cannot lseek back to original position" +#~ msgstr "%s: siirtyminen takaisin alkuperäiseen siirtymään ei onnistu" #, fuzzy -#~ msgid "truncating %s" -#~ msgstr "luodaan %s" +#~ msgid "%s: failed to reset file pointer" +#~ msgstr "%s: poisto epäonnistui" -#~ msgid "closing %s" -#~ msgstr "suljettaessa tiedostoa %s" +#~ msgid "cannot reposition file pointer for %s" +#~ msgstr "tiedosto-osoitinta ei voi siirtää tiedostossa %s" -#~ msgid "cannot create link %s" -#~ msgstr "linkkiä %s ei voi luoda" +#~ msgid "Usage: %s [OPTION]... [USERNAME]\n" +#~ msgstr "Käyttö: %s [VALITSIN]... [KÄYTTÄJÄTUNNUS]\n" -#~ msgid "accessing %s" -#~ msgstr "käytetään tiedostoa %s" +#, fuzzy +#~ msgid "failed to redirect stderr to /dev/null" +#~ msgstr "vakiovirhetulosteen uudelleenohjaus epäonnistui" -#~ msgid "invalid format precision" -#~ msgstr "virheellinen muodon tarkkuus" +#, fuzzy +#~ msgid "invalid number: '%s'" +#~ msgstr "virheellinen määrä %s" + +#, fuzzy +#~ msgid "--padding cannot be combined with --format" +#~ msgstr "signaalin yhdistäminen valitsimen -l tai -t kanssa ei onnistu" +#, 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" +#~ "With no FILE or if FILE is -, read Standard Input. '-F /' by default.\n" #~ msgstr "" -#~ "Näytä tämänhetkinen aika annetulla MUOTOILUlla, tai aseta järjestelmän " -#~ "aika.\n" #~ "\n" -#~ " -d, --date=MJONO näytä MJONOn määräämä aika ”now”:n sijaan\n" -#~ " -f, --file=PVMTIED kuten --date, kerran kullekin PVMTIEDoston " -#~ "riville\n" +#~ "Jos TIEDOSTOA ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" +#~ "Oletus on ”-F /”.\n" -#~ msgid "opening %s" -#~ msgstr "tiedoston %s avaaminen" +#, fuzzy +#~ msgid "cannot remove directory: %s" +#~ msgstr "hakemiston %s poistaminen ei onnistu" +#, fuzzy #~ msgid "" -#~ "Usage: %s NAME\n" -#~ " or: %s OPTION\n" +#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n" +#~ " or: %s LONG-OPTION\n" #~ msgstr "" -#~ "Käyttö: %s NIMI\n" +#~ "Käyttö: %s KÄYTTÄJÄNIMI KOMENTO [ARGUMENTTI]...\n" #~ " tai: %s VALITSIN\n" +#, fuzzy #~ msgid "" +#~ "Drop any supplemental groups, assume the user-ID and group-ID of the " +#~ "specified\n" +#~ "USER (numeric ID or user name), and run COMMAND with any specified " +#~ "ARGUMENTs.\n" +#~ "Exit with status 111 if unable to assume the required user and group ID.\n" +#~ "Otherwise, exit with the exit status of COMMAND.\n" +#~ "This program is useful only when run by root (user ID zero).\n" #~ "\n" -#~ "Examples:\n" -#~ " %s /usr/bin/sort Output \"/usr/bin\".\n" -#~ " %s stdio.h Output \".\".\n" #~ msgstr "" +#~ "Poista käytöstä mahdolliset lisäryhmät, aseta käyttäjä- ja ryhmä-ID\n" +#~ "annetun KÄYTTÄJÄNIMEn perusteella, ja suorita KOMENTO annetuilla\n" +#~ "ARGUMENTeilla. Poistu paluuarvolla 111, jos käyttäjä- ja ryhmä-ID:n\n" +#~ "asetus ei onnistu. Muussa tapauksessa poistutaan KOMENNOn paluuarvolla.\n" +#~ "Tämä ohjelma on käyttökelpoinen vain pääkäyttäjän (käyttäjä-ID 0)\n" +#~ "suorittamana.\n" #~ "\n" -#~ "Esimerkkejä:\n" -#~ " %s /usr/bin/sort Tuloste: ”/usr/bin”.\n" -#~ " %s stdio.h Tuloste: ”.”.\n" + +#~ msgid "unknown user-ID: %s" +#~ msgstr "tuntematon käyttäjä-ID: %s" + +#, fuzzy +#~ msgid "cannot set group-ID to %lu" +#~ msgstr "ryhmä-ID:n asetus arvoon %ld ei onnistu" + +#, fuzzy +#~ msgid "cannot set user-ID to %lu" +#~ msgstr "käyttäjä-ID:n asetus arvoon %ld ei onnistu" + +#~ msgid "dup2 failed" +#~ msgstr "dup2 epäonnistui" #~ msgid "" -#~ " -B, --block-size=SIZE use SIZE-byte blocks\n" -#~ " -b, --bytes equivalent to `--apparent-size --block-size=1'\n" -#~ " -c, --total produce a grand total\n" -#~ " -D, --dereference-args dereference only symlinks that are listed on " -#~ "the\n" -#~ " command line\n" +#~ "\n" +#~ "Report %s bugs to %s\n" #~ msgstr "" -#~ " -B, --block-size=KOKO käytä KOKO-tavuisia lohkoja\n" -#~ " -b, --bytes sama kuin ”--apparent-size --block-size=1”\n" -#~ " -c, --total näytä myös kokonaismäärä\n" -#~ " -D, --dereference-args laske mukaan vain komentorivillä annettujen\n" -#~ " symlinkkien kohteiden koot\n" +#~ "\n" +#~ "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen %s\n" -#~ msgid "%s: cannot lseek back to original position" -#~ msgstr "%s: siirtyminen takaisin alkuperäiseen siirtymään ei onnistu" +#, fuzzy +#~ msgid "warning: --retry is useful mainly when following by name" +#~ msgstr "varoitus: --retry toimii vain seurattaessa nimen perusteella" -#~ msgid "cannot reposition file pointer for %s" -#~ msgstr "tiedosto-osoitinta ei voi siirtää tiedostossa %s" +#, fuzzy +#~ msgid "" +#~ " -D, --all-repeated[=delimit-method] print all duplicate lines\n" +#~ " delimit-method={none(default),prepend,separate}\n" +#~ " Delimiting is done with blank lines\n" +#~ " -f, --skip-fields=N avoid comparing the first N fields\n" +#~ " -i, --ignore-case ignore differences in case when comparing\n" +#~ " -s, --skip-chars=N avoid comparing the first N characters\n" +#~ " -u, --unique only print unique lines\n" +#~ " -z, --zero-terminated end lines with 0 byte, not newline\n" +#~ msgstr "" +#~ " -D, --all-repeated[=erotustapa] tulosta kaikki vähintään kahteen " +#~ "kertaan\n" +#~ " esiintyvät rivit\n" +#~ " erotustapa={none(oletus),prepend,separate}\n" +#~ " Erotus tehdään tyhjillä riveillä.\n" +#~ " -f, --skip-fields=N älä vertaa N:ää ensimmäistä kenttää\n" +#~ " -i, --ignore-case älä huomioi kirjainkokoa vertaillessa\n" +#~ " -s, --skip-chars=N älä vertaa N:ää ensimmäistä merkkiä\n" +#~ " -u, --unique tulosta vain ainutkertaiset rivit\n" -#~ msgid "Usage: %s [OPTION]... [USERNAME]\n" -#~ msgstr "Käyttö: %s [VALITSIN]... [KÄYTTÄJÄTUNNUS]\n" +#, fuzzy +#~ msgid " returning value: '%s'\n" +#~ msgstr "luodaan tiedostoa %s\n" + +#, fuzzy +#~ msgid "Usage: %s [OPTIONS] [NUMBER]\n" +#~ msgstr "Käyttö: %s [VALITSIN] NIMI...\n" #, fuzzy +#~ msgid "no valid suffix found\n" +#~ msgstr "%s: virheellinen jälkiliitteen pituus" + #~ msgid "" -#~ "WARNING: --preserve_context is deprecated; use --preserve-context instead" +#~ "\n" +#~ "Examples:\n" +#~ " %s /usr/bin/sort Output \"sort\".\n" +#~ " %s include/stdio.h .h Output \"stdio\".\n" #~ msgstr "" -#~ "valitsin --reply ei ole suositeltava; käytä valitsinta -i tai -f sen " -#~ "sijaan" +#~ "\n" +#~ "Esimerkkejä:\n" +#~ " %s /usr/bin/sort Tuloste: ”sort”.\n" +#~ " %s include/stdio.h .h Tuloste: ”stdio”.\n" -#~ msgid "creating symbolic link %s" -#~ msgstr "luotaessa symbolista linkkiä %s" +#~ msgid "reading %s" +#~ msgstr "luettaessa tiedostoa %s" -#~ msgid "creating symbolic link %s -> %s" -#~ msgstr "luotaessa symbolista linkkiä %s -> %s" +#~ msgid "writing %s" +#~ msgstr "kirjoitettaessa tiedostoa %s" -#~ msgid "creating hard link %s" -#~ msgstr "luotaessa kovaa linkkiä %s" +#~ msgid "closing %s" +#~ msgstr "suljettaessa tiedostoa %s" -#~ msgid "creating hard link %s => %s" -#~ msgstr "luotaessa kovaa linkkiä %s → %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 "failed to redirect stderr to /dev/null" -#~ msgstr "vakiovirhetulosteen uudelleenohjaus epäonnistui" +#~ 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 "" @@ -12494,13 +13041,6 @@ msgstr "" #~ msgstr "" #~ "Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n" -#~ msgid "" -#~ " -A, --address-radix=RADIX decide how file offsets are printed\n" -#~ " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" -#~ msgstr "" -#~ " -A, --address-radix=KANTA päätä miten tiedostosiirtymät tulostetaan\n" -#~ " -j, --skip-bytes=MÄÄRÄ ohita aluksi MÄÄRÄ syötetavua\n" - #, fuzzy #~ msgid "" #~ "\n" @@ -12531,86 +13071,9 @@ msgstr "" #~ "--string ilman lukuarvoa on 3. --width ilman lukuarvoa on 32.\n" #~ "Oletuksena od käyttää -A o -t d2 -w 16.\n" -#~ msgid "" -#~ "\n" -#~ "With no FILE or if FILE is -, read Standard Input. `-F /' by default.\n" -#~ msgstr "" -#~ "\n" -#~ "Jos TIEDOSTOA ei ole annettu, tai se on ”-”, luetaan vakiosyötettä.\n" -#~ "Oletus on ”-F /”.\n" - #~ msgid "Usage: %s [OPTION]... FILE\n" #~ msgstr "Käyttö: %s [VALITSIN]... TIEDOSTO\n" -#, fuzzy -#~ msgid "cannot remove directory: %s" -#~ msgstr "hakemiston %s poistaminen ei onnistu" - -#, fuzzy -#~ msgid "" -#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n" -#~ " or: %s LONG-OPTION\n" -#~ msgstr "" -#~ "Käyttö: %s KÄYTTÄJÄNIMI KOMENTO [ARGUMENTTI]...\n" -#~ " tai: %s VALITSIN\n" - -#, fuzzy -#~ msgid "" -#~ "Drop any supplemental groups, assume the user-ID and group-ID of the " -#~ "specified\n" -#~ "USER (numeric ID or user name), and run COMMAND with any specified " -#~ "ARGUMENTs.\n" -#~ "Exit with status 111 if unable to assume the required user and group ID.\n" -#~ "Otherwise, exit with the exit status of COMMAND.\n" -#~ "This program is useful only when run by root (user ID zero).\n" -#~ "\n" -#~ msgstr "" -#~ "Poista käytöstä mahdolliset lisäryhmät, aseta käyttäjä- ja ryhmä-ID\n" -#~ "annetun KÄYTTÄJÄNIMEn perusteella, ja suorita KOMENTO annetuilla\n" -#~ "ARGUMENTeilla. Poistu paluuarvolla 111, jos käyttäjä- ja ryhmä-ID:n\n" -#~ "asetus ei onnistu. Muussa tapauksessa poistutaan KOMENNOn paluuarvolla.\n" -#~ "Tämä ohjelma on käyttökelpoinen vain pääkäyttäjän (käyttäjä-ID 0)\n" -#~ "suorittamana.\n" -#~ "\n" - -#~ msgid "unknown user-ID: %s" -#~ msgstr "tuntematon käyttäjä-ID: %s" - -#, fuzzy -#~ msgid "cannot set group-ID to %lu" -#~ msgstr "ryhmä-ID:n asetus arvoon %ld ei onnistu" - -#, fuzzy -#~ msgid "cannot set user-ID to %lu" -#~ msgstr "käyttäjä-ID:n asetus arvoon %ld ei onnistu" - -#, fuzzy -#~ msgid "extra operand %s\n" -#~ msgstr "ylimääräinen operandi %s" - -#~ msgid "dup2 failed" -#~ msgstr "dup2 epäonnistui" - -#~ msgid "" -#~ " -a, --suffix-length=N use suffixes of length N (default %d)\n" -#~ " -b, --bytes=SIZE put SIZE bytes per output file\n" -#~ " -C, --line-bytes=SIZE put at most SIZE bytes of lines per output " -#~ "file\n" -#~ " -d, --numeric-suffixes use numeric suffixes instead of alphabetic\n" -#~ " -l, --lines=NUMBER put NUMBER lines per output file\n" -#~ msgstr "" -#~ " -a, --suffix-length=N käytä N merkin pituisia jälkiliitteitä (oletus " -#~ "%d)\n" -#~ " -b, --bytes=KOKO kirjoita KOKO tavua yhteen tulostiedostoon\n" -#~ " -C, --line-bytes=KOKO kirjoita KOKO tavua rivejä yhteen " -#~ "tulostiedostoon\n" -#~ " -d, --numeric-suffixes käytä numeerisia jälkiliitteitä kirjaimien " -#~ "sijaan\n" -#~ " -l, --lines=MÄÄRÄ kirjoita MÄÄRÄ riviä yhteen tulostiedostoon\n" - -#~ msgid "invalid number of lines: 0" -#~ msgstr "virheellinen rivimäärä: 0" - #~ msgid "Password:" #~ msgstr "Salasana:" @@ -12623,6 +13086,9 @@ msgstr "" #~ msgid "cannot set group id" #~ msgstr "ryhmän id:n asetus ei onnistu" +#~ msgid "cannot set user id" +#~ msgstr "tunnuksen id:n asetus ei onnistu" + #~ msgid "Usage: %s [OPTION]... [-] [USER [ARG]...]\n" #~ msgstr "Käyttö: %s [VALITSIN]... [-] [TUNNUS [ARG]...]\n" @@ -12670,59 +13136,172 @@ msgstr "" #, fuzzy #~ msgid "" +#~ "Change the group of each FILE to GROUP.\n" +#~ "With --reference, change the group of each FILE to that of RFILE.\n" #~ "\n" -#~ "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" +#~ " -c, --changes like verbose but report only when a change is " +#~ "made\n" +#~ " -f, --silent, --quiet suppress most error messages\n" +#~ " -v, --verbose output a diagnostic for every file processed\n" #~ msgstr "" +#~ "Muuta kunkin TIEDOSTOn ryhmäksi RYHMÄ.\n" +#~ "Jos valitsin --reference on annettu, vaihda kunkin TIEDOSTOn ryhmäksi " +#~ "samat\n" +#~ "kuin VTIEDostolla.\n" #~ "\n" -#~ "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" +#~ " -c, --changes kuten monisanaisuus, mutta ilmoitetaan vain " +#~ "tehdyt\n" +#~ " muutokset\n" +#~ " --dereference muuta symbolisen linkin kohdetta, ei linkkiä\n" +#~ " itseään (tämä on oletustoiminta)\n" -#, 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? +#~ 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" -#~ "Report %s bugs to %s\n" #~ msgstr "" +#~ " -f, --silent, --quiet vaienna useimmat virheilmoitukset\n" +#~ " --reference=VTIED käytä VTIEDoston ryhmää RYHMÄ-arvon antamisen\n" +#~ " sijaan\n" +#~ " -R, --recursive käsittele tiedostot ja hakemistot " +#~ "rekursiivisesti\n" +#~ " -v, --verbose näytä ilmoitus jokaisesta käsitellystä " +#~ "tiedostosta\n" + +#~ msgid "" +#~ "Change the mode of each FILE to MODE.\n" #~ "\n" -#~ "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen\n" -#~ "<%s>.\n" +#~ " -c, --changes like verbose but report only when a change is " +#~ "made\n" +#~ msgstr "" +#~ "Vaihda kunkin TIEDOSTOn oikeuksiksi OIKEUDET.\n" +#~ "\n" +#~ " -c, --changes kuten monisanaisuus, mutta ilmoita vain tehdyt\n" +#~ " muutokset\n" -#, fuzzy -#~ msgid "warning: --retry is useful mainly when following by name" -#~ msgstr "varoitus: --retry toimii vain seurattaessa nimen perusteella" +#~ msgid "" +#~ " -f, --silent, --quiet suppress most error messages\n" +#~ " -v, --verbose output a diagnostic for every file processed\n" +#~ " --reference=RFILE use RFILE's mode instead of MODE values\n" +#~ " -R, --recursive change files and directories recursively\n" +#~ msgstr "" +#~ " -f, --silent, --quiet vaienna useimmat virheilmoitukset\n" +#~ " -v, --verbose näytä ilmoitus jokaisesta käsitellystä " +#~ "tiedostosta\n" +#~ " --reference=VTIED käytä VTIEDoston ryhmää annetun RYHMÄ-arvon " +#~ "sijaan\n" +#~ " -R, --recursive toimi rekursiivisesti\n" -#, fuzzy -#~ msgid "warning: the --%s option is obsolete; use --reference" -#~ msgstr "valitsin \"-%s\" on vanhentunut; käytä \"-l %s\"" +#~ msgid "" +#~ "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n" +#~ "With --reference, change the owner and group of each FILE to those of " +#~ "RFILE.\n" +#~ "\n" +#~ " -c, --changes like verbose but report only when a change is " +#~ "made\n" +#~ " --dereference affect the referent of each symbolic link (this " +#~ "is\n" +#~ " the default), rather than the symbolic link " +#~ "itself\n" +#~ msgstr "" +#~ "Vaihda kunkin TIEDOSTOn omistajaksi ja/tai ryhmäksi OMISTAJA ja/tai " +#~ "RYHMÄ.\n" +#~ "Jos valitsin --reference on annettu, vaihda kunkin TIEDOSTOn omistajaksi\n" +#~ "ja ryhmäksi samat kuin VTIEDostolla.\n" +#~ "\n" +#~ " -c, --changes kuin monisanaisuus, mutta ilmoita vain tehdyt\n" +#~ " muutokset\n" +#~ " --dereference muuta symbolisen linkin kohdetta, ei linkkiä\n" +#~ " itseään (tämä on oletustoimintatapa)\n" + +#~ msgid "" +#~ " -f, --silent, --quiet suppress most error messages\n" +#~ " --reference=RFILE use RFILE's owner and group rather than\n" +#~ " specifying OWNER:GROUP values\n" +#~ " -R, --recursive operate on files and directories recursively\n" +#~ " -v, --verbose output a diagnostic for every file processed\n" +#~ "\n" +#~ msgstr "" +#~ " -f, --silent, --quiet vaienna useimmat virheilmoitukset\n" +#~ " --reference=VTIED käytä VTIEDoston omistajaa ja ryhmää\n" +#~ " OMISTAJA:RYHMÄ-arvojen antamisen sijaan\n" +#~ " -R, --recursive käsittele tiedostot ja hakemistot " +#~ "rekursiivisesti\n" +#~ " -v, --verbose näytä ilmoitus jokaisesta käsitellystä " +#~ "tiedostosta\n" +#~ "\n" #, fuzzy #~ msgid "" #~ "\n" -#~ "Note that the -r and -s options are mutually exclusive.\n" -#~ msgstr "valitsimet --string ja --check ovat toisensa poissulkevia" +#~ "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" +#~ "KOKO voi olla (tai voi olla kokonaisluku, jota seuraa) yksi seuraavista:\n" +#~ "kB 1000, K 1024, MB 1000², M 1024², sekä samoin G, T, P, E, Z, Y.\n" + +#~ msgid "%s" +#~ msgstr "%s" + +#, fuzzy +#~ msgid "truncating %s" +#~ msgstr "luodaan %s" + +#~ msgid "cannot create link %s" +#~ msgstr "linkkiä %s ei voi luoda" + +#~ msgid "invalid format precision" +#~ msgstr "virheellinen muodon tarkkuus" #, fuzzy #~ msgid "" -#~ " -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" +#~ "WARNING: --preserve_context is deprecated; use --preserve-context instead" #~ msgstr "" -#~ " -D, --all-repeated[=erotustapa] tulosta kaikki vähintään kahteen " -#~ "kertaan\n" -#~ " esiintyvät rivit\n" -#~ " erotustapa={none(oletus),prepend,separate}\n" -#~ " Erotus tehdään tyhjillä riveillä.\n" -#~ " -f, --skip-fields=N älä vertaa N:ää ensimmäistä kenttää\n" -#~ " -i, --ignore-case älä huomioi kirjainkokoa vertaillessa\n" -#~ " -s, --skip-chars=N älä vertaa N:ää ensimmäistä merkkiä\n" -#~ " -u, --unique tulosta vain ainutkertaiset rivit\n" +#~ "valitsin --reply ei ole suositeltava; käytä valitsinta -i tai -f sen " +#~ "sijaan" + +#~ msgid "creating symbolic link %s" +#~ msgstr "luotaessa symbolista linkkiä %s" + +#~ msgid "creating symbolic link %s -> %s" +#~ msgstr "luotaessa symbolista linkkiä %s -> %s" + +#~ msgid "creating hard link %s" +#~ msgstr "luotaessa kovaa linkkiä %s" + +#~ msgid "creating hard link %s => %s" +#~ msgstr "luotaessa kovaa linkkiä %s → %s" + +#, fuzzy +#~ msgid "extra operand %s\n" +#~ msgstr "ylimääräinen operandi %s" + +#~ msgid "invalid number of lines: 0" +#~ msgstr "virheellinen rivimäärä: 0" + +#, fuzzy +#~ msgid "warning: the --%s option is obsolete; use --reference" +#~ msgstr "valitsin \"-%s\" on vanhentunut; käytä \"-l %s\"" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Note that the -r and -s options are mutually exclusive.\n" +#~ msgstr "valitsimet --string ja --check ovat toisensa poissulkevia" # Pitäisikö --:n olla oikea Unicode-ajatusviiva (m-viiva)? # Tai suomeen paremmin sopiva n-viiva. @@ -13085,9 +13664,6 @@ msgstr "" #~ 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" - #~ msgid "Usage: %s [OPTION] DIRECTORY...\n" #~ msgstr "Käyttö: %s [VALITSIN] HAKEMISTO...\n" @@ -13307,633 +13883,3 @@ msgstr "" #~ "WARNING: % of % computed checksum did NOT matchWARNING: " #~ "% of % computed checksums did NOT match" #~ msgstr "VAROITUS: %1$d %3$s %2$d tarkistetusta EI täsmännyt" - -# Tämä tulee varmasti vastaan monessa ohjelmassa, voisi sopia -# jonkun tietyn suomennoksen sille, ja käyttää sitä sitten aina. -#~ msgid "" -#~ "This is free software; see the source for copying conditions. There is " -#~ "NO\n" -#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " -#~ "PURPOSE.\n" -#~ msgstr "" -#~ "Tämä on vapaa ohjelmisto; katsokaa kopiointiehdot lähdekoodista. Takuuta " -#~ "EI OLE;\n" -#~ "ei edes KAUPALLISESTI HYVÄKSYTTÄVÄSTÄ LAADUSTA tai SOPIVUUDESTA TIETTYYN\n" -#~ "TARKOITUKSEEN.\n" - -#~ msgid "too few arguments" -#~ msgstr "liian vähän argumentteja" - -#~ msgid "closing standard output" -#~ msgstr "suljetaan vakiotuloste" - -#~ msgid "cannot change to null group" -#~ msgstr "ryhmän nimi ei voi olla tyhjä" - -#~ msgid "group number" -#~ msgstr "ryhmänumero" - -#~ msgid "invalid group number %s" -#~ msgstr "virheellinen ryhmänumero %s" - -#~ msgid "" -#~ "\n" -#~ "Each MODE is one or more of the letters ugoa, one of the symbols +-= and\n" -#~ "one or more of the letters rwxXstugo.\n" -#~ msgstr "" -#~ "\n" -#~ "Kukin OIKEUDET-argumentti koostuu yhdestä tai useammasta kirjaimista " -#~ "ugoa,\n" -#~ "yhdestä symboleista +-= ja yhdestä tai useammasta kirjaimista rwxXstugo.\n" - -#~ msgid "invalid mode string: %s" -#~ msgstr "virheellinen oikeusmerkkijono: %s" - -#~ msgid "cannot overwrite directory %s" -#~ msgstr "hakemistoa %s ei voi korvata" - -#~ msgid "%s: specified destination directory does not exist" -#~ msgstr "%s: annettu kohdehakemisto ei ole olemassa" - -#~ msgid "%s: specified target is not a directory" -#~ msgstr "%s: annettu kohde ei ole hakemisto" - -#~ msgid "copying multiple files, but last argument %s is not a directory" -#~ msgstr "" -#~ "kopioidaan useita tiedostoja, mutta viimeinen argumentti %s ei ole " -#~ "hakemisto" - -#~ msgid "" -#~ "warning: --version-control (-V) is obsolete; support for it\n" -#~ "will be removed in some future release. Use --backup=%s instead." -#~ msgstr "" -#~ "varoitus: --version-control (-V) on vanhentunut; sen tuki poistetaan\n" -#~ "jossakin tulevassa julkaisussa. Käytä sen sijaan --backup=%s." - -#~ msgid "" -#~ " %F same as %Y-%m-%d\n" -#~ " %g the 2-digit year corresponding to the %V week number\n" -#~ " %G the 4-digit year corresponding to the %V week number\n" -#~ msgstr "" -#~ " %F sama kuin %Y-%m-%d\n" -#~ " %g kaksinumeroinen vuosiluku, joka vastaa %V-viikkonumeroa\n" -#~ " %G nelinumeroinen vuosiluku, joka vastaa %V-viikkonumeroa\n" - -#~ msgid "" -#~ " %z RFC-2822 style numeric timezone (-0500) (a nonstandard extension)\n" -#~ " %Z time zone (e.g., EDT), or nothing if no time zone is determinable\n" -#~ "\n" -#~ "By default, date pads numeric fields with zeroes. GNU date recognizes\n" -#~ "the following modifiers between `%' and a numeric directive.\n" -#~ "\n" -#~ " `-' (hyphen) do not pad the field\n" -#~ " `_' (underscore) pad the field with spaces\n" -#~ msgstr "" -#~ " %z RFC-822-tyylinen numeerinen aikavyöhyke (-0500) (epästandardi " -#~ "laajennos)\n" -#~ " %Z aikavyöhyke (esim. EET), tai tyhjä, jos aikavyöhykettä ei voida " -#~ "määrittää\n" -#~ "\n" -#~ "Oletuksena date täyttää numeeriset kentät etunollilla. GNU date " -#~ "tunnistaa\n" -#~ "seuraavat määreet \"%\"-merkin ja numeerisen ohjaimen välillä.\n" -#~ "\n" -#~ " \"-\" (yhdysviiva) älä täytä kenttää\n" -#~ " \"_\" (alaviiva) täytä kenttä välilyönneillä\n" - -#~ msgid "too many non-option arguments: %s%s" -#~ msgstr "liikaa argumentteja, jotka eivät ole valitsimia: %s%s" - -#~ msgid "" -#~ "a format string may not be specified when using the --rfc-2822 (-R) option" -#~ msgstr "" -#~ "muotoilumerkkijonoa ei saa käyttää yhdessä valitsimen --rfc-822 (-R) " -#~ "kanssa" - -#~ msgid "undefined" -#~ msgstr "määrittelemätön" - -#~ msgid "%s+%s records in\n" -#~ msgstr "%s+%s tietuetta sisään\n" - -#~ msgid "%s+%s records out\n" -#~ msgstr "%s+%s tietuetta ulos\n" - -#~ msgid "truncated records" -#~ msgstr "typistettyä tietuetta" - -#~ msgid "" -#~ "\tonly one conv in {ascii,ebcdic,ibm}, {lcase,ucase}, {block,unblock}" -#~ msgstr "" -#~ "\tvain yksi conv joukoista {ascii,ebcdic,ibm}, {lcase,ucase}, {block," -#~ "unblock},\n" -#~ "{unblock,sync}" - -#~ msgid "file offset out of range" -#~ msgstr "tiedostosiirtymä on sallitun välin ulkopuolella" - -#~ msgid "" -#~ "no FILE arguments may be used with the option to output\n" -#~ "dircolors' internal database" -#~ msgstr "" -#~ "dircolors:in tietokannan tulostavan valitsimen kanssa ei voi\n" -#~ "käyttää TIEDOSTO-argumenttia" - -#~ msgid "" -#~ "Echo the STRING(s) to standard output.\n" -#~ "\n" -#~ " -n do not output the trailing newline\n" -#~ " -e enable interpretation of the backslash-escaped " -#~ "characters\n" -#~ " listed below\n" -#~ " -E disable interpretation of those sequences in STRINGs\n" -#~ msgstr "" -#~ "Kaiuta MERKKIJONO(t) vakiotulosteeseen.\n" -#~ "\n" -#~ " -n älä lisää rivinvaihtoa loppuun\n" -#~ " -e ota käyttöön alla lueteltujen kenoviivallisten\n" -#~ " ohjausmerkkien tulkinta\n" -#~ " -E poista käytöstä kyseisten merkkien tulkinta " -#~ "MERKKIJONOista\n" - -#~ msgid "`-LIST' option is obsolete; use `-t LIST'" -#~ msgstr "valitsin \"-LIST\" on vanhentunut; käytä \"-t LIST\"" - -#~ msgid "`%s' is too large" -#~ msgstr "\"%s\" on liian suuri" - -#~ msgid "" -#~ "Usage: %s [ignored command line arguments]\n" -#~ " or: %s OPTION\n" -#~ "Exit with a status code indicating failure.\n" -#~ "\n" -#~ "These option names may not be abbreviated.\n" -#~ "\n" -#~ msgstr "" -#~ "Käyttö: %s [huomiotta jätettävät komentoriviargumentit]\n" -#~ " tai: %s VALITSIN\n" -#~ "Poistutaan virheestä kertovalla tilakoodilla.\n" -#~ "\n" -#~ "Näitä valitsinten nimiä ei voi käyttää lyhennettyinä.\n" -#~ "\n" - -#~ msgid "`%s' option is obsolete; use `%s'" -#~ msgstr "valitsin \"%s\" on vanhentunut; käytä \"%s\"" - -#~ msgid "%s: number of bytes is large" -#~ msgstr "%s: tavumäärä on suuri" - -#~ msgid "`-%s' option is obsolete; use `-%c %.*s%.*s%s'" -#~ msgstr "valitsin \"-%s\" on vanhentunut; käytä \"-%c %.*s%.*s%s\"" - -#~ msgid "installing multiple files, but last argument, %s is not a directory" -#~ msgstr "" -#~ "asennetaan useita tiedostoja, mutta viimeinen argumentti %s ei ole " -#~ "hakemisto" - -#~ msgid "%s is a directory" -#~ msgstr "%s on hakemisto" - -#~ msgid "cannot obtain time stamps for %s" -#~ msgstr "tiedoston %s aikaleimojen hakeminen ei onnistu" - -#~ 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\"" - -#~ msgid "invalid field number for file 2: `%s'" -#~ msgstr "virheellinen sarakenumero tiedostolle 2: \"%s\"" - -#~ msgid "too few non-option arguments" -#~ msgstr "liian vähän argumentteja, jotka eivät ole valitsimia" - -#~ msgid "%s: File exists" -#~ msgstr "%s: Tiedosto on olemassa" - -#~ msgid "" -#~ "Usage: %s [OPTION]... TARGET [LINK_NAME]\n" -#~ " or: %s [OPTION]... TARGET... DIRECTORY\n" -#~ " or: %s [OPTION]... --target-directory=DIRECTORY TARGET...\n" -#~ msgstr "" -#~ "Käyttö: %s [VALITSIN]... KOHDE [LINKIN_NIMI]\n" -#~ " tai: %s [VALITSIN]... KOHDE... HAKEMISTO\n" -#~ " tai: %s [VALITSIN]... --target-directory=HAKEMISTO KOHDE...\n" - -#~ msgid "when making multiple links, last argument must be a directory" -#~ msgstr "useita linkkejä luotaessa viimeisen argumentin on oltava hakemisto" - -#~ msgid "" -#~ "\n" -#~ " -b, --binary read files in binary mode (default on DOS/" -#~ "Windows)\n" -#~ " -c, --check check %s sums against given list\n" -#~ " -t, --text read files in text mode (default)\n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ " -b, --binary lue tiedostot binäärimuodossa (oletus DOSissa/" -#~ "Windowsissa)\n" -#~ " -c, --check vertaa %s-summia annettuun luetteloon\n" -#~ " -t, --text lue tiedostot tekstimuodossa (oletus)\n" - -#~ msgid "files" -#~ msgstr "tiedostoa" - -#~ msgid "checksum" -#~ msgstr "tarkistussumma" - -#~ msgid "checksums" -#~ msgstr "tarkistussummaa" - -#~ msgid "no files may be specified when using --string" -#~ msgstr "tiedostoja ei voi antaa käytettäessä valitsinta --string" - -#~ msgid "only one argument may be specified when using --check" -#~ msgstr "käytettäessä valitsinta --check voi antaa vain yhden argumentin" - -#~ msgid "wrong number of arguments" -#~ msgstr "väärä määrä argumentteja" - -#~ msgid "major and minor device numbers may not be specified for fifo files" -#~ msgstr "fifo-tiedostoille ei voi antaa major- ja minor-laitearvoja" - -#~ msgid "when moving multiple files, last argument must be a directory" -#~ msgstr "" -#~ "viimeisen argumentin on oltava hakemisto siirrettäessä useita tiedostoja" - -#~ msgid "" -#~ "Run COMMAND with an adjusted scheduling priority.\n" -#~ "With no COMMAND, print the current scheduling priority. ADJUST is 10\n" -#~ "by default. Range goes from -20 (highest priority) to 19 (lowest).\n" -#~ "\n" -#~ " -n, --adjustment=ADJUST increment priority by ADJUST first\n" -#~ msgstr "" -#~ "Aja KOMENTO säädetyllä vuorotusprioriteetilla.\n" -#~ "Ilman KOMENTOa, näytä voimassaoleva prioriteetti. SÄÄTÖ on oletuksena " -#~ "10.\n" -#~ "Sen arvoalue on -20:stä (korkein prioriteetti) 19:ään (matalin).\n" -#~ "\n" -#~ " -n, --adjustment=SÄÄTÖ lisää prioriteettiin SÄÄTÖ\n" - -#~ msgid "invalid option `%s'" -#~ msgstr "valitsin \"%s\" ei kelpaa" - -#~ msgid "invalid priority `%s'" -#~ msgstr "prioriteetti \"%s\" ei kelpaa" - -#~ msgid "cannot get priority" -#~ msgstr "prioriteetin haku ei onnistu" - -#~ msgid "cannot set priority" -#~ msgstr "prioriteetin asetus ei onnistu" - -#~ msgid "old-style offset" -#~ msgstr "vanhantyylinen siirtymä" - -#~ msgid "invalid second operand in compatibility mode `%s'" -#~ msgstr "virheellinen toinen operandi \"%s\" yhteensopivuustilassa" - -#~ msgid "in compatibility mode, the last two arguments must be offsets" -#~ msgstr "" -#~ "kahden viimeisen argumentin on yhteensopivuustilassa oltava siirtymiä" - -#~ msgid "" -#~ "Diagnose unportable constructs in NAME.\n" -#~ "\n" -#~ " -p, --portability check for all POSIX systems, not only this one\n" -#~ msgstr "" -#~ "Määritä siirrettäväksi kelpaamattomia rakenteita NIMESSÄ.\n" -#~ "\n" -#~ " -p, --portability tarkista muillekin POSIX-järjestelmille kuin vain " -#~ "tälle\n" - -#~ msgid "path `%s' contains nonportable character `%c'" -#~ msgstr "polku \"%s\" sisältää siirrettäväksi kelpaamattoman merkin \"%c\"" - -#~ msgid "`%s' is not a directory" -#~ msgstr "\"%s\" ei ole hakemisto" - -#~ msgid "directory `%s' is not searchable" -#~ msgstr "haku ei onnistu hakemistosta \"%s\"" - -#~ msgid "name `%s' has length %ld; exceeds limit of %ld" -#~ msgstr "nimen \"%s\" pituus %ld ylittää raja-arvon %ld" - -#~ msgid "path `%s' has length %lu; exceeds limit of %ld" -#~ msgstr "polun \"%s\" pituus %lu ylittää raja-arvon %ld" - -#~ msgid "`--pages' invalid range of page numbers: `%s'" -#~ msgstr "virheellinen sivunumeroväli valitsimelle \"--pages\": \"%s\"" - -#~ msgid "`--pages' invalid starting page number: `%s'" -#~ msgstr "virheellinen aloitussivu valitsimelle \"--pages\": \"%s\"" - -#~ msgid "`--pages' invalid ending page number: `%s'" -#~ msgstr "virheellinen lopetussivu valitsimelle \"--pages\": \"%s\"" - -#~ msgid "`--pages' starting page number is larger than ending page number" -#~ msgstr "" -#~ "aloitussivun numero on suurempi kuin lopetussivun numero valitsimelle \"--" -#~ "pages\"" - -#~ msgid "`--columns=COLUMN' invalid number of columns: `%s'" -#~ msgstr "virheellinen palstamäärä valitsimelle \"--columns=PALSTA\": \"%s\"" - -# tätä ei käytetä mihinkään, tyhmää -#~ msgid "%b %e %H:%M %Y" -#~ msgstr "%e. %Bta %Y %H:%M" - -#~ msgid "starting page number larger than total number of pages: `%d'" -#~ msgstr "aloitussivunumero on suurempi kuin sivujen kokonaismäärä: \"%d\"" - -#~ msgid "Page %d" -#~ msgstr "Sivu %d" - -#~ msgid "Usage: %s format [argument...]\n" -#~ msgstr "Käyttö: %s muotoilu [argumentti...]\n" - -#~ msgid "" -#~ "Display file or filesystem status.\n" -#~ "\n" -#~ " -f, --filesystem display filesystem status instead of file status\n" -#~ " -c --format=FORMAT use the specified FORMAT instead of the default\n" -#~ " -L, --dereference follow links\n" -#~ " -t, --terse print the information in terse form\n" -#~ msgstr "" -#~ "Näytä tiedoston tai tiedostojärjestelmän tila.\n" -#~ "\n" -#~ " -f, --filesystem näytä tiedostojärjestelmän tila tiedoston tilan " -#~ "sijaan\n" -#~ " -c --format=MUOTO käytä annettua MUOTOa oletusmuodon sijaan\n" -#~ " -L, --dereference seuraa linkkejä\n" -#~ " -t, --terse tulosta tiedot lyhyessä muodossa\n" - -#~ msgid "Warning: `-l' is deprecated; use `-L' instead" -#~ msgstr "" -#~ "Varoitus: valitsin \"-l\" ei ole suositeltava; käytä valitsinta \"-L\" " -#~ "sen sijaan" - -#~ msgid "stdin: read error" -#~ msgstr "vakiosyöte: lukuvirhe" - -#~ msgid "%c: invalid suffix character in obsolescent option" -#~ msgstr "%c: virheellinen jälkiliitemerkki käytöstä poistuvassa valitsimessa" - -#~ msgid "" -#~ "too many arguments; When using tail's obsolescent option syntax (%s)\n" -#~ "there may be no more than one file argument. Use the equivalent -n or -" -#~ "c\n" -#~ "option instead." -#~ msgstr "" -#~ "liian monta argumenttia; Käytettäessä tail:in käytöstä poistuvaa\n" -#~ "valitsinsyntaksia (%s), tiedostoargumentteja saa olla vain yksi. Käytä\n" -#~ "vastaavaa valitsinta -n tai -c sen sijaan." - -#~ msgid "" -#~ "Warning: it is not portable to use two or more file arguments with\n" -#~ "tail's obsolescent option syntax (%s). Use the equivalent -n or -c\n" -#~ "option instead." -#~ msgstr "" -#~ "Varoitus: ei ole siirrettävää käyttää kahta tai useampaa " -#~ "tiedostoargumenttia\n" -#~ "tail:in käytöstä poistuvan valitsinsyntaksin (%s) kanssa. Käytä " -#~ "vastaavaa\n" -#~ "valitsinta -n tai -c sen sijaan." - -#~ msgid "`%s' option is obsolete; use `%s-%c %.*s'" -#~ msgstr "valitsin \"%s\" on vanhentunut; käytä \"%s-%c %.*s\"" - -#~ msgid "%s: invalid maximum number of consecutive size changes" -#~ msgstr "%s: virheellinen maksimimäärä peräkkäisiä koonmuutoksia" - -#~ msgid "argument expected\n" -#~ msgstr "odotettiin argumenttia\n" - -#~ msgid "%s: integer expression expected\n" -#~ msgstr "%s: odotettiin kokonaislukulauseketta\n" - -#~ msgid "after -lt" -#~ msgstr "operaattorin -lt jälkeen" - -#~ msgid "before -le" -#~ msgstr "ennen operaattoria -le" - -#~ msgid "after -le" -#~ msgstr "operaattorin -le jälkeen" - -#~ msgid "before -gt" -#~ msgstr "ennen operaattoria -gt" - -#~ msgid "after -gt" -#~ msgstr "operaattorin -gt jälkeen" - -#~ msgid "before -ge" -#~ msgstr "ennen operaattoria -ge" - -#~ msgid "after -ge" -#~ msgstr "operaattorin -ge jälkeen" - -#~ msgid "before -ne" -#~ msgstr "ennen operaattoria -ne" - -#~ msgid "after -ne" -#~ msgstr "operaattorin -ne jälkeen" - -#~ msgid "before -eq" -#~ msgstr "ennen operaattoria -eq" - -#~ msgid "after -eq" -#~ msgstr "operaattorin -eq jälkeen" - -#~ msgid "after -t" -#~ msgstr "operaattorin -t jälkeen" - -#~ msgid "too many arguments\n" -#~ msgstr "liian monta argumenttia\n" - -#~ msgid "file arguments missing" -#~ msgstr "tiedostoargumentit puuttuvat" - -#~ msgid "invalid backslash escape `\\%c'" -#~ msgstr "virheellinen kenoviivasuojaus \"\\%c\"" - -#~ msgid "at least one string must be given when squeezing repeats" -#~ msgstr "puristettaessa toistoja on annettava vähintään yksi merkkijono" - -#~ msgid "" -#~ "invalid identity mapping; when translating, any [:lower:] or [:upper:]\n" -#~ "construct in string1 must be aligned with a corresponding construct\n" -#~ "([:upper:] or [:lower:], respectively) in string2" -#~ msgstr "" -#~ "virheellinen kirjainkoon muutos; vaihdettaessa jokaisella merkkijono1:n\n" -#~ "[:lower:]- tai [:upper:]-rakenteella on oltava vastinrakenne\n" -#~ "([:upper:]-rakenteen vastine [:lower:], tai päinvastoin) merkkijono2:ssa" - -#~ msgid "" -#~ "Usage: %s [ignored command line arguments]\n" -#~ " or: %s OPTION\n" -#~ "Exit with a status code indicating success.\n" -#~ "\n" -#~ "These option names may not be abbreviated.\n" -#~ "\n" -#~ msgstr "" -#~ "Käyttö: %s [huomiotta jätettävät komentoriviargumentit]\n" -#~ " tai: %s VALITSIN\n" -#~ "Poistu onnistumisesta kertovalla tilakoodilla.\n" -#~ "\n" -#~ "Näitä valitsinnimiä ei voi käyttää lyhennettyinä.\n" -#~ "\n" - -#~ msgid "only one argument may be specified" -#~ msgstr "voidaan antaa vain yksi argumentti" - -#~ msgid "tab size contains an invalid character" -#~ msgstr "sarkainkoko sisältää virheellisen merkin" - -#~ msgid "`-LIST' option is obsolete; use `--first-only -t LIST'" -#~ msgstr "valitsin \"-LIST\" on vanhentunut; käytä \"--first-only -t LIST\"" - -#~ msgid "`-%lu' option is obsolete; use `-f %lu'" -#~ msgstr "valitsin \"-%lu\" on vanhentunut; käytä \"-f %lu\"" - -#~ msgid "" -#~ " -i, --idle add idle time as HOURS:MINUTES, . or old\n" -#~ " (deprecated, use -u)\n" -#~ " -l, --login print system login processes\n" -#~ msgstr "" -#~ " -i, --idle näytä myös joutenoloaika muodossa TUNNIT:MINUUTIT, .\n" -#~ " tai kauan (ei suositeltava, käytä valitsinta -u)\n" -#~ " -l, --login näytä järjestelmän sisäänkirjausprosessit\n" - -#~ msgid "%s: cannot find username for UID %u\n" -#~ msgstr "%s: UID:lle %u ei löydy käyttäjänimeä\n" - -#~ msgid "Usage: %s [OPTION]... LEFT_FILE RIGHT_FILE\n" -#~ msgstr "Käyttö: %s [VALITSIN]... VASEN_TIEDOSTO OIKEA_TIEDOSTO\n" - -#~ msgid "*** invalid date/time ***" -#~ msgstr "*** virheellinen päiväys/aika ***" - -#~ msgid "Torbjorn Granlund, David MacKenzie, and Jim Meyering" -#~ msgstr "Torbjörn Granlund, David MacKenzie ja Jim Meyering" - -#~ msgid "Stuart Kemp and David MacKenzie" -#~ msgstr "Stuart Kemp ja David MacKenzie" - -#~ msgid "%s: `+' or `-' expected after delimeter" -#~ msgstr "%s: rajoittimen jälkeen odotetaan merkkiä \"+\" tai \"-\"" - -#~ msgid "David Ihnat, David MacKenzie, and Jim Meyering" -#~ msgstr "David Ihnat, David MacKenzie ja Jim Meyering" - -#~ msgid "Paul Rubin, David MacKenzie, and Stuart Kemp" -#~ msgstr "Paul Rubin, David MacKenzie ja Stuart Kemp" - -#~ msgid "Torbjorn Granlund, David MacKenzie, and Paul Eggert" -#~ msgstr "Torbjörn Granlund, David MacKenzie ja Paul Eggert" - -#~ msgid "David MacKenzie and Jim Meyering" -#~ msgstr "David MacKenzie ja Jim Meyering" - -#~ msgid "Torbjorn Granlund, David MacKenzie, Paul Eggert, and Jim Meyering" -#~ msgstr "Torbjörn Granlund, David MacKenzie, Paul Eggert ja Jim Meyering" - -#~ msgid "cannot change to parent of directory %s" -#~ msgstr "hakemiston %s ylähakemistoon ei voi siirtyä" - -#~ msgid "Arnold Robbins and David MacKenzie" -#~ msgstr "Arnold Robbins ja David MacKenzie" - -#~ msgid "Mike Parker and David MacKenzie" -#~ msgstr "Mike Parker ja David MacKenzie" - -#~ msgid "Mike Parker, David MacKenzie, and Jim Meyering" -#~ msgstr "Mike Parker, David MacKenzie ja Jim Meyering" - -#~ msgid "Scott Bartram and David MacKenzie" -#~ msgstr "Scott Bartram ja David MacKenzie" - -#~ msgid "David M. Ihnat and David MacKenzie" -#~ msgstr "David M. Ihnat ja David MacKenzie" - -#~ msgid "Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi" -#~ msgstr "Joseph Arceneaux, David MacKenzie ja Kaveh Ghazi" - -#~ msgid "David MacKenzie and Richard Mlynarik" -#~ msgstr "David MacKenzie ja Richard Mlynarik" - -#~ msgid "Paul Rubin, David MacKenzie, Richard Stallman, and Jim Meyering" -#~ msgstr "Paul Rubin, David MacKenzie, Richard Stallman ja Jim Meyering" - -#~ msgid "Jay Lepreau and David MacKenzie" -#~ msgstr "Jay Lepreau ja David MacKenzie" - -#~ msgid "Paul Rubin, David MacKenzie, Ian Lance Taylor, and Jim Meyering" -#~ msgstr "Paul Rubin, David MacKenzie, Ian Lance Taylor ja Jim Meyering" - -#~ msgid "Mike Parker, Richard M. Stallman, and David MacKenzie" -#~ msgstr "Mike Parker, Richard M. Stallman ja David MacKenzie" - -#~ msgid "" -#~ "Paul Rubin, Arnold Robbins, Jim Kingdon, David MacKenzie, and Randy Smith" -#~ msgstr "" -#~ "Paul Rubin, Arnold Robbins, Jim Kingdon, David MacKenzie ja Randy Smith" - -#~ msgid "Joseph Arceneaux, David MacKenzie, and Michael Stone" -#~ msgstr "Joseph Arceneaux, David MacKenzie ja Michael Stone" - -#~ msgid "" -#~ "when the starting value is larger than the limit,\n" -#~ "the increment must be negative" -#~ msgstr "" -#~ "kun alkuarvo loppuarvoa suurempi, täytyy lisäyksen olla\n" -#~ "negatiivinen" - -#~ msgid "" -#~ "when the starting value is smaller than the limit,\n" -#~ "the increment must be positive" -#~ msgstr "" -#~ "kun alkuarvo loppuarvoa pienempi, täytyy lisäyksen olla\n" -#~ "positiivinen" - -#~ msgid "" -#~ "Warning: the meaning of '-l' will change in a future release to conform " -#~ "to POSIX" -#~ msgstr "" -#~ "Varoitus: valitsimen \"-l\" toiminta muuttuu tulevassa julkaisussa POSIX-" -#~ "yhteensopivaksi" - -#~ msgid "" -#~ "\n" -#~ "In -wNUMBER, the letter `w' may be omitted.\n" -#~ msgstr "" -#~ "\n" -#~ "Kirjain \"w\" voidaan jättää pois valitsimessa -wMÄÄRÄ.\n" - -#~ msgid "" -#~ " -c, --bytes=SIZE print first SIZE bytes\n" -#~ " -n, --lines=NUMBER print first NUMBER lines instead of first 10\n" -#~ msgstr "" -#~ " -c, --bytes=KOKO näytä ensimmäiset KOKO tavua\n" -#~ " -n, --lines=MÄÄRÄ näytä ensimmäiset MÄÄRÄ riviä, oletuksen 10 " -#~ "sijaan\n" - -#~ msgid "invalid number" -#~ msgstr "virheellinen lukuarvo" - -#~ msgid "%s is larger than the maximum file size on this system" -#~ msgstr "%s on suurempi kuin tämän järjestelmän maksimitiedostokoko" - -#~ msgid "\\%c: invalid escape" -#~ msgstr "\\%c: ohjausmerkki ei kelpaa" - -#~ msgid "program error" -#~ msgstr "ohjelmavirhe" - -#~ msgid "stack overflow" -#~ msgstr "pinon ylivuoto" diff --git a/po/fr.gmo b/po/fr.gmo index 5cbb7290..1f65572c 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 53830dfd..a2d773c1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,11 +6,12 @@ # kerb , 2008, 2009. # Stéphane Raimbault , 2009-2012. # David Prévot , 2012-2014. +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils-8.23-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2014-07-15 18:40-0400\n" "Last-Translator: David Prévot \n" "Language-Team: French \n" @@ -39,18 +40,18 @@ msgstr "Les arguments valables sont :" msgid "error closing file" msgstr "erreur de fermeture de fichier" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "erreur d'écriture" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "conservation des droits de %s" @@ -231,57 +232,62 @@ msgstr "Paramètre de chaîne non correctement codé" msgid "Unknown error" msgstr "Erreur inconnue" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s : l'option « %s » est ambiguë, possibilités :" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s : l'option « -W %s » est ambiguë\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s : l'option « --%s » n'accepte pas d'argument\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s : l'option « %c%s » n'accepte pas d'argument\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s : l'option « --%s » nécessite un argument\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s : option non reconnue « --%s »\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s : option non reconnue « %c%s »\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s : option incorrecte — « %c »\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s : l'option nécessite un argument — « %c »\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s : l'option « -W %s » est ambiguë\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s : l'option « -W %s » n'accepte pas d'argument\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s : l'option « -W %s » nécessite un argument\n" @@ -291,13 +297,13 @@ msgstr "%s : l'option « -W %s » nécessite un argument\n" msgid "cannot change permissions of %s" msgstr "impossible de modifier les droits de %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "impossible de créer le répertoire %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "mémoire insuffisante" @@ -346,6 +352,12 @@ msgstr " »" msgid "%s: end of file" msgstr "%s : fin de fichier" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s : erreur de lecture" + #: lib/regcomp.c:131 msgid "Success" msgstr "Réussite" @@ -453,7 +465,7 @@ msgstr "^[oOyY].*" msgid "^[nN]" msgstr "^[nN].*" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "initialisation des droits de %s" @@ -890,7 +902,7 @@ msgstr "" "Encoder ou décoder FICHIER en base64, ou l'entrée standard, vers la\n" "sortie standard.\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -908,15 +920,7 @@ msgstr "" "césure\n" "\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Sans FICHIER ou quand FICHIER est -, lire l'entrée standard.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -933,51 +937,51 @@ msgstr "" "de\n" "récupérer tout autre octet non alphabétique dans le flux codé.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "erreur de lecture" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "entrée incorrecte" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "longueur de césure incorrecte : %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "opérande supplémentaire %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "fermeture de l'entrée standard" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1030,38 +1034,45 @@ msgstr "" # Opérande est un nom masculin #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "opérande manquant" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Utilisation : %s [OPTION]... [FICHIER]...\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"Afficher la concaténation triée de tous les FICHIERs sur la sortie " +"standard.\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1082,7 +1093,7 @@ msgstr "" " -s, --squeeze-blank supprimer les lignes vides qui se répètent en " "sortie\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1096,7 +1107,7 @@ msgstr "" "TAB\n" # %s est « cat » (3 caractères), la ligne suivante est indentée sur cette supposition (Stéphane, David) -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1110,17 +1121,18 @@ msgstr "" " contenu de g.\n" " %s Copier l'entrée standard vers la sortie standard.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "impossible d'exécuter ioctl sur %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "sortie standard" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s : le fichier d'entrée est aussi celui de sortie" @@ -1132,10 +1144,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1149,8 +1161,8 @@ msgstr "impossible de créer le contexte de sécurité : %s" msgid "failed to set %s security context component to %s" msgstr "impossible de définir le composant de contexte de sécurité %s à %s" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "impossible de récupérer du contexte de sécurité de %s" @@ -1165,13 +1177,13 @@ msgstr "impossible d'appliquer un contexte partiel au fichier %s non étiqueté" msgid "failed to change context of %s to %s" msgstr "impossible de modifier le contexte de %s à %s" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "impossible d'accéder à %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "impossible de lire le répertoire %s" @@ -1187,7 +1199,7 @@ msgstr "changement du contexte de sécurité de %s\n" msgid "fts_read failed" msgstr "échec de fts_read" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1313,7 +1325,7 @@ msgid "-R -h requires -P" msgstr "-R -h nécessite -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1330,9 +1342,8 @@ msgid "conflicting security context specifiers given" msgstr "paramètres de contexte de sécurité en conflit" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "impossible d'obtenir les attributs de %s" @@ -1649,17 +1660,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "groupe %s incorrect" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "liste de groupes %s incorrecte" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1668,7 +1679,7 @@ msgstr "" "Utilisation : %s [OPTION] NOUV_RACINE [COMMANDE [ARG]...]\n" " ou : %s OPTION\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1676,10 +1687,19 @@ msgstr "" "Exécuter COMMANDE avec le répertoire racine initialisé à NOUV_RACINE.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" +" --userspec=UTILIS:GROUPE indiquer l'utilisateur et le groupe (ID ou nom) " +"à\n" +" utiliser\n" +" --groups=LISTE_G indiquer les groupes supplémentaires comme g1,g2,..," +"gN\n" + +#: src/chroot.c:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" " --userspec=UTILIS:GROUPE indiquer l'utilisateur et le groupe (ID ou nom) " "à\n" @@ -1687,7 +1707,12 @@ msgstr "" " --groups=LISTE_G indiquer les groupes supplémentaires comme g1,g2,..," "gN\n" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" @@ -1696,42 +1721,47 @@ msgstr "" "Sans commande fournie, exécuter « ${SHELL} -i » (« /bin/sh -i » par " "défaut).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "impossible de modifier le répertoire racine en %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "impossible d'aller dans le répertoire racine" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "Aucun groupe indiqué pour l’UID inconnu : %d" -#: src/chroot.c:383 +#: src/chroot.c:400 #, c-format msgid "failed to get supplemental groups" msgstr "impossible d’obtenir les groupes supplémentaires" -#: src/chroot.c:395 -#, c-format -msgid "failed to %s supplemental groups" -msgstr "impossible de %s les groupes supplémentaires" +#: src/chroot.c:412 +#, fuzzy, c-format +msgid "failed to set supplemental groups" +msgstr "impossible d’obtenir les groupes supplémentaires" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "impossible de définir l'identifiant de groupe" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "impossible de définir l'identifiant de l'utilisateur" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "impossible d'exécuter la commande %s" @@ -1773,7 +1803,16 @@ msgstr "Utilisation : %s [OPTION]... FICHIER1 FICHIER2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Comparer les fichiers triés FICHIER1 et FICHIER2 ligne à ligne.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Sans FICHIER ou quand FICHIER est -, lire l'entrée standard.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1786,7 +1825,7 @@ msgstr "" "uniques\n" "de FICHIER2 et la troisième contient les lignes communes aux deux fichiers.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1799,7 +1838,7 @@ msgstr "" " -3 supprimer la colonne 3 (lignes présentes dans les " "2 fichiers)\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1811,11 +1850,11 @@ msgstr "" " 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 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=CHA séparer les colonnes par CHA\n" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" @@ -1824,7 +1863,7 @@ msgstr "" "Remarque, les comparaisons respectent les règles définies par " "« LC_COLLATE ».\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1840,318 +1879,332 @@ msgstr "" "file2,\n" " et vice versa.\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "le fichier %d n'est pas dans l'ordre attendu" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "plusieurs délimiteurs indiqués" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "%s vide n'est pas autorisé" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "impossible de se positionner (lseek) dans %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "erreur de lecture %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "impossible de se positionner (lseek) dans %s" +msgid "error reading %s" +msgstr "erreur de lecture %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "erreur d'écriture de %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "erreur de lecture %s" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s : impossible d'obtenir les informations d'extension" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s : échec d'écriture" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "impossible d'étendre %s" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "initialisation des droits de %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "impossible de préserver l'appartenance pour %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "impossible de repérer le fichier %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "impossible de préserver l'auteur pour %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "" "impossible de définir le contexte de création de fichier par défaut à %s" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "" "impossible de définir le contexte de création de fichier par défaut pour %s" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "impossible de définir le contexte de sécurité de %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "impossible d'ouvrir %s en lecture" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "impossible d'obtenir l'état du fichier (fstat) %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "le fichier %s est ignoré car il a été remplacé durant la copie" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "impossible de supprimer %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "%s supprimé\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "pas d'écriture à travers le lien symbolique ballant %s" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "impossible de créer le fichier standard %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "impossible de cloner %s depuis %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "préservation des dates pour %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "impossible de fermer %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s : voulez-vous remplacer %s en outrepassant le mode %04lo (%s) ? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" "%s : %s non autorisé en écriture (mode %04lo, %s) ; voulez-vous essayer " "quand même ? " -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s : voulez-vous écraser %s ? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (archive : %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, 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:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "impossible de créer le lien direct %s vers %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "impossible d'évaluer %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "omission du répertoire %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "avertissement : le fichier source %s est mentionné plusieurs fois" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s et %s identifient le même fichier" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "impossible d'écraser le non répertoire %s par le répertoire %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "n'écrasera pas %s qui vient d'être créé par %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "impossible d'écraser le répertoire %s par un non répertoire" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "impossible de déplacer le répertoire dans un non répertoire : %s → %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "l'archivage de %s détruirait la source ; %s non déplacé" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "l'archivage de %s détruirait la source ; %s non copié" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "impossible d'archiver %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "" "ne copiera pas %s depuis le lien symbolique %s qui vient juste d'être créé" -#: src/copy.c:2184 +#: src/copy.c:2264 #, 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:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "avertissement : le fichier source %s est mentionné plusieurs fois" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "impossible de déplacer %s vers un sous-répertoire de lui-même, %s" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "impossible de déplacer %s vers %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "échec de déplacement interpériphérique de %s vers %s ; impossible de " "supprimer la cible" -#: src/copy.c:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "impossible de copier liens symboliques cycliques %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s : ne peut créer des liens symboliques relatifs que dans le répertoire " "actuel" -#: src/copy.c:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "impossible de créer le lien symbolique %s vers %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "impossible de créer la FIFO %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "impossible de créer le fichier spécial %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "impossible de lire le lien symbolique %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "impossible de créer le lien symbolique %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s possède un type de fichier inconnu" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "impossible de désarchiver %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s → %s (désarchivage)\n" @@ -2161,12 +2214,12 @@ msgstr "%s → %s (désarchivage)\n" msgid "Alex Deymo" msgstr "Alex Deymo" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "Utilisation : %s --coreutils-prog=PROGRAMME [PARAMÈTRES]... \n" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" @@ -2174,7 +2227,7 @@ msgstr "" "Exécuter le programme intégré PROGRAMME avec les PARAMÈTRES donnés.\n" "\n" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" @@ -2184,7 +2237,7 @@ msgstr "" "Utilisez : « %s --coreutils-prog=PROGRAMME --help » pour obtenir l’aide " "spécifique au programme.\n" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, c-format msgid "unknown program %s" msgstr "programme %s inconnu" @@ -2476,8 +2529,8 @@ msgstr "%s existe mais n'est pas un répertoire" msgid "failed to access %s" msgstr "impossible d'accéder à %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "opérande de fichier manquant" @@ -2555,134 +2608,134 @@ msgstr "" "charge xattr" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "l'entrée a disparu" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s : numéro de ligne hors limite" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s : %s : numéro de ligne hors limite" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " par répétition %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s : %s : pas de correspondance" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "erreur dans la recherche de l'expression rationnelle" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "erreur d'écriture pour %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s : entier attendu après le délimiteur" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s : « } » est nécessaire pour un compteur de répétition" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s} : entier nécessaire entre « { » et « } »" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s : délimiteur de fermeture « %c » manquant" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s : expression rationnelle incorrecte : %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s : motif incorrect" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, 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:1194 +#: src/csplit.c:1195 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "" "le numéro de ligne %s est plus petit que le numéro de ligne précédent, %s" -#: src/csplit.c:1200 +#: src/csplit.c:1201 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "" "avertissement : le numéro de ligne %s est le même que le numéro de ligne " "précédent" -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "symbole de conversion manquant dans le suffixe" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "le symbole de conversion %c est incorrect dans le suffixe" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "le symbole de conversion \\%.3o est incorrect dans le suffixe" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "attributs de spécification de conversion incorrects : %%%c%c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "trop de spécifications de conversion %% dans le suffixe" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "la spécification de conversion %% est manquante dans le suffixe" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s : nombre incorrect" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "nombre %s incorrect" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Utilisation : %s [OPTION]... FICHIER MOTIF...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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" @@ -2693,7 +2746,16 @@ msgstr "" "vers\n" "la sortie standard.\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Lire l'entrée standard si le FICHIER est -. Chaque MOTIF peut être :\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2705,12 +2767,12 @@ msgstr "" " -k, --keep-files ne pas supprimer les fichiers de sortie en cas\n" " d'erreurs\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" " -m, --suppress-matched supprimer les lignes correspondant à MOTIF\n" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2721,17 +2783,11 @@ msgstr "" "sortie\n" " -z, --elide-empty-files supprimer les fichiers de sortie vides\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Lire l'entrée standard si le FICHIER est -. Chaque MOTIF peut être :\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 +#, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2768,7 +2824,7 @@ msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" "Afficher des extraits de lignes de chaque FICHIER vers la sortie standard.\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2779,7 +2835,7 @@ msgstr "" " -d, --delimiter=DELIM utiliser DELIM au lieu de TAB comme délimiteur\n" " de champ\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2793,7 +2849,7 @@ msgstr "" "indiquée\n" " -n (ignoré)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2801,7 +2857,7 @@ msgstr "" " --complement compléter le jeu d'octets, caractères ou champs\n" " sélectionnés\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2813,7 +2869,7 @@ msgstr "" " le délimiteur d'entrée est utilisé par " "défaut\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2826,7 +2882,8 @@ msgstr "" "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:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2834,8 +2891,6 @@ msgid "" " 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 "" "Chaque intervalle est l'un de :\n" "\n" @@ -2846,51 +2901,52 @@ msgstr "" "\n" "Sans FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "octet, caractère ou liste de champs incorrects" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "champs et positions sont numérotés à partir de 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "intervalle incorrect sans limite de fin : -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "intervalle décroissant incorrect" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "le décalage d'octet %s est trop grand" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "le numéro de champ %s est trop grand" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "un seul type de liste peut être indiqué" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "le délimiteur doit être un seul caractère" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "une liste d'octets, de caractères ou de champs doit être indiquée" -#: src/cut.c:790 +#: src/cut.c:789 msgid "an input delimiter may be specified only when operating on fields" msgstr "" "un délimiteur ne peut être indiqué que lorsque des champs sont manipulés" -#: src/cut.c:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2898,11 +2954,11 @@ msgstr "" "la suppression des lignes non délimitées n'est permise\n" "\tque lorsque des champs sont manipulés." -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "liste des champs manquante" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "liste des positions manquante" @@ -2921,13 +2977,27 @@ msgstr "" "Afficher la date actuelle au FORMAT indiqué ou initialiser la date système.\n" #: src/date.c:134 +#, fuzzy +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +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" + +#: src/date.c:138 +#, fuzzy msgid "" -" -d, --date=STRING display time described by STRING, not 'now'\n" -" -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -" -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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" " -d, --date=CHAÎNE afficher la date indiqué par CHAÎNE, pas " "l'actuelle\n" @@ -2942,26 +3012,25 @@ msgstr "" " « ns » pour indiquer la précision des date et " "heure.\n" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=FICHIER afficher la dernière date de modification de " "FICHIER\n" " -R, --rfc-2822 afficher la date et l'heure au format RFC 2822.\n" " Exemple : Mon, 07 Aug 2006 12:34:56 -0600\n" -#: src/date.c:147 +#: src/date.c:149 +#, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=SPEC_DATE afficher la date et l'heure au format RFC 3339.\n" " SPEC_DATE est « date » pour la date seule par\n" @@ -2974,8 +3043,19 @@ msgstr "" "universel\n" " (UTC)\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2988,7 +3068,7 @@ msgstr "" " %% un caractère %\n" " %a nom abrégé localisé du jour de la semaine (par exemple dim.)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -3001,7 +3081,7 @@ msgstr "" " %c date et heure localisées (par exemple jeu. 03 mars 2005 23:05:25 " "CET)\n" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -3014,7 +3094,7 @@ msgstr "" " %e jour du mois, éventuellement complété par une espace, identique à " "%_d\n" -#: src/date.c:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -3025,7 +3105,7 @@ msgstr "" " %G année correspondant au numéro de semaine ISO (voir %V) ; normalement\n" " seulement utile avec %V\n" -#: src/date.c:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -3037,7 +3117,7 @@ msgstr "" " %I heure (01..12)\n" " %j jour de l'année (001..366)\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -3049,7 +3129,7 @@ msgstr "" " %m mois (01..12)\n" " %M minute (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -3067,7 +3147,7 @@ msgstr "" " %R heure en format 24 heures identique à %H:%M\n" " %s secondes depuis 1970-01-01 00:00:00 UTC\n" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3079,7 +3159,7 @@ msgstr "" " %T l'heure, identique à %H:%M:%S\n" " %u jour de la semaine (1..7) ; 1 représente le lundi\n" -#: src/date.c:209 +#: src/date.c:215 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" @@ -3093,7 +3173,7 @@ msgstr "" " %W numéro de la semaine, avec lundi en premier jour de la semaine " "(00..53)\n" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3105,7 +3185,7 @@ msgstr "" " %y deux derniers chiffres de l'année (00..99)\n" " %Y année\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3125,7 +3205,7 @@ msgstr "" "\n" "Par défaut, les champs de date numériques sont remplis par des zéros.\n" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3143,7 +3223,7 @@ msgstr "" " ^ utiliser des majuscules si possible\n" " # utiliser la casse opposée si possible\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3159,7 +3239,7 @@ msgstr "" "numériques\n" "si disponible.\n" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3184,38 +3264,38 @@ msgstr "" "Martinique :\n" " $ date --date='TZ=\"America/Martinique\" 09:00 next Fri'\n" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "entrée standard" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "date incorrecte %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "plusieurs formats de fichiers de sortie indiqués" -#: src/date.c:430 +#: src/date.c:436 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "" "les options pour indiquer les dates d'impression sont mutuellement exclusives" -#: src/date.c:437 +#: src/date.c:443 #, 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 " "ensemble" -#: src/date.c:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3228,23 +3308,23 @@ msgstr "" "des options reconnues doivent être des chaînes de formatage commençant par " "« + »" -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "impossible d'initialiser la date" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3253,7 +3333,7 @@ msgstr "" "Utilisation : %s [OPERAND]...\n" " ou : %s OPTION\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3272,7 +3352,8 @@ msgstr "" " count=N ne copier que N blocs d'entrée\n" " ibs=OCTETS lire jusqu'à OCTETS octets à la fois (512 par défaut)\n" -#: src/dd.c:541 +#: src/dd.c:570 +#, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3281,8 +3362,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=FICHIER lire FICHIER au lieu de l'entrée standard (stdin)\n" " iflag=ATTRS lire selon la liste de symboles séparés par des virgules\n" @@ -3299,7 +3382,7 @@ msgstr "" "transfert\n" " et « none » supprime tout\n" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3318,7 +3401,7 @@ msgstr "" "Chaque symbole CONV peut être :\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3352,7 +3435,7 @@ msgstr "" "NULL\n" "\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3368,7 +3451,7 @@ msgstr "" " fdatasync écrire physiquement les données en sortie avant la fin\n" " fsync identique, mais écrire aussi les métadonnées\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3382,143 +3465,109 @@ msgstr "" " append mode d'ajout (n'a de sens que pour la sortie ; conv=notrunc " "suggéré)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio utiliser des E/S simultanées pour les données\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct utiliser des E/S directes pour les données\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory échouer sauf s'il s'agit d'un répertoire\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync utiliser des E/S synchronisées pour les données\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync identique mais aussi pour les métadonnées\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock accumuler des blocs pleins en entrée (uniquement iflag)\n" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock utiliser des E/S non bloquantes\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime ne pas mettre à jour la date d'accès\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nocache abandonner les données en cache\n" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty ne pas assigner de terminal contrôleur depuis le fichier\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow ne pas suivre les liens symboliques\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks échouer en cas de liens multiples\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary utiliser des E/S binaires pour les données\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text utiliser des E/S textuelles pour les données\n" -#: src/dd.c:620 +#: src/dd.c:651 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:623 +#: src/dd.c:654 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:626 +#: src/dd.c:657 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:631 +#: src/dd.c:661 #, 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 "" -"\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 GB) copiés, 34.6279 s, 271 MB/s\n" -"\n" -"Les options sont :\n" -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +#: src/dd.c:699 +#, fuzzy, c-format +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "impossible d'allouer un tampon d'entrée de %zu octets (%s)" -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +#: src/dd.c:721 +#, fuzzy, c-format +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "impossible d'allouer un tampon de sortie de %zu octets (%s)" -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" -"%+% enregistrements lus\n" -"%+% enregistrements écrits\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% enregistrement tronqué\n" -msgstr[1] "% enregistrements tronqués\n" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "% octet (%s) copié" msgstr[1] "% octets (%s) copiés" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "Infinité B" @@ -3532,83 +3581,100 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% enregistrements lus\n" +"%+% enregistrements écrits\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% enregistrement tronqué\n" +msgstr[1] "% enregistrements tronqués\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "fermeture du fichier d'entrée %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "fermeture du fichier de sortie %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "impossible de désactiver O_DIRECT : %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "écriture vers %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "opérande %s non reconnu" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "conversion incorrecte" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "attribut d'entrée incorrect" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "attribut de sortie incorrect" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "attribut d'état incorrect" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "nombre %s incorrect" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "impossible de combiner deux options parmi ascii, ebcdic et ibm" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "impossible de combiner block et unblock" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "impossible de combiner lcase et ucase" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "impossible de combiner excl et nocreat" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "impossible de combiner direct et nocache" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3619,63 +3685,63 @@ msgstr "" " pour le fichier (%s) de type mt_type=0x%0lx\n" " — consultez pour la liste des types" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s : impossible d'ignorer" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s : impossible de se déplacer" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "débordement du décalage à la lecture du fichier %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" "avertissement : décalage de fichier incorrect suite à un échec de lecture" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "impossible de contourner une anomalie du noyau finalement" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "initialisation des attributs pour %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s : impossible d'ignorer jusqu'au décalage indiqué" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "impossible de tronquer le fichier de sortie %2$s à %1$ octets" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync a échoué pour %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "fsync a échoué pour %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "impossible d'ouvrir %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3684,19 +3750,19 @@ msgstr "" "décalage trop grand : impossible de tronquer à la longueur seek=" "% blocs (de %lu octets)" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "impossible de tronquer le fichier de sortie %2$s à %1$ octets" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "impossible d'abandonner le cache pour : %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3777,12 +3843,12 @@ msgstr "Capacité" msgid "%s-%s" msgstr "%2$s de %1$s" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "impossible d'accéder à %s : sur-monté par un autre périphérique" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3793,13 +3859,14 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 +#, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3815,7 +3882,7 @@ msgstr "" " 1K, 234M ou 2G)\n" " -H, --si identique avec un multiple de 1000 au lieu de 1024\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3831,13 +3898,41 @@ msgstr "" "les\n" " renseignements d'utilisation (par défaut)\n" -#: src/df.c:1409 +#: src/df.c:1429 +#, 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" +msgstr "" +" --output[=LISTE_CHAMPS] utiliser le format de sortie défini par\n" +" LISTE_CHAMPS, ou afficher tous les champs en\n" +" absence d’argument.\n" +" -P, --portability utiliser le format de sortie POSIX\n" +" --sync invoquer sync avant d'obtenir les renseignements\n" +" d'utilisation\n" +" -t, --type=TYPE limiter l'affichage aux systèmes de fichier de 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:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose afficher un diagnostic juste avant l'ouverture de\n" +" chaque fichier de sortie\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3857,7 +3952,7 @@ msgstr "" " que ceux de type TYPE\n" " -v (ignorée)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3873,25 +3968,25 @@ msgstr "" "et\n" "« target » (consultez la page info).\n" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "les options %s et %s sont mutuellement exclusives" -#: src/df.c:1610 +#: src/df.c:1636 #, 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:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Avertissement : " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "impossible de lire la table des systèmes de fichiers montés" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "aucun système de fichiers traité" @@ -4016,7 +4111,7 @@ msgstr "" " %s rep1/cha rep2/cha → « rep1 » suivi de « rep2 »\n" " %s stdio.h → « . »\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -4026,7 +4121,9 @@ msgstr "" " ou : %s [OPTION]... --files0-from=F\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +#, fuzzy +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Synthétiser l’occupation d’espace disque pour chaque FICHIER, récursivement\n" "pour les répertoires.\n" @@ -4179,67 +4276,61 @@ msgstr "" msgid "Infinity" msgstr "Infinité" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "échec de fts_read : %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "profondeur maximale %s incorrecte" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "argument « -0 » de --threshold incorrect" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "impossible d'afficher à la fois un résumé et toutes les entrées" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" "avertissement : résumer est la même chose qu'utiliser l'option --max-depth=0" -#: src/du.c:911 +#: src/du.c:932 #, 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:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" "avertissement : les options --apparent-size et -b sont inefficaces avec --" "inodes" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "" "les opérandes de fichier ne peuvent pas être combinés avec --files0-from" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s : erreur de lecture" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" "le nom de fichier %s n'est pas autorisé lors de la lecture de l'entrée " "standard" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "nom de fichier de longueur nulle incorrect" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "total" @@ -4388,9 +4479,8 @@ msgid "cannot specify --null (-0) with 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" +#, fuzzy +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "Convertir les tabulations de chaque FICHIER en espaces, en écrivant sur la\n" "sortie standard. Sans FICHIER, ou quand FICHIER est -, lire l'entrée " @@ -4439,7 +4529,7 @@ msgid "input line is too long" msgstr "la ligne d'entrée est trop longue" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4598,12 +4688,12 @@ msgstr "erreur de correspondance d'expression rationnelle" msgid "non-integer argument" msgstr "argument non entier" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "division par zéro" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "définissez LC_ALL='C' pour contourner le problème" @@ -4614,32 +4704,32 @@ msgid "the strings compared were %s and %s" msgstr "les chaînes comparées étaient %s et %s" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "Niels Moller" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, 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:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "dépassement de la file de squfof" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s n'est pas un entier positif valable" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s est trop grand" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4648,7 +4738,7 @@ msgstr "" "Utilisation : %s [NOMBRE]...\n" " ou : %s OPTION\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -4693,7 +4783,7 @@ msgstr "" "standard.\n" "L'option -LARGEUR est une forme abrégée de --width=CHIFFRES.\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4710,7 +4800,7 @@ msgstr "" "sans\n" " les remplir\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4725,7 +4815,7 @@ msgstr "" "défaut)\n" " -g, --goal=N largeur désirée (93 % de la largeur par défaut)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4734,21 +4824,20 @@ msgstr "" "option incorrecte — %c ; -LARGEUR n'est reconnue que si c'est la\n" "première option ; utilisez -w N à la place" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" 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" +#: src/fold.c:69 +#, fuzzy +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "Effectuer la césure des lignes d'entrée de chaque FICHIER (entrée standard " "par\n" "défaut), en écrivant sur la sortie standard.\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4758,9 +4847,9 @@ msgstr "" " -s, --spaces césure aux espaces\n" " -w, --width=LARGEUR utiliser LARGEUR colonnes au lieu de 80\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "nombre de colonnes incorrect : %s" #. This is a proper name. See the gettext manual, section Names. @@ -4834,18 +4923,18 @@ msgstr "impossible d'obtenir le GID réel" msgid "%s: no such user" msgstr "%s : utilisateur inexistant" -#: src/head.c:109 +#: src/head.c:110 +#, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Afficher les dix premières lignes de chaque FICHIER sur la sortie standard.\n" "Chaque fichier est précédé d'un en-tête avec son nom, si plusieurs " "fichiers.\n" "Sans FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4866,7 +4955,7 @@ msgstr "" "de\n" " chaque fichier\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4876,7 +4965,7 @@ msgstr "" " -v, --verbose toujours afficher les en-têtes de noms de " "fichier\n" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4888,48 +4977,36 @@ msgstr "" "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" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s : le fichier a été trop réduit" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s : le nombre d'octets est trop grand" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s : impossible de se déplacer à la position %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s : impossible de se déplacer selon le décalage relatif %s" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "le nombre de lignes" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "le ombre d'octets" +msgid "%s: number of bytes is too large" +msgstr "%s : le nombre d'octets est trop grand" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "nombre de lignes incorrect" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "nombre d'octets incorrect" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "option de terminaison incorrecte — %c" @@ -5128,7 +5205,7 @@ msgstr "impossible de modifier l'appartenance de %s" msgid "cannot set time stamps for %s" msgstr "impossible de définir le format horaire pour %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "échec de l'appel système fork" @@ -5308,7 +5385,7 @@ msgid "target directory not allowed when installing a directory" msgstr "" "un répertoire cible n'est pas autorisé lors de l'installation d'un répertoire" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "mode %s incorrect" @@ -5349,8 +5426,13 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5367,7 +5449,7 @@ msgstr "" "FICHIER2\n" " -e VIDE remplacer les champs d'entrée manquants par VIDE\n" -#: src/join.c:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5381,7 +5463,7 @@ msgstr "" " -t CAR utiliser CAR comme délimiteur de champs d'entrée et " "sortie\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5405,14 +5487,14 @@ msgstr "" "les\n" " appairer\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated le délimiteur de lignes est l’octet NULL, pas " "le\n" " changement de ligne\n" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5450,47 +5532,47 @@ msgstr "" "peuvent\n" "être fusionnées, un message d'alerte l'indiquera.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:% : n'est pas trié : %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "numéro de champ incorrect : %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "spécificateur de champ incorrect : %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "numéro de fichier incorrect dans la spécification de champ : %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "jonction incompatible des champs %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "chaînes de remplacement de champ vide conflictuelles" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "tabulation multicaractère %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "tabulations incompatibles" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "les fichiers ne peuvent pas être tous les deux l'entrée standard." @@ -5566,17 +5648,17 @@ msgstr "impossible de combiner le signal avec -l or -t" msgid "no process ID specified" msgstr "aucun identifiant de processus indiqué" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "impossible d'allouer un tampon stdio de % octets\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "mode %s de mise en tampon incorrect pour %s\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "impossible de définir la mise en tampon de %s au mode %s\n" @@ -5781,7 +5863,7 @@ msgstr "impossible de faire --relative sans --symbolic" msgid "FIXME: unknown" msgstr "À corriger : inconnu" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Utilisation : %s [OPTION]\n" @@ -5794,7 +5876,7 @@ msgstr "" "Afficher le nom de l'utilisateur actuel.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "aucun identifiant" @@ -5804,7 +5886,7 @@ msgstr "aucun identifiant" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%e %b %Y" @@ -5813,98 +5895,98 @@ msgstr "%e %b %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%e %b %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" -"valeur incorrecte de la variable d'environnement QUOTING_STYLE ignorée : %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "largeur incorrecte de la variable d'environnement COLUMNS ignorée : %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "taille de tabulation incorrecte de la variable d'environnement TABSIZE " "ignorée :%s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "largeur de ligne incorrecte : %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "taille de tabulation incorrecte : %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "format de style de temps %s incorrect" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "Les arguments possible sont :\n" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr " - +FORMAT (par exemple +%H:%M) pour un format de type « date »\n" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "erreur d'initialisation des chaînes de mois" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "préfixe non reconnu : %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "" "impossible d'analyser la valeur de la variable d'environnement LS_COLORS" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" +"valeur incorrecte de la variable d'environnement QUOTING_STYLE ignorée : %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "impossible d'ouvrir le répertoire %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "impossible de déterminer le périphérique et l'inœud de %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s : impossible d'afficher un répertoire déjà affiché" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "lecture du répertoire %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "fermeture du répertoire %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "impossible de comparer les noms de fichier %s et %s" -#: src/ls.c:4781 +#: src/ls.c:4775 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" @@ -5915,7 +5997,7 @@ msgstr "" "sort\n" "ne sont utilisées.\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5930,7 +6012,7 @@ msgstr "" "des\n" " protections selon le style C\n" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5960,12 +6042,14 @@ msgstr "" "nom ;\n" " autrement : trier selon ctime\n" -#: src/ls.c:4804 +#: src/ls.c:4798 +#, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5984,7 +6068,7 @@ msgstr "" " -D, --dired générer une sortie pour le mode « dired » " "d’Emacs\n" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -6006,13 +6090,13 @@ msgstr "" " « vertical » -C (vertical)\n" " --full-time identique à -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" " -g identique à -l mais sans afficher le " "propriétaire\n" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -6027,7 +6111,7 @@ msgstr "" " l’utilisation de --sort=none (-U) inhibe le\n" " regroupement\n" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -6043,7 +6127,7 @@ msgstr "" "au\n" " lieu de 1 024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -6065,7 +6149,7 @@ msgstr "" " correspondant au MOTIF de l'interpréteur\n" " (écrasé par -a ou -A)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -6094,7 +6178,7 @@ msgstr "" "l’occupation\n" " d’espace disque\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -6110,7 +6194,7 @@ msgstr "" " -m remplir la largeur avec une liste d'entrées\n" " séparées par des virgules\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -6130,7 +6214,7 @@ msgstr "" " de groupe\n" " -p, --indicator-style=slash ajouter l'indicateur « / » aux répertoires\n" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -6154,7 +6238,7 @@ msgstr "" "MOT :\n" " literal, shell, shell-always, c ou escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -6167,18 +6251,19 @@ msgstr "" "fichier,\n" " en bloc\n" -#: src/ls.c:4886 +#: src/ls.c:4881 +#, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S trier selon la taille des fichiers\n" " --sort=MOT trier selon MOT au lieu du nom : " @@ -6195,7 +6280,7 @@ msgstr "" "indiquée\n" " comme clef de tri si --sort=time\n" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -6223,7 +6308,7 @@ msgstr "" " 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:4908 +#: src/ls.c:4904 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -6233,11 +6318,12 @@ msgstr "" " -T, --tabsize=COLS utiliser des tabulations à chaque COLS au lieu " "de 8\n" -#: src/ls.c:4912 +#: src/ls.c:4908 +#, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -6252,13 +6338,15 @@ msgstr "" " -v tri naturel des numéros (de versions) dans le " "texte\n" -#: src/ls.c:4919 +#: src/ls.c:4915 +#, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=COLS définir la largeur de l'écran au lieu de la " "valeur\n" @@ -6271,7 +6359,7 @@ msgstr "" "fichier\n" " -1 afficher un fichier par ligne\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6289,7 +6377,7 @@ msgstr "" "la\n" "commande dircolors pour le définir.\n" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6322,20 +6410,20 @@ msgid "David Madore" msgstr "David Madore" #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" "Utilisation : %s [OPTION]... [FICHIER]...\n" "Afficher ou vérifier les sommes de contrôle %s (%d bits).\n" "Sans FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" @@ -6343,23 +6431,26 @@ msgstr "" "depuis\n" " l'entrée standard de tty)\n" -#: src/md5sum.c:178 -msgid " -b, --binary read in binary mode\n" +#: src/md5sum.c:180 +#, fuzzy +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary lire en mode binaire\n" # Ajout volontaire de place pour l'argument (Stéphane) -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" " -c, --check lire les sommes %s à partir des FICHIERs et les " "vérifier\n" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr " --tag créer une somme de contrôle de type BSD\n" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" @@ -6367,11 +6458,11 @@ msgstr "" "depuis\n" " l'entrée standard de tty)\n" -#: src/md5sum.c:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text lire en mode texte (par défaut)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -6393,14 +6484,15 @@ msgstr "" "\n" # Un peu d'espace en fin de ligne pour la norme... (Stéphane) -#: src/md5sum.c:206 -#, c-format +#: src/md5sum.c:209 +#, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "Les sommes sont calculées selon %s. Lors de la vérification, l'entrée\n" @@ -6411,35 +6503,35 @@ msgstr "" "d'entrée (« * » pour binaire, espace pour texte) et un nom pour chaque " "FICHIER.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s : trop de lignes de somme de contrôle" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s : % : ligne de somme de contrôle %s mal formatée" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s : Échec d'ouverture ou de lecture.\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "Échec" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "Réussi" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, 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:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" @@ -6447,32 +6539,32 @@ msgstr[0] "Attention : la ligne % n'est pas correctement formatée" msgstr[1] "" "Attention : les lignes % ne sont pas correctement formatées" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "Attention : le fichier % affiché n'a pas pu être lu" msgstr[1] "Attention : les fichiers % affichés n'ont pas pu être lus" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "Attention : la somme de contrôle % ne correspond pas" msgstr[1] "Attention : les sommes de contrôle % ne correspondent pas" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "--tag ne prend pas en charge le mode --text" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, 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:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6480,28 +6572,28 @@ msgstr "" "les options --binary et --text sont sans effet lors de la la vérification " "des sommes de contrôle" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" "l'option --status n'a de sens que lors de la vérification des sommes de " "contrôle" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -6543,22 +6635,22 @@ msgstr "" "de\n" " sécurité SELinux ou SMACK à CTX\n" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "impossible de définir le contexte de création par défaut pour %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" msgstr "impossible de restaurer le contexte pour %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "création du répertoire %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6779,7 +6871,7 @@ msgstr "trop de modèles" msgid "with --suffix, template %s must end in X" msgstr "avec --suffix, le modèle %s doit se terminer par un X" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" @@ -6923,9 +7015,8 @@ msgid "Scott Bartram" msgstr "Scott Bartram" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "Afficher chaque FICHIER sur la sortie standard avec les numéros de ligne.\n" "Sans FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n" @@ -7045,27 +7136,27 @@ msgstr "style de numérotation de corps incorrect : %s" msgid "invalid footer numbering style: %s" msgstr "style de numérotation de pied de page incorrect : %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "numéro de ligne de départ incorrect : %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "incrément de nombre de ligne incorrect : %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "nombre de lignes blanches incorrect : %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "largeur du champ de numérotation de ligne incorrect : %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "format de numérotation de ligne incorrect : %s" @@ -7088,10 +7179,10 @@ msgstr "" "\n" #: src/nohup.c:65 -#, c-format +#, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -7111,46 +7202,46 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "impossible de rendre inutilisable la sortie standard" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "les entrées sont ignorées" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "les entrées sont ignorées et la sortie est ajoutée à %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "la sortie est ajoutée à %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" "impossible de copier vers la sortie d'erreur standard pour terminer " "l'exécution" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" "entrée ignorée et sortie d'erreur standard redirigée vers la sortie standard" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "redirection de la sortie d'erreur standard vers la sortie standard" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" msgstr "impossible de rediriger vers la sortie d'erreur standard" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -7177,57 +7268,52 @@ msgstr "" " --all afficher le nombre de processeurs installés\n" " --ignore=N si possible, exclure N unités de traitement\n" -#: src/nproc.c:107 -#, c-format -msgid "%s: invalid number to ignore" -msgstr "%s : nombre à ignorer incorrect" - #. This is a proper name. See the gettext manual, section Names. -#: src/numfmt.c:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "Assaf Gordon" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "valeur trop grande pour être convertie : %s" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, c-format msgid "invalid number: %s" msgstr "nombre incorrect : %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, 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:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" msgstr "suffixe incorrect en entrée : %s" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, 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:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "impossible de préparer la valeur « %Lf » pour l'affichage" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, c-format msgid "invalid unit size: %s" msgstr "taille d'unité incorrecte : %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Utilisation : %s [OPTION]... [NOMBRE]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" @@ -7236,27 +7322,30 @@ msgstr "" "n'est\n" "indiqué.\n" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" " --debug afficher les avertissements en cas d'entrée " "incorrecte\n" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" " -d, --delimiter=X utiliser X au lieu d'un blanc comme délimiteur de " "champ\n" -#: src/numfmt.c:827 +#: src/numfmt.c:893 +#, fuzzy msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" " --field=N remplacer le nombre dans le champs d'entrée N\n" " (1 par défaut)\n" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" @@ -7265,7 +7354,7 @@ msgstr "" "FORMAT ;\n" " consultez FORMAT plus bas pour des précisions\n" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" @@ -7275,14 +7364,14 @@ msgstr "" " entrée ; « none » par défaut ; consultez ÉCHELLE\n" " ci-dessous\n" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" " --from-unit=N indiquer la taille d’unité en entrée (1 par défaut)\n" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -7296,7 +7385,7 @@ msgstr "" " régionaux (donc sans effet avec les locales C/" "POSIX)\n" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" @@ -7304,7 +7393,7 @@ 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:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" @@ -7313,7 +7402,7 @@ msgstr "" "être\n" " abort (par défaut), fail, warn ou ignore\n" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -7331,7 +7420,7 @@ msgstr "" "blanc\n" " est trouvé\n" -#: src/numfmt.c:860 +#: src/numfmt.c:927 msgid "" " --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" " up, down, from-zero (default), towards-zero, " @@ -7342,7 +7431,7 @@ msgstr "" " « from-zero » (par défaut), « towards-zero » ou\n" " « nearest »\n" -#: src/numfmt.c:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" @@ -7351,21 +7440,21 @@ msgstr "" "le\n" " SUFFIXE facultatif aux nombres en entrée\n" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" " --to=ÉCHELLE mettre à l’ÉCHELLE automatiquement les nombres en\n" " sortie ; consultez ÉCHELLE plus bas\n" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" " --to-unit=N la taille d’unité en sortie (au lieu de 1 par " "défaut)\n" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" @@ -7373,13 +7462,13 @@ msgstr "" "\n" "Options ÉCHELLE :\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 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:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -7394,7 +7483,7 @@ msgstr "" " 1Mi = 1048576 ;\n" " ...\n" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -7406,7 +7495,7 @@ msgstr "" " 1M = 1000000 ;\n" " ...\n" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7418,7 +7507,7 @@ msgstr "" " 1M = 1048576 ;\n" " ...\n" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7430,8 +7519,29 @@ msgstr "" " 1Mi = 1048576 ;\n" " ...\n" -#: src/numfmt.c:906 -#, c-format +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Chaque intervalle est l'un de :\n" +"\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 FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n" + +#: src/numfmt.c:983 +#, fuzzy, c-format msgid "" "\n" "FORMAT must be suitable for printing one floating-point argument '%f'.\n" @@ -7439,6 +7549,7 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" "\n" "FORMAT doit être adapté à l'affichage d'un argument de virgule flottante " @@ -7451,7 +7562,7 @@ msgstr "" "Les\n" "valeurs négatives facultatives (%-10f) aligneront la sortie à gauche.\n" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7471,8 +7582,8 @@ msgstr "" "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:922 -#, c-format +#: src/numfmt.c:1000 +#, fuzzy, c-format msgid "" "\n" "Examples:\n" @@ -7486,8 +7597,8 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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 "" @@ -7508,118 +7619,129 @@ msgstr "" " $ ls -lh | %s --header --field 5 --from=iec --padding=10\n" " $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n" -#: src/numfmt.c:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "le format %s ne contient pas de directive %%" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "format %s incorrect (dépassement de largeur)" # NOTE: s/dd/d/ -#: src/numfmt.c:1008 -#, c-format -msgid "--format padding overridding --padding" +#: src/numfmt.c:1085 +#, fuzzy, c-format +msgid "--format padding overriding --padding" msgstr "--format de remplissage écrasant --padding" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "le format %s termine avec %%" -#: src/numfmt.c:1030 -#, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "précision incorrecte : %s" + +#: src/numfmt.c:1126 +#, fuzzy, c-format +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "format %s incorrect, la directive doit être %%[0]['][-][N]f" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "le format %s contient trop de directives %%" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, c-format msgid "invalid suffix in input %s: %s" msgstr "suffixe incorrect dans l'entrée %s : %s" -#: src/numfmt.c:1103 -#, c-format -msgid "value too large to be printed: '%Lg' (consider using --to)" +#: src/numfmt.c:1206 +#, fuzzy, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" msgstr "" "valeur trop grande pour être affichée : « %Lg » (songez à utiliser --to)" -#: src/numfmt.c:1111 +#: src/numfmt.c:1210 +#, 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:1219 #, 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:1196 +#: src/numfmt.c:1305 #, 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:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, 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" +msgid "invalid field value %s" +msgstr "valeur de champ %s incorrecte" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, c-format msgid "invalid padding value %s" msgstr "valeur de remplissage %s incorrecte" -#: src/numfmt.c:1417 -#, c-format -msgid "invalid field value %s" -msgstr "valeur de champ %s incorrecte" +#: src/numfmt.c:1646 +#, fuzzy, c-format +msgid "multiple field specifications" +msgstr "%s : spécification de champ incorrect %s" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, c-format msgid "invalid header value %s" msgstr "valeur d'en-tête %s incorrecte" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "--grouping ne peut pas être combiné avec --format" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "aucune option de conversion indiquée" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "le groupement ne peut pas être combiné avec --format" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, 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:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "--header ignoré avec l'entrée en ligne de commande" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "erreur de lecture de l'entrée" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "impossible de convertir certains des nombres en entrée" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7632,14 +7754,13 @@ msgstr "" " ou : %s --traditional [OPTION]... [FICHIER] [[+]POSITION[.][b] \\\n" " [+][ÉTIQUETTE][.][b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" @@ -7647,8 +7768,10 @@ msgstr "" "Sans FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 +#, 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" @@ -7666,7 +7789,7 @@ msgstr "" "Pour POSITION et ÉTIQUETTE, un préfixe 0x ou 0X indique de l'hexadécimal ;\n" "les suffixes peuvent être . pour l'octal et b pour multiple de 512.\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7683,7 +7806,7 @@ msgstr "" " indiqué\n" " -j, --skip-bytes=OCTETS ignorer OCTETS premiers octets en entrée\n" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -7706,7 +7829,7 @@ msgstr "" " --traditional accepter les arguments sous la troisième\n" " forme précédente\n" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -7729,7 +7852,7 @@ msgstr "" " -d identique à -t u2, sélectionner les décimaux non signées sur " "2 octets\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7746,7 +7869,7 @@ msgstr "" " -x identique à -t x2, sélectionner les nombres hexadécimaux sur " "2 octets\n" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -7760,7 +7883,7 @@ msgstr "" " a caractère nommé, en ignorant le bit de poids fort\n" " c caractère affichable ou protection par barre oblique inverse\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7774,7 +7897,7 @@ msgstr "" " u[TAILLE] décimal non signé TAILLE octets par entier\n" " x[TAILLE] hexadécimal, TAILLE octets par entier\n" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -7790,7 +7913,7 @@ msgstr "" "Si le TYPE est f, TAILLE peut aussi être F pour sizeof(float), D pour\n" "sizeof(double) ou L pour sizeof(long double).\n" -#: src/od.c:401 +#: src/od.c:404 msgid "" "\n" "Adding a z suffix to any type displays printable characters at the end of\n" @@ -7800,7 +7923,7 @@ msgstr "" "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:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -7823,12 +7946,12 @@ msgstr "" " M 1024*1024 ;\n" "et ainsi de suite pour G, T, P, E, Z et Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "type de chaîne %s incorrect" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7837,7 +7960,7 @@ msgstr "" "type de chaîne %s incorrect ;\n" "ce système ne fournit pas de type entier sur %lu octets" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7846,38 +7969,38 @@ msgstr "" "type de chaîne %s incorrect ;\n" "ce système ne fournit pas de type en point flottant sur %lu octets" -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" msgstr "caractère « %c » incorrect dans le type de chaîne %s" -#: src/od.c:1094 +#: src/od.c:1105 #, 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:1650 +#: src/od.c:1658 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" "adresse radix de sortie « %c » incorrecte, ce doit être caractère parmi " "[doxn]" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "aucun type ne peut être indiqué lors de l'affichage brut des chaînes" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "le mode de compatibilité ne prend pas en charge plusieurs fichiers" -#: src/od.c:1884 +#: src/od.c:1892 #, 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:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "avertissement : largeur %lu incorrecte ; %d sera utilisé à la place" @@ -7893,10 +8016,10 @@ msgid "standard input is closed" msgstr "l'entrée standard est fermée" #: src/paste.c:439 +#, fuzzy msgid "" "Write lines consisting of the sequentially corresponding lines from\n" "each FILE, separated by TABs, to standard output.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Écrire séquentiellement les lignes correspondantes de chaque\n" "FICHIER, séparées par des tabulations, vers la sortie standard.\n" @@ -8045,12 +8168,12 @@ msgstr "Quand" msgid "Where" msgstr "Où" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Utilisation : %s [OPTION]... [UTILIS]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -8070,7 +8193,7 @@ msgstr "" " -s afficher au format court, c'est le comportement par " "défaut\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -8086,7 +8209,7 @@ msgstr "" " -q omettre le nom complet de l'utilisateur, le nom de l'hôte\n" " et le temps d'inactivité au format court\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -8097,7 +8220,7 @@ msgstr "" "Une version allégée du programme « finger » ; afficher les renseignements\n" "relatifs à un utilisateur. Le fichier utmp sera %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -8105,93 +8228,93 @@ msgstr "" "est utilisée" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "argument « --page=PREMIÈRE_PAGE[:DERNIÈRE_PAGE] » manquant" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "intervalle de pages %s incorrect" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "« -l TAILLE_PAGE » nombre de lignes incorrect : %s" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "« -N NUMÉRO » numéro de ligne de début incorrect : %s" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "« -o MARGE » saut de ligne incorrect : %s" -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "« -w LARGEUR_PAGE » nombre de caractères incorrect : %s" -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "« -W LARGEUR_PAGE » nombre de caractères incorrect : %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" "impossible d'indiquer le nombre de colonnes lors d'une impression en " "parallèle" -#: src/pr.c:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "impossible d'indiquer un affichage à la fois croisé et en parallèle" -#: src/pr.c:1196 +#: src/pr.c:1166 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "caractères « -%c » superflus ou nombre incorrect dans l'argument : %s" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "la largeur de page est trop petite" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" "le numéro % de page de départ dépasse le décompte de page %" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "débordement du numéro de page" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Page %" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "Paginer ou mettre en colonne le ou les FICHIERs pour impression.\n" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -8210,7 +8333,7 @@ msgstr "" "de\n" " chaque colonne sur chaque page\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -8227,7 +8350,7 @@ msgstr "" " oblique inverse\n" " -d, --double-space doubler les espaces à l'affichage\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -8250,7 +8373,7 @@ msgstr "" " séparer les pages (trois lignes par en-tête avec -F ou\n" " cinq lignes par en-tête et bas de page sans -f)\n" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -8276,11 +8399,28 @@ msgstr "" " des lignes -W, sans alignement des colonnes,\n" " --sep-string[=CHAÎNE] définit les séparateurs\n" -#: src/pr.c:2798 +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l, --length=TAILLE_PAGE\n" +" définir la taille de page à TAILLE_PAGE (66 par défaut)\n" +" lignes (par, défaut une page contient 56 lignes de " +"texte,\n" +" 63 avec l'option -F)\n" +" -m, --merge imprimer tous les fichiers en parallèle, un par " +"colonne,\n" +" tronquer les lignes, mais joindre les lignes de " +"longueur\n" +" complète avec -J\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -8295,7 +8435,7 @@ msgstr "" "longueur\n" " complète avec -J\n" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -8316,7 +8456,7 @@ msgstr "" "la\n" " première page imprimée (consultez +PREMIÈRE_PAGE)\n" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -8332,7 +8472,7 @@ msgstr "" "être\n" " ouvert\n" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -8349,14 +8489,14 @@ msgstr "" " ligne pour les trois options de colonnes\n" " (-COLONNE|-a - COLONNE|-m) sauf si -w est défini\n" -#: src/pr.c:2828 +#: src/pr.c:2802 +#, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -S[CHAÎNE], --sep-string[=CHAÎNE]\n" " séparer les colonnes par CHAÎNE ; sans -S, le séparateur " @@ -8366,7 +8506,13 @@ msgstr "" " sans effet sur les options de colonne\n" " -t, --omit-header ne pas afficher les en-têtes et les pieds de page\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -8394,7 +8540,7 @@ msgstr "" " colonnes. Cette option est annulée si utilisée avec -" "s[CAR]\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -8407,17 +8553,6 @@ msgstr "" " (72 colonnes par défaut), sauf lorsque l'option -J est\n" " active, sans interférence avec -S ou -s\n" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"-t est implicite si TAILLE_PAGE <= 10. Sans FICHIER, ou quand FICHIER est " -"-,\n" -"lire l'entrée standard.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -8577,11 +8712,11 @@ msgstr "" "Afficher un index permuté, incluant le contexte des mots des fichiers " "d'entrée.\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 +#, fuzzy 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 afficher références générées " "automatiquement\n" @@ -8593,6 +8728,12 @@ msgstr "" #: src/ptx.c:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -8608,7 +8749,7 @@ msgstr "" " -S, --sentence-regexp=EXP_RAT pour les fins de lignes ou de phrases\n" " -T, --format=tex générer la sortie comme des directives TeX\n" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8629,7 +8770,7 @@ msgstr "" " -o, --only-file=FICHIER lire la liste des mots à conserver dans " "FICHIER\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8641,20 +8782,16 @@ msgstr "" " -w, --width=NOMBRE largeur d'affichage en colonnes, sans " "référence\n" -#: src/ptx.c:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Sans FICHIER ou si FICHIER est -, lire l'entrée standard. « -F / » par " -"défaut.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "largeur de saut incorrecte : %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "largeur de ligne incorrecte : %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8686,7 +8823,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "impossible de changer de répertoire vers %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "impossible d’obtenir l’état de %s" @@ -8708,8 +8845,8 @@ msgstr "ignore les arguments qui ne sont pas des options" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Utilisation : %s [OPTION]... FICHIER...\n" @@ -8990,16 +9127,16 @@ msgstr "" "récupérable, envisagez l'utilisation de « shred ».\n" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s : supprimer l’argument %zu récursivement ? " msgstr[1] "%s : supprimer les arguments %zu récursivement ? " #: src/rm.c:345 -#, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +#, fuzzy, c-format +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s : supprimer l’argument %zu ? " msgstr[1] "%s : supprimer les arguments %zu ? " @@ -9223,12 +9360,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "argument à virgule flottante incorrect : %s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "le format %s contient une directive %%%c inconnue" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -9248,7 +9385,16 @@ msgstr "" "Écraser le FICHIER indiqué de manière répétée, afin de rendre difficile\n" "toute récupération des données par du matériel même coûteux.\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Si FICHIER est -, recopier sur la sortie standard.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -9262,7 +9408,7 @@ msgstr "" " --random-source=FICHIER obtenir des octets aléatoires de FICHIER\n" " -s, --size=N broyer N octets (les suffixes comme K, M, G sont acceptés)\n" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -9282,11 +9428,10 @@ msgstr "" "le\n" " broyage du fichier\n" -#: src/shred.c:192 +#: src/shred.c:196 +#, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -9313,7 +9458,7 @@ msgstr "" "Le mode par défaut est « wipesync », mais cela peut être coûteux.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -9332,7 +9477,7 @@ msgstr "" "lesquels le broyage n'est pas effectif dans tous les modes :\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 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 +9501,7 @@ msgstr "" " Network Appliance\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -9370,7 +9515,7 @@ msgstr "" "* systèmes de fichiers compressés\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -9393,7 +9538,7 @@ msgstr "" "dans le fichier /etc/fstab, tel que documenté dans la page man mount(8).\n" "\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -9404,129 +9549,129 @@ msgstr "" "contenir des copies des fichiers qui ne peuvent être supprimés et qui\n" "permettront à un fichier broyé d'être récupéré ultérieurement.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s : échec de fdatasync" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s : échec de fsync" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s : impossible de rembobiner" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s : passe %lu/%lu (%s)…" -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s : erreur d'écriture au décalage %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s : échec de lseek" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s : fichier trop gros" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s : passe %lu/%lu (%s)…%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s : passe %lu/%lu (%s)…%s/%s %d %%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s : échec de fstat" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s : type de fichier incorrect" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s : le fichier a une taille négative" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s : erreur de troncature" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s : échec de fcntl" -#: src/shred.c:994 +#: src/shred.c:996 #, 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:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s : suppression" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s : renommé en %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s : impossible de supprimer" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s : supprimé" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s : impossible de fermer" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s : impossible d’ouvrir en écriture" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s : nombre de passes incorrect" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "plusieurs sources aléatoires indiquées" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s : longueur de fichier incorrect" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -9537,13 +9682,13 @@ msgstr "" " ou : %s -e [OPTION]... [ARG]...\n" " ou : %s -i MIN-MAX [OPTION]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" "Afficher une permutation aléatoire des lignes entrées sur la sortie " "standard.\n" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -9564,37 +9709,37 @@ msgstr "" " --random-source=FICHIER obtenir des octets aléatoires de FICHIER\n" " -r, --repeat les lignes affichées peuvent être répétées\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "trop de lignes d’entrée" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "plusieurs options -l indiquées" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "intervalle d'entrée %s incorrect" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "compteur de lignes %s incorrect" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "plusieurs fichiers de sortie indiquées" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "impossible de combiner les options -e et -i" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "aucune ligne à répéter" @@ -9622,12 +9767,12 @@ msgstr "" "Avec plusieurs arguments, la pause se fait selon la somme des valeurs.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "intervalle de temps %s incorrect" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "impossible de lire l'horloge temps réel" @@ -9638,7 +9783,7 @@ msgstr "" "Afficher la concaténation triée de tous les FICHIERs sur la sortie " "standard.\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -9646,7 +9791,7 @@ msgstr "" "Options de tri :\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9659,7 +9804,7 @@ msgstr "" " alphanumériques\n" " -f, --ignore-case transformer les minuscules en majuscules\n" -#: src/sort.c:443 +#: src/sort.c:444 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -9670,14 +9815,14 @@ msgstr "" " -M, --month-sort comparer (inconnu) < « JANV. » < ... < " "« DÉC. »\n" -#: src/sort.c:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" " -h, --human-numeric-sort comparer des chiffres lisibles (par exemple 2K " "1G)\n" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9690,7 +9835,7 @@ msgstr "" " --random-source=FICHIER obtenir des octets aléatoires de FICHIER\n" " -r, --reverse inverser le résultat des comparaisons\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9708,7 +9853,7 @@ msgstr "" " le texte\n" "\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -9716,7 +9861,7 @@ msgstr "" "Autres Options :\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9724,7 +9869,7 @@ msgstr "" " --batch-size=NMERGE fusionner au plus NMERGE entrées à la fois ;\n" " pour plus, employez des fichiers temporaires\n" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -9740,7 +9885,7 @@ msgstr "" " --compress-program=PROG compresser les temporaires avec PROG et les\n" " décompresser avec PROG -d\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9758,7 +9903,7 @@ msgstr "" " Si F est -, lire les noms depuis l'entrée " "standard\n" -#: src/sort.c:487 +#: src/sort.c:488 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -9769,7 +9914,7 @@ msgstr "" " -m, --merge fusionner les fichiers déjà triés ; ne pas " "trier\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9785,7 +9930,7 @@ msgstr "" " -S, --buffer-size=TAILLE utiliser TAILLE pour le tampon mémoire " "principal\n" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9812,7 +9957,7 @@ msgstr "" "d'une\n" " passe équivalente\n" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9843,12 +9988,11 @@ msgstr "" "\n" "TAILLE peut être suivi d'un des suffixes multiplicatifs suivants :\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -9864,268 +10008,270 @@ msgstr "" "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:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "en attente de %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] a terminé anormalement" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "impossible de créer le fichier temporaire dans %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "échec d'ouverture" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "échec de fflush" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "échec de fermeture" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "impossible de créer le fichier temporaire" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "impossible de créer le processus pour %s -d" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "avertissement : impossible de supprimer : %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "argument %2$s de --%1$s incorrect" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "l'argument minimal de --%s est %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "argument de --%s %s trop grand" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "l'argument maximal de --%s avec la rlimit actuelle est %s" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "le nombre en parallèle doit être non nul" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "échec de stat()" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "échec de lecture" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "échec de transformation de chaîne" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "la chaîne non transformée était %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "^ ne correspond à aucun mot clef\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "le mot clef obsolète « %s » est utilisé ; considérez « %s » à la place" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "le mot clef %lu a une largeur nulle et sera ignoré" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" "les espaces au début sont significatifs dans le mot clef %lu ; considérez " "aussi l'emploi de « b »" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "le mot clef %lu est numérique et s'étend sur plusieurs champs" -#: src/sort.c:2484 +#: src/sort.c:2483 #, 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:2490 +#: src/sort.c:2489 #, 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:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "échec d'écriture" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s : %s:%s : désordre : " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "erreur standard" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "impossible de lire" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s : spécification de champ incorrect %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "les options « -%s » sont incompatibles" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s : compteur incorrect au départ de %s" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "nombre incorrect après « - »" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "nombre incorrect après « . »" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "caractère égaré dans le champ de spécification" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "plusieurs programmes de compression indiqués" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "nombre incorrect dans le champ de départ" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "le numéro de champ est zéro" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "l'adresse relative du caractère est zéro" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" msgstr "nombre incorrect après « , »" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "tabulation vide" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "impossible de lire les noms de fichiers à partir de %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu : incorrect, nom de fichier de longueur nulle" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "aucune d'entrée depuis %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "utilisation des règles de tri %s" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "utilisation de la comparaison simple d'octet" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "opérande supplémentaire « %s » non permis avec -%c" -#: src/split.c:186 -#, c-format -msgid "the suffix length needs to be at least %zu" +#: src/split.c:207 +#, fuzzy, c-format +msgid "the suffix length needs to be at least %" msgstr "la longueur du suffixe doit au minimum être %zu" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Utilisation : %s [OPTION]... [ENTRÉE [PRÉFIXE]]\n" -#: src/split.c:207 +#: src/split.c:228 +#, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" "Afficher des morceaux de ENTRÉE de taille fixe selon PRÉFIXEaa, " "PRÉFIXEab, ... ;\n" "la taille est de 1000 lignes et le préfixe est « x » par défaut.\n" "Sans ENTRÉE, ou quand ENTRÉE est -, lire l'entrée standard.\n" -#: src/split.c:215 -#, c-format +#: src/split.c:236 +#, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file names\n" " -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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" " -a, --suffix-length=N générer ces suffixes de longueur N (%d par " @@ -10152,7 +10298,7 @@ msgstr "" " -u, --unbuffered copier immédiatement l'entrée sur la sortie avec\n" " « -n r/... »\n" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -10160,16 +10306,17 @@ msgstr "" " --verbose afficher un diagnostic juste avant l'ouverture de\n" " chaque fichier de sortie\n" -#: src/split.c:235 +#: src/split.c:258 +#, fuzzy 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" "\n" "PARTIES peut être :\n" @@ -10180,193 +10327,198 @@ msgstr "" "r/N comme « l » mais utiliser une distribution « round robin »\n" "r/K/N identique mais n'afficher que le Kième de N sur la sortie\n" -#: src/split.c:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "les suffixes des fichiers de sortie sont épuisés" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "création du fichier %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "%s écraserait l'entrée ; abandon" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "impossible de définir la variable d'environnement FILE" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "exécution avec FILE=%s\n" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "impossible de créer le tube" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "fermeture du tube précédent" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "fermeture du tube de sortie" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "déplacement du tube d'entrée" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "fermeture du tube d'entrée" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "impossible d'exécuter la commande : « %s -s %s »" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "impossible de fermer le tube d'entrée" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "en attente du processus fils" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "avec FILE=%s, signal %s de la commande : %s" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "avec FILE=%s, sortie %d de la commande : %s" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "état inconnu de la commande (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "impossible de séparer de plusieurs manières" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s : nombre de morceaux incorrect" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s : numéro de morceau incorrect" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s : longueur de suffixe incorrecte" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s : nombre d'octets incorrect" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s : nombre de lignes incorrect" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "tabulation multicaractère %s" -#: src/split.c:1286 +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "fichier spécial de caractères multiplexé" + +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "l'option de décompte de ligne -%s%c... est trop grande" -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s : valeur de départ incorrecte pour le suffixe numérique" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s : taille de bloc d'E/S incorrecte" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "--filter ne traite pas les morceaux extraits vers la sortie standard" -#: src/split.c:1384 +#: src/split.c:1477 #, 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:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "impossible de canoniser %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "avertissement : séquence de protection « \\%c » non reconnue" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s : directive incorrecte" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "avertissement : barre oblique inverse à la fin du format" -#: src/stat.c:1262 +#: src/stat.c:1265 #, 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:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "impossible de lire les informations du système de fichiers pour %s" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -10382,7 +10534,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -10392,31 +10544,31 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 msgid "Device: %Dh/%dd\tInode: %-10i Links: %-5h Device type: %t,%T\n" msgstr "" "Périphérique : %Dh/%dd\tInœud : %-10i Liens : %-5h Type de périph. : %t,%T\n" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1367 +#: src/stat.c:1370 msgid "Device: %Dh/%dd\tInode: %-10i Links: %h\n" msgstr "Périphérique : %Dh/%dd\tInœud : %-10i Liens : %h\n" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "Contexte : %C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -10428,11 +10580,11 @@ msgstr "" "Changt : %z\n" " Créé : %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 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:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" @@ -10441,7 +10593,7 @@ msgstr "" " -f, --file-system afficher l'état du système de fichiers au lieu de\n" " l'état du fichier\n" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -10463,7 +10615,7 @@ msgstr "" " -t, --terse afficher l'information dans un format " "compréhensible\n" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -10483,7 +10635,7 @@ msgstr "" " %B la taille en octets de chaque bloc rapportée par %b\n" " %C la chaîne de contexte de sécurité SELinux\n" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -10499,7 +10651,7 @@ msgstr "" " %g GID du propriétaire\n" " %G nom de groupe du propriétaire\n" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -10525,7 +10677,7 @@ msgstr "" "spéciaux de\n" " périphériques caractère ou bloc\n" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -10551,7 +10703,7 @@ msgstr "" " %Z date du dernier changement d’état en seconde depuis Epoch\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -10569,7 +10721,7 @@ msgstr "" " %d nœuds de fichiers libres dans le système de fichiers\n" " %f blocs libres dans le système de fichiers\n" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -10648,11 +10800,11 @@ msgstr "" "tampon définit à MODE octets.\n" #: src/stdbuf.c:116 +#, fuzzy 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" +"for example) then that will override corresponding changes 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 "" @@ -10686,7 +10838,7 @@ msgstr "la mise en tampon de l'entrée standard est sans effet" msgid "you must specify a buffering mode option" msgstr "vous devez indiquer une option de mode de mise en tampon" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10697,11 +10849,11 @@ msgstr "" " ou : %s [-F PÉRIPHÉRIQUE | --file=PÉRIPHÉRIQUE] [-a|--all]\n" " ou : %s [-F PÉRIPHÉRIQUE | --file=PÉRIPHÉRIQUE] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "Afficher ou modifier les caractéristiques du terminal.\n" -#: src/stty.c:528 +#: src/stty.c:536 msgid "" " -a, --all print all current settings in human-readable form\n" " -g, --save print all current settings in a stty-readable form\n" @@ -10714,7 +10866,7 @@ msgstr "" " -F, --file=PÉRIPHÉRIQUE utiliser le PÉRIPHÉRIQUE indiqué au lieu de\n" " l'entrée standard\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10725,11 +10877,24 @@ msgstr "" "paramètres non POSIX. Le système sous-jacent détermine les paramètres\n" "applicables.\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -10741,9 +10906,13 @@ msgstr "" " eof CAR CAR émettra une fin de fichier (pour arrêter l'entrée)\n" " eol CAR CAR arrêtera la ligne\n" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -10753,35 +10922,58 @@ msgstr "" " intr CAR CAR émettra un signal d'interruption\n" " kill CAR CAR supprimera la ligne actuelle\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" msgstr "" -" * lnext CAR CAR entrera le prochain caractère entre guillemets\n" -" quit CAR CAR émettra un signal de fin\n" -" * rprnt CAR CAR réaffichera la ligne actuelle\n" -" start CAR CAR redémarrera la sortie après l'avoir arrêtée\n" -#: src/stty.c:559 +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 CAR CAR arrêtera la sortie\n" " susp CAR CAR émettra un signal d'arrêt de terminal\n" " * swtch CAR CAR permettra de basculer à une couche différente du shell\n" " * werase CAR CAR supprimera le dernier mot saisi\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 +#, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Paramètres spéciaux :\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:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -10791,10 +10983,17 @@ msgstr "" " * cols N indiquer au noyau que le terminal a N colonnes\n" " * columns N identique à « cols N »\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -10805,11 +11004,24 @@ msgstr "" " nécessaires pour obtenir une lecture complète\n" " ospeed N initialiser la vitesse de sortie à N\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * 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:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -10821,26 +11033,28 @@ msgstr "" "à\n" " N dixièmes de seconde\n" -#: src/stty.c:584 +#: src/stty.c:641 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 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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 +#, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -10848,7 +11062,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb utiliser 2 bits d'arrêt par caractère (un avec « - »)\n" " [-]hup émettre un signal de déconnexion quand le dernier " @@ -10861,7 +11074,12 @@ msgstr "" " [-]parodd utiliser une parité impaire (ou paire avec « - »)\n" " * [-]cmspar utiliser une parité « stick » (marque ou espace)\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -10869,6 +11087,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Paramètres d'entrée :\n" @@ -10877,10 +11096,14 @@ msgstr "" " [-]ignbrk ignorer les caractères break\n" " [-]igncr ignorer le retour chariot\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -10893,15 +11116,25 @@ msgstr "" " [-]inpck autoriser la vérification de la parité à l'entrée\n" " [-]istrip effacer le bit de poids fort (8e) des caractères en entrée\n" -#: src/stty.c:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" " * [-]iutf8 présumer que les caractères en entrée sont codés en UTF-8\n" -#: src/stty.c:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" +" * [-]iutf8 présumer que les caractères en entrée sont codés en UTF-8\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -10918,62 +11151,83 @@ msgstr "" " caractères (255-0)\n" " [-]tandem identique à [-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\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" -#: src/stty.c:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" -msgstr "" -" * [-]ocrnl 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 NULL\n" -" * [-]ofill utiliser le remplissage de caractères au lieu du délai par\n" -" minuterie\n" -" * [-]olcuc traduire les minuscules en majuscules\n" -" * [-]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" +msgstr "" -#: src/stty.c:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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 "" -" * [-]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:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10986,47 +11240,65 @@ msgstr "" " * -crtkill supprimer toute la ligne en respectant les paramètres\n" " « echoctl » et « echok »\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +#, fuzzy +msgid " [-]echo echo input characters\n" +msgstr "" +" * [-]iutf8 présumer que les caractères en entrée sont codés en UTF-8\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]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" +" [-]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:672 +#: src/stty.c:843 +#, fuzzy 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 "" " [-]isig autoriser les caractères spéciaux\n" " « interrupt », « quit » et « suspend »\n" @@ -11038,11 +11310,33 @@ msgstr "" " le terminal\n" " * [-]xcase avec « icanon », protéger les majuscules avec « \\ »\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -11052,41 +11346,50 @@ msgstr "" " cbreak identique à -icanon\n" " -cbreak identique à icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\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" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 +#, fuzzy 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 "" " -evenp identique à -parenb cs8\n" " * [-]lcase identique à xcase iuclc olcuc\n" @@ -11095,7 +11398,19 @@ msgstr "" " nl identique à -icrnl -onlcr\n" " -nl identique à icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"Paramètres de combinaison :\n" +" * [-]LCASE identique à [-]lcase\n" +" cbreak identique à -icanon\n" +" -cbreak identique à icanon\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -11109,11 +11424,12 @@ msgstr "" " pass8 identique à -parenb -istrip cs8\n" " -pass8 identique à parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw identique à -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" @@ -11121,14 +11437,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw identique à cooked\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane identique à cread -ignbrk brkint -inlcr -igncr icrnl -" "iutf8\n" @@ -11139,7 +11456,7 @@ msgstr "" "caractères\n" " spéciaux avec leur valeur par défaut.\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -11156,12 +11473,12 @@ msgstr "" "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:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "un seul périphérique peut être indiqué" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -11171,46 +11488,51 @@ msgstr "" "stty\n" "sont mutuellement exclusives" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" "les mode ne peuvent pas être initialisés quand le style de sortie est indiqué" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s : impossible de réinitialiser le mode non bloquant" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "argument %s incorrect" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "argument manquant pour %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s : erreur de troncature" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "procédure de contrôle %s incorrecte" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s : impossible d'effectuer toutes les opérations demandées" -#: src/stty.c:1403 +#: src/stty.c:1747 #, 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:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "argument numérique %s incorrect" #. This is a proper name. See the gettext manual, section Names. @@ -11219,8 +11541,16 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Afficher la somme de contrôle CRC et le décompte d'octets de chaque " +"FICHIER.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -11234,21 +11564,54 @@ msgstr "" "des\n" " blocs de 512 octets\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, fuzzy, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Utilisation : %s [OPTION]... [FICHIER]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Forcer l'écriture des blocs modifiés sur disque et la mise à jour du super " -"bloc.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" -#: src/sync.c:69 +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "erreur de lecture %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s : impossible de réinitialiser le mode non bloquant" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "erreur de lecture %s" + +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "ignorer tous les arguments" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -11262,15 +11625,23 @@ msgstr "" "documentation de l'interpréteur pour obtenir des précisions sur les options\n" "prises en charge.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help afficher l'aide et quitter\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version afficher des informations de version et quitter\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Sans FICHIER ou quand FICHIER est -, lire l'entrée standard.\n" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -11279,7 +11650,7 @@ msgstr "" "Les arguments obligatoires pour les options longues le sont aussi pour les\n" "options courtes.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -11293,7 +11664,7 @@ msgstr "" "ou\n" "KB, MB, etc. (puissances de 1000).\n" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -11310,7 +11681,7 @@ msgstr "" "1 024 octets\n" "(ou 512 si POSIXLY_CORRECT est défini).\n" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -11324,24 +11695,28 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" "Signalez les problèmes de traduction de « %s » à : \n" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -"Utilisez « info coreutils '%s invocation' » pour toute la documentation\n" -#: src/system.h:591 +#: src/system.h:613 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Saisissez « %s --help » pour plus d'informations.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -11362,9 +11737,8 @@ msgid "Jay Lepreau" msgstr "Jay Lepreau" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "Écrire chaque FICHIER sur la sortie standard, la dernière ligne en premier.\n" "Sans FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n" @@ -11381,63 +11755,62 @@ msgstr "" " -s, --separator=CHAÎNE utiliser CHAÎNE comme séparateur au lieu d'un\n" " changement de ligne\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s : échec de positionnement (seek)" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "enregistrement trop grand" -#: src/tac.c:450 +#: src/tac.c:459 #, c-format msgid "failed to create temporary file in %s" msgstr "impossible de créer le fichier temporaire dans %s" -#: src/tac.c:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" msgstr "impossible d’ouvrir %s en écriture" -#: src/tac.c:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" msgstr "impossible de rembobiner le flux pour %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s : erreur d'écriture" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "impossible d'ouvrir %s en lecture" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "le séparateur ne peut pas être vide" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 -#, c-format +#: src/tail.c:257 +#, 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" msgstr "" "Afficher les %d dernières lignes de chaque FICHIER sur la sortie standard.\n" "Avec plusieurs FICHIERs, précéder chacun d'un en-tête donnant le nom.\n" "Sans FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" @@ -11448,7 +11821,7 @@ msgstr "" "du\n" " Kième de chaque fichier\n" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -11461,7 +11834,7 @@ msgstr "" " équivalent à 'descriptor'\n" " -F identique à --follow=name --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -11489,7 +11862,7 @@ msgstr "" " avec inotify, cette option est rarement " "utilisée\n" -#: src/tail.c:293 +#: src/tail.c:288 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -11501,7 +11874,7 @@ msgstr "" " --retry continuer d'essayer à ouvrir un fichier s’il est\n" " inaccessible\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -11519,7 +11892,7 @@ msgstr "" " -v, --verbose afficher toujours les en-têtes des noms de " "fichier\n" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -11540,7 +11913,7 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024 et ainsi de suite pour T, P, E, Z et Y.\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -11560,23 +11933,23 @@ msgstr "" "--follow=name et tail suivra l'évolution du fichier en s'accommodant des\n" "changements de nom, des suppressions ou des créations.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "fermeture de %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, 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:898 +#: src/tail.c:893 #, 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:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -11585,150 +11958,150 @@ msgstr "" "type 0x%08lx de système de fichiers non reconnu pour %s, veuillez signaler " "cela à %s, retour à l'interrogation active" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "%s a été remplacé par un lien symbolique, abandon sur ce nom" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s est devenu inaccessible" -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" "%s a été remplacé par un fichier incompatible avec tail, abandon sur ce nom" -#: src/tail.c:1006 +#: src/tail.c:999 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "%s a été remplacé par un fichier distant, abandon sur ce nom" -#: src/tail.c:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s est devenu accessible" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s est apparu ; suivi de la fin du nouveau fichier" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s a été remplacé ; suivi de la fin du nouveau fichier" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s : impossible de modifier le mode non bloquant" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s : fichier tronqué" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "aucun fichier restant" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "impossible de surveiller le répertoire parent de %s" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "les ressources inotify sont épuisés" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "impossible de surveiller %s" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s : faut-il remplacer %s ? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "erreur de suivi d'un événement inotify" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "erreur de lecture d'un événement inotify" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s : impossible de suivre la fin de ce type de fichier, abandon sur ce nom" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "le numéro dans %s est trop grand" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "" "%s : nombre maximal de changements d'état incorrect entre les ouvertures" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s : PID incorrect" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s : nombre de secondes incorrect" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "nombre de colonnes incorrect : %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "option utilisée dans un contexte incorrect — %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "avertissement : --retry ignoré ; --retry n'est utile que lors du suivi" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "avertissement : --retry n’est effective que pour l’ouverture initiale" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "avertissement : PID ignoré ; --pid=PID n'est utile que lors du suivi" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "avertissement : --pid=PID n'est pas pris en charge sur ce système" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "impossible de suivre %s selon son nom" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "avertissement : suivre l'entrée standard indéfiniment est inefficace" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "impossible d'utiliser inotify, retour à l'interrogation active" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -11741,60 +12114,72 @@ msgstr "" " -a, --append ajouter aux FICHIERs, sans les écraser\n" " -i, --ignore-interrupts ignorer les signaux d'interruption\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Si FICHIER est -, recopier sur la sortie standard.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "argument manquant après %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "entier %s incorrect" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "« ) » attendu" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "« ) » attendu, %s trouvé" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s : opérateur unaire attendu" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt ne permet pas -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef ne permet pas -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot ne permet pas -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "opérateur binaire inconnu" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s : opérateur binaire attendu" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11808,7 +12193,7 @@ msgstr "" " ou : [ ]\n" " ou : [ OPTION ]\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11816,7 +12201,7 @@ msgstr "" "Terminer l'exécution avec l'état déterminé par EXPRESSION.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11827,7 +12212,7 @@ msgstr "" "vraie\n" "ou fausse et initialise l'état de fin d'exécution. Une parmi :\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11843,7 +12228,7 @@ msgstr "" " EXPRESSION1 -o EXPRESSION2 si l'une des deux EXPRESSION1 ou EXPRESSION2\n" " est vraie\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11859,7 +12244,7 @@ msgstr "" " CHAÎNE1 = CHAÎNE2 les chaînes sont identiques\n" " CHAÎNE1 != CHAÎNE2 les chaînes sont différentes\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11877,7 +12262,7 @@ msgstr "" " INTEGER1 -lt INTEGER2 INTEGER1 est plus petit que INTEGER2\n" " INTEGER1 -ne INTEGER2 INTEGER1 n'est pas égal à INTEGER2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11891,7 +12276,7 @@ msgstr "" "FICHIER2\n" " FICHIER1 -ot FICHIER2 FICHIER1 est plus ancien que FICHIER2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11905,7 +12290,7 @@ msgstr "" " -d FICHIER FICHIER existe et est un répertoire\n" " -e FICHIER FICHIER existe\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11919,7 +12304,7 @@ msgstr "" " -h FICHIER FICHIER existe et est un lien symbolique (identique à -L)\n" " -k FICHIER FICHIER existe et le bit « sticky » est initialisé\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11933,7 +12318,7 @@ msgstr "" " -r FICHIER FICHIER existe et dispose des droits en lecture\n" " -s FICHIER FICHIER existe et a une taille supérieure à zéro\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11949,7 +12334,7 @@ msgstr "" "le cas\n" " d'un répertoire)\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11965,7 +12350,7 @@ msgstr "" "barres obliques inverses) dans un interpréteur.\n" "ENTIER peut être -l CHAÎNE, qui évalue alors la longueur de la chaîne.\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11977,25 +12362,25 @@ msgstr "" "test traite chacun de ceux-là comme il traite n'importe quelle CHAÎNE non " "vide.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test et/ou [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "« ] » manquant" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "argument surnuméraire %s" @@ -12015,7 +12400,7 @@ msgstr "avertissement : timer_settime" msgid "warning: timer_create" msgstr "avertissement : timer_create" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -12024,12 +12409,12 @@ msgstr "" "Utilisation : %s [OPTION] DURÉE [COMMANDE [ARG]...]\n" " ou : %s OPTION\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" "Démarrer COMMANDE et l'arrêter si elle fonctionne encore après la DURÉE.\n" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -12067,7 +12452,7 @@ msgstr "" " SIGNAL peut être un nom comme « HUP » ou un nombre ;\n" " consultez « kill -l » pour une liste des signaux\n" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -12079,7 +12464,7 @@ msgstr "" "« s » pour secondes (par défaut), « m » pour minutes, « h » pour heures\n" "ou « d » pour jours.\n" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -12099,7 +12484,7 @@ msgstr "" "peut pas être capturé, auquel cas l'état de retour est 128+9 au lieu de " "124.\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "avertissement : impossible de désactiver les core dumps" @@ -12114,6 +12499,11 @@ msgstr "erreur d'attente de la commande" msgid "the monitored command dumped core" msgstr "la commande surveillée a renvoyé un core dump" +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "état inconnu de la commande (0x%X)" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -12505,12 +12895,12 @@ msgstr "Quitter avec un code d'état indiquant le succès." msgid "Exit with a status code indicating failure." msgstr "Quitter avec un code d'état indiquant l'échec." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Utilisation : %s [OPTION]... FICHIER...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -12530,11 +12920,11 @@ msgstr "" "supplémentaire\n" "(trou) contient des octets à zéro.\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create ne pas créer de fichier\n" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" @@ -12542,7 +12932,7 @@ msgstr "" "lieu\n" " d'octets\n" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" @@ -12551,7 +12941,7 @@ msgstr "" " -s, --size=TAILLE définir ou ajuster la taille du fichier à " "TAILLE octets\n" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -12564,59 +12954,64 @@ msgstr "" "« / » arrondi au multiple inférieur de, « % » arrondi au multiple supérieur " "de.\n" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" "débordement dans % * % blocs d'octets pour le fichier %s" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s : a une taille inutilisable, apparemment négative" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "impossible d'obtenir la taille de %s" -#: src/truncate.c:205 +#: src/truncate.c:178 #, 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:215 +#: src/truncate.c:188 #, 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:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "impossible de tronquer %s à % octets" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "plusieurs modificateurs relatifs indiqués" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "nombre %s incorrect" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "vous devez indiquer soit %s, soit %s" # « une » option -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "vous devez indiquer une %s relative avec %s" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "%s était indiquée mais pas %s" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "impossible d'ouvrir %s en écriture" @@ -12627,12 +13022,10 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Utilisation : %s [OPTION] [FICHIER]\n" "Afficher une liste entièrement ordonnée cohérente par le tri partiel de " @@ -12640,12 +13033,17 @@ msgstr "" "Sans FICHIER, ou quand FICHIER est -, lire l'entrée standard.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s : l'entrée contient un nombre impair de jetons" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s : l'entrée contient une boucle :" @@ -12715,9 +13113,8 @@ msgid "cannot get system name" msgstr "impossible d'obtenir le nom de système" #: 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" +#, fuzzy +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "Convertir les blancs de chaque FICHIER par des tabulations, lors de " "l'affichage\n" @@ -12778,9 +13175,10 @@ msgstr "" " pour chaque groupe\n" #: src/uniq.c:187 +#, fuzzy msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" " -D, --all-repeated[=MÉTHODE] afficher toutes les lignes en double, les\n" @@ -12793,9 +13191,10 @@ msgid " -f, --skip-fields=N avoid comparing the first N fields\n" msgstr " -f, --skip-fields=N ne pas comparer les N premiers champs\n" #: src/uniq.c:195 +#, fuzzy msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" " --group[=MÉTHODE] montrer tous les éléments, en séparant les groupes " @@ -12961,11 +13360,6 @@ msgstr "" " Les tâches dans\n" "un état dormant ininterruptible contribuent aussi à la charge moyenne.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -12987,12 +13381,17 @@ msgstr "" "Si FICHIER est indiqué, utiliser %s. %s en tant que FICHIER est usuel.\n" "\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -13011,12 +13410,13 @@ msgstr "" " -m, --chars afficher le nombre de caractères\n" " -l, --lines afficher le nombre de nouvelles lignes\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=F lire l'entrée depuis les fichiers indiqués par\n" @@ -13186,10 +13586,11 @@ msgstr "" "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 associé à l'UID %lu\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "" +"impossible de trouver le nom associé à l'identifiant utilisateur (UID) %s" #: src/yes.c:41 #, c-format @@ -13208,6 +13609,238 @@ msgstr "" "Afficher à répétition une ligne de caractères avec toutes les CHAÎNEs\n" "indiquées ou « y ».\n" +#~ 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" + +#~ 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 TAILLE_PAGE <= 10. Sans FICHIER, ou quand FICHIER est " +#~ "-,\n" +#~ "lire l'entrée standard.\n" + +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Sans FICHIER ou si FICHIER est -, lire l'entrée standard. « -F / » par " +#~ "défaut.\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Forcer l'écriture des blocs modifiés sur disque et la mise à jour du " +#~ "super bloc.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "ignorer tous les arguments" + +#~ msgid "%s: invalid number" +#~ msgstr "%s : nombre incorrect" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s : %s est tellement grand qu'il n'est pas représentable" + +#~ msgid "number of lines" +#~ msgstr "le nombre de lignes" + +#~ msgid "number of bytes" +#~ msgstr "le ombre d'octets" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s : nombre à ignorer incorrect" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s : nombre d'octets incorrect" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s : nombre de lignes incorrect" + +#~ msgid "number in %s is too large" +#~ msgstr "le numéro dans %s est trop grand" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s : nombre de secondes incorrect" + +#~ msgid "failed to %s supplemental groups" +#~ msgstr "impossible de %s les groupes supplémentaires" + +#~ 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 "" +#~ "\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 GB) copiés, 34.6279 s, 271 MB/s\n" +#~ "\n" +#~ "Les options sont :\n" + +#~ 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 CAR CAR entrera le prochain caractère entre guillemets\n" +#~ " quit CAR CAR émettra un signal de fin\n" +#~ " * rprnt CAR CAR réaffichera la ligne actuelle\n" +#~ " start CAR CAR redémarrera la sortie après l'avoir arrêtée\n" + +#~ 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 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" + +#~ 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 "" +#~ "\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" + +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl 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 NULL\n" +#~ " * [-]ofill utiliser le remplissage de caractères au lieu du délai " +#~ "par\n" +#~ " minuterie\n" +#~ " * [-]olcuc traduire les minuscules en majuscules\n" +#~ " * [-]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" + +#~ 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 "" +#~ " * [-]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" + +#~ 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 "" +#~ " * [-]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" + +#~ 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 "" +#~ " * [-]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" + +#~ 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 "" +#~ " 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" + +#~ msgid "For complete documentation, run: info coreutils '%s invocation'\n" +#~ msgstr "" +#~ "Utilisez « info coreutils '%s invocation' » pour toute la documentation\n" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s : impossible de trouver le nom associé à l'UID %lu\n" + #~ msgid "cannot create pipe" #~ msgstr "impossible de créer un tube (« pipe »)" @@ -13838,20 +14471,6 @@ msgstr "" #~ "traité\n" #~ "\n" -#~ msgid "" -#~ "Display the current time in the given FORMAT, or set the system date.\n" -#~ "\n" -#~ " -d, --date=STRING display time described by STRING, not `now'\n" -#~ " -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -#~ msgstr "" -#~ "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" diff --git a/po/ga.gmo b/po/ga.gmo index 8febefae..09b3dab4 100644 Binary files a/po/ga.gmo and b/po/ga.gmo differ diff --git a/po/ga.po b/po/ga.po index 421c9552..e322e089 100644 --- a/po/ga.po +++ b/po/ga.po @@ -3,11 +3,12 @@ # This file is distributed under the same license as the coreutils package. # Kevin Patrick Scannell , 2004, 2006, 2007, 2008. # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils 6.12\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2008-06-01 12:24-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" @@ -36,18 +37,18 @@ msgstr "Na hargóintí bailí:" msgid "error closing file" msgstr "earráid agus comhad á dhúnadh" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "earráid sa scríobh" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "ceadanna ar %s á gcaomhnú" @@ -235,57 +236,62 @@ msgstr "Níl an teaghrán paraiméadair ionchódaithe i gceart" msgid "Unknown error" msgstr "Earráid anaithnid" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: Tá an rogha `%s' débhríoch\n" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: Tá an rogha `-W %s' débhríoch\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `--%s'\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `%c%s'\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, fuzzy, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: tá argóint de dhíth i ndiaidh na rogha `%s'\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: rogha anaithnid `--%s'\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: rogha anaithnid `%c%s'\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: rogha neamhbhailí -- %c\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: tá argóint de dhíth i ndiaidh na rogha -- %c\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: Tá an rogha `-W %s' débhríoch\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `-W %s'\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, fuzzy, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: tá argóint de dhíth i ndiaidh na rogha `%s'\n" @@ -295,13 +301,13 @@ msgstr "%s: tá argóint de dhíth i ndiaidh na rogha `%s'\n" msgid "cannot change permissions of %s" msgstr "ní féidir na ceadanna de %s a athrú" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "ní féidir comhadlann %s a chruthú" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "cuimhne ídithe" @@ -350,6 +356,12 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: comhadchríoch" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: earráid sa léamh" + #: lib/regcomp.c:131 msgid "Success" msgstr "D'éirigh leis" @@ -460,7 +472,7 @@ msgstr "^[yYiIsS]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "ceadanna ar %s á socrú" @@ -905,7 +917,7 @@ msgstr "" "le bunuimhir 64, go dtí an gnáth-aschur.\n" "\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -915,15 +927,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Mura bhfuil COMHAD ann, nó más '-' é, léigh ón gnáth-ionchur.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -939,51 +943,51 @@ msgstr "" "iarracht a dhéanamh teacht slán ó charachtair neamhaibítreacha eile sa\n" "sruth ionchódaithe.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "earráid sa léamh" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "ionchur neamhbhailí" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "méid neamhbhailí timfhillte: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "oibreann breise %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "gnáth-ionchur á dhúnadh" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1027,39 +1031,46 @@ msgstr "" # plural above under cp.c -KPS #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "oibreann ar iarraidh" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Úsáid: %s [ROGHA]... [COMHAD]...\n" #: src/cat.c:92 #, fuzzy +msgid "Concatenate 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/cat.c:98 +#, fuzzy 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" @@ -1077,7 +1088,7 @@ msgstr "" " -n, --number uimhrigh gach líne aschurtha\n" " -s, --squeeze-blank laghdaigh línte folmha iomadúla go ceann amháin\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1089,7 +1100,7 @@ msgstr "" " -u (gan feidhm)\n" " -v, --show-nonprinting taispeáin rialúcháin le ^, M-; ní LFD agus TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1102,17 +1113,18 @@ msgstr "" " %s f - g Taispeáin f, ansin an gnáth-ionchur, agus g ina dhiaidh sin.\n" " %s Cóipeáil an gnáth-ionchur go dtí an gnáth-aschur.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "ní féidir ioctl a dhéanamh ar %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "gnáth-aschur" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: is ionann iad an t-inchomhad agus an t-aschomhad" @@ -1124,10 +1136,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1141,8 +1153,8 @@ msgstr "theip ar chomhthéacs slándála a chruthú: %s" msgid "failed to set %s security context component to %s" msgstr "theip ar chomhpháirt chomhthéacs slándála %s a shocrú mar %s" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, 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" @@ -1158,13 +1170,13 @@ msgstr "" 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:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "ní féidir %s a rochtain" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "ní féidir comhadlann %s a léamh" @@ -1180,7 +1192,7 @@ msgstr "comhthéacs slándála de %s á athrú" msgid "fts_read failed" msgstr "theip ar fts_read" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, fuzzy, c-format msgid "fts_close failed" @@ -1313,7 +1325,7 @@ msgid "-R -h requires -P" msgstr "tá gá le -P leis na roghanna -R -h" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1330,9 +1342,8 @@ msgid "conflicting security context specifiers given" msgstr "sonraitheoirí contrártha um chomhthéacs slándála" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "níorbh fhéidir na saintréithe de %s a rochtain" @@ -1630,17 +1641,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "grúpa neamhbhailí %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, fuzzy, c-format msgid "invalid group list %s" msgstr "grúpa neamhbhailí %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1649,7 +1660,7 @@ msgstr "" "Úsáid: %s ROGHA ÚSÁIDEOIR ORDÚ [ARGÓINT]...\n" " nó: %s ROGHA\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1657,13 +1668,20 @@ msgstr "" "Rith ORDÚ leis an fhréamhchomhadlann mar FRÉAMHNUA.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:207 #, fuzzy msgid "" "\n" @@ -1672,43 +1690,48 @@ msgstr "" "\n" "Mura bhfuil ORDÚ ann, rith ``${SHELL} -i'' (réamhshocrú: /bin/sh).\n" +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + # in FARF --KPS -#: src/chroot.c:311 +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "ní féidir an fhréamhchomhadlann a athrú go %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "ní féidir chdir a dhéanamh go dtí an fhréamhchomhadlann" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "níorbh fhéidir an grúpa (nó na grúpaí) forlíontach a shocrú" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" +msgid "failed to set supplemental groups" msgstr "níorbh fhéidir an grúpa (nó na grúpaí) forlíontach a shocrú" -#: src/chroot.c:402 +#: src/chroot.c:418 #, fuzzy, c-format msgid "failed to set group-ID" msgstr "theip ar ról nua %s a shocrú" -#: src/chroot.c:405 +#: src/chroot.c:421 #, fuzzy, c-format msgid "failed to set user-ID" msgstr "níorbh fhéidir úsáideoir nua %s a shocrú" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, fuzzy, c-format msgid "failed to run command %s" msgstr "ní féidir ordú %s a rith" @@ -1751,7 +1774,16 @@ msgstr "" "Déan comparáid idir na comhaid shórtáilte COMHAD1 agus COMHAD2, líne ar " "líne.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Mura bhfuil COMHAD ann, nó más '-' é, léigh ón gnáth-ionchur.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1763,7 +1795,7 @@ msgstr "" "cholún, línte atá i gCOMHAD1 ach nach COMHAD2; sa dara cholún, línte atá\n" "i gCOMHAD2 ach nach COMHAD2, agus comhlínte sa tríú colún.\n" -#: src/comm.c:116 +#: src/comm.c:120 #, fuzzy msgid "" "\n" @@ -1776,7 +1808,7 @@ msgstr "" " -2 ceil línte atá i gCOMHAD2 ach nach i gCOMHAD1\n" " -3 ceil línte atá sna comhaid araon\n" -#: src/comm.c:122 +#: src/comm.c:126 #, fuzzy msgid "" "\n" @@ -1792,17 +1824,17 @@ msgstr "" "phéireáil.\n" " --nocheck-order ná féach an bhfuil an t-ionchur sórtáilte mar is ceart\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1811,318 +1843,332 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, fuzzy, c-format msgid "file %d is not in sorted order" msgstr "Níl comhad %d in ord sórtáilte" -#: src/comm.c:407 +#: src/comm.c:411 #, fuzzy, c-format msgid "multiple delimiters specified" msgstr "sonraíodh roghanna -i iomadúla" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "ní féidir %s a `lseek'" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "earráid agus %s á léamh" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "ní féidir %s a `lseek'" +msgid "error reading %s" +msgstr "earráid agus %s á léamh" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "earráid agus %s á scríobh" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "earráid agus %s á léamh" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "níorbh fhéidir an comhthéacs reatha a fháil" -#: src/copy.c:383 +#: src/copy.c:478 #, fuzzy, c-format msgid "%s: write failed" msgstr "theip ar scríobh" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "Ní féidir %s a oscailt" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "ceadanna ar %s á nglanadh" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "níorbh fhéidir an úinéireacht de %s a chaomhnú" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "theip ar luchtú an chomhaid %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "níorbh fhéidir an t-údar de %s a chaomhnú" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "" "níorbh fhéidir an comhthéacs réamhshocraithe cruthaithe comhad a shocrú go %s" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "" "níorbh fhéidir an comhthéacs réamhshocraithe cruthaithe comhad a shocrú go %s" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "theip ar an gcomhthéacs slándála de %s a athrú go %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "ní féidir %s a oscailt chun léamh" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "ní féidir %s a `fstat'" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "ag gabháil thar an chomhad %s; bhí sé curtha as áit agus á chóipeáil" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "ní féidir %s a scriosadh" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "%s scriosta\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "ní scríobhfar trí nasc siombalach %s gan sprioc" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "ní féidir gnáthchomhad %s a chruthú" -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" msgstr "theip ar dhúnadh comhadlann %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "amanna á gcaomhnú le haghaidh %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "Ní féidir %s a oscailt" -#: src/copy.c:1580 +#: src/copy.c:1669 #, fuzzy, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: déan iarracht ar %s a fhorscríobh, agus mód %04lo (%s) a shárú? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: forscríobh %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (cúltaca: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, 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:1706 +#: src/copy.c:1795 #, 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:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "ní féidir %s a `stat'" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "comhadlann %s á fágáil ar lár" -#: src/copy.c:1791 +#: src/copy.c:1880 #, 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:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "is iad %s agus %s an comhad céanna" -#: src/copy.c:1939 +#: src/copy.c:2019 #, 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:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "diúltaíodh forscríobh ar an chomhad nua %s le %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, 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:1989 +#: src/copy.c:2069 #, 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:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "ní féidir cúltaca a dhéanamh ar %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, 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:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "rabhadh: comhad foinse %s tugtha níos mó ná uair amháin" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "ní féidir %s a aistriú go %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "ní féidir nasc siombalach ciorclach %s a chóipeáil" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, 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:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "ní féidir an `fifo' %s a chruthú" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "ní féidir comhad speisialta %s a chruthú" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "ní féidir nasc siombalach %s a léamh" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "ní féidir an nasc siombalach %s a chruthú" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "tá %s de chineál anaithnid" # bad coinage --KPS -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "ní féidir dí-chúltaca a dhéanamh ar %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (dí-chúltaca)\n" @@ -2132,25 +2178,25 @@ msgstr "%s -> %s (dí-chúltaca)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, fuzzy, c-format msgid "unknown program %s" msgstr "Aitheantas úsáideora anaithnid: %s" @@ -2414,8 +2460,8 @@ msgstr "Tá %s ann cheana, ach ní comhadlann é" msgid "failed to access %s" msgstr "Ní féidir %s a oscailt" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "oibreann comhaid ar iarraidh" @@ -2493,131 +2539,131 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "ionchur imithe" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: líne-uimhir as raon" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: líne-uimhir as raon" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " le linn timthriall %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: níl a leithéid ann" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "earráid le linn cuardaigh ar shlonn ionadaíochta" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "earráid sa scríobh le haghaidh %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, 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:1098 +#: src/csplit.c:1099 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: tá gá le `}' i líon na hathráite" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: tá gá le slánuimhir idir `{' agus `}'" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: teormharcóir foirceanta `%c' ar iarraidh" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: slonn ionadaíochta neamhbhailí: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: patrún neamhbhailí" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: ní foláir líne-uimhir dheimhneach" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "tá sonraitheoir tiontaithe ar iarraidh in iarmhír" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "sonraitheoir tiontaithe neamhbhailí in iarmhír: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "sonraitheoir tiontaithe neamhbhailí in iarmhír: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "%.*s: tiontú neamhbhailí" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "an iomarca sonraitheoirí tiontaithe %% in iarmhír" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "sonraitheoir tiontaithe %% ar iarraidh in iarmhír" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: uimhir neamhbhailí" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "uimhir neamhbhailí %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Úsáid: %s [ROGHA]... COMHAD PATRÚN...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 #, fuzzy msgid "" "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n" @@ -2628,7 +2674,16 @@ msgstr "" "agus taispeáin líon na mbeart i ngach píosa ar an gnáth-aschur.\n" "\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Má tá an COMHAD `-', léigh ón ghnáth-ionchur. Is féidir PATRÚN a bheith:\n" + +#: src/csplit.c:1492 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2639,11 +2694,11 @@ msgstr "" " -f, --prefix=RÉIMÍR bain úsáid as RÉIMÍR in ionad `xx'\n" " -k, --keep-files ná scrios aschomhaid tar éis earráidí\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2653,18 +2708,11 @@ 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:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Má tá an COMHAD `-', léigh ón ghnáth-ionchur. Is féidir PATRÚN a bheith:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 #, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2701,7 +2749,7 @@ msgstr "" "Taispeáin codanna tofa de na línte as gach COMHAD ar an ngnáth-aschur.\n" "\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2712,7 +2760,7 @@ msgstr "" " -d, --delimiter=TEORAN úsáid TEORAN in ionad TAB mar theormharcóir " "réimse\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2725,7 +2773,7 @@ msgstr "" " rogha -s tugtha\n" " -n (gan feidhm)\n" -#: src/cut.c:193 +#: src/cut.c:194 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2734,7 +2782,7 @@ msgstr "" " --complement inbhéartaigh na bearta, carachtair, nó réimsí\n" " roghnaithe.\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2744,7 +2792,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:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2756,7 +2804,8 @@ 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:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2764,8 +2813,6 @@ msgid "" " 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 "" "Is éard atá i ngach raon ná ceann de:\n" "\n" @@ -2776,52 +2823,53 @@ msgstr "" "\n" "Mura bhfuil COMHAD ann, nó más '-' é, léigh ón ghnáth-ionchur.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "liosta bearta nó réimsí neamhbhailí" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "uimhrítear réimsí agus ionaid ó 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "raon neamhbhailí gan chríoch: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "raon neamhbhailí laghdaitheach" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "tá an fritháireamh birt %s rómhór" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "tá an uimhir réimse %s rómhór" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "ní cheadaítear liostaí iomadúla" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "is gá an teormharcóir a bheith ina charachtar aonarach" -#: src/cut.c:787 +#: src/cut.c:786 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:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2829,11 +2877,11 @@ msgstr "" "ní cheiltear línte gan teormharcóirí ach nuair\n" "\tatáthar ag oibriú le réimsí" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "liosta réimsí ar iarraidh" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "liosta ionad ar iarraidh" @@ -2851,35 +2899,44 @@ msgid "Display the current time in the given FORMAT, or set the system date.\n" msgstr "" #: src/date.c:134 +#, fuzzy +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" +"Taispeáin an t-am anois i gcruth FORMÁID, nó socraigh dáta an chórais.\n" +"\n" +" -d, --date=TEAGHRÁN taispeáin am tugtha i dTEAGHRÁN, ní `now'\n" +" -f, --file=COMHADDÁTA mar --date uair amháin sa líne de CHOMHADDÁTA\n" + +#: src/date.c:138 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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=COMHAD taispeáin am an athraithe is déanaí do COMHAD\n" " -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:147 +#: src/date.c:149 #, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=AMCHÓD taispeáin dáta/am de réir RFC 3339.\n" " AMCHÓD=`date', `seconds', nó `ns' do dháta\n" @@ -2890,7 +2947,18 @@ 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:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 +msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 #, fuzzy msgid "" "\n" @@ -2906,7 +2974,7 @@ msgstr "" " %% '%' litriúil\n" " %a lá den tseachtain de réir an logchaighdeáin, giorraithe\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2918,7 +2986,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:171 +#: src/date.c:177 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2931,7 +2999,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:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2942,7 +3010,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:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2954,7 +3022,7 @@ msgstr "" " %I uair (01..12)\n" " %j lá den bhliain (001..366)\n" -#: src/date.c:188 +#: src/date.c:194 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2967,7 +3035,7 @@ msgstr "" " %m mí (01..12)\n" " %M nóiméad (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2985,7 +3053,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:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2997,7 +3065,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:209 +#: src/date.c:215 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" @@ -3010,7 +3078,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:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3022,7 +3090,7 @@ msgstr "" " %y dhá dhigit deiridh den bhliain (00..99)\n" " %Y an bhliain\n" -#: src/date.c:221 +#: src/date.c:227 #, fuzzy msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" @@ -3043,7 +3111,7 @@ msgstr "" "\n" "De réir réamhshocraithe, stuálann `date' réimsí uimhriúla le nialais.\n" -#: src/date.c:230 +#: src/date.c:236 #, fuzzy msgid "" "The following optional flags may follow '%':\n" @@ -3062,7 +3130,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:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3078,7 +3146,7 @@ msgstr "" "O, chun siombalacha malartacha uimhriúla an logchaighdeán a úsáid, más " "féidir.\n" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3092,36 +3160,36 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "gnáth-ionchur" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "dáta neamhbhailí %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "sonraíodh formáidí iomadúla aschurtha" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3132,23 +3200,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:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "ní féidir an dáta a shocrú" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3157,7 +3225,7 @@ msgstr "" "Úsáid: %s [OIBREANN]...\n" " nó: %s ROGHA\n" -#: src/dd.c:532 +#: src/dd.c:561 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3176,7 +3244,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:541 +#: src/dd.c:570 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3186,8 +3254,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\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" @@ -3199,7 +3269,7 @@ msgstr "" "ionchuir\n" " status=noxfer ná taispeáin staitistic faoin aistriú\n" -#: src/dd.c:552 +#: src/dd.c:583 #, fuzzy msgid "" "\n" @@ -3218,7 +3288,7 @@ msgstr "" "Is féidir EOCHAIRFHOCAL a bheith:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3247,7 +3317,7 @@ msgstr "" " nuair atá `block' nó `unblock' in úsáid, stuáil le spásanna\n" " in ionad carachtair NUL\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3263,7 +3333,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:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3277,136 +3347,98 @@ msgstr "" " append mód iarcheangail (ná húsáid ach le haschur; moltar " "conv=notrunc)\n" -#: src/dd.c:589 +#: src/dd.c:620 #, 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:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct úsáid I/A díreach le haghaidh sonraí\n" -#: src/dd.c:593 +#: src/dd.c:624 #, fuzzy msgid " directory fail unless a directory\n" msgstr " directory teip mura comhadlann é\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync úsáid I/A sioncrónaithe le haghaidh sonraí\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync mar an gcéanna, ach le haghaidh meiteashonraí fosta\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock úsáid I/A gan bhacainní\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime ná nuashonraigh an t-am rochtana\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty ná ceap an teirminéal rialaithe ó chomhad\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow ná lean naisc shiombalacha\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks teip má tá naisc iomadúla ann\n" -#: src/dd.c:616 +#: src/dd.c:647 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:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text úsáid I/A téacs le haghaidh sonraí\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 -#, fuzzy, c-format +#: src/dd.c:661 +#, 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 "" -"\n" -"Má sheoltar comhartha %s chuig próiseas `dd' beo, scríobhfaidh sé " -"staitistic\n" -"I/A chuig an ghnáth-aschur earráide, agus ansin atosóidh sé an chóipeáil.\n" -"\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ kill -%s $pid; sleep 1; kill $pid\n" -" 18335302+0 taifead isteach\n" -" 18335302+0 taifead amach\n" -" 9387674624 beart (9.4 GB) cóipeáilte, 34.6279 soicind, 271 MB/s\n" -"\n" -"Roghanna:\n" -"\n" - -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -"%+% taifead isteach\n" -"%+% taifead amach\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% taifead teasctha\n" -msgstr[1] "% thaifead teasctha\n" -msgstr[2] "% thaifead teasctha\n" -msgstr[3] "% dtaifead teasctha\n" -msgstr[4] "% taifead teasctha\n" -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" @@ -3416,7 +3448,7 @@ msgstr[2] "cóipeáladh % bheart (%s)" msgstr[3] "cóipeáladh % mbeart (%s)" msgstr[4] "cóipeáladh % beart (%s)" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "Éigríoch B" @@ -3430,83 +3462,103 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g shoicind, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g shoicind, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% taifead isteach\n" +"%+% taifead amach\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% taifead teasctha\n" +msgstr[1] "% thaifead teasctha\n" +msgstr[2] "% thaifead teasctha\n" +msgstr[3] "% dtaifead teasctha\n" +msgstr[4] "% taifead teasctha\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "inchomhad %s á dhúnadh" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "aschomhad %s á dhúnadh" -#: src/dd.c:1089 +#: src/dd.c:1142 #, fuzzy, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "theip ar chdir go dtí an chomhadlann %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "á scríobh i %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "oibreann anaithnid %s" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "tiontú neamhbhailí" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "bratach neamhbhailí ionchurtha" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "bratach neamhbhailí aschurtha" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "bratach neamhbhailí stádais" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "uimhir neamhbhailí %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, 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:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "ní féidir `block' agus `unblock' a úsáid lena chéile" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "ní féidir `lcase' agus `ucase' a úsáid lena chéile" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "ní féidir `excl' agus `nocreat' a úsáid lena chéile" -#: src/dd.c:1424 +#: src/dd.c:1527 #, 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:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3515,62 +3567,62 @@ msgstr "" "rabhadh: ag seachaint fabht eithne `lseek' don chomhad (%s)\n" " de mt_type=0x%0lx -- féach ar le haghaidh liosta cineálacha" -#: src/dd.c:1670 +#: src/dd.c:1773 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: ní féidir seek a dhéanamh" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: ní féidir seek a dhéanamh" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "fritháireamh thar maoil agus comhad %s á léamh" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "rabhadh: fritháireamh neamhbhailí i ndiaidh léamh teipthe" -#: src/dd.c:1760 +#: src/dd.c:1863 #, 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:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "bratacha á socraithe le haghaidh %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: ní féidir bogadh go fritháireamh coibhneasta %s" -#: src/dd.c:2172 +#: src/dd.c:2288 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "á theascadh ag % beart san aschomhad %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "theip ar fdatasync i gcomhair %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "theip ar fsync i gcomhair %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "Ní féidir %s a oscailt" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3578,19 +3630,19 @@ msgid "" msgstr "" "fritháireamh rómhór: ní féidir teascadh go fad % (%lu beart) bloc" -#: src/dd.c:2306 +#: src/dd.c:2422 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "á theascadh ag % beart san aschomhad %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, fuzzy, c-format msgid "failed to discard cache for: %s" msgstr "theip ar chdir go dtí an chomhadlann %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3672,12 +3724,12 @@ msgstr "Iomlán" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 #, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" @@ -3689,18 +3741,18 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3713,7 +3765,7 @@ msgstr "" " -l, --local ná taispeáin ach córais chomhaid logánta\n" " --no-sync ná sync roimh eolas úsáide a fháil (réamhshocrú)\n" -#: src/df.c:1409 +#: src/df.c:1429 #, fuzzy msgid "" " --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" @@ -3721,6 +3773,26 @@ msgid "" "omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" +msgstr "" +" -P, --portability taispeáin torthaí i gcruth POSIX\n" +" --sync sync roimh eolas úsáide a fháil\n" +" -t, --type=CINEÁL ná taispeáin ach córais chomhaid den chineál CINEÁL\n" +" -T, --print-type taispeáin an cineál chóras comhaid\n" +" -x, --exclude-type=CINEÁL ná taispeáin córais chomhaid den chineál CINEÁL\n" +" -v (gan feidhm)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose taispeáin diagnóisic go díreach roimh atá\n" +" gach aschomhad oscailte\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3733,7 +3805,7 @@ 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:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3741,25 +3813,25 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, fuzzy, c-format msgid "options %s and %s are mutually exclusive" msgstr "is comheisiatach iad na roghanna --string agus --check" -#: src/df.c:1610 +#: src/df.c:1636 #, 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:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Rabhadh: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 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:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "níor próiseáladh aon chórais chomhaid" @@ -3874,7 +3946,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3885,7 +3957,8 @@ msgstr "" #: src/du.c:285 #, fuzzy -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Coimrigh úsáid diosca do gach COMHAD, go hathchúrsach do chomhadlanna.\n" "\n" @@ -4025,64 +4098,58 @@ msgstr "" msgid "Infinity" msgstr "Éigríoch B" -#: src/du.c:636 +#: src/du.c:657 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "theip ar fts_read" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "doimhneacht uasta neamhbhailí %s" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "argóint neamhbhailí %s%s: `%s'" -#: src/du.c:898 +#: src/du.c:919 #, 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:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, 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:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 #, 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:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: earráid sa léamh" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "ainm neamhbhailí comhaid: folamh" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "iomlán" @@ -4217,9 +4284,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\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" @@ -4265,7 +4330,7 @@ msgid "input line is too long" msgstr "tá an líne ionchurtha rófhada" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4420,12 +4485,12 @@ msgstr "earráid le linn cuardaigh ar shlonn ionadaíochta" msgid "non-integer argument" msgstr "argóint neamhuimhriúil" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "roinnt le nialas" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, 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." @@ -4436,31 +4501,31 @@ msgid "the strings compared were %s and %s" msgstr "Rinneadh comparáid idir na teaghráin %s agus %s." #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "Ní slánuimhir dheimhneach bhailí é %s" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "tá %s rómhór" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4469,7 +4534,7 @@ msgstr "" "Úsáid: %s [UIMHIR]...\n" " nó: %s ROGHA\n" -#: src/factor.c:2443 +#: src/factor.c:2533 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4516,7 +4581,7 @@ msgstr "" "an toradh chuig an ghnáth-aschur. Mura bhfuil COMHAD ann, nó más '-' é,\n" "léigh ón ghnáth-ionchur.\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4529,7 +4594,7 @@ msgstr "" "athfhormáidithe\n" " -s, --split-only deighil línte fada, ach ná hathlíon\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, fuzzy, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4542,7 +4607,7 @@ msgstr "" "abairtí\n" " -w, --width=UIMHIR uasmhéid leithid líne (réamhshocrú 75 colún)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4551,22 +4616,20 @@ 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:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "leithead neamhbhailí: %s" -#: src/fold.c:70 +#: src/fold.c:69 #, fuzzy -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +msgid "Wrap input lines in each FILE, writing to standard output.\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:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4576,9 +4639,9 @@ msgstr "" " -s, --spaces bris ag spásanna\n" " -w, --width=LEITHEAD úsáid LEITHEAD colún in ionad 80\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "líon neamhbhailí na gcolún: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4649,12 +4712,11 @@ msgstr "ní féidir aitheantas an úsáideora a shocrú" msgid "%s: no such user" msgstr "%s: Níl a leithéid d'úsáideoir ann" -#: src/head.c:109 +#: src/head.c:110 #, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "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" @@ -4662,7 +4724,7 @@ msgstr "" "ghnáth-ionchur.\n" "\n" -#: src/head.c:117 +#: src/head.c:118 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4679,7 +4741,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:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4687,7 +4749,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:131 +#: src/head.c:132 #, fuzzy msgid "" "\n" @@ -4700,48 +4762,36 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: is róchraptha an comhad" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: is rómhór líon na mbeart" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: ní féidir bogadh go fritháireamh %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: ní féidir bogadh go fritháireamh coibhneasta %s" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "líon na línte" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "líon na mbeart" +msgid "%s: number of bytes is too large" +msgstr "%s: is rómhór líon na mbeart" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "líon na línte neamhbhailí" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "líon neamhbhailí na mbeart" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "rogha neamhbhailí chun deiridh -- %c" @@ -4933,7 +4983,7 @@ msgstr "ní féidir an t-úinéir de %s a athrú" msgid "cannot set time stamps for %s" msgstr "ní féidir an stampa ama a shocrú do %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "theip ar ghlao córais fork()" @@ -5084,7 +5134,7 @@ msgstr "ní cheadaítear an rogha --strip agus comhadlann á suiteáil" msgid "target directory not allowed when installing a directory" msgstr "ní cheadaítear sprioc-chomhadlann agus comhadlann á suiteáil" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "mód neamhbhailí %s" @@ -5117,11 +5167,15 @@ msgid "Mike Haertel" msgstr "Mike Haertel" #: src/join.c:195 -#, 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" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5135,7 +5189,7 @@ msgstr "" " -a TAOBH taispeáin línte gan phéire as an gcomhad TAOBH\n" " -e FOLAMH cuir FOLAMH in ionad réimsí ionchurtha ar iarraidh\n" -#: src/join.c:204 +#: src/join.c:210 #, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" @@ -5148,7 +5202,7 @@ msgstr "" " -o FORMÁID tóg an líne aschurtha de réir FORMÁID\n" " -t CAR úsáid CAR mar theormharcóir idir réimsí ionchur/aschur\n" -#: src/join.c:210 +#: src/join.c:216 #, fuzzy msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" @@ -5168,12 +5222,12 @@ msgstr "" "phéireáil.\n" " --nocheck-order ná féach an bhfuil an t-ionchur sórtáilte mar is ceart\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 #, fuzzy msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr " -z, --zero-terminated úsáid NUL foirceanta in ionad líne nua\n" -#: src/join.c:225 +#: src/join.c:231 #, fuzzy msgid "" "\n" @@ -5206,47 +5260,47 @@ msgstr "" "Mura bhfuil an t-ionchur sórtáilte agus ní féidir roinnt línte a nascadh,\n" "taispeánfar teachtaireacht rabhaidh duit.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "uimhir neamhbhailí réimse: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "sonraitheoir neamhbhailí réimse: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "uimhir neamhbhailí chomhaid i sonraitheoir réimse: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "réimsí neamh-chomhoiriúnacha ceangail %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "teaghrán ionaid le haghaidh réimsí folmha i gcoinbhleacht" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "táb ilcharachtair %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "táib éaguibhreannacha" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "ní gnáth-ionchur é ceann de na comhaid" @@ -5327,17 +5381,17 @@ msgstr "ní féidir comhartha a chumasc le -l nó -t" msgid "no process ID specified" msgstr "níor tugadh aitheantas próisis ar bith" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, fuzzy, c-format msgid "invalid buffering mode %s for %s\n" msgstr "argóint neamhbhailí %s chun %s" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -5515,7 +5569,7 @@ msgstr "ní féidir an nasc siombalach %s a chruthú" msgid "FIXME: unknown" msgstr "FIXME: anaithnid" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Úsáid: %s [ROGHA]\n" @@ -5528,7 +5582,7 @@ msgstr "" "Taispeáin an t-ainm den úsáideoir reatha.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "níl aon ainm logáilte isteach ann" @@ -5538,7 +5592,7 @@ msgstr "níl aon ainm logáilte isteach ann" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -5547,97 +5601,97 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" -"tá an athróg thimpeallachta QUOTING_STYLE neamhbhailí: %s; ag ligean thar" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "tá an athróg thimpeallachta COLUMNS neamhbhailí: %s; ag ligean thar" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "tá an athróg thimpeallachta TABSIZE neamhbhailí: %s; ag ligean thar" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "leithead líne neamhbhailí: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "méid neamhbhailí táib: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "formáid neamhbhailí ar an am: %s" -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "Na hargóintí bailí:" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "réimír anaithnid: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "tá an athróg thimpeallachta LS_COLORS neamhbhailí" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" +"tá an athróg thimpeallachta QUOTING_STYLE neamhbhailí: %s; ag ligean thar" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "ní féidir an chomhadlann %s a oscailt" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "ní féidir an gléas agus inode de %s a dhéanamh amach" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: ní liostófar comhadlann atá liostaithe cheana" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "comhadlann %s á léamh" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "comhadlann %s á dúnadh" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "" "ní féidir na hainmneacha comhaid %s agus %s a chur i gcomparáid le chéile" -#: src/ls.c:4781 +#: src/ls.c:4775 #, fuzzy msgid "" "List information about the FILEs (the current directory by default).\n" @@ -5647,7 +5701,7 @@ msgstr "" "Sórtáil san ord aibítre mura bhfuil --sort ná aon cheann de -cftuvSUX ann.\n" "\n" -#: src/ls.c:4788 +#: src/ls.c:4782 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5661,7 +5715,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:4794 +#: src/ls.c:4788 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." @@ -5682,13 +5736,14 @@ msgstr "" "ainm\n" " i ngach cás eile: sórtáil de réir ctime\n" -#: src/ls.c:4804 +#: src/ls.c:4798 #, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5700,7 +5755,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:4812 +#: src/ls.c:4807 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5717,13 +5772,13 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time ar comhbhrí le `-l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 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:4823 +#: src/ls.c:4818 #, fuzzy msgid "" " --group-directories-first\n" @@ -5738,7 +5793,7 @@ msgstr "" " grúpáil má bhaintear úsáid ar bith as\n" " --sort=none (-U)\n" -#: src/ls.c:4829 +#: src/ls.c:4824 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5751,7 +5806,7 @@ msgstr "" " (m.sh., 1K 234M 2G srl.)\n" " --si mar an gcéanna, ach le 1K=1000, ní 1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 #, fuzzy msgid "" " -H, --dereference-command-line\n" @@ -5774,7 +5829,7 @@ msgstr "" "leis\n" " an PATRÚN blaoisce (sáraithe ag -a nó -A)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5795,7 +5850,7 @@ msgstr "" " comhoiriúnach le PATRÚN\n" " -k ar comhbhrí le `--block-size=1K'\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5809,7 +5864,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:4863 +#: src/ls.c:4858 msgid "" " -n, --numeric-uid-gid like -l, but list numeric user and group IDs\n" " -N, --literal print raw entry names (don't treat e.g. " @@ -5827,7 +5882,7 @@ msgstr "" " -p, --indicator-style=slash\n" " cuir táscaire / le comhadlanna\n" -#: src/ls.c:4871 +#: src/ls.c:4866 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" @@ -5849,7 +5904,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 #, fuzzy msgid "" " -r, --reverse reverse order while sorting\n" @@ -5861,19 +5916,19 @@ msgstr "" " -R, --recursive taispeáin comhadlanna go hathchúrsach\n" " -s, --size taispeáin an mhéid de gach comhad (bloic)\n" -#: src/ls.c:4886 +#: src/ls.c:4881 #, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S sórtáil de réir méid an chomhaid\n" " --sort=FOCAL sórtáil de réir FOCAL in ionad an ainm: none -" @@ -5886,7 +5941,7 @@ msgstr "" "sonraithe\n" " mar eochair shórtála más --sort=time\n" -#: src/ls.c:4896 +#: src/ls.c:4892 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5908,7 +5963,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:4908 +#: src/ls.c:4904 #, fuzzy msgid "" " -t sort by modification time, newest first\n" @@ -5917,12 +5972,12 @@ 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:4912 +#: src/ls.c:4908 #, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -5934,14 +5989,15 @@ 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:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=COLÚIN socraigh leithead den scáileán\n" " -x taispeáin ar línte in ionad colún\n" @@ -5951,7 +6007,7 @@ msgstr "" " comhad má tá ann\n" " -1 taispeáin aon chomhad sa líne\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5960,7 +6016,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5989,38 +6045,39 @@ msgstr "David Madore" 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 "" "Úsáid: %s [ROGHA] [COMHAD]...\n" "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:174 +#: src/md5sum.c:175 #, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" " -b, --binary léigh sa mhód dénártha (réamhshocrú mura bhfuil sé " "ón ghnath-ionchur)\n" -#: src/md5sum.c:178 +#: src/md5sum.c:180 #, fuzzy -msgid " -b, --binary read in binary mode\n" +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary léigh sa mhód dénártha\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 #, fuzzy msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" @@ -6028,12 +6085,12 @@ msgstr "" " -t, --text léigh sa mhód téacs (réamhshocrú mura bhfuil sé " "ónghnáth-ionchur)\n" -#: src/md5sum.c:192 +#: src/md5sum.c:195 #, 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:195 +#: src/md5sum.c:198 #, fuzzy msgid "" "\n" @@ -6053,14 +6110,15 @@ msgstr "" " -w, --warn tabhair rabhadh má tá línte míchumtha ann\n" "\n" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "Ríomhtar na suimeanna mar atá mínithe i %s. Má táthar ag seiceáil, is gá\n" @@ -6069,35 +6127,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:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: an iomarca línte shuim sheiceála" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: líne mhíchumtha le suim sheiceála %s" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: Theip ar oscailt nó ar léamh\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "TEIPTHE" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "OK" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, 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:629 +#: src/md5sum.c:632 #, fuzzy, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" @@ -6107,7 +6165,7 @@ msgstr[2] "%s: %: líne mhíchumtha le suim sheiceála %s" msgstr[3] "%s: %: líne mhíchumtha le suim sheiceála %s" msgstr[4] "%s: %: líne mhíchumtha le suim sheiceála %s" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, fuzzy, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" @@ -6117,7 +6175,7 @@ msgstr[2] "RABHADH: ní féidir % as % comhaid a léamh" msgstr[3] "RABHADH: ní féidir % as % comhaid a léamh" msgstr[4] "RABHADH: ní féidir % as % comhaid a léamh" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, fuzzy, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" @@ -6127,19 +6185,19 @@ msgstr[2] "RABHADH: ní ceart % as % shuim ríofa seiceála" msgstr[3] "RABHADH: ní ceart % as % suim ríofa seiceála" msgstr[4] "RABHADH: ní ceart % as % suim ríofa seiceála" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, 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:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6147,28 +6205,28 @@ msgstr "" "tá na roghanna --binary agus --text gan bhrí agus suimeanna seiceála á " "bhfíorú" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -6212,23 +6270,23 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "" "níorbh fhéidir an comhthéacs réamhshocraithe cruthaithe comhad a shocrú go %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "níorbh fhéidir amanna a chaomhnú ar %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "cruthaíodh comhadlann %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, fuzzy, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6434,7 +6492,7 @@ msgstr "an iomarca teimpléad" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, fuzzy, c-format msgid "invalid suffix %s, contains directory separator" msgstr "teimpléad neamhbhailí, %s, tá deighilteoir comhadlainne ann" @@ -6574,9 +6632,7 @@ msgstr "Scott Bartram" #: src/nl.c:179 #, fuzzy -msgid "" -"Write each FILE to standard output, with line numbers added.\n" -"With no FILE, or when FILE is -, read standard input.\n" +msgid "Write each FILE to standard output, with line numbers added.\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" @@ -6685,27 +6741,27 @@ msgstr "stíl uimhrithe neamhbhailí don chorp: %s" msgid "invalid footer numbering style: %s" msgstr "stíl uimhrithe neamhbhailí do bhuntáisc: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "líne-uimhir imeachta neamhbhailí: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "incrimint líne-uimhreach neamhbhailí: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "líon na línte folmha neamhbhailí: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "réimseleithead líne-uimhreach neamhbhailí: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "formáid líne-uimhreach neamhbhailí: %s" @@ -6731,7 +6787,7 @@ msgstr "" #, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6751,50 +6807,50 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "níorbh fhéidir an gnáth-ionchur earráide a athsheoladh" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "ag déanamh neamhshuim ar ionchur" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "" "ag déanamh neamhshuim ar an ionchur agus an t-aschur á iarcheangal le %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, fuzzy, c-format msgid "appending output to %s" msgstr "" "ag déanamh neamhshuim ar an ionchur agus an t-aschur á iarcheangal le %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" "níorbh fhéidir an chóip den ghnáth-aschur earráide a dhúnadh i ndiaidh exec" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" "ag déanamh neamhshuim ar an ionchur, agus an gnáth-aschur earráid á " "athdhíriú go dtí an gnáth-aschur" -#: src/nohup.c:199 +#: src/nohup.c:197 #, fuzzy, c-format msgid "redirecting stderr to stdout" msgstr "" "ag déanamh neamhshuim ar an ionchur, agus an gnáth-aschur earráid á " "athdhíriú go dtí an gnáth-aschur" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "" @@ -6816,96 +6872,93 @@ msgid "" " --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: líon na línte neamhbhailí" - #. This is a proper name. See the gettext manual, section Names. -#: src/numfmt.c:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, fuzzy, c-format msgid "value too large to be converted: %s" msgstr "%s: níl an luach tiontaithe ar fad" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "uimhir neamhbhailí %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "iarmhír neamhbhailí in argóint %s%s: `%s'" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "%s: theip ar oscailt chun é a scríobh" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "méid neamhbhailí táib: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Úsáid: %s [ROGHA]... [ÚSÁIDEOIR]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6913,19 +6966,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -6935,40 +6988,40 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" msgstr "" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6977,7 +7030,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -6985,7 +7038,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -6993,7 +7046,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7001,18 +7054,40 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 -#, c-format +#: src/numfmt.c:973 +#, fuzzy 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" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Is éard atá i ngach raon ná ceann de:\n" +"\n" +" N N-ú beart, carachtar, nó réimse, uimhrithe ó 1\n" +" N- ón N-ú beart, carachtar, nó réimse go dtí deireadh na líne\n" +" N-M ón N-ú go dtí M-ú beart, carachtar, nó réimse (araon san áireamh)\n" +" -M ón aonú go dtí M-ú beart, carachtar, nó réimse (araon san áireamh)\n" +"\n" +"Mura bhfuil COMHAD ann, nó más '-' é, léigh ón ghnáth-ionchur.\n" + +#: src/numfmt.c:983 +#, 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 zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7024,7 +7099,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -7039,119 +7114,131 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, 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:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "leithead neamhbhailí na formáide" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "beachtas neamhbhailí: %s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "iarmhír neamhbhailí in argóint %s%s: `%s'" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "uimhir neamhbhailí réimse: %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "dáta neamhbhailí %s" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "uimhir neamhbhailí réimse: %s" +msgid "multiple field specifications" +msgstr "%s: sonraíocht neamhbhailí réimse %s" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "dáta neamhbhailí %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, 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:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "sonraíodh roghanna -i iomadúla" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, 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:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "earráid agus %s á léamh" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, fuzzy, c-format msgid "failed to convert some of the input numbers" msgstr "theip ar chomhthéacs de %s a athrú go %s" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7164,14 +7251,13 @@ msgstr "" " nó: %s --traditional [ROGHA]... [COMHAD] [[+]FRITHÁIREAMH[.][b] [+]" "[LIPÉAD][.][b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Scríobh léiriú gan athbhrí, bearta ochtnártha mar réamhshocrú,\n" @@ -7180,9 +7266,10 @@ msgstr "" "Mura bhfuil COMHAD ann, nó más '-' é, léigh ón ghnáth-ionchur.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 #, 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" @@ -7202,7 +7289,7 @@ msgstr "" "0x nó 0X heicsidheachúlach; úsáid iarmhír `.' don ochtnártha agus `b' mar " "512.\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7211,7 +7298,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 #, fuzzy msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" @@ -7232,7 +7319,7 @@ msgstr "" " -w, --width[=BEARTA] BEARTA beart ar líne aschuir\n" " --traditional glac le hargóintí san fhoirm thraidisiúnta\n" -#: src/od.c:363 +#: src/od.c:366 #, fuzzy msgid "" "\n" @@ -7253,7 +7340,7 @@ msgstr "" " -d ar comhbhrí le `-t u2', roghnaigh aonaid dheachúlacha gan sín, 2 " "bheart\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7270,7 +7357,7 @@ msgstr "" " -x ar comhbhrí le `-t x2', roghnaigh aonaid heicsidheachúlacha, 2 " "bheart\n" -#: src/od.c:380 +#: src/od.c:383 #, fuzzy msgid "" "\n" @@ -7285,7 +7372,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:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7299,7 +7386,7 @@ msgstr "" " u[MÉID] slánuimhir dheachúlach gan sín, MÉID beart ar an gceann\n" " x[MÉID] heicsidheachúlach, MÉID beart ar an gceann\n" -#: src/od.c:394 +#: src/od.c:397 #, fuzzy msgid "" "\n" @@ -7314,14 +7401,14 @@ msgstr "" "Más ionann CINEÁL agus f, is féidir MÉID a bheith `F'=sizeof(float),\n" "`D'=sizeof(double), nó `L'=sizeof(long double).\n" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 #, fuzzy msgid "" "\n" @@ -7339,12 +7426,12 @@ msgstr "" "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n" "GB 1000*1000*1000, G 1024*1024*1024, srl. le T, P, E, Z, Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "teaghrán neamhbhailí cineáil %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7353,7 +7440,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:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7362,37 +7449,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:869 +#: src/od.c:872 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "carachtar neamhbhailí `%c' i dteaghrán cineáil %s" -#: src/od.c:1094 +#: src/od.c:1105 #, 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:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, 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:1863 +#: src/od.c:1871 #, 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:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "is rómhór skip-bytes + read-bytes" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "rabhadh: leithead neamhbhailí %lu; bainfear úsáid as %d ina ionad" @@ -7412,7 +7499,6 @@ msgstr "tá an gnáth-ionchur dúnta" 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 "" "Scríobh, chuig an ghnáth-aschur, línte comhoiriúnacha go seicheamhach\n" "as gach COMHAD, scartha le TÁIB.\n" @@ -7557,12 +7643,12 @@ msgstr "Cathain" msgid "Where" msgstr "Cén Áit" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Úsáid: %s [ROGHA]... [ÚSÁIDEOIR]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7580,7 +7666,7 @@ msgstr "" " -p ná taispeáin an comhad plean i bhformáid fhada\n" " -s formáid achomair (réamhshocrú)\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7595,7 +7681,7 @@ msgstr "" " -q ná taispeáin ainm iomlán, cianóstach, nó am díomhaoin\n" " i bhformáid achomair\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, fuzzy, c-format msgid "" "\n" @@ -7606,102 +7692,102 @@ msgstr "" "Feidhmchlár beag cosúil le `finger'; taispeáin eolas faoi úsáideoir.\n" "Beidh %s an comhad utmp.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, 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" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "`--pages=AONÚ[:DEIREADH]' argóint ar iarraidh" -#: src/pr.c:910 +#: src/pr.c:907 #, fuzzy, c-format msgid "invalid page range %s" msgstr "Raon neamhbhailí leathanach %s" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "`-l FAD' líon neamhbhailí na línte: %s" -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "`-N UIMHIR' líne-uimhir neamhbhailí thosaigh: %s" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "`-o CIUMHAIS' fritháireamh neamhbhailí líne: %s" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "`-w LEITHEAD' líon neamhbhailí carachtar: %s" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "`-W LEITHEAD' líon neamhbhailí carachtar: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, 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:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "leathanach róchúng" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" "tá an uimhir leathanach tosaigh % níos mó ná líon na leathanach " "%" -#: src/pr.c:2380 +#: src/pr.c:2350 #, fuzzy, c-format msgid "page number overflow" msgstr "Uimhir leathanaigh thar maoil" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Leathanach %" -#: src/pr.c:2757 +#: src/pr.c:2727 #, 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:2763 +#: src/pr.c:2734 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -7718,7 +7804,7 @@ msgstr "" " mura bhfuil -a tugtha. Cothromaigh líon na línte sna\n" " colúin ar gach leathanach.\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7734,7 +7820,7 @@ msgstr "" " -d, --double-space\n" " spásáil dhúbailte\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7754,7 +7840,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:2789 +#: src/pr.c:2760 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -7778,12 +7864,24 @@ msgstr "" " colúin, socraigh deighilteoirí le --sep-" "string[=TEAGHRÁN]\n" -#: src/pr.c:2798 +#: src/pr.c:2769 #, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l FAD_LEATHANAIGH, --length=FAD_LEATHANAIGH\n" +" socraigh fad an leathanaigh go FAD_LEATHANAIGH (66) " +"líne\n" +" (línte téacs réamhshocraithe = 56, agus le -F 63)\n" +" -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:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -7794,7 +7892,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:2805 +#: src/pr.c:2779 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -7812,7 +7910,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:2813 +#: src/pr.c:2787 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -7827,7 +7925,7 @@ msgstr "" " -r, --no-file-warnings\n" " ná taispeáin rabhadh mura féidir comhad a oscailt\n" -#: src/pr.c:2820 +#: src/pr.c:2794 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -7844,7 +7942,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:2828 +#: src/pr.c:2802 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7852,7 +7950,6 @@ msgid "" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " dealaigh colúin le TEAGHRÁN,\n" " gan -S: is é an deighilteoir réamhshocraithe le -J\n" @@ -7861,7 +7958,13 @@ 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:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -7884,7 +7987,7 @@ msgstr "" " leithead an leathanaigh = LEITHEAD (72) carachtar\n" " d'aschur ilcholúnach, stopann -s[car] é seo (72)\n" -#: src/pr.c:2845 +#: src/pr.c:2822 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -7899,17 +8002,6 @@ msgstr "" "isteach\n" " ar na roghanna -S nó -s\n" -#: src/pr.c:2853 -#, fuzzy -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"Úsáidfear -t go huathoibríoch má tá FAD_LEATHANAIGH <= 10. Mura bhfuil\n" -"COMHAD ann, nó más '-' é, léigh ón ghnáth-ionchur.\n" - #: src/printenv.c:62 #, fuzzy, c-format msgid "" @@ -8068,18 +8160,23 @@ msgstr "" "Cuir as innéacs iomalartaithe, le comhthéacs, de na focail sna hinchomhaid.\n" "\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 #, fuzzy 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 cruthaigh tagairtí go huathoibríoch\n" " -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:1835 +msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -8095,7 +8192,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:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8112,7 +8209,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:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8123,20 +8220,16 @@ msgstr "" " -t, --typeset-mode - neamhchríochnaithe -\n" " -w, --width=UIMHIR leithead an aschuir, gan tagairt\n" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Mura bhfuil COMHAD ann, nó más '-' é, léigh ón gnáth-ionchur.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "leithead neamhbhailí bearna: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "leithead líne neamhbhailí: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8162,7 +8255,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "theip ar chdir go dtí an chomhadlann %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "theip ar stat %s" @@ -8182,8 +8275,8 @@ msgstr "ag déanamh neamhshuim ar argóintí nach roghanna iad" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Úsáid: %s [ROGHA]... COMHAD...\n" @@ -8433,8 +8526,8 @@ msgstr "" #: src/rm.c:342 #, fuzzy, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: bain gach argóint go hathchúrsach? " msgstr[1] "%s: bain gach argóint go hathchúrsach? " msgstr[2] "%s: bain gach argóint go hathchúrsach? " @@ -8443,8 +8536,8 @@ msgstr[4] "%s: bain gach argóint go hathchúrsach? " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: bain gach argóint? " msgstr[1] "%s: bain gach argóint? " msgstr[2] "%s: bain gach argóint? " @@ -8675,12 +8768,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "argóint neamhbhailí shnámhphointe: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "tá %s de chineál anaithnid" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8701,7 +8794,16 @@ msgstr "" "deacra na sonraí a fháil ar ais, fiú le crua-earraí an-chostasacha.\n" "\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Más '-' é an COMHAD, cóipeáil arís go dtí an gnáth-aschur.\n" + +#: src/shred.c:181 #, fuzzy, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8715,7 +8817,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:183 +#: src/shred.c:187 #, fuzzy msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" @@ -8730,12 +8832,10 @@ 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:192 +#: src/shred.c:196 #, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -8756,7 +8856,7 @@ msgstr "" "an rogha --remove go hiondúil le gnáthchomhaid.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8773,7 +8873,7 @@ msgstr "" "sé cumasach i ngach mód ar na córais a leanas:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8795,7 +8895,7 @@ msgstr "" "Network Appliances\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8809,7 +8909,7 @@ msgstr "" "* córais chomhad comhbhrúite\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -8830,7 +8930,7 @@ msgstr "" "mount (`man mount').\n" "\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -8840,129 +8940,129 @@ msgstr "" "comhad nó ar shuímh scáthánaithe, agus ní féidir na cóipeanna seo a bhaint.\n" "Dá bharr seo, b'fhéidir comhad léirscriosta a fháil ar ais amach anseo.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: theip ar fdatasync" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: theip ar fsync" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: ní féidir atochras" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: timthriall %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: earráid le linn scríobh ag fritháireamh %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: theip ar lseek" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: tá an comhad rómhór" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: timthriall %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: timthriall %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: theip ar fstat" # in FARF -KPS -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: cineál comhaid neamhbhailí" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: comhad de mhéid diúltach" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: earráid le linn teasctha" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: theip ar fcntl" # file descriptor in FARF -KPS -#: src/shred.c:994 +#: src/shred.c:996 #, 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:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: á scriosadh" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: ainm nua %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: theip ar bhaint" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: scriosta" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: theip ar dhúnadh" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: theip ar oscailt chun é a scríobh" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: líon na dtimthriallta neamhbhailí" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "sonraíodh foinsí iomadúla randamacha" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: méid comhaid neamhbhailí" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -8973,14 +9073,14 @@ msgstr "" " nó: %s -e [ROGHA]... [ARG]...\n" " nó: %s -i ÍSEAL-ARD [ROGHA]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 #, 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:73 +#: src/shuf.c:75 #, fuzzy msgid "" " -e, --echo treat each ARG as an input line\n" @@ -9002,37 +9102,37 @@ msgstr "" " -z, --zero-terminated cuir beart nialasach ag deireadh na línte,\n" " in ionad líne nua\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "an iomarca línte dúblacha" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "sonraíodh roghanna -i iomadúla" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "raon neamhbhailí ionchurtha: %s" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "líon neamhbhailí línte %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "aschomhaid iomadúla" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "ní féidir roghanna -e agus -i a chumasc" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -9060,12 +9160,12 @@ msgstr "" "den luach iomlán.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "tréimhse neamhbhailí %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "ní féidir an clog fhíor-ama a léamh" @@ -9078,7 +9178,7 @@ msgstr "" "aschur.\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -9086,7 +9186,7 @@ msgstr "" "Roghanna sórtála:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9098,19 +9198,19 @@ msgstr "" "uimhriúla\n" " -f, --ignore-case sórtáil an cás íochtair leis an gcás uachtair\n" -#: src/sort.c:443 +#: src/sort.c:444 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:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9118,7 +9218,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9128,7 +9228,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 #, fuzzy msgid "" "Other options:\n" @@ -9137,13 +9237,13 @@ msgstr "" "Roghanna sórtála:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 #, fuzzy msgid "" " -c, --check, --check=diagnose-first check for sorted input; do not sort\n" @@ -9163,7 +9263,7 @@ msgstr "" " -m, --merge cumaisc comhaid atá sórtáilte cheana; ná " "sórtáil\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9172,13 +9272,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9191,7 +9291,7 @@ msgstr "" " sórtála den rogha dheireanach\n" " -S, --buffer-size=MÉID maolán príomhchuimhne = MÉID\n" -#: src/sort.c:497 +#: src/sort.c:498 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9214,7 +9314,7 @@ msgstr "" " -u, --unique le -c, deimhnigh sórtáil gan dúblaigh;\n" " gan -c, ná taispeáin ach línte uathúla\n" -#: src/sort.c:511 +#: src/sort.c:512 #, fuzzy msgid "" "\n" @@ -9246,12 +9346,11 @@ msgstr "" "\n" "Is féidir na hiarmhíreanna seo a leanas a chur i ndiaidh MÉID:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -9266,117 +9365,117 @@ 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:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "ag feitheamh le %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "Chríochnaigh %s [-d] gan an chúis a mhíniú" -#: src/sort.c:884 +#: src/sort.c:883 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "ní féidir comhad sealadach %s a chruthú" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "theip ar oscailt" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "theip ar fflush" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "theip ar dhúnadh" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "níorbh fhéidir comhad sealadach a chruthú" -#: src/sort.c:1179 +#: src/sort.c:1178 #, 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:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "rabhadh: ní féidir %s a scriosadh" -#: src/sort.c:1338 +#: src/sort.c:1337 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "argóint neamhbhailí %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "argóint neamhbhailí %s%s: `%s'" -#: src/sort.c:1356 +#: src/sort.c:1355 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "argóint %s%s rómhór: `%s'" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "stat() teipthe" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "theip ar léamh" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "theip ar thiontú teaghráin" -#: src/sort.c:2079 +#: src/sort.c:2078 #, fuzzy, c-format msgid "the untransformed string was %s" msgstr "Ba é %s an teaghrán gan trasfhoirmiú." -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -9386,157 +9485,158 @@ msgstr[2] "%s: Tá an rogha `-W %s' débhríoch\n" msgstr[3] "%s: Tá an rogha `-W %s' débhríoch\n" msgstr[4] "%s: Tá an rogha `-W %s' débhríoch\n" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "theip ar scríobh" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: mí-eagar: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "gnáth-aschur earráide" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "%s: ní féidir atochras" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: sonraíocht neamhbhailí réimse %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "níl na roghanna `-%s' comhoiriúnach" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: áireamh neamhbhailí ag tús %s" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "uimhir neamhbhailí i ndiaidh `-'" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "uimhir neamhbhailí i ndiaidh `.'" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "carachtar ar seachrán i sonrú réimse" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "sonraíodh cláir iomadúla chomhbhrúite" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "uimhir neamhbhailí ag tús réimse" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "is nialas an uimhir réimse" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "is nialas an fritháireamh carachtair" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "uimhir neamhbhailí i ndiaidh `,'" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "táb folamh" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "ní féidir ainmneacha comhaid a léamh ó %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "ainm neamhbhailí comhaid: folamh" -#: src/sort.c:4619 +#: src/sort.c:4618 #, fuzzy, c-format msgid "no input from %s" msgstr "inchomhad %s á dhúnadh" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "ní cheadaítear oibreann breise %s le -%c" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 +#: src/split.c:224 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Úsáid: %s [ROGHA] [IONCHUR [RÉIMÍR]]\n" -#: src/split.c:207 +#: src/split.c:228 #, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\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:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9544,201 +9644,206 @@ msgstr "" " --verbose taispeáin diagnóisic go díreach roimh atá\n" " gach aschomhad oscailte\n" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "Iarmhíreanna don aschomhad ídithe" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "comhad %s á chruthú\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "theip ar ról nua %s a shocrú" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "theip ar %s a bhaint" -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" msgstr "comhadlann %s á dúnadh" -#: src/split.c:410 +#: src/split.c:464 #, fuzzy, c-format msgid "closing output pipe" msgstr "aschomhad %s á dhúnadh" -#: src/split.c:414 +#: src/split.c:468 #, fuzzy, c-format msgid "moving input pipe" msgstr "inchomhad %s á dhúnadh" -#: src/split.c:416 +#: src/split.c:470 #, fuzzy, c-format msgid "closing input pipe" msgstr "inchomhad %s á dhúnadh" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "theip ar chomhthéacs de %s a athrú go %s" -#: src/split.c:427 +#: src/split.c:481 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "theip ar dhúnadh comhadlann %s" -#: src/split.c:463 +#: src/split.c:517 #, fuzzy, c-format msgid "waiting for child process" msgstr "ag feitheamh le \"strip\"" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, 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:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: líon na soicindí neamhbhailí" -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: uimhir neamhbhailí" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: fad iarmhíre neamhbhailí" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: líon neamhbhailí na mbeart" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: líon na línte neamhbhailí" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "táb ilcharachtair %s" -#: src/split.c:1286 +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "comhad speisialta den chineál `carachtar'" + +#: src/split.c:1383 #, 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:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "líne-uimhir imeachta neamhbhailí: %s" -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: méid comhaid neamhbhailí" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "Ní féidir %s a oscailt" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "rabhadh: éalúchán anaithnid `\\%c'" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: treoir neamhbhailí" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "rabhadh: cúlslais ag deireadh na formáide" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, 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:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9749,7 +9854,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9757,30 +9862,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9788,11 +9893,11 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 #, fuzzy msgid "" " -L, --dereference follow links\n" @@ -9803,7 +9908,7 @@ msgstr "" " -L, --dereference lean naisc\n" " -f, --file-system taispeáin stádas de chóras in ionad comhaid\n" -#: src/stat.c:1422 +#: src/stat.c:1425 #, fuzzy msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" @@ -9820,7 +9925,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:1433 +#: src/stat.c:1436 #, fuzzy msgid "" "\n" @@ -9841,7 +9946,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:1442 +#: src/stat.c:1445 #, fuzzy msgid "" " %d device number in decimal\n" @@ -9858,7 +9963,7 @@ msgstr "" " %g Aitheantas ghrúpa den úinéir\n" " %G Ainm grúpa den úinéir\n" -#: src/stat.c:1450 +#: src/stat.c:1453 #, fuzzy msgid "" " %h number of hard links\n" @@ -9880,7 +9985,7 @@ msgstr "" " %t Cineál gléis príomha, heicsidheachúlach\n" " %T Cineál gléis mion, heicsidheachúlach\n" -#: src/stat.c:1461 +#: src/stat.c:1464 #, fuzzy msgid "" " %u user ID of owner\n" @@ -9905,7 +10010,7 @@ msgstr "" " %Z Am den athrú is déanaí, soicindí ón tSainré\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -9925,7 +10030,7 @@ msgstr "" " %f Bloic ar fáil sa chóras comhaid\n" " %C Comhthéacs slándála SELinux\n" -#: src/stat.c:1484 +#: src/stat.c:1487 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -9988,8 +10093,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -10014,7 +10118,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "" -#: src/stty.c:516 +#: src/stty.c:524 #, fuzzy, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10025,11 +10129,11 @@ msgstr "" " nó: %s [-F GLÉAS] [--file=GLÉAS] [-a|--all]\n" " nó: %s [-F GLÉAS] [--file=GLÉAS] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 #, fuzzy msgid "" " -a, --all print all current settings in human-readable form\n" @@ -10042,7 +10146,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:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10053,11 +10157,24 @@ msgstr "" "roghanna neamh-POSIX le `*'. Socraíonn an córas féin na roghanna atá ar " "fáil.\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -10068,9 +10185,13 @@ msgstr "" " eof CAR Seolfaidh CAR comhadchríoch (críochnaigh ionchur)\n" " eol CAR Críochnóidh CAR an líne\n" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -10080,36 +10201,58 @@ msgstr "" " intr CAR seolfaidh CAR comhartha idirbhriste\n" " kill CAR léirscriosfaidh CAR an líne reatha\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" msgstr "" -" * lnext CAR iontrálfaidh CAR an chéad charachtar luaite eile\n" -" quit CAR seolfaidh CAR comhartha scortha\n" -" * 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:559 +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 CAR stopfaidh CAR an t-aschur\n" " susp CAR seolfaidh CAR comhartha chun an teirminéal a stopadh\n" " * swtch CAR athróidh CAR chuig sraith bhlaoisce eile\n" " * werase CAR léirscriosfaidh CAR an focal is déanaí\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 #, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Roghanna speisialta:\n" +" N socraigh an luas ionchurtha/aschurtha a bheith N bád\n" +" * 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:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -10119,10 +10262,17 @@ 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:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -10132,11 +10282,21 @@ 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:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N cuir in iúl go bhfuil N líne ag an teirminéal\n" +" * size taispeáin líon na línte agus na gcolún de réir na heithne\n" +" speed taispeáin luas an teirminéil\n" +" time N le -icanon, socraigh seal fanachta, N deachú soicind\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -10145,25 +10305,27 @@ msgstr "" " speed taispeáin luas an teirminéil\n" " time N le -icanon, socraigh seal fanachta, N deachú soicind\n" -#: src/stty.c:584 -#, fuzzy +#: src/stty.c:641 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" -"Roghanna rialaithe:\n" -" [-]clocal stop comharthaí a rialaíonn an móideim\n" -" [-]cread cumasaigh ionchur\n" -" * [-]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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -10172,7 +10334,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb dhá ghiotán stoptha an charachtair (1 le `-')\n" " [-]hup seol comhartha HUP nuair a dhúnann an tty\n" @@ -10180,7 +10341,12 @@ msgstr "" " [-]parenb gin giotán paireachta san aschur agus iarr é san ionchur\n" " [-]parodd socraigh paireacht chorr (cothrom le `-')\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -10188,6 +10354,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Roghanna ionchurtha:\n" @@ -10196,10 +10363,14 @@ msgstr "" " [-]ignbrk déan neamhshuim ar charachtair bhriste\n" " [-]igncr déan neamhshuim ar aisfhilleadh\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -10210,14 +10381,23 @@ 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:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 glac le carachtair san ionchódú UTF-8\n" -#: src/stty.c:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr " * [-]iutf8 glac le carachtair san ionchódú UTF-8\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -10230,60 +10410,83 @@ msgstr "" " [-]parmrk comharthaigh earráidí phaireachta (le cód 255-0-carachtar)\n" " [-]tandem ar comhbhrí le [-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Roghanna aschuir:\n" -" * bsN mód moille do chúlspásanna, N=0 nó 1\n" -" * crN mód moille d'aisfhilleadh, N=0,1,2, nó 3\n" -" * 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:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" msgstr "" -" * [-]ocrnl tiontaigh aisfhilleadh go líne nua\n" -" * [-]ofdel stuáil le scrioscharachtair in ionad carachtair nialasacha\n" -" * [-]ofill stuáil le carachtair in ionad am-áireamh i gcás moille\n" -" * [-]olcuc tiontaigh an cás íochtair go dtí an cás uachtair\n" -" * [-]onlcr tiontaigh líne nua go haisfhilleadh+líne nua\n" -" * [-]onlret déan líne nua aisfhilleadh\n" -#: src/stty.c:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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 "" -" * [-]onocr ná taispeáin aisfhilleadh sa chéad cholún\n" -" [-]opost iarphróiseáil an t-aschur\n" -" * tabN mód moille do tháib chothrománacha, N=0,1,2, nó 3\n" -" * tabs ar comhbhrí le tab0\n" -" * -tabs ar comhbhrí le tab3\n" -" * vtN mód moille do tháib ingearacha, N=0 nó 1\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10296,47 +10499,63 @@ msgstr "" " * -crtkill scrios gach líne trí ghéilleadh do na roghanna echoctl/" "echok\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 #, fuzzy +msgid " [-]echo echo input characters\n" +msgstr " * [-]iutf8 glac le carachtair san ionchódú UTF-8\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]ctlecho déan macalla de charachtair rialúcháin mar `^c', srl.\n" -" [-]echo déan macalla de gach carachtar ionchurtha\n" -" * [-]echoctl ar comhbhrí le [-]ctlecho\n" -" [-]echoe ar comhbhrí le [-]crterase\n" -" [-]echok déan macalla de líne nua i ndiaidh carachtair maraithe\n" -#: src/stty.c:665 -#, fuzzy +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]echoke ar comhbhrí le [-]crtkill\n" -" [-]echonl déan macalla de líne nua, fiú mura carachtair eile\n" -" * [-]echoprt déan macalla de charachtair léirscriosta ar gcúl,\n" -" idir `\\' agus `/'\n" -" [-]icanon cumasaigh carachtair speisialta erase,kill,werase,agus " -"rprnt\n" -" [-]iexten cumasaigh carachtair speisialta neamh-POSIX\n" +" [-]isig cumasaigh interrupt, quit, agus cuir carachtair\n" +" speisialta ar fionraí\n" +" [-]noflsh stop sruthlú i ndiaidh carachtair speisialta interrupt/" +"quit\n" +" * [-]prterase ar comhbhrí le [-]echoprt\n" +" * [-]tostop stop tascanna sa chúlra atá scríobh chuig an teirminéal\n" +" * [-]xcase le icanon, éalúchán le `\\' do charachtair sa chás " +"uachtair\n" -#: src/stty.c:672 +#: src/stty.c:843 #, fuzzy 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 "" " [-]isig cumasaigh interrupt, quit, agus cuir carachtair\n" " speisialta ar fionraí\n" @@ -10347,11 +10566,33 @@ msgstr "" " * [-]xcase le icanon, éalúchán le `\\' do charachtair sa chás " "uachtair\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -10361,12 +10602,12 @@ msgstr "" " cbreak ar comhbhrí le -icanon\n" " -cbreak ar comhbhrí le icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 ar comhbhrí le brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof agus eol ag glacadh a luachanna " @@ -10374,29 +10615,38 @@ msgstr "" " -cooked ar comhbhrí le `raw'\n" " crt ar comhbhrí le echoe echoctl echoke\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -" dec ar comhbhrí le echoe echoctl echoke -ixany intr ^c erase\n" -" 0177 kill ^u\n" -" * [-]decctlq ar comhbhrí le [-]ixany\n" -" ek glac carachtair scriosta/maraithe a luachanna " -"réamhshocraithe\n" -" evenp ar comhbhrí le parenb -parodd cs7\n" -#: src/stty.c:699 +#: src/stty.c:919 +#, fuzzy 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 "" " -evenp ar comhbhrí le -parenb cs8\n" " * [-]lcase ar comhbhrí le xcase iuclc olcuc\n" @@ -10405,7 +10655,19 @@ msgstr "" " nl ar comhbhrí le -icrnl -onlcr\n" " -nl ar comhbhrí le icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"Roghanna measctha:\n" +" * [-]LCASE ar comhbhrí le [-]lcase\n" +" cbreak ar comhbhrí le -icanon\n" +" -cbreak ar comhbhrí le icanon\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10419,11 +10681,12 @@ msgstr "" " pass8 ar comhbhrí le -parenb -istrip cs8\n" " -pass8 ar comhbhrí le parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw ar comhbhrí le -ignbrk -brkint -ignpar -parmrk -inpck -" @@ -10432,15 +10695,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw ar comhbhrí le `cooked'\n" -#: src/stty.c:720 -#, fuzzy +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane ar comhbhrí le cread -ignbrk brkint -inlcr -igncr icrnl\n" " -iutf8 -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl " @@ -10451,7 +10714,7 @@ msgstr "" " agus glacann carachtair speisialta a luach " "réamhshocraithe.\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10466,12 +10729,12 @@ msgstr "" "nó\n" "127; úsáid luachanna ^- nó undef chun carachtair speisialta a stopadh.\n" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "ní cheadaítear ach gléas amháin a bheith ceaptha" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10480,45 +10743,50 @@ msgstr "" "is comheisiatach iad na roghanna d'aschur foclach agus\n" "d'aschur stty-inléite" -#: src/stty.c:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: ní féidir mód gan bacainní a athshocrú" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "argóint neamhbhailí %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "tá argóint de dhíth i ndiaidh na rogha %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: earráid le linn teasctha" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "disciplín neamhbhailí líne %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: ní féidir gach tasc iarrtha a dhéanamh" -#: src/stty.c:1403 +#: src/stty.c:1747 #, 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:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "argóint neamhbhailí shlánuimhreach %s" #. This is a proper name. See the gettext manual, section Names. @@ -10528,8 +10796,14 @@ msgstr "Kayvan Aghaiepour" #: src/sum.c:62 #, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Taispeáin suim sheiceála CRC agus líon bearta di gach COMHAD.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -10539,20 +10813,54 @@ msgstr "" " -r stop -s, úsáid algartam BSD agus bloic 1K\n" " -s, --sysv úsáid algartam System V agus bloic 512 beart\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Úsáid: %s [ROGHA] [COMHAD]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Scríobh bloic athraithe chuig an diosca, nuashonraigh an t-osbhloc.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" -#: src/sync.c:69 +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "earráid agus %s á léamh" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: ní féidir mód gan bacainní a athshocrú" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "earráid agus %s á léamh" + +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "ag déanamh neamhshuim ar gach argóint" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10566,15 +10874,23 @@ msgstr "" "dhoiciméadú do bhlaoisce chun tuilleadh eolais a fháil faoi na roghanna\n" "a dtacaíonn sé leo.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help taispeáin an chabhair seo agus scoir\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version taispeáin eolas faoin leagan agus scoir\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Mura bhfuil COMHAD ann, nó más '-' é, léigh ón gnáth-ionchur.\n" + +#: src/system.h:544 #, fuzzy msgid "" "\n" @@ -10583,7 +10899,7 @@ msgstr "" "Is riachtanach le rogha ghearr aon argóint atá riachtanach leis an rogha " "fhada.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10591,7 +10907,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10600,7 +10916,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -10611,22 +10927,27 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "Full documentation at: <%s%s>\n" msgstr "" -#: src/system.h:591 +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "" + +#: src/system.h:613 #, 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:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10648,9 +10969,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\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" @@ -10669,57 +10988,56 @@ msgstr "" " -s, --separator=TEAGHRÁN úsáid TEAGHRÁN mar dheighilteoir in ionad líne " "nua\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: níorbh fhéidir `seek' a dhéanamh" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "tá an taifead rómhór" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "ní féidir comhad sealadach %s a chruthú" -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: theip ar oscailt chun é a scríobh" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "níorbh fhéidir amanna a chaomhnú ar %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: earráid sa scríobh" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "ní féidir %s a oscailt chun léamh" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "ní cheadaítear deighilteoir folamh" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 +#: src/tail.c:257 #, 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" 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 " @@ -10727,13 +11045,13 @@ msgstr "" "Mura bhfuil COMHAD ann, nó más '-' é, léigh ón ghnáth-ionchur.\n" "\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 #, fuzzy msgid "" " -f, --follow[={name|descriptor}]\n" @@ -10748,7 +11066,7 @@ msgstr "" "comhbhrí\n" " -F ar comhbhrí le --follow=name --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10770,7 +11088,7 @@ msgstr "" " féachaint an raibh sé dínasctha nó athainmnithe\n" " (mar shampla do logchomhaid uainíochta go minic)\n" -#: src/tail.c:293 +#: src/tail.c:288 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -10784,7 +11102,7 @@ msgstr "" " -v, --verbose taispeáin ceanntásca le hainmneacha comhaid i " "gcónaí\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -10793,7 +11111,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 +#: src/tail.c:302 #, fuzzy msgid "" "\n" @@ -10813,7 +11131,7 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024, srl. le T, P, E, Z, Y.\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -10830,174 +11148,174 @@ 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:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "%s (fd=%d) á dhúnadh" -#: src/tail.c:461 +#: src/tail.c:456 #, 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:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, fuzzy, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "cuireadh comhad nach féidir a `tail' in áit %s; á thréigean" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "tá %s dorochtana anois" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "tá %s insroichte anois" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "tá %s ann anois; críoch an chomhaid nua á leanúint" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "tá comhad nua in áit %s anois; críoch an chomhaid nua á leanúint" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: ní féidir mód gan bacainní a athshocrú" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: comhad teasctha" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "níl aon chomhad fágtha" -#: src/tail.c:1424 +#: src/tail.c:1440 #, fuzzy, c-format msgid "cannot watch parent directory of %s" msgstr "níl an chomhadlann oibre ar fáil (%s anois)" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, fuzzy, c-format msgid "inotify resources exhausted" msgstr "cuimhne ídithe" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, fuzzy, c-format msgid "cannot watch %s" msgstr "ní féidir %s a `touch'" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: ionadaigh %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1597 #, fuzzy, c-format msgid "error reading inotify event" msgstr "earráid agus %s á léamh" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: ní féidir an chríoch a lorg do chomhad den chineál seo; ag tréigean" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "tá an uimhir i %s rómhór" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "%s: is neamhbhailí é an líon uasta `stat'anna gan athrú idir oscailtí" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: PID neamhbhailí" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: líon na soicindí neamhbhailí" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "líon neamhbhailí na gcolún: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "úsáideadh an rogha i gcomhthéacs neamhbhailí -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, fuzzy, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" "rabhadh: rinneadh neamhshuim ar PID; níl --pid=PID tairbheach\n" "mura bhfuiltear ag leanúint" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" "rabhadh: rinneadh neamhshuim ar PID; níl --pid=PID tairbheach\n" "mura bhfuiltear ag leanúint" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "rabhadh: níl --pid=PID ar fáil ar an gcóras seo" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "ní féidir %s a leanúint de réir a ainm" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "rabhadh: níl maith ar bith i lorg an ghnáth-ionchur gan teorainn ama" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -11010,60 +11328,72 @@ msgstr "" " -a, --append iarcheangail leis na COMHA(I)D, ná forscríobh\n" " -i, --ignore-interrupts déan neamhshuim ar chomharthaí idirbhriste\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Más '-' é an COMHAD, cóipeáil arís go dtí an gnáth-aschur.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "argóint ar iarraidh i ndiaidh %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "slánuimhir neamhbhailí %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "bhíothas ag súil le ')'" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "bhíothas ag súil le ')', fuarthas %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: bhíothas ag súil le hoibreoir aonártha" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "ní ghlacann -nt le -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "ní ghlacann -ef le -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "ní ghlacann -ot le -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "oibreoir dénártha anaithnid" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: bhíothas ag súil le hoibreoir dénártha" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11077,7 +11407,7 @@ msgstr "" " nó: [ ]\n" " nó: [ ROGHA\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11085,7 +11415,7 @@ msgstr "" "Scoir leis an stádas scortha tugtha ag SLONN.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11097,7 +11427,7 @@ msgstr "" "is fíor nó bréagach SLONN agus socraíonn sé an stádas scortha. Tá sé ceann\n" "de na luachanna seo a leanas:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11111,7 +11441,7 @@ msgstr "" " SLONN1 -a SLONN2 tá SLONN1 agus SLONN2 fíor\n" " SLONN1 -o SLONN2 tá SLONN1 nó SLONN2 fíor\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11127,7 +11457,7 @@ msgstr "" " TEAGHRÁN1 = TEAGHRÁN2 is ionann iad\n" " TEAGHRÁN1 != TEAGHRÁN2 ní ionann iad\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11145,7 +11475,7 @@ msgstr "" " UIMHIR1 -lt UIMHIR2 tá UIMHIR1 níos lú ná UIMHIR2\n" " UIMHIR1 -ne UIMHIR2 ní ionann iad\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11157,7 +11487,7 @@ msgstr "" " COMHAD1 -ef COMHAD2 tá COMHAD1 níos úire (mionathrú) ná COMHAD2\n" " COMHAD1 -ot COMHAD2 tá COMHAD2 níos úire ná COMHAD1\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11172,7 +11502,7 @@ msgstr "" " -d COMHAD tá COMHAD ann agus is comhadlann é\n" " -e COMHAD tá COMHAD ann\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11186,7 +11516,7 @@ msgstr "" " -h COMHAD tá COMHAD ann agus is nasc siombalach é (is ionann agus -L)\n" " -k COMHAD tá COMHAD ann agus tá sé a ghiotán greamaitheach lasta\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11200,7 +11530,7 @@ msgstr "" " -r COMHAD tá COMHAD ann agus tá sé inléite\n" " -s COMHAD tá COMHAD ann agus níl sé folamh\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11214,7 +11544,7 @@ msgstr "" " -w COMHAD tá COMHAD ann agus is inscríofa é\n" " -x COMHAD tá COMHAD ann agus is féidir é a rith nó a chuardach\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11227,7 +11557,7 @@ msgstr "" "Ní foláir duit `(' agus `)' a chosaint ón bhlaosc le, m.sh., cúlslaiseanna.\n" "Is féidir le hUIMHIR a bheith -l TEAGHRÁN, fad an teaghráin.\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11238,26 +11568,26 @@ msgstr "" "úsáideann 'test' --help agus --version díreach cosúil le aon\n" "TEAGHRÁN eile nach bhfuil folamh.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test agus/nó [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 #, fuzzy msgid "missing ']'" msgstr "`]' ar iarraidh" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "argóint bhreise %s" @@ -11277,7 +11607,7 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11286,11 +11616,11 @@ msgstr "" "Úsáid: %s ROGHA ÚSÁIDEOIR ORDÚ [ARGÓINT]...\n" " nó: %s ROGHA\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11308,7 +11638,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11316,7 +11646,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -11327,7 +11657,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -11342,6 +11672,11 @@ msgstr "earráid agus %s á scríobh" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -11705,12 +12040,12 @@ msgstr "Scoir le cód scortha a chomharthaíonn bua." msgid "Exit with a status code indicating failure." msgstr "Scoir le cód scortha a chomharthaíonn teip." -#: src/truncate.c:96 +#: src/truncate.c:69 #, fuzzy, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Úsáid: %s ROGHA... [COMHAD]...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -11721,23 +12056,23 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 #, fuzzy msgid " -c, --no-create do not create any files\n" msgstr " -d, --directory cruthaigh comhadlann in ionad comhaid\n" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11745,57 +12080,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: comhad de mhéid diúltach" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "níl aon fháil ar an am lae" -#: src/truncate.c:205 +#: src/truncate.c:178 #, fuzzy, c-format msgid "overflow rounding up size of file %s" msgstr "fritháireamh thar maoil agus comhad %s á léamh" -#: src/truncate.c:215 +#: src/truncate.c:188 #, fuzzy, c-format msgid "overflow extending size of file %s" msgstr "fritháireamh thar maoil agus comhad %s á léamh" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "" -#: src/truncate.c:303 +#: src/truncate.c:276 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "sonraíodh sprioc-chomhadlanna iomadúla" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "uimhir neamhbhailí %s" + +#: src/truncate.c:307 #, 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:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "ní féidir %s a oscailt chun scríobh air" @@ -11809,12 +12149,10 @@ msgstr "Mark Kettenis" # seems not to have the force of a past participle # coined "páirtord" by analogy #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Úsáid: %s [ROGHA] [COMHAD]\n" "Scríobh liosta sórtáilte go hiomlán is comhchuí leis an pháirtord i " @@ -11822,12 +12160,17 @@ msgstr "" "Mura bhfuil COMHAD ann, nó más '-' é, léigh ón ghnáth-ionchur.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: is corr líon na dteaghrán san ionchur" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: tá lúb san ionchur:" @@ -11893,9 +12236,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "Tiontaigh spásanna i ngach COMHAD go táib, agus scríobh ar an ngnáth-" "aschur.\n" @@ -11949,8 +12290,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -11961,7 +12302,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -12119,11 +12460,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "" - #: src/uptime.c:214 #, fuzzy, c-format msgid "" @@ -12145,13 +12481,17 @@ msgstr "" "Gan CHOMHAD, úsáid %s. Feictear %s mar CHOMHAD go minic.\n" "\n" -#: src/wc.c:117 -#, fuzzy +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -12167,13 +12507,13 @@ msgstr "" " -m, --chars taispeáin líon na gcarachtar\n" " -l, --lines taispeáin líon na línte nua\n" -#: src/wc.c:128 +#: src/wc.c:134 #, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=C léigh na comhaid a shonraítear i gcomhad C le\n" @@ -12340,10 +12680,10 @@ msgstr "" "faoi láthair. Ar comhbhrí le `id -un'.\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: níl aon fháil ar ainm don aitheantas úsáideora %lu\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "níl aon fháil ar ainm don aitheantas úsáideora %lu" #: src/yes.c:41 #, c-format @@ -12363,6 +12703,224 @@ msgstr "" "Priontáil líne arís agus arís le gach TEAGHRÁN ceaptha, nó `y'.\n" "\n" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "Úsáidfear -t go huathoibríoch má tá FAD_LEATHANAIGH <= 10. Mura bhfuil\n" +#~ "COMHAD ann, nó más '-' é, léigh ón ghnáth-ionchur.\n" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Mura bhfuil COMHAD ann, nó más '-' é, léigh ón gnáth-ionchur.\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Scríobh bloic athraithe chuig an diosca, nuashonraigh an t-osbhloc.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "ag déanamh neamhshuim ar gach argóint" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: uimhir neamhbhailí" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: tá %s chomh mór nach inléirithe é" + +#~ msgid "number of lines" +#~ msgstr "líon na línte" + +#~ msgid "number of bytes" +#~ msgstr "líon na mbeart" + +#, fuzzy +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: líon na línte neamhbhailí" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: líon neamhbhailí na mbeart" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: líon na línte neamhbhailí" + +#~ msgid "number in %s is too large" +#~ msgstr "tá an uimhir i %s rómhór" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: líon na soicindí neamhbhailí" + +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "níorbh fhéidir an grúpa (nó na grúpaí) forlíontach a shocrú" + +#, fuzzy +#~ 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 "" +#~ "\n" +#~ "Má sheoltar comhartha %s chuig próiseas `dd' beo, scríobhfaidh sé " +#~ "staitistic\n" +#~ "I/A chuig an ghnáth-aschur earráide, agus ansin atosóidh sé an " +#~ "chóipeáil.\n" +#~ "\n" +#~ " $ dd if=/dev/zero of=/dev/null& pid=$!\n" +#~ " $ kill -%s $pid; sleep 1; kill $pid\n" +#~ " 18335302+0 taifead isteach\n" +#~ " 18335302+0 taifead amach\n" +#~ " 9387674624 beart (9.4 GB) cóipeáilte, 34.6279 soicind, 271 MB/s\n" +#~ "\n" +#~ "Roghanna:\n" +#~ "\n" + +#~ 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 CAR iontrálfaidh CAR an chéad charachtar luaite eile\n" +#~ " quit CAR seolfaidh CAR comhartha scortha\n" +#~ " * rprnt CAR priontálfaidh CAR an líne reatha arís\n" +#~ " start CAR atosóidh CAR an t-aschur i ndiaidh á stopadh\n" + +#, 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" +#~ "Roghanna rialaithe:\n" +#~ " [-]clocal stop comharthaí a rialaíonn an móideim\n" +#~ " [-]cread cumasaigh ionchur\n" +#~ " * [-]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" + +#~ 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 "" +#~ "\n" +#~ "Roghanna aschuir:\n" +#~ " * bsN mód moille do chúlspásanna, N=0 nó 1\n" +#~ " * crN mód moille d'aisfhilleadh, N=0,1,2, nó 3\n" +#~ " * ffN mód moille d'fhoirmfhotha, N=0 nó 1\n" +#~ " * nlN mód moille do línte nua, N=0 nó 1\n" + +#, fuzzy +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl tiontaigh aisfhilleadh go líne nua\n" +#~ " * [-]ofdel stuáil le scrioscharachtair in ionad carachtair " +#~ "nialasacha\n" +#~ " * [-]ofill stuáil le carachtair in ionad am-áireamh i gcás moille\n" +#~ " * [-]olcuc tiontaigh an cás íochtair go dtí an cás uachtair\n" +#~ " * [-]onlcr tiontaigh líne nua go haisfhilleadh+líne nua\n" +#~ " * [-]onlret déan líne nua aisfhilleadh\n" + +#~ 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 "" +#~ " * [-]onocr ná taispeáin aisfhilleadh sa chéad cholún\n" +#~ " [-]opost iarphróiseáil an t-aschur\n" +#~ " * tabN mód moille do tháib chothrománacha, N=0,1,2, nó 3\n" +#~ " * tabs ar comhbhrí le tab0\n" +#~ " * -tabs ar comhbhrí le tab3\n" +#~ " * vtN mód moille do tháib ingearacha, N=0 nó 1\n" + +#, fuzzy +#~ 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 "" +#~ " * [-]ctlecho déan macalla de charachtair rialúcháin mar `^c', srl.\n" +#~ " [-]echo déan macalla de gach carachtar ionchurtha\n" +#~ " * [-]echoctl ar comhbhrí le [-]ctlecho\n" +#~ " [-]echoe ar comhbhrí le [-]crterase\n" +#~ " [-]echok déan macalla de líne nua i ndiaidh carachtair maraithe\n" + +#, fuzzy +#~ 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 "" +#~ " * [-]echoke ar comhbhrí le [-]crtkill\n" +#~ " [-]echonl déan macalla de líne nua, fiú mura carachtair eile\n" +#~ " * [-]echoprt déan macalla de charachtair léirscriosta ar gcúl,\n" +#~ " idir `\\' agus `/'\n" +#~ " [-]icanon cumasaigh carachtair speisialta erase,kill,werase,agus " +#~ "rprnt\n" +#~ " [-]iexten cumasaigh carachtair speisialta neamh-POSIX\n" + +#~ 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 "" +#~ " dec ar comhbhrí le echoe echoctl echoke -ixany intr ^c " +#~ "erase\n" +#~ " 0177 kill ^u\n" +#~ " * [-]decctlq ar comhbhrí le [-]ixany\n" +#~ " ek glac carachtair scriosta/maraithe a luachanna " +#~ "réamhshocraithe\n" +#~ " evenp ar comhbhrí le parenb -parodd cs7\n" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: níl aon fháil ar ainm don aitheantas úsáideora %lu\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: rogha neamhcheadaithe -- %c\n" @@ -12410,9 +12968,6 @@ 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 "%s" #~ msgstr "%s" @@ -12582,18 +13137,6 @@ msgstr "" #~ msgid "David Ihnat" #~ msgstr "David Ihnat" -#~ msgid "" -#~ "Display the current time in the given FORMAT, or set the system date.\n" -#~ "\n" -#~ " -d, --date=STRING display time described by STRING, not `now'\n" -#~ " -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -#~ msgstr "" -#~ "Taispeáin an t-am anois i gcruth FORMÁID, nó socraigh dáta an chórais.\n" -#~ "\n" -#~ " -d, --date=TEAGHRÁN taispeáin am tugtha i dTEAGHRÁN, ní `now'\n" -#~ " -f, --file=COMHADDÁTA mar --date uair amháin sa líne de " -#~ "CHOMHADDÁTA\n" - #~ msgid "opening %s" #~ msgstr "%s á oscailt" diff --git a/po/gl.gmo b/po/gl.gmo index 578d1378..7b0671e6 100644 Binary files a/po/gl.gmo and b/po/gl.gmo differ diff --git a/po/gl.po b/po/gl.po index 511e2d4d..7fba3455 100644 --- a/po/gl.po +++ b/po/gl.po @@ -2,11 +2,12 @@ # Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. # Jacobo Tarrio , 2000, 2001, 2002. # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: textutils 2.0.22\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2002-07-23 03:07+0200\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -34,18 +35,18 @@ msgstr "Os parámetros correctos son:" msgid "error closing file" msgstr "volcando o ficheiro" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "erro de escritura" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, fuzzy, c-format msgid "preserving permissions for %s" msgstr "non se pode cambia-los permisos de %s" @@ -236,57 +237,62 @@ msgstr "" msgid "Unknown error" msgstr "Erro do sistema descoñecido" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: a opción \"%s\" é ambigua\n" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: a opción \"-W %s\" é ambigua\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: a opción \"--%s\" non permite un argumento\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: a opción \"%c%s\" precisa dun argumento\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, fuzzy, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: a opción \"%s\" precisa dun argumento\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: opción descoñecida \"--%s\"\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: opción descoñecida \"%c%s\"\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opción incorrecta -- %c\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a opción precisa dun argumento -- %c\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: a opción \"-W %s\" é ambigua\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: a opción \"-W %s\" non permite un argumento\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, fuzzy, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: a opción \"%s\" precisa dun argumento\n" @@ -296,13 +302,13 @@ msgstr "%s: a opción \"%s\" precisa dun argumento\n" msgid "cannot change permissions of %s" msgstr "non se pode cambia-los permisos de %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "non se pode crea-lo directorio %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "memoria esgotada" @@ -351,6 +357,12 @@ msgstr "\"" msgid "%s: end of file" msgstr "%s: erro de lectura" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: erro de lectura" + #: lib/regcomp.c:131 msgid "Success" msgstr "" @@ -464,7 +476,7 @@ msgstr "^[sSyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, fuzzy, c-format msgid "setting permissions for %s" msgstr "non se pode cambia-los permisos de %s" @@ -885,7 +897,7 @@ msgid "" "Base64 encode or decode FILE, or standard input, to standard output.\n" msgstr "" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -895,15 +907,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Sen FICHEIRO, ou cando o FICHEIRO é -, lese da entrada estándar.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -912,51 +916,51 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "erro de lectura" -#: src/base64.c:231 +#: src/base64.c:229 #, fuzzy, c-format msgid "invalid input" msgstr "número incorrecto" -#: src/base64.c:268 +#: src/base64.c:266 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "cadea de tipo incorrecta \"%s\"" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, fuzzy, c-format msgid "extra operand %s" msgstr "operando \"%s\" extra" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, fuzzy, c-format msgid "closing standard input" msgstr "entrada estándar" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 #, fuzzy msgid "David MacKenzie" @@ -1002,40 +1006,48 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, fuzzy, c-format msgid "missing operand" msgstr "%s: esperábase un enteiro tras \"%c\"" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 #, fuzzy msgid "Richard M. Stallman" msgstr "Torbjorn Grandlund e Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n" #: src/cat.c:92 #, fuzzy +msgid "Concatenate 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/cat.c:98 +#, fuzzy 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" @@ -1053,7 +1065,7 @@ msgstr "" " -n, --number numerar tódalas liñas de saída\n" " -s, --squeeze-blank nunca máis dunha soa liña en branco\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1065,7 +1077,7 @@ msgstr "" " -u (ignorado)\n" " -v, --show-nonprinting usar notación de ^ e M-, excepto en LFD e TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1074,17 +1086,18 @@ msgid "" " %s Copy standard input to standard output.\n" msgstr "" -#: src/cat.c:326 +#: src/cat.c:327 #, fuzzy, c-format msgid "cannot do ioctl on %s" msgstr "non se poden facer operacións de ioctl en \"%s\"" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "saída estándar" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: o ficheiro de entrada é o mesmo que o de saída" @@ -1096,10 +1109,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 #, fuzzy msgid "Jim Meyering" msgstr "Mike Haertel e Paul Eggert" @@ -1114,8 +1127,8 @@ msgstr "obtendo os atributos de %s" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "obtendo os atributos de %s" @@ -1130,13 +1143,13 @@ msgstr "" 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:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, fuzzy, c-format msgid "cannot access %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "non se pode crea-lo directorio %s" @@ -1152,7 +1165,7 @@ msgstr "non se pode cambia-los permisos de %s" msgid "fts_read failed" msgstr "erro de lectura" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, fuzzy, c-format msgid "fts_close failed" @@ -1239,7 +1252,7 @@ msgid "-R -h requires -P" msgstr "" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, fuzzy, c-format msgid "missing operand after %s" @@ -1256,9 +1269,8 @@ msgid "conflicting security context specifiers given" msgstr "" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, fuzzy, c-format msgid "failed to get attributes of %s" msgstr "obtendo os atributos de %s" @@ -1546,17 +1558,17 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, fuzzy, c-format msgid "invalid group %s" msgstr "grupo incorrecto" -#: src/chroot.c:150 +#: src/chroot.c:152 #, fuzzy, c-format msgid "invalid group list %s" msgstr "grupo incorrecto" -#: src/chroot.c:186 +#: src/chroot.c:185 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1565,60 +1577,72 @@ msgstr "" "Uso: %s [FICHEIRO]...\n" " ou: %s [OPCIÓN]\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" msgstr "" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" msgstr "" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, fuzzy, c-format msgid "cannot change root directory to %s" msgstr "non se pode cambiar ao directorio %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, fuzzy, c-format msgid "cannot chdir to root directory" msgstr "non se pode cambiar ao directorio %s" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "non se pode obte-la lista de grupos suplementarios" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" +msgid "failed to set supplemental groups" msgstr "non se pode obte-la lista de grupos suplementarios" -#: src/chroot.c:402 +#: src/chroot.c:418 #, fuzzy, c-format msgid "failed to set group-ID" msgstr "non se poden omiti-lo usuario e o grupo" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, fuzzy, c-format msgid "failed to run command %s" msgstr "obtendo os atributos de %s" @@ -1659,7 +1683,16 @@ msgstr "Uso: %s [OPCIÓN]... FICHEIRO1 FICHEIRO2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Sen FICHEIRO, ou cando o FICHEIRO é -, lese da entrada estándar.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1667,7 +1700,7 @@ msgid "" "and column three contains lines common to both files.\n" msgstr "" -#: src/comm.c:116 +#: src/comm.c:120 #, fuzzy msgid "" "\n" @@ -1682,7 +1715,7 @@ msgstr "" " -2 elimina-las liñas que só aparezan no ficheiro dereito\n" " -3 elimina-las liñas que só aparezan nalgún dos ficheiros\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1690,17 +1723,17 @@ msgid "" " --nocheck-order do not check that the input is correctly sorted\n" msgstr "" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1709,310 +1742,324 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "" -#: src/comm.c:407 +#: src/comm.c:411 #, fuzzy, c-format msgid "multiple delimiters specified" msgstr "\\%c: secuencia de escape non válida" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 -#, c-format -msgid "error reading %s" -msgstr "erro lendo %s" - -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:181 src/copy.c:452 #, fuzzy, c-format msgid "cannot lseek %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" +msgstr "erro lendo %s" + +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 +#, c-format +msgid "error reading %s" +msgstr "erro lendo %s" + +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "erro escribindo %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "erro lendo %s" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "obtendo os atributos de %s" -#: src/copy.c:383 +#: src/copy.c:478 #, fuzzy, c-format msgid "%s: write failed" msgstr "erro de escritura" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "obtendo os atributos de %s" -#: src/copy.c:687 +#: src/copy.c:789 #, fuzzy, c-format msgid "clearing permissions for %s" msgstr "non se pode cambia-los permisos de %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, fuzzy, c-format msgid "failed to preserve ownership for %s" msgstr "mantense o dono de %s" -#: src/copy.c:748 +#: src/copy.c:850 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "mantense a data de %s" -#: src/copy.c:753 +#: src/copy.c:855 #, fuzzy, c-format msgid "failed to preserve authorship for %s" msgstr "mantense o dono de %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, fuzzy, c-format msgid "failed to set default file creation context to %s" msgstr "obtendo os atributos de %s" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "obtendo os atributos de %s" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "obtendo os atributos de %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "non se pode abrir %s para lectura" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, fuzzy, c-format msgid "cannot fstat %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, fuzzy, c-format msgid "cannot remove %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, fuzzy, c-format msgid "removed %s\n" msgstr "borrando %s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "" -#: src/copy.c:1070 +#: src/copy.c:1172 #, fuzzy, c-format msgid "cannot create regular file %s" msgstr "non se pode crea-lo ficheiro temporal" -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" msgstr "non foi posible mudar o grupo de %s a %s\n" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "mantense a data de %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "mantense a data de %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, fuzzy, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: ¿sobrescribir %s, ignorando o modo %04lo? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, fuzzy, c-format msgid "%s: overwrite %s? " msgstr "%s: erro de escritura" -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (copia de seguridade: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1706 +#: src/copy.c:1795 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, fuzzy, c-format msgid "cannot stat %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/copy.c:1777 +#: src/copy.c:1866 #, fuzzy, c-format msgid "omitting directory %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s e %s son o mesmo ficheiro" -#: src/copy.c:1939 +#: src/copy.c:2019 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "non se pode cambiar ao directorio %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, fuzzy, c-format msgid "will not overwrite just-created %s with %s" msgstr "non se pode sobrescribir o non-directorio %s co directorio %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:1989 +#: src/copy.c:2069 #, fuzzy, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "non se pode cambiar ao directorio %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, fuzzy, c-format msgid "cannot backup %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, c-format +msgid "warning: source directory %s specified more than once" +msgstr "" + +#: src/copy.c:2294 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "non se pode cambiar ao directorio %s" -#: src/copy.c:2258 +#: src/copy.c:2351 #, fuzzy, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "non se pode cambiar ao directorio %s" -#: src/copy.c:2301 +#: src/copy.c:2394 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:2357 +#: src/copy.c:2450 #, 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:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, fuzzy, c-format msgid "cannot create special file %s" msgstr "ficheiro especial de carácter" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "ligazón simbólica" -#: src/copy.c:2583 +#: src/copy.c:2676 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "non se pode crea-lo directorio %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s é un tipo de ficheiro descoñecido" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, fuzzy, c-format msgid "cannot un-backup %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (restaurado da copia de seguridade)\n" @@ -2022,25 +2069,25 @@ msgstr "%s -> %s (restaurado da copia de seguridade)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, c-format msgid "unknown program %s" msgstr "" @@ -2323,8 +2370,8 @@ msgstr "%s existe pero non é un directorio" msgid "failed to access %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, fuzzy, c-format msgid "missing file operand" msgstr "argumento de salto" @@ -2396,131 +2443,131 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "a entrada desapareceu" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: número de liña inexistente" -#: src/csplit.c:713 +#: src/csplit.c:714 #, 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:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, fuzzy, c-format msgid " on repetition %s\n" msgstr " na repetición %d\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, fuzzy, c-format msgid "%s: %s: match not found" msgstr "%s: \"%s\": non se atopou nada que coincidira" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "erro ao buscar por expresións regulares" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, fuzzy, c-format msgid "write error for %s" msgstr "erro de escritura en \"%s\"" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, fuzzy, c-format msgid "%s: integer expected after delimiter" msgstr "%s: esperábase un enteiro tras \"%c\"" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: fai falla un \"}\" no número de repeticións" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: fai falla un enteiro entre \"{\" e \"}\"" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: delimitador de peche \"%c\" non atopado" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: expresión regular incorrecta: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: patrón incorrecto" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, 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:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "especificador de conversión non atopado no sufixo" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "especificador de conversión do sufixo incorrecto: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "especificador de conversión do sufixo incorrecto: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "especificador de conversión do sufixo incorrecto: %c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "demasiadas especificacións de conversión %% no sufixo" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "especificación de conversión %% non atopada no sufixo" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: número incorrecto" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "número incorrecto" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Uso: %s [OPCIÓN]... FICHEIRO PATRÓN...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 #, fuzzy msgid "" "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n" @@ -2530,7 +2577,16 @@ msgstr "" "\"xx02\", ..., e amosa-lo número de bytes de cada anaco na saída estándar.\n" "\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Lese da entrada estándar se o FICHEIRO é -. Cada PATRÓN pode ser:\n" + +#: src/csplit.c:1492 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2542,11 +2598,11 @@ msgstr "" " -k, --keep-files non elimina-los ficheiros de saída se hai " "erros\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2557,18 +2613,11 @@ 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:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Lese da entrada estándar se o FICHEIRO é -. Cada PATRÓN pode ser:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 #, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2604,7 +2653,7 @@ msgstr "" "Amosar partes seleccionadas das liñas de cada FICHEIRO na saída estándar.\n" "\n" -#: src/cut.c:182 +#: src/cut.c:183 #, fuzzy msgid "" " -b, --bytes=LIST select only these bytes\n" @@ -2615,7 +2664,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:187 +#: src/cut.c:188 #, fuzzy msgid "" " -f, --fields=LIST select only these fields; also print any line\n" @@ -2628,7 +2677,7 @@ msgstr "" " se indica a opción -s\n" " -n (ignórase)\n" -#: src/cut.c:193 +#: src/cut.c:194 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2637,7 +2686,7 @@ msgstr "" " --verbose amosar un diagnóstico no erro estándar antes de\n" " abrir cada ficheiro de saída\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2648,7 +2697,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:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2656,7 +2705,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:210 +#: src/cut.c:211 #, fuzzy msgid "" "Each range is one of:\n" @@ -2665,8 +2714,6 @@ msgid "" " 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 "" "\n" "Empregue un e só un de -b, -c ou -f. Cada LISTA componse dun rango ou " @@ -2680,54 +2727,54 @@ msgstr "" "\n" "Sen un FICHEIRO, ou cando o FICHEIRO é -, lese da entrada estándar.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "lista de bytes ou campos non correcta" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "" -#: src/cut.c:320 +#: src/cut.c:319 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "opción de anchura non válida: \"%s\"" -#: src/cut.c:334 -#, fuzzy +#: src/cut.c:333 src/numfmt.c:1417 +#, fuzzy, c-format msgid "invalid decreasing range" msgstr "cadea de tipo incorrecta \"%s\"" -#: src/cut.c:383 +#: src/cut.c:382 #, fuzzy, c-format msgid "byte offset %s is too large" msgstr "%s é grande de máis" -#: src/cut.c:386 +#: src/cut.c:385 #, fuzzy, c-format msgid "field number %s is too large" msgstr "o número do campo é cero" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "só se pode indicar un tipo de lista" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "o delimitador debe ser un só carácter" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "debe especificarse unha lista de bytes, caracteres ou campos" -#: src/cut.c:790 +#: src/cut.c:789 #, 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2735,11 +2782,11 @@ msgstr "" "elimina-las liñas sen delimitadores ten sentido\n" "\tsó cando se traballa con campos" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "lista de campos non atopada" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "lista de posicións non atopada" @@ -2757,35 +2804,69 @@ msgid "Display the current time in the given FORMAT, or set the system date.\n" msgstr "" #: src/date.c:134 +#, fuzzy +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" +"Amosa-la data actual no FORMATO indicado, ou establece-la data do sistema.\n" +"\n" +" -d, --date=CADEA amosa-la data descrita por CADEA, non `agora'\n" +" -f, --file=FICH_DATA coma --date, unha vez para cada liña en " +"FICH_DATA\n" +" -I, --iso-8601[=ESPDATA] escribir unha cadea de data/hora seguindo o\n" +" estándar ISO-8601. ESPDATA=`date' (ou sen " +"nada)\n" +" para que só o sexa a data, `hours', `minutes' " +"ou\n" +" `seconds' para a data e a hora coa precisión\n" +" indicada.\n" +" -r, --reference=FICH amosa-la última data de modificación de FICH\n" +" -R, --rfc-822 amosar unha cadea coa data seguindo o RFC-822\n" +" -s, --set=CADEA establece-la data descrita por CADEA\n" +" -u, --utc, --universal escribir ou establece-la Hora Universal " +"Coordinada\n" +" --help amosar esta axuda e saír\n" +" --version amosa-la información da versión e saír\n" + +#: src/date.c:138 +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" +msgstr "" + +#: src/date.c:145 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" -#: src/date.c:142 +#: src/date.c:149 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" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" -#: src/date.c:147 +#: src/date.c:155 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 (UTC)\n" +" -r, --reference=FILE display the last modification time of FILE\n" msgstr "" #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2793,7 +2874,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2801,7 +2882,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2809,14 +2890,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:177 +#: src/date.c:183 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 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2824,7 +2905,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2832,7 +2913,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2843,7 +2924,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2851,7 +2932,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:209 +#: src/date.c:215 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" @@ -2859,7 +2940,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2867,7 +2948,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2879,7 +2960,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2890,7 +2971,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2899,7 +2980,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -2913,35 +2994,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "entrada estándar" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, fuzzy, c-format msgid "invalid date %s" msgstr "anchura non válida: \"%s\"" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, fuzzy, c-format msgid "multiple output formats specified" msgstr "\\%c: secuencia de escape non válida" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2953,23 +3034,23 @@ msgstr "" "argumentos que non son opcións teñen que ser unha cadea\n" "de formato comezando con `+'." -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "non se pode establece-la data" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "" -#: src/dd.c:527 +#: src/dd.c:556 #, fuzzy, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2978,7 +3059,7 @@ msgstr "" "Uso: %s [FICHEIRO]...\n" " ou: %s [OPCIÓN]\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -2989,7 +3070,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:570 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2998,11 +3079,13 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3013,7 +3096,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:561 +#: src/dd.c:592 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3042,7 +3125,7 @@ msgstr "" " usalo con block e unblock, completar con espacios en vez de " "NULs\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3058,7 +3141,7 @@ msgstr "" " fdatasync physically write output file data before finishing\n" " fsync likewise, but also write metadata\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3067,124 +3150,104 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:593 +#: src/dd.c:624 #, fuzzy msgid " directory fail unless a directory\n" msgstr "%s existe pero non é un directorio" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 +#: src/dd.c:661 #, 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:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" - -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:754 -#, fuzzy, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "rexistro truncado" -msgstr[1] "rexistro truncado" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "" @@ -3198,168 +3261,182 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr "" -#: src/dd.c:877 +#: src/dd.c:809 +#, c-format +msgid ", %.6f s, %s/s" +msgstr "" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" + +#: src/dd.c:834 +#, fuzzy, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "rexistro truncado" +msgstr[1] "rexistro truncado" + +#: src/dd.c:920 #, fuzzy, c-format msgid "closing input file %s" msgstr "creando ficheiro \"%s\"\n" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "pechando o ficheiro de saída %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, fuzzy, c-format msgid "writing to %s" msgstr "erro escribindo %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, fuzzy, c-format msgid "unrecognized operand %s" msgstr "opción descoñecida \"-%c\"" -#: src/dd.c:1285 +#: src/dd.c:1376 #, fuzzy msgid "invalid conversion" msgstr "opción de anchura non válida: \"%s\"" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 #, fuzzy msgid "invalid input flag" msgstr "número non válido ao comezo do campo" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 #, fuzzy msgid "invalid output flag" msgstr "grupo incorrecto" -#: src/dd.c:1294 +#: src/dd.c:1385 #, fuzzy -msgid "invalid status flag" +msgid "invalid status level" msgstr "usuario incorrecto" -#: src/dd.c:1333 src/truncate.c:310 -#, fuzzy, c-format -msgid "invalid number %s" -msgstr "número incorrecto" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1417 +#: src/dd.c:1520 #, fuzzy, c-format msgid "cannot combine block and unblock" msgstr "non se poden omiti-lo usuario e o grupo" -#: src/dd.c:1419 +#: src/dd.c:1522 #, fuzzy, c-format msgid "cannot combine lcase and ucase" msgstr "As cadeas que se compararon foron %s e %s" -#: src/dd.c:1421 +#: src/dd.c:1524 #, fuzzy, c-format msgid "cannot combine excl and nocreat" msgstr "non se pode move-lo punteiro do ficheiro de %s" -#: src/dd.c:1424 +#: src/dd.c:1527 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "non se pode move-lo punteiro do ficheiro de %s" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" " of mt_type=0x%0lx -- see for the list of types" msgstr "" -#: src/dd.c:1670 +#: src/dd.c:1773 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "non se pode executar %s" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, fuzzy, c-format msgid "%s: cannot seek" msgstr "%s: non se pode borrar" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1756 +#: src/dd.c:1859 #, 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:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1903 +#: src/dd.c:2006 #, fuzzy, c-format msgid "setting flags for %s" msgstr "establecendo a data de %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: non se pode desprazar á posición relativa %s%s" -#: src/dd.c:2172 +#: src/dd.c:2288 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "avanzando os pasados %s bytes no ficheiro de saída %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, fuzzy, c-format msgid "failed to open %s" msgstr "mantense a data de %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2306 +#: src/dd.c:2422 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "avanzando os pasados %s bytes no ficheiro de saída %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, fuzzy, c-format msgid "failed to discard cache for: %s" msgstr "mantense a data de %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "" @@ -3440,12 +3517,12 @@ msgstr "Capacid" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3453,18 +3530,18 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3473,20 +3550,33 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:1409 +#: src/df.c:1429 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" +msgstr "" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose amosar un diagnóstico no erro estándar antes de\n" +" abrir cada ficheiro de saída\n" + +#: src/df.c:1439 +msgid "" " -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:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3494,26 +3584,26 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, fuzzy, c-format msgid "options %s and %s are mutually exclusive" msgstr "as opcións --string e --check son mutuamente exclusivas" -#: src/df.c:1610 +#: src/df.c:1636 #, 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:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Aviso: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 #, 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:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "" @@ -3632,7 +3722,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3642,7 +3732,8 @@ msgstr "" " ou: %s --traditional [FICHEIRO] [[+]DESPRAZAMENTO [[+]ETIQUETA]]\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" #: src/du.c:291 @@ -3726,62 +3817,56 @@ msgstr "" msgid "Infinity" msgstr "" -#: src/du.c:636 +#: src/du.c:657 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "erro de lectura" -#: src/du.c:787 +#: src/du.c:808 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "anchura non válida: \"%s\"" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "incremento de números de liña incorrecto: \"%s\"" -#: src/du.c:898 +#: src/du.c:919 #, 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:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, fuzzy, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "aviso: resumir vai en conflicto con --max-depth=%d" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: erro de lectura" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 #, fuzzy msgid "invalid zero-length file name" msgstr "grupo incorrecto" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "total" @@ -3902,9 +3987,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\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" @@ -3954,7 +4037,7 @@ msgid "input line is too long" msgstr "%s: ficheiro longo de máis" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "" @@ -4070,12 +4153,12 @@ msgstr "erro ao buscar por expresións regulares" msgid "non-integer argument" msgstr "argumento de límite" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Estabreza LC_ALL='C' para palia-lo problema" @@ -4086,31 +4169,31 @@ msgid "the strings compared were %s and %s" msgstr "As cadeas que se compararon foron %s e %s" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, fuzzy, c-format msgid "%s is not a valid positive integer" msgstr "`%s' non é un enteiro positivo válido" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s é grande de máis" -#: src/factor.c:2438 +#: src/factor.c:2528 #, fuzzy, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4119,7 +4202,7 @@ msgstr "" "Uso: %s [FICHEIRO]...\n" " ou: %s [OPCIÓN]\n" -#: src/factor.c:2443 +#: src/factor.c:2533 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4171,7 +4254,7 @@ msgstr "" "Se non se indica un FICHEIRO ou se é \"-\", lese da entrada estándar.\n" "\n" -#: src/fmt.c:278 +#: src/fmt.c:279 #, fuzzy msgid "" " -c, --crown-margin preserve indentation of first two lines\n" @@ -4183,7 +4266,7 @@ 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:287 +#: src/fmt.c:288 #, fuzzy, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4196,29 +4279,27 @@ 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:359 +#: src/fmt.c:356 #, 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 -#, fuzzy, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "anchura non válida: \"%s\"" -#: src/fold.c:70 +#: src/fold.c:69 #, fuzzy -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +msgid "Wrap input lines in each FILE, writing to standard output.\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:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4228,9 +4309,9 @@ msgstr "" " -s, --spaces partir nos espacios\n" " -w, --width=ANCHO empregar ANCHO columnas no canto de 80\n" -#: src/fold.c:288 src/pr.c:832 -#, fuzzy, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "número de columnas incorrecto: \"%s\"" #. This is a proper name. See the gettext manual, section Names. @@ -4297,19 +4378,18 @@ msgstr "non se poden omiti-lo usuario e o grupo" msgid "%s: no such user" msgstr "%s: Non hai tal usuario" -#: src/head.c:109 +#: src/head.c:110 #, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "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:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4319,7 +4399,7 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4328,7 +4408,7 @@ msgstr "" " -v, --verbose amosar sempre as cabeceiras cos nomes dos " "ficheiros\n" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4336,48 +4416,36 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:237 src/head.c:1052 -#, fuzzy, c-format -msgid "%s: number of bytes is too large" -msgstr "número de bytes a comparar non válido" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, fuzzy, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: non se pode desprazar á posición %s%s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, fuzzy, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: non se pode desprazar á posición relativa %s%s" -#: src/head.c:886 -#, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "%s: %s é tan grande que non é representable" - -#: src/head.c:887 -msgid "number of lines" -msgstr "número de liñas" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "número de bytes" +#: src/head.c:267 +#, fuzzy, c-format +msgid "%s: number of bytes is too large" +msgstr "número de bytes a comparar non válido" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "número de liñas incorrecto" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "número de bytes incorrecto" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "%s: opción incorrecta -- %c\n" @@ -4573,7 +4641,7 @@ msgstr "non se pode cambia-los permisos de %s" msgid "cannot set time stamps for %s" msgstr "non se pode crea-lo directorio %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, fuzzy, c-format msgid "fork system call failed" msgstr "ficheiro especial de bloque" @@ -4694,7 +4762,7 @@ 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:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, fuzzy, c-format msgid "invalid mode %s" msgstr "anchura non válida: \"%s\"" @@ -4728,11 +4796,15 @@ msgid "Mike Haertel" msgstr "Mike Haertel e Paul Eggert" #: src/join.c:195 -#, 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" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -4747,7 +4819,7 @@ msgstr "" "LADO\n" " -e BALEIRO substituí-los campos de entrada baleiros con BALEIRO\n" -#: src/join.c:204 +#: src/join.c:210 #, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" @@ -4763,7 +4835,7 @@ msgstr "" " -t CAR emprega-lo CARácter coma separador de campos de entrada\n" " e saída\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -4775,14 +4847,14 @@ msgid "" " print them without trying to pair them\n" msgstr "" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 #, fuzzy msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated remata-las liñas cun byte 0, non un\n" " salto de liña\n" -#: src/join.c:225 +#: src/join.c:231 #, fuzzy msgid "" "\n" @@ -4811,47 +4883,47 @@ msgstr "" "defecto amosa o campo de join, os campos restantes de FICHEIRO1 e os campos\n" "restantes de FICHEIRO2, todos separados por CAR.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, fuzzy, c-format msgid "invalid field number: %s" msgstr "número de campo incorrecto: \"%s\"" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, fuzzy, c-format msgid "invalid field specifier: %s" msgstr "especificador de campo incorrecto: \"%s\"" -#: src/join.c:884 +#: src/join.c:890 #, fuzzy, c-format msgid "invalid file number in field spec: %s" msgstr "número de ficheiro incorrecto na especificación de campos: \"%s\"" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, fuzzy, c-format msgid "multi-character tab %s" msgstr "tabulación multi-carácter \"%s\"" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "os dous ficheiros non poden ser entrada estándar" @@ -4923,17 +4995,17 @@ msgstr "" msgid "no process ID specified" msgstr "" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, fuzzy, c-format msgid "invalid buffering mode %s for %s\n" msgstr "argumento incorrecto %s para %s" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -5085,7 +5157,7 @@ msgstr "non se pode crea-lo directorio %s" msgid "FIXME: unknown" msgstr "" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, fuzzy, c-format msgid "Usage: %s [OPTION]\n" msgstr "Uso: %s [OPCIÓN] [FICHEIRO]...\n" @@ -5096,7 +5168,7 @@ msgid "" "\n" msgstr "" -#: src/logname.c:84 +#: src/logname.c:79 #, fuzzy, c-format msgid "no login name" msgstr "%s: número incorrecto" @@ -5106,7 +5178,7 @@ msgstr "%s: número incorrecto" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 #, fuzzy msgid "%b %e %Y" msgstr "%e %b %Y %H:%M" @@ -5116,106 +5188,106 @@ msgstr "%e %b %Y %H:%M" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 #, fuzzy msgid "%b %e %H:%M" msgstr "%e %b %Y %H:%M" -#: src/ls.c:1590 -#, fuzzy, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" -"ignorando o tamaño de tabulador non válido na variable de ambiente TABSIZE: " -"%s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "ignorando o ancho non válido na variable de ambiente COLUMNS: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "ignorando o tamaño de tabulador non válido na variable de ambiente TABSIZE: " "%s" -#: src/ls.c:1760 src/ptx.c:1978 -#, fuzzy, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "anchura non válida: \"%s\"" -#: src/ls.c:1834 -#, fuzzy, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "cadea de tipo incorrecta \"%s\"" -#: src/ls.c:2043 +#: src/ls.c:2021 #, fuzzy, c-format msgid "invalid time style format %s" msgstr "argumento incorrecto %s para %s" -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "Os parámetros correctos son:" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "" -#: src/ls.c:2450 +#: src/ls.c:2428 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "opción descoñecida \"-%c\"" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "a variable de ambiente LS_COLORS ten un valor ilexible" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, fuzzy, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" +"ignorando o tamaño de tabulador non válido na variable de ambiente TABSIZE: " +"%s" + +#: src/ls.c:2554 src/pwd.c:164 #, fuzzy, c-format msgid "cannot open directory %s" msgstr "non se pode crea-lo directorio %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, fuzzy, c-format msgid "cannot determine device and inode of %s" msgstr "non se pode move-lo punteiro do ficheiro de %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, fuzzy, c-format msgid "%s: not listing already-listed directory" msgstr "non se pode crea-lo directorio %s" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, fuzzy, c-format msgid "reading directory %s" msgstr "non se pode crea-lo directorio %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, fuzzy, c-format msgid "closing directory %s" msgstr "non se pode cambiar ao directorio %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, fuzzy, c-format msgid "cannot compare file names %s and %s" msgstr "As cadeas que se compararon foron %s e %s" -#: src/ls.c:4781 +#: src/ls.c:4775 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:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5224,7 +5296,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5238,18 +5310,19 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4798 msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5259,11 +5332,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5272,7 +5345,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5280,7 +5353,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5293,7 +5366,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5305,7 +5378,7 @@ msgid "" " -k, --kibibytes default to 1024-byte blocks for disk usage\n" msgstr "" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5315,7 +5388,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5326,7 +5399,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4871 +#: src/ls.c:4866 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" @@ -5382,7 +5455,7 @@ msgstr "" " -R, --recursive amosa-los subdirectorios recursivamente\n" " -s, --size escribi-lo tamaño de cada ficheiro, en bloques\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5390,21 +5463,21 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4886 +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -5418,36 +5491,37 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4908 +#: src/ls.c:4904 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:4912 +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -f, --fields=LISTA amosar só estes campos; tamén amosa calquera liña\n" " que non conteña o carácter delimitador, agás se\n" " se indica a opción -s\n" " -n (ignórase)\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5456,7 +5530,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5486,47 +5560,52 @@ msgstr "" 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 "" "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/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" +"\n" +" -B, --binary usar escrituras binarias á consola.\n" +"\n" -#: src/md5sum.c:178 +#: src/md5sum.c:180 #, fuzzy -msgid " -b, --binary read in binary mode\n" +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr "" "\n" " -B, --binary usar escrituras binarias á consola.\n" "\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:195 +#: src/md5sum.c:198 #, fuzzy msgid "" "\n" @@ -5544,14 +5623,15 @@ msgstr "" " -w, --warn abisar das liñas mal formatadas\n" "\n" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "As sumas calcúlanse tal como se describe en %s. Ao comprobar, a entrada\n" @@ -5559,88 +5639,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:521 +#: src/md5sum.c:524 #, 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:545 +#: src/md5sum.c:548 #, fuzzy, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %lu: liña de suma de comprobación %s mal formatada" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: apertura ou lectura FALLIDA\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "FALLA" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "OK" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, 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:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, fuzzy, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % 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:645 +#: src/md5sum.c:648 #, fuzzy, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % 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:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, 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:777 +#: src/md5sum.c:780 #, 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:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, 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" @@ -5680,22 +5760,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "obtendo os atributos de %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "mantense a data de %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, fuzzy, c-format msgid "created directory %s" msgstr "non se pode crea-lo directorio %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -5889,7 +5969,7 @@ msgstr "demasiados argumentos" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" @@ -6021,9 +6101,7 @@ 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" +msgid "Write each FILE to standard output, with line numbers added.\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" @@ -6139,27 +6217,27 @@ msgstr "número incorrecto" msgid "invalid footer numbering style: %s" msgstr "número de ficheiro incorrecto na especificación de campos: \"%s\"" -#: src/nl.c:503 -#, fuzzy, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "número de liña inicial incorrecto: \"%s\"" -#: src/nl.c:512 -#, fuzzy, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "incremento de números de liña incorrecto: \"%s\"" -#: src/nl.c:524 -#, fuzzy, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "número de liñas en blanco incorrecto: \"%s\"" -#: src/nl.c:538 -#, fuzzy, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "ancho do campo do número de liña incorrecto: \"%s\"" -#: src/nl.c:557 +#: src/nl.c:531 #, fuzzy, c-format msgid "invalid line numbering format: %s" msgstr "incremento de números de liña incorrecto: \"%s\"" @@ -6183,7 +6261,7 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6195,43 +6273,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "os dous ficheiros non poden ser entrada estándar" -#: src/nohup.c:131 +#: src/nohup.c:129 #, fuzzy, c-format msgid "ignoring input" msgstr "demasiados argumentos" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "" -#: src/nohup.c:176 +#: src/nohup.c:174 #, fuzzy, c-format msgid "appending output to %s" msgstr "non se pode cambia-lo propietario e/ou grupo de %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "" @@ -6253,96 +6331,93 @@ msgid "" " --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: número de liñas incorrecto" - #. This is a proper name. See the gettext manual, section Names. -#: src/numfmt.c:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, fuzzy, c-format msgid "value too large to be converted: %s" msgstr "%s: valor non convertido por completo" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "número incorrecto" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "anchura non válida: \"%s\"" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "mantense a data de %s" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "cadea de tipo incorrecta \"%s\"" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6350,19 +6425,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -6372,40 +6447,40 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" msgstr "" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6414,7 +6489,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -6422,7 +6497,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -6430,7 +6505,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -6438,7 +6513,31 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"\n" +"Empregue un e só un de -b, -c ou -f. Cada LISTA componse dun rango ou " +"varios\n" +"rangos separados por comas. Cada rango é un de:\n" +"\n" +" N N-ésimo byte, carácter ou campo, contado dende 1\n" +" N- do N-ésimo byte, carácter ou campo, ata a fin da liña\n" +" N-M do N-ésimo ao M-ésimo (inclusive) byte, carácter ou campo\n" +" -M do primeiro ao M-ésimo (inclusive) byte, carácter ou campo\n" +"\n" +"Sen un FICHEIRO, ou cando o FICHEIRO é -, lese da entrada estándar.\n" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -6447,9 +6546,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -6461,7 +6561,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -6476,118 +6576,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "argumento incorrecto %s para %s" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "opción de anchura non válida: \"%s\"" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "anchura non válida: \"%s\"" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "número de campo incorrecto: \"%s\"" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "anchura non válida: \"%s\"" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "número de campo incorrecto: \"%s\"" +msgid "multiple field specifications" +msgstr "%s: especificación de campo incorrecta \"%s\"" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "anchura non válida: \"%s\"" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "especificador de conversión non atopado no sufixo" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "erro lendo %s" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "" -#: src/od.c:320 +#: src/od.c:321 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6598,14 +6710,13 @@ msgstr "" "Uso: %s [OPCIÓN]... [FICHEIRO]...\n" " ou: %s --traditional [FICHEIRO] [[+]DESPRAZAMENTO [[+]ETIQUETA]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Escribir na saída estándar unha representación non ambigua, con\n" @@ -6614,9 +6725,10 @@ msgstr "" "un FICHEIRO, ou se este é -, lese da entrada estándar.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 #, 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" @@ -6636,7 +6748,7 @@ msgstr "" " a carácter con nome\n" " c carácter ASCII ou escapado\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -6645,7 +6757,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 #, fuzzy msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" @@ -6666,7 +6778,7 @@ msgstr "" " -w, --width[=BYTES] amosar BYTES bytes por liña de saída\n" " --traditional acepta-los argumentos en formato tradicional\n" -#: src/od.c:363 +#: src/od.c:366 #, fuzzy msgid "" "\n" @@ -6684,7 +6796,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:372 +#: src/od.c:375 #, fuzzy msgid "" " -f same as -t fF, select floats\n" @@ -6701,7 +6813,7 @@ 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:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -6710,7 +6822,7 @@ msgid "" " c printable character or backslash escape\n" msgstr "" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6724,7 +6836,7 @@ msgstr "" " u[TAMAÑO] decimal sen signo, TAMAÑO bytes por enteiro\n" " x[TAMAÑO] hexadecimal, TAMAÑO bytes por enteiro\n" -#: src/od.c:394 +#: src/od.c:397 #, fuzzy msgid "" "\n" @@ -6739,14 +6851,14 @@ msgstr "" "sizeof(long). Se TIPO é f, TAMAÑO tamén pode ser F para sizeof(float),\n" "D para sizeof(double) ou L para sizeof(long double).\n" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -6759,12 +6871,12 @@ msgid "" "and so on for G, T, P, E, Z, Y.\n" msgstr "" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, fuzzy, c-format msgid "invalid type string %s" msgstr "cadea de tipo incorrecta \"%s\"" -#: src/od.c:690 +#: src/od.c:693 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6773,7 +6885,7 @@ msgstr "" "cadea de tipo incorrecta \"%s\";\n" "este sistema non proporciona un tipo integral de %lu bytes" -#: src/od.c:811 +#: src/od.c:814 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6782,38 +6894,38 @@ msgstr "" "cadea de tipo incorrecta \"%s\";\n" "este sistema non proporciona un tipo de punto flotante de %lu bytes" -#: src/od.c:869 +#: src/od.c:872 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "carácter \"%c\" incorrecto na cadea de tipo \"%s\"" -#: src/od.c:1094 +#: src/od.c:1105 #, 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:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "non se pode especificar un tipo ao volcar cadeas" -#: src/od.c:1863 +#: src/od.c:1871 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "o modo de compatibilidade soporta 3 argumentos como moito" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "aviso: ancho %lu incorrecto; usando %d na súa vez" @@ -6833,7 +6945,6 @@ msgstr "a entrada estándar está pechada" 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 "" "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" @@ -6975,12 +7086,12 @@ msgstr "Cando" msgid "Where" msgstr "Onde" -#: src/pinky.c:495 +#: src/pinky.c:494 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6990,7 +7101,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6999,7 +7110,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -7007,100 +7118,100 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:597 +#: src/pinky.c:596 #, 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" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 #, fuzzy msgid "Roland Huebner" msgstr "Pete TerMaat e Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, 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:910 +#: src/pr.c:907 #, fuzzy, c-format msgid "invalid page range %s" msgstr "cadea de tipo incorrecta \"%s\"" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "\"-l LONXITUDE\" número de liñas incorrecto: \"%s\"" -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "\"-N NÚMERO\" número de liña inicial incorrecto: \"%s\"" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "\"-o MARXE\" desprazamento de liña incorrecto: \"%s\"" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "\"-w ANCHO_PAXINA\" número de caracteres incorrecto: \"%s\"" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "\"-W ANCHO_PAXINA\" número de caracteres incorrecto: \"%s\"" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, 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:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "páxina demasiado estreita" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" -#: src/pr.c:2380 +#: src/pr.c:2350 #, fuzzy, c-format msgid "page number overflow" msgstr "o número do campo é cero" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "" -#: src/pr.c:2757 +#: src/pr.c:2727 #, 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:2763 +#: src/pr.c:2734 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -7118,7 +7229,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:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7135,7 +7246,7 @@ msgstr "" " -d, --double-space\n" " amosa-la saída a doble espacio\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7158,7 +7269,7 @@ msgstr "" " liñas con -F ou unha cabeceira e pé de 5 liñas sen -" "F)\n" -#: src/pr.c:2789 +#: src/pr.c:2760 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -7184,12 +7295,27 @@ msgstr "" " de -W, sen aliñamento de columnas, --sep-string[=CADEA\n" " estabrece os separadores\n" -#: src/pr.c:2798 +#: src/pr.c:2769 #, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l LONXITUDE, --length=LONXITUDE\n" +" estabrece-la lonxitude das páxinas a LONXITUDE (66) " +"liñas\n" +" (o número de liñas de texto por defecto é 56, e con -F " +"63)\n" +" -m, --merge amosar tódolos ficheiros en paralelo, un en cada " +"columna,\n" +" trunca-las liñas, pero uni-las liñas de lonxitude\n" +" completa con -J\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -7203,7 +7329,7 @@ msgstr "" " trunca-las liñas, pero uni-las liñas de lonxitude\n" " completa con -J\n" -#: src/pr.c:2805 +#: src/pr.c:2779 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -7223,7 +7349,7 @@ msgstr "" " comezar a contar no NÚMERO na primeira liña da primeira\n" " páxina imprimida (vexa +PRIMEIRA)\n" -#: src/pr.c:2813 +#: src/pr.c:2787 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -7238,7 +7364,7 @@ msgstr "" " -r, --no-file-warnings\n" " omiti-lo aviso cando non se pode abrir un ficheiro\n" -#: src/pr.c:2820 +#: src/pr.c:2794 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -7257,7 +7383,7 @@ msgstr "" " opcións de tres columnas (-COLUMNA|-a -COLUMNA|-m) agás\n" " se -w está estabrecido\n" -#: src/pr.c:2828 +#: src/pr.c:2802 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7265,7 +7391,6 @@ msgid "" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " separa-las columnas coa CADEA,\n" " sen -S: Separador por defecto (tabulación) con -J e\n" @@ -7274,7 +7399,13 @@ msgstr "" " opcións de columnas\n" " -t, --omit-header omiti-las cabeceiras e pés de páxina\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -7299,7 +7430,7 @@ msgstr "" " para o formato de saída de varias solumnas de texto,\n" " -s[car] desactívao (72)\n" -#: src/pr.c:2845 +#: src/pr.c:2822 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -7314,16 +7445,6 @@ msgstr "" "estea\n" " estabrecida; non interfire con -S ou -s\n" -#: src/pr.c:2853 -#, fuzzy -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"Sen FICHEIRO, ou cando o FICHEIRO é -, lese da entrada estándar.\n" - #: src/printenv.c:62 #, fuzzy, c-format msgid "" @@ -7466,12 +7587,11 @@ msgstr "" "de entrada.\n" "\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 #, fuzzy 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 amosa-las referencias xeradas " "automaticamente\n" @@ -7481,6 +7601,12 @@ msgstr "" "truncadas\n" #: src/ptx.c:1835 +msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -7497,7 +7623,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:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7516,7 +7642,7 @@ msgstr "" "FICHEIRO\n" " -o, --only-file=FICHEIRO le-la lista de palabras únicas do FICHEIRO\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7528,20 +7654,16 @@ msgstr "" " -t, --typeset-mode - sen implementar -\n" " -w, --width=NÚMERO ancho da saída, excluíndo referencias\n" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Sen FICHEIRO, ou cando o FICHEIRO é -, lese da entrada estándar.\n" - #: src/ptx.c:1951 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "anchura non válida: \"%s\"" +#: src/ptx.c:1978 +#, fuzzy, c-format +msgid "invalid line width: %s" +msgstr "anchura non válida: \"%s\"" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -7565,7 +7687,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "non foi posible mudar o grupo de %s a %s\n" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, fuzzy, c-format msgid "failed to stat %s" msgstr "obtendo os atributos de %s" @@ -7585,8 +7707,8 @@ msgstr "demasiados argumentos" msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n" @@ -7775,16 +7897,16 @@ msgid "" msgstr "" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " -msgstr[0] "" -msgstr[1] "" +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " +msgstr[0] "%s: ¿borrar %s? " +msgstr[1] "%s: ¿borrar %s? " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: ¿borrar %s? " msgstr[1] "%s: ¿borrar %s? " @@ -7976,12 +8098,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "número de liña inicial incorrecto: \"%s\"" -#: src/seq.c:234 +#: src/seq.c:248 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s é un tipo de ficheiro descoñecido" -#: src/seq.c:557 +#: src/seq.c:603 #, 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" @@ -7997,7 +8119,16 @@ msgid "" "for even very expensive hardware probing to recover the data.\n" msgstr "" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Sen FICHEIRO, ou cando o FICHEIRO é -, lese da entrada estándar.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8006,7 +8137,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -8015,11 +8146,9 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:192 +#: src/shred.c:196 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.\n" @@ -8031,7 +8160,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8042,7 +8171,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8054,7 +8183,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8063,7 +8192,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -8075,136 +8204,136 @@ msgid "" "\n" msgstr "" -#: src/shred.c:241 +#: src/shred.c:243 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:340 +#: src/shred.c:342 #, fuzzy, c-format msgid "%s: fdatasync failed" msgstr "a obtención de datos do ficheiro fallou" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:461 +#: src/shred.c:463 #, fuzzy, c-format msgid "%s: cannot rewind" msgstr "non se pode executar %s" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: pasada %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, fuzzy, c-format msgid "%s: error writing at offset %s" msgstr "erro escribindo %s" -#: src/shred.c:549 +#: src/shred.c:551 #, fuzzy, c-format msgid "%s: lseek failed" msgstr "o peche fallou" -#: src/shred.c:561 +#: src/shred.c:563 #, fuzzy, c-format msgid "%s: file too large" msgstr "%s: ficheiro longo de máis" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: pasada %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, fuzzy, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: pasada %lu/%lu (%s)...%s/%s" -#: src/shred.c:859 +#: src/shred.c:861 #, fuzzy, c-format msgid "%s: fstat failed" msgstr "a obtención de datos do ficheiro fallou" -#: src/shred.c:870 +#: src/shred.c:872 #, fuzzy, c-format msgid "%s: invalid file type" msgstr "%s: lonxitude do sufixo non válida" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: o ficheiro ten un tamaño negativo" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, fuzzy, c-format msgid "%s: error truncating" msgstr "%s: ficheiro truncado" -#: src/shred.c:989 +#: src/shred.c:991 #, fuzzy, c-format msgid "%s: fcntl failed" msgstr "a obtención de datos do ficheiro fallou" -#: src/shred.c:994 +#: src/shred.c:996 #, 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:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: borrando" -#: src/shred.c:1102 +#: src/shred.c:1104 #, fuzzy, c-format msgid "%s: renamed to %s" msgstr "%s: erro de lectura" -#: src/shred.c:1124 +#: src/shred.c:1126 #, fuzzy, c-format msgid "%s: failed to remove" msgstr "%s: ficheiro longo de máis" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: borrado" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, fuzzy, c-format msgid "%s: failed to close" msgstr "%s: ficheiro longo de máis" -#: src/shred.c:1171 +#: src/shred.c:1173 #, fuzzy, c-format msgid "%s: failed to open for writing" msgstr "%s: ficheiro longo de máis" #: src/shred.c:1236 -#, fuzzy, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: número de segundos incorrecto" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, fuzzy, c-format msgid "multiple random sources specified" msgstr "\\%c: secuencia de escape non válida" -#: src/shred.c:1264 -#, fuzzy, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: lonxitude do sufixo non válida" -#: src/shuf.c:61 +#: src/shuf.c:62 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -8214,11 +8343,11 @@ msgstr "" "Uso: %s [OPCIÓN]... [ENTRADA]... (sen -G)\n" " ou: %s -G [OPCIÓN] [ENTRADA [SAÍDA]]\n" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -8229,37 +8358,37 @@ msgid "" " -r, --repeat output lines can be repeated\n" msgstr "" -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "demasiados argumentos" -#: src/shuf.c:431 +#: src/shuf.c:428 #, fuzzy, c-format msgid "multiple -i options specified" msgstr "\\%c: secuencia de escape non válida" -#: src/shuf.c:452 -#, fuzzy, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "número incorrecto" -#: src/shuf.c:465 +#: src/shuf.c:459 #, fuzzy, c-format -msgid "invalid line count %s" +msgid "invalid line count: %s" msgstr "anchura non válida: \"%s\"" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, fuzzy, c-format msgid "multiple output files specified" msgstr "\\%c: secuencia de escape non válida" -#: src/shuf.c:502 +#: src/shuf.c:496 #, fuzzy, c-format msgid "cannot combine -e and -i options" msgstr "non se pode move-lo punteiro do ficheiro de %s" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -8290,12 +8419,12 @@ 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:323 +#: src/sleep.c:135 src/timeout.c:325 #, fuzzy, c-format msgid "invalid time interval %s" msgstr "número de campo incorrecto: \"%s\"" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "non se pode le-lo reloxo coa hora real" @@ -8309,13 +8438,13 @@ msgstr "" "Opcións de ordeamento:\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:437 +#: src/sort.c:438 #, fuzzy msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" @@ -8328,7 +8457,7 @@ msgstr "" "alfanuméricos\n" " -f, --ignore-case ignora-las maiúsculas e minúsculas\n" -#: src/sort.c:443 +#: src/sort.c:444 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -8342,12 +8471,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:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 #, fuzzy msgid "" " -n, --numeric-sort compare according to string numerical value\n" @@ -8362,7 +8491,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:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8372,19 +8501,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -8393,7 +8522,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8402,13 +8531,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 #, fuzzy msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" @@ -8428,7 +8557,7 @@ msgstr "" " de derradeiro recurso\n" " -S, --buffer-size=TAMAÑO empregar un buffer de memoria deste TAMAÑO\n" -#: src/sort.c:497 +#: src/sort.c:498 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8451,7 +8580,7 @@ msgstr "" " noutro caso: amosar só o primeiro dun grupo\n" " de elementos iguais\n" -#: src/sort.c:511 +#: src/sort.c:512 #, fuzzy msgid "" "\n" @@ -8478,12 +8607,11 @@ msgstr "" "\n" "TAMAÑO pode estar seguido polos seguintes sufixos multiplicativos:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -8499,251 +8627,249 @@ msgstr "" "Estabreza LC_ALL=C para obte-la orde tradicional que emprega\n" "valores de byte nativos.\n" -#: src/sort.c:725 +#: src/sort.c:724 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "erro escribindo %s" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:884 +#: src/sort.c:883 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "non se pode crea-lo ficheiro temporal" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "a apertura fallou" -#: src/sort.c:998 +#: src/sort.c:997 #, fuzzy msgid "fflush failed" msgstr "volcando o ficheiro" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "o peche fallou" -#: src/sort.c:1140 +#: src/sort.c:1139 #, fuzzy msgid "couldn't create temporary file" msgstr "non se pode crea-lo ficheiro temporal" -#: src/sort.c:1179 +#: src/sort.c:1178 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "non se pode crea-lo directorio %s" -#: src/sort.c:1252 +#: src/sort.c:1251 #, fuzzy, c-format msgid "warning: cannot remove: %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/sort.c:1338 +#: src/sort.c:1337 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "argumento incorrecto %s para %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "argumento %s ambiguo para %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s: conta \"%.*s\" grande de máis" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "a obtención de datos do ficheiro fallou" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "erro de lectura" -#: src/sort.c:2076 +#: src/sort.c:2075 #, fuzzy, c-format msgid "string transformation failed" msgstr "a comparación de cadeas fallou" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "%s: a opción \"-W %s\" é ambigua\n" msgstr[1] "%s: a opción \"-W %s\" é ambigua\n" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "erro de escritura" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: desorde: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "erro estándar" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "non se poden cambia-los permisos de `%s'" -#: src/sort.c:4017 +#: src/sort.c:4016 #, fuzzy, c-format msgid "%s: invalid field specification %s" msgstr "%s: especificación de campo incorrecta \"%s\"" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "" -#: src/sort.c:4079 +#: src/sort.c:4078 #, fuzzy, c-format msgid "%s: invalid count at start of %s" msgstr "%s: conta non válida ao principio de \"%s\"" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "número non válido despois de \"-\"" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "número non válido despois de \".\"" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "carácter de sobras na especificación do campo" -#: src/sort.c:4403 +#: src/sort.c:4402 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "\\%c: secuencia de escape non válida" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "número non válido ao comezo do campo" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "o número do campo é cero" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "o desprazamento do carácter é cero" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "número non válido despois de \",\"" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, fuzzy, c-format msgid "cannot read file names from %s" msgstr "As cadeas que se compararon foron %s e %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s: lonxitude do sufixo non válida" -#: src/sort.c:4619 +#: src/sort.c:4618 #, fuzzy, c-format msgid "no input from %s" msgstr "creando ficheiro \"%s\"\n" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, fuzzy, c-format msgid "extra operand %s not allowed with -%c" msgstr "operando \"%s\" extra non admitido despois de -c" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 +#: src/split.c:224 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Uso: %s [OPCIÓN] [ENTRADA [PREFIXO]]\n" -#: src/split.c:207 +#: src/split.c:228 #, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" "Gravar anacos de ENTRADA de tamaño fixo en PREFIXOaa, PREFIXOab, ...; o " "PREFIXO\n" @@ -8751,25 +8877,28 @@ msgstr "" "estándar.\n" "\n" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 #, fuzzy msgid "" " --verbose print a diagnostic just before each\n" @@ -8778,201 +8907,206 @@ msgstr "" " --verbose amosar un diagnóstico no erro estándar antes de\n" " abrir cada ficheiro de saída\n" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "Esgotáronse os sufixos de ficheiros de saída" -#: src/split.c:365 +#: src/split.c:419 #, fuzzy, c-format msgid "creating file %s\n" msgstr "creando ficheiro \"%s\"\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "a variable de ambiente LS_COLORS ten un valor ilexible" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "mantense a data de %s" -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" msgstr "non se pode cambiar ao directorio %s" -#: src/split.c:410 +#: src/split.c:464 #, fuzzy, c-format msgid "closing output pipe" msgstr "pechando o ficheiro de saída %s" -#: src/split.c:414 +#: src/split.c:468 #, fuzzy, c-format msgid "moving input pipe" msgstr "creando ficheiro \"%s\"\n" -#: src/split.c:416 +#: src/split.c:470 #, fuzzy, c-format msgid "closing input pipe" msgstr "creando ficheiro \"%s\"\n" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "non foi posible mudar o grupo de %s a %s\n" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "non se pode partir en máis dun xeito" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: número de segundos incorrecto" -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: número incorrecto" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: lonxitude do sufixo non válida" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: número de bytes incorrecto" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: número de liñas incorrecto" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "tabulación multi-carácter \"%s\"" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "ficheiro especial de carácter" -#: src/split.c:1286 +#: src/split.c:1383 #, fuzzy, c-format msgid "line count option -%s%c... is too large" msgstr "%s: conta \"%.*s\" grande de máis" -#: src/split.c:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "número de liña inicial incorrecto: \"%s\"" -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: lonxitude do sufixo non válida" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "%s: opción descoñecida `-%c'\n" -#: src/stat.c:1184 +#: src/stat.c:1187 #, fuzzy, c-format msgid "%s: invalid directive" msgstr "%s: patrón incorrecto" -#: src/stat.c:1231 +#: src/stat.c:1234 #, fuzzy, c-format msgid "warning: backslash at end of format" msgstr "secuencia de escape incorrecta na fin da cadea" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, 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:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8983,7 +9117,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8991,30 +9125,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9022,17 +9156,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9042,7 +9176,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9054,7 +9188,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9064,7 +9198,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9077,7 +9211,7 @@ msgid "" " %T minor device type in hex, for character/block device special files\n" msgstr "" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9092,7 +9226,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9103,7 +9237,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9158,8 +9292,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -9184,7 +9317,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "" -#: src/stty.c:516 +#: src/stty.c:524 #, fuzzy, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9195,11 +9328,11 @@ msgstr "" " ou: %s [-F DISPOSITIVO] [--file=DISPOSITIVO] [-a|--all]\n" " ou: %s [-F DISPOSITIVO] [--file=DISPOSITIVO] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 #, fuzzy msgid "" " -a, --all print all current settings in human-readable form\n" @@ -9221,85 +9354,138 @@ msgstr "" "parámetros\n" "non POSIX. O sistema presente define os parámetros que están dispoñibles.\n" -#: src/stty.c:535 +#: src/stty.c:543 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:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +msgid "" " 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 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:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" msgstr "" -#: src/stty.c:559 +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" + +#: src/stty.c:614 +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 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:578 +#: src/stty.c:632 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" +msgstr "" + +#: src/stty.c:637 +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:584 +#: src/stty.c:641 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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -9308,7 +9494,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" "\n" "Parámetros de control:\n" @@ -9326,7 +9511,11 @@ msgstr "" " na entrada\n" " [-]parodd establecer paridade impar (mesmo con `-')\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -9334,156 +9523,249 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +msgid "" " [-]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:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:619 +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +msgid "" " [-]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:627 +#: src/stty.c:712 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:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]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 "" -"\n" -"Parámetros da saída:\n" -"* bsN estilo de retardo do carácter de borrado, N entre [0..1]\n" -"* crN estilo de retardo do retorno de carro, N entre [0..3]\n" -"* ffN estilo de retardo do salto de páxina, N entre [0..1]\n" -"* nlN estilo de retardo do carácter de nova liña, N entre [0..1]\n" -"* [-]ocrnl converter retornos de carro en nova liña\n" -"* [-]ofdel usar caracteres de borrado para rechear, en vez de " -"caracteres\n" -" nulos\n" -"* [-]ofill usar caracteres de recheo en vez de tempos de retardo\n" -"* [-]olcuc converter caracteres minúsculos a maiúsculos\n" -"* [-]onlcr converter unha nova liña a retorno de carro + nova liña\n" -"* [-]onlret o carácter de nova liña fai un retorno de carro\n" -"* [-]onocr non escribi-los retornos de carro na primeira columna\n" -" [-]opost pos-procesar a saída\n" -"* tabN estilo de retardo da tabulación horizontal, N entre [0..3]\n" -"* tabs o mesmo que tab0\n" -"* -tabs o mesmo que tab3\n" -"* vtN estilo de retardo da tabulación vertical, N entre [0..1]\n" - -#: src/stty.c:643 -msgid "" -" * [-]onocr do not print carriage returns in the first column\n" -" [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 +msgid "" " * 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:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +msgid "" " * 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr "" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:672 +#: src/stty.c:843 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" +msgstr "" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:875 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:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 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:707 +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -9492,25 +9774,27 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -9525,57 +9809,62 @@ msgstr "" "coma en ^c, 0x37, 0177 ou 127; os valores especiais ^- ou undef úsanse para\n" "desactiva-los caracteres especiais.\n" -#: src/stty.c:800 +#: src/stty.c:1124 #, fuzzy, c-format msgid "only one device may be specified" msgstr "só se pode especificar un argumento" -#: src/stty.c:830 +#: src/stty.c:1154 #, 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:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: non se pode restablece-lo modo de non bloqueo" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, fuzzy, c-format msgid "invalid argument %s" msgstr "argumento incorrecto %s para %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, fuzzy, c-format msgid "missing argument to %s" msgstr "argumento %s ambiguo para %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: ficheiro truncado" + +#: src/stty.c:1331 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "anchura non válida: \"%s\"" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: non se poden facer tódalas operacións pedidas" -#: src/stty.c:1403 +#: src/stty.c:1747 #, 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:1924 -#, fuzzy, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "incremento de números de liña incorrecto: \"%s\"" #. This is a proper name. See the gettext manual, section Names. @@ -9586,8 +9875,14 @@ msgstr "Kayvan Aghaiepour e David MacKenzie" #: src/sum.c:62 #, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Amosa-la suma de comprobación CRC e o número de bytes de cada FICHEIRO.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -9599,18 +9894,54 @@ msgstr "" " -s, --sysv usa-lo algoritmo de suma System V, usar bloques de 512 " "bytes\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Uso: %s [OPCIÓN] [FICHEIRO]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" +"\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" msgstr "" -#: src/sync.c:69 +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 #, fuzzy, c-format -msgid "ignoring all arguments" -msgstr "demasiados argumentos" +msgid "error opening %s" +msgstr "erro lendo %s" -#: src/system.h:343 +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: non se pode restablece-lo modo de non bloqueo" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "erro lendo %s" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "" + +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -9619,15 +9950,23 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help amosar esta axuda e saír\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version amosar información da versión e saír\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Sen FICHEIRO, ou cando o FICHEIRO é -, lese da entrada estándar.\n" + +#: src/system.h:544 #, fuzzy msgid "" "\n" @@ -9636,7 +9975,7 @@ msgstr "" "Os argumentos obrigatorios nas opcións longas tamén o son nas opcións " "curtas.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -9644,7 +9983,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -9653,7 +9992,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -9664,22 +10003,27 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -#: src/system.h:591 +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Escriba \"%s --help\" para máis información.\n" -#: src/system.h:633 +#: src/system.h:655 #, fuzzy, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9701,9 +10045,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\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" @@ -9720,57 +10062,56 @@ msgstr "" " -s, --separator=CADEA usa-la CADEA coma separador na vez de salto de " "liña\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, fuzzy, c-format msgid "%s: seek failed" msgstr "o peche fallou" -#: src/tac.c:263 +#: src/tac.c:277 #, fuzzy, c-format msgid "record too large" msgstr "%s: ficheiro longo de máis" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "non se pode crea-lo ficheiro temporal" -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "non se pode abrir %s para lectura" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "mantense a data de %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, fuzzy, c-format msgid "%s: write error" msgstr "erro de escritura" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "non se pode abrir %s para lectura" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "o separador non pode estar baleiro" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "" -#: src/tail.c:262 +#: src/tail.c:257 #, 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" 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" @@ -9778,13 +10119,13 @@ msgstr "" "estándar.\n" "\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 #, fuzzy msgid "" " -f, --follow[={name|descriptor}]\n" @@ -9799,7 +10140,7 @@ msgstr "" "equivalentes\n" " -F igual que --follow=name --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -9819,7 +10160,7 @@ msgstr "" " (é o caso normal de ficheiros de rexistro " "rotados)\n" -#: src/tail.c:293 +#: src/tail.c:288 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -9832,7 +10173,7 @@ msgstr "" " -v, --verbose amosar sempre as cabeceiras cos nomes de " "ficheiro\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -9841,7 +10182,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 +#: src/tail.c:302 #, fuzzy msgid "" "\n" @@ -9861,7 +10202,7 @@ msgstr "" "multiplicativo: b para 512, k para 1024, m para 1048576 (1 Mega).\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -9879,176 +10220,176 @@ msgstr "" "programa\n" "o eliminou e volveu crear.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "pechando %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, 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:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, fuzzy, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" "\"%s\" foi remprazado cun ficheiro do que non se pode amosa-la fin; " "abandonando este ficheiro" -#: src/tail.c:980 +#: src/tail.c:973 #, fuzzy, c-format msgid "%s has become inaccessible" msgstr "\"%s\" volveuse inaccesible" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, fuzzy, c-format msgid "%s has become accessible" msgstr "\"%s\" volveuse accesible" -#: src/tail.c:1035 +#: src/tail.c:1032 #, fuzzy, c-format -msgid "%s has appeared; following end of new file" +msgid "%s has appeared; following new file" msgstr "\"%s\" apareceu; buscando a fin do novo ficheiro" -#: src/tail.c:1046 +#: src/tail.c:1042 #, fuzzy, c-format -msgid "%s has been replaced; following end of new file" +msgid "%s has been replaced; following new file" msgstr "\"%s\" foi remprazado; buscando a fin do ficheiro novo" -#: src/tail.c:1163 +#: src/tail.c:1159 #, fuzzy, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: non se pode restablece-lo modo de non bloqueo" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: ficheiro truncado" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "non quedan ficheiros" -#: src/tail.c:1424 +#: src/tail.c:1440 #, fuzzy, c-format msgid "cannot watch parent directory of %s" msgstr "non se pode crea-lo directorio %s" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, fuzzy, c-format msgid "inotify resources exhausted" msgstr "memoria virtual esgotada" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, fuzzy, c-format msgid "cannot watch %s" msgstr "non se poden cambia-los permisos de `%s'" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: ¿substituír %s?" + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1597 #, fuzzy, c-format msgid "error reading inotify event" msgstr "erro lendo %s" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: non se pode segui-la fin deste tipo de ficheiro; abandoando este nome" -#: src/tail.c:1961 -#, fuzzy, c-format -msgid "number in %s is too large" -msgstr "%s é grande de máis" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "%s: número máximo de datos non cambiados entre aperturas incorrecto" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: PID incorrecto" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: número de segundos incorrecto" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "número de columnas incorrecto: \"%s\"" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "" -#: src/tail.c:2096 +#: src/tail.c:2135 #, fuzzy, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "aviso: PID ignorado; --pid=PID é útil só cando segue" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "aviso: PID ignorado; --pid=PID é útil só cando segue" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "aviso: --pid=PID non é soportado neste sistema" -#: src/tail.c:2209 +#: src/tail.c:2250 #, fuzzy, c-format msgid "cannot follow %s by name" msgstr "non se pode crea-lo ficheiro temporal" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 #, fuzzy msgid "" "Copy standard input to each FILE, and also to standard output.\n" @@ -10064,66 +10405,77 @@ msgstr "" " --help amosar esta axuda e saír\n" " --version amosa-la información da versión e saír\n" -#: src/tee.c:71 -#, fuzzy +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Sen FICHEIRO, ou cando o FICHEIRO é -, lese da entrada estándar.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, fuzzy, c-format msgid "missing argument after %s" msgstr "argumento %s ambiguo para %s" -#: src/test.c:159 +#: src/test.c:161 #, fuzzy, c-format msgid "invalid integer %s" msgstr "número incorrecto" -#: src/test.c:241 +#: src/test.c:243 #, fuzzy msgid "')' expected" msgstr "agardábase ')'\n" -#: src/test.c:244 +#: src/test.c:246 #, fuzzy, c-format msgid "')' expected, found %s" msgstr "agardábase ')', atopouse %s\n" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, fuzzy, c-format msgid "%s: unary operator expected" msgstr "%s: agardábase un operador unario\n" -#: src/test.c:329 +#: src/test.c:331 #, fuzzy msgid "-nt does not accept -l" msgstr "-nt non acepta -l\n" -#: src/test.c:342 +#: src/test.c:344 #, fuzzy msgid "-ef does not accept -l" msgstr "-ef non acepta -l\n" -#: src/test.c:358 +#: src/test.c:360 #, fuzzy msgid "-ot does not accept -l" msgstr "-nt non acepta -l\n" -#: src/test.c:367 +#: src/test.c:369 #, fuzzy msgid "unknown binary operator" msgstr "Erro do sistema descoñecido" -#: src/test.c:646 +#: src/test.c:648 #, fuzzy, c-format msgid "%s: binary operator expected" msgstr "%s: agardábase un operador binario\n" -#: src/test.c:704 +#: src/test.c:706 #, fuzzy msgid "" "Usage: test EXPRESSION\n" @@ -10135,13 +10487,13 @@ msgstr "" "Uso: %s [FICHEIRO]...\n" " ou: %s [OPCIÓN]\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" msgstr "" -#: src/test.c:717 +#: src/test.c:719 #, fuzzy msgid "" "\n" @@ -10154,7 +10506,7 @@ msgstr "" " --help amosar esta axuda e saír\n" " --version amosar información sobre a versión e saír\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -10163,7 +10515,7 @@ msgid "" " EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n" msgstr "" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -10173,7 +10525,7 @@ msgid "" " STRING1 != STRING2 the strings are not equal\n" msgstr "" -#: src/test.c:737 +#: src/test.c:739 #, fuzzy msgid "" "\n" @@ -10202,7 +10554,7 @@ msgstr "" " ENTEIRO1 -lt ENTEIRO2 ENTEIRO1 é menor que ENTEIRO2\n" " ENTEIRO1 -ne ENTEIRO2 ENTEIRO1 é distinto que ENTEIRO2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -10210,7 +10562,7 @@ msgid "" " FILE1 -ot FILE2 FILE1 is older than FILE2\n" msgstr "" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -10219,7 +10571,7 @@ msgid "" " -e FILE FILE exists\n" msgstr "" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -10228,7 +10580,7 @@ msgid "" " -k FILE FILE exists and has its sticky bit set\n" msgstr "" -#: src/test.c:766 +#: src/test.c:768 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" @@ -10237,7 +10589,7 @@ msgid "" " -s FILE FILE exists and has a size greater than zero\n" msgstr "" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -10246,7 +10598,7 @@ msgid "" " -x FILE FILE exists and execute (or search) permission is granted\n" msgstr "" -#: src/test.c:780 +#: src/test.c:782 #, fuzzy msgid "" "\n" @@ -10260,33 +10612,33 @@ msgstr "" "barras invertidas) para as shells.\n" "ENTEIRO pode ser tamén -l CADEA, que se evalúa coma a lonxitude de CADEA.\n" -#: src/test.c:786 +#: src/test.c:788 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 +#: src/test.c:793 msgid "test and/or [" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "" -#: src/test.c:858 +#: src/test.c:860 #, fuzzy msgid "missing ']'" msgstr "falta un `]'\n" -#: src/test.c:872 +#: src/test.c:874 #, fuzzy, c-format msgid "extra argument %s" msgstr "demasiados argumentos" @@ -10306,7 +10658,7 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -10315,11 +10667,11 @@ msgstr "" "Uso: %s [FICHEIRO]...\n" " ou: %s [OPCIÓN]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -10337,7 +10689,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -10345,7 +10697,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -10356,7 +10708,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -10371,6 +10723,11 @@ msgstr "erro escribindo %s" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -10715,12 +11072,12 @@ msgstr "" msgid "Exit with a status code indicating failure." msgstr "" -#: src/truncate.c:96 +#: src/truncate.c:69 #, fuzzy, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Uso: %s [OPCIÓN]... [FICHEIRO]...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -10731,22 +11088,22 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -10754,57 +11111,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: o ficheiro ten un tamaño negativo" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "non se pode partir en máis dun xeito" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "" -#: src/truncate.c:303 +#: src/truncate.c:276 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "\\%c: secuencia de escape non válida" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "número incorrecto" + +#: src/truncate.c:307 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "debe especificarse unha lista de bytes, caracteres ou campos" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, fuzzy, c-format msgid "cannot open %s for writing" msgstr "non se pode abrir %s para lectura" @@ -10815,24 +11177,27 @@ msgid "Mark Kettenis" msgstr "" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Uso: %s [OPCIÓN] [FICHEIRO]\n" "Escribir unha lista totalmente ordeada consistente coa ordeación parcial\n" "do FICHEIRO. Se non se indica un FICHEIRO, ou cando o FICHEIRO é -, lese\n" "da entrada estándar.\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "" + +#: src/tsort.c:475 #, fuzzy, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: a entrada contén un lazo:" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: a entrada contén un lazo:" @@ -10899,9 +11264,7 @@ msgstr "non se pode crea-lo ficheiro temporal" #: 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\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 " @@ -10955,8 +11318,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -10967,7 +11330,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -11118,11 +11481,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "" - #: src/uptime.c:214 #, fuzzy, c-format msgid "" @@ -11150,13 +11508,17 @@ msgstr "" " --help amosar esta axuda e saír\n" " --version amosa-la información da versión e saír\n" -#: src/wc.c:117 -#, fuzzy +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -11171,12 +11533,12 @@ msgstr "" " -m, --chars escribi-lo número de caracteres\n" " -l, --lines escribi-lo número de saltos de liña\n" -#: src/wc.c:128 +#: src/wc.c:134 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" @@ -11321,9 +11683,9 @@ msgstr "" " --help amosar esta axuda e saír\n" " --version amosa-la información da versión e saír\n" -#: src/whoami.c:91 +#: src/whoami.c:87 #, fuzzy, c-format -msgid "%s: cannot find name for user ID %lu\n" +msgid "cannot find name for user ID %lu" msgstr "%s: non se pode atopa-lo nome de usuario do UID %u\n" #: src/yes.c:41 @@ -11341,6 +11703,100 @@ msgid "" "\n" msgstr "" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "Sen FICHEIRO, ou cando o FICHEIRO é -, lese da entrada estándar.\n" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Sen FICHEIRO, ou cando o FICHEIRO é -, lese da entrada estándar.\n" + +#, fuzzy +#~ msgid "ignoring all arguments" +#~ msgstr "demasiados argumentos" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: número incorrecto" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s é tan grande que non é representable" + +#~ msgid "number of lines" +#~ msgstr "número de liñas" + +#~ msgid "number of bytes" +#~ msgstr "número de bytes" + +#, fuzzy +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: número de liñas incorrecto" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: número de bytes incorrecto" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: número de liñas incorrecto" + +#, fuzzy +#~ msgid "number in %s is too large" +#~ msgstr "%s é grande de máis" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: número de segundos incorrecto" + +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "non se pode obte-la lista de grupos suplementarios" + +#, fuzzy +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ "\n" +#~ "Parámetros da saída:\n" +#~ "* bsN estilo de retardo do carácter de borrado, N entre [0..1]\n" +#~ "* crN estilo de retardo do retorno de carro, N entre [0..3]\n" +#~ "* ffN estilo de retardo do salto de páxina, N entre [0..1]\n" +#~ "* nlN estilo de retardo do carácter de nova liña, N entre " +#~ "[0..1]\n" +#~ "* [-]ocrnl converter retornos de carro en nova liña\n" +#~ "* [-]ofdel usar caracteres de borrado para rechear, en vez de " +#~ "caracteres\n" +#~ " nulos\n" +#~ "* [-]ofill usar caracteres de recheo en vez de tempos de retardo\n" +#~ "* [-]olcuc converter caracteres minúsculos a maiúsculos\n" +#~ "* [-]onlcr converter unha nova liña a retorno de carro + nova liña\n" +#~ "* [-]onlret o carácter de nova liña fai un retorno de carro\n" +#~ "* [-]onocr non escribi-los retornos de carro na primeira columna\n" +#~ " [-]opost pos-procesar a saída\n" +#~ "* tabN estilo de retardo da tabulación horizontal, N entre " +#~ "[0..3]\n" +#~ "* tabs o mesmo que tab0\n" +#~ "* -tabs o mesmo que tab3\n" +#~ "* vtN estilo de retardo da tabulación vertical, N entre [0..1]\n" + +#, fuzzy +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: non se pode atopa-lo nome de usuario do UID %u\n" + #~ msgid "program error" #~ msgstr "erro do programa" @@ -11379,9 +11835,6 @@ msgstr "" #~ msgid "too few arguments" #~ msgstr "número de argumentos insuficiente" -#~ msgid "Usage: %s [OPTION] [FILE]...\n" -#~ msgstr "Uso: %s [OPCIÓN] [FICHEIRO]...\n" - #, fuzzy #~ msgid "closing standard output" #~ msgstr "saída estándar" @@ -13502,36 +13955,6 @@ msgstr "" #~ msgid "%s: only one signal specififier allowed" #~ msgstr "só se pode especificar un argumento" -#, fuzzy -#~ msgid "" -#~ "Display the current time in the given FORMAT, or set the system date.\n" -#~ "\n" -#~ " -d, --date=STRING display time described by STRING, not `now'\n" -#~ " -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -#~ msgstr "" -#~ "Amosa-la data actual no FORMATO indicado, ou establece-la data do " -#~ "sistema.\n" -#~ "\n" -#~ " -d, --date=CADEA amosa-la data descrita por CADEA, non " -#~ "`agora'\n" -#~ " -f, --file=FICH_DATA coma --date, unha vez para cada liña en " -#~ "FICH_DATA\n" -#~ " -I, --iso-8601[=ESPDATA] escribir unha cadea de data/hora seguindo o\n" -#~ " estándar ISO-8601. ESPDATA=`date' (ou sen " -#~ "nada)\n" -#~ " para que só o sexa a data, `hours', `minutes' " -#~ "ou\n" -#~ " `seconds' para a data e a hora coa precisión\n" -#~ " indicada.\n" -#~ " -r, --reference=FICH amosa-la última data de modificación de FICH\n" -#~ " -R, --rfc-822 amosar unha cadea coa data seguindo o " -#~ "RFC-822\n" -#~ " -s, --set=CADEA establece-la data descrita por CADEA\n" -#~ " -u, --utc, --universal escribir ou establece-la Hora Universal " -#~ "Coordinada\n" -#~ " --help amosar esta axuda e saír\n" -#~ " --version amosa-la información da versión e saír\n" - #, fuzzy #~ msgid "" #~ "Run COMMAND with root directory set to NEWROOT.\n" diff --git a/po/hr.gmo b/po/hr.gmo index e27a9823..6944a555 100644 Binary files a/po/hr.gmo and b/po/hr.gmo differ diff --git a/po/hr.po b/po/hr.po index e599abad..119f6469 100644 --- a/po/hr.po +++ b/po/hr.po @@ -3,11 +3,12 @@ # This file is distributed under the same license as the coreutils package. # # Tomislav Krznar , 2012. +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: GNU coreutils 8.19\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2012-10-01 17:38+0200\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" @@ -37,18 +38,18 @@ msgstr "Ispravni argumenti su:" msgid "error closing file" msgstr "greška pri zatvaranju datoteke" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 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:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "čuvam dozvole za %s" @@ -233,57 +234,62 @@ msgstr "Niz parametara nije pravilno kodiran" msgid "Unknown error" msgstr "Nepoznata greška" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, 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 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: opcija „-W %s” je višeznačna\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, 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 +#: lib/getopt.c:667 lib/getopt.c:672 #, 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 +#: lib/getopt.c:715 lib/getopt.c:734 #, 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 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: neprepoznata opcija „--%s”\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: neprepoznata opcija „%c%s”\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, 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 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, 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 +#: lib/getopt.c:964 lib/getopt.c:980 #, 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 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, 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 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: opcija „-W %s” zahtijeva argument\n" @@ -293,13 +299,13 @@ msgstr "%s: opcija „-W %s” zahtijeva argument\n" msgid "cannot change permissions of %s" msgstr "ne mogu promijeniti dozvole %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "ne mogu napraviti direktorij %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "memorija iscrpljena" @@ -348,6 +354,12 @@ msgstr "”" msgid "%s: end of file" msgstr "%s: kraj datoteke" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "" + #: lib/regcomp.c:131 msgid "Success" msgstr "Uspjeh" @@ -455,7 +467,7 @@ msgstr "^[dDyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "postavljam dozvole za %s" @@ -888,7 +900,7 @@ msgid "" "Base64 encode or decode FILE, or standard input, to standard output.\n" msgstr "" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -898,15 +910,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Ako DATOTEKA nije navedena ili je „-”, čitaj standardni ulaz.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -915,51 +919,51 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "greška čitanja" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "neispravan ulaz" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "operand viška %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, 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:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -998,38 +1002,41 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "nedostaje operand" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 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) to standard output.\n" +msgstr "" + +#: src/cat.c:98 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" @@ -1039,7 +1046,7 @@ msgid "" " -s, --squeeze-blank suppress repeated empty output lines\n" msgstr "" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1047,7 +1054,7 @@ msgid "" " -v, --show-nonprinting use ^ and M- notation, except for LFD and TAB\n" msgstr "" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1056,17 +1063,18 @@ msgid "" " %s Copy standard input to standard output.\n" msgstr "" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "ne mogu izvršiti ioctl na %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "standardni izlaz" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: ulazna datoteka je izlazna datoteka" @@ -1078,10 +1086,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1095,8 +1103,8 @@ msgstr "nisam uspio napraviti sigurnosni kontekst: %s" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "nisam uspio dohvatiti sigurnosni kontekst %s" @@ -1111,13 +1119,13 @@ msgstr "ne mogu primijeniti djelomični kontekst neoznačenoj datoteci %s" msgid "failed to change context of %s to %s" msgstr "nisam uspio promijeniti kontekst %s u %s" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "ne mogu pristupiti %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "ne mogu čitati direktorij %s" @@ -1133,7 +1141,7 @@ msgstr "mijenjam sigurnosni kontekst %s\n" msgid "fts_read failed" msgstr "fts_read nije uspio" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1221,7 +1229,7 @@ msgid "-R -h requires -P" msgstr "" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1238,9 +1246,8 @@ msgid "conflicting security context specifiers given" msgstr "" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "nisam uspio otkriti svojstva %s" @@ -1501,77 +1508,89 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" " or: %s OPTION\n" msgstr "" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" msgstr "" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" msgstr "" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "nisam uspio dohvatiti sigurnosni kontekst %s" -#: src/chroot.c:395 -#, c-format -msgid "failed to %s supplemental groups" -msgstr "" +#: src/chroot.c:412 +#, fuzzy, c-format +msgid "failed to set supplemental groups" +msgstr "nisam uspio dohvatiti sigurnosni kontekst %s" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "" @@ -1608,7 +1627,16 @@ msgstr "" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Ako DATOTEKA nije navedena ili je „-”, čitaj standardni ulaz.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1616,7 +1644,7 @@ msgid "" "and column three contains lines common to both files.\n" msgstr "" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1624,7 +1652,7 @@ msgid "" " -3 suppress column 3 (lines that appear in both files)\n" msgstr "" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1632,17 +1660,17 @@ msgid "" " --nocheck-order do not check that the input is correctly sorted\n" msgstr "" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1651,309 +1679,323 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" msgstr "" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" +msgstr "greška pri zatvaranju datoteke" + +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" +msgid "error reading %s" msgstr "" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "" -#: src/copy.c:323 +#: src/copy.c:302 +#, c-format +msgid "overflow reading %s" +msgstr "" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "nisam uspio dohvatiti sigurnosni kontekst %s" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "nisam uspio dohvatiti sigurnosni kontekst %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "nisam uspio ponovo otvoriti %s s modom %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "" -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "" -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr "" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "" -#: src/copy.c:2107 +#: src/copy.c:2187 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "" -#: src/copy.c:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, c-format +msgid "warning: source directory %s specified more than once" +msgstr "" + +#: src/copy.c:2294 #, c-format msgid "will not create hard link %s to directory %s" msgstr "" -#: src/copy.c:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" -#: src/copy.c:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "" @@ -1963,25 +2005,25 @@ msgstr "" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, fuzzy, c-format msgid "unknown program %s" msgstr "nepoznat tok podataka" @@ -2165,8 +2207,8 @@ msgstr "" msgid "failed to access %s" msgstr "ne mogu pristupiti %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "" @@ -2238,137 +2280,143 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr "" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "" -#: src/csplit.c:1200 +#: src/csplit.c:1201 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "" -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "neispravan kontekst: %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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:1490 +#: src/csplit.c:1485 +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2376,26 +2424,21 @@ msgid "" " -k, --keep-files do not remove output files on errors\n" msgstr "" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 msgid "" "\n" +"Each PATTERN may be:\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" @@ -2419,14 +2462,14 @@ msgstr "" msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" -#: src/cut.c:182 +#: src/cut.c:183 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:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2434,20 +2477,20 @@ msgid "" " -n (ignored)\n" msgstr "" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" -#: src/cut.c:197 +#: src/cut.c:198 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:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2455,7 +2498,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:210 +#: src/cut.c:211 msgid "" "Each range is one of:\n" "\n" @@ -2463,64 +2506,63 @@ msgid "" " 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:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "" -#: src/cut.c:790 +#: src/cut.c:789 msgid "an input delimiter may be specified only when operating on fields" msgstr "" -#: src/cut.c:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" msgstr "" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "" @@ -2537,34 +2579,48 @@ 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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" msgstr "" -#: src/date.c:142 +#: src/date.c:138 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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" -#: src/date.c:147 +#: src/date.c:145 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 (UTC)\n" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" +msgstr "" + +#: src/date.c:149 +msgid "" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" +msgstr "" + +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" msgstr "" #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2572,7 +2628,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2580,7 +2636,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2588,14 +2644,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:177 +#: src/date.c:183 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 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2603,7 +2659,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2611,7 +2667,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2622,7 +2678,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2630,7 +2686,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:209 +#: src/date.c:215 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" @@ -2638,7 +2694,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2646,7 +2702,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2658,7 +2714,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2669,7 +2725,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2678,7 +2734,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -2692,35 +2748,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "" -#: src/date.c:430 +#: src/date.c:436 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "" -#: src/date.c:437 +#: src/date.c:443 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" -#: src/date.c:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2728,30 +2784,30 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" " or: %s OPTION\n" msgstr "" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -2762,7 +2818,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:570 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2771,11 +2827,13 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -2786,7 +2844,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -2801,7 +2859,7 @@ msgid "" " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2811,7 +2869,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2820,117 +2878,96 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 +#: src/dd.c:661 #, 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:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" - -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" @@ -2938,7 +2975,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "" @@ -2952,164 +2989,180 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr "" -#: src/dd.c:877 +#: src/dd.c:809 +#, c-format +msgid ", %.6f s, %s/s" +msgstr "" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "" -#: src/dd.c:1294 -msgid "invalid status flag" -msgstr "" - -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" +msgstr "neispravan korisnik" -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" " of mt_type=0x%0lx -- see for the list of types" msgstr "" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, 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:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "" @@ -3190,12 +3243,12 @@ msgstr "" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3203,18 +3256,18 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3223,20 +3276,30 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:1409 +#: src/df.c:1429 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" +msgstr "" + +#: src/df.c:1435 +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" + +#: src/df.c:1439 +msgid "" " -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:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3244,25 +3307,25 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "" -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "" @@ -3352,7 +3415,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3360,7 +3423,8 @@ msgid "" msgstr "" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" #: src/du.c:291 @@ -3444,61 +3508,55 @@ msgstr "" msgid "Infinity" msgstr "" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "neispravan %s%s argument „%s”" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "" @@ -3609,9 +3667,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "\n" "Ako DATOTEKA nije navedena ili je „-”, čitaj standardni ulaz.\n" @@ -3653,7 +3709,7 @@ msgid "input line is too long" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "" @@ -3759,12 +3815,12 @@ msgstr "" msgid "non-integer argument" msgstr "" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "" @@ -3775,38 +3831,38 @@ msgid "the strings compared were %s and %s" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" " or: %s OPTION\n" msgstr "" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -3845,7 +3901,7 @@ msgid "" "The option -WIDTH is an abbreviated form of --width=DIGITS.\n" msgstr "" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -3853,7 +3909,7 @@ msgid "" " -s, --split-only split long lines, but do not refill\n" msgstr "" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -3862,35 +3918,33 @@ msgid "" " -g, --goal=WIDTH goal width (default of 93% of width)\n" msgstr "" -#: src/fmt.c:359 +#: src/fmt.c:356 #, 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/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" +msgstr "neispravan ulaz" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" -#: src/fold.c:77 +#: src/fold.c:76 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 "" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" +msgstr "neispravan kontekst: %s" #. This is a proper name. See the gettext manual, section Names. #: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 @@ -3956,14 +4010,13 @@ msgstr "" msgid "%s: no such user" msgstr "" -#: src/head.c:109 +#: src/head.c:110 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 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -3973,13 +4026,13 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:125 +#: src/head.c:126 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 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -3987,48 +4040,36 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "" -#: src/head.c:886 +#: src/head.c:267 #, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "" - -#: src/head.c:887 -msgid "number of lines" -msgstr "" - -#: src/head.c:887 -msgid "number of bytes" +msgid "%s: number of bytes is too large" msgstr "" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "" @@ -4195,7 +4236,7 @@ msgstr "" msgid "cannot set time stamps for %s" msgstr "" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "" @@ -4311,7 +4352,7 @@ msgstr "" msgid "target directory not allowed when installing a directory" msgstr "" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "" @@ -4346,15 +4387,19 @@ msgstr "" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +msgid "" "\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:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -4362,7 +4407,7 @@ msgid "" " -t CHAR use CHAR as input and output field separator\n" msgstr "" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -4374,11 +4419,11 @@ msgid "" " print them without trying to pair them\n" msgstr "" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -4397,47 +4442,47 @@ msgid "" "warning message will be given.\n" msgstr "" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "" @@ -4501,17 +4546,17 @@ msgstr "" msgid "no process ID specified" msgstr "" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -4658,7 +4703,7 @@ msgstr "" msgid "FIXME: unknown" msgstr "" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "" @@ -4669,7 +4714,7 @@ msgid "" "\n" msgstr "" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "" @@ -4679,7 +4724,7 @@ msgstr "" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "" @@ -4688,100 +4733,100 @@ msgstr "" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" -msgstr "" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" +msgstr "neispravan ulaz" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" -msgstr "" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" +msgstr "neispravan kontekst: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "" -#: src/ls.c:4781 +#: src/ls.c:4775 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:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -4790,7 +4835,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -4804,18 +4849,19 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4798 msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -4825,11 +4871,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -4838,7 +4884,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -4846,7 +4892,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -4859,7 +4905,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -4871,7 +4917,7 @@ msgid "" " -k, --kibibytes default to 1024-byte blocks for disk usage\n" msgstr "" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -4881,7 +4927,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -4892,7 +4938,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -4904,7 +4950,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -4912,21 +4958,21 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4886 +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -4940,31 +4986,32 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4908 +#: src/ls.c:4904 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:4912 +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4919 +#: src/ls.c:4915 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 security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -4973,7 +5020,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -4998,43 +5045,44 @@ msgid "David Madore" msgstr "" #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" +msgstr "Uporaba: %s [OPCIJA]... [DATOTEKA]...\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 msgid "" +"\n" " -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" +#: src/md5sum.c:180 +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr "" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -5046,45 +5094,46 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" @@ -5092,7 +5141,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" @@ -5100,7 +5149,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" @@ -5108,38 +5157,38 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -5169,22 +5218,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "nisam uspio dohvatiti sigurnosni kontekst %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "nisam uspio dohvatiti sigurnosni kontekst %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -5353,7 +5402,7 @@ msgstr "" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" @@ -5465,9 +5514,7 @@ 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" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "\n" "Ako DATOTEKA nije navedena ili je „-”, čitaj standardni ulaz.\n" @@ -5542,27 +5589,27 @@ msgstr "" msgid "invalid footer numbering style: %s" msgstr "" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" -msgstr "" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" +msgstr "neispravan korisnik" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" -msgstr "" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" +msgstr "neispravan kontekst: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" -msgstr "" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" +msgstr "neispravan kontekst: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" -msgstr "" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" +msgstr "neispravan kontekst: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "" @@ -5584,7 +5631,7 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -5596,43 +5643,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "" @@ -5654,96 +5701,93 @@ msgid "" " --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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, fuzzy, c-format msgid "value too large to be converted: %s" msgstr "nisam uspio napraviti sigurnosni kontekst: %s" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "neispravan kontekst: %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "neispravan sufiks u %s%s argumentu „%s”" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "neispravan kontekst: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Uporaba: %s [OPCIJA]... [DATOTEKA]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -5751,19 +5795,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -5773,40 +5817,40 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" msgstr "" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -5815,7 +5859,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -5823,7 +5867,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -5831,7 +5875,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -5839,7 +5883,19 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -5848,9 +5904,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -5862,7 +5919,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -5877,118 +5934,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "neispravan argument %s za %s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "neispravan sufiks u %s%s argumentu „%s”" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "neispravan %s%s argument „%s”" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "neispravna grupa: %s" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "neispravan %s%s argument „%s”" +msgid "multiple field specifications" +msgstr "posebna blokovska datoteka" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "neispravna grupa: %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, fuzzy, c-format msgid "failed to convert some of the input numbers" msgstr "nisam uspio promijeniti kontekst %s u %s" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5997,18 +6066,17 @@ msgid "" "[b]]\n" msgstr "" -#: src/od.c:326 +#: src/od.c:327 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:333 +#: src/od.c:335 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" @@ -6017,7 +6085,7 @@ msgid "" "suffixes may be . for octal and b for multiply by 512.\n" msgstr "" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -6026,7 +6094,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -6039,7 +6107,7 @@ msgid "" " --traditional accept arguments in third form above\n" msgstr "" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -6050,7 +6118,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6060,7 +6128,7 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -6069,7 +6137,7 @@ msgid "" " c printable character or backslash escape\n" msgstr "" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6078,7 +6146,7 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -6087,14 +6155,14 @@ msgid "" "for sizeof(double) or L for sizeof(long double).\n" msgstr "" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -6107,55 +6175,55 @@ msgid "" "and so on for G, T, P, E, Z, Y.\n" msgstr "" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte integral type" msgstr "" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte floating point type" msgstr "" -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" msgstr "" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "" -#: src/od.c:1650 +#: src/od.c:1658 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "" @@ -6174,7 +6242,6 @@ msgstr "" 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 @@ -6306,12 +6373,12 @@ msgstr "" msgid "Where" msgstr "" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6321,7 +6388,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6330,7 +6397,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -6338,96 +6405,91 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:597 +#: src/pinky.c:596 #, 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 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +msgid "'-N NUMBER' invalid starting line number" msgstr "" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +msgid "'-o MARGIN' invalid line offset" msgstr "" -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "" -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "" -#: src/pr.c:1096 +#: src/pr.c:1059 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" -#: src/pr.c:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" -#: src/pr.c:1196 +#: src/pr.c:1166 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6437,7 +6499,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6447,7 +6509,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6459,7 +6521,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -6472,16 +6534,21 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2798 +#: src/pr.c:2769 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2775 +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -6491,7 +6558,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -6500,7 +6567,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -6511,17 +6578,22 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2828 +#: src/pr.c:2802 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6535,7 +6607,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -6544,13 +6616,6 @@ msgid "" " with -S or -s\n" msgstr "" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" - #: src/printenv.c:62 #, c-format msgid "" @@ -6675,15 +6740,20 @@ msgid "" "files.\n" msgstr "" -#: src/ptx.c:1830 +#: src/ptx.c:1831 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:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -6691,7 +6761,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -6701,7 +6771,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -6709,20 +6779,16 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Ako DATOTEKA nije navedena ili je „-”, čitaj standardni ulaz.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -6746,7 +6812,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "" @@ -6766,8 +6832,8 @@ msgstr "" msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "" @@ -6957,16 +7023,16 @@ msgstr "" #: src/rm.c:342 #, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "" msgstr[1] "" msgstr[2] "" #: src/rm.c:345 #, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -7145,12 +7211,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -7166,7 +7232,16 @@ msgid "" "for even very expensive hardware probing to recover the data.\n" msgstr "" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Ako DATOTEKA nije navedena ili je „-”, čitaj standardni ulaz.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7175,7 +7250,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -7184,11 +7259,9 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:192 +#: src/shred.c:196 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.\n" @@ -7200,7 +7273,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -7211,7 +7284,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7223,7 +7296,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7232,7 +7305,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -7244,134 +7317,134 @@ msgid "" "\n" msgstr "" -#: src/shred.c:241 +#: src/shred.c:243 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:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "" -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" -msgstr "" +#, fuzzy +msgid "invalid number of passes" +msgstr "neispravan kontekst: %s" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" -msgstr "" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" +msgstr "neispravan kontekst: %s" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -7379,11 +7452,11 @@ msgid "" " or: %s -i LO-HI [OPTION]...\n" msgstr "" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -7394,37 +7467,37 @@ msgid "" " -r, --repeat output lines can be repeated\n" msgstr "" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" -msgstr "" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" +msgstr "neispravan ulaz" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" -msgstr "" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" +msgstr "neispravan kontekst: %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -7443,12 +7516,12 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "" @@ -7457,13 +7530,13 @@ msgstr "" msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -7471,19 +7544,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:443 +#: src/sort.c:444 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:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -7491,7 +7564,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7501,19 +7574,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -7522,7 +7595,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7531,13 +7604,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -7545,7 +7618,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7560,7 +7633,7 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -7579,129 +7652,127 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:524 +#: src/sort.c:525 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:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -7709,348 +7780,354 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "" -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" msgstr "" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" -msgstr "" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" +msgstr "Uporaba: %s [OPCIJA]... [DATOTEKA]...\n" -#: src/split.c:207 +#: src/split.c:228 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" -msgstr "" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" +msgstr "neispravan kontekst: %s" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" -msgstr "" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" +msgstr "neispravan kontekst: %s" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" -msgstr "" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" +msgstr "neispravan sufiks u %s%s argumentu „%s”" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" +msgid "empty record separator" msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "posebna znakovna datoteka" -#: src/split.c:1286 +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "posebna znakovna datoteka" + +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "" -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" -msgstr "" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" +msgstr "neispravan kontekst: %s" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, c-format msgid "%s: cannot determine file size" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8061,7 +8138,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8069,30 +8146,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8100,17 +8177,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8120,7 +8197,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -8132,7 +8209,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8142,7 +8219,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8155,7 +8232,7 @@ msgid "" " %T minor device type in hex, for character/block device special files\n" msgstr "" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8170,7 +8247,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8181,7 +8258,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -8236,8 +8313,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -8262,7 +8338,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8270,96 +8346,149 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 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:535 +#: src/stty.c:543 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:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +msgid "" " 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 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:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" msgstr "" -#: src/stty.c:559 +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" + +#: src/stty.c:614 +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 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:578 +#: src/stty.c:632 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" +msgstr "" + +#: src/stty.c:637 +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:584 +#: src/stty.c:641 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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -8367,10 +8496,13 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -8378,135 +8510,249 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +msgid "" " [-]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:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:619 +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +msgid "" " [-]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:627 +#: src/stty.c:712 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:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]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:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +msgid "" " * 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr "" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:672 +#: src/stty.c:843 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" +msgstr "" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:875 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:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -#: src/stty.c:699 +#: src/stty.c:919 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:707 +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8515,25 +8761,27 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8542,58 +8790,63 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "greška pri zatvaranju datoteke" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" -msgstr "" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" +msgstr "neispravan %s%s argument „%s”" #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 @@ -8601,25 +8854,64 @@ msgid "Kayvan Aghaiepour" msgstr "" #: src/sum.c:62 +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" + +#: src/sum.c:68 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 +#: src/sync.c:64 +#, fuzzy, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Uporaba: %s [OPCIJA]... [DATOTEKA]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" +"\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" msgstr "" -#: src/sync.c:69 +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "greška pri zatvaranju datoteke" + +#: src/sync.c:124 #, c-format -msgid "ignoring all arguments" +msgid "couldn't reset non-blocking mode %s" msgstr "" -#: src/system.h:343 +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "greška pri zatvaranju datoteke" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "" + +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -8628,21 +8920,29 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr "" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr "" -#: src/system.h:543 +#: src/system.h:537 +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/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -8650,7 +8950,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -8659,7 +8959,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, fuzzy, c-format msgid "" "\n" @@ -8670,22 +8970,27 @@ msgstr "%s početna stranica: <%s>\n" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -#: src/system.h:591 +#: src/system.h:613 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -8702,9 +9007,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "\n" "Ako DATOTEKA nije navedena ili je „-”, čitaj standardni ulaz.\n" @@ -8716,66 +9019,65 @@ msgid "" " -s, --separator=STRING use STRING as the separator instead of newline\n" msgstr "" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "" -#: src/tac.c:450 +#: src/tac.c:459 #, c-format msgid "failed to create temporary file in %s" msgstr "" -#: src/tac.c:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" msgstr "" -#: src/tac.c:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" msgstr "" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "" -#: src/tail.c:262 +#: src/tail.c:257 #, 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 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -8783,7 +9085,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -8796,14 +9098,14 @@ msgid "" " with inotify, this option is rarely useful\n" msgstr "" -#: src/tail.c:293 +#: src/tail.c:288 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 if it is inaccessible\n" msgstr "" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -8812,7 +9114,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -8823,7 +9125,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -8833,169 +9135,168 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "" -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" -#: src/tail.c:1006 +#: src/tail.c:999 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" -#: src/tail.c:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "" -#: src/tail.c:1035 +#: src/tail.c:1032 #, c-format -msgid "%s has appeared; following end of new file" +msgid "%s has appeared; following new file" msgstr "" -#: src/tail.c:1046 +#: src/tail.c:1042 #, c-format -msgid "%s has been replaced; following end of new file" +msgid "%s has been replaced; following new file" msgstr "" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "" -#: src/tail.c:1529 +#: src/tail.c:1513 #, c-format -msgid "error monitoring inotify event" +msgid "%s was replaced" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1577 #, c-format -msgid "error reading inotify event" +msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1844 +#: src/tail.c:1597 #, c-format -msgid "%s: cannot follow end of this type of file; giving up on this name" +msgid "error reading inotify event" msgstr "" -#: src/tail.c:1961 +#: src/tail.c:1902 #, c-format -msgid "number in %s is too large" +msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +msgid "invalid maximum number of unchanged stats between opens" msgstr "" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" -msgstr "" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" +msgstr "neispravan korisnik" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "neispravan kontekst: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -9003,58 +9304,72 @@ msgid "" " -i, --ignore-interrupts ignore interrupt signals\n" msgstr "" -#: src/tee.c:71 +#: src/tee.c:93 +msgid "" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" +msgstr "" + +#: src/tee.c:98 msgid "" "\n" -"If a FILE is -, copy again to standard output.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -9063,20 +9378,20 @@ msgid "" " or: [ OPTION\n" msgstr "" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" msgstr "" -#: src/test.c:717 +#: src/test.c:719 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 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -9085,7 +9400,7 @@ msgid "" " EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n" msgstr "" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -9095,7 +9410,7 @@ msgid "" " STRING1 != STRING2 the strings are not equal\n" msgstr "" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -9106,7 +9421,7 @@ msgid "" " INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n" msgstr "" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -9114,7 +9429,7 @@ msgid "" " FILE1 -ot FILE2 FILE1 is older than FILE2\n" msgstr "" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -9123,7 +9438,7 @@ msgid "" " -e FILE FILE exists\n" msgstr "" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -9132,7 +9447,7 @@ msgid "" " -k FILE FILE exists and has its sticky bit set\n" msgstr "" -#: src/test.c:766 +#: src/test.c:768 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" @@ -9141,7 +9456,7 @@ msgid "" " -s FILE FILE exists and has a size greater than zero\n" msgstr "" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -9150,7 +9465,7 @@ msgid "" " -x FILE FILE exists and execute (or search) permission is granted\n" msgstr "" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -9159,32 +9474,32 @@ msgid "" "INTEGER may also be -l STRING, which evaluates to the length of STRING.\n" msgstr "" -#: src/test.c:786 +#: src/test.c:788 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 +#: src/test.c:793 msgid "test and/or [" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "" @@ -9204,18 +9519,18 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" " or: %s [OPTION]\n" msgstr "" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -9233,7 +9548,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9241,7 +9556,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -9252,7 +9567,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -9267,6 +9582,11 @@ msgstr "" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -9544,12 +9864,12 @@ msgstr "" msgid "Exit with a status code indicating failure." msgstr "" -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -9560,22 +9880,22 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -9583,57 +9903,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "neispravan kontekst: %s" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "" @@ -9648,16 +9973,19 @@ msgstr "" 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:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "" @@ -9706,9 +10034,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "\n" "Ako DATOTEKA nije navedena ili je „-”, čitaj standardni ulaz.\n" @@ -9752,8 +10078,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -9764,7 +10090,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -9900,11 +10226,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "" - #: src/uptime.c:214 #, c-format msgid "" @@ -9920,12 +10241,16 @@ msgid "" "\n" msgstr "" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +msgid "" +"\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" @@ -9933,12 +10258,12 @@ msgid "" " -l, --lines print the newline counts\n" msgstr "" -#: src/wc.c:128 +#: src/wc.c:134 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" @@ -10073,9 +10398,9 @@ msgid "" "\n" msgstr "" -#: src/whoami.c:91 +#: src/whoami.c:87 #, c-format -msgid "%s: cannot find name for user ID %lu\n" +msgid "cannot find name for user ID %lu" msgstr "" #: src/yes.c:41 @@ -10091,6 +10416,15 @@ msgid "" "\n" msgstr "" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Ako DATOTEKA nije navedena ili je „-”, čitaj standardni ulaz.\n" + #~ msgid "cannot create pipe" #~ msgstr "ne mogu napraviti cjevovod" diff --git a/po/hu.gmo b/po/hu.gmo index fde3952c..c456368e 100644 Binary files a/po/hu.gmo and b/po/hu.gmo differ diff --git a/po/hu.po b/po/hu.po index 1e03e27d..30ecda99 100644 --- a/po/hu.po +++ b/po/hu.po @@ -5,20 +5,22 @@ # # Emese Kovács , 2002. # Gabor Kelemen , 2005, 2006, 2007, 2008, 2010, 2011, 2012, 2013, 2014. +# Balázs Úr , 2015. +#: src/stty.c:941 msgid "" msgstr "" -"Project-Id-Version: coreutils 8.22-pre4\n" +"Project-Id-Version: coreutils 8.23-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" -"PO-Revision-Date: 2014-04-07 16:40+0200\n" -"Last-Translator: Gabor Kelemen \n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" +"PO-Revision-Date: 2015-06-14 10:20+0200\n" +"Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\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" +"X-Generator: Lokalize 1.2\n" #: lib/argmatch.c:133 #, c-format @@ -38,18 +40,18 @@ 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:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "íráshiba" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "%s jogosultságainak megtartása" @@ -100,7 +102,7 @@ msgstr "speciális karakterfájl" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "folyamatos adatok" #: lib/file-type.c:75 msgid "fifo" @@ -108,44 +110,39 @@ msgstr "fifo" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "ajtó" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "speciális blokkfájl" +msgstr "multiplexelt speciális blokkfájl" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "speciális karakterfájl" +msgstr "multiplexelt speciális karakterfájl" #: lib/file-type.c:87 -#, fuzzy msgid "multiplexed file" -msgstr "több szerep" +msgstr "multiplexelt fájl" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "szokatlan fájl" +msgstr "elnevezett fájl" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "speciális blokkfájl" +msgstr "speciális hálózatfájl" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "átköltöztetett fájl adatokkal" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "átköltöztetett fájl adatok nélkül" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "port" #: lib/file-type.c:105 msgid "socket" @@ -153,7 +150,7 @@ msgstr "foglalat" #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "kifehéredés" #: lib/file-type.c:110 msgid "weird file" @@ -235,57 +232,62 @@ msgstr "A paraméter-karakterlánc kódolása nem megfelelő" msgid "Unknown error" msgstr "Ismeretlen hiba" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű, lehetőségek:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: a „-W %s” kapcsoló nem egyértelmű\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: a(z) „--%s” kapcsoló nem enged meg argumentumot\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: a(z) „%c%s” kapcsoló nem enged meg argumentumot\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: a(z) „--%s” kapcsolóhoz argumentum szükséges\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: a(z) „--%s” kapcsoló ismeretlen\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: a(z) „%c%s” kapcsoló ismeretlen\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: érvénytelen kapcsoló -- „%c”\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a kapcsoló egy argumentumot igényel -- „%c”\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: a „-W %s” kapcsoló nem egyértelmű\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: a „-W %s” kapcsoló nem enged meg argumentumot\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: a(z) „-W%s” kapcsolóhoz argumentum szükséges\n" @@ -295,13 +297,13 @@ msgstr "%s: a(z) „-W%s” kapcsolóhoz argumentum szükséges\n" msgid "cannot change permissions of %s" msgstr "nem lehet %s jogosultságait megváltoztatni" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "nem lehet a következő könyvtárat létrehozni: %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "elfogyott a memória" @@ -350,6 +352,12 @@ msgstr "”" msgid "%s: end of file" msgstr "%s: fájl vége" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: olvasási hiba" + #: lib/regcomp.c:131 msgid "Success" msgstr "Sikerült" @@ -459,7 +467,7 @@ msgstr "^[iIyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "%s jogosultságainak beállítása" @@ -895,7 +903,7 @@ msgstr "" "Használat: %s [KAPCSOLÓ]… [FÁJL]\n" "A FÁJL vagy a szabványos bemenet Base64 kódolása a szabványos kimenetre.\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -911,15 +919,7 @@ msgstr "" " (alapértelmezésben 76). A 0 kikapcsolja a törést\n" "\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Ha a FÁJL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -936,51 +936,51 @@ msgstr "" "az\n" "ábécében nem szereplő karakterekből.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "olvasási hiba" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "érvénytelen bemenet" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "érvénytelen sortörésméret: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "extra operandus: „%s”" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "a szabványos bemenet lezárása" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -992,7 +992,7 @@ msgid "" " or: %s OPTION... NAME...\n" msgstr "" "Használat: %s NÉV [UTÓTAG]\n" -" vagy: %s KAPCSOLÓ... NÉV...\n" +" vagy: %s KAPCSOLÓ… NÉV…\n" #: src/basename.c:53 msgid "" @@ -1003,16 +1003,15 @@ msgstr "" "Ha meg van adva, a záró UTÓTAGOT is eltávolítja.\n" #: src/basename.c:60 -#, fuzzy msgid "" " -a, --multiple support multiple arguments and treat each as a NAME\n" " -s, --suffix=SUFFIX remove a trailing SUFFIX; implies -a\n" " -z, --zero end each output line with NUL, not newline\n" msgstr "" -" -a, --multiple több argumentum támogatása, és mindegyik NÉVKÉNT " -"kezelése\n" -" -s, --suffix=UTÓTAG remove a trailing SUFFIX\n" -" -z, --zero kimenet elválasztása NULL-lal új sor helyett\n" +" -a, --multiple több argumentum támogatása, és mindegyik NÉVKÉNT\n" +" kezelése\n" +" -s, --suffix=UTÓTAG záró UTÓTAG eltávolítása\n" +" -z, --zero minden kimeneti sor lezárása NUL-lal új sor helyett\n" #: src/basename.c:67 #, c-format @@ -1032,38 +1031,44 @@ msgstr "" " %s -a izé/str1 izé/str2 -> „str1” majd „str2”\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "hiányzó operandus" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Használat: %s [KAPCSOLÓ]… [FÁJL]…\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"Az összes FÁJL rendezett konkatenációjának kiírása a szabványos kimenetre.\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1082,7 +1087,7 @@ msgstr "" " -s, --squeeze-blank az ismétlődő üres kimeneti sorokat nem jeleníti " "meg\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1095,7 +1100,7 @@ msgstr "" " -v, --show-nonprinting a ^ és M- jelölés használata az LFD és TAB\n" " kivételével\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1108,17 +1113,18 @@ msgstr "" " %s f - g Előbb f, majd a szabványos bemenet, majd g tartalmának kiírása.\n" " %s A szabványos bemenet másolása a szabványos kimenetre.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "nem végezhető ioctl a következőn: %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "szabványos kimenet" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: a bemeneti fájl a kimeneti fájl" @@ -1130,10 +1136,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1149,8 +1155,8 @@ msgstr "" "a(z) %s biztonsági kontextus összetevőjének beállítása meghiúsult a " "következőre: %s" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "%s biztonsági kontextusának lekérése meghiúsult" @@ -1165,13 +1171,13 @@ msgstr "nem alkalmazható részleges kontextus a(z) %s nem címkézett fájlra" 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:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "%s nem érhető el" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "a következő könyvtár nem olvasható: %s" @@ -1187,7 +1193,7 @@ msgstr "%s biztonsági kontextusának megváltoztatása\n" msgid "fts_read failed" msgstr "az fts_read sikertelen" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1312,7 +1318,7 @@ msgid "-R -h requires -P" msgstr "a -R -h megköveteli a -P használatát" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1329,9 +1335,8 @@ msgid "conflicting security context specifiers given" msgstr "ütköző biztonságikontextus-meghatározót adott meg" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "%s attribútumainak beolvasása sikertelen" @@ -1652,17 +1657,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "érvénytelen csoport: %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "érvénytelen csoportlista: %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1671,7 +1676,7 @@ msgstr "" "Használat: %s [KAPCSOLÓ] ÚJGYÖKÉR [PARANCS [ARGUMENTUM]…]\n" " vagy: %s KAPCSOLÓ\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1679,17 +1684,30 @@ msgstr "" "A PARANCS futtatása a gyökérkönyvtár ÚJGYÖKÉRRE állításával.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" +" --userspec=FELH:CSOP használandó felhasználó és csoport megadása " +"(azonosító\n" +" vagy név)\n" +" --groups=G_LISTa kiegészítő csoportok megadása mint g1,g2,..,gN\n" + +#: src/chroot.c:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" " --userspec=FELH:CSOP használandó felhasználó és csoport megadása " "(azonosító\n" " vagy név)\n" " --groups=G_LISTa kiegészítő csoportok megadása mint g1,g2,..,gN\n" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" @@ -1698,42 +1716,47 @@ msgstr "" "Ha nincs parancs megadva, a „${SHELL} -i” (alapértelmezés: „/bin/sh”) indul " "el.\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "a gyökérkönyvtár nem váltható át a következőre: %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "nem lehet a gyökérkönyvtárba lépni" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" -msgstr "" +msgstr "nincs csoport megadva az ismeretlen uid-nál: %d" -#: src/chroot.c:383 -#, fuzzy, c-format +#: src/chroot.c:400 +#, c-format msgid "failed to get supplemental groups" -msgstr "a kiegészítő csoportok beállítása meghiúsult" +msgstr "a kiegészítő csoportok lekérése meghiúsult" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" -msgstr "a kiegészítő csoportok beállítása meghiúsult" +msgid "failed to set supplemental groups" +msgstr "a kiegészítő csoportok lekérése meghiúsult" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "a csoportazonosító beállítása meghiúsult" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "a felhasználói azonosító beállítása meghiúsult" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "a(z) %s parancs futtatása meghiúsult" @@ -1774,7 +1797,16 @@ msgstr "Használat: %s [KAPCSOLÓ]… FÁJL1 FÁJL2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "A rendezett FÁJL1 és FÁJL2 összehasonlítása sorról sorra.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Ha a FÁJL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1787,7 +1819,7 @@ msgstr "" "sorokat,\n" "a harmadik oszlop pedig a mindkét fájlban közös sorokat.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1799,7 +1831,7 @@ msgstr "" " -2 a 2. oszlop (a FÁJL2-ben egyedi sorok) elnyomása\n" " -3 a 3. oszlop (a mindkét fájlban szereplő sorok) elnyomása\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1811,12 +1843,12 @@ msgstr "" " minden bemeneti sor párosítható is.\n" " --nocheck-order ne ellenőrizze a bemenet megfelelő rendezését\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" " --output-delimiter=STR oszlopok elválasztása a STR karakterlánccal\n" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" @@ -1826,7 +1858,7 @@ msgstr "" "által\n" "megadott szabályokat.\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1839,76 +1871,86 @@ msgstr "" " %s -12 fájl1 fájl2 Csak a fájl1 fájl2 közös sorainak kiírása.\n" " %s -3 fájl1 fájl2 A fájl1 és a fájl2 nem közös sorainak kiírása.\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "a(z) %d. fájl nincs rendezve" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "több -elválasztót adott meg" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "üres %s nem engedélyezett" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "lseek %s sikertelen" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "hiba %s olvasása közben" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "lseek %s sikertelen" +msgid "error reading %s" +msgstr "hiba %s olvasása közben" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "hiba %s írása közben" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "hiba %s olvasása közben" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s: az extent információinak lekérése meghiúsult" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: az írás meghiúsult" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "%s kiterjesztése meghiúsult" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "%s jogosultságainak törlése" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "%s tulajdonosának megtartása meghiúsult" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "%s fájl kikeresése meghiúsult" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "%s szerzőjének megtartása meghiúsult" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" @@ -1916,245 +1958,247 @@ msgstr "" "az alapértelmezett fájllétrehozási kontextus beállítása meghiúsult a " "következőre: %s" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "" "az alapértelmezett fájllétrehozási kontextus beállítása meghiúsult ehhez: %s" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "%s biztonsági kontextusának beállítása meghiúsult" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "%s nem nyitható meg olvasásra" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "fstat %s sikertelen" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "%s fájl kihagyása, mivel kicserélték másolás közben" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "%s nem törölhető" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "%s törölve\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "nincs írás a(z) %s törött szimbolikus linken keresztül" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "%s reguláris fájl nem hozható létre" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "%s klónozása meghiúsult innen: %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "%s összes idejének megtartása" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "%s bezárása meghiúsult" -#: src/copy.c:1580 -#, fuzzy, c-format +#: src/copy.c:1669 +#, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " -msgstr "" -"%s: megpróbálja felülírni a(z) %s fájlt, figyelmen kívül hagyva a(z) %04lo " -"(%s) módot? " +msgstr "%s: %s cseréje, felülírási mód %04lo (%s)? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " -msgstr "" +msgstr "%s: nem írható %s (mód: %04lo, %s); mindenképp megpróbálja? " -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " -msgstr "%s: felülírod a(z) %s fájlt? " +msgstr "%s: felülírja a(z) %s fájlt? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (biztonsági mentés: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, 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:1706 +#: src/copy.c:1795 #, 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:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "stat %s sikertelen" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "%s könyvtár kihagyása" -#: src/copy.c:1791 +#: src/copy.c:1880 #, 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:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s és %s ugyanaz a fájl" -#: src/copy.c:1939 +#: src/copy.c:2019 #, 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:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "az éppen létrehozott %s-t nem fogom felülírni ezzel: %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, 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:1989 +#: src/copy.c:2069 #, 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:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "%s biztonsági mentése sikertelen" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, 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:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "figyelmeztetés: %s forrásfájl többször is meg van adva" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "%s-t nem lehet ide áthelyezni: %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "%s körkörös szimbolikus link nem másolható" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, 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:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "%s fifo nem hozható létre" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "%s speciális fájl nem hozható létre" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "%s szimbolikus link nem olvasható" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "%s szimbolikus link nem hozható létre" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s fájltípusa ismeretlen" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "%s biztonsági mentése nem állítható vissza" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (biztonsági mentés visszaállítása)\n" @@ -2162,30 +2206,35 @@ msgstr "%s -> %s (biztonsági mentés visszaállítása)\n" #. This is a proper name. See the gettext manual, section Names. #: src/coreutils.c:47 msgid "Alex Deymo" -msgstr "" +msgstr "Alex Deymo" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" -msgstr "" +msgstr "Használat: %s --coreutils-prog=PROGRAM_NEVE [PARAMÉTEREK]… \n" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" +"A beépített PROGRAM_NEVE program végrehajtása a megadott PARAMÉTEREKKEL.\n" +"\n" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" +"\n" +"Az egyes programok súgójához használja a(z) „%s --coreutils-" +"prog=PROGRAM_NEVE --help” parancsot.\n" -#: src/coreutils.c:178 src/coreutils.c:202 -#, fuzzy, c-format +#: src/coreutils.c:177 src/coreutils.c:201 +#, c-format msgid "unknown program %s" -msgstr "ismeretlen adatfolyam" +msgstr "ismeretlen program: %s" #: src/cp.c:157 src/mv.c:288 #, c-format @@ -2348,17 +2397,17 @@ msgstr "" " -x, --one-file-system az adott fájlrendszeren marad\n" #: src/cp.c:232 -#, fuzzy msgid "" " -Z set SELinux security context of destination\n" " file to default type\n" " --context[=CTX] like -Z, or if CTX is specified then set the\n" " SELinux or SMACK security context to CTX\n" msgstr "" -" -Z, --context[=KTX] a célfájl SELinux biztonsági kontextusának\n" -" beállítása az alapértelmezett típusra, " -"vagy\n" -" ha meg van adva akkor a KTX-ra\n" +" -Z a célfájl SELinux biztonsági környezetének\n" +" beállítása az alapértelmezett típusra\n" +" --context[=CTX] mint a -Z, vagy ha a CTX meg van adva, akkor\n" +" a SELinux vagy SMACK biztonsági környezet\n" +" beállítása CTX értékre\n" #: src/cp.c:240 msgid "" @@ -2460,8 +2509,8 @@ msgstr "%s létezik, de nem könyvtár" msgid "failed to access %s" msgstr "%s elérése meghiúsult" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "hiányzó fájloperandus" @@ -2539,131 +2588,131 @@ msgstr "" "készült" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "a bemenet eltűnt" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: a sorszám kívül esik a tartományon" -#: src/csplit.c:713 +#: src/csplit.c:714 #, 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:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " a(z) %s ismétlésben\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: a találat nem található" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "hiba a szabályos kifejezés keresésében" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "írási hiba a következőhöz: %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, 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:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: egy „}” szükséges az ismétlésszámban" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, 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:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: a záró „%c” elhatároló hiányzik" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: érvénytelen szabályos kifejezés: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: érvénytelen minta" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: a sorszámnak nagyobbnak kell lennie, mint 0" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, 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:1284 +#: src/csplit.c:1285 #, 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:1287 +#: src/csplit.c:1288 #, 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:1292 +#: src/csplit.c:1293 #, 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:1309 +#: src/csplit.c:1310 #, 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:1323 +#: src/csplit.c:1324 #, 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:1371 -#, c-format -msgid "%s: invalid number" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" msgstr "érvénytelen szám: %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Használat: %s [KAPCSOLÓ]… FÁJL MINTA…\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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" @@ -2671,7 +2720,16 @@ 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" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Ha a FÁJL a -, akkor a szabványos bemenetet olvassa. A MINTA lehet:\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2683,11 +2741,11 @@ msgstr "" " -f, --prefix=ELŐTAG az ELŐTAG használata az „xx” helyett\n" " -k, --keep-files ne törölje kimeneti fájlokat hiba esetén\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr " -m, --suppress-matched a MINTÁRA illeszkedő sorok elnyomása\n" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2699,17 +2757,11 @@ msgstr "" "összegét\n" " -z, --elide-empty-files üres kimeneti fájlok eltávolítása\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Ha a FÁJL a -, akkor a szabványos bemenetet olvassa. A MINTA lehet:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 +#, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2742,7 +2794,7 @@ 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" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2753,7 +2805,7 @@ msgstr "" " -d, --delimiter=ELHAT az ELHAT használata a TAB helyett " "mezőelválasztóként\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2767,7 +2819,7 @@ msgstr "" " kivéve ha a -s kapcsoló meg van adva\n" " -n (figyelmen kívül marad)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2776,7 +2828,7 @@ msgstr "" "halmazának\n" " kiegészítése.\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2788,7 +2840,7 @@ msgstr "" " elhatárolójaként, az alapértelmezés a bemenet\n" " elhatárolójának használata\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2800,7 +2852,8 @@ 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:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2808,8 +2861,6 @@ msgid "" " 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 "" "Minden egyes tartomány az alábbiak egyike:\n" "\n" @@ -2822,50 +2873,51 @@ msgstr "" "\n" "Ha a FÁJL nincs megadva vagy -, akkor a szabványos bemenetet olvassa.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "érvénytelen bájt-, karakter- vagy mezőlista" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "a mezők és pozíciók számozása 1-től kezdődik" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "érvénytelen tartomány végpont nélkül: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "érvénytelen csökkenő tartomány" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "a(z) %s bájteltolás túl nagy" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "a(z) %s mezőszám túl nagy" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "csak egy listatípus adható meg" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "az elhatárolónak egyetlen karakternek kell lennie" -#: src/cut.c:787 +#: src/cut.c:786 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:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2873,11 +2925,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:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "a mezőlista hiányzik" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "a pozíciólista hiányzik" @@ -2897,13 +2949,29 @@ msgstr "" "beállítása.\n" #: src/date.c:134 +#, fuzzy +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" +"Az aktuális idő megjelenítése a megadott FORMÁTUMBAN, vagy a rendszerdátum\n" +"beállítása.\n" +"\n" +" -d, --date=KARAKTERLÁNC a KARAKTERLÁNC által leírt dátum megjelenítése\n" +" az aktuális helyett\n" +" -f, --file=DÁTUMFÁJL ugyanaz, mint a --date egyszer a DÁTUMFÁJL " +"minden\n" +" egyes sorára\n" + +#: src/date.c:138 +#, fuzzy msgid "" -" -d, --date=STRING display time described by STRING, not 'now'\n" -" -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -" -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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" " -d, --date=KARAKTERLÁNC a KARAKTERLÁNC által leírt dátum megjelenítése\n" " az aktuális helyett\n" @@ -2915,26 +2983,25 @@ msgstr "" " vagy „hours”, „minutes”, „seconds” vagy „ns” a\n" " jelzett pontosságú dátum és idő kiírásához.\n" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=FÁJL a FÁJL utolsó módosítása dátumának " "megjelenítése\n" " -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:147 +#: src/date.c:149 +#, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=IDŐMEGHAT dátum kiírása RFC 3339 formátumban.\n" " Az IDŐMEGHAT=„date”, „seconds”, vagy „ns”\n" @@ -2945,8 +3012,19 @@ msgstr "" " -u, --utc, --universal a Koordinált világidő kiírása vagy\n" " beállítása\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2959,7 +3037,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:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2972,7 +3050,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:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2984,7 +3062,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:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2994,7 +3072,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:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -3006,7 +3084,7 @@ msgstr "" " %I óra (01..12)\n" " %j az év napja (001..366)\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -3018,7 +3096,7 @@ msgstr "" " %m hónap (01..12)\n" " %M perc (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -3037,7 +3115,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:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3049,7 +3127,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:209 +#: src/date.c:215 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" @@ -3061,7 +3139,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:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3073,7 +3151,7 @@ msgstr "" " %y az év utolsó két számjegye (00..99)\n" " %Y év\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3093,7 +3171,7 @@ msgstr "" "\n" "Alapértelmezésben a date a numerikus mezőket nullákkal tölti ki.\n" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3111,7 +3189,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:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3125,7 +3203,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:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3150,38 +3228,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:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "szabványos bemenet" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "érvénytelen dátum: %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "több kimeneti formátum van megadva" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3192,23 +3270,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:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "nem állítható be a dátum" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, c-format msgid "time %s is out of range" msgstr "a(z)%s időpont kívül esik a tartományon" #. 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 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3217,7 +3295,7 @@ msgstr "" "Használat: %s [OPERANDUS]…\n" " vagy: %s KAPCSOLÓ\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3237,7 +3315,8 @@ msgstr "" " count=N csak N bemeneti blokkot másol\n" " ibs=BÁJT egyszerre BÁJT bájtot olvas be (alapérték: 512)\n" -#: src/dd.c:541 +#: src/dd.c:570 +#, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3246,8 +3325,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=FÁJL olvasás a FÁJLBÓL a szabványos bemenet helyett\n" " iflag=JELÖLŐK olvasás a vesszővel elválasztott szimbólumlistának " @@ -3260,7 +3341,7 @@ msgstr "" " status=MELYIK MELYIK infó elnyomása a szabványos hibakimeneten:\n" " „noxfer”: átviteli statisztika, „none”: minden\n" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3278,7 +3359,7 @@ msgstr "" "A KONV szimbólumok az alábbiak lehetnek:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3308,7 +3389,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:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3324,7 +3405,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:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3338,143 +3419,108 @@ msgstr "" " append hozzáfűzési mód (csak kimenet esetén van értelme; javasolt a\n" " conv=notrunc)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio párhuzamos I/O használata az adatokhoz\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct közvetlen I/O használata az adatokhoz\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory működés csak könyvtárakon\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync szinkronizált I/O használata az adatokhoz\n" -#: src/dd.c:597 +#: src/dd.c:628 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:598 +#: src/dd.c:629 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:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock nem blokkoló I/O használata\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime ne frissítse a hozzáférési időt\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nocache gyorsítótárazott adatok eldobása\n" # fixme -#: src/dd.c:609 +#: src/dd.c:640 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:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow ne kövesse a szimbolikus linkeket\n" -#: src/dd.c:614 +#: src/dd.c:645 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:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary bináris I/O használata az adatokhoz\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text szöveges I/O használata az adatokhoz\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" " count_bytes a „count=N” bájtszámként kezelése (csak az iflag " "kapcsolóval)\n" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" " skip_bytes a „skip=N” bájtszámként kezelése (csak az iflag kapcsolóval)\n" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" " seek_bytes a „seek=N” bájtszámként kezelése (csak az oflag kapcsolóval)\n" -#: src/dd.c:631 +#: src/dd.c:661 #, 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 "" -"\n" -"Egy %s szignál küldésével egy futó „dd” folyamatnak kiírathatja az\n" -"addig beolvasott és kiírt rekordok számát a szabványos hibakimenetre,\n" -"majd folytathatja a másolást.\n" -"\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ kill -%s $pid; sleep 1; kill $pid\n" -" 18335302+0 beolvasott rekord\n" -" 18335302+0 kiírt rekord\n" -" 9387674624 bájt (9.4 GB) másolva, 34.6279 mp, 271 MB/s\n" -"\n" -"A kapcsolók:\n" -"\n" -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +#: src/dd.c:699 +#, fuzzy, c-format +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "a memóriát elfogyasztotta a %zu bájt hosszú bemeneti puffer (%s)" -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +#: src/dd.c:721 +#, fuzzy, c-format +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "a memóriát elfogyasztotta a %zu bájt hosszú kimeneti puffer (%s)" -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" -"%+% beolvasott rekord\n" -"%+% kiírt rekord\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% levágott rekord\n" -msgstr[1] "% levágott rekord\n" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "% bájt (%s) másolva" msgstr[1] "% bájt (%s) másolva" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "Végtelen B" @@ -3488,83 +3534,100 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g mp, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g mp, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% beolvasott rekord\n" +"%+% kiírt rekord\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% levágott rekord\n" +msgstr[1] "% levágott rekord\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "%s bemeneti fájl lezárása" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "%s kimeneti fájl lezárása" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "az O_DIRECT kikapcsolása meghiúsult: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "írás a következőbe: %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "ismeretlen operandus: %s" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "érvénytelen átalakítás" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "érvénytelen bemeneti jelölő" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "érvénytelen kimeneti jelölő" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "érvénytelen állapotjelölő" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "érvénytelen szám: %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, 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:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "a block és az unblock nem adható meg egyszerre" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "az lcase és az ucase nem adható meg egyszerre" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "az excl és a nocreat nem adható meg egyszerre" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "a direct és a nocache nem adható meg egyszerre" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3574,63 +3637,63 @@ msgstr "" "%s (mt_type=0x%0lx)\n" "A fájlban megtalálod a típusok listáját" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: nem lehet ugrani" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: nem lehet pozicionálni" -#: src/dd.c:1744 +#: src/dd.c:1847 #, 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:1756 +#: src/dd.c:1859 #, 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:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "a kernelhiba nem kerülhető meg" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "%s jelölőinek beállítása" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: nem lehet a megadott eltolásra ugrani" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" "a csonkítás meghiúsult % bájtra a következő kimeneti fájlban: %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "az fdatasync meghiúsult a következőhöz: %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "az fsync meghiúsult a következőhöz: %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "%s megnyitása meghiúsult" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3639,20 +3702,20 @@ msgstr "" "Az eltolás túl nagy: nem lehet seek=% (%lu bájt) blokk\n" "hosszára csonkítani" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" "a csonkítás meghiúsult % bájtra a következő kimeneti fájlban: %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "a következő gyorsítótárának eldobása meghiúsult: %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3733,12 +3796,12 @@ msgstr "Kapacit." msgid "%s-%s" msgstr "%s-%s" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" -msgstr "" +msgstr "%s nem érhető el: egy másik eszköz felülcsatolta" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3748,28 +3811,27 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 #, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -" -a, --all üres fájlrendszereket is listázza\n" -" -B, --block-size=MÉRET MÉRET bájtos blokkok használata kiírás előtt\n" +" -a, --all üres fájlrendszereket is listázza\n" +" -B, --block-size=MÉRET MÉRET bájtos blokkok használata kiírás előtt\n" " Például a „-BM” a méreteket 1,048,576 bájtos\n" -" egységekben írja ki. Lásd a MÉRET formátumot " -"alább\n" -" --total összesítés előállítása\n" -" -h, --human-readable közérthető formátum (például 1K 234M 2G)\n" -" -H, --si ugyanaz mint előbb, de 1000-es szorzó 1024-es " -"helyett\n" +" egységekben írja ki. Lásd a MÉRET formátumot\n" +" alább\n" +" --total összesítés előállítása\n" +" -h, --human-readable méretek kiírása 1024 hatványaként (például 1023M)\n" +" -H, --si méretek kiírása 1000 hatványaként (például 1.1G)\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3784,13 +3846,40 @@ msgstr "" "információk\n" " beolvasása előtt (alapértelmezett)\n" -#: src/df.c:1409 +#: src/df.c:1429 +#, 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" +msgstr "" +" --output[=MEZŐLISTA] a MEZŐLISTA által megadott kimeneti formátum\n" +" használata, vagy minden mező kiírása, " +"ha a MEZŐLISTA hiányzik.\n" +" -P, --portability POSIX kompatibilis kimenet\n" +" --sync kiadja a sync parancsot a használati információk\n" +" beolvasása előtt\n" +" -t, --type=TÍPUS csak az adott TÍPUSÚ fájlrendszereket írja ki\n" +" -T, --print-type fájlrendszertípusok kiírása\n" +" -x, --exclude-type=TÍPUS a megadott TÍPUSÚ fájlrendszereket nem listázza " +"ki\n" +" -v (figyelmen kívül marad)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose diagnosztikai üzenet kiírása minden egyes " +"kimeneti\n" +" fájl megnyitása előtt\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3808,7 +3897,7 @@ msgstr "" "ki\n" " -v (figyelmen kívül marad)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3820,26 +3909,26 @@ msgstr "" "mezőnevek: „source”, „fstype”, „itotal”, „iused”, „iavail”, „ipcent”,\n" "„size”, ”used”, „avail”, „pcent”, „file” és „target” (lásd az info oldalt).\n" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "a(z) %s és %s kapcsolók egymást kölcsönösen kizárják" -#: src/df.c:1610 +#: src/df.c:1636 #, 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:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Figyelmeztetés: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "a csatolt fájlrendszerek táblája nem olvasható" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "nem került feldolgozásra fájlrendszer" @@ -3936,9 +4025,8 @@ msgstr "" "\n" #: src/dirname.c:59 -#, fuzzy msgid " -z, --zero end each output line with NUL, not newline\n" -msgstr " -z, --zero a sorok lezárása a NULL bájttal új sor helyett\n" +msgstr " -z, --zero minden kimeneti sor lezárása NUL-lal új sor helyett\n" #: src/dirname.c:64 #, c-format @@ -3955,7 +4043,7 @@ msgstr "" " %s kvt1/str kvt2/str -> „kvt1” majd „kvt2”\n" " %s stdio.h -> „.”\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3965,11 +4053,12 @@ msgstr "" " vagy: %s [KAPCSOLÓ]… --files0-from=F\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +#, fuzzy +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "Összefoglalja minden FÁJL lemezhasználatát, könyvtárakra rekurzívan.\n" #: src/du.c:291 -#, fuzzy msgid "" " -0, --null end each output line with NUL, not newline\n" " -a, --all write counts for all files, not just directories\n" @@ -3979,8 +4068,7 @@ msgid "" " larger due to holes in ('sparse') files, internal\n" " fragmentation, indirect blocks, and the like\n" msgstr "" -" -0, --null minden egyes új sort a 0 bájttal fejez be új sor " -"helyett\n" +" -0, --null minden kimeneti sor lezárása NUL-lal új sor helyett\n" " -a, --all minden fájl adatait kiírja, nem csak a könyvtárakat\n" " --apparent-size a tényleges méretet írja ki a lemezhasználat " "helyett,\n" @@ -4107,69 +4195,63 @@ msgstr "" msgid "Infinity" msgstr "Végtelen" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "az fts_read sikertelen: %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "érvénytelen maximális mélység: %s" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "érvénytelen --threshold argumentum: „-0”" -#: src/du.c:898 +#: src/du.c:919 #, 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:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, 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:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" "figyelmeztetés: a --apparent-size és -b kapcsolók hatástalanok a --inodes " "megadásakor" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 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:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: olvasási hiba" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "érvénytelen nulla hosszúságú fájlnév" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "összesen" @@ -4280,15 +4362,13 @@ msgstr "" "PARANCSOT.\n" #: src/env.c:61 -#, fuzzy msgid "" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with NUL, not newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" " -i, --ignore-environment indulás üres környezettel\n" -" -0, --null minden kimeneti sor lezárása új sor helyett 0 " -"bájttal\n" +" -0, --null minden kimeneti sor lezárása NUL-lal új sor helyett\n" " -u, --unset=NÉV változó eltávolítása a környezetből\n" #: src/env.c:68 @@ -4317,9 +4397,8 @@ msgid "cannot specify --null (-0) with command" msgstr "a --null (-0) nem adható meg paranccsal együtt" #: 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" +#, fuzzy +msgid "Convert tabs in each FILE to spaces, writing to standard output.\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" @@ -4366,7 +4445,7 @@ msgid "input line is too long" msgstr "a bemeneti sor túl hosszú" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4526,12 +4605,12 @@ msgstr "hiba a szabályos kifejezés illesztésében" msgid "non-integer argument" msgstr "nem egész argumentum" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "osztás nullával" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, 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" @@ -4542,31 +4621,31 @@ msgid "the strings compared were %s and %s" msgstr "az összehasonlított karakterláncok: %s és %s." #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "Niels Moller" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "Lucas prím teszt hiba. Ennek nem lenne szabad megtörténnie" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "squfof sor túlcsordulás" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s nem egy érvényes pozitív egész" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "a(z) %s túl nagy" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4575,7 +4654,7 @@ msgstr "" "Használat: %s [SZÁM]…\n" " vagy: %s KAPCSOLÓ\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -4622,7 +4701,7 @@ msgstr "" "írása.\n" "A -SZÉLESSÉG kapcsoló a --width=SZÉLESSÉG rövidítése.\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4637,7 +4716,7 @@ 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:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4651,7 +4730,7 @@ msgstr "" " -g, --goal=SZÉLESSÉG cél szélessége (alapértelmezés a szélesség 93%-" "a)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4661,21 +4740,20 @@ msgstr "" "az \n" "első kapcsoló; használja helyette a -w N kapcsolót" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "érvénytelen szélesség: %s" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +#, fuzzy +msgid "Wrap input lines in each FILE, writing to standard output.\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" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4685,9 +4763,9 @@ 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:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "érvénytelen oszlopszám: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4760,18 +4838,18 @@ msgstr "a valódi csoportazonosító nem kérhető le" msgid "%s: no such user" msgstr "%s: nincs ilyen felhasználó" -#: src/head.c:109 +#: src/head.c:110 +#, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "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 " "nevét.\n" "Ha a FÁJL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4789,7 +4867,7 @@ msgstr "" "utolsó\n" " N sora kivételével az összeset kiírja\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4797,7 +4875,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:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4809,48 +4887,36 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: a fájl túl sokat zsugorodott" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: a bájtszám túl nagy" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: nem lehet a(z) %s eltolásra pozicionálni" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: nem lehet a(z) %s relatív eltolásra keresni" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "sorok száma" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "bájtok száma" +msgid "%s: number of bytes is too large" +msgstr "%s: a bájtszám túl nagy" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "érvénytelen sorszám" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "érvénytelen bájtszám" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "érvénytelen bevezető kapcsoló -- %c" @@ -4916,7 +4982,6 @@ msgstr "" "\n" #: src/id.c:90 -#, fuzzy msgid "" " -a ignore, for compatibility with other versions\n" " -Z, --context print only the security context of the process\n" @@ -4928,19 +4993,17 @@ msgid "" " -z, --zero delimit entries with NUL characters, not whitespace;\n" " not permitted in default format\n" msgstr "" -" -a figyelmen kívül marad, a más verziókkal való " -"kompatibilitáshoz\n" -" -Z, --context csak a jelenlegi felhasználó biztonsági kontextusának " -"kiírása\n" +" -a mellőzés a más verziókkal való kompatibilitáshoz\n" +" -Z, --context csak a folyamat biztonsági környezetének kiírása\n" " -g, --group csak a hatásos csoportazonosító kiírása\n" " -G, --groups az összes csoportazonosító kiírása\n" " -n, --name egy név kiírása egy szám helyett, az -ugG kapcsolókhoz\n" " -r, --real a valódi azonosító kiírása a hatásos helyett, az -ugG\n" " kapcsolókkal\n" " -u, --user csak a hatásos felhasználói azonosító kiírása\n" -" -z, --zero bejegyzések elválasztása NULL karakterekkel üres helyek " -"helyett;\n" -" nem engedélyezett az alapértelmezett formátumban\n" +" -z, --zero bejegyzések elválasztása NUL karakterekkel üres helyek\n" +" helyett; nem engedélyezett az alapértelmezett " +"formátumban\n" #: src/id.c:103 msgid "" @@ -5046,7 +5109,7 @@ msgstr "%s tulajdonosa nem változtatható meg" msgid "cannot set time stamps for %s" msgstr "%s időbélyegei nem állíthatók be" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "a fork() rendszerhívás sikertelen" @@ -5173,7 +5236,6 @@ msgstr "" " -v, --verbose minden létrehozott könyvtár nevét kiírja\n" #: src/install.c:648 -#, fuzzy msgid "" " --preserve-context preserve SELinux security context\n" " -Z set SELinux security context of destination\n" @@ -5181,11 +5243,12 @@ msgid "" " --context[=CTX] like -Z, or if CTX is specified then set the\n" " SELinux or SMACK security context to CTX\n" msgstr "" -" --preserve-context a SELinux biztonsági kontextus megőrzése\n" -" -Z, --context[=KTX] a célfájl SELinux biztonsági kontextusának " -"beállítása\n" -" az alapértelmezett típusra vagy a megadott KTX-" -"re\n" +" --preserve-context a SELinux biztonsági környezet megőrzése\n" +" -Z a célfájl SELinux biztonsági környezetének\n" +" beállítása az alapértelmezett típusra\n" +" --context[=CTX] mint a -Z, vagy ha a CTX meg van adva, akkor a\n" +" SELinux vagy SMACK biztonsági környezet\n" +" beállítása CTX értékre\n" #: src/install.c:696 src/unlink.c:86 #, c-format @@ -5210,7 +5273,7 @@ msgstr "könyvtár telepítésénél nem használható a „strip” kapcsoló" 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:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "érvénytelen mód: %s" @@ -5251,8 +5314,13 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5273,7 +5341,7 @@ msgstr "" " megfelelően.\n" " -e ÜRES a hiányzó bemeneti mezők helyettesítése az ÜRESSEL\n" -#: src/join.c:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5288,7 +5356,7 @@ msgstr "" " -t KARAKTER a KARAKTER használata a bementi és kimeneti mező\n" " elválasztójaként\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5310,13 +5378,11 @@ msgstr "" " --header minden fájl első sorát mezőfejlécnek tekinti,\n" " ezeket a párosításukra tett kísérlet nélkül írja ki\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 -#, fuzzy +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" -msgstr "" -" -z, --zero-terminated a sorok lezárása a 0 bájttal új sor helyett\n" +msgstr " -z, --zero-terminated a sorok elválasztója NUL, nem új sor\n" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5357,47 +5423,47 @@ msgstr "" "szabályait. Ha a bemenet nincs rendezve, és egyes sorok nem kapcsolhatók\n" "össze, akkor figyelmeztető üzenet jelenik meg.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:%: nincs rendezve: %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "érvénytelen mezőszám: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "érvénytelen mezőmeghatározás: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "érvénytelen mezőszám a mezőspecifikációban: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "inkompatibilis összekapcsolási mezők: %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "ütköző üres-mező helyettesítési karakterlánc" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "többkarakteres tab: %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "nem kompatibilis tabok" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "mindkét fájl nem lehet a szabványos bemenet" @@ -5474,17 +5540,17 @@ msgstr "a szignál nem kombinálható a -l vagy -t kapcsolóval" msgid "no process ID specified" msgstr "nincs megadva folyamatazonosító" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "nem sikerült % bájt szabványos kimeneti puffert foglalni\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "a pufferelési mód (%s) a következőhöz: %s\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "nem állítható be %s pufferelése %s módra\n" @@ -5683,7 +5749,7 @@ msgstr "a --relative nem használható a --symbolic nélkül" msgid "FIXME: unknown" msgstr "FIXME: ismeretlen" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Használat: %s [KAPCSOLÓ]\n" @@ -5696,7 +5762,7 @@ msgstr "" "Az aktuális felhasználó nevének kiírása.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "nincs bejelentkezési név" @@ -5706,7 +5772,7 @@ msgstr "nincs bejelentkezési név" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%Y %b %e" @@ -5715,100 +5781,100 @@ msgstr "%Y %b %e" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H.%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" -"a QUOTING_STYLE környezeti változóban megadott érvénytelen érték\n" -"figyelmen kívül hagyása: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "" "a COLUMNS környezeti változóban megadott érvénytelen szélesség\n" "figyelmen kívül hagyása: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "a TABSIZE környezeti változóban megadott érvénytelen tabulátorméret\n" "figyelmen kívül hagyása: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "érvénytelen sorhossz: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "érvénytelen tabulátorméret: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "érvénytelen időformátum stílus: %s" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "Az érvényes argumentumok a következők:\n" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr " - +FORMÁTUM (pl.: +%H:%M) a „date”-stílusú formátumért\n" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "hiba a hónap karakterláncok előkészítésekor" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "ismeretlen előtag: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "az LS_COLORS környezeti változó értéke nem értelmezhető" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" +"a QUOTING_STYLE környezeti változóban megadott érvénytelen érték\n" +"figyelmen kívül hagyása: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "nem lehet a következő könyvtárat megnyitni: %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "%s eszközét és inode-ját nem lehet megállapítani" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: a már listázott könyvtár nem kerül listázásra" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "%s könyvtár olvasása" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "%s könyvtár bezárása" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "%s és %s fájlnevek nem hasonlíthatók össze" -#: src/ls.c:4781 +#: src/ls.c:4775 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" @@ -5817,7 +5883,7 @@ msgstr "" "Ábécé sorrendbe rendezi a bejegyzéseket, ha nincs megadva a -cftuvSUX\n" "vagy a --sort kapcsolók valamelyike.\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5832,7 +5898,7 @@ msgstr "" " -b, --escape C-stílusú escape karaktereket jelenít meg\n" " a nem-grafikus karakterek helyett\n" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5858,12 +5924,14 @@ msgstr "" " szerint, egyébként: rendezés ctime szerint,\n" " legújabb előre\n" -#: src/ls.c:4804 +#: src/ls.c:4798 +#, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5876,7 +5944,7 @@ msgstr "" " -d, --directory könyvtár listázása a könyvtár tartalma helyett\n" " -D, --dired az Emacs dired módjához tervezett kimenet\n" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5898,11 +5966,11 @@ msgstr "" " vertical: -C\n" " --full-time mint a -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 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:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5916,8 +5984,7 @@ msgstr "" " --sort=none (-U) használata letiltja a\n" " csoportosítást\n" -#: src/ls.c:4829 -#, fuzzy +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5926,11 +5993,13 @@ msgid "" msgstr "" " -G, --no-group hosszú felsorolásnál nem írja ki a " "csoportneveket\n" -" -h, --human-readable közérthető formátum (például 1K 234M 2G)\n" -" -H, --si ugyanaz mint előbb, de a szorzó 1024 helyett " -"1000\n" +" -h, --human-readable -l és/vagy -s kapcsolóval közérthető formában\n" +" írja ki a méreteket (például 1K 234M 2G)\n" +" -H, --si hasonlóképpen, de 1000 hatványát használja " +"1024\n" +" helyett\n" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5953,7 +6022,7 @@ msgstr "" "illeszkedő\n" " bejegyzéseket (a -a vagy -A felülbírálja)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5974,7 +6043,7 @@ msgstr "" " -k, --kibibytes alapesetben 1024 bájtos blokkok " "lemezhasználathoz\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5991,7 +6060,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:4863 +#: src/ls.c:4858 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. " @@ -6011,7 +6080,7 @@ msgstr "" " -p, --indicator-style=slash\n" " egy / jelet fűz a könyvtárakhoz\n" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -6032,7 +6101,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -6043,18 +6112,19 @@ 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:4886 +#: src/ls.c:4881 +#, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S rendezés fájlméret alapján\n" " --sort=SZÓ rendezés a SZÓ szerint a név helyett: none (-" @@ -6070,7 +6140,7 @@ msgstr "" " status (-c); a megadott idő alapján rendez,\n" " ha a --sort=time kapcsoló meg van adva\n" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -6097,7 +6167,7 @@ msgstr "" " csak a POSIX területi beállításokon kívül\n" " lép életbe.\n" -#: src/ls.c:4908 +#: src/ls.c:4904 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -6106,11 +6176,12 @@ msgstr "" "előre\n" " -T, --tabsize=OSZL tabulátor minden OSZL-nál, 8 helyett\n" -#: src/ls.c:4912 +#: src/ls.c:4908 +#, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -6125,24 +6196,26 @@ msgstr "" " -v rendezés a szövegben lévő (verzió)számok " "szerint\n" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" -" -w, --width=OSZL feltételezi, hogy a képernyő OSZL széles\n" -" -x a bejegyzéseket soronként, és nem oszloponként\n" -" listázza\n" -" -X ábécé sorba rendez, kiterjesztés szerint\n" -" -Z, --context az egyes fájlok teljes SELinux biztonsági\n" -" kontextusának kiírása\n" -" -1 soronként egy fájlnevet ír ki\n" +" -w, --width=OSZL OSZL képernyőszélesség feltételezése a\n" +" jelenlegi érték helyett\n" +" -x bejegyzések listázása soronként oszloponkénti\n" +" listázás helyett\n" +" -X ábécé sorba rendezés kiterjesztés szerint\n" +" -Z, --context az egyes fájlok bármely SELinux biztonsági\n" +" környezetének kiírása\n" +" -1 soronként egy fájl listázása\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6158,7 +6231,7 @@ msgstr "" "változóval módosíthatók a beállítások, ehhez a dircolors parancs " "használható.\n" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6189,53 +6262,56 @@ msgid "David Madore" msgstr "David Madore" #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" "Használat: %s [KAPCSOLÓ]… [FÁJL]…\n" "%s (%d bites) ellenőrzőösszegek kiírása vagy ellenőrzése.\n" "Ha a FÁJL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" " -b, --binary olvasás bináris módban (alapértelmezett, ha nem\n" " terminál szabványos bemenetet olvas)\n" -#: src/md5sum.c:178 -msgid " -b, --binary read in binary mode\n" +#: src/md5sum.c:180 +#, fuzzy +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary bináris módú olvasás\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr " --tag BSD-stílusú ellenőrzőösszeg létrehozása\n" -#: src/md5sum.c:188 +#: src/md5sum.c:191 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:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text olvasás szöveges módban (alapértelmezett)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -6256,14 +6332,15 @@ msgstr "" " ellenőrzőösszeg-sorokra\n" "\n" -#: src/md5sum.c:206 -#, c-format +#: src/md5sum.c:209 +#, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "Az összegek a(z) %s által leírt módon kerülnek kiszámításra.\n" @@ -6272,88 +6349,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:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: túl sok ellenőrzőösszeg-sor" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: nem megfelelően formázott %s ellenőrzőösszeg-sor" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: a megnyitás vagy olvasás meghiúsult\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "HIBÁS" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "RENDBEN" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, 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:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "FIGYELMEZTETÉS: % sor nem megfelelően formázott" msgstr[1] "FIGYELMEZTETÉS: % sor nem megfelelően formázott" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "FIGYELMEZTETÉS: % felsorolt fájl nem olvasható" msgstr[1] "FIGYELMEZTETÉS: % felsorolt fájl nem olvasható" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "FIGYELMEZTETÉS: % számított ellenőrzőösszeg NEM egyezett" msgstr[1] "FIGYELMEZTETÉS: % számított ellenőrzőösszeg NEM egyezett" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "a --tag nem támogatja a --text módot" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "a --tag kapcsoló értelmetlen ellenőrzőösszegek ellenőrzésekor" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, 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:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "a --strict kapcsoló csak ellenőrzőösszegek ellenőrzésekor értelmes" @@ -6368,20 +6445,15 @@ 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:65 -#, fuzzy msgid "" " -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" " -p, --parents no error if existing, make parent directories as needed\n" " -v, --verbose print a message for each created directory\n" msgstr "" -" -m, --mode=MÓD fájlmód beállítása, (mint a chmod), nem a=rwx - umask\n" -" -p, --parents könyvtárstruktúrát hoz létre. Nem ad hibát, ha már " -"létezik\n" -" -v, --verbose üzenetet ír ki minden egyes létrehozott könyvtárhoz\n" -" -Z, --context[=KTX] minden létrehozott könyvtár SELinux biztonsági\n" -" kontextusának beállítása az alapértelmezett " -"típusra,\n" -" vagy ha meg van adva, a KTX-re\n" +" -m, --mode=MÓD fájlmód beállítása (mint a chmod), nem a=rwx - umask\n" +" -p, --parents nincs hiba, ha létezik, szülőkönyvtárak létrehozása\n" +" szükség szerint\n" +" -v, --verbose üzenet kiírása minden egyes létrehozott könyvtárhoz\n" #: src/mkdir.c:70 msgid "" @@ -6391,24 +6463,30 @@ msgid "" " --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n" " or SMACK security context to CTX\n" msgstr "" +" -Z minden egyes létrehozott könyvtár SELinux biztonsági\n" +" környezetének beállítása az alapértelmezett " +"típusra\n" +" --context[=CTX] mint a -Z, vagy ha a CTX meg van adva, akkor a\n" +" SELinux vagy SMACK biztonsági környezet beállítása\n" +" CTX értékre\n" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "" "az alapértelmezett létrehozási kontextus beállítása meghiúsult ehhez: %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" msgstr "%s kontextusának visszaállítása meghiúsult" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "%s könyvtár létrejött" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6437,6 +6515,11 @@ msgid "" " --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n" " or SMACK security context to CTX\n" msgstr "" +" -Z a SELinux biztonsági környezet beállítása az\n" +" alapértelmezett típusra\n" +" --context[=CTX] mint a -Z, vagy ha a CTX meg van adva, akkor a\n" +" SELinux vagy SMACK biztonsági környezet beállítása\n" +" CTX értékre\n" #: src/mkfifo.c:153 src/mknod.c:150 #, c-format @@ -6624,7 +6707,7 @@ msgstr "túl sok sablon" 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:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "a(z) %s utótag érvénytelen, könyvtárelválasztót tartalmaz" @@ -6767,9 +6850,8 @@ msgid "Scott Bartram" msgstr "Scott Bartram" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, with line numbers added.\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" @@ -6884,27 +6966,27 @@ msgstr "érvénytelen törzsszámozási stílus: %s" msgid "invalid footer numbering style: %s" msgstr "érvénytelen láblécszámozási stílus: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "érvénytelen kezdősorszám: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "érvénytelen sorszámnövekmény: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "érvénytelen üressorszám: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "érvénytelen sorszámmező szélesség: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "érvénytelen sorszámozási formátum: %s" @@ -6928,10 +7010,10 @@ msgstr "" "\n" #: src/nohup.c:65 -#, c-format +#, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6951,48 +7033,48 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "a szabványos hibakimenet használhatatlanná tétele meghiúsult" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "bemenet figyelmen kívül hagyása" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "" "bemenet figyelmen kívül hagyása és kimenet hozzáfűzése a következőhöz: %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "kimenet hozzáfűzése a következőhöz: %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" "a szabványos hibakimenet másolatának beállítása meghiúsult „bezárás\n" "végrehajtáskor” módra" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" "bemenet figyelmen kívül hagyása és a szabványos hibakimenet átirányítása\n" "a szabványos kimenetre" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "a szabványos hibakimenet átirányítása a szabványos kimenetre" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -7019,57 +7101,52 @@ 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: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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "Assaf Gordon" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "az érték túl nagy az átalakításhoz: %s" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, c-format msgid "invalid number: %s" msgstr "érvénytelen szám: %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "utótag visszautasítása a bemenetben: %s (használja a --from kapcsolót)" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" msgstr "érvénytelen utótag a bemenetben: %s" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "hiányzó „i” utótag a bemenetben: %s (pl. Ki/Mi/Gi)" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "a(z) „%Lf” érték előkészítése kiírásra meghiúsult" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, c-format msgid "invalid unit size: %s" msgstr "érvénytelen egységméret: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Használat: %s [KAPCSOLÓ]… [SZÁM]…\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" @@ -7077,24 +7154,27 @@ msgstr "" "A SZÁMOK, vagy ha nincs megadva a szabványos bemenet számainak " "újraformázása.\n" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" " --debug figyelmeztetések kiírása érvénytelen bemenetről\n" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" " -d, --delimiter=X az X használata üreshely helyett mezőhatárolóként\n" -#: src/numfmt.c:827 +#: src/numfmt.c:893 +#, fuzzy msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" " --field N a szám helyettesítése az N. bemeneti mezőben (alap=1)\n" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" @@ -7102,7 +7182,7 @@ msgstr "" " --format=FORMÁTUM printf stílusú lebegőpontos FORMÁTUM használata.\n" " Részletekért lásd a FORMÁTUMOT alább.\n" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" @@ -7111,14 +7191,14 @@ msgstr "" " --from=EGYSÉG a bemeneti számok automatikus átszámolása EGYSÉGEKRE.\n" " Alapértelmezett: „none”. Lásd alább az EGYSÉG leírását.\n" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" " --from-unit=N a bemeneti egység méretének megadása (az alap 1 helyett).\n" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -7129,7 +7209,7 @@ msgstr "" " A területi beállítástól függő csoportosítást használja\n" " (azaz nincs hatása C/POSIX locale esetén.\n" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" @@ -7137,7 +7217,7 @@ msgstr "" " --header[=N] az első N fejlécsor kiírása (konvertálás nélkül).\n" " Az N alapértelmezett értéke 1, ha nincs megadva.\n" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" @@ -7145,7 +7225,7 @@ msgstr "" " --invalid=MÓD hibamód érvénytelen számokhoz: a MÓD lehet:\n" " abort (alapértelmezés), fail, warn, ignore.\n" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -7161,7 +7241,7 @@ msgstr "" " figyelmen kívül marad. Az alapértelmezés az automatikus\n" " kitöltés, ha a kimenetben van üreshely.\n" -#: src/numfmt.c:860 +#: src/numfmt.c:927 msgid "" " --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" " up, down, from-zero (default), towards-zero, " @@ -7172,7 +7252,7 @@ msgstr "" " értékek: up, down, from-zero (alap), towards-zero, " "nearest\n" -#: src/numfmt.c:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" @@ -7181,19 +7261,19 @@ msgstr "" "UTÓTAG\n" " elfogadása a bemeneti számokban.\n" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" " --to=EGYSÉG kimeneti számok automatikus átszámolása EGYSÉGRE.\n" " Lásd alább az EGYSÉG leírását.\n" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr " --to-unit=N a kimeneti egység mérete (az alap 1 helyett).\n" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" @@ -7201,13 +7281,13 @@ msgstr "" "\n" "EGYSÉG beállításai:\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" " none Nincs automatikus átszámolás. Az utótagok használata hibát " "okoz.\n" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -7221,7 +7301,7 @@ msgstr "" " 1M = 1000000\n" " 1Mi = 1048576\n" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -7233,7 +7313,7 @@ msgstr "" " 1M = 1000000\n" " ...\n" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7245,7 +7325,7 @@ msgstr "" " 1M = 1048576\n" " ...\n" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7257,7 +7337,30 @@ msgstr "" " 1Mi = 1048576\n" " ...\n" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Minden egyes tartomány az alábbiak egyike:\n" +"\n" +" N N. bájt, karakter vagy mező, 1-től számítva\n" +" N- az N. bájttól, karaktertől vagy mezőtől, a sor végéig\n" +" N-M az N. bájttól, karaktertől vagy mezőtől, az M.-ig (azt is " +"beleértve)\n" +" -M az első bájttól, karaktertől vagy mezőtől az M.-ig (azt is " +"beleértve)\n" +"\n" +"Ha a FÁJL nincs megadva vagy -, akkor a szabványos bemenetet olvassa.\n" + +#: src/numfmt.c:983 #, fuzzy, c-format msgid "" "\n" @@ -7266,18 +7369,20 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" "\n" "A FORMÁTUMNAK meg kell felelnie egy lebegőpontos „%f” argumentum " "kiírásához.\n" -"Az elhagyható idézőjel (%'f) bekapcsolja a --grouping kapcsolót (ha a " -"területi\n" -"beállítás támogatja).\n" +"Az elhagyható idézőjel (%'f) be fogja kapcsolni a --grouping kapcsolót (ha " +"a\n" +"jelenlegi területi beállítás támogatja).\n" "Az elhagyható szélességérték (%10f) kitölti a kimenetet. Az elhagyható " -"negatív\n" -"szélességértékek (%-10f) balról töltik ki a kimenetet.\n" +"nulla\n" +"(%010f) szélesség nullával tölti ki a számot. Az elhagyható negatív értékek\n" +"(%-10f) balra fognak igazítani.\n" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7300,8 +7405,8 @@ msgstr "" "felismerésre,\n" "és a kilépési állapot 0 lesz.\n" -#: src/numfmt.c:922 -#, c-format +#: src/numfmt.c:1000 +#, fuzzy, c-format msgid "" "\n" "Examples:\n" @@ -7315,8 +7420,8 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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 "" @@ -7337,116 +7442,126 @@ msgstr "" " $ ls -lh | %s --header --field 5 --from=iec --padding=10\n" " $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n" -#: src/numfmt.c:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "a formátum (%s) nem tartalmaz %% direktívát" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "érvénytelen formátum: %s (szélesség-túlcsordulás)" -#: src/numfmt.c:1008 -#, c-format -msgid "--format padding overridding --padding" -msgstr "" +#: src/numfmt.c:1085 +#, fuzzy, c-format +msgid "--format padding overriding --padding" +msgstr "a --format kitöltés felülírja a --padding kapcsolót" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "a formátum (%s) vége %%" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "érvénytelen pontosság: %s" + +#: src/numfmt.c:1126 #, fuzzy, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" "érvénytelen formátum: %s, a direktívának a következők egyikének kell lennie: " -"%%['][-][N]f" +"%%[0]['][-][N]f" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "a formátum (%s) túl sok %% direktívát tartalmaz" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, c-format msgid "invalid suffix in input %s: %s" msgstr "érvénytelen utótag a(z) %s bemenetben: %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, fuzzy, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "az érték túl nagy a kiíráshoz: „%Lg” (használja a --to kapcsolót)" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "az érték túl nagy a kiíráshoz: „%Lg” (használja a --to kapcsolót)" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "az érték túl nagy a kiíráshoz: „%Lg” (nem kezelhetők > 999Y értékek)" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "nagy bemeneti érték: %s: a pontosság csökkenhet" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" -"a bemeneti sor túl rövid, nem találhatók konvertálandó számok a(z) %ld. " -"mezőben" +msgid "invalid field value %s" +msgstr "érvénytelen mezőérték: %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, c-format msgid "invalid padding value %s" msgstr "érvénytelen kitöltési érték: %s" -#: src/numfmt.c:1417 -#, c-format -msgid "invalid field value %s" -msgstr "érvénytelen mezőérték: %s" +#: src/numfmt.c:1646 +#, fuzzy, c-format +msgid "multiple field specifications" +msgstr "%s: érvénytelen mezőspecifikáció: %s" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, c-format msgid "invalid header value %s" msgstr "érvénytelen fejlécérték: %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "a --grouping nem kombinálható a --format kapcsolóval" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "nem adott meg konverziós kapcsolót" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "a --grouping nem kombinálható a --to kapcsolóval" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "a csoportosításnak nincs hatása ezen területi beállításban" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "a --header figyelmen kívül marad parancssori bemenet esetén" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "hiba a bemenet olvasása közben" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "nem sikerült néhány bemeneti szám átalakítása" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7459,14 +7574,13 @@ msgstr "" " vagy: %s --traditional [KAPCSOLÓ]… [FÁJL] [[+]ELTOLÁS[.][b]\n" " [+][CÍMKE][.][b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "A FÁJL egy egyértelmű ábrázolásának kiírása, alapértelmezetten oktális\n" @@ -7476,8 +7590,10 @@ msgstr "" "Ha a FÁJL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 +#, 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" @@ -7495,8 +7611,7 @@ msgstr "" "jelez;\n" "az utótagok a . (oktális) és b (szorzás 512-vel) lehetnek.\n" -#: src/od.c:344 -#, fuzzy +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7508,9 +7623,11 @@ msgstr "" " [doxn] egyike: decimális, oktális, hexa " "vagy\n" " nincs\n" +" --endian={big|little} a bemeneti bájtok felcserélése a megadott\n" +" sorrend szerint\n" " -j, --skip-bytes=BÁJT BÁJT darab bemeneti bájt kihagyása először\n" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -7534,7 +7651,7 @@ msgstr "" " --traditional argumentumok elfogadása a hagyományos " "formában\n" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -7555,7 +7672,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:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7571,7 +7688,7 @@ 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:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -7586,7 +7703,7 @@ msgstr "" "hagyása\n" " c nyomtatható karakter vagy visszaper escape\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7600,7 +7717,7 @@ msgstr "" " u[MÉRET] előjel nélküli decimális, MÉRET bájt egészenként\n" " x[MÉRET] hexadecimális, MÉRET bájt egészenként\n" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -7614,7 +7731,7 @@ 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:401 +#: src/od.c:404 msgid "" "\n" "Adding a z suffix to any type displays printable characters at the end of\n" @@ -7625,7 +7742,7 @@ msgstr "" "megjelennek\n" "a kimeneti sorok végén.\n" -#: src/od.c:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -7649,12 +7766,12 @@ msgstr "" " M 1024*1024\n" "és ugyanígy a G, T, P, E, Z, Y esetén.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "érvénytelen típus-karakterlánc: %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7663,7 +7780,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:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7672,37 +7789,37 @@ msgstr "" "érvénytelen típus-karakterlánc: %s\n" "ez a rendszer nem biztosít %lu bájtos lebegőpontos típust" -#: src/od.c:869 +#: src/od.c:872 #, 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:1094 +#: src/od.c:1105 #, 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:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, 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:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "a kompatibilitási mód legfeljebb egy fájlt támogat" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "a kihagyandó és beolvasandó bájtok összege túl nagy" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "" @@ -7719,10 +7836,10 @@ 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" msgstr "" "Az egyes FÁJLOK sorozatban megfelelő soraiból álló sorok kiírása a\n" "szabványos kimenetre, tabokkal elválasztva.\n" @@ -7868,12 +7985,12 @@ msgstr "Mikor" msgid "Where" msgstr "Hol" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Használat: %s [KAPCSOLÓ]… [FELHASZNÁLÓ]…\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7894,7 +8011,7 @@ msgstr "" " -s rövid formátumú kimenet előállítása, ez az " "alapértelmezett\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7910,7 +8027,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:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -7921,7 +8038,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:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7929,94 +8046,94 @@ msgstr "" "a -l használatakor" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "„--pages=ELSŐ_OLDAL[:UTOLSÓ_OLDAL]” hiányzó argumentum" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "érvénytelen oldaltartomány: %s" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "„-l OLDALHOSSZ” érvénytelen sorszám: %s" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "„-N SZÁM” érvénytelen kezdő sorszám: %s" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "„-o MARGÓ” érvénytelen soreltolás: %s" -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "„-w OLDAL_SZÉLESSÉG” érvénytelen karakterszám: %s" -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "„-W OLDAL_SZÉLESSÉG” érvénytelen karakterszám: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, 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:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "az oldalszélesség túl keskeny" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "a(z) % kezdő oldalszám meghaladja a(z) % oldalszámot" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "oldalszám-túlcsordulás" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "%. oldal" -#: src/pr.c:2757 +#: src/pr.c:2727 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" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -8034,7 +8151,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:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -8050,7 +8167,7 @@ msgstr "" " -d, --double-space\n" " a kimenet dupla kitöltése\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -8072,7 +8189,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:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -8097,11 +8214,25 @@ msgstr "" " nincs oszlopigazítás, a --sep-string[=KARAKTERLÁNC]\n" " beállítja az elválasztókat\n" -#: src/pr.c:2798 +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l, --length=OLDALHOSSZ\n" +" beállítja az oldalhosszúságot OLDALHOSSZ (66) sorra\n" +" (a szövegsorok alapértelmezett száma 56, és a -F esetén " +"63)\n" +" -m, --merge az összes fájl párhuzamos nyomtatása, egyet minden\n" +" oszlopba, a sorokat csonkítja, de a teljes hosszúságú\n" +" sorokat a -J használatakor összekapcsolja\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -8113,7 +8244,7 @@ msgstr "" " oszlopba, a sorokat csonkítja, de a teljes hosszúságú\n" " sorokat a -J használatakor összekapcsolja\n" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -8131,7 +8262,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:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -8147,8 +8278,7 @@ msgstr "" " -r, --no-file-warnings\n" " figyelmeztetés kihagyása, ha egy fájl nem nyitható meg\n" -#: src/pr.c:2820 -#, fuzzy +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -8159,21 +8289,21 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" " -s[KARAKTER],--separator[=KARAKTER]\n" -" az oszlopok elválasztása egyetlen KARAKTERREL, az\n" -" alapértelmezés a karakter a -w nélkül és „semmi”\n" +" oszlopok elválasztása egyetlen karakterrel, a KARAKTER\n" +", alapértelmezetten karakter a -w nélkül és " +"„semmi”\n" " a -w esetén. A -s[KARAKTER] kikapcsolja a sorcsonkítást\n" -" mind a 3 oszlopkapcsolóhoz (-OSZLOP|-a -OSZLOP|-m), " -"kivéve\n" -" ha a -w be van állítva\n" +" mind a 3 oszlopkapcsolóhoz (-OSZLOP|-a -OSZLOP|-m),\n" +" kivéve ha a -w be van állítva\n" -#: src/pr.c:2828 +#: src/pr.c:2802 +#, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -S[KARAKTERLÁNC], --sep-string[=KARAKTERLÁNC]\n" " az oszlopok elválasztása a KARAKTERLÁNCCAL,\n" @@ -8183,7 +8313,13 @@ msgstr "" " nincs hatással az oszlopkapcsolókra\n" " -t, --omit-header oldalfejlécek és befejezők kihagyása\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -8209,7 +8345,7 @@ msgstr "" " karakterre, csak több szöveges oszlopot tartalmazó\n" " kimenethez, az s[karakter] kikapcsolja (72)\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -8224,16 +8360,6 @@ msgstr "" "s\n" " kapcsolókkal\n" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"A -t következik, ha az OLDALHOSSZ <= 10. Ha a FÁJL nincs megadva, vagy -, " -"akkor a szabványos bemenetet olvassa.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -8248,9 +8374,8 @@ msgstr "" "\n" #: src/printenv.c:69 -#, fuzzy msgid " -0, --null end each output line with NUL, not newline\n" -msgstr " -0, --null a sorok lezárása a 0 bájttal új sor helyett\n" +msgstr " -0, --null minden kimeneti sor lezárása NUL-lal új sor helyett\n" #: src/printf.c:79 #, c-format @@ -8394,11 +8519,11 @@ msgstr "" "A bemeneti fájlok szavai permutált indexének kiírása a kontextust is " "beleértve.\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 +#, fuzzy 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 automatikusan előállított hivatkozások " "kiírása\n" @@ -8408,6 +8533,12 @@ msgstr "" #: src/ptx.c:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -8421,7 +8552,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:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8441,7 +8572,7 @@ msgstr "" " -o, --only-file=FÁJL az egyedüli szólista olvasása ebből a " "FÁJLBÓL\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8454,20 +8585,16 @@ msgstr "" " -w, --width=SZÁM a kimenet szélessége oszlopokban, a \n" " hivatkozások kihagyásával\n" -#: src/ptx.c:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Ha a FÁJL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n" -"Alapértelmezett: „-F /”.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "érvénytelen résszélesség: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "érvénytelen sorhossz: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8490,13 +8617,15 @@ msgid "" "\n" "If no option is specified, -P is assumed.\n" msgstr "" +"\n" +"Ha nincs kapcsoló megadva, akkor -P feltételezett.\n" #: src/pwd.c:169 #, c-format msgid "failed to chdir to %s" msgstr "a következő könyvtárba lépés meghiúsult: %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "%s elérése meghiúsult" @@ -8519,8 +8648,8 @@ msgstr "a nem kapcsoló argumentumok figyelmen kívül hagyva" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Használat: %s [KAPCSOLÓ]… FÁJL…\n" @@ -8557,7 +8686,6 @@ 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 " @@ -8577,10 +8705,10 @@ msgstr "" " az összetevők létezésére tekintet nélkül\n" " -n, --no-newline ne írja ki a záró elhatárolót\n" " -q, --quiet,\n" -" -s, --silent megszünteti a legtöbb hibaüzenetet\n" +" -s, --silent a legtöbb hibaüzenet kikapcsolása\n" " -v, --verbose hibaüzenetek kiírása\n" -" -z, --zero kimenet elválasztása NULL-lal új sor " -"helyett\n" +" -z, --zero minden kimeneti sor lezárása NUL-lal új sor\n" +" helyett\n" #: src/readlink.c:152 #, c-format @@ -8598,7 +8726,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" @@ -8625,8 +8752,8 @@ msgstr "" "alatti\n" " útvonalakat\n" " -s, --strip, --no-symlinks ne bontsa ki a szimlinkeket\n" -" -z, --zero a kimenet elválasztása új sor helyett NULL-" -"lal\n" +" -z, --zero minden kimeneti sor lezárása NUL-lal új sor\n" +" helyett\n" "\n" #: src/relpath.c:130 @@ -8797,16 +8924,16 @@ msgstr "" "meg a shred parancs használatát.\n" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: rekurzívan eltávolít %zu argumentumot? " msgstr[1] "%s: rekurzívan eltávolít %zu argumentumot? " #: src/rm.c:345 -#, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +#, fuzzy, c-format +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: eltávolít %zu argumentumot? " msgstr[1] "%s: eltávolít %zu argumentumot? " @@ -9033,12 +9160,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "érvénytelen lebegőpontos argumentum: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "a formátum (%s) ismeretlen %%%c direktívát tartalmaz" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -9058,7 +9185,16 @@ 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" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Ha a FÁJL nincs megadva, vagy -, akkor újra a szabványos bemenetre másol.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -9072,7 +9208,7 @@ msgstr "" " -s, --size=N ennyi bájt megsemmisítése (a k, M, G utótagok " "megengedettek)\n" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -9088,11 +9224,10 @@ 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:192 +#: src/shred.c:196 +#, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -9119,7 +9254,7 @@ msgstr "" "lehet.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -9137,7 +9272,7 @@ msgstr "" "hatásossága:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -9159,7 +9294,7 @@ msgstr "" " NFS kiszolgálója\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -9173,7 +9308,7 @@ msgstr "" "* tömörített fájlrendszerek\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -9196,7 +9331,7 @@ msgstr "" "ahogyan az a mount kézikönyvoldalában dokumentálva van (man mount).\n" "\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -9207,128 +9342,128 @@ msgstr "" "vagy egy távoli tükörkiszolgálón. Ezek alapján vissza lehet állítani a\n" "megsemmisített fájlt.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: az fdatasync meghiúsult" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: az fsync meghiúsult" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: nem lehet visszacsévélni" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: %lu/%lu menet (%s)…" -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: írási hiba a következő eltolásnál: %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: az lseek meghiúsult" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: a fájl túl nagy" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: %lu/%lu menet (%s)…%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: %lu/%lu menet (%s)…%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: az elérés meghiúsult" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: érvénytelen fájltípus" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: a fájl mérete negatív" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: hiba a csonkításnál" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: az fcntl meghiúsult" -#: src/shred.c:994 +#: src/shred.c:996 #, 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:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: törlés alatt" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: átnevezve a következőre: %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: az eltávolítás meghiúsult" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: törölve" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: a bezárás meghiúsult" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: az írásra megnyitás meghiúsult" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: érvénytelen menetszám" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "több véletlen forrás van megadva" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: érvénytelen fájlméret" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -9339,13 +9474,12 @@ msgstr "" " vagy: %s -e [KAPCSOLÓ]… [ARG]…\n" " vagy: %s -i LO-HI [KAPCSOLÓ]…\n" -#: src/shuf.c:67 +#: src/shuf.c:68 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" -#: src/shuf.c:73 -#, fuzzy +#: src/shuf.c:75 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 " @@ -9356,50 +9490,48 @@ msgid "" " -r, --repeat output lines can be repeated\n" msgstr "" " -e, --echo minden egyes ARG bemeneti sorként való kezelése\n" -" -i, --input-range=LO-HI a LO és HI közötti számok kezelése bemeneti " +" -i, --input-range=LO-HI LO és HI közötti számok kezelése bemeneti " "sorként\n" " -n, --head-count=SZÁM legfeljebb SZÁM darab sor kiírása\n" -" -o, --output=FÁJL az eredmény kiírása a FÁJLBA a szabványos " -"kimenet\n" +" -o, --output=FÁJL az eredmény kiírása FÁJLBA a szabványos kimenet\n" " helyett\n" " --random-source=FÁJL véletlen bájtok olvasása a FÁJLBÓL\n" " -r, --repeat a kimeneti sorok ismétlődhetnek\n" -" -z, --zero-terminated a sorok lezárása a 0 bájttal az új sor helyett\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "túl sok bemeneti sor" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "több -i kapcsolót adott meg" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "érvénytelen bemeneti tartomány: %s" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "érvénytelen sorszám: %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "több kimeneti fájl van megadva" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "a -e és -i kapcsolók nem kombinálhatók" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" -msgstr "" +msgstr "nincsenek ismétlendő sorok" #: src/sleep.c:44 #, c-format @@ -9425,12 +9557,12 @@ msgstr "" "tart\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "érvénytelen időtartam: %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "a valósidejű óra nem olvasható" @@ -9440,7 +9572,7 @@ 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" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -9448,7 +9580,7 @@ msgstr "" "Rendezési lehetőségek:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9461,7 +9593,7 @@ msgstr "" " vétele\n" " -f, --ignore-case kisbetűk nagybetűkké alakítása\n" -#: src/sort.c:443 +#: src/sort.c:444 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -9473,14 +9605,14 @@ msgstr "" " -M, --month-sort összehasonlítás: (ismeretlen) < „JAN” < … < " "„DEC”\n" -#: src/sort.c:448 +#: src/sort.c:449 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:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9494,7 +9626,7 @@ msgstr "" " -r, --reverse az összehasonlítások eredményének " "megfordítása\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9512,7 +9644,7 @@ msgstr "" " belül\n" "\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -9520,7 +9652,7 @@ msgstr "" "Egyéb kapcsolók:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9529,7 +9661,7 @@ msgstr "" "összefésülése,\n" " többhöz használjon ideiglenes fájlokat\n" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -9545,7 +9677,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:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9563,7 +9695,7 @@ msgstr "" " Ha az F a -, akkor a szabványos bemenetről " "olvas\n" -#: src/sort.c:487 +#: src/sort.c:488 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -9574,7 +9706,7 @@ msgstr "" " -m, --merge a már rendezett fájlok összefésülése; ne " "rendezzen\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9588,7 +9720,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:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9615,7 +9747,7 @@ msgstr "" " -c nélkül csak az elsőt írja ki egy egyenlő\n" " menetből\n" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9648,12 +9780,11 @@ msgstr "" "\n" "A MÉRETET a következő többszöröző utótagok követhetik:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -9669,268 +9800,270 @@ 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:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "várakozás a következőre: %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "A(z) %s [-d] váratlanul befejeződött" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "nem hozható létre ideiglenes fájl itt: %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "a megnyitás meghiúsult" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "az fflush meghiúsult" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "a lezárás meghiúsult" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "nem hozható létre ideiglenes fájl" -#: src/sort.c:1179 +#: src/sort.c:1178 #, 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:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "figyelmeztetés: a(z) %s nem távolítható el" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "érvénytelen --%s argumentum: %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "a minimális --%s argumentum: %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "a --%s %s argumentuma túl nagy" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "a minimális --%s argumentum a jelenlegi rlimittel: %s" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "a párhuzamos rendezések száma nem lehet nulla" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "az elérés meghiúsult" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "az olvasás meghiúsult" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "a karakterlánc-átalakítás sikertelen" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "az átalakítatlan karakterlánc: %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "^ nincs illeszkedés a kulcsra\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, 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:2428 +#: src/sort.c:2427 #, 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:2439 +#: src/sort.c:2438 #, 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:2452 +#: src/sort.c:2451 #, 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:2484 +#: src/sort.c:2483 #, 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:2490 +#: src/sort.c:2489 #, 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:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "az írás meghiúsult" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: rendezetlenség: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "szabványos hibakimenet" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "nem olvasható" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: érvénytelen mezőspecifikáció: %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "a következő kapcsolók inkompatibilisek: „-%s”" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: érvénytelen szám a(z) %s kezdetén" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "érvénytelen szám a „-” után" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "érvénytelen szám a „.” után" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "véletlen karakter a mezőspecifikációban" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "több tömörítőprogram van megadva" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "érvénytelen szám a mező kezdeténél" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "a mezőszám nulla" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "karaktereltolás nulla" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" msgstr "érvénytelen szám a „,” után" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "üres tab" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "nem olvashatók fájlnevek a következőből: %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, 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:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "nincs bemenet ebből: %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "%s rendezési szabályok használata" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "egyszerű bájt-összehasonlítás használata" -#: src/sort.c:4699 +#: src/sort.c:4698 #, 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:186 -#, c-format -msgid "the suffix length needs to be at least %zu" +#: src/split.c:207 +#, fuzzy, c-format +msgid "the suffix length needs to be at least %" msgstr "az utótag hossza legalább %zu kell legyen" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Használat: %s [KAPCSOLÓ]… [BEMENET [ELŐTAG]]\n" -#: src/split.c:207 +#: src/split.c:228 +#, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\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" "„x”. Ha a BEMENET nincs megadva, vagy -, akkor a szabványos bemenetet " "olvassa.\n" -#: src/split.c:215 -#, c-format +#: src/split.c:236 +#, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file names\n" " -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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" " -a, --suffix-length=N N hosszúságú utótagok használata (alapértelmezett: " @@ -9952,7 +10085,7 @@ msgstr "" " -u, --unbuffered bemenet azonnali kimenetre másolása a „-n r/...”\n" " használatával\n" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9961,16 +10094,17 @@ msgstr "" "kimeneti\n" " fájl megnyitása előtt\n" -#: src/split.c:235 +#: src/split.c:258 +#, fuzzy 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" "\n" "A DARABOK lehet:\n" @@ -9982,191 +10116,196 @@ 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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "a kimenetifájl-utótagok elfogytak" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "%s fájl létrehozása\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "%s felülírná a bemenetet, megszakítás" -#: src/split.c:390 +#: src/split.c:444 #, 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:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "végrehajtás a FÁJL=%s használatával\n" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "az adatcsatorna létrehozása meghiúsult" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "korábbi adatcsatorna bezárása" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "kimeneti adatcsatorna lezárása" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "bemeneti adatcsatorna mozgatása" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "bemeneti adatcsatorna lezárása" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "a parancs futtatása meghiúsult: „%s -c %s”" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "a bemeneti adatcsatorna bezárása meghiúsult" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "várakozás a gyermekfolyamatra" -#: src/split.c:473 +#: src/split.c:527 #, 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:481 +#: src/split.c:535 #, 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:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "ismeretlen állapot a parancstól (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "egynél több módon nem lehet darabolni" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: a darabok száma érvénytelen" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: érvénytelen darabszám" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: érvénytelen utótaghossz" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: érvénytelen bájtszám" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: érvénytelen sorszám" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "többkarakteres tab: %s" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "multiplexelt speciális karakterfájl" -#: src/split.c:1286 +#: src/split.c:1383 #, 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:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: érvénytelen kezdőérték a numerikus utótaghoz" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: érvénytelen IO-blokkméret" -#: src/split.c:1347 +#: src/split.c:1437 #, 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:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "a numerikus utótag kezdőértéke túl nagy az utótag hosszához" -#: src/split.c:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "%s kanonikalizálása meghiúsult" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "figyelmeztetés: fel nem ismert védés „\\%c”" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: érvénytelen direktíva" -#: src/stat.c:1231 +#: src/stat.c:1234 #, 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:1262 +#: src/stat.c:1265 #, 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:1269 +#: src/stat.c:1272 #, 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:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -10182,7 +10321,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -10192,30 +10331,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "Kontextus: %C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -10227,11 +10366,11 @@ msgstr "" " Változás: %z\n" " Születés: %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "Kijelzi a fájl vagy fájlrendszer állapotát.\n" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" @@ -10239,7 +10378,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:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -10257,7 +10396,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:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -10277,7 +10416,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:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -10293,7 +10432,7 @@ msgstr "" " %g a tulajdonos csoportazonosítója\n" " %G a tulajdonos csoportneve\n" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -10317,8 +10456,7 @@ msgstr "" " %T minor eszköztípus hexadecimálisan, a karakteres/blokkos " "eszközfájlokhoz\n" -#: src/stat.c:1461 -#, fuzzy +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -10345,7 +10483,7 @@ msgstr "" " %Z utolsó változtatás ideje az Epoch óta eltelt másodpercekként\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -10363,7 +10501,7 @@ msgstr "" " %d szabad fájlcsomópontok a fájlrendszeren\n" " %f szabad blokkok a fájlrendszeren\n" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -10438,11 +10576,11 @@ msgstr "" "méretű puffer használatával.\n" #: src/stdbuf.c:116 +#, fuzzy msgid "" "\n" "NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" -"for e.g.) then that will override corresponding settings changed by " -"'stdbuf'.\n" +"for example) then that will override corresponding changes 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 "" @@ -10472,7 +10610,7 @@ msgstr "a szabványos bemenet sorpufferelése értelmetlen" msgid "you must specify a buffering mode option" msgstr "meg kell adnia egy pufferelésimód-beállítást" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10483,11 +10621,11 @@ 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:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "A terminál jellemzőinek kiírása vagy megváltoztatása.\n" -#: src/stty.c:528 +#: src/stty.c:536 msgid "" " -a, --all print all current settings in human-readable form\n" " -g, --save print all current settings in a stty-readable form\n" @@ -10501,7 +10639,7 @@ msgstr "" " -F, --file=ESZKÖZ a megadott ESZKÖZ használata a szabványos bemenet " "helyett\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10512,11 +10650,24 @@ 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:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -10528,9 +10679,13 @@ 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:547 -msgid "" -" * eol2 CHAR alternate CHAR for ending the line\n" +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy +msgid "" " 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" @@ -10540,36 +10695,58 @@ 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:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" msgstr "" -" * lnext KAR a KAR hatására a következő karakter idézőjelek között kerül\n" -" bevitelre\n" -" quit KAR a KAR egy kilépési szignált fog küldeni\n" -" * 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:559 +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 KAR a KAR leállítja a kimenetet\n" " susp KAR a KAR egy terminál leállítása szignált küld\n" " * 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:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 +#, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Speciális beállítások:\n" +" N beállítja a bemeneti és kimeneti sebességeket N baudra\n" +" * cols N közli a kernellel, hogy a terminál N oszloppal rendelkezik\n" +" * columns N ugyanaz, mint a cols N\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -10579,11 +10756,18 @@ msgstr "" " * cols N közli a kernellel, hogy a terminál N oszloppal rendelkezik\n" " * columns N ugyanaz, mint a cols N\n" +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + # fixme line discipline??? -#: src/stty.c:572 +#: src/stty.c:627 +#, fuzzy 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" @@ -10595,11 +10779,23 @@ msgstr "" " befejezett olvasáshoz\n" " ospeed N beállítja a kimeneti sebességet N-re\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N közli a kernellel, hogy a terminál N sorral rendelkezik\n" +" * size kiírja a sorok és oszlopok számát a kernellel összhangban\n" +" speed kiírja a terminál sebességét\n" +" time N az -icanon használatakor beállítja az olvasási időtúllépést " +"N\n" +" tizedmásodpercre\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -10610,25 +10806,28 @@ msgstr "" "N\n" " tizedmásodpercre\n" -#: src/stty.c:584 +#: src/stty.c:641 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" -"Vezérlőbeállítások:\n" -" [-]clocal modem vezérlőszignálok letiltása\n" -" [-]cread engedélyezi a bemenet fogadását\n" -" * [-]crtscts engedélyezi az RTS/CTS kézfogást\n" -" * [-]cdtrdsr engedélyezi a DTR/DSR kézfogást\n" -" csN beállítja a karakterméretet N bitre, N értéke [5..8] lehet\n" -#: src/stty.c:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 +#, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -10636,7 +10835,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb két stop bit használata karakterenként (egy, ha „-”)\n" " [-]hup egy hangup szignál küldése amikor az utolsó folyamat " @@ -10648,7 +10846,12 @@ msgstr "" " [-]parodd páratlan paritás beállítása (vagy páros, ha „-”)\n" " * [-]cmspar „stick” (jel/szóköz) paritás használata\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -10656,6 +10859,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Bemeneti beállítások:\n" @@ -10664,10 +10868,14 @@ 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:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -10679,15 +10887,25 @@ 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:616 +#: src/stty.c:692 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:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" +" * [-]iutf8 a bemeneti karakterek UTF-8 kódolásának feltételezése\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -10701,62 +10919,83 @@ msgstr "" " [-]parmrk paritáshibák jelölése (egy 255-0 karaktersorozattal)\n" " [-]tandem ugyanaz, mint a [-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Kimeneti beállítások:\n" -" * bsN a backspace késleltetési stílusa, N lehet [0..1]\n" -" * crN a kocsivissza késleltetési stílusa, N lehet [0..3]\n" -" * 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:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" -msgstr "" -" * [-]ocrnl a kocsivissza új sorrá fordítása\n" -" * [-]ofdel delete karakterek használata kitöltéshez null karakterek\n" -" helyett\n" -" * [-]ofill kitöltő karakterek használata időzítés helyett a\n" -" késleltetésekhez\n" -" * [-]olcuc kisbetűs karakterek nagybetűssé alakítása\n" -" * [-]onlcr új sor karakterek kocsivissza - új sorrá alakítása\n" -" * [-]onlret az új sor kocsivisszát hajt végre\n" - -#: src/stty.c:643 -msgid "" -" * [-]onocr do not print carriage returns in the first column\n" -" [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 +msgid "" " * 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 "" -" * [-]onocr ne írjon ki kocsivissza karaktereket az első oszlopba\n" -" [-]opost kimenet utófeldolgozása\n" -" * tabN vízszintes tab késleltetési stílus, N lehet [0..3]\n" -" * tabs ugyanaz, mint a tab0\n" -" * -tabs ugyanaz, mint a tab3\n" -" * vtN függőleges tab késleltetési stílus, N lehet [0..1]\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10769,45 +11008,56 @@ msgstr "" " * -crtkill az összes vonal kilövése az echoctl és echok beállítások\n" " alkalmazásával\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +#, fuzzy +msgid " [-]echo echo input characters\n" +msgstr "" +" * [-]iutf8 a bemeneti karakterek UTF-8 kódolásának feltételezése\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]ctlecho vezérlőkarakterek visszaadása kalapos jelöléssel („^c”)\n" -" [-]echo bemeneti karakterek visszaadása\n" -" * [-]echoctl ugyanaz, mint a [-]ctlecho\n" -" [-]echoe ugyanaz, mint a [-]crterase\n" -" [-]echok új sor visszaadása egy kill karakter után\n" -#: src/stty.c:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]echoke ugyanaz, mint a [-]crtkill\n" -" [-]echonl új sor visszaadása akkor is, ha más karaktereket nem ad " -"vissza\n" -" * [-]echoprt törölt karakterek visszaadása visszafelé, „\\” és „/” " -"között\n" -" [-]icanon az erase, kill, werase és rprnt különleges karakterek\n" -" bekapcsolása\n" -" [-]iexten a nem POSIX különleges karakterek bekapcsolása\n" -#: src/stty.c:672 +#: src/stty.c:843 +#, fuzzy 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 "" " [-]isig a interrupt, quit és suspend különleges karakterek\n" " bekapcsolása\n" @@ -10819,11 +11069,33 @@ msgstr "" " * [-]xcase az icanon használatakor escape-elés a „\\” karakterekkel\n" " nagybetűs karakterekhez\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -10833,12 +11105,12 @@ msgstr "" " cbreak ugyanaz, mint a -icanon\n" " -cbreak ugyanaz, mint az icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 ugyanaz, mint a brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof és eol karakterek beállítása az " @@ -10847,39 +11119,47 @@ msgstr "" " -cooked ugyanaz, mint a raw\n" " crt ugyanaz, mint az echoe echoctl echoke\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -" dec ugyanaz, mint az echoe echoctl echoke -ixany intr ^c erase " -"0177\n" -" kill ^u\n" -" * [-]decctlq ugyanaz, mint a [-]ixany\n" -" ek erase és kill karakterek beállítása az alapértelmezett\n" -" értékeikre\n" -" evenp ugyanaz, mint a parenb -parodd cs7\n" -#: src/stty.c:699 +#: src/stty.c:919 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 "" -" -evenp ugyanaz, mint a -parenb cs8\n" -" * [-]lcase ugyanaz, mint az xcase iuclc olcuc\n" -" litout ugyanaz, mint a -parenb -istrip -opost cs8\n" -" -litout ugyanaz, mint a parenb istrip opost cs7\n" -" nl ugyanaz, mint az -icrnl -onlcr\n" -" -nl ugyanaz, mint az icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr " -g mint a -l, de tulajdonos kiírása nélkül\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10893,11 +11173,12 @@ msgstr "" " pass8 ugyanaz, mint a -parenb -istrip cs8\n" " -pass8 ugyanaz, mint a parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw ugyanaz, mint az -ignbrk -brkint -ignpar -parmrk -inpck -" @@ -10906,14 +11187,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw ugyanaz, mint a cooked\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane ugyanaz, mint a cread -ignbrk brkint -inlcr -igncr icrnl -" "iutf8\n" @@ -10924,7 +11206,7 @@ msgstr "" "különleges\n" " karakter beállítása az alapértelmezett értékeikre\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10942,12 +11224,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:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "csak egyetlen eszköz adható meg" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10956,45 +11238,50 @@ 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:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: nem állítható vissza a nem blokkoló mód" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "érvénytelen argumentum: %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "a(z) %s argumentuma hiányzik" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: hiba a csonkításnál" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "érvénytelen vonalmódszer: %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, 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:1403 +#: src/stty.c:1747 #, 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:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "érvénytelen egész argumentum: %s" #. This is a proper name. See the gettext manual, section Names. @@ -11003,8 +11290,15 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Minden egyes FÁJL CRC ellenőrzőösszegének és bájtjai számának kiírása.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -11015,20 +11309,54 @@ msgstr "" " -s, --sysv a System V sum algoritmus és 512 bájtos blokkok " "használata\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, fuzzy, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Használat: %s [KAPCSOLÓ]… [FÁJL]…\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"A megváltozott blokkokat azonnal kiírja lemezre, frissíti a szuperblokkot\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "hiba %s olvasása közben" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: nem állítható vissza a nem blokkoló mód" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "hiba %s olvasása közben" -#: src/sync.c:69 +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "minden argumentum figyelmen kívül marad" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -11044,15 +11372,23 @@ msgstr "" "parancsértelmező\n" "dokumentációjához.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help ezen súgó megjelenítése és kilépés\n" -#: src/system.h:351 +#: src/system.h:345 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:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Ha a FÁJL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -11060,8 +11396,7 @@ msgstr "" "\n" "A hosszú kapcsolók kötelező argumentumai a rövid kapcsolókhoz is kötelezők.\n" -#: src/system.h:551 -#, fuzzy +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -11069,11 +11404,10 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" "\n" -"A MÉRET egy egész és elhagyható egység (például: 10M = 10*1024*1024). Az\n" -"egységek K, M, G, T, P, E, Z, Y (1024 hatványai) vagy KB, MB, … (1000 " -"hatványai)\n" +"A MÉRET argumentum egy egész és elhagyható egység (például: 10K = 10*1024).\n" +"Az egységek K,M,G,T,P,E,Z,Y (1024 hatványai) vagy KB,MB,… (1000 hatványai)\n" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -11088,7 +11422,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:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -11101,25 +11435,29 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" "A(z) %s fordítási hibái a \n" "címen jelenthetők.\n" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -"A teljes dokumentációért futtassa az „info coreutils %s hívás” parancsot\n" -#: src/system.h:591 +#: src/system.h:613 #, 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:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -11140,9 +11478,8 @@ msgid "Jay Lepreau" msgstr "Jay Lepreau" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, last line first.\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" @@ -11159,64 +11496,63 @@ msgstr "" " -s, --separator=KARAKTERLÁNC a KARAKTERLÁNC használata elválasztóként az\n" " új sor helyett\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: a keresés meghiúsult" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "a rekord túl nagy" -#: src/tac.c:450 +#: src/tac.c:459 #, c-format msgid "failed to create temporary file in %s" msgstr "nem hozható létre ideiglenes fájl itt: %s" -#: src/tac.c:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" msgstr "%s megnyitása írásra meghiúsult" -#: src/tac.c:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" msgstr "az adatfolyam visszaállítása meghiúsult erre: %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: íráshiba" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "%s megnyitása olvasásra meghiúsult" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "az elválasztó nem lehet üres" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 -#, c-format +#: src/tail.c:257 +#, 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" 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:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" @@ -11226,7 +11562,7 @@ msgstr "" " a bájtok kiíratására minden fájl K. bájtjától " "kezdve\n" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -11239,7 +11575,7 @@ msgstr "" " a hiányzó argumentum jelentése „descriptor”\n" " -F ugyanaz, mint a --follow=name --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -11266,7 +11602,7 @@ msgstr "" " eset forgatott naplófájlok esetén).\n" " Az inotify használatakor ez ritkán hasznos.\n" -#: src/tail.c:293 +#: src/tail.c:288 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -11278,7 +11614,7 @@ msgstr "" " --retry próbáljon megnyitni egy fájlt akkor is, ha az\n" " nem érhető el\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -11294,7 +11630,7 @@ msgstr "" " ellenőrzése N másodpercenként legalább egyszer\n" " -v, --verbose mindig írja ki a fájlneveket megadó fejléceket\n" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -11312,7 +11648,7 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024, és ugyanígy T, P, E, Z, Y.\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -11331,22 +11667,22 @@ msgstr "" "nevű fájlt úgy követi, hogy az átnevezést, eltávolítást és létrehozást " "kezelje.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "%s lezárása (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, 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:898 +#: src/tail.c:893 #, 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:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -11355,160 +11691,160 @@ 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:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" "%s le lett cserélve egy szimbolikus linkre, a program ezen a néven befejezi " "a próbálkozást" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s elérhetetlenné vált" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s elérhetővé vált" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s megjelent; a program az új fájl végét követi" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s helyettesítésre került; a program az új fájl végét követi" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: nem módosítható a nem blokkoló mód" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: a fájl csonkítva" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "nem maradtak fájlok" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "nem lehet %s szülőkönyvtárát figyelni" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "az inotify-erőforrások elfogytak" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "%s nem figyelhető" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: %s cseréje? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "hiba az inotify esemény figyelésekor" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "hiba az inotify esemény olvasásakor" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: ezen fájltípus vége nem követhető;\n" "a program ezen a néven befejezi a próbálkozást" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "a szám túl nagy a következőben: %s" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "" "%s: a változatlan statok maximális száma érvénytelen a megnyitások között" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: érvénytelen PID" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: a másodpercek száma érvénytelen" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "érvénytelen oszlopszám: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "a kapcsoló érvénytelen kontextusban került felhasználásra: -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" "figyelmeztetés: a --retry figyelmen kívül marad; a --retry csak követés " "esetén hasznos" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "figyelmeztetés: a --retry csak a kezdeti megnyitáshoz hatásos" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" "figyelmeztetés: a PID figyelmen kívül marad; a --pid=PID csak követés\n" "esetén hasznos" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "figyelmeztetés: ez a rendszer nem támogatja a --pid=PID kapcsolót" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "%s nem követhető név szerint" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "figyelmeztetés: a szabványos bemenet korlátlan követése nem hatékony" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "az inotify nem használható, visszatérés a lekérdezésre" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -11522,60 +11858,72 @@ msgstr "" "helyett\n" " -i, --ignore-interrupts megszakítási szignálok figyelmen kívül hagyása.\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Ha a FÁJL nincs megadva, vagy -, akkor újra a szabványos bemenetre másol.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "a(z) %s utáni argumentum hiányzik" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "érvénytelen egész: %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "a program „)” jelet várt" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "a program „)” jelet várt, de a következőt találta: %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: a program egyoperandusú operátort várt" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "a -nt nem fogadja el a -l kapcsolót" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "a -ef nem fogadja el a -l kapcsolót" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "a -ot nem fogadja el a -l kapcsolót" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "ismeretlen bináris operátor" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: a program bináris operátort várt" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11589,7 +11937,7 @@ msgstr "" " vagy: [ ]\n" " vagy: [ KAPCSOLÓ\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11597,7 +11945,7 @@ msgstr "" "Kilépés a KIFEJEZÉS által meghatározott állapottal.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11608,7 +11956,7 @@ msgstr "" "igaz vagy hamis és beállítja a kilépési állapotot. A KIFEJEZÉS az alábbiak\n" "egyike:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11622,7 +11970,7 @@ msgstr "" " KIFEJEZÉS1 -a KIFEJEZÉS2 mind a KIFEJEZÉS1, mind a KIFEJEZÉS2 igaz\n" " KIFEJEZÉS1 -o KIFEJEZÉS2 vagy a KIFEJEZÉS1, vagy a KIFEJEZÉS2 igaz\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11638,7 +11986,7 @@ msgstr "" " KARAKTERLÁNC1 = KARAKTERLÁNC2 a karakterláncok azonosak\n" " KARAKTERLÁNC1 != KARAKTERLÁNC2 a karakterláncok nem azonosak\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11656,7 +12004,7 @@ msgstr "" " EGÉSZ1 -lt EGÉSZ2 az EGÉSZ1 kisebb, mint az EGÉSZ2\n" " EGÉSZ1 -ne EGÉSZ2 az EGÉSZ1 nem egyenlő az EGÉSZ2-vel \n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11670,7 +12018,7 @@ msgstr "" "FÁJL2\n" " FÁJL1 -ot FÁJL2 a FÁJL1 régebbi, mint a FÁJL2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11684,7 +12032,7 @@ msgstr "" " -d FÁJL a FÁJL létezik és könyvtár\n" " -e FÁJL a FÁJL létezik\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11698,7 +12046,7 @@ msgstr "" " -h FÁJL a FÁJL létezik és szimbolikus link (ugyanaz, mint a -L)\n" " -k FÁJL a FÁJL létezik és a ragadós bit be van állítva\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11712,7 +12060,7 @@ msgstr "" " -r FÁJL a FÁJL létezik és olvasható\n" " -s FÁJL a FÁJL létezik és mérete nagyobb, mint nulla\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11728,7 +12076,7 @@ msgstr "" " -w FÁJL a FÁJL létezik és írható\n" " -x FÁJL a FÁJL létezik és végrehajtható (vagy kereshető)\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11743,7 +12091,7 @@ msgstr "" "Az EGÉSZ lehet -l KARAKTERLÁNC is, ez a KARAKTERLÁNC hosszát veszi fel " "értékül.\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11754,25 +12102,25 @@ msgstr "" "test\n" "nem. A test ezeket bármely más nem üres KARAKTERLÁNCHOZ hasonlóan kezeli.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test és/vagy [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "hiányzó „]”" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "extra argumentum: %s" @@ -11792,7 +12140,7 @@ msgstr "figyelmeztetés: timer_settime" msgid "warning: timer_create" msgstr "figyelmeztetés: timer_create" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11801,13 +12149,13 @@ msgstr "" "Használat: %s [KAPCSOLÓ] IDŐTARTAM PARANCS [ARGUMENTUM]…\n" " vagy: %s [KAPCSOLÓ]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 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" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11843,7 +12191,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:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11854,7 +12202,7 @@ msgstr "" "Az IDŐTARTAM egy lebegőpontos szám, és egy elhagyható UTÓTAG követheti:\n" "„s” (másodperc, alapértelmezett), „m” (perc), „h” (óra) vagy „d” (nap).\n" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -11874,7 +12222,7 @@ msgstr "" "használandó, mivel ez nem kapható el; ebben az esetben a kilépési állapot\n" "124 helyett 128+9.\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "figyelmeztetés: a magkiíratások letiltása meghiúsult" @@ -11889,6 +12237,11 @@ msgstr "hiba a parancsra várakozás közben" msgid "the monitored command dumped core" msgstr "a megfigyelt parancs hibakeresési kimenetet adott vissza" +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "ismeretlen állapot a parancstól (0x%X)" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -12262,12 +12615,12 @@ msgstr "Kilépés egy sikert jelző állapotkóddal." msgid "Exit with a status code indicating failure." msgstr "Kilépés egy hibát jelző állapotkóddal." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Használat: %s KAPCSOLÓ… FÁJL…\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -12284,18 +12637,18 @@ msgstr "" "Ha egy FÁJL nagyobb a megadott méretnél, akkor a további adatok elvesznek.\n" "Ha egy FÁJL kisebb, akkor nulla bájtokkal megnövelésre kerül.\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create ne hozzon létre fájlokat\n" -#: src/truncate.c:112 +#: src/truncate.c:85 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:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" @@ -12303,7 +12656,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 vagy módosítása MÉRET bájtra\n" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -12315,57 +12668,62 @@ 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:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "túlcsordulás % * % bájtos blokkokban a(z) %s fájlhoz" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s használhatatlan, nyilvánvalóan negatív mérettel rendelkezik" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "%s mérete nem kérhető le" -#: src/truncate.c:205 +#: src/truncate.c:178 #, 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:215 +#: src/truncate.c:188 #, 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:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "%s csonkítása meghiúsult a(z) %. bájtnál" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "több relatív módosító van megadva" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "érvénytelen szám: %s" + +#: src/truncate.c:307 #, 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:340 +#: src/truncate.c:314 #, 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:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "%s meg lett adva, de %s nem" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "%s nem nyitható meg olvasásra" @@ -12376,12 +12734,10 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Használat: %s [KAPCSOLÓ] [FÁJL]\n" "Teljesen rendezett lista kiírása a FÁJLBAN található részleges rendezéssel\n" @@ -12389,12 +12745,17 @@ msgstr "" "olvassa.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: a bemenet páratlan számú jelsort tartalmaz" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: bemenet hurkot tartalmaz:" @@ -12464,9 +12825,8 @@ msgid "cannot get system name" msgstr "nem kérhető le a rendszer neve" #: 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" +#, fuzzy +msgid "Convert blanks in each FILE to tabs, writing to standard output.\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" @@ -12525,9 +12885,10 @@ msgstr "" " -d, --repeated csak a kettőzött sorok kiírása, csoportonként egyet\n" #: src/uniq.c:187 +#, fuzzy msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" " -D, --all-repeated[=MÓD] minden többször szereplő sor kiírása\n" @@ -12540,9 +12901,10 @@ msgstr "" " -f, --skip-fields=N az első N mező összehasonlításának elkerülése\n" #: src/uniq.c:195 +#, fuzzy msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" " --group[=MÓD] minden elem megjelenítése, a csoportok elválasztása\n" @@ -12551,17 +12913,15 @@ msgstr "" " append,both}\n" #: src/uniq.c:199 -#, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing\n" " -s, --skip-chars=N avoid comparing the first N characters\n" " -u, --unique only print unique lines\n" msgstr "" -" -i, --ignore-case a kis- és nagybetűk nem különböznek " +" -i, --ignore-case kis- és nagybetűk nem különböznek " "összehasonlításkor\n" " -s, --skip-chars=N az első N karakter összehasonlításának elkerülése\n" " -u, --unique csak az egyedi sorok kiírása\n" -" -z, --zero-terminated a sorok befejezése 0 bájttal új sor helyett\n" #: src/uniq.c:207 msgid " -w, --check-chars=N compare no more than N characters in lines\n" @@ -12708,11 +13068,6 @@ msgstr "" " A megszakíthatatlan\n" "alvási állapotban lévő folyamatok is hozzájárulnak az átlagos terheléshez.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -12734,12 +13089,17 @@ msgstr "" "Ha a FÁJL nincs megadva, akkor a %s fájlt használja.\n" "A %s használata általános\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -12758,12 +13118,13 @@ msgstr "" " -m, --chars a karakterek számának kiírása\n" " -l, --lines az új sorok számának kiírása\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=F bemenet olvasása az F fájlban található, NULL végű\n" @@ -12935,10 +13296,10 @@ msgstr "" "Ugyanaz, mint az id -un.\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: nem található a név a(z) %lu felhasználói azonosítóhoz\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "nem található a név a(z) %s felhasználói azonosítóhoz" #: src/yes.c:41 #, c-format @@ -12958,6 +13319,247 @@ msgstr "" "kiírása.\n" "\n" +#~ msgid "failed to %s supplemental groups" +#~ msgstr "a kiegészítő csoportok %s meghiúsult" + +#~ msgid "%s: invalid number" +#~ msgstr "érvénytelen szám: %s" + +#~ 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 "" +#~ "\n" +#~ "Egy %s szignál küldésével egy futó „dd” folyamatnak kiírathatja az\n" +#~ "addig beolvasott és kiírt rekordok számát a szabványos hibakimenetre,\n" +#~ "majd folytathatja a másolást.\n" +#~ "\n" +#~ " $ dd if=/dev/zero of=/dev/null& pid=$!\n" +#~ " $ kill -%s $pid; sleep 1; kill $pid\n" +#~ " 18335302+0 beolvasott rekord\n" +#~ " 18335302+0 kiírt rekord\n" +#~ " 9387674624 bájt (9.4 GB) másolva, 34.6279 mp, 271 MB/s\n" +#~ "\n" +#~ "A kapcsolók:\n" +#~ "\n" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s olyan nagy, hogy nem ábrázolható" + +#~ msgid "number of lines" +#~ msgstr "sorok száma" + +#~ msgid "number of bytes" +#~ msgstr "bájtok száma" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: érvénytelen figyelmen kívül hagyandó szám" + +#~ msgid "input line is too short, no numbers found to convert in field %ld" +#~ msgstr "" +#~ "a bemeneti sor túl rövid, nem találhatók konvertálandó számok a(z) %ld. " +#~ "mezőben" + +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "A -t következik, ha az OLDALHOSSZ <= 10. Ha a FÁJL nincs megadva, vagy -, " +#~ "akkor a szabványos bemenetet olvassa.\n" + +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Ha a FÁJL nincs megadva, vagy -, akkor a szabványos bemenetet olvassa.\n" +#~ "Alapértelmezett: „-F /”.\n" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: érvénytelen bájtszám" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: érvénytelen sorszám" + +#~ 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 KAR a KAR hatására a következő karakter idézőjelek között " +#~ "kerül\n" +#~ " bevitelre\n" +#~ " quit KAR a KAR egy kilépési szignált fog küldeni\n" +#~ " * 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" + +#~ 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" +#~ "Vezérlőbeállítások:\n" +#~ " [-]clocal modem vezérlőszignálok letiltása\n" +#~ " [-]cread engedélyezi a bemenet fogadását\n" +#~ " * [-]crtscts engedélyezi az RTS/CTS kézfogást\n" +#~ " * [-]cdtrdsr engedélyezi a DTR/DSR kézfogást\n" +#~ " csN beállítja a karakterméretet N bitre, N értéke [5..8] " +#~ "lehet\n" + +#~ 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 "" +#~ "\n" +#~ "Kimeneti beállítások:\n" +#~ " * bsN a backspace késleltetési stílusa, N lehet [0..1]\n" +#~ " * crN a kocsivissza késleltetési stílusa, N lehet [0..3]\n" +#~ " * 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" + +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl a kocsivissza új sorrá fordítása\n" +#~ " * [-]ofdel delete karakterek használata kitöltéshez NUL karakterek\n" +#~ " helyett\n" +#~ " * [-]ofill kitöltő karakterek használata időzítés helyett a\n" +#~ " késleltetésekhez\n" +#~ " * [-]olcuc kisbetűs karakterek nagybetűssé alakítása\n" +#~ " * [-]onlcr új sor karakterek kocsivissza - új sorrá alakítása\n" +#~ " * [-]onlret az új sor kocsivisszát hajt végre\n" + +#~ 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 "" +#~ " * [-]onocr ne írjon ki kocsivissza karaktereket az első oszlopba\n" +#~ " [-]opost kimenet utófeldolgozása\n" +#~ " * tabN vízszintes tab késleltetési stílus, N lehet [0..3]\n" +#~ " * tabs ugyanaz, mint a tab0\n" +#~ " * -tabs ugyanaz, mint a tab3\n" +#~ " * vtN függőleges tab késleltetési stílus, N lehet [0..1]\n" + +#~ 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 "" +#~ " * [-]ctlecho vezérlőkarakterek visszaadása kalapos jelöléssel („^c”)\n" +#~ " [-]echo bemeneti karakterek visszaadása\n" +#~ " * [-]echoctl ugyanaz, mint a [-]ctlecho\n" +#~ " [-]echoe ugyanaz, mint a [-]crterase\n" +#~ " [-]echok új sor visszaadása egy kill karakter után\n" + +#~ 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 "" +#~ " * [-]echoke ugyanaz, mint a [-]crtkill\n" +#~ " [-]echonl új sor visszaadása akkor is, ha más karaktereket nem ad " +#~ "vissza\n" +#~ " * [-]echoprt törölt karakterek visszaadása visszafelé, „\\” és „/” " +#~ "között\n" +#~ " [-]icanon az erase, kill, werase és rprnt különleges karakterek\n" +#~ " bekapcsolása\n" +#~ " [-]iexten a nem POSIX különleges karakterek bekapcsolása\n" + +#~ 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 "" +#~ " dec ugyanaz, mint az echoe echoctl echoke -ixany intr ^c " +#~ "erase 0177\n" +#~ " kill ^u\n" +#~ " * [-]decctlq ugyanaz, mint a [-]ixany\n" +#~ " ek erase és kill karakterek beállítása az alapértelmezett\n" +#~ " értékeikre\n" +#~ " evenp ugyanaz, mint a parenb -parodd cs7\n" + +#~ 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 "" +#~ " -evenp ugyanaz, mint a -parenb cs8\n" +#~ " * [-]lcase ugyanaz, mint az xcase iuclc olcuc\n" +#~ " litout ugyanaz, mint a -parenb -istrip -opost cs8\n" +#~ " -litout ugyanaz, mint a parenb istrip opost cs7\n" +#~ " nl ugyanaz, mint az -icrnl -onlcr\n" +#~ " -nl ugyanaz, mint az icrnl -inlcr -igncr onlcr -ocrnl -" +#~ "onlret\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "A megváltozott blokkokat azonnal kiírja lemezre, frissíti a " +#~ "szuperblokkot\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "minden argumentum figyelmen kívül marad" + +#~ 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" + +#~ msgid "number in %s is too large" +#~ msgstr "a szám túl nagy a következőben: %s" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: a másodpercek száma érvénytelen" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: nem található a név a(z) %lu felhasználói azonosítóhoz\n" + #~ msgid "cannot create pipe" #~ msgstr "nem hozható létre adatcsatorna" @@ -13654,23 +14256,6 @@ msgstr "" #~ " üzenetet ír ki\n" #~ "\n" -#~ msgid "" -#~ "Display the current time in the given FORMAT, or set the system date.\n" -#~ "\n" -#~ " -d, --date=STRING display time described by STRING, not `now'\n" -#~ " -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -#~ msgstr "" -#~ "Az aktuális idő megjelenítése a megadott FORMÁTUMBAN, vagy a " -#~ "rendszerdátum\n" -#~ "beállítása.\n" -#~ "\n" -#~ " -d, --date=KARAKTERLÁNC a KARAKTERLÁNC által leírt dátum " -#~ "megjelenítése\n" -#~ " az aktuális helyett\n" -#~ " -f, --file=DÁTUMFÁJL ugyanaz, mint a --date egyszer a DÁTUMFÁJL " -#~ "minden\n" -#~ " egyes sorára\n" - #~ msgid "" #~ "\n" #~ "SIZE may be (or may be an integer optionally followed by) one of " diff --git a/po/ia.gmo b/po/ia.gmo index 5aaee233..4e074525 100644 Binary files a/po/ia.gmo and b/po/ia.gmo differ diff --git a/po/ia.po b/po/ia.po index 91deeb8a..62db0705 100644 --- a/po/ia.po +++ b/po/ia.po @@ -3,11 +3,12 @@ # This file is distributed under the same license as the coreutils package. # Nik Kalach , 2012. # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils-8.20-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2012-12-22 07:27+0400\n" "Last-Translator: Nik Kalach \n" "Language-Team: Interlingua \n" @@ -35,18 +36,18 @@ msgstr "Le argumentos valide es:" msgid "error closing file" msgstr "error al clauder le file" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 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:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "preservation del permissiones pro %s" @@ -231,57 +232,62 @@ msgstr "Catena de parametros codificate incorrectemente" msgid "Unknown error" msgstr "Error incognite" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, 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 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: le option '-W %s' es ambigue\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, 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 +#: lib/getopt.c:667 lib/getopt.c:672 #, 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 +#: lib/getopt.c:715 lib/getopt.c:734 #, 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 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: option non recognoscite '--%s'\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, 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 +#: lib/getopt.c:835 lib/getopt.c:838 #, 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 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, 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 +#: lib/getopt.c:964 lib/getopt.c:980 #, 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 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, 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 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: le option '-W %s' require un argumento\n" @@ -291,13 +297,13 @@ msgstr "%s: le option '-W %s' require un argumento\n" msgid "cannot change permissions of %s" msgstr "impossibile de cambiar le permissiones de %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "impossibile de crear le directorio %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "memoria exhauste" @@ -346,6 +352,12 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: fin de file" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "" + #: lib/regcomp.c:131 msgid "Success" msgstr "Successo" @@ -453,7 +465,7 @@ msgstr "^[sSyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "initiation de permissiones de %s" @@ -859,7 +871,7 @@ msgid "" "Base64 encode or decode FILE, or standard input, to standard output.\n" msgstr "" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -869,13 +881,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -884,51 +890,51 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, 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:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "" @@ -965,38 +971,41 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "" #: src/cat.c:92 +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" + +#: src/cat.c:98 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" @@ -1006,7 +1015,7 @@ msgid "" " -s, --squeeze-blank suppress repeated empty output lines\n" msgstr "" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1014,7 +1023,7 @@ msgid "" " -v, --show-nonprinting use ^ and M- notation, except for LFD and TAB\n" msgstr "" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1023,17 +1032,18 @@ msgid "" " %s Copy standard input to standard output.\n" msgstr "" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "" @@ -1045,10 +1055,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "" @@ -1062,8 +1072,8 @@ msgstr "" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "" @@ -1078,13 +1088,13 @@ msgstr "" msgid "failed to change context of %s to %s" msgstr "" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "" @@ -1100,7 +1110,7 @@ msgstr "" msgid "fts_read failed" msgstr "" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1184,7 +1194,7 @@ msgid "-R -h requires -P" msgstr "" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1201,9 +1211,8 @@ msgid "conflicting security context specifiers given" msgstr "" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "" @@ -1459,77 +1468,89 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" " or: %s OPTION\n" msgstr "" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" msgstr "" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" msgstr "" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, c-format msgid "failed to get supplemental groups" msgstr "" -#: src/chroot.c:395 +#: src/chroot.c:412 #, c-format -msgid "failed to %s supplemental groups" +msgid "failed to set supplemental groups" msgstr "" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "" @@ -1566,7 +1587,13 @@ msgstr "" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1574,7 +1601,7 @@ msgid "" "and column three contains lines common to both files.\n" msgstr "" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1582,7 +1609,7 @@ msgid "" " -3 suppress column 3 (lines that appear in both files)\n" msgstr "" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1590,17 +1617,17 @@ msgid "" " --nocheck-order do not check that the input is correctly sorted\n" msgstr "" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1609,309 +1636,323 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" msgstr "" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" +msgstr "error al clauder le file" + +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" +msgid "error reading %s" msgstr "" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "" -#: src/copy.c:323 +#: src/copy.c:302 +#, c-format +msgid "overflow reading %s" +msgstr "" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "" -#: src/copy.c:1580 +#: src/copy.c:1669 #, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "" -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "" -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr "" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "" -#: src/copy.c:2107 +#: src/copy.c:2187 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "" -#: src/copy.c:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, c-format +msgid "warning: source directory %s specified more than once" +msgstr "" + +#: src/copy.c:2294 #, c-format msgid "will not create hard link %s to directory %s" msgstr "" -#: src/copy.c:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" -#: src/copy.c:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "" @@ -1921,25 +1962,25 @@ msgstr "" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, fuzzy, c-format msgid "unknown program %s" msgstr "Error incognite" @@ -2123,8 +2164,8 @@ msgstr "" msgid "failed to access %s" msgstr "" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "" @@ -2196,137 +2237,143 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr "" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "" -#: src/csplit.c:1200 +#: src/csplit.c:1201 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "" -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "argumento %s invalide pro %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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:1490 +#: src/csplit.c:1485 +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2334,26 +2381,21 @@ msgid "" " -k, --keep-files do not remove output files on errors\n" msgstr "" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 msgid "" "\n" +"Each PATTERN may be:\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" @@ -2377,14 +2419,14 @@ msgstr "" msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" -#: src/cut.c:182 +#: src/cut.c:183 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:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2392,20 +2434,20 @@ msgid "" " -n (ignored)\n" msgstr "" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" -#: src/cut.c:197 +#: src/cut.c:198 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:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2413,7 +2455,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:210 +#: src/cut.c:211 msgid "" "Each range is one of:\n" "\n" @@ -2421,64 +2463,63 @@ msgid "" " 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:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "" -#: src/cut.c:790 +#: src/cut.c:789 msgid "an input delimiter may be specified only when operating on fields" msgstr "" -#: src/cut.c:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" msgstr "" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "" @@ -2495,34 +2536,48 @@ 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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" + +#: src/date.c:138 +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" +msgstr "" + +#: src/date.c:145 +msgid "" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" -#: src/date.c:142 +#: src/date.c:149 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" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" -#: src/date.c:147 +#: src/date.c:155 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 (UTC)\n" +" -r, --reference=FILE display the last modification time of FILE\n" msgstr "" #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2530,7 +2585,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2538,7 +2593,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2546,14 +2601,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:177 +#: src/date.c:183 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 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2561,7 +2616,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2569,7 +2624,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2580,7 +2635,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2588,7 +2643,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:209 +#: src/date.c:215 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" @@ -2596,7 +2651,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2604,7 +2659,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2616,7 +2671,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2627,7 +2682,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2636,7 +2691,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -2650,35 +2705,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "" -#: src/date.c:430 +#: src/date.c:436 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "" -#: src/date.c:437 +#: src/date.c:443 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" -#: src/date.c:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2686,30 +2741,30 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" " or: %s OPTION\n" msgstr "" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -2720,7 +2775,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:570 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2729,11 +2784,13 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -2744,7 +2801,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -2759,7 +2816,7 @@ msgid "" " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2769,7 +2826,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2778,123 +2835,103 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 +#: src/dd.c:661 #, 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:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" - -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "" -msgstr[1] "" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "" @@ -2908,164 +2945,178 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr "" -#: src/dd.c:877 +#: src/dd.c:809 +#, c-format +msgid ", %.6f s, %s/s" +msgstr "" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "" +msgstr[1] "" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +msgid "invalid status level" msgstr "" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" " of mt_type=0x%0lx -- see for the list of types" msgstr "" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, 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:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "" @@ -3146,12 +3197,12 @@ msgstr "" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3159,18 +3210,18 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3179,20 +3230,30 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:1409 +#: src/df.c:1429 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" +msgstr "" + +#: src/df.c:1435 +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" + +#: src/df.c:1439 +msgid "" " -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:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3200,25 +3261,25 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "" -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "" @@ -3308,7 +3369,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3316,7 +3377,8 @@ msgid "" msgstr "" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" #: src/du.c:291 @@ -3400,61 +3462,55 @@ msgstr "" msgid "Infinity" msgstr "" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "" @@ -3564,9 +3620,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" #: src/expand.c:114 @@ -3606,7 +3660,7 @@ msgid "input line is too long" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "" @@ -3712,12 +3766,12 @@ msgstr "" msgid "non-integer argument" msgstr "" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "" @@ -3728,38 +3782,38 @@ msgid "the strings compared were %s and %s" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" " or: %s OPTION\n" msgstr "" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -3798,7 +3852,7 @@ msgid "" "The option -WIDTH is an abbreviated form of --width=DIGITS.\n" msgstr "" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -3806,7 +3860,7 @@ msgid "" " -s, --split-only split long lines, but do not refill\n" msgstr "" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -3815,35 +3869,32 @@ msgid "" " -g, --goal=WIDTH goal width (default of 93% of width)\n" msgstr "" -#: src/fmt.c:359 +#: src/fmt.c:356 #, 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" +#: src/fmt.c:400 src/fmt.c:407 +msgid "invalid width" msgstr "" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" -#: src/fold.c:77 +#: src/fold.c:76 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 "" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" +msgstr "argumento %s invalide pro %s" #. This is a proper name. See the gettext manual, section Names. #: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 @@ -3909,14 +3960,13 @@ msgstr "" msgid "%s: no such user" msgstr "" -#: src/head.c:109 +#: src/head.c:110 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 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -3926,13 +3976,13 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:125 +#: src/head.c:126 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 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -3940,48 +3990,36 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "" -#: src/head.c:886 +#: src/head.c:267 #, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "" - -#: src/head.c:887 -msgid "number of lines" -msgstr "" - -#: src/head.c:887 -msgid "number of bytes" +msgid "%s: number of bytes is too large" msgstr "" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "" @@ -4148,7 +4186,7 @@ msgstr "" msgid "cannot set time stamps for %s" msgstr "" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "" @@ -4264,7 +4302,7 @@ msgstr "" msgid "target directory not allowed when installing a directory" msgstr "" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "" @@ -4299,15 +4337,19 @@ msgstr "" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +msgid "" "\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:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -4315,7 +4357,7 @@ msgid "" " -t CHAR use CHAR as input and output field separator\n" msgstr "" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -4327,11 +4369,11 @@ msgid "" " print them without trying to pair them\n" msgstr "" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -4350,47 +4392,47 @@ msgid "" "warning message will be given.\n" msgstr "" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "" @@ -4454,17 +4496,17 @@ msgstr "" msgid "no process ID specified" msgstr "" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -4611,7 +4653,7 @@ msgstr "" msgid "FIXME: unknown" msgstr "" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "" @@ -4622,7 +4664,7 @@ msgid "" "\n" msgstr "" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "" @@ -4632,7 +4674,7 @@ msgstr "" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "" @@ -4641,100 +4683,100 @@ msgstr "" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" -msgstr "" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" +msgstr "Fin de intervallo incorrecte" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" -msgstr "" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" +msgstr "argumento %s invalide pro %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "" -#: src/ls.c:4781 +#: src/ls.c:4775 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:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -4743,7 +4785,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -4757,18 +4799,19 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4798 msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -4778,11 +4821,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -4791,7 +4834,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -4799,7 +4842,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -4812,7 +4855,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -4824,7 +4867,7 @@ msgid "" " -k, --kibibytes default to 1024-byte blocks for disk usage\n" msgstr "" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -4834,7 +4877,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -4845,7 +4888,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -4857,7 +4900,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -4865,21 +4908,21 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4886 +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -4893,31 +4936,32 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4908 +#: src/ls.c:4904 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:4912 +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4919 +#: src/ls.c:4915 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 security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -4926,7 +4970,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -4955,39 +4999,40 @@ msgstr "" 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 +#: src/md5sum.c:175 msgid "" +"\n" " -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" +#: src/md5sum.c:180 +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr "" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -4999,97 +5044,98 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -5119,22 +5165,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" msgstr "" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -5303,7 +5349,7 @@ msgstr "" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" @@ -5414,9 +5460,7 @@ 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" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" #: src/nl.c:186 @@ -5489,27 +5533,27 @@ msgstr "" msgid "invalid footer numbering style: %s" msgstr "" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" -msgstr "" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" +msgstr "argumento %s invalide pro %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" -msgstr "" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" +msgstr "argumento %s invalide pro %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" -msgstr "" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" +msgstr "argumento %s invalide pro %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" -msgstr "" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" +msgstr "argumento %s invalide pro %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "" @@ -5531,7 +5575,7 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -5543,43 +5587,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "" @@ -5601,96 +5645,93 @@ msgid "" " --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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "argumento %s invalide pro %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" msgstr "" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "argumento %s invalide pro %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -5698,19 +5739,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -5720,40 +5761,40 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" msgstr "" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -5762,7 +5803,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -5770,7 +5811,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -5778,7 +5819,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -5786,7 +5827,19 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -5795,9 +5848,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -5809,7 +5863,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -5824,118 +5878,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "argumento %s invalide pro %s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "argumento %s invalide pro %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, c-format -msgid "input line is too short, no numbers found to convert in field %ld" +msgid "invalid field value %s" msgstr "" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "argumento %s invalide pro %s" -#: src/numfmt.c:1417 -#, c-format -msgid "invalid field value %s" -msgstr "" +#: src/numfmt.c:1646 +#, fuzzy, c-format +msgid "multiple field specifications" +msgstr "file special de blocos" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "argumento %s invalide pro %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5944,18 +6010,17 @@ msgid "" "[b]]\n" msgstr "" -#: src/od.c:326 +#: src/od.c:327 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:333 +#: src/od.c:335 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" @@ -5964,7 +6029,7 @@ msgid "" "suffixes may be . for octal and b for multiply by 512.\n" msgstr "" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -5973,7 +6038,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -5986,7 +6051,7 @@ msgid "" " --traditional accept arguments in third form above\n" msgstr "" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -5997,7 +6062,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6007,7 +6072,7 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -6016,7 +6081,7 @@ msgid "" " c printable character or backslash escape\n" msgstr "" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6025,7 +6090,7 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -6034,14 +6099,14 @@ msgid "" "for sizeof(double) or L for sizeof(long double).\n" msgstr "" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -6054,55 +6119,55 @@ msgid "" "and so on for G, T, P, E, Z, Y.\n" msgstr "" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte integral type" msgstr "" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte floating point type" msgstr "" -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" msgstr "" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "" -#: src/od.c:1650 +#: src/od.c:1658 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "" @@ -6121,7 +6186,6 @@ msgstr "" 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 @@ -6253,12 +6317,12 @@ msgstr "" msgid "Where" msgstr "" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6268,7 +6332,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6277,7 +6341,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -6285,96 +6349,91 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:597 +#: src/pinky.c:596 #, 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 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +msgid "'-N NUMBER' invalid starting line number" msgstr "" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +msgid "'-o MARGIN' invalid line offset" msgstr "" -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "" -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "" -#: src/pr.c:1096 +#: src/pr.c:1059 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" -#: src/pr.c:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" -#: src/pr.c:1196 +#: src/pr.c:1166 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6384,7 +6443,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6394,7 +6453,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6406,7 +6465,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -6419,16 +6478,21 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2798 +#: src/pr.c:2769 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2775 +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -6438,7 +6502,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -6447,7 +6511,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -6458,17 +6522,22 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2828 +#: src/pr.c:2802 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6482,7 +6551,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -6491,15 +6560,8 @@ msgid "" " with -S or -s\n" msgstr "" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" - -#: src/printenv.c:62 -#, c-format +#: src/printenv.c:62 +#, c-format msgid "" "Usage: %s [OPTION]... [VARIABLE]...\n" "Print the values of the specified environment VARIABLE(s).\n" @@ -6622,15 +6684,20 @@ msgid "" "files.\n" msgstr "" -#: src/ptx.c:1830 +#: src/ptx.c:1831 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:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -6638,7 +6705,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -6648,7 +6715,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -6656,17 +6723,16 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -6690,7 +6756,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "" @@ -6710,8 +6776,8 @@ msgstr "" msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "" @@ -6901,15 +6967,15 @@ msgstr "" #: src/rm.c:342 #, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "" msgstr[1] "" #: src/rm.c:345 #, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "" msgstr[1] "" @@ -7087,12 +7153,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -7108,7 +7174,13 @@ msgid "" "for even very expensive hardware probing to recover the data.\n" msgstr "" -#: src/shred.c:177 +#: src/shred.c:174 +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7117,7 +7189,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -7126,11 +7198,9 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:192 +#: src/shred.c:196 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.\n" @@ -7142,7 +7212,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -7153,7 +7223,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7165,7 +7235,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7174,7 +7244,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -7186,134 +7256,134 @@ msgid "" "\n" msgstr "" -#: src/shred.c:241 +#: src/shred.c:243 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:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "" -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" -msgstr "" +#, fuzzy +msgid "invalid number of passes" +msgstr "argumento %s invalide pro %s" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" -msgstr "" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" +msgstr "argumento %s invalide pro %s" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -7321,11 +7391,11 @@ msgid "" " or: %s -i LO-HI [OPTION]...\n" msgstr "" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -7336,37 +7406,37 @@ msgid "" " -r, --repeat output lines can be repeated\n" msgstr "" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" -msgstr "" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" +msgstr "Fin de intervallo incorrecte" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" -msgstr "" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" +msgstr "argumento %s invalide pro %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -7385,12 +7455,12 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "" @@ -7399,13 +7469,13 @@ msgstr "" msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -7413,19 +7483,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:443 +#: src/sort.c:444 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:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -7433,7 +7503,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7443,19 +7513,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -7464,7 +7534,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7473,13 +7543,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -7487,7 +7557,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7502,7 +7572,7 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -7521,477 +7591,481 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:524 +#: src/sort.c:525 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:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "" msgstr[1] "" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "" -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" msgstr "" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 +#: src/split.c:224 #, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "" -#: src/split.c:207 +#: src/split.c:228 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" -msgstr "" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" +msgstr "argumento %s invalide pro %s" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" -msgstr "" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" +msgstr "argumento %s invalide pro %s" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" -msgstr "" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" +msgstr "argumento %s invalide pro %s" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" +msgid "empty record separator" msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "file special de characteres" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "file special de characteres" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "" -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" -msgstr "" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" +msgstr "argumento %s invalide pro %s" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, c-format msgid "%s: cannot determine file size" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8002,7 +8076,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8010,30 +8084,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8041,17 +8115,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8061,7 +8135,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -8073,7 +8147,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8083,7 +8157,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8096,7 +8170,7 @@ msgid "" " %T minor device type in hex, for character/block device special files\n" msgstr "" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8111,7 +8185,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8122,7 +8196,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -8177,8 +8251,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -8203,7 +8276,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8211,96 +8284,149 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 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:535 +#: src/stty.c:543 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:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +msgid "" " 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 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:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" msgstr "" -#: src/stty.c:559 +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" + +#: src/stty.c:614 +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 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:578 +#: src/stty.c:632 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" +msgstr "" + +#: src/stty.c:637 +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:584 +#: src/stty.c:641 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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -8308,10 +8434,13 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -8319,135 +8448,249 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +msgid "" " [-]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:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:619 +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +msgid "" " [-]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:627 +#: src/stty.c:712 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:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]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:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +msgid "" " * 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr "" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:672 +#: src/stty.c:843 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" +msgstr "" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:875 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:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 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:707 +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8456,25 +8699,27 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8483,58 +8728,63 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "error al clauder le file" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" -msgstr "" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" +msgstr "argumento %s invalide pro %s" #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 @@ -8542,25 +8792,64 @@ msgid "Kayvan Aghaiepour" msgstr "" #: src/sum.c:62 +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" + +#: src/sum.c:68 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 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" +"\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" msgstr "" -#: src/sync.c:69 +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "error al clauder le file" + +#: src/sync.c:124 #, c-format -msgid "ignoring all arguments" +msgid "couldn't reset non-blocking mode %s" msgstr "" -#: src/system.h:343 +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "error al clauder le file" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "" + +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -8569,21 +8858,27 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr "" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr "" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -8591,7 +8886,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -8600,7 +8895,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -8611,22 +8906,27 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -#: src/system.h:591 +#: src/system.h:613 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -8642,9 +8942,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" #: src/tac.c:144 @@ -8654,66 +8952,65 @@ msgid "" " -s, --separator=STRING use STRING as the separator instead of newline\n" msgstr "" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "" -#: src/tac.c:450 +#: src/tac.c:459 #, c-format msgid "failed to create temporary file in %s" msgstr "" -#: src/tac.c:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" msgstr "" -#: src/tac.c:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" msgstr "" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "" -#: src/tail.c:262 +#: src/tail.c:257 #, 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 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -8721,7 +9018,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -8734,14 +9031,14 @@ msgid "" " with inotify, this option is rarely useful\n" msgstr "" -#: src/tail.c:293 +#: src/tail.c:288 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 if it is inaccessible\n" msgstr "" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -8750,7 +9047,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -8761,7 +9058,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -8771,169 +9068,167 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "" -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" -#: src/tail.c:1006 +#: src/tail.c:999 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" -#: src/tail.c:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "" -#: src/tail.c:1035 +#: src/tail.c:1032 #, c-format -msgid "%s has appeared; following end of new file" +msgid "%s has appeared; following new file" msgstr "" -#: src/tail.c:1046 +#: src/tail.c:1042 #, c-format -msgid "%s has been replaced; following end of new file" +msgid "%s has been replaced; following new file" msgstr "" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "" -#: src/tail.c:1529 +#: src/tail.c:1513 #, c-format -msgid "error monitoring inotify event" +msgid "%s was replaced" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1577 #, c-format -msgid "error reading inotify event" +msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1844 +#: src/tail.c:1597 #, c-format -msgid "%s: cannot follow end of this type of file; giving up on this name" +msgid "error reading inotify event" msgstr "" -#: src/tail.c:1961 +#: src/tail.c:1902 #, c-format -msgid "number in %s is too large" +msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +msgid "invalid maximum number of unchanged stats between opens" msgstr "" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +msgid "invalid PID" msgstr "" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "argumento %s invalide pro %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -8941,58 +9236,72 @@ msgid "" " -i, --ignore-interrupts ignore interrupt signals\n" msgstr "" -#: src/tee.c:71 +#: src/tee.c:93 +msgid "" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" +msgstr "" + +#: src/tee.c:98 msgid "" "\n" -"If a FILE is -, copy again to standard output.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -9001,20 +9310,20 @@ msgid "" " or: [ OPTION\n" msgstr "" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" msgstr "" -#: src/test.c:717 +#: src/test.c:719 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 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -9023,7 +9332,7 @@ msgid "" " EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n" msgstr "" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -9033,7 +9342,7 @@ msgid "" " STRING1 != STRING2 the strings are not equal\n" msgstr "" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -9044,7 +9353,7 @@ msgid "" " INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n" msgstr "" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -9052,7 +9361,7 @@ msgid "" " FILE1 -ot FILE2 FILE1 is older than FILE2\n" msgstr "" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -9061,7 +9370,7 @@ msgid "" " -e FILE FILE exists\n" msgstr "" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -9070,7 +9379,7 @@ msgid "" " -k FILE FILE exists and has its sticky bit set\n" msgstr "" -#: src/test.c:766 +#: src/test.c:768 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" @@ -9079,7 +9388,7 @@ msgid "" " -s FILE FILE exists and has a size greater than zero\n" msgstr "" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -9088,7 +9397,7 @@ msgid "" " -x FILE FILE exists and execute (or search) permission is granted\n" msgstr "" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -9097,32 +9406,32 @@ msgid "" "INTEGER may also be -l STRING, which evaluates to the length of STRING.\n" msgstr "" -#: src/test.c:786 +#: src/test.c:788 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 +#: src/test.c:793 msgid "test and/or [" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "" @@ -9142,18 +9451,18 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" " or: %s [OPTION]\n" msgstr "" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -9171,7 +9480,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9179,7 +9488,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -9190,7 +9499,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -9205,6 +9514,11 @@ msgstr "" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -9482,12 +9796,12 @@ msgstr "" msgid "Exit with a status code indicating failure." msgstr "" -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -9498,22 +9812,22 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -9521,57 +9835,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "argumento %s invalide pro %s" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "" @@ -9586,16 +9905,19 @@ msgstr "" 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:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "" @@ -9643,9 +9965,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" #: src/unexpand.c:124 @@ -9687,8 +10007,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -9699,7 +10019,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -9833,11 +10153,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "" - #: src/uptime.c:214 #, c-format msgid "" @@ -9853,12 +10168,16 @@ msgid "" "\n" msgstr "" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +msgid "" +"\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" @@ -9866,12 +10185,12 @@ msgid "" " -l, --lines print the newline counts\n" msgstr "" -#: src/wc.c:128 +#: src/wc.c:134 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" @@ -10006,9 +10325,9 @@ msgid "" "\n" msgstr "" -#: src/whoami.c:91 +#: src/whoami.c:87 #, c-format -msgid "%s: cannot find name for user ID %lu\n" +msgid "cannot find name for user ID %lu" msgstr "" #: src/yes.c:41 diff --git a/po/id.gmo b/po/id.gmo index 195f5b2c..98a09737 100644 Binary files a/po/id.gmo and b/po/id.gmo differ diff --git a/po/id.po b/po/id.po index a126c8dd..b233a500 100644 --- a/po/id.po +++ b/po/id.po @@ -3,11 +3,12 @@ # This file is distributed under the same license as the coreutils package. # Arif E. Nugroho , 2008, 2009, 2010, 2011, 2012, 2013. # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils 8.21\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2013-05-16 08:45+0700\n" "Last-Translator: Arif E. Nugroho \n" "Language-Team: Indonesian \n" @@ -35,18 +36,18 @@ msgstr "Argumen yang valid adalah:" msgid "error closing file" msgstr "error menutup berkas" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "error menulis" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "menyimpan permission untuk %s" @@ -232,57 +233,62 @@ msgstr "Parameter string tidak secara benar dikodekan" msgid "Unknown error" msgstr "Error tidak diketahui" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: pilihan '%s' adalah ambigu\n" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: pilihan '-W %s' adalah ambigu\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: pilihan '--%s' tidak memperbolehkan sebuah argumen\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: pilihan '%c%s' tidak memperbolehkan sebuah argumen\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, fuzzy, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: pilihan '%s' membutuhkan sebuah argumen\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: pilihan tidak dikenal '--%s'\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: pilihan tidak dikenal '%c%s'\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: pilihan tidak valid -- '%c'\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: pilihan membutuhkan sebuah argumen -- '%c'\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: pilihan '-W %s' adalah ambigu\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: pilihan '-W %s' tidak memperbolehkan sebuah argumen\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, fuzzy, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: pilihan '%s' membutuhkan sebuah argumen\n" @@ -292,13 +298,13 @@ msgstr "%s: pilihan '%s' membutuhkan sebuah argumen\n" msgid "cannot change permissions of %s" msgstr "tidak dapat merubah ijin dari %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "tidak dapat membuat direktori %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "kehabisan memori" @@ -347,6 +353,12 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: akhir dari berkas" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: error membaca" + #: lib/regcomp.c:131 msgid "Success" msgstr "Sukses" @@ -455,7 +467,7 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[tT]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "menset ijin untuk %s" @@ -891,7 +903,7 @@ msgstr "" "standar.\n" "\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -901,15 +913,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Tanpa BERKAS, atau ketika BERKAS adalah -, baca masukan standar.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -926,51 +930,51 @@ msgstr "" "merekover\n" "dari karakter bukan alphabet bytes dalam stream yang dienkode.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "error baca" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "masukan tidak valid" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "ukuran wrap tidak valid: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "extra operand %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "menutup masukan standar" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1012,39 +1016,45 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "operand hilang" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Penggunaan: %s [PILIHAN]... [BERKAS]...\n" #: src/cat.c:92 #, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"Tulis concatenation terurut dari seluruh BERKAS ke standar keluaran.\n" +"\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1062,7 +1072,7 @@ msgstr "" " -n, --number nomori seluruh baris keluaran\n" " -s, --squeeze-blank tekan baris keluaran kosong yang berulang\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1075,7 +1085,7 @@ msgstr "" " -v, --show-nonprinting gunakan ^ dan M- notasi, kecuali untuk LFD dan " "TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1088,17 +1098,18 @@ msgstr "" " %s f - g Keluarkan isi f, kemudian masukan standar, kemudian isi g.\n" " %s Salin masukan standar ke keluaran standar.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "tidak dapat melakukan ioctl di %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "keluaran standar" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: berkas masukan adalah berkas keluaran" @@ -1110,10 +1121,10 @@ msgstr "Russel Coker" #. This is a proper name. See the gettext manual, section Names. #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58 -#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1127,8 +1138,8 @@ msgstr "gagal untuk membuat konteks keamanan: %s" msgid "failed to set %s security context component to %s" msgstr "gagal menset %s kontek keamanan komponen ke %s" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "gagal untuk memperoleh konteks keamanan dari %s" @@ -1143,13 +1154,13 @@ msgstr "tidak dapat mengapply konteks pecahan ke berkas yang tidak bernama %s" 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:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "tidak dapat mengakses %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "tidak dapat membaca direktori %s" @@ -1165,7 +1176,7 @@ msgstr "mengubah konteks keamanan dari %s\n" msgid "fts_read failed" msgstr "fts_read gagal" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1288,7 +1299,7 @@ msgid "-R -h requires -P" msgstr "-R -h membutuhkan -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1305,9 +1316,8 @@ msgid "conflicting security context specifiers given" msgstr "konteks keamanan konflik dengan spesifikasi yang diberikan" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "gagal untuk memperoleh atribut dari %s" @@ -1614,17 +1624,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "grup tidak valid %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "daftar grup tidak valid %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1633,7 +1643,7 @@ msgstr "" "Penggunaan: %s [PILIHAN] NEWROOT [PERINTAH [ARG]...]\n" " atau: %s PILIHAN\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1641,16 +1651,28 @@ msgstr "" "Jalankan PERINTAH dengan direktori root set ke NEWROOT.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" +" --userspec=PENGGUNA:GRUP spesifikasikan pengguna dan grup (ID atau nama) " +"yang digunakan\n" +" --groups=G_LIST spesifikasikan grup tambahan sebagai g1,g2,..,gN\n" + +#: src/chroot.c:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" " --userspec=PENGGUNA:GRUP spesifikasikan pengguna dan grup (ID atau nama) " "yang digunakan\n" " --groups=G_LIST spesifikasikan grup tambahan sebagai g1,g2,..,gN\n" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 #, fuzzy msgid "" "\n" @@ -1660,42 +1682,47 @@ msgstr "" "Jika tidak ada perintah yang diberikan, jalankan ``${SHELL} -i'' (default: /" "bin/sh).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "tidak dapat mengubah direktori root ke %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "tidak dapat chdir ke direktori root" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "gagal untuk menset grup tambahan" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" +msgid "failed to set supplemental groups" msgstr "gagal untuk menset grup tambahan" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "gagal untuk menset ID grup" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "gagal untuk menset ID pengguna" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "gagal menjalankan perintah %s" @@ -1736,7 +1763,16 @@ msgstr "Penggunaan: %s [PILIHAN]... BERKAS1 BERKAS2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Bandingkan berkas terurut BERKAS1 dan BERKAS2 baris demi baris.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Tanpa BERKAS, atau ketika BERKAS adalah -, baca masukan standar.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1748,7 +1784,7 @@ msgstr "" "baris unik ke BERKAS1, kolom dua berisi baris unik ke BERKAS2.\n" "dan kolom tiga berisi baris umum ke kedua berkas.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1760,7 +1796,7 @@ msgstr "" " -2 tekan kolom 2 (baris unik ke BERKAS2)\n" " -3 tekan kolom 3 (baris yang timbul di kedua berkas)\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1773,11 +1809,11 @@ msgstr "" " jika seluruh masukan baris dapat dipasangkan\n" " --nocheck-order jangan periksa masukan adalah diurutkan secara benar\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=STR pisahkan kolom dengan STR\n" -#: src/comm.c:133 +#: src/comm.c:137 #, fuzzy msgid "" "\n" @@ -1786,7 +1822,7 @@ msgstr "" "\n" "Catat, perbandingan menghargai aturan dispesifikasikan oleh `LC_COLLATE'.\n" -#: src/comm.c:137 +#: src/comm.c:141 #, fuzzy, c-format msgid "" "\n" @@ -1801,312 +1837,326 @@ msgstr "" " %s -3 berkas1 berkas2 Cetak baris dalam berkas1 bukan dalam berkas2, dan " "sebaliknya.\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "berkas %d ada dalam keadaan tidak terurut" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "banyak pembatas dispesifikasikan" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "kosong %s tidak diperbolehkan" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "tidak dapat lseek %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "error membaca %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "tidak dapat lseek %s" +msgid "error reading %s" +msgstr "error membaca %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "error menulis %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "error membaca %s" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "gagal memperolek konteks sekarang" -#: src/copy.c:383 +#: src/copy.c:478 #, fuzzy, c-format msgid "%s: write failed" msgstr "tulis gagal" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "gagal untuk membuka %s" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "menghapus ijin untuk %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "gagal untuk menjaga kepemilikan untuk %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "gagal untuk menlookup berkas %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "gagal untuk menjaga kepengarangan untuk %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "gagal untuk menset default berkas pembuatan konteks ke %s" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "gagal untuk menset default berkas pembuatan konteks ke %s" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "gagal untuk menset konteks keamanan dari %s ke %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "tidak dapat membuka %s untuk dibaca" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "tidak dapat fstat %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "melewati berkas %s, seperti ini ditimpa ketika sedang disalin" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "tidak dapat menghapus %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "menghapus %s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "tidak menulis melalui dangling symlink %s" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "tidak dapat membuat berkas regular %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" msgstr "gagal untuk menutup %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "menjaga waktu untuk %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "gagal untuk menutup %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, fuzzy, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: mencoba untuk menulis %s, mengoveride mode %04lo (%s)? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: menimpa %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (backup: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "gagal merestore ke default berkas konteks pembuatan" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "tidak dapat membuah link keras %s ke %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "tidak dapat memperoleh statistik %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "mengabaikan direktori %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "peringatan: berkas sumber %s dispesifikasikan lebih dari sekali" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s dan %s adalah berkas yang sama" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "tidak dapat menimpa bukan-direktori %s dengan direktori %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "tidak akan menimpa baru dibuat %s dengan %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "tidak dapat menimpa direktori %s dengan bukan-direktori" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "tidak dapat memindahkan direktori ke bukan-direktori: %s -> %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "tidak dapat membackup %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, 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:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "peringatan: berkas sumber %s dispesifikasikan lebih dari sekali" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "tidak dapat memindahkan %s ke %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "tidak dapat menyalin cyclic link simbolik %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "tidak dapat membuat link simbolik %s ke %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "tidak dapat membuat fifo %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "tidak dapat membuah berkas spesial %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "tidak dapat membaca link simbolik %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "tidak dapat membuat link simbolik %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s memiliki tipe berkas tidak diketahui" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "tidak dapat un-backup %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (unbackup)\n" @@ -2116,25 +2166,25 @@ msgstr "%s -> %s (unbackup)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, fuzzy, c-format msgid "unknown program %s" msgstr "Aliran tidak diketahui" @@ -2414,8 +2464,8 @@ msgstr "%s ada tetapi bukan sebuah direktori" msgid "failed to access %s" msgstr "gagal untuk menutup %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "operand berkas hilang" @@ -2490,131 +2540,131 @@ msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "tidak dapat menjaga atribut ekstensi, cp dibuat tanpa dukungan xattr" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "masukan hilang" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: nomor baris hilang dari jangkauan" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: nomor baris hilang dari jangkauan" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " repetisi di %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: cocok tidak ditemukan" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "error dalam pencarian ekspresi regular" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "error dalam penulisan untuk %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: integer diperkirakan setelah delimiter" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: `}' dibutuhkan dalam jumlah berulang" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: integer dibutuhkan diantara `{' dan `}'" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: menutup delimiter `%c' hilang" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: ekspresi regular tidak valid: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: pola tidak valid" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: nomor baris harus lebih besar dari nol" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "hilang spesifikasi konversi dalam akhiran" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "spesifikasi konversi tidak valid dalam akhiran: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "spesifikasi konversi tidak valid dalam akhiran: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "%.*s: spesifikasi konversi tidak valid" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "terlalu banyak %% spesifikasi konversi dalam akhiran" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "hilang %% spesifikasi konversi di akhiran" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: nomor tidak valid" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "nomor %s tidak valid" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Penggunaan: %s [PILIHAN]... BERKAS POLA...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 #, fuzzy msgid "" "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n" @@ -2625,7 +2675,16 @@ msgstr "" "dan jumlah keluaran byte dari setiap potongan ke keluaran standar.\n" "\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Baca standard masukan jika BERKAS adalah -. Setiap POLA mungkin:\n" + +#: src/csplit.c:1492 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2636,11 +2695,11 @@ msgstr "" " -f, --prefix=PREFIX gunakan PREFIX daripada `xx'\n" " -k, --keep-files jangan menghapus berkas keluaran di errors\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2652,18 +2711,11 @@ msgstr "" "keluaran\n" " -z, --elide-empty-files hapus keluaran berkas kosong\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Baca standard masukan jika BERKAS adalah -. Setiap POLA mungkin:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 #, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2700,7 +2752,7 @@ msgstr "" "standar.\n" "\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2710,7 +2762,7 @@ msgstr "" " -c, --character=LIST pilih hanya karakter ini\n" " -d, --delimiter=DELIM gunakan DELIM daripada TAB untuk bagian pembatas\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2723,7 +2775,7 @@ msgstr "" " pilihan -s dispesifikasikan\n" " -n (diabaikan)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2732,7 +2784,7 @@ msgstr "" "yang\n" " dipilih\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2743,7 +2795,7 @@ msgstr "" " sebagai default yang digunakan sebagai masukan " "delimiter\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2757,7 +2809,8 @@ msgstr "" "ditulis\n" "dalam urutan yang sama dengan waktu dibaca, dan ditulis tepat sekali.\n" -#: src/cut.c:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2765,8 +2818,6 @@ msgid "" " 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 "" "Setiap jangkauan adalah satu dari:\n" "\n" @@ -2775,54 +2826,55 @@ 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:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "byte tidak valid atau daftar field" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "fields dan posisi dinomori dari 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "jangkauan tidak valid dengan tidak ada endpoint: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "jangkauan berkurang tidak valid" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "byte offset %s terlalu besar" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "nomor field %s terlalu besar" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "hanya satu tipe dari daftar yang boleh dispesifikasikan" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "pembatas harus berupa sebuah karakter" -#: src/cut.c:787 +#: src/cut.c:786 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:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2830,11 +2882,11 @@ msgstr "" "menekan non-delimited baris membuat masuk akal\n" "\thanya ketika beroperasi di fields" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "hilang daftar dari fields" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "hilang daftar dari posisi" @@ -2852,35 +2904,47 @@ msgid "Display the current time in the given FORMAT, or set the system date.\n" msgstr "" #: src/date.c:134 +#, fuzzy +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +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" + +#: src/date.c:138 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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=FILE menampilkan modifikasi waktu terakhir dari FILE\n" " -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:147 +#: src/date.c:149 #, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --ufc-3339=TIMESPEC mengeluarkan tanggal dan jam dalam format RFC " "3339.\n" @@ -2892,8 +2956,19 @@ msgstr "" " -u, --utc, --universal menampilkan atau menset Coordinated Universal " "Time\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2906,7 +2981,7 @@ msgstr "" " %% sebuah literal %\n" " %a locale penyingkatan nama weekday (contoh, Sun)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2918,7 +2993,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:171 +#: src/date.c:177 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2932,7 +3007,7 @@ msgstr "" " %D tanggal; sama seperti %m/%d/%y\n" " %e hari dari bulan, spasi dipadded; sama seperti %_d\n" -#: src/date.c:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2943,7 +3018,7 @@ msgstr "" " %G tahun dari ISO nomor minggu (lihat %V); biasanya berguna hanya dengan " "%V\n" -#: src/date.c:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2955,7 +3030,7 @@ msgstr "" " %I jam (01...12)\n" " %j hari dari tahun (001...366)\n" -#: src/date.c:188 +#: src/date.c:194 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2968,7 +3043,7 @@ msgstr "" " %m bulan (01..12)\n" " %M menit (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2986,7 +3061,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:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2998,7 +3073,7 @@ msgstr "" " %T waktu; sama seperti %H:%M:%S\n" " %u hari dari minggu (1..7); 1 adalah Senin\n" -#: src/date.c:209 +#: src/date.c:215 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" @@ -3013,7 +3088,7 @@ msgstr "" " %W nomor minggu dari tahun, dengan Senin sebagai hari pertama dari " "minggu (00..53)\n" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3025,7 +3100,7 @@ msgstr "" " %y dua digit terakhir dari tahun (00..99)\n" " %Y tahun\n" -#: src/date.c:221 +#: src/date.c:227 #, fuzzy msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" @@ -3045,7 +3120,7 @@ msgstr "" " %Z singkatan daerah waktu alphabet (contoh, WIT)\n" "\n" -#: src/date.c:230 +#: src/date.c:236 #, fuzzy msgid "" "The following optional flags may follow '%':\n" @@ -3064,7 +3139,7 @@ msgstr "" " ^ gunakan huruf besar jika mungkin\n" " # gunakan kasus sebalik jika mungkin\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3079,7 +3154,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:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3093,37 +3168,37 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "standar masukan" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "tanggal tidak valid %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "multiple format keluaran dispesifikasikan" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3134,23 +3209,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:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "tidak dapat menset tanggal" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3159,7 +3234,7 @@ msgstr "" "Penggunaan: %s [OPERAND]...\n" " atau: %s PILIHAN\n" -#: src/dd.c:532 +#: src/dd.c:561 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3180,7 +3255,7 @@ msgstr "" " count=BLOCKS salin hanya BLOK input blok\n" " ibs=BYTES baca BYTES byte dalam satu waktu\n" -#: src/dd.c:541 +#: src/dd.c:570 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3190,8 +3265,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=FILE baca dari BERKAS daripada dari stdin\n" " iflag=FLAGS baca sebagai daftar simbol yang dipisahkan dengan koma\n" @@ -3202,7 +3279,7 @@ msgstr "" " skip=BLOK lewati BLOK sebesar ibs blok di awal dari masukan\n" " status=noxfer tekan statistik transfer\n" -#: src/dd.c:552 +#: src/dd.c:583 #, fuzzy msgid "" "\n" @@ -3221,7 +3298,7 @@ msgstr "" "Setiap simbol CONV bisa berupa:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3249,7 +3326,7 @@ msgstr "" "digunakan\n" " dengan blok atau unblok, pad dengan spasi daripada dengan NUL\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3265,7 +3342,7 @@ msgstr "" " fdatasync secara fisik tulis berkas keluaran data sebelum selesai\n" " fsync sama seperti, tetapi juga tulis metadata\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3279,138 +3356,103 @@ msgstr "" " append mode append (berguna hanya untuk keluaran; conv=notrunc " "disarankan)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio gunakan I/O bersamaan untuk data\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct gunakan I/O langsung untuk data\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " direktori gagal kecuali sebuah direktori\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync gunakan I/O tersinkron untuk data\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync sama seperti itu, tetapi juga untuk metadata\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock akumulasikan blok penuh dari masukan (hanya iflag)\n" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock gunakan I/O non-blok\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime jangan perbaharui waktu akses\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty jangan assign pengontrol terminal dari berkas\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow jangan ikuti symlinks\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks gagal jika multiply-linked\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary gunakan binary I/O untuk data\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text gunakan teks I/O untuk data\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 -#, fuzzy, c-format +#: src/dd.c:661 +#, 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 "" -"\n" -"Mengirim sebuah %s sinyal ke proses `dd' yang sedang berjalan membuatnya\n" -"menampilkan statistik I/O ke standar error dan kemudian melanjutkan " -"penyalinan.\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) tersalin, 34.6279 detik, 271 MB/s\n" -"\n" -"Pilihan adalah:\n" -"\n" - -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -"%+% catatan masuk\n" -"%+% catatan keluar\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% rekaman terpotong\n" -msgstr[1] "% rekaman terpotong\n" -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "% byte (%s) tersalin" msgstr[1] "% byte (%s) tersalin" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "Tak terhingga B" @@ -3424,83 +3466,100 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% catatan masuk\n" +"%+% catatan keluar\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% rekaman terpotong\n" +msgstr[1] "% rekaman terpotong\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "menutup berkas masukan %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "menutup berkas keluaran %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "gagal untuk mematikan O_DIRECT: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "menulis ke %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "operand %s tidak dikenal" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "konversi tidak valid" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "masukan flag tidak valid" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "keluaran flag tidak valid" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "statu flag tidak valid" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "nomor %s tidak valid" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "tidak dapat mengkombinasikan dua dari {ascii, ebcdic, ibm}" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "tidak dapat mengkombinasikan blok dan unblok" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "tidak dapat mengkombinasikan huruf kecil dan huruf besar" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "tidak dapat mengkombinasikan excl dan nocreat" -#: src/dd.c:1424 +#: src/dd.c:1527 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "tidak dapat mengkombinasikan excl dan nocreat" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3509,62 +3568,62 @@ msgstr "" "peringatan: bekerja dalam lseek kernel bug untuk berkas (%s)\n" " dari mt type=0x%00lx -- lihat untuk daftar dari type" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: tidak dapat melewati" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: tidak dapat mencari" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "offset overflow ketika membaca berkas %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "peringatan: berkas ofset tidak valid setelah gagal baca" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "tidak dapat bekerja dalam kernel bug ternyata" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "menset flag untuk %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: tidak dapat melewati ofset yang dispesifikasikan" -#: src/dd.c:2172 +#: src/dd.c:2288 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "gagal untuk memotong % byte dalam berkas keluaran %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync gagal untuk %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "fsync gagal untuk %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "gagal untuk membuka %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3573,19 +3632,19 @@ msgstr "" "ofset terlalu besar: tidak dapat memotong ke panjang dari seek=% " "(%lu-byte) blok" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "gagal untuk memotong % byte dalam berkas keluaran %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, fuzzy, c-format msgid "failed to discard cache for: %s" msgstr "gagal untuk chdir ke %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3666,12 +3725,12 @@ msgstr "Kapasita" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 #, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" @@ -3683,14 +3742,14 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 #, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3701,7 +3760,7 @@ msgstr "" " -H, --si sama seperti itu, tetapi menggunakan kelipatan dari " "1000 bukan 1024\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3715,7 +3774,7 @@ msgstr "" " --no-sync jangan menjalankan sync sebelum memperoleh informasi " "penggunaan (default)\n" -#: src/df.c:1409 +#: src/df.c:1429 #, fuzzy msgid "" " --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" @@ -3723,6 +3782,28 @@ msgid "" "omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" +msgstr "" +" -P, --portability gunakan format keluaran POSIX\n" +" --sync menjalankan sync sebelum memperoleh informasi " +"penggunaan\n" +" -t, --type=TYPE membatasi daftar dari sistem berkas dari tipe TIPE\n" +" -T, --print-type menampilkan tipe sistem berkas\n" +" -x, --exclude-type=TYPE membatasi daftar dari sistem berkas bukan dari " +"tipe TIPE\n" +" -v (diabaikan)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose tampilkan sebuah diagnosa tepat sebelum setiap\n" +" berkas keluaran dibuka\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3737,7 +3818,7 @@ msgstr "" "tipe TIPE\n" " -v (diabaikan)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3745,25 +3826,25 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, fuzzy, c-format msgid "options %s and %s are mutually exclusive" msgstr "pilihan --compare (C) dan --strip adalah mutually exclusive" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "sistem berkas tipe %s keduanyan dipilih dan diexclude" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Peringatan: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "tidak dapat membaca tabel dari sistem berkas yang terpasang" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "tidak ada sistem berkas yang diproses" @@ -3879,7 +3960,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3890,7 +3971,8 @@ msgstr "" #: src/du.c:285 #, fuzzy -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Ringkas penggunaan disk dari setiap BERKAS, secara rekursif untuk " "direktori.\n" @@ -4029,63 +4111,57 @@ msgstr "" msgid "Infinity" msgstr "Tak terhingga B" -#: src/du.c:636 +#: src/du.c:657 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fts_read gagal" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "kedalaman maksimal %s tidak valid" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "argumen --%s tidak valid %s" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "tidak dapat meringkas dan menampilkan seluruh masukan bersamaan" -#: src/du.c:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "peringatan: meringkas konflik dengan --max-depth=%lu" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "berkas operand tidak dapat dikombinasikan dengan --files0-from." -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: error membaca" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "nama berkas panjang-nol tidak valid" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "total" @@ -4230,9 +4306,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\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" @@ -4279,7 +4353,7 @@ msgid "input line is too long" msgstr "baris masukan terlalu panjang" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4435,12 +4509,12 @@ msgstr "error dalam pencocokan ekspresi regular" msgid "non-integer argument" msgstr "argumen tidak numeric" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "pembagian dengan nol" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "set LC_ALL='C' untuk memperbaiki masalah" @@ -4451,31 +4525,31 @@ msgid "the strings compared were %s and %s" msgstr "string yang dibandingkan adalah %s dan %s" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s bukan sebuah valid positif integer" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s terlalu besar" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4484,7 +4558,7 @@ msgstr "" "Penggunaan: %s [NOMOR]...\n" " atau: %s PILIHAN\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -4532,7 +4606,7 @@ msgstr "" "Pilihan -WIDTH adalah kependekan dari bentuk --width=DIGITS.\n" "\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4545,7 +4619,7 @@ msgstr "" " reattaching prefix ke baris yang diformat\n" " -s, --split-only split baris panjang, tetapi jangan refill\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, fuzzy, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4557,7 +4631,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:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4567,23 +4641,21 @@ msgstr "" "pilihan\n" "pertama; gunakan -w N daripada" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "lebar tidak valid: %s" -#: src/fold.c:70 +#: src/fold.c:69 #, fuzzy -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "Wrap baris masukan dalam setiap BERKAS (standar masukan secara default), " "tulis ke\n" "standar keluaran.\n" "\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4593,9 +4665,9 @@ msgstr "" " -s, --spaces break di spaces\n" " -w, --width=WIDTH gunakan WIDTH kolom daripada 80\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "jumlah dari kolom tidak valid: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4668,12 +4740,11 @@ msgstr "tidak dapat menset id pengguna" msgid "%s: no such user" msgstr "%s: Tidak ada pengguna seperti itu" -#: src/head.c:109 +#: src/head.c:110 #, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Tampilkan 10 baris pertama dari setiap BERKAS ke standar keluaran.\n" "Dengan lebih dari satu BERKAS, awali setiap dengan sebuah header memberikan " @@ -4681,7 +4752,7 @@ msgstr "" "Dengan tidak ada BERKAS, atau ketika BERKAS adalah -, baca standar masukan.\n" "\n" -#: src/head.c:117 +#: src/head.c:118 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4700,7 +4771,7 @@ msgstr "" "baris\n" " terakhir dari setiap berkas\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4709,7 +4780,7 @@ msgstr "" "berkas\n" " -v, --verbose selalu menampilkan header memberikan nama berkas\n" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4721,48 +4792,36 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: berkas telah mengecil terlalu banyak" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: jumlah dari byte terlalu besar" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: tidak dapat mencari ofset %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: tidak dapat mencari ofset relatif %s" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "jumlah dari baris" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "jumlah dari byte" +msgid "%s: number of bytes is too large" +msgstr "%s: jumlah dari byte terlalu besar" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "jumlah dari baris tidak valid" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "jumlah dari byte tidak valid" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "akhiran pilihan tidak valid -- %c" @@ -4952,7 +5011,7 @@ msgstr "tidak dapat mengubah kepemilikan dari %s" msgid "cannot set time stamps for %s" msgstr "tidak dapat menset time stamps untuk %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "fork system call gagal" @@ -5112,7 +5171,7 @@ msgstr "pilihan strip tidak boleh digunakan ketika memasang sebuah direktori" msgid "target directory not allowed when installing a directory" msgstr "direktori tujuan tidak memperbolehkan ketika memasang sebuah direktori" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "mode tidak valid %s" @@ -5150,11 +5209,15 @@ msgid "Mike Haertel" msgstr "Mike Haertel" #: src/join.c:195 -#, 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" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5171,7 +5234,7 @@ msgstr "" " FILENUM adalah 1 atau 2, sesuai dengan FILE1 atau FILE2\n" " -e EMPTY menggantikan field masukan yang hilang dengan EMPTY\n" -#: src/join.c:204 +#: src/join.c:210 #, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" @@ -5184,7 +5247,7 @@ msgstr "" " -o FORMAT patuhi FORMAT ketika membuat baris keluaran\n" " -t CHAR gunakan CHAR sebagai pemisah field masukan dan keluaran\n" -#: src/join.c:210 +#: src/join.c:216 #, fuzzy msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" @@ -5205,13 +5268,13 @@ msgstr "" " jika seluruh masukan baris dapat dipasangkan\n" " --nocheck-order jangan periksa masukan adalah diurutkan secara benar\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 #, fuzzy msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated akhir baris dengan 0 byte, bukan baris baru\n" -#: src/join.c:225 +#: src/join.c:231 #, fuzzy msgid "" "\n" @@ -5250,47 +5313,47 @@ msgstr "" "sebuah\n" "pesan peringatan akan diberikan.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "nomor field tidak valid: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "spesifikasi field tidak valid: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "nomor berkas tidak valid dalam field spec: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "join field tidak kompatible %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "konflik penggantian string empty-field" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "multi-character tab %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "incompatible tabs" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "kedua berkas tidak dapat berupa standar masukan" @@ -5371,17 +5434,17 @@ msgstr "tidak dapat mengkombinasikan sinyal dengan -l atau -t" msgid "no process ID specified" msgstr "tidak ada proses ID dispesifikasikan" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "gagal untuk mengalokasikan sebuah % byte penyangga stdio\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "mode penyangga %s tidak valid untuk %s\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "tidak dapat menset penyangga dari %s untuk mode %s\n" @@ -5579,7 +5642,7 @@ msgstr "tidak dapat membuat link simbolik %s" msgid "FIXME: unknown" msgstr "BETULKAN AKU: tidak diketahui" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Penggunaan: %s [PILIHAN]\n" @@ -5592,7 +5655,7 @@ msgstr "" "Menampilkan nama dari pengguna sekarang.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "bukan nama login" @@ -5602,7 +5665,7 @@ msgstr "bukan nama login" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -5611,97 +5674,97 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" -"mengabaikan nilai tidak valid dari variabel lingkungan QUOTING_STYLE: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "mengabaikan lebar tidak valid dalam variabel lingkungan KOLOM: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "mengabaikan ukuran tab tidak valid dalam variabel lingkungan UKURAN TAB: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "lebar baris tidak valid: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "ukuran tab tidak valid: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "format gaya waktu tidak valid: %s" -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "Argumen yang valid adalah:" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "error menginisialisasi string bulan" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "prefix tidak dikenal: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "nilai tidak dapat diparse untuk variabel lingkungan LS_COLORS" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" +"mengabaikan nilai tidak valid dari variabel lingkungan QUOTING_STYLE: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "tidak dapat membuka direktori %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "tidak dapat menentukan perangkat dan inode dari %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: tidak mendaftar direktori yang sudah terdaftar" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "membaca direktori %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "menutup direktori %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "tidak dapat membandingkan nama berkas %s dan %s" -#: src/ls.c:4781 +#: src/ls.c:4775 #, fuzzy msgid "" "List information about the FILEs (the current directory by default).\n" @@ -5711,7 +5774,7 @@ msgstr "" "Urutkan masukan secara alphabet jika tidak ada dari -cftuvSUX atau --sort.\n" "\n" -#: src/ls.c:4788 +#: src/ls.c:4782 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5727,7 +5790,7 @@ msgstr "" " -b, --escape menampilkan oktal escape untuk karakter bukan " "bergambar\n" -#: src/ls.c:4794 +#: src/ls.c:4788 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." @@ -5752,13 +5815,14 @@ msgstr "" "nama\n" " jika tidak; urutkan dengan ctime\n" -#: src/ls.c:4804 +#: src/ls.c:4798 #, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5773,7 +5837,7 @@ msgstr "" " -D, --dired menghasilkan keluarkan didesign untuk Emacs' " "dired mode\n" -#: src/ls.c:4812 +#: src/ls.c:4807 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5794,12 +5858,12 @@ msgstr "" " satu-kolom -1, verbose -l, vertikal -C\n" " --full-time seperti -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" " -g seperti -l, tetapi jangan mendaftar pemilik\n" -#: src/ls.c:4823 +#: src/ls.c:4818 #, fuzzy msgid "" " --group-directories-first\n" @@ -5815,7 +5879,7 @@ msgstr "" " penggunaan apapun dari --sort=none (-U) " "menonaktifkan grup\n" -#: src/ls.c:4829 +#: src/ls.c:4824 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5831,7 +5895,7 @@ msgstr "" " --si sama seperti diatas, tetapi menggunakan " "kelipatan 1000 bukan 1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 #, fuzzy msgid "" " -H, --dereference-command-line\n" @@ -5854,7 +5918,7 @@ msgstr "" "POLA\n" " (overriden dengan -a atau -A)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5875,7 +5939,7 @@ msgstr "" "POLA\n" " -k seperti --block-size=1K\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5893,7 +5957,7 @@ msgstr "" " -m isi lebar dengan sebuah masukan yang " "dipisahkan dengan koma\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5913,7 +5977,7 @@ msgstr "" " -p, --indicator-style=slash\n" " menambahkan / indikator ke direktori\n" -#: src/ls.c:4871 +#: src/ls.c:4866 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" @@ -5934,7 +5998,7 @@ msgstr "" " --quoting-style-chars gunakan quoting style KATA untuk masukan nama:\n" " literal, local, shell, shell-always, c, escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5946,19 +6010,19 @@ msgstr "" " -s, --size tampilkan ukuran dari setiap berkas yang " "dialokasikan, dalam blok\n" -#: src/ls.c:4886 +#: src/ls.c:4881 #, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S mengurutkan dengan ukuran berkas\n" " --sort=WORD urutkan dengan WORD daripada dari nama: none -" @@ -5971,7 +6035,7 @@ msgstr "" "sebagai kunci pengurut\n" " jika --sort=time\n" -#: src/ls.c:4896 +#: src/ls.c:4892 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5996,7 +6060,7 @@ msgstr "" " jika STYLE di awali dengan `posix-', STYLE\n" " berpengaruh hanya diluar POSIX locale\n" -#: src/ls.c:4908 +#: src/ls.c:4904 #, fuzzy msgid "" " -t sort by modification time, newest first\n" @@ -6006,12 +6070,12 @@ msgstr "" " -T, --tabsize=COLS asumsikan tab stops ada di setiap COLS " "daripada 8\n" -#: src/ls.c:4912 +#: src/ls.c:4908 #, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -6024,14 +6088,15 @@ msgstr "" "direktori\n" " -v urutkan sesuai dengan versi\n" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, -width=COLS asumsikan lebar layar daripada nilai sekarang\n" " -x daftar masukan dengan baris daripada dengan " @@ -6042,7 +6107,7 @@ msgstr "" "untuk setiap berkas\n" " -1 tampilkan sat berkas per baris\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6059,7 +6124,7 @@ msgstr "" "dapat mengubah konfigurasi ini. Gunakan perintah dircolors untuk " "mengubahnya.\n" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6091,43 +6156,44 @@ msgid "David Madore" msgstr "David Madore" #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" "Penggunaan: %s [PILIHAN]... [BERKAS]...\n" "Tampilkan atau periksa %s (%d-bit) checksums.\n" "dengan tanpa BERKAS, atau ketika BERKAS adalah -, baca standar masukan.\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 #, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" " -b, --binary baca dalam mode binary (default kecuali membaca " "tty stdin)\n" -#: src/md5sum.c:178 +#: src/md5sum.c:180 #, fuzzy -msgid " -b, --binary read in binary mode\n" +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary baca dalam mode binary\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 #, fuzzy msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" @@ -6135,12 +6201,12 @@ msgstr "" " -t, --text baca dalam mode text (default jika membaca tty " "stdin)\n" -#: src/md5sum.c:192 +#: src/md5sum.c:195 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text baca dalam mode text (default)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 #, fuzzy msgid "" "\n" @@ -6162,14 +6228,15 @@ msgstr "" "dengan baris checksum\n" "\n" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "Sum dihitung sesuai dijelaskan dalam %s. Ketika memeriksa, masukan\n" @@ -6179,42 +6246,42 @@ msgstr "" "untuk binary, ` ' untuk \n" "text), dan nama untuk setiap BERKAS.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: terlalu banyak baris checksum" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: baris checksum %s terformat secara tidak benar" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: GAGAL membuka atau membaca\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "GAGAL" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "OK" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, 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:629 +#: src/md5sum.c:632 #, fuzzy, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "%s: %: baris checksum %s terformat secara tidak benar" msgstr[1] "%s: %: baris checksum %s terformat secara tidak benar" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, fuzzy, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" @@ -6223,7 +6290,7 @@ msgstr[0] "" msgstr[1] "" "PERINGATAN: % dari % daftar berkas tidak dapat dibaca" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, fuzzy, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" @@ -6232,39 +6299,39 @@ msgstr[0] "" msgstr[1] "" "PERINGATAN: % dari % checksum yang terhitung TIDAK cocok" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, fuzzy, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "pilihan --status hanya berguna ketika memverifikasikan checksum" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, 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:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "pilihan --status hanya berguna ketika memverifikasikan checksum" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "pilihan --warn hanya berguna ketika memverifikasikan checksum" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "pilihan --quiet hanya berguna ketika memverifikasikan checksum" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "pilihan --status hanya berguna ketika memverifikasikan checksum" @@ -6306,22 +6373,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "gagal untuk menset default berkas pembuatan konteks ke %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "gagal untuk menjaga waktu untuk %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "direktori %s dibuat" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, fuzzy, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6543,7 +6610,7 @@ msgstr "terlalu banyak template" msgid "with --suffix, template %s must end in X" msgstr "dengan --suffix, template %s harus berakhir dalam X" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "akhiran tidak valid %s, berisi pemisah direktori" @@ -6688,9 +6755,7 @@ msgstr "Scott Bartram" #: src/nl.c:179 #, fuzzy -msgid "" -"Write each FILE to standard output, with line numbers added.\n" -"With no FILE, or when FILE is -, read standard input.\n" +msgid "Write each FILE to standard output, with line numbers added.\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" @@ -6802,27 +6867,27 @@ msgstr "gaya penomoran body: %s tidak valid" msgid "invalid footer numbering style: %s" msgstr "gaya penomoran footer: %s tidak valid" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "awalan nomor baris: %s tidak valid" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "nomor baris increment: %s tidak valid" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "jumlah dari baris kosong: %s tidak valid" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "lebar field nomor baris: %s tidak valid" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "format penomoran baris: %s tidak valid" @@ -6848,7 +6913,7 @@ msgstr "" #, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6868,43 +6933,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "gagal untuk me-'render' masukan baku yang tidak berguna" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "mengabaikan masukan" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "mengabaikan masukan dan menambahkan keluaran ke %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "menambahkan keluaran ke %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "gagal untuk menset salinan dari stderr untuk ditutup pada saat exec" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "mengabaikan masukan dan meredirect stderr ke stdout" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "meredirect stderr ke stdout" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -6931,96 +6996,93 @@ msgstr "" " --all tampilkan jumlah dari prosesor yang terpasang\n" " --ignore=N jika memungkinkan, abaikan N satuan pemrosesan\n" -#: 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, fuzzy, c-format msgid "value too large to be converted: %s" msgstr "%s: nilai tidak secara lengkap diubah" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "nomor %s tidak valid" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "akhiran dalam %s%s tidak valid argumen `%s'" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, fuzzy, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "akhiran dalam %s%s tidak valid argumen `%s'" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "%s: gagal untuk membuka untuk menulis" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "ukuran tab tidak valid: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Penggunaan: %s [PILIHAN]... [PENGGUNA]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -7028,19 +7090,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -7050,30 +7112,30 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 #, fuzzy msgid "" "\n" @@ -7082,11 +7144,11 @@ msgstr "" "Pilihan lain:\n" "\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -7095,7 +7157,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -7103,7 +7165,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7111,7 +7173,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7119,18 +7181,38 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 -#, c-format +#: src/numfmt.c:973 +#, fuzzy msgid "" "\n" -"FORMAT must be suitable for printing one floating-point argument '%f'.\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Setiap jangkauan adalah satu dari:\n" +"\n" +" N byte, karakter atau field ke N, dihitung dari 1\n" +" N- dari byte, karakter atau field ke N, ke akhir dari baris\n" +" N-M dari N ke M (termasuk) byte, karakter atau field\n" +" -M dari pertama ke M (termasuk) byte, karakter atau field\n" + +#: src/numfmt.c:983 +#, 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 zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7142,7 +7224,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -7157,118 +7239,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "format %s tidak memiliki %% direktif" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "format lebar tidak valid" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "format %s berakhir dalam %%" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "presisi tidak valid: %s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "format %s memiliki terlalu banyak %% direktif" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "akhiran dalam %s%s tidak valid argumen `%s'" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "nomor field tidak valid: %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "jangkauan halaman %s tidak valid" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "nomor field tidak valid: %s" +msgid "multiple field specifications" +msgstr "%s: spesifikasi field %s tidak valid" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "tanggal tidak valid %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, fuzzy, c-format msgid "--grouping cannot be combined with --format" msgstr "berkas operand tidak dapat dikombinasikan dengan --files0-from." -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "banyak pilihan -i dispesifikasikan" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, fuzzy, c-format msgid "grouping cannot be combined with --to" msgstr "berkas operand tidak dapat dikombinasikan dengan --files0-from." -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "error membaca %s" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, 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:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7281,14 +7375,13 @@ msgstr "" " atau: %s --traditional [PILIHAN]... [BERKAS] [[+]OFFSET[.][b] [+]" "[LABEL][.][b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Tulis sebuah represetasi ambigu, oktal byte secara default,\n" @@ -7297,9 +7390,10 @@ msgstr "" "dengan tidak ada BERKAS, atau ketika BERKAS adalah -, baca standar masukan.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 #, 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" @@ -7318,7 +7412,7 @@ msgstr "" "hexadesimal;\n" "akhiran mungkin . untuk oktal dan b untuk kelipatan dari 512.\n" -#: src/od.c:344 +#: src/od.c:347 #, fuzzy msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" @@ -7330,7 +7424,7 @@ msgstr "" " -A, --address-radix=RADIX tentukan bagaimana berkas ofset ditampilkan\n" " -j, --skip-bytes=BYTES lewati BYTES masukan awal byte\n" -#: src/od.c:350 +#: src/od.c:353 #, fuzzy msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" @@ -7352,7 +7446,7 @@ msgstr "" " -w, --width[=BYTES] keluarkan byte BYTES per baris keluaran\n" " --traditional menerima argumen dalam format tradisional\n" -#: src/od.c:363 +#: src/od.c:366 #, fuzzy msgid "" "\n" @@ -7371,7 +7465,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:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7387,7 +7481,7 @@ 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:380 +#: src/od.c:383 #, fuzzy msgid "" "\n" @@ -7402,7 +7496,7 @@ msgstr "" " a karakter bernama, mengabaikan high-order bit\n" " c karakter ASCII atau backslash escape\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7416,7 +7510,7 @@ msgstr "" " u[SIZE] unsigned desimal, SIZE bytes per integer\n" " x[SIZE] hexadesimal, SIZE bytes per integer\n" -#: src/od.c:394 +#: src/od.c:397 #, fuzzy msgid "" "\n" @@ -7432,14 +7526,14 @@ msgstr "" "D\n" "untuk sizeof (double) atau L untuk sizeof(long double).\n" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 #, fuzzy msgid "" "\n" @@ -7457,12 +7551,12 @@ msgstr "" "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n" "GB 1000*1000*1000, G 1024*1024*1024, dan seterusnya untuk T, P, E, Z, Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "tipe string %s tidak valid" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7471,7 +7565,7 @@ msgstr "" "tipe string %s tidak valid;\n" "Sistem ini tidak memberikan sebuah tipe %lu-byte integral" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7480,38 +7574,38 @@ msgstr "" "Tipe string %s tidak valid;\n" "Sistem ini tidak memberikan sebuah %lu-byte tipe floating point" -#: src/od.c:869 +#: src/od.c:872 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "karakter `%c' tidak valid dalam tipe string %s" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "tidak dapat melewatkan akhir dari kombinasi masukan" -#: src/od.c:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "tidak ada tipe yang bisa dispesikasikan ketika mendump strings" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "mode kompabilitas melayani di setiap berkas." -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "Skip-bytes + read-bytes terlalu besar" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "peringatan: lebar tidak valid %lu; menggunakan %d" @@ -7531,7 +7625,6 @@ msgstr "standar masukan telah ditutup" 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 "" "Tulis baris berisi dari baris berurut dari\n" "setiap BERKAS, dipisahkan dengan TAB, ke standar keluaran.\n" @@ -7676,12 +7769,12 @@ msgstr "Ketika" msgid "Where" msgstr "Dimana" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Penggunaan: %s [PILIHAN]... [PENGGUNA]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7699,7 +7792,7 @@ msgstr "" " -p mengabaikan berkas rencana pengguna dalam format panjang\n" " -s jangan memendekan format keluaran, ini adalah default\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7715,7 +7808,7 @@ msgstr "" "idle\n" " dalam format pendek\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, fuzzy, c-format msgid "" "\n" @@ -7726,7 +7819,7 @@ msgstr "" "Sebuah aplikasi ringan `finger'; menampilkan informasi pengguna.\n" "Berkas utmp akan berada %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7734,97 +7827,97 @@ msgstr "" "dispesifikasikan ketika menggunakan -l" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "`--pages=FIRST_PAGE[:LAST_PAGE]' argumen hilang" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "jangkauan halaman %s tidak valid" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "`-l PAGE_LENGTH' nomor baris tidak valid: %s" -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "`-N NOMOR' tidak valid dimulai dibaris nomor: %s" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "`-o MARGIN' tidak valid di baris ofset: %s" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "`-w PAGE_WIDTH' tidak valid jumlah dari karakter: %s" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "`-W PAGE_WIDTH' tidak valid jumlah dari karakter: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, 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:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "lebar halaman terlalu kecil" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" "nomor halaman dimulai dari % melebihi jumlah halaman %" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "jumlah halaman berlebihan" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Halaman %" -#: src/pr.c:2757 +#: src/pr.c:2727 #, fuzzy msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "Paginate atau columnate BERKAS untuk dicetak.\n" "\n" -#: src/pr.c:2763 +#: src/pr.c:2734 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -7842,7 +7935,7 @@ msgstr "" "dalam\n" " kolom disetiap halaman.\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7859,7 +7952,7 @@ msgstr "" " -d, --double-space\n" " keluaran menggunakan dua spasi\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7881,7 +7974,7 @@ msgstr "" "5 baris header\n" " dan trailer tanpat -F)\n" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7904,11 +7997,25 @@ msgstr "" "ada kolom\n" " penyesuaian, --sep-string[=STRING] set pemisah\n" -#: src/pr.c:2798 +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l, --length=PAGE_LENGTH\n" +" set panjang halaman ke PAGE_LENGTH (66) baris\n" +" (default jumlah baris dari text 56, dan dengan -F 63)\n" +" -m, --merge menampilkan seluruh berkas dalam paralel, satu di setiap " +"kolom,\n" +" truncate baris, tetapi gabungkan baris dari lebar " +"panjang lengkap dengan -J\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -7920,7 +8027,7 @@ msgstr "" " truncate baris, tetapi gabungkan baris dari lebar " "panjang lengkap dengan -J\n" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7939,7 +8046,7 @@ msgstr "" "berkas\n" " pertama yang ditampilkan (lihat +FIRST_PAGE)\n" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7955,7 +8062,7 @@ msgstr "" " abaikan peringatan ketika sebuah berkas tidak dapat " "dibuka\n" -#: src/pr.c:2820 +#: src/pr.c:2794 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -7974,7 +8081,7 @@ msgstr "" "kolom\n" " pilihan (-COLUMN|-a -COLUMN|-m) kecuali -w diset\n" -#: src/pr.c:2828 +#: src/pr.c:2802 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7982,7 +8089,6 @@ msgid "" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -SSTRING, --sep-string[=STRING]\n" " pisahkan kolom dengan STRING,\n" @@ -7991,7 +8097,13 @@ msgstr "" "pilihan kolom\n" " -t, --omit-header abaikan header halaman dan akhiran\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -8015,7 +8127,7 @@ msgstr "" " keluaran multiple text-kolom saja, -s[char] matikan " "(72)\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -8029,17 +8141,6 @@ msgstr "" "interference\n" " dengan -S atau -s\n" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"-t mengindikasikan jika PAGE_LENGTH <= 10. Dengan tidak ada BERKAS, atau " -"ketika\n" -"BERKAS adalah -, baca standar masukan.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -8204,12 +8305,11 @@ msgstr "" "berkas masukan.\n" "\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 #, fuzzy 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 keluarkan secara otomatis referensi yang " "dihasilkan\n" @@ -8218,6 +8318,12 @@ msgstr "" "baris\n" #: src/ptx.c:1835 +msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -8235,7 +8341,7 @@ msgstr "" "kalimat\n" " -T, --format=tex menghasilkan keluaran seperti direktif Tex\n" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8256,7 +8362,7 @@ msgstr "" " -o, --only-file=FILE baca hanya daftar kata saja dari BERKAS " "ini\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8269,20 +8375,16 @@ msgstr "" " -w, --width=NUMBER lebar keluaran dalam kolom, referensi " "diabaikan\n" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Tanpa BERKAS, atau ketika BERKAS adalah -, baca masukan standar.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "lebar gap tidak valid: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "lebar baris tidak valid: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8311,7 +8413,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "gagal untuk chdir ke %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "gagal memperoleh statistik %s" @@ -8331,8 +8433,8 @@ msgstr "mengabaikan argumen bukan pilihan" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Penggunaan: %s [PILIHAN]... BERKAS...\n" @@ -8588,15 +8690,15 @@ msgstr "" #: src/rm.c:342 #, fuzzy, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: hapus seluruh argumen rekursif? " msgstr[1] "%s: hapus seluruh argumen rekursif? " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: hapus seluruh argumen? " msgstr[1] "%s: hapus seluruh argumen? " @@ -8827,12 +8929,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "argumen floating point tidak valid: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "format %s memiliki %%%c direktif tidak diketahui" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8855,7 +8957,16 @@ msgstr "" "untuk bahkan perangkat mahal probing untuk menyelematkan data.\n" "\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Jika sebuah BERKAS adalah -, salin kembali ke standar keluaran.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8869,7 +8980,7 @@ msgstr "" " -s, --size=N shred sebanyak bytes ini (akhiran seperti K, M, G " "diterima)\n" -#: src/shred.c:183 +#: src/shred.c:187 #, fuzzy msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" @@ -8885,12 +8996,10 @@ msgstr "" " -z, --zero tambahkan sebuah akhir paksa tulis dengan nol untuk " "menyembunyikan shredding\n" -#: src/shred.c:192 +#: src/shred.c:196 #, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -8913,7 +9022,7 @@ msgstr "" "umum, kebanyakan orang menggunakan pilihan --remove.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8932,7 +9041,7 @@ msgstr "" "berkas:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8955,7 +9064,7 @@ msgstr "" "server\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8969,7 +9078,7 @@ msgstr "" "* sistem berkas terkompres\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -8992,7 +9101,7 @@ msgstr "" "seperti yang terdokumentasi dalam halaman manual mount (man mount).\n" "\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -9004,127 +9113,127 @@ msgstr "" "berkas yang tershred untuk\n" "diselamatkan nanti.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync gagal" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync gagal" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: gagal rewind" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: tahap %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: error menulis di ofset %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek gagal" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: berkas terlalu besar" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: tahap %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: tahap %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat gagal" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: tipe berkas tidak valid" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: berkas memilik ukuran negatif" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: error memotong" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl gagal" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: tidak dapat menshred tambah-saja berkas deskripsi" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: menghapus" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: diubah namanya menjadi %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: gagal untuk menghapus" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: dihapus" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: gagal untuk menutup" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: gagal untuk membuka untuk menulis" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: jumlah tahap tidak valid" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "banyak sumber random dispesifikasikan" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: ukuran berkas tidak valid" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -9135,14 +9244,14 @@ msgstr "" " atau: %s -e [PILIHAN]... [ARG]...\n" " atau: %s -i LO-HI [PILIHAN]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 #, 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:73 +#: src/shuf.c:75 #, fuzzy msgid "" " -e, --echo treat each ARG as an input line\n" @@ -9162,37 +9271,37 @@ 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:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "terlalu banyak pengulangan baris" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "banyak pilihan -i dispesifikasikan" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "jangkauan masukan %s tidak valid" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "jumlah baris %s tidak valid" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "banyak berkas keluaran dispesifikasikan" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "tidak dapat mengkombinasikan pilihan -e dan -i" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -9222,12 +9331,12 @@ msgstr "" "yang dispesifikasikan oleh jumlah dari nilainya.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "jangka waktu %s tidak valid" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "tidak dapat membaca realtime clock" @@ -9239,7 +9348,7 @@ msgstr "" "Tulis concatenation terurut dari seluruh BERKAS ke standar keluaran.\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -9247,7 +9356,7 @@ msgstr "" "Pilihan pengurutan:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9259,7 +9368,7 @@ msgstr "" "dan angka\n" " -f, --ignore-case ubah karakter huruf kecil ke huruf besar\n" -#: src/sort.c:443 +#: src/sort.c:444 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -9272,14 +9381,14 @@ msgstr "" " -M, --month-sort bandingkan (tidak diketahui) < `JAN' < ... < " "`DEC'\n" -#: src/sort.c:448 +#: src/sort.c:449 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:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9291,7 +9400,7 @@ msgstr "" " --random-source=BERKAS dapatkan random bytes dari BERKAS\n" " -r, --reverse balik hasil dari komparasi\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9307,7 +9416,7 @@ msgstr "" " -V, --version-sort urutan alami dari nomor versi dalam teks\n" "\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -9315,7 +9424,7 @@ msgstr "" "Pilihan lain:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9323,7 +9432,7 @@ msgstr "" " --batch-size=NMERGE gabungkan di NMERGE masukan dalam satu waktu;\n" " untuk penggunaan lebih berkas sementara\n" -#: src/sort.c:473 +#: src/sort.c:474 #, fuzzy msgid "" " -c, --check, --check=diagnose-first check for sorted input; do not sort\n" @@ -9342,7 +9451,7 @@ msgstr "" "oleh\n" " nama yang diakhiri NUL dalam berkas F\n" -#: src/sort.c:480 +#: src/sort.c:481 #, fuzzy msgid "" " --debug annotate the part of the line used to sort,\n" @@ -9361,7 +9470,7 @@ msgstr "" "oleh\n" " nama yang diakhiri NUL dalam berkas F\n" -#: src/sort.c:487 +#: src/sort.c:488 #, fuzzy msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" @@ -9373,7 +9482,7 @@ msgstr "" " -m, --merge gabungkan berkas yang sudah diurutkan, jangan " "urutkan\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9386,7 +9495,7 @@ msgstr "" "perbandingan terakhir\n" " -S, --buffer-size=SIZE gunakan SIZE untuk buffer memori utama\n" -#: src/sort.c:497 +#: src/sort.c:498 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9410,7 +9519,7 @@ msgstr "" " tanpa -c, keluarkan hanya pertama dari sebuah " "jalan pertama\n" -#: src/sort.c:511 +#: src/sort.c:512 #, fuzzy msgid "" "\n" @@ -9443,12 +9552,11 @@ msgstr "" "\n" "UKURAN mungkin diikuti dengan akhiran pengali berikut:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -9464,249 +9572,247 @@ msgstr "" "Set LC_ALL=C untuk memperoleh cara pengurutan tradisional yang menggunakan\n" "nilai byte asli.\n" -#: src/sort.c:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "menunggu untuk %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] berakhir secara tidak normal" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "tidak dapat membuat berkas sementara dalam %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "gagal membuka" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "fflush gagal" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "gagal menutup" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "tidak dapat membuat berkas sementara" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "tidak dapat membuat proses untuk %s -d" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "peringatan: tidak dapat menghapus: %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "argumen --%s tidak valid %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "argumen %s minimum --%s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "--%s argumen %s terlalu besar" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "maksimal --%s argumen dengan rlimit sekarang adalah %s" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "stat gagal" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "baca gagal" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "Transformasi string gagal" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "untransformasi string adalah %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "%s: pilihan '%s' adalah ambigu\n" msgstr[1] "%s: pilihan '%s' adalah ambigu\n" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "tulis gagal" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: tidak terurut: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "standar error" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "%s: gagal rewind" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: spesifikasi field %s tidak valid" -#: src/sort.c:4028 +#: src/sort.c:4027 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "pilihan `-%s' tidak kompatibel" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: jumlah tidak valid di awal dari %s" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "jumlah tidak valid setelah `-'" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "jumlah tidak valid setelah `.'" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "karakter sisa dalam spesifikasi field" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "banyak aplikasi kompresi dispesifikasikan" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "jumlah tidak valid di awal field" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "jumlah field adalah nol" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "karakter ofset adalah nol" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "jumlah tidak valid setelah `,'" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "empty tab" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "tidak dapat membaca nama berkas dari %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: nama berkas panjang-nol tidak valid" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "tidak ada masukan masukan dari %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "kelebihan operan %s tidak dibolehkan dengan -%c" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Penggunaan: %s [PILIHAN]... [MASUKAN [PREFIX]]\n" -#: src/split.c:207 +#: src/split.c:228 #, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" "Keluarkan fixed-size pieces dari MASUKAN ke AWALAHaa, AWALANab, ...; " "default\n" @@ -9715,25 +9821,28 @@ msgstr "" "adalah -, baca standar masukan.\n" "\n" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9741,203 +9850,208 @@ msgstr "" " --verbose tampilkan sebuah diagnosa tepat sebelum setiap\n" " berkas keluaran dibuka\n" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "Kehabisan akhiran berkas keluaran" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "membuat berkas %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "gagal untuk memperbarui lingkungan dengan %s" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "gagal untuk menghapus %s" -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" msgstr "menutup direktori %s" -#: src/split.c:410 +#: src/split.c:464 #, fuzzy, c-format msgid "closing output pipe" msgstr "menutup berkas keluaran %s" -#: src/split.c:414 +#: src/split.c:468 #, fuzzy, c-format msgid "moving input pipe" msgstr "menutup berkas masukan %s" -#: src/split.c:416 +#: src/split.c:470 #, fuzzy, c-format msgid "closing input pipe" msgstr "menutup berkas masukan %s" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "gagal menjalankan perintah %s" -#: src/split.c:427 +#: src/split.c:481 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "gagal menutup direktori %s" -#: src/split.c:463 +#: src/split.c:517 #, fuzzy, c-format msgid "waiting for child process" msgstr "menunggu untuk strip" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "status dari perintah (0x%X) tidak diketahui" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "tidak dapat memisahkan lebih dari satu cara" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: jumlah detik tidak valid" -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: nomor tidak valid" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: panjang akhiran tidak valid" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: jumlah dari bytes tidak valid" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: jumlah dari baris tidak valid" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "multi-character tab %s" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "berkas karakter spesial" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "jumlah baris pilihan -%s%c... terlalu besar" -#: src/split.c:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "awalan nomor baris: %s tidak valid" -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: ukuran berkas tidak valid" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "gagal untuk menutup %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "peringatan: escape tidak dikenal `\\%c'" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: direktif tidak valid" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "peringatan: backslash di akhir dari format" -#: src/stat.c:1262 +#: src/stat.c:1265 #, 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:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "tidak dapat membaca informasi sistem berkas untuk %s" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9948,7 +10062,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9956,30 +10070,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, fuzzy, c-format msgid "Context: %C\n" msgstr " konteks=%s" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9987,11 +10101,11 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 #, fuzzy msgid "" " -L, --dereference follow links\n" @@ -10003,7 +10117,7 @@ msgstr "" " -f, --file-system tampilkan status sistem berkas dari pada status " "berkas\n" -#: src/stat.c:1422 +#: src/stat.c:1425 #, fuzzy msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" @@ -10024,7 +10138,7 @@ msgstr "" "FORMAT.\n" " -t, --terse tampilkan informasi dalam format lengkap\n" -#: src/stat.c:1433 +#: src/stat.c:1436 #, fuzzy msgid "" "\n" @@ -10045,7 +10159,7 @@ msgstr "" " %B Jumlah dalam bytes untuk setiap blok yang dilaporkan oleh %b\n" " %C String konteks keamanan SELinux\n" -#: src/stat.c:1442 +#: src/stat.c:1445 #, fuzzy msgid "" " %d device number in decimal\n" @@ -10062,7 +10176,7 @@ msgstr "" " %g Grup ID dari pemilik\n" " %G Nama ID dari pemilik\n" -#: src/stat.c:1450 +#: src/stat.c:1453 #, fuzzy msgid "" " %h number of hard links\n" @@ -10084,7 +10198,7 @@ msgstr "" " %t Tipe perangkat major dalam heksadesimal\n" " %T Tipe perangkat minor dalam heksadesimal\n" -#: src/stat.c:1461 +#: src/stat.c:1464 #, fuzzy msgid "" " %u user ID of owner\n" @@ -10108,7 +10222,7 @@ msgstr "" " %z Waktu terakhir diubah\n" " %Z Waktu terakhir diubah sebagai detik sejak Epoch\n" -#: src/stat.c:1475 +#: src/stat.c:1478 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -10128,7 +10242,7 @@ msgstr "" " %f Blok bebas dalam sistem berkas\n" " %C String konteks keamanan SELinux\n" -#: src/stat.c:1484 +#: src/stat.c:1487 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -10216,8 +10330,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -10250,7 +10363,7 @@ msgstr "baris penyangga stdin tidak berarti" msgid "you must specify a buffering mode option" msgstr "anda harus menspesifikasikan satu dari %s atau %s" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10261,11 +10374,11 @@ msgstr "" " atau: %s [-F PERANGKAT] [--file=PERANGKAT] [-a|-all]\n" " atau: %s [-F PERANGKAT] [--file=PERANGKAT] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 #, fuzzy msgid "" " -a, --all print all current settings in human-readable form\n" @@ -10281,7 +10394,7 @@ msgstr "" " -F, --file=DEVICE buka dan gunakan PERANGKAT yang dispesifikasikan " "daripada stdin\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10293,11 +10406,24 @@ msgstr "" "non-POSIX. Sistem yang berjalan mendefinisikan dimana konfigurasi yang " "tersedia.\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -10309,9 +10435,13 @@ msgstr "" "masukan)\n" " eof CHAR CHAR akan akhir dari baris\n" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -10322,35 +10452,58 @@ msgstr "" " intr CHAR CHAR akan mengirim sinyal interupsi\n" " kill CHAR CHAR akan menghapus baris sekarang\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" msgstr "" -" * lnext CHAR CHAR akan memasukan karakter berikutnya quoted\n" -" quit CHAR CHAR akan mengirim sebuah sinyal berhenti\n" -" * rprnt CHAR CHAR akan menggambar ulang baris sekarang\n" -" start CHAR CHAR akan mengulang keluaran setelah menyetopnya\n" -#: src/stty.c:559 +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 akan menghentikan keluaran\n" " susp CHAR CHAR akan mengirim sebuah sinyal berhenti terminal\n" " * swtch CHAR CHAR akan mengubah ke lapisan shell yang berbeda\n" " * werase CHAR CHAR akan menghapus kata terakhir yang diketik\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 +#, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Konfigurasi spesial:\n" +" N set kecepatan masukan dan keluaran ke N bauds\n" +" * cols N beritahu kernel bahwa terminal memilik N kolom\n" +" * columns N sama seperti cols N\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -10360,10 +10513,17 @@ msgstr "" " * cols N beritahu kernel bahwa terminal memilik N kolom\n" " * columns N sama seperti cols N\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -10374,11 +10534,23 @@ msgstr "" "pembacaan selesai\n" " ospeed N set kecepatan keluaran ke N\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N beritahu kernel bahwa terminal memiliki N baris\n" +" * size tampilkan jumlah dari baris dan kolom menurut yang ada di " +"kernel\n" +" speed tampilkan kecepatan terminal\n" +" time N Dengan -icanon, set timeout baca untuk N persepuluh dari " +"detik\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -10389,25 +10561,27 @@ msgstr "" " time N Dengan -icanon, set timeout baca untuk N persepuluh dari " "detik\n" -#: src/stty.c:584 -#, fuzzy +#: src/stty.c:641 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" -"Konfigurasi kontrol:\n" -" [-]clocal nonaktifkan sinyal kontrol modem\n" -" [-]cread bolehkan masukan untuk diterima\n" -" * [-]crtscts aktifkan RTS/CTS handshaking\n" -" csN set ukuran karakter ke N bits, N dalam [5..8]\n" -#: src/stty.c:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -10416,7 +10590,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb gunakan dua stop bit per karakter (satu dengan `-')\n" " [-]hup kirim sebuah sinyal hangup ketika proses terakhir tutup " @@ -10426,7 +10599,12 @@ msgstr "" "dalam masukan\n" " [-]parodd set odd parity (bahkan dengan `-')\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -10434,6 +10612,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Konfigurasi masukan:\n" @@ -10442,10 +10621,14 @@ msgstr "" " [-]ignbrk abaikan karakter break\n" " [-]igncr abaikan carriage return\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -10457,15 +10640,25 @@ msgstr "" " [-]inpck aktifkan pengecheckan masukan parity\n" " [-]istrip hapus atas (ke 8) bit dari karakter masukan\n" -#: src/stty.c:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" " * [-]iutf8 asumsikan karakter masukan adalah terenkode dalam UTF-8\n" -#: src/stty.c:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" +" * [-]iutf8 asumsikan karakter masukan adalah terenkode dalam UTF-8\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -10479,61 +10672,83 @@ msgstr "" " [-]parmrk tandai parity error (dengan sebuah urutan 255-0-karakter)\n" " [-]tandem sama seperti [-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Konfigurasi keluaran:\n" -" * bsN gaya backspace delay, N dalam [0..1]\n" -" * crN gaya carriage return delay, N dalam [0..3]\n" -" * ffN gaya form feed delay, N dalam [0..1]\n" -" * nlN gayal baris baru delay, N dalam [0..1]\n" -#: src/stty.c:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" -msgstr "" -" * [-]ocrnl translasikan carriage return ke baris baru\n" -" * [-]ofdel gunakan karakter del untuk mengisi daripada karakter " -"kosong\n" -" * [-]ofill gunakan isi (tambah) karakter daripada pewaktu untuk delay\n" -" * [-]olcuc translasikan karakter huruf kecil ke huruf besar\n" -" * [-]onlcr translasikan baris baru ke carriage return-baris baru\n" -" * [-]onlret baris baru menperformasikan sebuah carriage return\n" - -#: src/stty.c:643 -msgid "" -" * [-]onocr do not print carriage returns in the first column\n" -" [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 +msgid "" " * 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 "" -" * [-]onocr jangan menampilkan carriage return dalam kolom pertama\n" -" [-]opost postprocess keluaran\n" -" * tabN gaya horisontal tab delay, N dalam [0..3]\n" -" * tabs sama seperti tab0\n" -" * -tabs sama seperti tab3\n" -" * vtN gaya vertikal tab delay, N dalam [0..1]\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10545,45 +10760,64 @@ msgstr "" " * -crtkill hapus seluruh baris dengan mengikuti konfigurasi echoctl " "dan echok\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 #, fuzzy +msgid " [-]echo echo input characters\n" +msgstr "" +" * [-]iutf8 asumsikan karakter masukan adalah terenkode dalam UTF-8\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]ctlecho karakter pengontrol echo dalam notasi top (`^c')\n" -" [-]echo echo karakter masukan\n" -" * [-]echoctl sama seperti [-]ctlecho\n" -" [-]echoe sama seperti [-]crterase\n" -" [-]echok echo sebuah baris baru sesudah karakter hapus\n" -#: src/stty.c:665 -#, fuzzy +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]echoke sama seperti [-]crtkill\n" -" [-]echonl echo baris baru meskipun jika tidak mengecho karakter lain\n" -" * [-]echoprt echo karakter hapus backward, diantara `\\' dan `/'\n" -" [-]icanon aktifkan erase, kill, werase, dan rprnt karakter spesial\n" -" [-]iexten aktifkan karakter spesial non-POSIX\n" +" [-]isig aktifkan interupsi, quit, dan suspend spesial karakter\n" +" [-]noflsh non-aktifkan flushing setelah interupsi dan spesial " +"karakter quit\n" +" * [-]prterase sama seperti [-]echoprt\n" +" * [-]tostop hentikan pekerjaan dibelakan yang mencoba untuk menulis ke " +"terminal\n" +" * [-]xcase dengan icanon, escape dengan `\\' untuk karakter huruf " +"besar\n" -#: src/stty.c:672 +#: src/stty.c:843 #, fuzzy 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 "" " [-]isig aktifkan interupsi, quit, dan suspend spesial karakter\n" " [-]noflsh non-aktifkan flushing setelah interupsi dan spesial " @@ -10594,11 +10828,33 @@ msgstr "" " * [-]xcase dengan icanon, escape dengan `\\' untuk karakter huruf " "besar\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -10608,40 +10864,50 @@ msgstr "" " cbreak sama seperti -icanon\n" " -cbreak sama seperti icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 sama seperti brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof dan eol karakter ke nilai defaultnya\n" " -cooked sama seperti mentah\n" " crt sama seperti echoe echoctl echoke\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -" dec sama seperti echoe echoctl echoke ixany intr ^c erase 0177\n" -" kill ^u\n" -" * [-]decctlq sama seperti [-]ixany\n" -" ek erase dan kill karakter ke nilai defaultnya\n" -" evenp sama seperti parenb -parodd cs7\n" -#: src/stty.c:699 +#: src/stty.c:919 +#, fuzzy 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 "" " -evenp sama seperti -parenb cs8\n" " * [-]lcase sama seperti xcase iuclc olcuc\n" @@ -10650,7 +10916,19 @@ msgstr "" " nl sama seperti -icrnl -onlcr\n" " -nl sama seperti icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"Konfigurasi kombinasi:\n" +" * [-]LCASE sama seperti [-]lcase\n" +" cbreak sama seperti -icanon\n" +" -cbreak sama seperti icanon\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10664,11 +10942,12 @@ msgstr "" " pass8 sama seperti -parenb -istrip cs8\n" " -pass8 sama seperti parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw sama seperti -ignbrk -brkint -ignpar -parmrk -inpck -" @@ -10677,14 +10956,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw sama seperti cooked\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane sama seperti cread -ignbrk brkint -inlcr -igncr icrnl -" "iutf8\n" @@ -10694,7 +10974,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, semua karakter\n" " spesial ke nilai defaultnya.\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10710,12 +10990,12 @@ msgstr "" "127; nilai spesial ^- atau undef digunakan untuk menonaktifkan karakter " "spesial.\n" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "hanya sebuah perangkat yang dispesifikasikan" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10724,45 +11004,50 @@ msgstr "" "pilihan untuk gaya verbose dan stty-readable keluaran adalah\n" "mutualy exclusive" -#: src/stty.c:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: tidak dapat mereset mode non-blocking" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "argumen tidak valid %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "argumen ke %s hilang" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: error memotong" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "baris disiplin %s tidak valid" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: tidak dapat melakukan seluruh operasi yang diminta" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: tidak ada informasi ukuran untuk perangkat ini" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "integer argumen %s tidak valid" #. This is a proper name. See the gettext manual, section Names. @@ -10771,8 +11056,15 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Tampilkan checksum CRC dan jumlah byte dari setiap BERKAS\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -10782,20 +11074,54 @@ msgstr "" " -r gunakan algoritma sum BSD, gunakan 1K blok\n" " -s, --sysv gunakan System V algoritma sum, gunakan 512 bytes blok\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Penggunaan: %s [PILIHAN] [BERKAS...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Paksa perubahan block ke disk, update super blok.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "error membaca %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: tidak dapat mereset mode non-blocking" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "error membaca %s" -#: src/sync.c:69 +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "mengabaikan seluruh argumen" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10809,15 +11135,23 @@ msgstr "" "dari versi yang dijelaskan disini. Tolong lihat ke dokumentasi shell anda\n" "untuk detail mengenai pilihan yang didukung.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help tampilkan bantuan ini dan keluar\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version keluarkan informasi versi dan keluar\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Tanpa BERKAS, atau ketika BERKAS adalah -, baca masukan standar.\n" + +#: src/system.h:544 #, fuzzy msgid "" "\n" @@ -10825,7 +11159,7 @@ msgid "" msgstr "" "Argumen wajib untuk pilihan panjang adalah wajib untuk pilihan pendek juga.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10833,7 +11167,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10848,7 +11182,7 @@ msgstr "" "Jika tidak, satuan baku ke 1024 bytes (atau 512 jika POSIXLY_CORRECT " "diset).\n" -#: src/system.h:570 +#: src/system.h:590 #, fuzzy, c-format msgid "" "\n" @@ -10859,22 +11193,27 @@ msgstr "%s halaman rumah: <%s>\n" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "Laporkan %s bugs terjemahan ke \n" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" -msgstr "Untuk dokumentasi lengkap, jalankan: info coreutils '%s pemanggilan'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "" -#: src/system.h:591 +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10897,9 +11236,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "Tulis setiap BERKAS ke standar keluaran, baris terakhir pertama.\n" "Tanpa BERKAS, atau ketika BERKAS adalah -, baca standar masukan.\n" @@ -10917,57 +11254,56 @@ msgstr "" " -s, --separator=STRING gunakan STRING sebagai pemisah daripada baris " "baru\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: gagal mencari" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "rekaman terlalu besar" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "tidak dapat membuat berkas sementara dalam %s" -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: gagal untuk membuka untuk menulis" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "gagal untuk menjaga waktu untuk %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: tulis error" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "tidak dapat membuka %s untuk dibaca" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "pemisah tidak dapat kosong" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 +#: src/tail.c:257 #, 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" msgstr "" "Tampilkan akhir %d baris dari setiap BERKAS ke standar keluaran.\n" "Dengan lebih dari satu BERKAS, awali setiap dengan sebuah header memberikan " @@ -10975,7 +11311,7 @@ msgstr "" "Tanpa BERKAS, atau ketika BERKAS adalah -, baca standar masukan.\n" "\n" -#: src/tail.c:270 +#: src/tail.c:265 #, fuzzy msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" @@ -10986,7 +11322,7 @@ msgstr "" " mengeluarkan bytes dimulai dengan ke K dari " "setiap berkas\n" -#: src/tail.c:274 +#: src/tail.c:269 #, fuzzy msgid "" " -f, --follow[={name|descriptor}]\n" @@ -11001,7 +11337,7 @@ msgstr "" " sama\n" " -F sama seperti --follow=name --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -11025,7 +11361,7 @@ msgstr "" "diubah nama\n" " (ini biasa untuk berkas log terotasi)\n" -#: src/tail.c:293 +#: src/tail.c:288 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -11040,7 +11376,7 @@ msgstr "" "mengikuti\n" " nama, contoh, dengan --follow=name\n" -#: src/tail.c:298 +#: src/tail.c:293 #, fuzzy msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" @@ -11053,7 +11389,7 @@ msgstr "" " (baku 1.0) diantara interasi.\n" " -v, --verbose selalu mengeluarkan header diberikan nama berkas\n" -#: src/tail.c:307 +#: src/tail.c:302 #, fuzzy msgid "" "\n" @@ -11074,7 +11410,7 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024, dan seterusnya untuk T, P, E, Z, Y.\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -11095,177 +11431,177 @@ msgstr "" "telah dihapus dan\n" "dibuat kembali oleh aplikasi lain.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "menutup %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: tidak dapat mencari ofset akhir-relatif %s" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "tidak dapat menentukan lokasi dari %s. kembali ke polling" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, fuzzy, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" "%s telah digantikan dengan sebuah berkas 'remote'; menyerah untuk nama ini" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s telah menjadi tidak dapat diakses" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s telah menjadi dapat diakses" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s telah muncul; mengikuti akhir dari berkas baru" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s telah diganti; mengikuti akhir dari berkas baru" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: tidak dapat mengubah mode nonblocking" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: berkas terpotong" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "tidak ada berkas tersisa" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "tidak dapat mengamati direktori atas dari %s" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, fuzzy, c-format msgid "inotify resources exhausted" msgstr "Kehabisan akhiran berkas keluaran" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "tidak dapat mengamati %s" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: menimpa %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "error mengamati inotify event" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "error membaca inotify event" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: tidak dapat mengikuti akhir dari berkas tipe ini; menyerah di nama ini" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "angka dalam %s terlalu besar" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "" "%s: jumlah maksimal dari statistik tidak diubah tidak valid diantar buka" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: PID tidak valid" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: jumlah detik tidak valid" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "jumlah dari kolom tidak valid: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "pilihan yang digunakan tidak valid dalam konteks -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, fuzzy, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "peringatan: PID diabaikan; --pid=PID hanya berguna ketika mengikuti" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "peringatan: PID diabaikan; --pid=PID hanya berguna ketika mengikuti" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "peringata: --pid=PID tidak didukung dalam sistem ini" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "tidak dapat mengikuti %s dengan nama" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" "peringatan: mengikuti standar masukan secara tak terhingga adalah tidak " "efektif" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "inotify tidak dapat digunakan, kembali ke polling" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -11278,60 +11614,72 @@ msgstr "" "ditulis\n" " -i, --ignore-interrupts abaikan sinyal interupsi\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Jika sebuah BERKAS adalah -, salin kembali ke standar keluaran.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "argumen hilang setelah %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "integer %s tidak valid" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "')' diharapkan" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "')' diharapkan, ditemukan %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: operator unary diharapkan" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt tidak menerima -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef tidak menerima -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot tidak menerima -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "operator binary tidak diketahui" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: operator binary diharapkan" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11345,7 +11693,7 @@ msgstr "" " atau: [ ]\n" " atau: [ PILIHAN ]\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11353,7 +11701,7 @@ msgstr "" "Keluar dengan status ditentukan oleh EKSPRESI.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11364,7 +11712,7 @@ msgstr "" "EKSPRESI adalah benar atau salah dan set status keluar. Ini adalah salah " "satu dari:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11378,7 +11726,7 @@ msgstr "" " EKSPRESI1 -a EKSPRESI2 kedua EKSPRESI1 dan EKSPRESI2 adalah benar\n" " EKSPRESI1 -o EKSPRESI2 EKSPRESI1 atau EKSPRESI2 adalah benar\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11394,7 +11742,7 @@ msgstr "" " STRING1 = STRING2 string adalah sama\n" " STRING1 != STRING2 string tidak sama\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11414,7 +11762,7 @@ msgstr "" " INTEGER1 -lt INTEGER2 INTEGER1 adalah lebih kecil dari INTEGER2\n" " INTEGER1 -ne INTEGER2 INTEGER1 tidak sama dengan INTEGER2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11428,7 +11776,7 @@ msgstr "" "BERKAS2\n" " FILE1 -ot FILE2 BERKAS1 adalah lebih lama dari BERKAS2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11442,7 +11790,7 @@ msgstr "" " -d BERKAS BERKAS ada dan ini adalah sebuah direktori\n" " -e BERKAS BERKAS ada\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11456,7 +11804,7 @@ msgstr "" " -h BERKAS BERKAS ada dan ini adalah link simbolik (sama seperti -L)\n" " -k BERKAS BERKAS ada dan ini memiliki sticky bit diset\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11470,7 +11818,7 @@ msgstr "" " -r BERKAS BERKAS ada dan ijin membaca diberikan\n" " -s BERKAS BERKAS ada dan memiliki ukuran lebih besar dari nol\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11484,7 +11832,7 @@ msgstr "" " -w BERKAS BERKAS ada dan ijin tulis diberikan\n" " -x BERKAS BERKAS ada dan ijin menjalankan (atau pencarian) ada\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11499,7 +11847,7 @@ msgstr "" "shell.\n" "INTEGER mungkin juga -l STRING, yang dievaluasi ke panjang dari STRING.\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11510,26 +11858,26 @@ msgstr "" "memperlakukan test dari setiap itu seperti memperlakukan STRING tidak kosong " "lain.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test dan/atau [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 #, fuzzy msgid "missing ']'" msgstr "hilang `]'" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "kelebihan argumen %s" @@ -11549,7 +11897,7 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11558,11 +11906,11 @@ msgstr "" "Penggunaan: %s [PILIHAN] NEWROOT [PERINTAH [ARG]...]\n" " atau: %s PILIHAN\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11580,7 +11928,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 #, fuzzy msgid "" "\n" @@ -11593,7 +11941,7 @@ msgstr "" "`h' untuk jam atau `d' untuk hari.\n" "\n" -#: src/timeout.c:262 +#: src/timeout.c:264 #, fuzzy msgid "" "\n" @@ -11614,7 +11962,7 @@ msgstr "" "ini mungkin perlu menggunakan sinyal KILL(9), karena sinyal ini tidak dapat\n" "ditangkap.\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -11629,6 +11977,11 @@ msgstr "error dalam menunggu perintah" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "status dari perintah (0x%X) tidak diketahui" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -12008,12 +12361,12 @@ msgstr "Keluar dengan sebuah kode status yang mengindikasikan sukses." msgid "Exit with a status code indicating failure." msgstr "Keluar dengan sebuah kode status yang mengindikasikan gagal." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Penggunaan: %s PILIHAN... BERKAS...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 #, fuzzy msgid "" "Shrink or extend the size of each FILE to the specified size\n" @@ -12036,11 +12389,11 @@ msgstr "" "dibaca sebagai byte nol.\n" "\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create jangan buat berkas apapun\n" -#: src/truncate.c:112 +#: src/truncate.c:85 #, fuzzy msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" @@ -12048,7 +12401,7 @@ msgstr "" " -o, --io-blocks Perlakukan UKURAN sebagai sebuah nomor dari IO blok " "daripada bytes\n" -#: src/truncate.c:115 +#: src/truncate.c:88 #, fuzzy msgid "" " -r, --reference=RFILE base size on RFILE\n" @@ -12057,7 +12410,7 @@ msgstr "" " -r, --reference=BERKAS gunakan ukuran BERKAS ini\n" " -s, --size=SIZE gunakan UKURAN ini\n" -#: src/truncate.c:121 +#: src/truncate.c:94 #, fuzzy msgid "" "\n" @@ -12071,57 +12424,62 @@ msgstr "" "`/' membulatkan kebawah ke kelipatan dari, `%' membulatkan keatas ke " "kelipatan dari.\n" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "overflow dalam % * % byte blok untuk berkas %s" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s adalah tidak berguna, kelihatannya memiliki ukuran negatif" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "tidak dapat mengubah kepemilikan dari %s" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "pembulatan overflow dari ukuran berkas %s" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "extending overflow dari ukuran berkas %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, fuzzy, c-format msgid "failed to truncate %s at % bytes" msgstr "memotong %s di % byte" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "multiple relatif pengubah dispesifikasikan" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "nomor %s tidak valid" + +#: src/truncate.c:307 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "anda harus menspesifikasikan satu dari %s atau %s" -#: src/truncate.c:340 +#: src/truncate.c:314 #, fuzzy, c-format msgid "you must specify a relative %s with %s" msgstr "anda harus menspesifikasikan satu dari %s atau %s" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "%s telah dispesifikasikan tetapi %s belum" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "tidak dapat membuka %s untuk ditulis" @@ -12132,12 +12490,10 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Penggunaan: %s [PILIHAN] [BERKAS]\n" "Tulis total daftar terurut konsisten dengan pengurutan partial dalam " @@ -12145,12 +12501,17 @@ msgstr "" "Tanpa BERKAS, atau ketika BERKAS adalah -, baca standar masukan.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: masukan berisi sebuah angka ganjil dari tokens" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: masukan berisi sebuah loop:" @@ -12219,9 +12580,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "Mengubah blank dalam setiap BERKAS ke tabs, menulis ke standar keluaran.\n" "Tanpa BERKAS, atau ketika BERKAS adalah -, baca standar masukan.\n" @@ -12282,8 +12641,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -12294,7 +12653,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -12454,11 +12813,6 @@ msgstr "" "sebuah keadaan tidur tidak dapat diinterupsi juga berkontribusi terhada " "beban kerja.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -12481,13 +12835,17 @@ msgstr "" "umum.\n" "\n" -#: src/wc.c:117 -#, fuzzy +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -12503,12 +12861,13 @@ msgstr "" " -m, --chars menampilkan jumlah karakter\n" " -l, --lines menampilkan jumlah baris baru\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=F baca masukan dari berkas yang dispesifikasikan " @@ -12679,10 +13038,10 @@ msgstr "" "Sama seperti id -un.\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: tidak dapat menemukan nama untuk ID pengguna %lu\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "tidak dapat menemukan nama untuk pengguna ID %lu" #: src/yes.c:41 #, c-format @@ -12703,6 +13062,226 @@ msgstr "" "atau `y'.\n" "\n" +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "-t mengindikasikan jika PAGE_LENGTH <= 10. Dengan tidak ada BERKAS, atau " +#~ "ketika\n" +#~ "BERKAS adalah -, baca standar masukan.\n" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Tanpa BERKAS, atau ketika BERKAS adalah -, baca masukan standar.\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Paksa perubahan block ke disk, update super blok.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "mengabaikan seluruh argumen" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: nomor tidak valid" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s terlalu besar yang ini tidak direpresentasikan" + +#~ msgid "number of lines" +#~ msgstr "jumlah dari baris" + +#~ msgid "number of bytes" +#~ msgstr "jumlah dari byte" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: nomor tidak valid diabaikan" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: jumlah dari bytes tidak valid" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: jumlah dari baris tidak valid" + +#~ msgid "number in %s is too large" +#~ msgstr "angka dalam %s terlalu besar" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: jumlah detik tidak valid" + +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "gagal untuk menset grup tambahan" + +#, fuzzy +#~ 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 "" +#~ "\n" +#~ "Mengirim sebuah %s sinyal ke proses `dd' yang sedang berjalan membuatnya\n" +#~ "menampilkan statistik I/O ke standar error dan kemudian melanjutkan " +#~ "penyalinan.\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) tersalin, 34.6279 detik, 271 MB/s\n" +#~ "\n" +#~ "Pilihan adalah:\n" +#~ "\n" + +#~ 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 akan memasukan karakter berikutnya quoted\n" +#~ " quit CHAR CHAR akan mengirim sebuah sinyal berhenti\n" +#~ " * rprnt CHAR CHAR akan menggambar ulang baris sekarang\n" +#~ " start CHAR CHAR akan mengulang keluaran setelah menyetopnya\n" + +#, 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" +#~ "Konfigurasi kontrol:\n" +#~ " [-]clocal nonaktifkan sinyal kontrol modem\n" +#~ " [-]cread bolehkan masukan untuk diterima\n" +#~ " * [-]crtscts aktifkan RTS/CTS handshaking\n" +#~ " csN set ukuran karakter ke N bits, N dalam [5..8]\n" + +#~ 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 "" +#~ "\n" +#~ "Konfigurasi keluaran:\n" +#~ " * bsN gaya backspace delay, N dalam [0..1]\n" +#~ " * crN gaya carriage return delay, N dalam [0..3]\n" +#~ " * ffN gaya form feed delay, N dalam [0..1]\n" +#~ " * nlN gayal baris baru delay, N dalam [0..1]\n" + +#, fuzzy +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl translasikan carriage return ke baris baru\n" +#~ " * [-]ofdel gunakan karakter del untuk mengisi daripada karakter " +#~ "kosong\n" +#~ " * [-]ofill gunakan isi (tambah) karakter daripada pewaktu untuk " +#~ "delay\n" +#~ " * [-]olcuc translasikan karakter huruf kecil ke huruf besar\n" +#~ " * [-]onlcr translasikan baris baru ke carriage return-baris baru\n" +#~ " * [-]onlret baris baru menperformasikan sebuah carriage return\n" + +#~ 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 "" +#~ " * [-]onocr jangan menampilkan carriage return dalam kolom pertama\n" +#~ " [-]opost postprocess keluaran\n" +#~ " * tabN gaya horisontal tab delay, N dalam [0..3]\n" +#~ " * tabs sama seperti tab0\n" +#~ " * -tabs sama seperti tab3\n" +#~ " * vtN gaya vertikal tab delay, N dalam [0..1]\n" + +#, fuzzy +#~ 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 "" +#~ " * [-]ctlecho karakter pengontrol echo dalam notasi top (`^c')\n" +#~ " [-]echo echo karakter masukan\n" +#~ " * [-]echoctl sama seperti [-]ctlecho\n" +#~ " [-]echoe sama seperti [-]crterase\n" +#~ " [-]echok echo sebuah baris baru sesudah karakter hapus\n" + +#, fuzzy +#~ 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 "" +#~ " * [-]echoke sama seperti [-]crtkill\n" +#~ " [-]echonl echo baris baru meskipun jika tidak mengecho karakter " +#~ "lain\n" +#~ " * [-]echoprt echo karakter hapus backward, diantara `\\' dan `/'\n" +#~ " [-]icanon aktifkan erase, kill, werase, dan rprnt karakter " +#~ "spesial\n" +#~ " [-]iexten aktifkan karakter spesial non-POSIX\n" + +#~ 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 "" +#~ " dec sama seperti echoe echoctl echoke ixany intr ^c erase " +#~ "0177\n" +#~ " kill ^u\n" +#~ " * [-]decctlq sama seperti [-]ixany\n" +#~ " ek erase dan kill karakter ke nilai defaultnya\n" +#~ " evenp sama seperti parenb -parodd cs7\n" + +#~ msgid "For complete documentation, run: info coreutils '%s invocation'\n" +#~ msgstr "" +#~ "Untuk dokumentasi lengkap, jalankan: info coreutils '%s pemanggilan'\n" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: tidak dapat menemukan nama untuk ID pengguna %lu\n" + #, fuzzy #~ msgid "cannot create pipe" #~ msgstr "tidak dapat membuat link %s" @@ -13024,20 +13603,6 @@ msgstr "" #~ msgid "invalid format precision" #~ msgstr "format presisi tidak valid" -#~ msgid "" -#~ "Display the current time in the given FORMAT, or set the system date.\n" -#~ "\n" -#~ " -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 "opening %s" #~ msgstr "membuka %s" @@ -13540,9 +14105,6 @@ msgstr "" #~ msgid "FIXME unknown" #~ msgstr "BETULKAN-AKU tidak diketahui" -#~ msgid "Usage: %s [OPTION] [FILE]...\n" -#~ msgstr "Penggunaan: %s [PILIHAN] [BERKAS...\n" - #~ msgid "Richard Stallman" #~ msgstr "Richard Stallman" diff --git a/po/it.gmo b/po/it.gmo index 0d772098..5763b5f0 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index 54785c72..abe02afd 100644 --- a/po/it.po +++ b/po/it.po @@ -15,11 +15,12 @@ # # Dalla 8.4.10081926 sono state corrette alcune opzioni di base64, stat, tail e uniq che non seguivano questo # stile e che per uniformità erano state tradotte dalla 7.0 con maiuscole/punteggiatura diverse dall'originale inglese +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: GNU coreutils 8.14-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2011-10-09 10:15+0100\n" "Last-Translator: Giorgio Catanzaro \n" "Language-Team: Italian \n" @@ -47,18 +48,18 @@ msgstr "Sono argomenti validi:" msgid "error closing file" msgstr "errore nel chiudere il file" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "errore di scrittura" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "preservazione dei permessi per %s" @@ -244,57 +245,62 @@ msgstr "Stringa dei parametri codificata non correttamente" msgid "Unknown error" msgstr "Errore sconosciuto" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: l'opzione «%s» è ambigua; possibilità:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: l'opzione «-W %s» è ambigua\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: l'opzione «--%s» non accetta alcun argomento\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: l'opzione «%c%s» non accetta alcun argomento\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: l'opzione «--%s» richiede un argomento\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: opzione «--%s» non riconosciuta\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: opzione «%c%s» non riconosciuta\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opzione -- «%c» non valida\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: l'opzione richiede un argomento -- «%c»\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: l'opzione «-W %s» è ambigua\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: l'opzione «-W %s» non accetta alcun argomento\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: l'opzione «-W %s» richiede un argomento\n" @@ -304,13 +310,13 @@ msgstr "%s: l'opzione «-W %s» richiede un argomento\n" msgid "cannot change permissions of %s" msgstr "impossibile cambiare i permessi di %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "impossibile creare la directory %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "memoria esaurita" @@ -359,6 +365,12 @@ msgstr "\"" msgid "%s: end of file" msgstr "%s: fine del file" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: errore di lettura" + #: lib/regcomp.c:131 msgid "Success" msgstr "Successo" @@ -466,7 +478,7 @@ msgstr "^[sSyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "impostazione dei permessi per %s" @@ -944,7 +956,7 @@ msgstr "" "output.\n" "\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -961,15 +973,7 @@ msgstr "" " Usare 0 per disabilitare l'andata a capo\n" "\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Senza FILE, o quando FILE è -, legge lo standard input.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -983,51 +987,51 @@ 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:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "errore di lettura" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "input non valido" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "dimensione di ritorno a capo non valida: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "operando %s in più" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "chiusura dello standard input" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1070,38 +1074,45 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "operando mancante" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Uso: %s [OPZIONE]... [FILE]...\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"Scrive una concatenazione ordinata di tutti i FILE sullo standard output.\n" +"\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1120,7 +1131,7 @@ msgstr "" " -n, --number numera tutte le righe in output\n" " -s, --squeeze-blank elimina le righe di output vuote ripetute\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1133,7 +1144,7 @@ msgstr "" " -v, --show-nonprinting usa la notazione ^ e M-, eccetto che per LFD e " "TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1147,17 +1158,18 @@ msgstr "" "contenuto di g.\n" " %s Copia lo standard input nello standard output.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "impossibile eseguire ioctl su %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "standard output" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: il file di input coincide con quello di output" @@ -1169,10 +1181,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1187,8 +1199,8 @@ msgid "failed to set %s security context component to %s" msgstr "" "impostazione del componente del contesto di sicurezza %s in %s non riuscita" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "recupero del contesto di sicurezza di %s non riuscito" @@ -1204,13 +1216,13 @@ msgstr "" 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:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "impossibile accedere a %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "impossibile leggere la directory %s" @@ -1226,7 +1238,7 @@ msgstr "cambio del contesto di sicurezza di %s\n" msgid "fts_read failed" msgstr "fts_read non riuscita" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1357,7 +1369,7 @@ msgid "-R -h requires -P" msgstr "-R -h richiede -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1374,9 +1386,8 @@ msgid "conflicting security context specifiers given" msgstr "forniti specificatori di contesto di sicurezza in conflitto" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "recupero degli attributi di %s non riuscito" @@ -1688,17 +1699,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "gruppo %s non valido" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "elenco dei gruppi %s non valido" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1707,7 +1718,7 @@ msgstr "" "Uso: %s [OPZIONE] NUOVAROOT [COMANDO [ARG]...]\n" " o: %s OPZIONE\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1715,16 +1726,28 @@ msgstr "" "Esegue il COMANDO con la root directory impostata a NUOVAROOT.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" +" --userspec=UTENTE:GRUPPO specifica l'id o il nome dell'utente e del gruppo " +"da usare\n" +" --groups=ELENCO_G specifica i gruppi supplementari come g1,g2,..,gN\n" + +#: src/chroot.c:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" " --userspec=UTENTE:GRUPPO specifica l'id o il nome dell'utente e del gruppo " "da usare\n" " --groups=ELENCO_G specifica i gruppi supplementari come g1,g2,..,gN\n" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 #, fuzzy msgid "" "\n" @@ -1733,42 +1756,47 @@ msgstr "" "\n" "Se non è dato alcun comando, esegue «${SHELL} -i» (predefinita: /bin/sh).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "impossibile cambiare la root directory a %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "impossibile fare chdir alla root directory" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "impostazione del gruppo supplementare non riuscita" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" +msgid "failed to set supplemental groups" msgstr "impostazione del gruppo supplementare non riuscita" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "impostazione dell'id di gruppo non riuscita" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "impostazione dell'id utente non riuscita" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "impossibile eseguire il comando %s" @@ -1809,7 +1837,16 @@ msgstr "Uso: %s [OPZIONE]... FILE1 FILE2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Confronta i file ordinati FILE1 e FILE2 riga per riga.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Senza FILE, o quando FILE è -, legge lo standard input.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1822,7 +1859,7 @@ msgstr "" "solo\n" "nel FILE2, e la terza contiene le righe comuni ad entrambi i file.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1834,7 +1871,7 @@ msgstr "" " -2 elimina la colonna 2 (righe presenti solo in FILE2)\n" " -3 elimina la colonna 3 (righe presenti in entrambi i file)\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1846,11 +1883,11 @@ msgstr "" " se tutte le righe in input possono essere accoppiate\n" " --nocheck-order non controlla che l'input sia ordinato correttamente\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=STR separa le colonne con STR\n" -#: src/comm.c:133 +#: src/comm.c:137 #, fuzzy msgid "" "\n" @@ -1860,7 +1897,7 @@ msgstr "" "Notare che i confronti rispettano le regole specificate da \"LC_COLLATE\".\n" # (ndt) lasciate allineate come nella 8.5 e precedenti -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1874,78 +1911,88 @@ msgstr "" "file2.\n" " %s -3 file1 file2 Stampa le righe in file1 non in file2, e viceversa.\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "il file %d non è ordinato" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "specificati delimitatori multipli" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "%s vuoto non permesso" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "impossibile fare lseek in %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "errore leggendo %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "impossibile fare lseek in %s" +msgid "error reading %s" +msgstr "errore leggendo %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "errore scrivendo %s" +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "errore leggendo %s" + # http://it.wikipedia.org/wiki/Extent # http://it.wikipedia.org/wiki/Ext4#Extent -#: src/copy.c:323 +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s: recupero delle informazioni degli extent non riuscito" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: scrittura non riuscita" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "creazione dell'extent di %s non riuscita" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "azzeramento dei permessi per %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "impossibile preservare il proprietario di %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "lookup del file %s non riuscito" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "preservazione dei diritti di %s non riuscita" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" @@ -1953,243 +2000,247 @@ msgstr "" "impostazione del contesto predefinito di creazione dei file in %s non " "riuscita" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "" "impostazione del contesto predefinito di creazione dei file in %s non " "riuscita" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "impostazione del contesto di sicurezza di %s in %s non riuscita" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "impossibile aprire %s per la lettura" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "impossibile fare fstat di %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "file %s saltato perché è stato sostituito mentre veniva copiato" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "impossibile rimuovere %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "%s rimosso\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "" "non è possibile scrivere attraverso il collegamento simbolico con obiettivo " "non esistente %s" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "impossibile creare il file regolare %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "clonazione di %s da %s non riuscita" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "preservati gli orari di %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "apertura di %s non riuscita" -#: src/copy.c:1580 +#: src/copy.c:1669 #, fuzzy, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: provare a sovrascrivere %s, ignorando il modo %04lo (%s)? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: sovrascrivere %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (backup: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, 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:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "impossibile creare il collegamento fisico %s a %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "impossibile eseguire stat di %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "directory %s omessa" -#: src/copy.c:1791 +#: src/copy.c:1880 #, 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:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s e %s sono lo stesso file" -#: src/copy.c:1939 +#: src/copy.c:2019 #, 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:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "%s appena creato non sarà sovrascritto da %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "impossibile sovrascrivere la directory %s con una non-directory" -#: src/copy.c:1989 +#: src/copy.c:2069 #, 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:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "impossibile fare il backup di %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "impossibile copiare una directory, %s, dentro sé stessa, %s" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "attenzione: il file di origine %s è stato specificato più di una volta" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "impossibile spostare %s in %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "impossibile copiare il collegamento simbolico ciclico %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "impossibile creare il collegamento simbolico %s a %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "impossibile creare il fifo %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "impossibile creare il file speciale %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "impossibile leggere il collegamento simbolico %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "impossibile creare il collegamento simbolico %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s presenta un tipo di file sconosciuto" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "impossibile annullare il backup di %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (annullamento backup)\n" @@ -2199,25 +2250,25 @@ msgstr "%s -> %s (annullamento backup)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, fuzzy, c-format msgid "unknown program %s" msgstr "flusso sconosciuto" @@ -2493,8 +2544,8 @@ msgstr "%s esiste ma non è una directory" msgid "failed to access %s" msgstr "apertura di %s non riuscita" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "manca il file operando" @@ -2573,131 +2624,131 @@ msgstr "" "per xattr" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "l'input è scomparso" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: numero di riga fuori dall'intervallo" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: numero di riga fuori dall'intervallo" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " su ripetizione %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: corrispondenza non trovata" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "errore nella ricerca con espressione regolare" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "errore di scrittura per %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: intero atteso dopo il delimitatore" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: \"}\" è richiesto nel conteggio delle ripetizioni" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: intero richiesto tra \"{\" e \"}\"" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: manca il delimitatore di chiusura \"%c\"" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: espressione regolare non valida: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: modello non valido" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, 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:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "manca lo specificatore di conversione nel suffisso" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "specificatore di conversione non valido nel suffisso: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "specificatore di conversione non valido nel suffisso: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "flag non validi nella specifica di conversione: %%%c%c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "troppe specifiche di conversione %% nel suffisso" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "manca la specifica di conversione %% nel suffisso" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: numero non valido" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "numero %s non valido" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Uso: %s [OPZIONE]... FILE MODELLO...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 #, fuzzy msgid "" "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n" @@ -2708,7 +2759,16 @@ msgstr "" "e stampa su stdout la dimensione in byte di ogni parte.\n" "\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Legge da standard input se FILE è -. Ogni MODELLO può essere:\n" + +#: src/csplit.c:1492 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2720,11 +2780,11 @@ msgstr "" " -f, --prefix=PREFISSO usa PREFISSO invece di \"xx\"\n" " -k, --keep-files non rimuove i file di uscita in caso di errori\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2736,18 +2796,11 @@ msgstr "" "file di output\n" " -z, --elide-empty-files rimuove i file di output vuoti\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Legge da standard input se FILE è -. Ogni MODELLO può essere:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 #, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2786,7 +2839,7 @@ msgstr "" "Stampa le parti di riga selezionate da ogni FILE sullo standard ouput.\n" "\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2797,7 +2850,7 @@ msgstr "" " -d, --delimiter=DELIM usa DELIM invece di TAB come delimitatore di " "campo\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2811,7 +2864,7 @@ msgstr "" " meno che non sia specificata l'opzione -s\n" " -n (ignorato)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2819,7 +2872,7 @@ msgstr "" " --complement complementa l'insieme dei byte, caratteri\n" " o campi selezionati\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2831,7 +2884,7 @@ msgstr "" " il comportamento predefinito è di utilizzare il " "delimitatore di input\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2844,7 +2897,8 @@ 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:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2852,8 +2906,6 @@ msgid "" " 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 "" "Ogni intervallo è uno tra:\n" "\n" @@ -2864,53 +2916,54 @@ msgstr "" "\n" "Senza FILE, o quando FILE è -, legge lo standard input.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "elenco di campi o byte non valido" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "campi e posizioni sono numerati da 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "intervallo non valido senza punto finale: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "intervallo decrescente non valido" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "l'offset in byte %s è troppo grande" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "il numero di campo %s è troppo grande" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "può essere specificato solo un tipo di elenco" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "il delimitatore deve essere un singolo carattere" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "è necessario specificare una elenco di byte, caratteri o campi" -#: src/cut.c:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2918,11 +2971,11 @@ msgstr "" "eliminare le righe non delimitate ha senso\n" "\tsolo quando si sta operando sui campi" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "manca l'elenco dei campi" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "manca l'elenco delle posizioni" @@ -2940,36 +2993,47 @@ msgid "Display the current time in the given FORMAT, or set the system date.\n" msgstr "" #: src/date.c:134 +#, fuzzy +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +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" + +#: src/date.c:138 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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=FILE visualizza l'orario dell'ultima modifica di " "FILE\n" " -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:147 +#: src/date.c:149 #, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=TIMESPEC stampa data e ora nel formato RFC 3339.\n" " TIMESPEC=\"date\", \"seconds\", o \"ns\" per\n" @@ -2980,8 +3044,19 @@ msgstr "" " -u, --utc, --universal stampa o imposta il Tempo Coordinato Universale " "(UTC)\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2994,7 +3069,7 @@ msgstr "" " %% un % letterale\n" " %a nome localizzato abbreviato del giorno della settimana (es.: dom)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -3007,7 +3082,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:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -3020,7 +3095,7 @@ msgstr "" " %D data; equivalente a %m/%d/%y\n" " %e giorno del mese, con spazi; equivalente a %_d\n" -#: src/date.c:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -3032,7 +3107,7 @@ msgstr "" " %G anno del numero ISO della settimana (consultare %V); in genere utile " "solo con %V\n" -#: src/date.c:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -3044,7 +3119,7 @@ msgstr "" " %I ora (01..12)\n" " %j giorno dell'anno (001..366)\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -3056,7 +3131,7 @@ msgstr "" " %m mese (01..12)\n" " %M minuto (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -3074,7 +3149,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:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3086,7 +3161,7 @@ msgstr "" " %T ora; come %H:%M:%S\n" " %u giorno della settimana (1..7); 1 rappresenta lunedì\n" -#: src/date.c:209 +#: src/date.c:215 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" @@ -3102,7 +3177,7 @@ msgstr "" " %W numero della settimana dell'anno con lunedì come primo giorno della\n" " settimana (00..53)\n" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3114,7 +3189,7 @@ msgstr "" " %y ultime due cifre dell'anno (00..99)\n" " %Y anno\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3134,7 +3209,7 @@ msgstr "" "\n" "In modo predefinito, date riempie i campi numerici con zeri.\n" -#: src/date.c:230 +#: src/date.c:236 #, fuzzy msgid "" "The following optional flags may follow '%':\n" @@ -3153,7 +3228,7 @@ msgstr "" " ^ usa la maiuscola se possibile\n" " # usa l'opposto se possibile\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3169,7 +3244,7 @@ msgstr "" "O per usare la rappresentazione localizzata alternativa per i simboli " "numerici, se definita.\n" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3195,37 +3270,37 @@ msgstr "" "degli USA\n" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "standard input" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "data %s non valida" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "specificati formati di output multipli" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3237,23 +3312,23 @@ msgstr "" "argomento\n" "che non sia un'opzione deve essere una stringa di formato che inizia con «+»" -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "impossibile impostare la data" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3262,7 +3337,7 @@ msgstr "" "Uso: %s [OPERANDO]...\n" " o: %s OPZIONE\n" -#: src/dd.c:532 +#: src/dd.c:561 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3282,7 +3357,7 @@ msgstr "" " count=BLOCCHI copia dall'input solo BLOCCHI blocchi\n" " ibs=BYTE legge BYTE byte per volta (predefinito: 512)\n" -#: src/dd.c:541 +#: src/dd.c:570 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3292,8 +3367,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=FILE legge da FILE invece che da stdin\n" " iflag=FLAGS legge come dall'elenco di simboli separati da virgole\n" @@ -3306,7 +3383,7 @@ msgstr "" "dell'input\n" " status=noxfer nasconde le statistiche di trasferimento\n" -#: src/dd.c:552 +#: src/dd.c:583 #, fuzzy msgid "" "\n" @@ -3326,7 +3403,7 @@ msgstr "" "Ogni simbolo CONV può essere:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3354,7 +3431,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:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3370,7 +3447,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:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3384,137 +3461,103 @@ msgstr "" " append modalità append (ha senso solo per l'output; suggerito " "conv=notrunc)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio utilizza I/O concorrente per i dati\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct utilizza I/O diretto per i dati\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory fallisce a meno che non sia una directory\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync utilizza I/O sincronizzato per i dati\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync similmente, ma anche per metadati\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock accumula blocchi pieni di input (solo iflag)\n" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock utilizza I/O non bloccante\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime non aggiorna l'orario di accesso\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nocache scarta i dati nella cache\n" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty non assegna il controllo del terminale da file\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow non segue i collegamenti simbolici\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks fallisce per collegamenti multipli\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary utilizza I/O binario per i dati\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text utilizza I/O testuale per i dati\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 -#, fuzzy, c-format +#: src/dd.c:661 +#, 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 "" -"\n" -"Mandando un segnale %s ad un processo di «dd» attivo vengono mostrate " -"statistiche di I/O sullo standard error; in seguito verrà ripresa la copia.\n" -"\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ kill -%s $pid; sleep 1; kill $pid\n" -" 18335302+0 record in\n" -" 18335302+0 record out\n" -" 9387674624 byte (9,4 GB) copiati, 34,6279 s, 271 MB/s\n" -"\n" -"Le opzioni sono:\n" -"\n" -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +#: src/dd.c:699 +#, fuzzy, c-format +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "memoria esaurita da un buffer di input di dimensione %zu byte (%s)" -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +#: src/dd.c:721 +#, fuzzy, c-format +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "memoria esaurita da un buffer di output di dimensione %zu byte (%s)" -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" -"%+% record dentro\n" -"%+% record fuori\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% record troncato\n" -msgstr[1] "% record troncati\n" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "% byte (%s) copiato" msgstr[1] "% byte (%s) copiati" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "B illimitato" @@ -3528,83 +3571,100 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% record dentro\n" +"%+% record fuori\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% record troncato\n" +msgstr[1] "% record troncati\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "chiusura del file di input %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "chiusura del file di output %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "disattivazione di O_DIRECT non riuscita: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "scrittura di %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "operando %s non riconosciuto" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "conversione non valida" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "flag di input non valido" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "flag di output non valido" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "flag di stato non valido" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "numero %s non valido" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "non è possibile combinare qualunque coppia di {ascii,ebcdic,ibm}" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "non è possibile combinare block e unblock" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "non è possibile combinare lcase e ucase" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "non è possibile combinare excl e nocreat" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "non è possibile combinare direct e nocache" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3613,62 +3673,62 @@ msgstr "" "attenzione: si sta aggirando il bug del kernel di lseek per il file (%s)\n" " di mt_type=0x%0lx -- consultare per l'elenco dei tipi" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: impossibile saltare" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: impossibile fare il seek" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "offset eccessivo leggendo il file %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, 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:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "non si può aggirare il bug del kernel, dopo tutto" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "impostazione dei flag %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: impossibile saltare all'offset specificato" -#: src/dd.c:2172 +#: src/dd.c:2288 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "interruzione a % byte nel file di output %s non riuscita" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync non riuscita per %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "fsync non riuscita per %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "apertura di %s non riuscita" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3677,19 +3737,19 @@ msgstr "" "offset troppo grande: impossibile interrompere a una lunghezza di seek=" "% (%lu-byte) blocchi" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "interruzione a % byte nel file di output %s non riuscita" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "scarto della cache per %s non riuscito" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3770,12 +3830,12 @@ msgstr "Capacità" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 #, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" @@ -3788,14 +3848,14 @@ msgstr "" # (ndt) ho tolto il punto finale in -B per uniformità #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 #, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3811,7 +3871,7 @@ msgstr "" " -H, --si similmente, ma usa multipli di 1000 invece che di " "1024\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3826,7 +3886,7 @@ msgstr "" " --no-sync non fa sync prima di recuperare le informazioni " "(predefinito)\n" -#: src/df.c:1409 +#: src/df.c:1429 #, fuzzy msgid "" " --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" @@ -3834,6 +3894,27 @@ msgid "" "omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" +msgstr "" +" -P, --portability usa il formato di output POSIX\n" +" --sync fa sync prima di recuperare le informazioni " +"sull'uso\n" +" -t, --type=TIPO limita l'elenco ai file system di tipo TIPO\n" +" -T, --print-type stampa il tipo di file system\n" +" -x, --exclude-type=TIPO limita l'elenco ai file system non di tipo TIPO\n" +" -v (ignorato)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose stampa una diagnostica prima\n" +" dell'apertura di ciascun file di output\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3847,7 +3928,7 @@ msgstr "" " -x, --exclude-type=TIPO limita l'elenco ai file system non di tipo TIPO\n" " -v (ignorato)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3855,25 +3936,25 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, fuzzy, c-format msgid "options %s and %s are mutually exclusive" msgstr "le opzioni --compare (-C) e --strip sono mutualmente esclusive" -#: src/df.c:1610 +#: src/df.c:1636 #, 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:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Attenzione: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "impossibile leggere la tabella dei file system montati" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "nessun file system elaborato" @@ -3992,7 +4073,7 @@ msgstr "" " %s /usr/bin/ stampa \"/usr\".\n" " %s stdio.h stampa \".\".\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -4003,7 +4084,8 @@ msgstr "" #: src/du.c:285 #, fuzzy -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Riassume l'uso del disco di ogni FILE, ricorsivamente per le directory.\n" "\n" @@ -4143,62 +4225,56 @@ msgstr "" msgid "Infinity" msgstr "B illimitato" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "fts_read non riuscita: %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "profondità massima %s non valida" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "l'argomento %2$s di --%1$s non è valido" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "impossibile riassumere e contemporaneamente mostrare tutte le voci" -#: src/du.c:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "attenzione: riassumere è in conflitto con --max-depth=%lu" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "gli operandi dei file non possono essere combinati con --files0-from" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: errore di lettura" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "nome di file di lunghezza zero non valido" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "totale" @@ -4346,9 +4422,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "Converte i tabulatori in spazi in ogni FILE, scrivendo sullo standard " "output.\n" @@ -4398,7 +4472,7 @@ msgid "input line is too long" msgstr "la riga di input è troppo lunga" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4557,12 +4631,12 @@ msgstr "errore nel controllo dell'espressione regolare" msgid "non-integer argument" msgstr "argomento non intero" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "divisione per zero" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "impostare LC_ALL='C' per aggirare il problema" @@ -4573,31 +4647,31 @@ msgid "the strings compared were %s and %s" msgstr "le stringhe confrontate erano %s e %s" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s non è un intero positivo valido" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s è troppo grande" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4606,7 +4680,7 @@ msgstr "" "Uso: %s [NUMERO]...\n" " o: %s OPZIONE\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -4652,7 +4726,7 @@ msgstr "" "L'opzione -LARGH è una forma abbreviata di --width=NUMERI.\n" "\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4666,7 +4740,7 @@ msgstr "" " -s, --split-only divide le righe lunghe, ma non le riempie " "nuovamente\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, fuzzy, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4679,7 +4753,7 @@ msgstr "" " -w, --width=AMPIEZZA larghezza massima della riga (predefinita a 75 " "colonne)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4688,23 +4762,21 @@ msgstr "" "opzione non valida -- %c; -WIDTH è riconosciuto solo quando è la prima " "opzione; utilizzare -w N" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "larghezza non valida: %s" -#: src/fold.c:70 +#: src/fold.c:69 #, fuzzy -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +msgid "Wrap input lines in each FILE, writing to standard output.\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:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4714,9 +4786,9 @@ msgstr "" " -s, --spaces interrompe se si incontrano spazi\n" " -w, --width=LARG usa LARG colonne invece di 80\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "numero di colonne non valido: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4791,12 +4863,11 @@ msgstr "impossibile impostare l'id utente" msgid "%s: no such user" msgstr "%s: questo utente non esiste" -#: src/head.c:109 +#: src/head.c:110 #, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "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 " @@ -4804,7 +4875,7 @@ msgstr "" "Senza FILE, o quando FILE è -, legge lo standard input.\n" "\n" -#: src/head.c:117 +#: src/head.c:118 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4821,7 +4892,7 @@ msgstr "" " con \"-\", le stampa tutte a parte le ultime\n" " K di ogni file\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4831,7 +4902,7 @@ msgstr "" " -v, --verbose stampa sempre le intestazioni che riportano i " "nomi dei file\n" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4843,48 +4914,36 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: il file si è ridotto eccessivamente" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: il numero di byte è troppo grande" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: impossibile posizionarsi all'offset %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: impossibile posizionarsi all'offset relativo %s" -#: src/head.c:886 +#: src/head.c:267 #, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "%s: %s è così grande che è impossibile rappresentarlo" - -#: src/head.c:887 -msgid "number of lines" -msgstr "numero di righe" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "numero di byte" +msgid "%s: number of bytes is too large" +msgstr "%s: il numero di byte è troppo grande" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "numero di righe non valido" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "numero di byte non valido" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "opzione finale non valida -- %c" @@ -5076,7 +5135,7 @@ msgstr "impossibile cambiare il proprietario di %s" msgid "cannot set time stamps for %s" msgstr "impossibile impostare l'orario di %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "chiamata di sistema fork non riuscita" @@ -5242,7 +5301,7 @@ msgstr "" "la directory di destinazione non è permessa durante l'installazione di una " "directory" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "modo %s non valido" @@ -5282,8 +5341,13 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5299,7 +5363,7 @@ msgstr "" " NUMFILE è 1 o 2. corrispondente a FILE1 o FILE2\n" " -e VUOTO sostuituisce i campi di input mancanti con VUOTO\n" -#: src/join.c:204 +#: src/join.c:210 #, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" @@ -5313,7 +5377,7 @@ msgstr "" " -o FORMATO rispetta il FORMATO mentre costruisce la riga di output\n" " -t CAR usa CAR come separatore dei campi di input e output\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5334,14 +5398,14 @@ msgstr "" "dei campi,\n" " stampandole senza provare ad accoppiarle\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 #, fuzzy msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated termina le righe con il byte 0, invece del " "ritorno a capo\n" -#: src/join.c:225 +#: src/join.c:231 #, fuzzy msgid "" "\n" @@ -5380,47 +5444,47 @@ msgstr "" "Se l'input non è ordinato e alcune righe non possono essere unite, verrà\n" "restituito un messaggio di avviso.\n" -#: src/join.c:410 +#: src/join.c:416 #, fuzzy, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:%ju: non è ordinato: %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "numero di campo non valido: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "specificatore di campo non valido: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "numero di file non valido nello specificatore di campo: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "campi di unione incompatibili %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "conflitto fra le stringhe di sostituzione per i campi vuoti" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "tabulatore multicarattere %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "tabulatori incompatibili" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "entrambi i file non possono essere lo standard input" @@ -5501,17 +5565,17 @@ msgstr "non è possibile combinare un segnale con -l o -t" msgid "no process ID specified" msgstr "nessun id del processo specificato" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "allocazione di un buffer di stdio di % byte non riuscita\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "modo di buffering %s non valido per %s\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "impossibile impostare il buffering di %s nel modo %s\n" @@ -5713,7 +5777,7 @@ msgstr "impossibile creare il collegamento simbolico %s" msgid "FIXME: unknown" msgstr "DA SISTEMARE: sconosciuto" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Uso: %s [OPZIONE]\n" @@ -5726,7 +5790,7 @@ msgstr "" "Stampa il nome dell'utente corrente.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "nome di accesso inesistente" @@ -5736,7 +5800,7 @@ msgstr "nome di accesso inesistente" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%e %b %Y" @@ -5745,99 +5809,99 @@ msgstr "%e %b %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%e %b %H.%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" -"ignorato il valore non valido della variabile di ambiente QUOTING_STYLE: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "" "ignorata la larghezza non valida nella variabile di ambiente COLUMNS: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "ignorata la larghezza del tabulatore non valida nella variabile di ambiente " "TABSIZE: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "larghezza della riga non valida: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "dimensioni di tabulazione non valide: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "formato dello stile dell'ora %s non valido" -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "Sono argomenti validi:" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "errore di inizializzazione delle stringhe dei mesi" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "prefisso non riconosciuto: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "valore non interpretabile nella variabile di ambiente LS_COLORS" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" +"ignorato il valore non valido della variabile di ambiente QUOTING_STYLE: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "impossibile aprire la directory %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "impossibile determinare device e inode di %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "non viene elencata la directory già elencata: %s" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "lettura della directory %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "chiusura della directory %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "impossibile confrontare i nomi dei file %s e %s" -#: src/ls.c:4781 +#: src/ls.c:4775 #, fuzzy msgid "" "List information about the FILEs (the current directory by default).\n" @@ -5848,7 +5912,7 @@ msgstr "" "sort.\n" "\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5863,7 +5927,7 @@ msgstr "" "grafici\n" # (ndt) anche qui ho tolto il punto finale alla -B per uniformità -#: src/ls.c:4794 +#: src/ls.c:4788 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." @@ -5892,13 +5956,14 @@ msgstr "" " altrimenti: ordina secondo il ctime, prima il " "più recente\n" -#: src/ls.c:4804 +#: src/ls.c:4798 #, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5913,7 +5978,7 @@ msgstr "" " e non segue i collegamenti simbolici\n" " -D, --dired genera un output adatto al modo dired di Emacs\n" -#: src/ls.c:4812 +#: src/ls.c:4807 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5932,11 +5997,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time come -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr " -g come -l, ma non elenca il proprietario\n" -#: src/ls.c:4823 +#: src/ls.c:4818 #, fuzzy msgid "" " --group-directories-first\n" @@ -5951,7 +6016,7 @@ msgstr "" " di --sort=none (-U) disabilita il " "raggruppamento\n" -#: src/ls.c:4829 +#: src/ls.c:4824 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5966,7 +6031,7 @@ msgstr "" " (es.: 1K 234M 2G)\n" " --si similmente, ma usa multipli di 1000, non 1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 #, fuzzy msgid "" " -H, --dereference-command-line\n" @@ -5990,7 +6055,7 @@ msgstr "" "della shell\n" " (annullato da -a o -A)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -6011,7 +6076,7 @@ msgstr "" "della shell\n" " -k come --block-size=1K\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -6028,7 +6093,7 @@ msgstr "" " riferisce invece che sul collegamento stesso\n" " -m elenca le voci separandole con virgole\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -6046,7 +6111,7 @@ msgstr "" " -p, --indicator-style=slash\n" " appende / come indicatore alle directory\n" -#: src/ls.c:4871 +#: src/ls.c:4866 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" @@ -6068,7 +6133,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -6080,19 +6145,19 @@ msgstr "" " -s, --size stampa la dimensione allocata in blocchi di " "ogni file\n" -#: src/ls.c:4886 +#: src/ls.c:4881 #, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S ordina secondo le dimensioni dei file\n" " --sort=TIPO ordina per TIPO invece che per nome: none -U,\n" @@ -6105,7 +6170,7 @@ msgstr "" "specificato come\n" " chiave di ordinamento\n" -#: src/ls.c:4896 +#: src/ls.c:4892 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -6131,7 +6196,7 @@ msgstr "" "effetto\n" " solo fuori dal locale POSIX\n" -#: src/ls.c:4908 +#: src/ls.c:4904 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -6141,12 +6206,12 @@ msgstr "" " -T, --tabsize=COL assume che le tabulazioni siano ad ogni COL " "invece di 8\n" -#: src/ls.c:4912 +#: src/ls.c:4908 #, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -6161,14 +6226,15 @@ msgstr "" " -v ordina naturalmente secondo i numeri (di " "versione) nel testo\n" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=COL considera lo schermo largo COL invece del " "valore attuale\n" @@ -6179,7 +6245,7 @@ msgstr "" "file\n" " -1 elenca un file per riga\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6197,7 +6263,7 @@ msgstr "" "può cambiare queste impostazioni. Usare il comando dircolors per " "impostarla.\n" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6228,51 +6294,54 @@ msgid "David Madore" msgstr "David Madore" #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" "Uso: %s [OPZIONE]... [FILE]...\n" "Stampa o verifica i codici di controllo %s (%d-bit).\n" "Senza FILE, o quando FILE è -, legge lo standard input.\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" " -b, --binary legge in modalità binaria (predefinito se non si " "legge dal tty stdin)\n" -#: src/md5sum.c:178 -msgid " -b, --binary read in binary mode\n" +#: src/md5sum.c:180 +#, fuzzy +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary legge in modalità binaria\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 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:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text legge in modalità testo (predefinito)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 #, fuzzy msgid "" "\n" @@ -6294,14 +6363,15 @@ msgstr "" "codice di controllo\n" "\n" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "Le somme sono calcolate come descritto in %s. Durante il controllo, l'input\n" @@ -6311,52 +6381,52 @@ msgstr "" "per binario, spazio per\n" "testo) e il nome per ogni FILE.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: troppe righe del codice di controllo" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "" "%s: %: riga del codice di controllo %s non formattata correttamente" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: apertura o lettura NON RIUSCITA\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "NON RIUSCITO" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "OK" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, 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:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "ATTENZIONE: % riga non formattata correttamente" msgstr[1] "ATTENZIONE: % righe non formattate correttamente" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "ATTENZIONE: % file elencato non può essere letto" msgstr[1] "ATTENZIONE: % file elencati non possono essere letti" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" @@ -6365,19 +6435,19 @@ msgstr[0] "" msgstr[1] "" "ATTENZIONE: % codici di controllo calcolati NON corrispondono" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, 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:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6385,28 +6455,28 @@ msgstr "" "le opzioni --binary e --text non hanno significato quando si stanno " "verificando i codici di controllo" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -6449,24 +6519,24 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "" "impostazione del contesto predefinito di creazione dei file in %s non " "riuscita" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "impossibile preservare gli orari di %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "directory %s creata" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, fuzzy, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6687,7 +6757,7 @@ msgstr "troppi modelli" msgid "with --suffix, template %s must end in X" msgstr "con --suffix, il modello %s deve terminare con X" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "suffisso %s non valido, contiene separatori di directory" @@ -6826,9 +6896,7 @@ msgstr "Scott Bartram" #: src/nl.c:179 #, fuzzy -msgid "" -"Write each FILE to standard output, with line numbers added.\n" -"With no FILE, or when FILE is -, read standard input.\n" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "Scrive ogni FILE sullo standard output aggiungendo i numeri di riga.\n" "Senza FILE, o quando FILE è -, legge lo standard input.\n" @@ -6940,27 +7008,27 @@ msgstr "stile di numerazione del corpo non valido: %s" msgid "invalid footer numbering style: %s" msgstr "stile di numerazione del piè di pagina non valido: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "numero di riga iniziale non valido: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "incremento del numero di riga non valido: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "numero di righe vuote non valido: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "larghezza del campo numero riga non valida: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "formato del numero di righe non valido: %s" @@ -6986,7 +7054,7 @@ msgstr "" #, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -7005,44 +7073,44 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "rendere inutilizzabile lo standard input non riuscito" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "input ignorato" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "input ignorato e output accodato a %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "output accodato a %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" "impostazione della copia di stderr alla chiusura dell'esecuzione non riuscita" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "input ignorato e stderr reindirizzato in stdout" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "stderr reindirizzato in stdout" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -7070,100 +7138,97 @@ msgstr "" " --all stampa il numero dei processori installati\n" " --ignore=N se possibile, esclude N unità di elaborazione\n" -#: 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, fuzzy, c-format msgid "value too large to be converted: %s" msgstr "%s: valore non completamente convertito" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "numero %s non valido" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" # (ndt) - es: df -B 2a - Giorgio -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, 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:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "%s: apertura per la scrittura non riuscita" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "dimensioni di tabulazione non valide: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Uso: %s [OPZIONE]... [UTENTE]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 #, 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:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -7171,19 +7236,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -7193,30 +7258,30 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 #, fuzzy msgid "" "\n" @@ -7225,11 +7290,11 @@ msgstr "" "Altre opzioni:\n" "\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -7238,7 +7303,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -7246,7 +7311,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7254,7 +7319,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7262,7 +7327,28 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Ogni intervallo è uno tra:\n" +"\n" +" N N-esimo byte, carattere o campo, contato da 1\n" +" N- dal N-esimo byte, carattere o campo, alla fine della riga\n" +" N-M dal N-esimo al M-esimo byte (incluso), carattere o campo\n" +" -M dal primo al M-esimo byte (incluso), carattere o campo\n" +"\n" +"Senza FILE, o quando FILE è -, legge lo standard input.\n" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -7271,9 +7357,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7285,7 +7372,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -7300,119 +7387,131 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "il formato %s non ha una direttiva %%" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "formato di data %s non valido" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "il formato %s termina in %%" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "precisione non valida: %s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, 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:1081 +#: src/numfmt.c:1177 #, 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:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "numero di campo non valido: %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "intervallo di pagine non valido %s" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "numero di campo non valido: %s" +msgid "multiple field specifications" +msgstr "%s: specifica di campo %s non valida" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "data %s non valida" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, 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:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "specificate opzioni -i multiple" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, 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:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "errore leggendo %s" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, fuzzy, c-format msgid "failed to convert some of the input numbers" msgstr "rendere inutilizzabile lo standard input non riuscito" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7425,14 +7524,13 @@ msgstr "" " o: %s --traditional [OPZIONE]... [FILE] [[+]OFFSET[.][b] [+][ETICH][.]" "[b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Scrive una rappresentazione non ambigua, in modo predefinito in byte " @@ -7442,9 +7540,10 @@ msgstr "" "Senza FILE, o quando FILE è -, legge lo standard input.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 #, 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" @@ -7462,7 +7561,7 @@ msgstr "" "Per OFFSET e ETICH, un prefisso 0x o 0X significa esadecimale;\n" "i suffissi possono essere . per ottale e b per multipli di 512.\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7471,7 +7570,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 #, fuzzy msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" @@ -7494,7 +7593,7 @@ msgstr "" " --traditional accetta gli argomenti nella forma " "tradizionale\n" -#: src/od.c:363 +#: src/od.c:366 #, fuzzy msgid "" "\n" @@ -7514,7 +7613,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:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7530,7 +7629,7 @@ 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:380 +#: src/od.c:383 #, fuzzy msgid "" "\n" @@ -7545,7 +7644,7 @@ msgstr "" " a carattere con nome, ignorando il bit più alto\n" " c carattere ASCII o protetto da backslash\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7559,7 +7658,7 @@ msgstr "" " u[DIM] decimale senza segno, DIM byte per intero\n" " x[DIM] esadecimale, DIM byte per intero\n" -#: src/od.c:394 +#: src/od.c:397 #, fuzzy msgid "" "\n" @@ -7574,14 +7673,14 @@ msgstr "" "sizeof(long). Se TIPO è f, DIM può essere F per sizeof(float), D\n" "per sizeof(double) o L per sizeof(long double).\n" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 #, fuzzy msgid "" "\n" @@ -7599,13 +7698,13 @@ msgstr "" "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n" "GB 1000*1000*1000, G 1024*1024*1024, e così via per T, P, E, Z, Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "stringa di tipo non valida: %s" # (ndt) error generated by «od -t3 filename» -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7614,7 +7713,7 @@ msgstr "" "stringa di tipo non valida %s;\n" "questo sistema non fornisce un tipo intero a %lu byte" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7623,38 +7722,38 @@ msgstr "" "stringa di tipo non valida %s;\n" "questo sistema non fornisce un tipo a virgola mobile a %lu byte" -#: src/od.c:869 +#: src/od.c:872 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "carattere \"%c\" non valido nella stringa di tipo %s" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "impossibile saltare oltre la fine di un input combinato" -#: src/od.c:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, 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:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "la modalità compatibile supporta al massimo un file" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "il numero di byte saltati + byte letti è troppo grande" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "attenzione: larghezza %lu non valida; usare invece %d" @@ -7674,7 +7773,6 @@ msgstr "lo standard input è chiuso" 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 "" "Scrive le righe che corrispondono sequenzialmente a ciascun FILE,\n" "separate da TAB, sullo standard output.\n" @@ -7822,12 +7920,12 @@ msgstr "Quando" msgid "Where" msgstr "Dove" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Uso: %s [OPZIONE]... [UTENTE]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7843,7 +7941,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:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7857,7 +7955,7 @@ msgstr "" " -q omette il nome completo, l'host remoto e il tempo di\n" " inattività nel formato breve\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, fuzzy, c-format msgid "" "\n" @@ -7868,7 +7966,7 @@ msgstr "" "Una versione leggera di «finger»; stampa informazioni sugli utenti.\n" "Il file utmp sarà %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7876,96 +7974,96 @@ msgstr "" "almeno uno" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "«--pages=PRIMA_PAG[:ULTIMA_PAG]» argomento mancante" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "intervallo di pagine non valido %s" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "«-l LUNGH_PAG» numero di righe non valido: %s" -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "«-N NUMERO» numero della riga iniziale non valido: %s" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "«-o MARGINE» offset di riga non valido: %s" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "«-w LARGH_PAGINA» numero di caratteri non valido: %s" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "«-W LARGH_PAGINA» numero di caratteri non valido: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, 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:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "larghezza della pagina troppo stretta" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" "il numero della pagina iniziale % supera il numero di pagine " "%" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "overflow del numero di pagina" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Pagina %" -#: src/pr.c:2757 +#: src/pr.c:2727 #, fuzzy msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "Impagina o incolonna i FILE per la stampa.\n" "\n" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7982,7 +8080,7 @@ msgstr "" " specificata l'opzione -a. Bilancia il numero\n" " di righe nelle colonne di ciascuna pagina\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7999,7 +8097,7 @@ msgstr "" " -d, --double-space\n" " raddoppia l'interlinea nell'output\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -8023,7 +8121,7 @@ msgstr "" "5 righe\n" " e trailer senza -F)\n" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -8047,11 +8145,26 @@ msgstr "" " non allinea le colonne, --sep-string[=STRINGA] imposta i " "separatori\n" -#: src/pr.c:2798 +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l, --length=LUNGH_PAG\n" +" imposta la lunghezza della pagina a LUNGH_PAG (66) " +"righe\n" +" (numero predefinito di righe di testo 56, e con -F 63)\n" +" -m, --merge stampa tutti i file in parallelo, uno in ciascuna " +"colonna,\n" +" tronca le righe, ma unisce le righe di lunghezza piena " +"con -J\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -8064,7 +8177,7 @@ msgstr "" " tronca le righe, ma unisce le righe di lunghezza piena " "con -J\n" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -8082,7 +8195,7 @@ msgstr "" "prima\n" " pagina stampata (consultare +FIRST_PAGE)\n" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -8096,7 +8209,7 @@ msgstr "" " -r, --no-file-warnings\n" " omette l'avviso quando un file non può essere aperto\n" -#: src/pr.c:2820 +#: src/pr.c:2794 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -8117,7 +8230,7 @@ msgstr "" "impostato -w\n" # (ndt) messa la minuscola dopo i : per uniformità -#: src/pr.c:2828 +#: src/pr.c:2802 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -8125,7 +8238,6 @@ msgid "" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -SSTRINGA, --sep-string[=STRINGA]\n" " separa le colonne con STRINGA,\n" @@ -8135,7 +8247,13 @@ msgstr "" "opzioni delle colonne\n" " -t, --omit-header omette intestazioni e piè di pagina\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -8161,7 +8279,7 @@ msgstr "" " output multipli testo-colonna, -s[char] la disattiva " "(72)\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -8176,16 +8294,6 @@ msgstr "" "l'opzione -J,\n" " non interferisce con -S o -s\n" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"-t è implicito se LUNGH_PAG <= 10. Senza FILE, o quando FILE è -, legge\n" -"lo standard input.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -8350,12 +8458,11 @@ msgstr "" "di input.\n" "\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 #, fuzzy 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 stampa i riferimenti generati " "automaticamente\n" @@ -8364,6 +8471,12 @@ msgstr "" "riga\n" #: src/ptx.c:1835 +msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -8379,7 +8492,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:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8400,7 +8513,7 @@ msgstr "" " -o, --only-file=FILE legge l'elenco delle parole da considerare " "da questo FILE\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8413,20 +8526,16 @@ msgstr "" " -w, --width=NUMERO stampa la larghezza in colonne, esclusi i " "riferimenti\n" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Senza FILE, o quando FILE è -, legge lo standard input.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "larghezza dello spazio non valida: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "larghezza della riga non valida: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8455,7 +8564,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "cambio della directory in %s non riuscito" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "stat di %s non riuscito" @@ -8475,8 +8584,8 @@ msgstr "gli argomenti che non sono opzioni sono stati ignorati" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Uso: %s [OPZIONE]... FILE...\n" @@ -8736,15 +8845,15 @@ msgstr "" #: src/rm.c:342 #, fuzzy, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: rimuovere ricorsivamente tutti gli argomenti? " msgstr[1] "%s: rimuovere ricorsivamente tutti gli argomenti? " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: rimuovere tutti gli argomenti? " msgstr[1] "%s: rimuovere tutti gli argomenti? " @@ -8971,12 +9080,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "argomento in virgola mobile non valido: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "il formato %s ha una direttiva %%%c sconosciuta" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -9000,7 +9109,16 @@ msgstr "" "recuperare i dati anche con indagini hardware molto costose.\n" "\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Se un FILE corrisponde a -, effettua una nuova copia sullo standard output.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -9015,7 +9133,7 @@ msgstr "" " -s, --size=N distrugge solo N byte (sono accettati suffissi come K, M e " "G)\n" -#: src/shred.c:183 +#: src/shred.c:187 #, fuzzy msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" @@ -9032,12 +9150,10 @@ msgstr "" " -z, --zero aggiunge una sovrascrittura finale con zeri per nascondere\n" " la distruzione\n" -#: src/shred.c:192 +#: src/shred.c:196 #, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -9059,7 +9175,7 @@ msgstr "" "persone usano l'opzione --remove.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -9076,7 +9192,7 @@ msgstr "" "garantito che sia efficace:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -9098,7 +9214,7 @@ msgstr "" " Appliance\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -9112,7 +9228,7 @@ msgstr "" "* file system compressi\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -9135,7 +9251,7 @@ msgstr "" "come documentato nella pagina del manuale di mount (man mount).\n" "\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -9145,127 +9261,127 @@ msgstr "" "del file impossibili da rimuovere e che permetterebbero di recuperare un\n" "file distrutto.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync non riuscito" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync non riuscito" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: impossibile riavvolgere" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: passo %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: errore di scrittura all'offset %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek non riuscito" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: file troppo grande" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: passo %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: passo %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat non riuscito" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: tipo di file non valido" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: il file ha dimensioni negative" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: errore durante il troncamento" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl non riuscito" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: impossibile distruggere un descrittore di file append only" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: rimozione" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: rinominato in %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: rimozione non riuscita" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: rimosso" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: chiusura non riuscita" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: apertura per la scrittura non riuscita" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: numero di passi non valido" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "sono state specificate sorgenti casuali multiple" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: dimensione del file non valida" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -9276,7 +9392,7 @@ msgstr "" " o: %s -e [OPZIONE]... [ARG]...\n" " o: %s -i BASSO-ALTO [OPZIONE]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 #, fuzzy msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" @@ -9284,7 +9400,7 @@ msgstr "" "output.\n" "\n" -#: src/shuf.c:73 +#: src/shuf.c:75 #, fuzzy msgid "" " -e, --echo treat each ARG as an input line\n" @@ -9305,37 +9421,37 @@ msgstr "" " -z, --zero-terminated termina le righe con il byte 0, non con il " "ritorno a capo\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "troppe righe ripetute" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "specificate opzioni -i multiple" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "intervallo di input %s non valido" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "numero di riga %s non valido" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "è stato specificato più di un file di output" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "non è possibile combinare le opzioni -e e -i" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -9365,12 +9481,12 @@ msgstr "" "quantità di tempo data dalla somma dei loro valori.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "intervallo di tempo non valido: %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "impossibile leggere l'orologio realtime" @@ -9382,7 +9498,7 @@ msgstr "" "Scrive una concatenazione ordinata di tutti i FILE sullo standard output.\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -9390,7 +9506,7 @@ msgstr "" "Opzioni di ordinamento:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9402,7 +9518,7 @@ msgstr "" " -f, --ignore-case ignora le differenze tra caratteri minuscoli e " "maiuscoli\n" -#: src/sort.c:443 +#: src/sort.c:444 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -9414,14 +9530,14 @@ msgstr "" " -M, --month-sort confronta (sconosciuto) < \"GEN\" < ... < \"DIC" "\"\n" -#: src/sort.c:448 +#: src/sort.c:449 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:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9435,7 +9551,7 @@ msgstr "" " -r, --reverse inverte il risultato dei confronti\n" "\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9452,7 +9568,7 @@ msgstr "" "versione) nel testo\n" "\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -9460,7 +9576,7 @@ msgstr "" "Altre opzioni:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9468,7 +9584,7 @@ msgstr "" " --batch-size=NUM unisce al massimo NUM input contemporaneamente;\n" " per un numero maggiore usare file temporanei\n" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -9484,7 +9600,7 @@ msgstr "" " li decomprime con PROG -d\n" # (ndt) idee su questionable??? -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9498,7 +9614,7 @@ msgstr "" " dai nomi nel file F (terminati con NUL);\n" " se F è -, legge i nomi dallo standard input\n" -#: src/sort.c:487 +#: src/sort.c:488 #, fuzzy msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" @@ -9510,7 +9626,7 @@ msgstr "" "di POS in basso\n" " -m, --merge unisce file già ordinati; non ordina\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9523,7 +9639,7 @@ msgstr "" "\"last-resort\"\n" " -S, --buffer-size=DIM usa DIM per il buffer della memoria principale\n" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9549,7 +9665,7 @@ msgstr "" " senza -c, mostra solo il primo di una sequenza " "uguale\n" -#: src/sort.c:511 +#: src/sort.c:512 #, fuzzy msgid "" "\n" @@ -9581,12 +9697,11 @@ msgstr "" "\n" "DIM può essere seguita dai seguenti suffissi moltiplicativi:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -9602,251 +9717,249 @@ msgstr "" "Impostare LC_ALL=C per avere l'ordinamento tradizionale che usa\n" "i valori nativi dei byte.\n" -#: src/sort.c:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "attesa di %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] terminato in modo anomalo" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "impossibile creare il file temporaneo in %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "open non riuscita" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "fflush non riuscita" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "close non riuscita" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "impossibile creare il file temporaneo" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "impossibile creare il processo per %s -d" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "attenzione: impossibile rimuovere %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "l'argomento %2$s di --%1$s non è valido" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "il minimo dell'argomento --%s è %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "l'argomento %2$s di --%1$s è troppo grande" -#: src/sort.c:1359 +#: src/sort.c:1358 #, 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:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "numero in parallelo non deve essere zero" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "stat non riuscita" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "read non riuscita" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "trasformazione stringa non riuscita" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "la stringa non trasformata era %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "^ nessuna corrispondenza per la chiave\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, fuzzy, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "usata la chiave obsoleta \"%s\"; considerare invece \"%s\"" -#: src/sort.c:2428 +#: src/sort.c:2427 #, 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:2439 +#: src/sort.c:2438 #, 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:2452 +#: src/sort.c:2451 #, 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:2484 +#: src/sort.c:2483 #, 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:2490 +#: src/sort.c:2489 #, 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:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "write non riuscita" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: fuori ordine: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "standard error" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "%s: impossibile riavvolgere" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: specifica di campo %s non valida" -#: src/sort.c:4028 +#: src/sort.c:4027 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "le opzioni «-%s» sono incompatibili" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: conteggio non valido all'inizio di %s" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "numero non valido dopo \"-\"" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "numero non valido dopo \".\"" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "carattere estraneo nella specifica del campo" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "è stato specificato più di un programma di compressione" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "numero non valido all'inizio del campo" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "il numero del campo è zero" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "l'offset del carattere è zero" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "numero non valido dopo \",\"" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "tabulatore vuoto" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "impossibile leggere i nomi dei file da %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: nome di file di lunghezza nulla non valido" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "nessun input da %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "usate le regole di ordinamento %s" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "usato il confronto a singolo byte" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "operando %s in più non permesso con -%c" -#: src/split.c:186 -#, c-format -msgid "the suffix length needs to be at least %zu" +#: src/split.c:207 +#, fuzzy, c-format +msgid "the suffix length needs to be at least %" msgstr "la lunghezza del suffisso deve essere almeno %zu" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Uso: %s [OPZIONE]... [INPUT [PREFISSO]]\n" -#: src/split.c:207 +#: src/split.c:228 #, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" "Trasforma l'INPUT in parti con lunghezza fissa del tipo PREFISSOaa, " "PREFISSOab, ...; la dimensione\n" @@ -9855,21 +9968,24 @@ msgstr "" "è -, legge dallo standard input.\n" "\n" -#: src/split.c:215 +#: src/split.c:236 #, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file names\n" " -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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" " -a, --suffix-length=N usa suffissi di lunghezza N (predefinito %d)\n" @@ -9885,7 +10001,7 @@ msgstr "" " -u, --unbuffered copia immediatamente l'input in output con «-n " "r/...»\n" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9893,17 +10009,17 @@ msgstr "" " --verbose stampa una diagnostica prima\n" " dell'apertura di ciascun file di output\n" -#: src/split.c:235 +#: src/split.c:258 #, fuzzy 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" "\n" "PARTI può essere:\n" @@ -9914,192 +10030,197 @@ 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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "i suffissi dei file di output sono esauriti" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "creazione di %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "impostazione della variabile di ambiente FILE non riuscita" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "esecuzione con FILE=%s\n" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "creazione della pipe non riuscita" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "chiusura della pipe precedente" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "chiusura della pipe di output" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "spostamento della pipe di input" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "chiusura della pipe di input" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "impossibile eseguire il comando: «%s -c %s»" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "chiusura della pipe di input non riuscita" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "in attesa del processo figlio" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "con FILE=%s, segnale %s dal comando: %s" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "con FILE=%s, uscita %d dal comando: %s" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "stato sconosciuto dal comando (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "impossibile suddividere in più di un modo" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: numero di parti non valido" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: numero di parte non valido" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: lunghezza del suffisso non valida" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: numero di byte non valido" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: numero di righe non valido" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "tabulatore multicarattere %s" -#: src/split.c:1286 +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "file speciale a caratteri" + +#: src/split.c:1383 #, 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:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "numero di riga iniziale non valido: %s" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: dimensione del blocco di IO non valida" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "--filter non processa una parte estratta in stdout" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" # (ndt) ??? -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "trasformazione di %s in forma canonica non riuscita" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "attenzione: sequenza di escape «\\%c» non riconosciuta" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: direttiva non valida" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "attenzione: backslash alla fine del formato" -#: src/stat.c:1262 +#: src/stat.c:1265 #, 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:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "impossibile leggere le informazioni del file system per %s" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -10115,7 +10236,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -10125,30 +10246,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "Contesto: %C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -10160,11 +10281,11 @@ msgstr "" "Cambio : %z\n" "Creazione: %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 #, fuzzy msgid "" " -L, --dereference follow links\n" @@ -10176,7 +10297,7 @@ msgstr "" " -f, --file-system visualizza lo stato del file system invece di quello " "del file\n" -#: src/stat.c:1422 +#: src/stat.c:1425 #, fuzzy msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" @@ -10198,7 +10319,7 @@ msgstr "" "FORMATO\n" " -t, --terse stampa le informazioni in modo conciso\n" -#: src/stat.c:1433 +#: src/stat.c:1436 #, fuzzy msgid "" "\n" @@ -10219,7 +10340,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:1442 +#: src/stat.c:1445 #, fuzzy msgid "" " %d device number in decimal\n" @@ -10236,7 +10357,7 @@ msgstr "" " %g Id del gruppo del proprietario\n" " %G Nome del gruppo del proprietario\n" -#: src/stat.c:1450 +#: src/stat.c:1453 #, fuzzy msgid "" " %h number of hard links\n" @@ -10260,7 +10381,7 @@ msgstr "" " %t Major number del device in esadecimale\n" " %T Minor number del device in esadecimale\n" -#: src/stat.c:1461 +#: src/stat.c:1464 #, fuzzy msgid "" " %u user ID of owner\n" @@ -10287,7 +10408,7 @@ msgstr "" " %Z Orario dell'ultimo cambiamento in secondi dall'Epoca\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -10306,7 +10427,7 @@ msgstr "" " %d Numero di inode liberi nel file system\n" " %f Numero di blocchi liberi file system\n" -#: src/stat.c:1484 +#: src/stat.c:1487 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -10394,8 +10515,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -10426,7 +10546,7 @@ msgstr "il buffering di righe su stdin non ha significato" msgid "you must specify a buffering mode option" msgstr "è necessario specificare un %s relativo con %s" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10437,11 +10557,11 @@ msgstr "" " or: %s [-F DEVICE] | --file=DEVICE] [-a|--all]\n" " or: %s [-F DEVICE] | --file=DEVICE] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 #, fuzzy msgid "" " -a, --all print all current settings in human-readable form\n" @@ -10456,7 +10576,7 @@ msgstr "" " leggibile da stty\n" " -F, --file=DEVICE apre e usa il DEVICE specificato invece di stdin\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10467,11 +10587,24 @@ msgstr "" "impostazioni non POSIX. Il sistema sottostante definisce quali impostazioni\n" "sono disponibili.\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -10482,9 +10615,13 @@ msgstr "" " eof CAR CAR invierà un fine file (termina l'input)\n" " eol CAR CAR terminerà la riga\n" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -10494,35 +10631,58 @@ msgstr "" " intr CAR CAR invierà un segnale di interrupt\n" " kill CAR CAR cancellerà la riga corrente\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" msgstr "" -" * lnext CAR CAR inserirà il carattere successivo in modo letterale\n" -" quit CAR CAR invierà un segnale di quit\n" -" * rprnt CAR CAR ridisegnerà la riga corrente\n" -" start CAR CAR farà ripartire l'output dopo averlo fermato\n" -#: src/stty.c:559 +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 CAR CAR fermerà l'output\n" " susp CAR CAR invierà il segnale di stop del terminale\n" " * swtch CAR CAR passerà ad un diverso livello di shell\n" " * werase CAR CAR cancellerà l'ultima parola digitata\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 +#, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Impostazioni speciali:\n" +" N imposta a N baud le velocità di input e output\n" +" * cols N dice al kernel che il terminale ha N colonne\n" +" * columns N come cols N\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -10532,10 +10692,17 @@ msgstr "" " * cols N dice al kernel che il terminale ha N colonne\n" " * columns N come cols N\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -10546,11 +10713,22 @@ msgstr "" "lettura completa\n" " ospeed N imposta a N la velocità di output\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N dice al kernel che il terminale ha N righe\n" +" * size stampa il numero di righe e colonne secondo il kernel\n" +" speed stampa la velocità del terminale\n" +" time N con -icanon, imposta a N decimi di secondo il timeout in " +"lettura\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -10560,26 +10738,27 @@ msgstr "" " time N con -icanon, imposta a N decimi di secondo il timeout in " "lettura\n" -#: src/stty.c:584 -#, fuzzy +#: src/stty.c:641 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" -"Impostazioni di controllo:\n" -"\n" -" [-]clocal disabilita i segnali di controllo del modem\n" -" [-]cread permette la ricezione dell'input\n" -" * [-]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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -10588,7 +10767,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb usa due bit di stop per carattere (uno con \"-\")\n" " [-]hup invia un signal di hangup quando l'ultimo processo chiude " @@ -10598,7 +10776,12 @@ msgstr "" "parità in input\n" " [-]parodd imposta la parità dispari (pari con \"-\")\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -10606,6 +10789,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Impostazioni dell'input:\n" @@ -10615,10 +10799,14 @@ msgstr "" " [-]ignbrk ignora i caratteri di break\n" " [-]igncr ignora i ritorno carrello\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -10630,15 +10818,25 @@ 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:616 +#: src/stty.c:692 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:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" +" * [-]iutf8 assume che i caratteri in ingresso siano codificati UTF-8\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -10653,61 +10851,83 @@ msgstr "" "carattere)\n" " [-]tandem come [-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Impostazioni dell'output:\n" -" * bsN stile del ritardo di backspace, N in [0..1]\n" -" * crN stile del ritardo del ritorno carrello, N in [0..3]\n" -" * 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:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" -msgstr "" -" * [-]ocrnl converte ritorno carrello in ritorno a capo\n" -" * [-]ofdel usa per il riempimento caratteri di delete invece di null\n" -" * [-]ofill usa caratteri di riempimento (padding) invece di\n" -" temporizzazioni per i ritardi\n" -" * [-]olcuc converte i caratteri minuscoli in maiuscoli\n" -" * [-]onlcr converte ritorno a capo in ritorno carrello-ritorno a capo\n" -" * [-]onlret ritorno a capo esegue un ritorno carrello\n" - -#: src/stty.c:643 -msgid "" -" * [-]onocr do not print carriage returns in the first column\n" -" [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 +msgid "" " * 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 "" -" * [-]onocr non stampa i ritorno carrello nella prima colonna\n" -" [-]opost postprocessa l'output\n" -" * tabN stile del ritardo del tabulatore orizzontale, N in [0..3]\n" -" * tabs come tab0\n" -" * -tabs come tab3\n" -" * vtN stile del ritardo del tabulatore verticale, N in [0..1]\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10720,48 +10940,64 @@ msgstr "" " * -crtkill cancella tutte le righe obbedendo alle impostazioni\n" " echoctl e echok\n" -#: src/stty.c:658 -#, fuzzy +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +#, fuzzy +msgid " [-]echo echo input characters\n" +msgstr "" +" * [-]iutf8 assume che i caratteri in ingresso siano codificati UTF-8\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]ctlecho fa l'echo dei caratteri di controllo nella notazione \"^c" -"\"\n" -" [-]echo fa l'echo dei caratteri in input\n" -" * [-]echoctl come [-]ctlecho\n" -" [-]echoe come [-]crterase\n" -" [-]echok fa l'echo di un ritorno a capo dopo un carattere di kill\n" -#: src/stty.c:665 -#, fuzzy +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]echoke come [-]crtkill\n" -" [-]echonl fa l'echo di un ritorno a capo anche se non fa l'echo degli " -"altri caratteri\n" -" * [-]echoprt fa l'echo al contrario dei caratteri cancellati, tra \"\\\" " -"e \"/\"\n" -" [-]icanon abilita i caratteri speciali erase, kill, werase, e rprnt\n" -" [-]iexten abilita i caratteri speciali non POSIX\n" +" [-]isig abilita i caratteri speciali interrupt, quit, e suspend\n" +" [-]noflsh disabilita il flushing dopo i caratteri speciali di " +"interrupt e quit\n" +" * [-]prterase come [-]echoprt\n" +" * [-]tostop ferma i processi in background che provano a scrivere sul " +"terminale\n" +" * [-]xcase con icanon, fa l'escape con \"\\\" per i caratteri " +"maiuscoli\n" -#: src/stty.c:672 +#: src/stty.c:843 #, fuzzy 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 "" " [-]isig abilita i caratteri speciali interrupt, quit, e suspend\n" " [-]noflsh disabilita il flushing dopo i caratteri speciali di " @@ -10772,11 +11008,33 @@ msgstr "" " * [-]xcase con icanon, fa l'escape con \"\\\" per i caratteri " "maiuscoli\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -10786,40 +11044,50 @@ msgstr "" " cbreak come -icanon\n" " -cbreak come icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 come brkint ignpar istrip icrnl ixon opost isig\n" " icanon, i caratteri eof e eol ai loro valori predefiniti\n" " -cooked come raw\n" " crt come echoe echoctl echoke\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -" dec come echoe echoctl echoke -ixany intr ^c erase 0177\n" -" kill ^u\n" -" * [-]decctlq come [-]ixany\n" -" ek caratteri di erase e kill ai loro valori predefiniti\n" -" evenp come parenb -parodd cs7\n" -#: src/stty.c:699 +#: src/stty.c:919 +#, fuzzy 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 "" " -evenp come -parenb cs8\n" " * [-]lcase come xcase iuclc olcuc\n" @@ -10828,7 +11096,19 @@ msgstr "" " nl come -icrnl -onlcr\n" " -nl come icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"Impostazioni combinazione:\n" +" * [-]LCASE come [-]lcase\n" +" cbreak come -icanon\n" +" -cbreak come icanon\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10842,11 +11122,12 @@ msgstr "" " pass8 come -parenb -istrip cs8\n" " -pass8 come parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw come -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" @@ -10854,14 +11135,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw come cooked\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane come cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10870,7 +11152,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, tutti i caratteri\n" " speciali ai loro valori predefiniti\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10885,12 +11167,12 @@ msgstr "" "o 127; i valori speciali ^- o undef sono usati per disabilitare i caratteri\n" "speciali.\n" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "può essere specificato un solo dispositivo" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10899,46 +11181,51 @@ msgstr "" "le opzioni per gli stili dell'output \"verbose\" e \"stty-readable\" sono " "mutualmente esclusive" -#: src/stty.c:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: impossibile azzerare il modo non bloccante" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "argomento %s non valido" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "manca l'argomento per %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: errore durante il troncamento" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "disciplina di riga non valida %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: impossibile eseguire tutte le operazioni richieste" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: non ci sono informazioni sulle dimensioni di questo dispositivo" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "argomento intero %s non valido" #. This is a proper name. See the gettext manual, section Names. @@ -10947,8 +11234,15 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Stampa il checksum CRC e la dimensione in byte di ogni FILE.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -10959,20 +11253,54 @@ msgstr "" " -s, --sysv usa l'algoritmo di somma System V, usa blocchi da 512 " "byte\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, fuzzy, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Uso: %s [OPZIONE]... [FILE]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Forza la scrittura su disco dei blocchi cambiati, aggiorna il super block.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" -#: src/sync.c:69 +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "errore leggendo %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: impossibile azzerare il modo non bloccante" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "errore leggendo %s" + +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "ignorati tutti gli argomenti" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10985,15 +11313,23 @@ msgstr "" "la versione descritta qui. Fare riferimento alla documentazione della shell\n" "per i dettagli sulle opzioni supportate.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help mostra questo aiuto ed esce\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version stampa le informazioni sulla versione ed esce\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Senza FILE, o quando FILE è -, legge lo standard input.\n" + +#: src/system.h:544 #, fuzzy msgid "" "\n" @@ -11002,7 +11338,7 @@ msgstr "" "Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle " "brevi.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -11010,7 +11346,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -11025,7 +11361,7 @@ msgstr "" "Altrimenti, le unità sono predefinite a 1024 byte (o 512 se è impostata " "POSIXLY_CORRECT).\n" -#: src/system.h:570 +#: src/system.h:590 #, fuzzy, c-format msgid "" "\n" @@ -11036,23 +11372,27 @@ msgstr "Sito web di %s: <%s>\n" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "Segnalare i bug di traduzione di %s a \n" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -"Per la documentazione completa, eseguire: info coreutils \"%s invocation\"\n" -#: src/system.h:591 +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Usare «%s --help» per ulteriori informazioni.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -11074,9 +11414,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "Scrive ogni FILE nello standard output, dall'ultima riga alla prima.\n" "Senza FILE, o quando FILE è -, legge lo standard input.\n" @@ -11094,57 +11432,56 @@ msgstr "" " -s, --separator=STRINGA utilizza STRINGA come separatore anziché il " "carattere di ritorno a capo\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: seek non riuscito" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "record troppo grande" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "impossibile creare il file temporaneo in %s" -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: apertura per la scrittura non riuscita" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "impossibile preservare gli orari di %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: errore di scrittura" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "impossibile aprire %s per la lettura" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "il separatore non può essere vuoto" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 +#: src/tail.c:257 #, 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" 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 " @@ -11152,7 +11489,7 @@ msgstr "" "Con nessun FILE, o quando il FILE è -, legge lo standard input.\n" "\n" -#: src/tail.c:270 +#: src/tail.c:265 #, fuzzy msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" @@ -11163,7 +11500,7 @@ msgstr "" " stampare i byte che iniziano con il K-esimo di " "ciascun file\n" -#: src/tail.c:274 +#: src/tail.c:269 #, fuzzy msgid "" " -f, --follow[={name|descriptor}]\n" @@ -11179,7 +11516,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:280 +#: src/tail.c:275 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -11202,7 +11539,7 @@ msgstr "" "ruotano).\n" " Con inotify, questa opzione è raramente utile\n" -#: src/tail.c:293 +#: src/tail.c:288 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -11218,7 +11555,7 @@ msgstr "" "follow=nome\n" # (ndt) ho tolto il punto finale in -s per uniformità -#: src/tail.c:298 +#: src/tail.c:293 #, fuzzy msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" @@ -11234,7 +11571,7 @@ msgstr "" " -v, --verbose stampa sempre le intestazioni fornendo i nomi dei " "file\n" -#: src/tail.c:307 +#: src/tail.c:302 #, fuzzy msgid "" "\n" @@ -11255,7 +11592,7 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024, e così via per T, P, E, Z, Y.\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -11276,179 +11613,179 @@ msgstr "" "conto\n" "di operazione di rinomina, rimozione e creazione.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "chiusura di %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: impossibile posizionarsi all'offset %s relativo alla fine" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "impossibile determinare la posizione di %s, ritorno al polling" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, fuzzy, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" "%s è stato sostituito con un file remoto; operazione annullata per questo " "nome" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s è diventato inaccessibile" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s è divenuto accessibile" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s è comparso; si sta seguendo la fine del nuovo file" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s è stato sostituito; si sta seguendo la fine del nuovo file" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: impossibile cambiare il modo non bloccante" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: file troncato" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "nessun file rimasto" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "impossibile controllare la directory padre di %s" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "risorse inotify esaurite" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "impossibile controllare %s" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: sostituire %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "errore monitorando l'evento inotify" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "errore leggendo l'evento inotify" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: non si può continuare fino alla fine di questo tipo di file; " "elaborazione terminata per questo nome" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "il numero in %s è troppo grande" - # (ndt) sono esecuzioni ripetute della chiamata _stat_, non stati - Giorgio -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "%s: numero massimo di stat non cambiate tra le aperture non valido" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: PID non valido" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: numero di secondi non valido" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "numero di colonne non valido: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "opzione usata in un contesto non valido -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, fuzzy, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "attenzione: PID ignorato; --pid=PID è utile solo seguendo" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "attenzione: PID ignorato; --pid=PID è utile solo seguendo" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "attenzione: --pid=PID non è supportato su questo sistema" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "impossibile seguire %s per nome" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" "attenzione: seguire lo standard input in modo indefinito non è efficace" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "inotify non può essere usato, ritorno al polling" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -11460,60 +11797,72 @@ msgstr "" " -a, --append accoda ai FILE specificati, non sovrascrive\n" " -i, --ignore-interrupts ignora i segnali di interrupt\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Se un FILE corrisponde a -, effettua una nuova copia sullo standard output.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "manca l'argomento dopo %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "intero non valido %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "atteso \")\"" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "atteso \")\", trovato %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: atteso un operatore unario" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt non accetta -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef non accetta -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot non accetta -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "operatore binario sconosciuto" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: atteso un operatore binario" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11527,7 +11876,7 @@ msgstr "" " o: [ ]\n" " o: [ OPZIONE\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11535,7 +11884,7 @@ msgstr "" "Esce con lo stato determinato dall'ESPRESSIONE.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11545,7 +11894,7 @@ msgstr "" "Un'ESPRESSIONE omessa restituisce falso. Altrimenti,\n" "ESPRESSIONE è vera o falsa e imposta lo stato d'uscita. È uno tra:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11559,7 +11908,7 @@ msgstr "" " ESPRESSIONE1 -a ESPRESSIONE2 sia ESPRESSIONE1 che ESPRESSIONE2 sono vere\n" " ESPRESSIONE1 -o ESPRESSIONE2 o ESPRESSIONE1 o ESPRESSIONE2 è vera\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11575,7 +11924,7 @@ msgstr "" " STRINGA1 = STRINGA2 le stringhe sono uguali\n" " STRINGA1 != STRINGA2 le stringhe sono diverse\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11593,7 +11942,7 @@ msgstr "" " INTERO1 -lt INTERO2 INTERO1 è minore di INTERO2\n" " INTERO1 -ne INTERO2 INTERO1 non è uguale a INTERO2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11606,7 +11955,7 @@ msgstr "" " FILE1 -nt FILE2 FILE1 è più nuovo (data di modifica) di FILE2\n" " FILE1 -ot FILE2 FILE1 è più vecchio di FILE2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11620,7 +11969,7 @@ msgstr "" " -d FILE FILE esiste ed è una directory\n" " -e FILE FILE esiste\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11634,7 +11983,7 @@ msgstr "" " -h FILE FILE esiste ed è un collegamento simbolico (come -L)\n" " -k FILE FILE esiste ed ha il suo sticky bit impostato\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11648,7 +11997,7 @@ msgstr "" " -r FILE FILE esiste ed è leggibile\n" " -s FILE FILE esiste ed ha dimensione maggiore di zero\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11662,7 +12011,7 @@ msgstr "" " -w FILE FILE esiste ed è scrivibile\n" " -x FILE FILE esiste ed è eseguibile o ricercabile\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11677,7 +12026,7 @@ msgstr "" "backslash) dalla shell.\n" "INTERO può anche essere -l STRINGA, che è assume la lunghezza di STRINGA.\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11687,26 +12036,26 @@ msgstr "" "NOTA: [ gestisce le opzioni --help e --version, ma test no.\n" "test le gestisce come se trattasse qualsiasi altra STRINGA non vuota.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test o [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 #, fuzzy msgid "missing ']'" msgstr "manca un \"]\"" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "argomento %s in più" @@ -11726,7 +12075,7 @@ msgstr "attenzione: timer_settime" msgid "warning: timer_create" msgstr "attenzione: timer_create" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11735,7 +12084,7 @@ msgstr "" "Uso: %s [OPZIONE] DURATA COMANDO [ARG]...\n" " o: %s [OPZIONE]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 #, fuzzy msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" @@ -11744,7 +12093,7 @@ msgstr "" "Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle " "brevi.\n" -#: src/timeout.c:238 +#: src/timeout.c:240 #, fuzzy msgid "" " --preserve-status\n" @@ -11778,7 +12127,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:257 +#: src/timeout.c:259 #, fuzzy msgid "" "\n" @@ -11791,7 +12140,7 @@ msgstr "" "\"s\" per secondi (predefinito), \"m\" per minuti, \"h\" per ore o \"d\" per " "giorni.\n" -#: src/timeout.c:262 +#: src/timeout.c:264 #, fuzzy msgid "" "\n" @@ -11811,7 +12160,7 @@ msgstr "" "usare il segnale KILL (9), dato che questo segnale non può essere " "catturato.\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "attenzione: disabilitazione dei dump di core non riuscita" @@ -11826,6 +12175,11 @@ msgstr "errore aspettando il comando" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "stato sconosciuto dal comando (0x%X)" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -12204,12 +12558,12 @@ msgstr "Termina con un codice di stato indicante successo." msgid "Exit with a status code indicating failure." msgstr "Termina con un codice di stato indicante fallimento." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Uso: %s OPZIONE... [FILE]...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 #, fuzzy msgid "" "Shrink or extend the size of each FILE to the specified size\n" @@ -12230,18 +12584,18 @@ msgstr "" "viene letta come byte zero.\n" "\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create non crea alcun file\n" -#: src/truncate.c:112 +#: src/truncate.c:85 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:115 +#: src/truncate.c:88 #, fuzzy msgid "" " -r, --reference=RFILE base size on RFILE\n" @@ -12251,7 +12605,7 @@ msgstr "" " -s, --size=DIM imposta o modifica la dimensione del file a questa " "DIMensione\n" -#: src/truncate.c:121 +#: src/truncate.c:94 #, fuzzy msgid "" "\n" @@ -12265,57 +12619,62 @@ msgstr "" "\"/\" arrotondato in difetto a multipli di, \"%\" arrotondato in eccesso a " "multipli di.\n" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "overflow in % * % blocchi di byte per il file %s" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s non è usabile, apparentemente ha dimensioni negative" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "impossibile ottenere la dimensione di %s" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "overflow arrotondando la dimensione del file %s" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "overflow estendendo la dimensione del file %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "troncamento di %s a % byte non riuscito" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "specificati modificatori multipli relativi" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "numero %s non valido" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "è necessario specificare uno tra %s o %s" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "è necessario specificare un %s relativo con %s" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "era specificato %s ma non %s" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "impossibile aprire %s per la scrittura" @@ -12326,12 +12685,10 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Uso: %s [OPZIONE] [FILE]\n" "Scrive un elenco totalmente ordinato di un FILE rispettando l'ordinamento " @@ -12339,12 +12696,17 @@ msgstr "" "Senza FILE, o quando FILE è -, legge lo standard input.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: l'input contiene un numero dispari di token" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: l'input contiene un ciclo:" @@ -12412,9 +12774,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "Converte gli spazi in tabulazioni in ogni FILE e scrive sullo standard " "output.\n" @@ -12478,8 +12838,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -12490,7 +12850,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -12646,11 +13006,6 @@ msgstr "" " Anche i processi in\n" "uno stato non interrompibile di riposo contribuiscono al carico medio.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -12672,12 +13027,17 @@ msgstr "" "%s è comunemente usato come FILE.\n" "\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -12695,12 +13055,13 @@ msgstr "" " -m, --chars stampa il numero di caratteri\n" " -l, --lines stampa il numero di righe\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=F legge l'input dai file specificati\n" @@ -12867,10 +13228,10 @@ msgstr "" "Come id -un.\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: impossibile trovare il nome per l'id utente %lu\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "impossibile trovare il nome dell'utente con id %lu" #: src/yes.c:41 #, c-format @@ -12890,6 +13251,233 @@ msgstr "" "Stampa in continuazione una riga con ogni STRINGA specificata oppure \"y\".\n" "\n" +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "-t è implicito se LUNGH_PAG <= 10. Senza FILE, o quando FILE è -, legge\n" +#~ "lo standard input.\n" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Senza FILE, o quando FILE è -, legge lo standard input.\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Forza la scrittura su disco dei blocchi cambiati, aggiorna il super " +#~ "block.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "ignorati tutti gli argomenti" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: numero non valido" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s è così grande che è impossibile rappresentarlo" + +#~ msgid "number of lines" +#~ msgstr "numero di righe" + +#~ msgid "number of bytes" +#~ msgstr "numero di byte" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: numero di esclusioni non valido" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: numero di byte non valido" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: numero di righe non valido" + +#~ msgid "number in %s is too large" +#~ msgstr "il numero in %s è troppo grande" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: numero di secondi non valido" + +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "impostazione del gruppo supplementare non riuscita" + +#, fuzzy +#~ 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 "" +#~ "\n" +#~ "Mandando un segnale %s ad un processo di «dd» attivo vengono mostrate " +#~ "statistiche di I/O sullo standard error; in seguito verrà ripresa la " +#~ "copia.\n" +#~ "\n" +#~ " $ dd if=/dev/zero of=/dev/null& pid=$!\n" +#~ " $ kill -%s $pid; sleep 1; kill $pid\n" +#~ " 18335302+0 record in\n" +#~ " 18335302+0 record out\n" +#~ " 9387674624 byte (9,4 GB) copiati, 34,6279 s, 271 MB/s\n" +#~ "\n" +#~ "Le opzioni sono:\n" +#~ "\n" + +#~ 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 CAR CAR inserirà il carattere successivo in modo letterale\n" +#~ " quit CAR CAR invierà un segnale di quit\n" +#~ " * rprnt CAR CAR ridisegnerà la riga corrente\n" +#~ " start CAR CAR farà ripartire l'output dopo averlo fermato\n" + +#, 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" +#~ "Impostazioni di controllo:\n" +#~ "\n" +#~ " [-]clocal disabilita i segnali di controllo del modem\n" +#~ " [-]cread permette la ricezione dell'input\n" +#~ " * [-]crtscts abilita l'handshaking RTS/CTS\n" +#~ " csN imposta a N bit la dimensione dei caratteri, N tra 5 e " +#~ "8\n" + +#~ 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 "" +#~ "\n" +#~ "Impostazioni dell'output:\n" +#~ " * bsN stile del ritardo di backspace, N in [0..1]\n" +#~ " * crN stile del ritardo del ritorno carrello, N in [0..3]\n" +#~ " * 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" + +#, fuzzy +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl converte ritorno carrello in ritorno a capo\n" +#~ " * [-]ofdel usa per il riempimento caratteri di delete invece di " +#~ "null\n" +#~ " * [-]ofill usa caratteri di riempimento (padding) invece di\n" +#~ " temporizzazioni per i ritardi\n" +#~ " * [-]olcuc converte i caratteri minuscoli in maiuscoli\n" +#~ " * [-]onlcr converte ritorno a capo in ritorno carrello-ritorno a " +#~ "capo\n" +#~ " * [-]onlret ritorno a capo esegue un ritorno carrello\n" + +#~ 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 "" +#~ " * [-]onocr non stampa i ritorno carrello nella prima colonna\n" +#~ " [-]opost postprocessa l'output\n" +#~ " * tabN stile del ritardo del tabulatore orizzontale, N in " +#~ "[0..3]\n" +#~ " * tabs come tab0\n" +#~ " * -tabs come tab3\n" +#~ " * vtN stile del ritardo del tabulatore verticale, N in [0..1]\n" + +#, fuzzy +#~ 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 "" +#~ " * [-]ctlecho fa l'echo dei caratteri di controllo nella notazione \"^c" +#~ "\"\n" +#~ " [-]echo fa l'echo dei caratteri in input\n" +#~ " * [-]echoctl come [-]ctlecho\n" +#~ " [-]echoe come [-]crterase\n" +#~ " [-]echok fa l'echo di un ritorno a capo dopo un carattere di " +#~ "kill\n" + +#, fuzzy +#~ 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 "" +#~ " * [-]echoke come [-]crtkill\n" +#~ " [-]echonl fa l'echo di un ritorno a capo anche se non fa l'echo " +#~ "degli altri caratteri\n" +#~ " * [-]echoprt fa l'echo al contrario dei caratteri cancellati, tra \"\\" +#~ "\" e \"/\"\n" +#~ " [-]icanon abilita i caratteri speciali erase, kill, werase, e " +#~ "rprnt\n" +#~ " [-]iexten abilita i caratteri speciali non POSIX\n" + +#~ 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 "" +#~ " dec come echoe echoctl echoke -ixany intr ^c erase 0177\n" +#~ " kill ^u\n" +#~ " * [-]decctlq come [-]ixany\n" +#~ " ek caratteri di erase e kill ai loro valori predefiniti\n" +#~ " evenp come parenb -parodd cs7\n" + +#~ msgid "For complete documentation, run: info coreutils '%s invocation'\n" +#~ msgstr "" +#~ "Per la documentazione completa, eseguire: info coreutils \"%s invocation" +#~ "\"\n" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: impossibile trovare il nome per l'id utente %lu\n" + #~ msgid "" #~ "\n" #~ "Examples:\n" @@ -13029,19 +13617,6 @@ msgstr "" #~ msgid "accessing %s" #~ msgstr "accesso a %s" -#~ msgid "" -#~ "Display the current time in the given FORMAT, or set the system date.\n" -#~ "\n" -#~ " -d, --date=STRING display time described by STRING, not `now'\n" -#~ " -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -#~ msgstr "" -#~ "Visualizza l'orario corrente nel FORMATO dato, o imposta la data di " -#~ "sistema.\n" -#~ "\n" -#~ " -d, --date=STRINGA visualizza l'orario specificato da STRINGA, " -#~ "non \"adesso\"\n" -#~ " -f, --file=FILEDATA come --date una per ogni riga di FILEDATA\n" - #~ msgid "opening %s" #~ msgstr "apertura di %s" diff --git a/po/ja.gmo b/po/ja.gmo index 7600b378..3f9534fc 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/ja.po b/po/ja.po index d88a8754..46ee7d39 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,17 +1,18 @@ # Japanese messages for GNU coreutils -# Copyright (C) 2000, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 2000, 2010, 2011, 2014 Free Software Foundation, Inc. # This file is distributed under the same license as the coreutils package. # Masahito Yamaga , 2002. # derived from the version by Yasuyuki Furukawa 1998. # Jun Nishii 1999. # Daisuke Yamashita 1999. -# Yasuaki Taniguchi , 2010, 2011. +# Yasuaki Taniguchi , 2010, 2011, 2014. +#: src/stty.c:941 msgid "" msgstr "" -"Project-Id-Version: GNU coreutils 8.14\n" +"Project-Id-Version: GNU coreutils 8.23-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" -"PO-Revision-Date: 2011-10-28 09:23+0900\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" +"PO-Revision-Date: 2014-11-07 09:47+0000\n" "Last-Translator: Yasuaki Taniguchi \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -38,18 +39,18 @@ msgstr "有効な引数:" msgid "error closing file" msgstr "ファイルクローズエラー" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "書き込みエラー" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "%s のパーミッションを保存しています" @@ -108,32 +109,28 @@ msgstr "fifo" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "door" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "ブロックスペシャルファイル" +msgstr "多重ブロック特殊ファイル" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "キャラクタスペシャルファイル" +msgstr "多重キャラクタ特殊ファイル" #: lib/file-type.c:87 -#, fuzzy msgid "multiplexed file" -msgstr "複数のロール" +msgstr "多重ファイル" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "不明なファイル" +msgstr "名前付きファイル" #: lib/file-type.c:93 #, fuzzy msgid "network special file" -msgstr "ブロックスペシャルファイル" +msgstr "ネットワーク特殊ファイル" #: lib/file-type.c:96 msgid "migrated file with data" @@ -145,7 +142,7 @@ msgstr "" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "ポート" #: lib/file-type.c:105 msgid "socket" @@ -235,57 +232,62 @@ msgstr "パラメーター文字列が正しくエンコードされていませ msgid "Unknown error" msgstr "不明なエラー" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: オプション '%s' は曖昧です: 次のものが可能です:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: オプション '-W %s' は曖昧です\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: オプション '--%s' は引数を取ることができません\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: オプション '%c%s' は引数を取ることができません\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: オプション '--%s' は引数が必要です\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: オプション '--%s' を認識できません\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: オプション '%c%s' を認識できません\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 無効なオプション -- '%c'\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: オプションには引数が必要です -- '%c'\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: オプション '-W %s' は曖昧です\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: オプション '-W %s' は引数を取ることができません\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: オプション '-W %s' は引数が必要です\n" @@ -295,13 +297,13 @@ msgstr "%s: オプション '-W %s' は引数が必要です\n" msgid "cannot change permissions of %s" msgstr "%s のパーミッションを変更できません" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "ディレクトリ %s を作成できません" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "メモリを使い果たしました" @@ -350,6 +352,12 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: ファイル終了 (EOF)" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: 読み込みエラー" + #: lib/regcomp.c:131 msgid "Success" msgstr "成功" @@ -458,7 +466,7 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "%s のパーミッションを設定します" @@ -866,19 +874,19 @@ msgid "cannot perform formatted output" msgstr "書式設定を行った出力を実行することができません" #: lib/xstrtol-error.c:63 -#, fuzzy, c-format +#, c-format msgid "invalid %s%s argument '%s'" -msgstr "引数 `%3$s' に対して %1$s%2$s が無効です" +msgstr "引数 '%3$s' に対して %1$s%2$s が無効です" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format +#, c-format msgid "invalid suffix in %s%s argument '%s'" -msgstr "引数 `%3$s' に対して無効な接尾辞 %1$s%2$s です" +msgstr "引数 '%3$s' に対して無効な接尾辞 %1$s%2$s です" #: lib/xstrtol-error.c:72 -#, fuzzy, c-format +#, c-format msgid "%s%s argument '%s' too large" -msgstr "引数 `%3$s' に対する %1$s%2$s が大きすぎます" +msgstr "引数 '%3$s' に対する %1$s%2$s が大きすぎます" #. This is a proper name. See the gettext manual, section Names. #: src/base64.c:40 @@ -886,17 +894,15 @@ msgid "Simon Josefsson" msgstr "Simon Josefsson" #: src/base64.c:60 -#, fuzzy, c-format +#, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" "Base64 encode or decode FILE, or standard input, to standard output.\n" msgstr "" -"使用法: %s [オプション]... [ファイル]\n" -"ファイルまたは標準入力を Base64 エンコード・デコードして標準出力に出力しま" -"す。\n" -"\n" +"使用法: %s [OPTION]... [FILE]\n" +"FILE または標準入力を Base64 エンコード・デコードして標準出力に出力します。\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -911,15 +917,7 @@ msgstr "" " 0 を指定した場合、改行を行わない\n" "\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"ファイルの指定がなかったり, - であった場合, 標準入力から読み込みます.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -933,51 +931,51 @@ msgstr "" "場合があります。入力ストリームに他の非英字バイトが含まれていて回復\n" "したい場合は --ignore-garbage を使用してください。\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "読み込みエラー" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "無効な入力" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "無効な折り返し列数: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "余分な演算子 %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, 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:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -988,17 +986,16 @@ msgid "" "Usage: %s NAME [SUFFIX]\n" " or: %s OPTION... NAME...\n" msgstr "" -"使用法: %s 名前 [接尾辞]\n" -"または: %s オプション\n" +"使用法: %s NAME [SUFFIX]\n" +"または: %s OPTION... NAME...\n" #: src/basename.c:53 -#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" msgstr "" -"パス名からディレクトリ部分を取りのぞいた名前を表示します。\n" -"指定があれば、末尾の接尾辞も取り除きます。\n" +"NAME から前にある全てのディレクトリ部分を取りのぞいた名前を表示します。\n" +"指定があれば、末尾の SUFFIX も取り除きます。\n" "\n" #: src/basename.c:60 @@ -1007,6 +1004,9 @@ msgid "" " -s, --suffix=SUFFIX remove a trailing SUFFIX; implies -a\n" " -z, --zero end each output line with NUL, not newline\n" msgstr "" +" -a, --multiple 複数の NAME 引数をサポートし、各 NAME に処理を行う\n" +" -s, --suffix=SUFFIX 接尾辞 SUFFIX を削除する。暗黙的に -a が使用される\n" +" -z, --zero 各出力を改行ではなく NUL で区切る\n" #: src/basename.c:67 #, c-format @@ -1018,40 +1018,55 @@ msgid "" " %s -s .h include/stdio.h -> \"stdio\"\n" " %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" msgstr "" +"\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 any/str1 any/str2 -> \"str1\" followed by \"str2\"\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "オペランドがありません" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "使用法: %s [オプション]... [ファイル]...\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"ファイルの内容をソートして標準出力に書き込みます。入力ファイルが複数の場" +"合、\n" +"連結して出力します。\n" +"\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1070,7 +1085,7 @@ msgstr "" " -n, --number 全ての行に行番号を付け加える\n" " -s, --squeeze-blank 連続した空行の出力を抑止する\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1083,7 +1098,7 @@ msgstr "" " -v, --show-nonprinting 非表示文字と`^'や`^'を付けて表示 (LFDとTABは除" "く)\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1097,17 +1112,18 @@ msgstr "" " そして g の中身を出力します。\n" " %s 標準入力を標準出力に複製します。\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "%s で ioctl を実行できません" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "標準出力" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: 入力ファイルと出力ファイルが同じです" @@ -1119,10 +1135,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1136,8 +1152,8 @@ msgstr "セキュリティコンテキストの作成に失敗しました: %s" msgid "failed to set %s security context component to %s" msgstr "%s セキュリティコンテキストコンポーネントを %s に設定出来ませんでした" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "%s のセキュリティコンテキストを取得できませんでした" @@ -1153,13 +1169,13 @@ msgstr "" msgid "failed to change context of %s to %s" msgstr "%s のコンテキストを %s に変更できません" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "%s にアクセスできません" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "ディレクトリ %s を読み込めません" @@ -1175,7 +1191,7 @@ msgstr "%s のセキュリティコンテキストを変更しています\n" msgid "fts_read failed" msgstr "fts_read に失敗しました" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1193,18 +1209,14 @@ msgstr "" "または: %s [OPTION]... --reference=RFILE FILE...\n" #: src/chcon.c:357 -#, fuzzy msgid "" "Change the SELinux security context of each FILE to CONTEXT.\n" "With --reference, change the security context of each FILE to that of " "RFILE.\n" msgstr "" -"各 FILE のセキュリティコンテキストを CONTEXT に変更します。\n" +"各 FILE の SELinux セキュリティコンテキストを CONTEXT に変更します。\n" "--reference がある場合、各 FILE のセキュリティコンテキストを RFILE のものに\n" "変更します。\n" -"\n" -" -h, --no-dereference 参照先のファイルの代わりにシンボリックリンクに適用す" -"る\n" #: src/chcon.c:364 src/chgrp.c:123 src/chown.c:94 msgid "" @@ -1213,6 +1225,11 @@ msgid "" " -h, --no-dereference affect symbolic links instead of any referenced " "file\n" msgstr "" +" --dereference シンボリック自体の代わりに、シンボリックリンクを" +"辿っ\n" +" た先に適用する (この動作が既定)、\n" +" -h, --no-dereference 参照先のファイルの代わりにシンボリックリンクに適用す" +"る\n" #: src/chcon.c:369 #, fuzzy @@ -1230,39 +1247,33 @@ msgstr "" " TYPE に設定する\n" " -l, --range=RANGE 対象となるセキュリティコンテキストの範囲を\n" " RANGE に設定する\n" -"\n" #: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110 -#, fuzzy msgid "" " --no-preserve-root do not treat '/' specially (the default)\n" " --preserve-root fail to operate recursively on '/'\n" msgstr "" -" --no-preserve-root `/' を特別扱いしない (デフォルト)\n" -" --preserve-root `/' に対する再帰的な操作を失敗させる\n" +" --no-preserve-root '/' を特別扱いしない (既定)\n" +" --preserve-root '/' に対する再帰的な操作を失敗させる\n" #: src/chcon.c:379 -#, fuzzy msgid "" " --reference=RFILE use RFILE's security context rather than " "specifying\n" " a CONTEXT value\n" msgstr "" -" --reference=RFILE CONTEXT の値を指定するのに代わって RFILE の\n" +" --reference=RFILE CONTEXT 値を指定するのに代わって RFILE の\n" " セキュリティコンテキストを使用する\n" -" -R, --recursive ファイルとディレクトリを再帰的に操作する\n" -" -v, --verbose 各ファイルを処理した時の診断を出力する\n" #: src/chcon.c:383 src/chgrp.c:140 src/chown.c:118 msgid " -R, --recursive operate on files and directories recursively\n" -msgstr "" +msgstr " -R, --recursive ファイルとディレクトリを再帰的に操作する\n" #: src/chcon.c:386 msgid " -v, --verbose output a diagnostic for every file processed\n" -msgstr "" +msgstr " -v, --verbose 各ファイルを処理した時の診断を出力する\n" #: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 -#, fuzzy msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1276,6 +1287,7 @@ msgid "" " -P do not traverse any symbolic links (default)\n" "\n" msgstr "" +"\n" "以下のオプションは -R オプションと併せて指定されたときにどのように階層を\n" "横断するかの動作を変更します。2個以上指定されたときは最後のオプションの\n" "み有効になります。\n" @@ -1298,7 +1310,7 @@ msgid "-R -h requires -P" msgstr "-R -h は -P が必要です" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1315,9 +1327,8 @@ msgid "conflicting security context specifiers given" msgstr "与えられたセキュリティコンテキスト指定が競合しています" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "%s の属性情報を取得できませんでした" @@ -1343,12 +1354,9 @@ msgid "" "With --reference, change the group of each FILE to that of RFILE.\n" "\n" msgstr "" -"各 FILE のセキュリティコンテキストを CONTEXT に変更します。\n" -"--reference がある場合、各 FILE のセキュリティコンテキストを RFILE のものに\n" -"変更します。\n" +"各 FILE のグループを GROUP に変更します。\n" +"--reference がある場合、各 FILE のグループを RFILE のものに変更します。\n" "\n" -" -h, --no-dereference 参照先のファイルの代わりにシンボリックリンクに適用す" -"る\n" #: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89 msgid "" @@ -1356,22 +1364,25 @@ msgid "" " -f, --silent, --quiet suppress most error messages\n" " -v, --verbose output a diagnostic for every file processed\n" msgstr "" +" -c, --changes verbose と似ているが、変更があるもののみ出力する\n" +" -f, --silent, --quiet ほとんどのエラーメッセージを抑止する\n" +" -v, --verbose 各ファイルを処理する毎に診断メッセージを表示する\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 参照先のファイルではなく、シンボリックリンク自体に\n" -" 効果を与える (シンボリックリンクの所有権を変更でき\n" -" るシステムでのみ利用可能)\n" +" (シンボリックリンクの所有権を変更できるシステムで\n" +" のみ利用可能)\n" #: src/chgrp.c:136 msgid "" " --reference=RFILE use RFILE's group rather than specifying a\n" " GROUP value\n" msgstr "" +" --reference=RFILE GROUP の値を使用する代わりに RFILE の GRUOP 値\n" +" を使用する\n" #: src/chgrp.c:158 #, c-format @@ -1445,29 +1456,26 @@ msgid "" "With --reference, change the mode of each FILE to that of RFILE.\n" "\n" msgstr "" -"各 FILE のセキュリティコンテキストを CONTEXT に変更します。\n" -"--reference がある場合、各 FILE のセキュリティコンテキストを RFILE のものに\n" -"変更します。\n" +"各 FILE のモードを MODE に変更します。\n" +"--reference がある場合、各 FILE のモードを RFILE のものに変更します。\n" "\n" -" -h, --no-dereference 参照先のファイルの代わりにシンボリックリンクに適用す" -"る\n" #: src/chmod.c:394 msgid " --reference=RFILE use RFILE's mode instead of MODE values\n" msgstr "" +" --reference=RFILE MODE 値を指定する代わりに RFILE の MODE を使用する\n" #: src/chmod.c:397 msgid " -R, --recursive change files and directories recursively\n" -msgstr "" +msgstr " -R, --recursive ファイルとディレクトリを再帰的に変更する\n" #: src/chmod.c:402 -#, fuzzy msgid "" "\n" "Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n" msgstr "" "\n" -"各 MODE は `[ugoa]*([-+=]([rwxXst]*|[ugo]))+' の形式です。\n" +"各 MODE は '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+' の形式です.\n" #: src/chmod.c:516 #, c-format @@ -1625,17 +1633,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "無効なグループ %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "無効なグループリスト %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1644,69 +1652,85 @@ msgstr "" "使用法: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" "または: %s OPTION\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" msgstr "" -"ルートディレクトリを NEWROOT に設定してコマンドを実行します。\n" +"ルートディレクトリを NEWROOT に設定して COMMAND を実行します。\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" msgstr "" " --userspec=USER:GROUP 使用するユーザーおよびグループ (ID または名前) を指" "定します\n" " --groups=G_LIST g1,g2,..,gN 形式で追加のグループを指定します\n" -#: src/chroot.c:203 +#: src/chroot.c:198 #, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" +" --userspec=USER:GROUP 使用するユーザーおよびグループ (ID または名前) を指" +"定します\n" +" --groups=G_LIST g1,g2,..,gN 形式で追加のグループを指定します\n" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" msgstr "" "\n" -"COMMAND が与えられない場合、``${SHELL} -i'' (デフォルト: /bin/sh) を実行しま" +"COMMAND を指定しない場合、'${SHELL} -i' (既定: '/bin/sh -i') が実行されま" "す。\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "ルートディレクトリを %s に変更できません" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "ルートディレクトリに移動できません" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 -#, fuzzy, c-format +#: src/chroot.c:400 +#, c-format msgid "failed to get supplemental groups" -msgstr "追加グループの設定に失敗しました" +msgstr "追加グループの取得に失敗しました" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" -msgstr "追加グループの設定に失敗しました" +msgid "failed to set supplemental groups" +msgstr "追加グループの取得に失敗しました" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "グループ ID の設定に失敗しました" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "ユーザー ID の設定に失敗しました" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "コマンド %s の実行に失敗しました" @@ -1747,7 +1771,16 @@ msgstr "使用法: %s [OPTION]... FILE1 FILE2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "ソートされたファイル FILE1 および FILE2 を一行ずつ比較します。\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"FILE の指定がなかったり, - であった場合, 標準入力から読み込みます.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1759,7 +1792,7 @@ msgstr "" "れる行、2列目は FILE2 のみに含まれる行、3列目は両方のファイルに含まれ\n" "る行となります。\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1771,7 +1804,7 @@ msgstr "" " -2 2列目を抑止する (FILE2 のみに含まれる行)\n" " -3 3列目を抑止する (両方のファイルに含まれる行)\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1783,20 +1816,19 @@ msgstr "" " ソートされているかを確認する\n" " --nocheck-order 入力が正しくソートされているかを確認しない\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=STR 列を STR で分割する\n" -#: src/comm.c:133 -#, fuzzy +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" "\n" -"注: 比較の優先順位と方法は `LC_COLLATE' で指定します。\n" +"注: 比較の優先順位と方法は 'LC_COLLATE' で指定します。\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1810,312 +1842,326 @@ msgstr "" " %s -3 file1 file2 file1 に存在して file2 に存在しない行および file2\n" " に存在して file1 に存在しない行を表示する\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "ファイル %d がソートされていません" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "複数の区切り文字が指定されました" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "空の %s は許可されていません" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "lseek %s をすることができません" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "%s の読み込みエラー" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "lseek %s をすることができません" +msgid "error reading %s" +msgstr "%s の読み込みエラー" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "%s の書き込みエラー" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "%s の読み込みエラー" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s: エクステント情報の取得に失敗しました" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: 書き込みに失敗しました" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "%s の拡張に失敗しました" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "%s のパーミッションを消去しています" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "%s の所有者の保護に失敗しました" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "ファイル %s が見つかりませんでした" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "%s の作成者の保護に失敗しました" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" -msgstr "デフォルトのファイル作成コンテキストを %s に設定できませんでした" +msgstr "既定のファイル作成コンテキストを %s に設定できませんでした" -#: src/copy.c:820 -#, fuzzy, c-format +#: src/copy.c:922 +#, c-format msgid "failed to set default file creation context for %s" -msgstr "デフォルトのファイル作成コンテキストを %s に設定できませんでした" +msgstr "%s 用の既定のファイル作成コンテキストを設定できませんでした" -#: src/copy.c:846 -#, fuzzy, c-format +#: src/copy.c:948 +#, c-format msgid "failed to set the security context of %s" -msgstr "%s のセキュリティコンテキストを %s に設定できませんでした" +msgstr "%s のセキュリティコンテキストを設定できませんでした" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "%s を 読み込み用に開くことが出来ません" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "%s を fstat することができません" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "コピー中に移動されたため、ファイル %s をスキップしています" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "%s を削除できません" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "%s を削除しました\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "参照先が無いシンボリックリンク %s を通じて書き込むことはできません" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "通常ファイル %s を作成できません" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "%2$s から %1$s への複製に失敗しました" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "%s のタイムスタンプを保存中" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 -#, fuzzy, c-format +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 +#, c-format msgid "failed to close %s" -msgstr "%s を開けませんでした" +msgstr "%s を閉じられませんでした" -#: src/copy.c:1580 +#: src/copy.c:1669 #, fuzzy, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "" "%s: %s を上書きしようとしています。モード %04lo (%s) を上書きしますか? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: %s を上書きしますか? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (バックアップ: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "デフォルトのファイル作成コンテキストの復元に失敗しました" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "%s から %s へのハードリンクを作成できません" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "%s を stat できません" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "ディレクトリ %s を省略しています" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "警告: コピー元ファイル %s が複数指定されました" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s と %s は同じファイルです" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "ディレクトリではない %s をディレクトリ %s で上書きすることはできません" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "たった今作成した %s には %s で上書きしません" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "ディレクトリ %s をディレクトリ以外で上書きできません" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "ディレクトリをディレクトリ以外に移動できません: %s -> %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "%s をバックアップすると元ファイルが壊れます -- %s を移動しませんでした" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" "%s をバックアップすると元ファイルが壊れます -- %s をコピーしませんでした" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "%s をバックアップできません" -#: src/copy.c:2107 +#: src/copy.c:2187 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "" "たった今作成したシンボリックリンク %2$s を通して %1$s をコピーできません" -#: src/copy.c:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "ディレクトリ %s を自分自身 %s にコピーできません" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "警告: コピー元ファイル %s が複数指定されました" + +#: src/copy.c:2294 #, c-format msgid "will not create hard link %s to directory %s" msgstr "%s からディレクトリ %s へのハードリンクを作成できません" -#: src/copy.c:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "%s を自分自身のサブディレクトリ %s に移動できません" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "%s から %s へ移動できません" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "デバイス間移動失敗: %s から %s 。移動先を削除できません" -#: src/copy.c:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "循環するシンボリックリンク %s はコピーできません" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: カレントディレクトリ上でのみ相対シンボリックリンクができます" -#: src/copy.c:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "%s から %s へのシンボリックリンクを作成できません" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "fifo %s を作成できません" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "特殊ファイル %s を作成できません" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "シンボリックリンク %s を読み込めません" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "シンボリックリンク %s を作成できません" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s のファイルタイプが不明です" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "%s を復元できません" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (復元)\n" @@ -2125,28 +2171,28 @@ msgstr "%s -> %s (復元)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 -#, fuzzy, c-format +#: src/coreutils.c:177 src/coreutils.c:201 +#, c-format msgid "unknown program %s" -msgstr "不明なストリーム" +msgstr "不明なプログラム %s" #: src/cp.c:157 src/mv.c:288 #, c-format @@ -2415,8 +2461,8 @@ msgstr "%s は存在しますがディレクトリではありません" msgid "failed to access %s" msgstr "%s を開けませんでした" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "ファイルオペランドがありません" @@ -2494,131 +2540,131 @@ msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "拡張属性を保護できません。cp が xattr サポートなしで作成されています" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "入力が無くなりました" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: 範囲外の行番号" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: 範囲外の行番号" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " 繰り返し %s 回目\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: 一致しているものが見つかりません" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "正規表現による検索中のエラー" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "%s への書き込みエラー" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: 区切り文字の後には整数が予期されます" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: 繰り返しカウントには `}' が必要です" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: `{' と `}' の間には整数値が必要です" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: 終了の区切り文字 `%c' がありません" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: 無効な正規表現です: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: 無効なパターン指定です" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: 行番号はゼロより大きい数でなければなりません" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "行番号 %s が前に出現した行番号 %s より小さい値です" -#: src/csplit.c:1200 +#: src/csplit.c:1201 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "警告: 行番号 %s が前に出現した行番号と同じ値です" -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "末尾の変換修飾子が指定されていません" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "末尾の変換修飾子が無効です: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "末尾の変換修飾子が無効です: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "変換修飾子に無効なフラグがあります: %%%c%c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "末尾の %% 変換修飾子が多すぎます" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "末尾の %% 変換修飾子が無効です" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: 無効な番号です" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "%s : 無効な数字です" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "使用法: %s [OPTION]... FILE PATTERN...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 #, fuzzy msgid "" "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n" @@ -2627,7 +2673,17 @@ msgstr "" "PATTERN によって区切られたファイルの断片をファイル `xx00'、 `xx01'、 ...\n" "に出力し、各断片のバイト数を標準出力に表示します。\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"ファイルが - ならば標準入力から読み込みます。 各々のパターンは\n" +"次のようになります:\n" + +#: src/csplit.c:1492 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2638,11 +2694,11 @@ msgstr "" " -f, --prefix=PREFIX 接頭辞として `xx' の代わりに PREFIX を使用する\n" " -k, --keep-files エラー発生時に出力ファイルを削除しない\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2652,19 +2708,11 @@ msgstr "" " -s, --quiet, --silent 出力ファイルの大きさを表示しない\n" " -z, --elide-empty-files 空の出力ファイルを削除する\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"ファイルが - ならば標準入力から読み込みます。 各々のパターンは\n" -"次のようになります:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 #, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2699,7 +2747,7 @@ msgstr "" "ファイルの各行から選択した部分だけを切り出し、標準出力に表示します。\n" "\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2710,7 +2758,7 @@ msgstr "" " -d, --delimiter=DELIM フィールドの区切り文字として TAB の代わりに DELIM\n" " を使用する \n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2722,7 +2770,7 @@ msgstr "" " する\n" " -n (無視される)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2730,7 +2778,7 @@ msgstr "" " --complement 選択されたバイト数、文字数またはフィールド数の\n" " 組を補足する\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2740,7 +2788,7 @@ msgstr "" " --output-delimiter=STRING 出力の区切り文字として STRING を使用\n" " デフォルトでは入力の区切り文字を使用\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2752,7 +2800,8 @@ msgstr "" "LIST はコンマで区切られた単一または複数の範囲で構成されます。選択\n" "した入力は読み込まれた順番でただ一度だけ出力されます。\n" -#: src/cut.c:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2760,8 +2809,6 @@ msgid "" " 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 "" "範囲指定は以下のいずれかです。\n" " N N 番目のバイト、文字またはフィールド。行頭を1とする\n" @@ -2771,51 +2818,52 @@ msgstr "" "\n" "FILE が無いまたは - の場合は標準入力から読み込みます。\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "無効なバイトまたはフィールド指定です" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "フィールドと位置は1から始まる番号です" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "端点が無い無効な範囲です: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "無効な降順の範囲です" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "バイトオフセット %s が大きすぎます" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "フィールド番号 %s が大きすぎます" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "切り出し方として指定できるのは 1 種類だけです" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "区切り文字に指定できるのは 1 文字だけです" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "バイト, 文字, もしくはフィールドのリストを指定してください" -#: src/cut.c:790 +#: src/cut.c:789 msgid "an input delimiter may be specified only when operating on fields" msgstr "フィールドを操作する場合のみ入力区切り文字を指定できます" -#: src/cut.c:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2823,11 +2871,11 @@ msgstr "" "区切られていない行の抑制が有効なのは, \n" "\tフィールドを操作する場合のみです" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "フィールドのリストがありません" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "位置指定リストがありません" @@ -2845,35 +2893,45 @@ msgid "Display the current time in the given FORMAT, or set the system date.\n" msgstr "" #: src/date.c:134 +#, fuzzy +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" +"与えられた FORMAT で現在時刻を表示します。またはシステム時刻を設定します。\n" +"\n" +" -d, --date=STRING 現在時刻ではなく STRING で記述された時刻を表示す" +"る\n" +" -f, --file=DATEFILE DATEFILE の各行に対して --date と同様に動作する\n" + +#: src/date.c:138 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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=FILE FILE の最終変更時刻を表示する\n" " -R, --rfc-2822 RFC 2822 形式で日付と時刻を出力する\n" " 例: Mon, 07 Aug 2006 12:34:56 -0600\n" -#: src/date.c:147 +#: src/date.c:149 #, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=TIMESPEC RFC 3339 形式で日付と時刻を出力する\n" " TIMESPEC=`date', `seconds' または `ns' で\n" @@ -2883,8 +2941,19 @@ msgstr "" " -s, --set=STRING STRING で記述される時間に設定する\n" " -u, --utc, --universal UTC (協定世界時) 時間を表示または設定する\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2897,7 +2966,7 @@ msgstr "" " %% 文字 %\n" " %a ロケール表示による曜日の省略名 (例: Sun、日)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2909,7 +2978,7 @@ msgstr "" " %B ロケール表示での月の完全名 (例: January)\n" " %c ロケール表示での日付と時刻 (例: Thu Mar 3 23:05:25 2005)\n" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2921,7 +2990,7 @@ msgstr "" " %D 日付。 %m/%d/%y と同様\n" " %e スペースで字幅調整された月の中の何日目かを表す値。%_d と同様\n" -#: src/date.c:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2931,7 +3000,7 @@ msgstr "" " %g ISO 週番号の最後の2桁 (%G 参照)\n" " %G ISO 週番号の年部分 (%V 参照)。通常は %V と同時に使用される\n" -#: src/date.c:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2943,7 +3012,7 @@ msgstr "" " %I 時 (01..12)\n" " %j 年の開始日からの日数 (001..366)\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2955,7 +3024,7 @@ msgstr "" " %m 月 (01..12)\n" " %M 分 (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2973,7 +3042,7 @@ msgstr "" " %R 24時間表示での時および分。%H:%M と同様\n" " %s 1970-01-01 00:00:00 UTC からの秒数\n" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2985,7 +3054,7 @@ msgstr "" " %T 時刻。%H:%M:%S と同様\n" " %u 週の何日目かを表す値 (1..7); 1 が月曜日\n" -#: src/date.c:209 +#: src/date.c:215 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" @@ -2997,7 +3066,7 @@ msgstr "" " %w 週の何日目かを表す値 (0..6); 0 を日曜日とする\n" " %W 月曜日を週初めとした週番号 (00..53)\n" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3009,7 +3078,7 @@ msgstr "" " %y 西暦での年の下2桁 (00..99)\n" " %Y 年\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3029,7 +3098,7 @@ msgstr "" "\n" "デフォルトでは0で日付の空白部分が埋められます。\n" -#: src/date.c:230 +#: src/date.c:236 #, fuzzy msgid "" "The following optional flags may follow '%':\n" @@ -3048,7 +3117,7 @@ msgstr "" " ^ 可能な場合は大文字を使用する\n" " # 可能な場合は小文字を使用する\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3063,7 +3132,7 @@ msgstr "" "E はロケールで代替の表記をが利用可能な時には代替表記を利用します。\n" "O はロケールで代替の数字が利用可能なときには代替数字を利用します。\n" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3088,35 +3157,35 @@ msgstr "" "ローカル時間の次の金曜日午前9時を米国西海岸のタイムゾーンで表示する場合\n" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "標準入力" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "%s は無効な日付です" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "複数の出力形式が指定されています" -#: src/date.c:430 +#: src/date.c:436 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "日付表示を指定するオプションが相互に排他的です" -#: src/date.c:437 +#: src/date.c:443 #, c-format msgid "the options to print and set the time may not be used together" msgstr "表示オプションと設定オプションは同時に指定できません" -#: src/date.c:458 +#: src/date.c:464 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3127,23 +3196,23 @@ msgstr "" "日付を指定するオプションを使用する場合、オプションでない引数\n" "は `+' で始まる書式文字列でなければいけません。" -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "日時を設定できません" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3152,7 +3221,7 @@ msgstr "" "使用法: %s [OPERAND]...\n" "または: %s OPTION\n" -#: src/dd.c:532 +#: src/dd.c:561 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3171,7 +3240,7 @@ msgstr "" " count=BLOCKS 入力ブロック BLOCKS 個分だけコピーする\n" " ibs=BYTES 一回に BYTES バイトずつ読み込む (デフォルト: 512)\n" -#: src/dd.c:541 +#: src/dd.c:570 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3181,8 +3250,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=FILE 標準入力の代わりに FILE から読み込む\n" " iflag=FLAGS コンマで区切られたシンボルリストとして読み込む\n" @@ -3195,7 +3266,7 @@ msgstr "" "る\n" " status=noxfer 転送ステータス表示を抑止する\n" -#: src/dd.c:552 +#: src/dd.c:583 #, fuzzy msgid "" "\n" @@ -3214,7 +3285,7 @@ msgstr "" "各 CONV シンボルは以下の通りです:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3241,7 +3312,7 @@ msgstr "" " または unblock と一緒に利用された場合 NUL でなくスペースで埋め" "る\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3257,7 +3328,7 @@ msgstr "" " fdatasync 終了前に出力ファイルデータを物理的に書き込む\n" " fsync 上と同様だがメタデータに対しても使用する\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3270,135 +3341,102 @@ msgstr "" "\n" " append 追加モード (出力に対してのみ意味がある。 conv=notrunc を推奨)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio データに対して同時 I/O を使用する\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct データに対して直接 I/O を使用する\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory ディレクトリで無い場合に失敗させる\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync データに対して同期 I/O を使用する\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync 上と同様だがメタデータに対しても使用する\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock 入力のブロックがいっぱいになるまで蓄積する (iflag のみ)\n" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock 非ブロック I/O を使用する\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime アクセス時間を更新しない\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nocache キャッシュデータを破棄する\n" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty ファイルからの制御端末を割り当てない\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow シンボリックリンクをたどらない\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks 複数リンクされている場合に失敗させる\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary データに対してバイナリー I/O を使用する\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text データに対してテキスト I/O を使用する\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 -#, fuzzy, c-format +#: src/dd.c:661 +#, 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 "" -"\n" -"%s シグナルを実行中の `dd' に送ると I/O 統計情報を標準出力に\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" -" 9387674624 バイト (9.4 GB) コピーされました、 34.6279 秒、 271 MB/秒\n" -"\n" -"オプションは次の通りです:\n" -"\n" -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +#: src/dd.c:699 +#, fuzzy, c-format +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "大きさ %zu バイトの入力バッファによりメモリを使い果たしました (%s)" -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +#: src/dd.c:721 +#, fuzzy, c-format +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "大きさ %zu バイトの出力バッファによりメモリを使い果たしました (%s)" -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" -"%+% レコード入力\n" -"%+% レコード出力\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% 切り詰められたレコード\n" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "% バイト (%s) コピーされました" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "無限 B" @@ -3412,83 +3450,99 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr "、 %g 秒、 %s/秒\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr "、 %g 秒、 %s/秒\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% レコード入力\n" +"%+% レコード出力\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% 切り詰められたレコード\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "入力ファイル %s を閉じています" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "出力ファイル %s を閉じています" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "O_DIRECT をオフにできませんでした : %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "%s に書き込み中です" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "%s : 認識できないオペランドです" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "無効な変換です" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "無効な入力フラグです" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "無効な出力フラグです" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "無効なステータスフラグです" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "%s : 無効な数字です" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "ascii、ebcdic、ibm のどの2個も組み合わせることはできません" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "block と unblock を組み合わせることはできません" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "lcase と ucase を組み合わせることはできません" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "excl と nocreat を組み合わせることはできません" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "direct と nocache を組み合わせることはできません" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3497,62 +3551,62 @@ msgstr "" "警告: lseek のカーネルバグに対処します。\n" " ファイル (%s) の mt_type=0x%0lx -- のタイプリストを見て下さい" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: スキップできません" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: seek できません" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "ファイル %s を読み込み中にオフセットがオーバーフローしました" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "警告: 読み込み失敗後の無効なファイルオフセットです" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "最終的にカーネルバグを回避できません" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "%s のフラグを設定中" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: 指定されたオフセットまでスキップできません" -#: src/dd.c:2172 +#: src/dd.c:2288 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "% バイトに出力ファイル %s を切り詰めることに失敗しました" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "%s に対する fdatasync に失敗しました" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "%s に対する fsync に失敗しました" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "%s を開けませんでした" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3561,19 +3615,19 @@ msgstr "" "オフセット過大: seek=% (%lu バイト) ブロックの長さまで切り詰めること" "ができません" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "% バイトに出力ファイル %s を切り詰めることに失敗しました" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "キャッシュ破棄に失敗しました: %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3654,12 +3708,12 @@ msgstr "容量" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 #, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" @@ -3671,14 +3725,14 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 #, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3691,7 +3745,7 @@ msgstr "" "2G)\n" " -H, --si 同様だが、1024 倍ではなく 1000 倍の値を使用する\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3704,7 +3758,7 @@ msgstr "" " -l, --local ローカルファイルシステムのみ表示するように制限する\n" " --no-sync 使用量の情報を得る前に sync を行わない (デフォルト)\n" -#: src/df.c:1409 +#: src/df.c:1429 #, fuzzy msgid "" " --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" @@ -3712,6 +3766,27 @@ msgid "" "omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" +msgstr "" +" -P, --portability POSIX 出力形式を使用する\n" +" --sync 使用量の情報を得る前に sync を実行する\n" +" -t, --type=TYPE 種類が TYPE のファイルシステムのみ表示する\n" +" -T, --print-type ファイルシステムの種類を表示する\n" +" -x, --exclude-type=TYPE 種類が TYPE ではないファイルシステムのみ表示す" +"る\n" +" -v (無視される)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose 各出力ファイルを開く前に診断メッセージを\n" +" 表示する\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3725,7 +3800,7 @@ msgstr "" "る\n" " -v (無視される)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3733,25 +3808,25 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, fuzzy, c-format msgid "options %s and %s are mutually exclusive" msgstr "オプション --compare (-C) および --strip は排他的です" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "%s 形式ファイルシステムが選択/非選択の両方で指定されました" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "警告: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "マウントされているファイルシステムのテーブルを読めません" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "ファイルシステムが処理されませんでした" @@ -3869,7 +3944,7 @@ msgstr "" " %s /usr/bin/ 出力 \"/usr\"\n" " %s stdio.h 出力 \".\"\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3880,7 +3955,8 @@ msgstr "" #: src/du.c:285 #, fuzzy -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "各ファイルのディスク使用量を集計します。ディレクトリは再帰的に処理します。\n" "\n" @@ -4016,62 +4092,56 @@ msgstr "" msgid "Infinity" msgstr "無限 B" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "fts_read に失敗しました: %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "無効な最大の深さ %s です" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "--%s の引数 %s が無効です" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "合計と全エントリの表示の両方を、一度に指定することはできません" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "警告: 統計(-s)と --max-depth=0 は同じ用法です" -#: src/du.c:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "警告: 統計(-s)と --max-depth=%lu の指定が競合しています" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "ファイルオペランドと --files0-from を同時に使用できません" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: 読み込みエラー" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" "ファイル名を標準入力から読み込んでいる場合に、ファイル名 %s を指定できません" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "無効な長さが0のファイル名です" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "合計" @@ -4215,9 +4285,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "各 FILE のタブをスペースに変換し、標準出力に書き出します。 FILE が指定\n" "されていないか `-' の場合は標準入力から読み込みます。\n" @@ -4262,7 +4330,7 @@ msgid "input line is too long" msgstr "入力ファイルが長すぎます" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4413,12 +4481,12 @@ msgstr "正規表現検索中のエラー" msgid "non-integer argument" msgstr "整数でない引数" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "ゼロでの割り算" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "問題を回避するために LC_ALL='C' を指定してください。" @@ -4429,31 +4497,31 @@ msgid "the strings compared were %s and %s" msgstr "比較した文字列は %s と %s です" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s は有効な正の整数ではありません" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s は長すぎます" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4462,7 +4530,7 @@ msgstr "" "使用法: %s [NUMBER]...\n" "または: %s OPTION\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -4508,7 +4576,7 @@ msgstr "" "--width=DIGITS の省略形です。\n" "\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4520,7 +4588,7 @@ msgstr "" " 再整形した行には先頭に STRING をつける\n" " -s, --split-only 長い行を分割する。ただしインデントは行わない\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, fuzzy, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4532,7 +4600,7 @@ msgstr "" " -u, --uniform-spacing 単語の間には 1つ, 文の間には 2 つの空白を置く\n" " -w, --width=NUMBER 最大行幅 (標準 75文字) を指定\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4542,22 +4610,20 @@ msgstr "" "以外では\n" " -w N を使用してください。" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "無効な幅: %s" -#: src/fold.c:70 +#: src/fold.c:69 #, fuzzy -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "各 FILE (デフォルトは標準入力) の入力行を折り返し、標準出力に書き\n" "込みます。\n" "\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4567,9 +4633,9 @@ msgstr "" " -s, --spaces 空白の位置で折り返す\n" " -w, --width=WIDTH 80 の代わりに幅を WIDTH で指定する\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "無効な列数です: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4642,19 +4708,18 @@ msgstr "ユーザ ID を設定できません" msgid "%s: no such user" msgstr "%s: そのようなユーザは存在しません" -#: src/head.c:109 +#: src/head.c:110 #, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "各 FILE の先頭 10 行を標準出力に出力します。FILE が2個以上指定された場合は\n" "ヘッダーとしてファイル名が内容の前に出力されます。FILE が指定されない場合、\n" "または FILE に - が指定された場合は標準入力から読み込みます。\n" "\n" -#: src/head.c:117 +#: src/head.c:118 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4674,7 +4739,7 @@ msgstr "" "全てを\n" " 表示する\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4682,7 +4747,7 @@ msgstr "" " -q, --quiet, --silent ファイル毎のヘッダー出力を行わない\n" " -v, --verbose 常にファイル毎のヘッダー出力を行う\n" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4694,48 +4759,36 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: ファイルが小さく縮められすぎています" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: バイト数が大きすぎます" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: オフセット %s まで seek できません" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: 相対オフセット %s まで探査 (seek) できません" -#: src/head.c:886 +#: src/head.c:267 #, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "%s: %s は大きすぎて表示できません" - -#: src/head.c:887 -msgid "number of lines" -msgstr "行数" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "バイト数" +msgid "%s: number of bytes is too large" +msgstr "%s: バイト数が大きすぎます" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "無効な行数です" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "無効なバイト数です" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "無効な後続のオプションです -- %c" @@ -4924,7 +4977,7 @@ msgstr "%s の所有権を変更できません" msgid "cannot set time stamps for %s" msgstr "%s の時刻を設定できません" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "fork システムコールが失敗しました" @@ -5089,7 +5142,7 @@ msgid "target directory not allowed when installing a directory" msgstr "" "ディレクトリをインストールする際にターゲットディレクトリを指定できません" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "無効なモード: %s" @@ -5128,8 +5181,13 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5147,7 +5205,7 @@ msgstr "" " または FILE2 を表す\n" " -e EMPTY 入力フィールドが存在しない場合 EMPTY で置き換える\n" -#: src/join.c:204 +#: src/join.c:210 #, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" @@ -5160,7 +5218,7 @@ msgstr "" " -o FORMAT 出力行生成時に FORMAT に従う\n" " -t CHAR 入出力区切り文字として CHAR を使用する\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5180,13 +5238,13 @@ msgstr "" " --header 各ファイルの1行目をヘッダとして扱い、結合せずに\n" " 表示を行う\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 #, fuzzy msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated 文字列の最後に改行でなく NULL 文字を付加する\n" -#: src/join.c:225 +#: src/join.c:231 #, fuzzy msgid "" "\n" @@ -5229,47 +5287,47 @@ msgstr "" "ジが\n" "表示されます。\n" -#: src/join.c:410 +#: src/join.c:416 #, fuzzy, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:%ju: ソートされていません: %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "無効なフィールド番号です: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "無効なフィールド指定です: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "フィールド指定でのファイル番号は無効です: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "結合するフィールドが不完全です %lu、%lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "空の文字列を置換する文字列が競合しています" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "複数文字のタブ %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "互換性のないタブです" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "両方のファイルを標準入力にはできません" @@ -5345,17 +5403,17 @@ msgstr "-l または -t とシグナルを組み合わせることができま msgid "no process ID specified" msgstr "プロセス ID が指定されていません" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "% バイトの標準入出力バッファの割り当てに失敗しました\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "%2$s に対するバッファリングモード %1$s は無効です\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "%s のバッファリングモードを %s に設定できません\n" @@ -5557,7 +5615,7 @@ msgstr "シンボリックリンク %s を作成できません" msgid "FIXME: unknown" msgstr "FIXME: unknown" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "使用法: %s [OPTION]\n" @@ -5568,7 +5626,7 @@ msgid "" "\n" msgstr "現在のユーザ名を表示します。\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "ログイン名がありません" @@ -5578,7 +5636,7 @@ msgstr "ログイン名がありません" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -5587,95 +5645,95 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "環境変数 QUOTING_STYLE の値(%s)が不適切なので無視します" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "環境変数 COLUMNS の値(%s) が不適切な行幅なので無視します" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "環境変数 TABSIZE の値(%s) が不適切なタブサイズなので無視します" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "無効な行幅です: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "無効なタブ幅です: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "無効な時刻書式です: %s" -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "有効な引数:" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "月の文字列初期化時にエラーが発生しました" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "認識できない接頭辞です: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "環境変数 LS_COLORS の値を解釈できません" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "環境変数 QUOTING_STYLE の値(%s)が不適切なので無視します" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "ディレクトリ %s を開くことが出来ません" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "%s のデバイスと i ノードを決定できません" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: 既に一覧表示したディレクトリのため一覧表示しません" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "ディレクトリ %s を読み込んでいます" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "ディレクトリ %s を閉じています" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "ファイル名 %s および %s を比較できません" -#: src/ls.c:4781 +#: src/ls.c:4775 #, fuzzy msgid "" "List information about the FILEs (the current directory by default).\n" @@ -5686,7 +5744,7 @@ msgstr "" "られます。\n" "\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5701,7 +5759,7 @@ msgstr "" " -b, --escape 表示不可能な文字の場合に C 形式のエスケープ文字" "を表示する\n" -#: src/ls.c:4794 +#: src/ls.c:4788 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." @@ -5728,13 +5786,14 @@ msgstr "" "示する\n" " それ以外: ctime で新しい順に並べ替える\n" -#: src/ls.c:4804 +#: src/ls.c:4798 #, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5749,7 +5808,7 @@ msgstr "" " -D, --dired Emacs の dired モード用に設計された出力を生成す" "る\n" -#: src/ls.c:4812 +#: src/ls.c:4807 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5770,11 +5829,11 @@ msgstr "" "vertical は -C\n" " --full-time -l --time-style=full-iso と同様\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr " -g -l と同様だがファイル所有者を表示しない\n" -#: src/ls.c:4823 +#: src/ls.c:4818 #, fuzzy msgid "" " --group-directories-first\n" @@ -5790,7 +5849,7 @@ msgstr "" " --sort=none (-U) と併せたときはグループ化しな" "い\n" -#: src/ls.c:4829 +#: src/ls.c:4824 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5805,7 +5864,7 @@ msgstr "" " --si 上と同様だが乗数の単位に 1024 の代わりに 1000 を" "使用する\n" -#: src/ls.c:4835 +#: src/ls.c:4830 #, fuzzy msgid "" " -H, --dereference-command-line\n" @@ -5829,7 +5888,7 @@ msgstr "" "い\n" " (-a または -A で上書きされる)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5849,7 +5908,7 @@ msgstr "" "い\n" " -k --block-size=1K と同様\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5865,7 +5924,7 @@ msgstr "" " 情報を表示する\n" " -m 要素のリストをカンマで区切り、一行に詰め込む\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5882,7 +5941,7 @@ msgstr "" " -p, --indicator-style=slash\n" " ディレクトリに対して識別子 / を加えて表示する\n" -#: src/ls.c:4871 +#: src/ls.c:4866 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" @@ -5903,7 +5962,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5914,19 +5973,19 @@ msgstr "" " -R, --recursive 子ディレクトリを再帰的に一覧表示する\n" " -s, --size ブロック単位で各ファイルサイズを表示する\n" -#: src/ls.c:4886 +#: src/ls.c:4881 #, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S ファイルサイズ順にソートする\n" " --sort=WORD 名前順の代わりに次の WORD で指定した順でソートす" @@ -5940,7 +5999,7 @@ msgstr "" " --sort=time を指定した場合はソートのキーとして\n" " 指定した時間が使用される\n" -#: src/ls.c:4896 +#: src/ls.c:4892 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5966,7 +6025,7 @@ msgstr "" "は POSIX ロケール\n" " では無い場合にのみ効果がある\n" -#: src/ls.c:4908 +#: src/ls.c:4904 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -5974,12 +6033,12 @@ msgstr "" " -t ファイル更新時間で新しい順にソートする\n" " -T, --tabsize=COLS タブ幅を 8 の代わりに COLS にする\n" -#: src/ls.c:4912 +#: src/ls.c:4908 #, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -5991,14 +6050,15 @@ msgstr "" "で表示する\n" " -v 自然な (バージョン) 数字順でソートする\n" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=COLS スクリーン幅として現在の値の代わりに COLS を使用" "する\n" @@ -6008,7 +6068,7 @@ msgstr "" "表示する\n" " -1 1 ファイル 1 行で表示する\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6024,7 +6084,7 @@ msgstr "" "されている場合のみカラーコードを出力します。LS_COLORS 環境変数によって動作\n" "を設定できます。LS_COLORS を設定する場合は dircolors を使用してください。\n" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6054,51 +6114,54 @@ msgid "David Madore" msgstr "David Madore" #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" "使用法: %s [OPTION]... [FILE]...\n" "%s (%d-bit) チェックサムを表示または照合します。\n" "FILE の指定が無いか、 - が指定された場合、標準入力から読み込みます。\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" " -b, --binary バイナリモードで読み込む (tty 標準入力以外から読み込む" "時のデフォルト)\n" -#: src/md5sum.c:178 -msgid " -b, --binary read in binary mode\n" +#: src/md5sum.c:180 +#, fuzzy +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary バイナリモードで読み込む\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check FILE から %s チェックサムを読み込み、照合する\n" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" " -t, --text テキストモードで読み込む (tty 標準入力から読み込む時の" "デフォルト)\n" -#: src/md5sum.c:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text テキストモードで読み込む (デフォルト)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 #, fuzzy msgid "" "\n" @@ -6118,14 +6181,15 @@ msgstr "" " -w, --warn チェックサム行の書式が不正な場合に警告を行う\n" "\n" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "チェックサムは %s に記されている通りに計算されます。照合の際に入力\n" @@ -6134,84 +6198,84 @@ msgstr "" "チェックサム、入力モードの印(バイナリには `*', テキストには ` ')、 \n" "およびファイル名を表示します。\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: チェックサム行が多すぎます" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: %s チェックサム行として不適切な書式です" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: オープンまたは読み込みに失敗しました\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "失敗" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "完了" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: %s チェックサムとして適切な書式の行がありませんでした" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "警告: 書式が不適切な行が % 行あります" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "警告: 一覧にある % 個のファイルが読み込めませんでした" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "警告: % 個の計算したチェックサムが一致しませんでした" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, fuzzy, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "--status オプションはチェックサムの照合時のみ意味を持ちます" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "チェックサムの照合時には --binary および --text オプションは無意味です" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "--status オプションはチェックサムの照合時のみ意味を持ちます" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "--warn オプションはチェックサムの照合時のみ意味を持ちます" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "--quiet オプションはチェックサムの照合時のみ意味を持ちます" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "--strict オプションはチェックサムの照合時のみ意味を持ちます" @@ -6253,22 +6317,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "デフォルトのファイル作成コンテキストを %s に設定できませんでした" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "%s のタイムスタンプの保護に失敗しました" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "ディレクトリ %s を作成しました" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, fuzzy, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6502,7 +6566,7 @@ msgid "with --suffix, template %s must end in X" msgstr "" "--suffix を使用する場合、テンプレート %s は X で終了しなければいけません" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "%s: 無効な接尾辞です。ディレクトリ区切り文字が含まれています" @@ -6643,9 +6707,7 @@ msgstr "Scott Bartram" #: src/nl.c:179 #, fuzzy -msgid "" -"Write each FILE to standard output, with line numbers added.\n" -"With no FILE, or when FILE is -, read standard input.\n" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "指定したそれぞれのファイルに行番号を付け足して標準出力に書き込みます。\n" "ファイルを指定しないか `-' を指定した場合には標準入力から読み込みます。\n" @@ -6752,27 +6814,27 @@ msgstr "無効な本文番号書式です: %s" msgid "invalid footer numbering style: %s" msgstr "無効な振った番号書式です: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "開始行番号が正しくありません: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "行番号の増分が正しくありません: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "空行の行番号が正しくありません: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "無効な行番号幅の指定です: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "無効な行番号書式です: %s" @@ -6798,7 +6860,7 @@ msgstr "" #, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6818,43 +6880,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "標準入力が使用できないため取り込むことに失敗しました" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "入力を無視します" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "入力を無視し、出力を %s に追記します" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "出力を %s に追記します" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "exec 時に標準エラー出力のコピーを閉じることができませんでした" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "標準入力を無視し、標準エラー出力を標準出力にリダイレクトします" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "標準エラー出力を標準出力にリダイレクトします" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" msgstr "標準エラー出力のリダイレクトに失敗しました" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -6881,99 +6943,96 @@ msgstr "" " --all 導入されているプロセッサの数を表示する\n" " --ignore=N 可能であれば N 個のプロセスユニットを無視する\n" -#: 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, fuzzy, c-format msgid "value too large to be converted: %s" msgstr "%s: 値は完全には変換されていません" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "%s : 無効な数字です" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "引数 `%3$s' に対して無効な接尾辞 %1$s%2$s です" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "%s: 書き込み用に開くことに失敗しました" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "無効なタブ幅です: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "使用法: %s [OPTION]... [USER]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 #, fuzzy msgid " --debug print warnings about invalid input\n" msgstr "" " --strict --check と併せて使用し、無効な入力がある場合に 0 以外" "で終了する\n" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6981,19 +7040,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -7003,30 +7062,30 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 #, fuzzy msgid "" "\n" @@ -7035,11 +7094,11 @@ msgstr "" "そのほかのオプション:\n" "\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -7048,7 +7107,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -7056,7 +7115,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7064,7 +7123,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7072,7 +7131,27 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"範囲指定は以下のいずれかです。\n" +" N N 番目のバイト、文字またはフィールド。行頭を1とする\n" +" N- N 番目のバイト、文字またはフィールドから行末まで\n" +" N-M N 番目から M 番目(これも含める)までのバイト、文字またはフィールド\n" +" -M 行頭から M 番目(これも含める)までのバイト、文字またはフィールド\n" +"\n" +"FILE が無いまたは - の場合は標準入力から読み込みます。\n" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -7081,9 +7160,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7095,7 +7175,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -7110,118 +7190,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "FORMAT %s に %% 指定がありません" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "無効な書式幅です" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "FORMAT %s が %% で終了しています" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "無効な精度です: %s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "FORMAT %s に %% 指定が多すぎます" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "引数 `%3$s' に対して無効な接尾辞 %1$s%2$s です" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "無効なフィールド番号です: %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "無効なページ範囲です %s" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "無効なフィールド番号です: %s" +msgid "multiple field specifications" +msgstr "%s: 無効なフィールド指定です: %s" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "%s は無効な日付です" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, fuzzy, c-format msgid "--grouping cannot be combined with --format" msgstr "ファイルオペランドと --files0-from を同時に使用できません" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "複数の -i オプションが指定されています" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, fuzzy, c-format msgid "grouping cannot be combined with --to" msgstr "ファイルオペランドと --files0-from を同時に使用できません" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "%s の読み込みエラー" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, fuzzy, c-format msgid "failed to convert some of the input numbers" msgstr "標準入力が使用できないため取り込むことに失敗しました" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7234,14 +7326,13 @@ msgstr "" "または: %s --traditional [OPTION]... [FILE] [[+]OFFSET[.][b] [+][LABEL][.]" "[b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "FILE を明確な表現形式 (デフォルトは八進数) で標準出力に書き出します。\n" @@ -7249,9 +7340,10 @@ msgstr "" "を指定しないか、 - の場合、標準入力から読み込みます。\n" "\n" -#: src/od.c:333 +#: src/od.c:335 #, 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" @@ -7267,7 +7359,7 @@ msgstr "" "OFFSET および LABEL に 0x または 0X 接頭辞をつけると十六進数を表します。\n" "接尾子 . は八進数を表します。接尾子 b は 512 倍を表します。\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7276,7 +7368,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 #, fuzzy msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" @@ -7297,7 +7389,7 @@ msgstr "" " -w, --width[=BYTES] 一行あたりの出力バイト数を BYTES バイトにする\n" " --traditional 古い POSIX の形式の引数を受け付ける\n" -#: src/od.c:363 +#: src/od.c:366 #, fuzzy msgid "" "\n" @@ -7315,7 +7407,7 @@ msgstr "" " -c -t c と同様。 ASCII 文字または \\ エスケープ文字で表示する\n" " -d -t u2と同様。符号なし十進数2バイトで表示する\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7331,7 +7423,7 @@ msgstr "" " -s -t d2と同様。十進数2バイトで表示する\n" " -x -t x2と同様。十六進数2バイトで表示する\n" -#: src/od.c:380 +#: src/od.c:383 #, fuzzy msgid "" "\n" @@ -7346,7 +7438,7 @@ msgstr "" " a 文字名。最上位ビットは無視される\n" " c ASCII 文字または \\ エスケープ文字\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7360,7 +7452,7 @@ msgstr "" " u[サイズ] 符号なし10進数 1 整数(integer)のサイズ指定\n" " x[サイズ] 16進数 1 整数(integer)のサイズ指定\n" -#: src/od.c:394 +#: src/od.c:397 #, fuzzy msgid "" "\n" @@ -7376,14 +7468,14 @@ msgstr "" "F は sizeof(float) として, D は sizeof(double) として, または \n" "L は sizeof(long double) として指定できます.\n" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 #, fuzzy msgid "" "\n" @@ -7401,12 +7493,12 @@ msgstr "" "b =512、kB =1000、K =1024、MB =1000*1000、M =1024*1024\n" "GB =1000*1000*1000、G =1024*1024*1024、および T、P、E、Z、Y などです。\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "無効な TYPE 指定文字列です: %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7415,7 +7507,7 @@ msgstr "" "無効な TYPE 指定文字列です: %s;\n" "このシステムでは %lu バイト整数型を扱えません" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7424,38 +7516,38 @@ msgstr "" "無効な TYPE 指定文字列です: %s;\n" "このシステムでは %lu バイト浮動小数点型を扱えません" -#: src/od.c:869 +#: src/od.c:872 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "型指定文字列 %2$s に無効な文字 `%1$c' が含まれています" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "入力の終端を越えて読みとばす事はできません" -#: src/od.c:1650 +#: src/od.c:1658 #, fuzzy, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" "無効な出力アドレスの基数 `%c' が指定されました\n" " -- doxn のいずれかを指定してください" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "文字列ダンプ時の型は指定できません" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "互換モードでは 1 個のファイルしか使用できません" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "スキップバイト数と読み込みバイト数の和が大きすぎます" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "警告: 幅 %lu は無効な値です。代わりに %d を使用します" @@ -7475,7 +7567,6 @@ msgstr "標準入力が閉じられています" 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 "" "FILE の各行から, 一致する行をタブ文字で区切り, 順に標準出力に書き込みます.\n" "FILE が指定されない, あるいは `-' を指定した場合には標準入力を読み込みます.\n" @@ -7619,12 +7710,12 @@ msgstr "開始時刻" msgid "Where" msgstr "ログイン元" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "使用法: %s [OPTION]... [USER]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7640,7 +7731,7 @@ msgstr "" " -p 長形式でユーザのプランファイルを省略\n" " -s 短形式で出力 (標準)\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7654,7 +7745,7 @@ msgstr "" " -q 短形式でユーザのフルネーム, ログイン元および待機時間を省" "略\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, fuzzy, c-format msgid "" "\n" @@ -7665,7 +7756,7 @@ msgstr "" "軽量 `finger' プログラムです。ユーザ情報を表示します。\n" "utmp ファイルは %s が使用されます。\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7673,93 +7764,93 @@ msgstr "" "けません" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "`--pages=FIRST_PAGE[:LAST_PAGE]' 引数がありません" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "無効なページ範囲です %s" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "`-l PAGE_LENGTH' 無効な行数です: %s" -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "`-N NUMBER' 無効な開始行番号です: %s" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "`-o MARGIN' 無効な行オフセットです: %s" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "`-w PAGE_WIDTH' 無効な文字数です: %s" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "`-W PAGE_WIDTH' 無効な文字数です: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "並列に印刷するときには列数を指定できません" -#: src/pr.c:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "段組の横方向印刷(-a)と並列印刷を同時指定できません." -#: src/pr.c:1196 +#: src/pr.c:1166 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "`-%c' 余分な文字が付いているか引数の数字が無効です: %s" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "ページ幅が狭すぎます" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "開始ページ番号 % は総ページ番号 % を超過しています" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "ページ番号が溢れました" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "% ページ" -#: src/pr.c:2757 +#: src/pr.c:2727 #, fuzzy msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "印字のために、ページ付けや段組を行ないます。\n" "\n" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7776,7 +7867,7 @@ msgstr "" "に\n" " 向けて出力する。ページ毎にカラム内の行数を調整する\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7794,7 +7885,7 @@ msgstr "" " -d, --double-space\n" " 行間に空行を挿入する\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7816,7 +7907,7 @@ msgstr "" " (-f と共に 3行分, -f を指定しない場合 5行分のヘッダを出" "力)\n" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7839,11 +7930,23 @@ msgstr "" "効、区切り\n" " 文字を --sep-string[=STRING] に設定する\n" -#: src/pr.c:2798 +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l, --length=PAGE_LENGTH\n" +" 1ページの行数を PAGE_LENGTH (66) にする (デフォルトは\n" +" 56行で、 -F を使用したときは 63 行)\n" +" -m, --merge 全てのファイルを並列に印刷する。 1 ファイル 1 列とし、\n" +" -J オプションで行を結合した場合を除き、行を切り詰める。\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -7853,7 +7956,7 @@ msgstr "" " -m, --merge 全てのファイルを並列に印刷する。 1 ファイル 1 列とし、\n" " -J オプションで行を結合した場合を除き、行を切り詰める。\n" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7870,7 +7973,7 @@ msgstr "" " 表示した最初のページの1行目を NUMBER として数え始め\n" " る (+FIRST_PAGE を参照)\n" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7885,7 +7988,7 @@ msgstr "" " -r, --no-file-warnings\n" " ファイルを開けなかったときに警告を表示しない\n" -#: src/pr.c:2820 +#: src/pr.c:2794 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -7907,7 +8010,7 @@ msgstr "" "り詰\n" " めが無効となる\n" -#: src/pr.c:2828 +#: src/pr.c:2802 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7915,7 +8018,6 @@ msgid "" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -SSTRING, --sep-string[=STRING]\n" " STRING によって列を区切る\n" @@ -7925,7 +8027,13 @@ msgstr "" " 列オプションには影響を及ぼさない\n" " -t, --omit-header ページのヘッダーとフッターを表示しない\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7947,7 +8055,7 @@ msgstr "" " 複数列の出力時のみページ幅を PAGE_WIDTH (72)\n" " 文字に設定する。 -s[char] は無効になる\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7960,17 +8068,6 @@ msgstr "" " PAGE_WIDTH (72) 文字に設定し、行を切り詰める。-S ま\n" " たは -s オプションには影響しない\n" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"PAGE_LENGTH <= 10 の場合は -t が暗黙的に利用されます。FILE を指定しないか、 " -"FILE\n" -"が - の時は標準入力から読み込みます。\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -8127,18 +8224,23 @@ msgstr "" "入力ファイルに含まれる単語の索引を並べ替え、前後を含めて出力します。\n" "\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 #, fuzzy 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 自動生成した参照文を出力する\n" " -G, --traditional System V の `ptx' により近い動作を行う\n" " -F, --flag-truncation=STRING 行の切り詰めの目印に STRING を使用する\n" #: src/ptx.c:1835 +msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -8153,7 +8255,7 @@ msgstr "" " -S, --sentence-regexp=REGEXP 行末または文末を表現する正規表現を指定\n" " -T, --format=tex TeX 命令で出力を生成\n" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8169,7 +8271,7 @@ msgstr "" " -i, --ignore-file=FILE FILE から無視する単語一覧を読み込む\n" " -o, --only-file=FILE この FILE から単語一覧のみを読み込む\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8180,20 +8282,16 @@ msgstr "" " -t, --typeset-mode - 未実装 -\n" " -w, --width=NUMBER 列の出力幅を指定. 参照文を除いて数える\n" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"ファイルの指定がなかったり, - であった場合, 標準入力から読み込みます.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "無効な隙間の幅です: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "無効な行幅です: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8222,7 +8320,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "%s にディレクトリを変更 (chdir) できませんでした" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "%s の属性情報を取得 (stat) できませんでした" @@ -8242,8 +8340,8 @@ msgstr "非オプション引数を無視します" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "使用法: %s [OPTION]... FILE...\n" @@ -8494,14 +8592,14 @@ msgstr "" #: src/rm.c:342 #, fuzzy, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: 全ての引数を再帰的に削除しますか? " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: 全ての引数を削除しますか? " #: src/rmdir.c:134 src/rmdir.c:233 @@ -8724,12 +8822,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "引数の浮動小数が無効です: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "FORMAT %s に不明な %%%c 指定があります" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8750,7 +8848,16 @@ msgstr "" "データ復元の為の調査を行う事が非常に困難となるようにします。\n" "\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"FILE に - を指定した場合、標準出力に再度コピーします\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8765,7 +8872,7 @@ msgstr "" "ど\n" " が使用可能)\n" -#: src/shred.c:183 +#: src/shred.c:187 #, fuzzy msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" @@ -8780,12 +8887,10 @@ msgstr "" " ファイル以外ではこれがデフォルトの動作\n" " -z, --zero shred を行ったことを隠すために最後に 0 で上書きする\n" -#: src/shred.c:192 +#: src/shred.c:196 #, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -8805,7 +8910,7 @@ msgstr "" "操作する時は、ほとんどの人が --remove オプションを使用します。\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8822,7 +8927,7 @@ msgstr "" "のモードで shred が効果的であることを保証できないファイルシステムの例です。\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8842,7 +8947,7 @@ msgstr "" "ム\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8856,7 +8961,7 @@ msgstr "" "* 圧縮ファイルシステム\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -8878,7 +8983,7 @@ msgstr "" "に記述されます。詳細はマニュアル (man mount) に記述されています。\n" "\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -8888,127 +8993,127 @@ msgstr "" "ファイルのコピーが含まれている場合があります。これにより shred したファイル\n" "が後で復元できるかもしれません。\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: ファイルデータ同期 (fdatasync) に失敗しました" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: ファイル同期 (fsync) に失敗しました" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: 巻き戻しできません" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: 経過 %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: オフセット %s で書き込みエラーが発生しました" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: ファイル走査 (lseek) に失敗しました" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: ファイルが大きすぎます" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: 経過 %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: 経過 %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: ファイル状態取得 (fstat) に失敗しました" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: 無効なファイルの種類です" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: ファイルが負の大きさになっています" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: ファイル切り詰め時にエラーが発生しました" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: ファイル記述子操作 (fcntl) に失敗しました" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: 追加用ファイル記述子には shred できません" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: 削除しています" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: %s に名前が変更されました" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: 削除に失敗しました" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: 削除しました" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: 閉じるのに失敗しました" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: 書き込み用に開くことに失敗しました" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: 無効な繰り返し回数です" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "複数のランダムソースが指定されました" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: 無効なファイルサイズです" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -9019,14 +9124,14 @@ msgstr "" "または: %s -e [OPTION]... [ARG]...\n" "または: %s -i LO-HI [OPTION]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 #, fuzzy msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" "入力行をランダムに並べ替えて標準出力に書き込みます。\n" "\n" -#: src/shuf.c:73 +#: src/shuf.c:75 #, fuzzy msgid "" " -e, --echo treat each ARG as an input line\n" @@ -9044,37 +9149,37 @@ msgstr "" " --random-source=FILE ランダムバイトのソースを FILE にする\n" " -z, --zero-terminated 行末を改行文字ではなく NULL 文字にする\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "重複した行が多すぎます" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "複数の -i オプションが指定されています" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "%s: 無効な入力範囲です" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "%s: 無効な行数です" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "複数の出力ファイルが指定されています" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "-e と -i オプションを同時に使用することはできません" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -9101,12 +9206,12 @@ msgstr "" "停止します。\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "%s: 無効な時間間隔です" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "実時間の時計を読み取ることができません" @@ -9120,7 +9225,7 @@ msgstr "" "連結して出力します。\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -9128,7 +9233,7 @@ msgstr "" "並び替えオプション:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9139,7 +9244,7 @@ msgstr "" " -d, --dictionary-order 空白および英数字のみ含まれていると仮定する\n" " -f, --ignore-case 大文字・小文字を区別しない\n" -#: src/sort.c:443 +#: src/sort.c:444 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -9150,14 +9255,14 @@ msgstr "" " -i, --ignore-nonprinting 表示可能な文字のみ比較を行う\n" " -M, --month-sort 月名でソートする (不明) < `JAN' < ... < `DEC'\n" -#: src/sort.c:448 +#: src/sort.c:449 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:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9169,7 +9274,7 @@ msgstr "" " --random-source=FILE ランダムソースを FILE に設定する\n" " -r, --reverse 逆順にソートを行う\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9186,7 +9291,7 @@ msgstr "" " -V, --version-sort 自然な (バージョン) 数字順でソートする\n" "\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -9194,7 +9299,7 @@ msgstr "" "そのほかのオプション:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9203,7 +9308,7 @@ msgstr "" "合\n" " は一時ファイルが使用される\n" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -9221,7 +9326,7 @@ msgstr "" "を\n" " 使用して展開する\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9241,7 +9346,7 @@ msgstr "" "ファ\n" " イル名を標準入力から読み込む\n" -#: src/sort.c:487 +#: src/sort.c:488 #, fuzzy msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" @@ -9254,7 +9359,7 @@ msgstr "" " -m, --merge ソートされたファイルを併合する。ソート自体は行わ" "ない\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9265,7 +9370,7 @@ msgstr "" " -s, --stable 前の比較結果に頼らない安定的な並び替えを行う\n" " -S, --buffer-size=SIZE 主記憶のバッファの大きさとして SIZE を使用する\n" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9291,7 +9396,7 @@ msgstr "" "c を付け\n" " ずに使用した場合、最初の同一行のみ出力する\n" -#: src/sort.c:511 +#: src/sort.c:512 #, fuzzy msgid "" "\n" @@ -9325,12 +9430,11 @@ msgstr "" "SIZE の後には以下の倍数などを指定する接尾辞を続けることが出来ます:\n" "\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -9345,270 +9449,271 @@ msgstr "" "本来のバイト単位の値を使用した伝統的な並び替え順にしたい場合、\n" "LC_ALL=C を指定してください。\n" -#: src/sort.c:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "%s [-d] を待っています" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] が異常終了しました" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "一時ファイルを %s 内に作成できません" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "オープンに失敗しました" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "fflush に失敗しました" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "クローズに失敗しました" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "一時ファイルを作成することが出来ませんでした" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "プロセス %s -d を作成することが出来ませんでした" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "待機中: 削除できません: %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "--%s の引数 %s が無効です" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "--%s の引数の最小値は %s です。" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "--%s の引数の値 %s は大きすぎます" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "現在の rlimit に基づいた --%s の引数の最大値は %s です" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "parallel の引数は 0 ではいけません" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "状態取得 (stat) に失敗しました" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "読み込みに失敗しました" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "文字列の変換に失敗しました" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "変換前の文字列は %s です" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "キーに対して ^ が一致しません\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, fuzzy, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "非推奨なキー `%s' が使用されています。代わりに `%s' を使用してください" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "キー %lu の幅は 0 のため無視されます" -#: src/sort.c:2439 +#: src/sort.c:2438 #, fuzzy, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" "キー %lu において先頭の空白類文字は意味を持ちます。`b' も指定することを検討し" "てください" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "キー %lu が数値のため複数のフィールドに展開されます" -#: src/sort.c:2484 +#: src/sort.c:2483 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "オプション `-%s' は無視されます" -#: src/sort.c:2490 +#: src/sort.c:2489 #, fuzzy, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "オプション `-r' は最後の比較のみに適用されます" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "書き込みに失敗しました" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: 順序が不規則: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "標準エラー" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "%s: 巻き戻しできません" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: 無効なフィールド指定です: %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "オプション `-%s' は両立しません" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: %s の開始番号が無効です" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "`-' の後の数字が正しくありません" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "`.' の後の数字が正しくありません" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "フィールド指定に使えない文字があります" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "複数の圧縮プログラムが指定されています" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "フィールド開始番号が無効です" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "フィールド番号がゼロです" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "文字のオフセットがゼロです" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "`,' の後の数字が正しくありません" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "タブが空です" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "ファイル名を %s から読み込むことが出来ません" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: 長さが 0 のファイル名は無効です" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "%s からの入力がありません" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "%s ソートルールを使用しています" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "単なるバイト比較を使用しています" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "追加のオペランド %s は -%c と併せて使用できません" -#: src/split.c:186 -#, c-format -msgid "the suffix length needs to be at least %zu" +#: src/split.c:207 +#, fuzzy, c-format +msgid "the suffix length needs to be at least %" msgstr "接尾辞の長さは最低 %zu 必要です" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "使用法: %s [OPTION]... [INPUT [PREFIX]]\n" -#: src/split.c:207 +#: src/split.c:228 #, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" "INPUT を PREFIXaa, PREFIXab, ... という固定サイズのファイルに分割します。\n" "デフォルトの大きさは 1000 行です。デフォルトの PREFIX は `x' です。 INPUT\n" "が指定されないか、INPUT に - を指定した場合は標準入力から読み込まれます。\n" -#: src/split.c:215 +#: src/split.c:236 #, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file names\n" " -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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" " -a, --suffix-length=N 接尾辞の長さを N にする (デフォルト: %d)\n" @@ -9625,7 +9730,7 @@ msgstr "" " -u, --unbuffered `-n r/...' を使用した時にすぐに入力を出力にコピーす" "る\n" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9633,17 +9738,17 @@ msgstr "" " --verbose 各出力ファイルを開く前に診断メッセージを\n" " 表示する\n" -#: src/split.c:235 +#: src/split.c:258 #, fuzzy 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" "\n" "塊 (CHUNKS) は次の通りです:\n" @@ -9654,190 +9759,195 @@ msgstr "" "r/N `l' と同様だがラウンドロビン分割をする\n" "r/K/N 上記と同様だが N 個中 K 番目を標準出力に出力する\n" -#: src/split.c:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "出力ファイルの接尾辞を使い果たしました" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "ファイル %s を作成しています\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "環境変数 FILE の設定に失敗しました" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "FILE=%s で実行しています\n" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "パイプの作成に失敗しました" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "以前のパイプを閉じています" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "出力パイプを閉じています" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "入力パイプを移動しています" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "入力パイプを閉じています" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "コマンド実行に失敗しました: \"%s -c %s\"" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "入力パイプを閉じるのに失敗しました" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "子プロセスを待機しています" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "FILE=%s で次のコマンドからシグナル %s を受け取りました: %s" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "FILE=%s で 次のコマンドが終了ステータス %d で終了しました: %s" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "不明なコマンドの終了ステータスです (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "複数の分割方法は指定できません" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: 無効な塊の数です" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: 無効な塊の番号です" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: 接尾辞の長さが正しくありません" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: 無効なバイト数表記です" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: 無効な行数表記です" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "複数文字のタブ %s" -#: src/split.c:1286 +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "多重キャラクタ特殊ファイル" + +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "行数を指定するオプション -%s%c が大きすぎます" -#: src/split.c:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "開始行番号が正しくありません: %s" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: 無効な IO ブロックサイズです" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "--filter は標準出力に出力された塊を処理しません" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, c-format msgid "%s: cannot determine file size" msgstr "%s: ファイルサイズを決定できません" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "%s の正規化に失敗しました" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "警告: 認識できないエスケープです: `\\%c'" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: 無効な指定です" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "警告: 書式文字列の終端にバックスラッシュがあります" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" "ファイルシステムモードでは %s を使用して標準入力を指定することはできません" -#: src/stat.c:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "%s に関するファイルシステム情報を読み込むことができません" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9853,7 +9963,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9863,30 +9973,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "Context: %C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9898,11 +10008,11 @@ msgstr "" "Change: %z\n" " Birth: %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 #, fuzzy msgid "" " -L, --dereference follow links\n" @@ -9914,7 +10024,7 @@ msgstr "" " -f, --file-system ファイル情報の代わりにファイルシステム情報を表示す" "る\n" -#: src/stat.c:1422 +#: src/stat.c:1425 #, fuzzy msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" @@ -9934,7 +10044,7 @@ msgstr "" " FORMAT に \\n を含める必要がある\n" " -t, --terse 簡潔な形式で情報を表示する\n" -#: src/stat.c:1433 +#: src/stat.c:1436 #, fuzzy msgid "" "\n" @@ -9955,7 +10065,7 @@ msgstr "" " %B %b によって報告された各ブロックのバイト数\n" " %C SELinux のセキュリティコンテキスト文字列\n" -#: src/stat.c:1442 +#: src/stat.c:1445 #, fuzzy msgid "" " %d device number in decimal\n" @@ -9972,7 +10082,7 @@ msgstr "" " %g 所有者のグループ ID\n" " %G 所有者のグループ名\n" -#: src/stat.c:1450 +#: src/stat.c:1453 #, fuzzy msgid "" " %h number of hard links\n" @@ -9995,7 +10105,7 @@ msgstr "" " %t メジャーデバイス番号の十六進数表記\n" " %T マイナーデバイス番号の十六進数表記\n" -#: src/stat.c:1461 +#: src/stat.c:1464 #, fuzzy msgid "" " %u user ID of owner\n" @@ -10022,7 +10132,7 @@ msgstr "" " %Z 最終変更日時 (Epoch からの秒数)\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -10041,7 +10151,7 @@ msgstr "" " %d ファイルシステムの空きファイルノード数\n" " %f ファイルシステムの空きブロック数\n" -#: src/stat.c:1484 +#: src/stat.c:1487 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -10126,8 +10236,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -10158,7 +10267,7 @@ msgstr "標準入力に対する行モードのバッファ設定は意味があ msgid "you must specify a buffering mode option" msgstr "%2$s と併せて相対的な %1$s を指定しなければいけません" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10169,11 +10278,11 @@ msgstr "" "または: %s [-F DEVICE | --file=DEVICE] [-a|--all]\n" "または: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 #, fuzzy msgid "" " -a, --all print all current settings in human-readable form\n" @@ -10187,7 +10296,7 @@ msgstr "" " -F, --file=DEVICE 標準入力の代わりに DEVICE で指定されたデバイスを使用す" "る\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10200,11 +10309,24 @@ msgstr "" "が決まります。\n" "\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -10214,9 +10336,13 @@ msgstr "" " eof CHAR CHAR はファイル終端を送信 (入力の終了)\n" " eol CHAR CHAR は行末\n" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -10226,35 +10352,58 @@ msgstr "" " intr CHAR CHAR は割り込みシグナルを送信\n" " kill CHAR CHAR は現在の行を削除\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" msgstr "" -" * lnext CHAR CHAR は引用された次の文字を入力\n" -" quit CHAR CHAR は終了シグナルを送信\n" -" * rprnt CHAR CHAR は現在の行を再表示\n" -" start CHAR CHAR は停止した出力を再開\n" -#: src/stty.c:559 +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 出力を停止\n" " susp CHAR CHAR は端末停止シグナルを送信\n" " * swtch CHAR CHAR は別のシェル層に切り替え\n" " * werase CHAR CHAR は最後にタイプされた単語を削除\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 +#, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"特殊設定:\n" +" N 入出力の速度を N ボーに設定\n" +" * cols N ターミナルが N 桁であることをカーネルに通知\n" +" * columns N cols N と同じ\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -10264,10 +10413,17 @@ msgstr "" " * cols N ターミナルが N 桁であることをカーネルに通知\n" " * columns N cols N と同じ\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -10277,11 +10433,22 @@ msgstr "" " min N -icanon と共に使い, 完全な読込みに対して最低 N 文字を設定\n" " ospeed N 出力速度を N に設定\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N タームなるが N 行であることをカーネルに通知\n" +" * size カーネルに対応した行数と桁数を表示\n" +" speed 端末速度を表示\n" +" time N -icanon と共に使い, 読込みのタイムアウトを 10 分の N 秒に設" +"定\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -10291,34 +10458,35 @@ msgstr "" " time N -icanon と共に使い, 読込みのタイムアウトを 10 分の N 秒に設" "定\n" -#: src/stty.c:584 -#, fuzzy +#: src/stty.c:641 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 RTS/CTS ハンドシェイクを有効に\n" -" csN 文字の大きさを N ビットに設定, N の範囲は [5..8]\n" -#: src/stty.c:593 -#, fuzzy -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" +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 +#, fuzzy +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" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb 1文字あたり 2ストップビットを使用 (1 の場合は `-' を付け" "る)\n" @@ -10327,7 +10495,12 @@ msgstr "" " [-]parenb パリティビットを出力し, 入力にパリティビットがあるとする\n" " [-]parodd 奇パリティを設定 (偶は `-')\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -10335,6 +10508,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "入力設定:\n" @@ -10343,10 +10517,14 @@ msgstr "" " [-]ignbrk ブレイク文字を無視\n" " [-]igncr 復帰 (CR) を無視\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -10357,14 +10535,23 @@ msgstr "" " [-]inpck 入力パリティのチェックを可能に\n" " [-]istrip 入力文字の最上位 (第8) ビットを落とす\n" -#: src/stty.c:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 入力文字を UTF-8 と見なす\n" -#: src/stty.c:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr " * [-]iutf8 入力文字を UTF-8 と見なす\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -10377,60 +10564,83 @@ msgstr "" " [-]parmrk パリティーエラーをマーク (255-0 文字のシーケンスで)\n" " [-]tandem [-]ixoff と同じ\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"出力設定:\n" -" * bsN バックスペースの遅延スタイル. N の範囲は [0..1]\n" -" * crN 復帰 (CR) 遅延スタイル. N の範囲は [0..3]\n" -" * ffN 用紙送り遅延スタイル. N の範囲は [0..1]\n" -" * nlN 改行 (LF) 遅延スタイル. N の範囲は [0..1]\n" -#: src/stty.c:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" msgstr "" -" * [-]ocrnl 復帰 (CR) を改行 (LF) に翻訳\n" -" * [-]ofdel ヌル文字の代わりに埋める文字として削除文字を使用\n" -" * [-]ofill 遅延のタイミングの代わりに埋める文字を使用\n" -" * [-]olcuc 小文字を大文字に翻訳\n" -" * [-]onlcr 改行 (LF) を復帰改行 (CR-LF) に翻訳\n" -" * [-]onlret 改行 (LF) が復帰 (CR) として振舞う\n" -#: src/stty.c:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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 "" -" * [-]onocr 1桁目の復帰 (CR) を表示しない\n" -" [-]opost プロセス後出力\n" -" * tabN 水平タブ遅延スタイル. N の範囲は [0..3]\n" -" * tabs tab0 と同じ\n" -" * -tabs tab3 と同じ\n" -" * vtN 垂直タブ遅延スタイル. N の範囲は [0..1]\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10440,45 +10650,62 @@ msgstr "" " * crtkill echoprt と echoe の設定にしたがって全ての行を削除\n" " * -crtkill echoctl と echok の設定にしたがって全ての行を削除\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 #, fuzzy +msgid " [-]echo echo input characters\n" +msgstr " * [-]iutf8 入力文字を UTF-8 と見なす\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]ctlecho ハット記号 (`^c') で制御文字をエコー\n" -" [-]echo 入力文字をエコー\n" -" * [-]echoctl [-]ctlecho と同じ\n" -" [-]echoe [-]crterase と同じ\n" -" [-]echok 削除文字の後で改行をエコー\n" -#: src/stty.c:665 -#, fuzzy +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]echoke [-]crtkill と同じ\n" -" [-]echonl 他の文字をエコーしなくても改行をエコー\n" -" * [-]echoprt `\\' と '/' の間で, 削除された文字を逆順にエコー\n" -" [-]icanon erase, kill, werase および rprnt 特殊文字を使用可能に\n" -" [-]iexten 非 POSIX 特殊文字を使用可能に\n" +" [-]isig 割り込み (interrupt), 終了 (quit) および中断 (suspend)\n" +" 特殊文字を使用可能に\n" +" [-]noflsh 割り込み (interrupt) と終了 (quit) 特殊文字の後の出力を無効" +"に\n" +" * [-]prterase [-]echoprt と同じ\n" +" * [-]tostop 端末に書き込もうとするバックグラウンドジョブを停止\n" +" * [-]xcase icanon と共に使い, 大文字に対して `\\' でエスケープ\n" -#: src/stty.c:672 +#: src/stty.c:843 #, fuzzy 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 "" " [-]isig 割り込み (interrupt), 終了 (quit) および中断 (suspend)\n" " 特殊文字を使用可能に\n" @@ -10488,11 +10715,33 @@ msgstr "" " * [-]tostop 端末に書き込もうとするバックグラウンドジョブを停止\n" " * [-]xcase icanon と共に使い, 大文字に対して `\\' でエスケープ\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -10502,40 +10751,50 @@ msgstr "" " cbreak -icanon と同じ\n" " -cbreak icanon と同じ\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 brkint ignpar istrip icrnl ixon opost isig と同じ\n" " icanon, eof および eol 文字は標準の値\n" " -cooked raw と同じ\n" " crt echoe echoctl echoke と同じ\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -" dec echoe echoctl echoke -ixany intr ^c erase 0177 kill ^u と同" -"じ\n" -" * [-]decctlq [-]ixany と同じ\n" -" ek erase と kill 文字を標準の値に\n" -" evenp parenb -parodd cs7 と同じ\n" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 +#, fuzzy 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 "" " -evenp -parenb cs8 と同じ\n" " * [-]lcase xcase iuclc olcuc と同じ\n" @@ -10544,7 +10803,19 @@ msgstr "" " nl -icrnl -onlcr と同じ\n" " -nl icrnl -inlcr -igncr onlcr -ocrnl -onlret と同じ\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"組合せ設定:\n" +" * [-]LCASE [-]lcase と同じ\n" +" cbreak -icanon と同じ\n" +" -cbreak icanon と同じ\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10558,11 +10829,12 @@ msgstr "" " pass8 -parenb -istrip cs8 と同じ\n" " -pass8 parenb istrip cs7 と同じ\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" @@ -10570,14 +10842,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0 と同じ\n" " -raw cooked と同じ\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10586,7 +10859,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke と同じ,\n" " 全ての特殊文字は標準の値.\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10601,57 +10874,62 @@ msgstr "" "のようにコード化されます。特別な値 ^- または undef は特殊文字を無効に\n" "するのに使用されます。\n" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "DEVICE は一つだけ指定できます" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "冗長出力と stty が解釈できる出力形式のオプションは排他的です" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "出力形式を指定した場合、モードを設定してはいけません" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: 非ブロッキングモードを再設定できませんでした" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "%s: 無効な引数です" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "%s に対する引数がありません" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: ファイル切り詰め時にエラーが発生しました" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "%s: 無効な回線制御規則です" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: 要求された処理の全てを実行することができません" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: このデバイスのサイズ情報がありません" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "%s: 無効な整数の引数です" #. This is a proper name. See the gettext manual, section Names. @@ -10660,8 +10938,15 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"各 FILE の CRC チェックサムおよびバイト数を表示します。\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -10673,20 +10958,54 @@ msgstr "" " -s, --sysv System V 形式のチェックサムアルゴリズムと 512 バイトのブ" "ロックを使用します\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, fuzzy, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "使用法: %s [オプション]... [ファイル]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"強制的にディスクを変更されたブロックに変更し、スーパーブロックを更新する。\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" -#: src/sync.c:69 +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "%s の読み込みエラー" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: 非ブロッキングモードを再設定できませんでした" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "%s の読み込みエラー" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "" + +#: src/sync.c:216 #, c-format -msgid "ignoring all arguments" -msgstr "全ての引数を無視します" +msgid "--data needs at least one argument" +msgstr "" -#: src/system.h:343 +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10701,22 +11020,30 @@ msgstr "" "の\n" "文書を参照してオプションなどの詳細を確認してください。\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help この使い方を表示して終了する\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version バージョン情報を表示して終了する\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"FILE の指定がなかったり, - であった場合, 標準入力から読み込みます.\n" + +#: src/system.h:544 #, fuzzy msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "長いオプションに必須の引数は短いオプションにも必須です。\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10724,7 +11051,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10741,7 +11068,7 @@ msgstr "" "バ\n" "イト)。\n" -#: src/system.h:570 +#: src/system.h:590 #, fuzzy, c-format msgid "" "\n" @@ -10752,26 +11079,29 @@ msgstr "%s のホームページ: <%s>\n" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" "%s の翻訳に関するバグは に連絡し" "てください。\n" -#: src/system.h:584 +#: src/system.h:604 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -"完全な文書を参照する場合は info coreutils '%s invocation' を実行してくださ" -"い。\n" -#: src/system.h:591 +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "詳しくは `%s --help' を実行して下さい。\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10793,9 +11123,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "ファイル毎に行を逆順にして標準出力に書き込みます。FILE が指定されないか\n" "FILE として - が指定された場合、標準入力から読み込みます。\n" @@ -10811,63 +11139,62 @@ msgstr "" " -r, --regex 区切り文字列を正規表現として解釈する\n" " -s, --separator=STRING 改行文字の代わりに STRING を区切り文字列にする\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: ファイル探査 (seek) に失敗しました" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "レコードが大きすぎます" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "一時ファイルを %s 内に作成できません" -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: 書き込み用に開くことに失敗しました" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "%s のタイムスタンプの保護に失敗しました" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: 書き込みエラー" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "%s を 読み込み用に開くことが出来ません" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "区切り文字が空であってはなりません" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 +#: src/tail.c:257 #, 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" msgstr "" "各々の FILE の最後の %d 行を標準出力に書き込みます。複数の FILE が指定され\n" "た場合、ファイル名がヘッダ情報として出力されます。FILE が指定されないか、\n" "FILE が - の場合は、標準入力から読み込まれます。\n" -#: src/tail.c:270 +#: src/tail.c:265 #, fuzzy msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" @@ -10878,7 +11205,7 @@ msgstr "" " 場合は各ファイルの先頭から K 番目のバイト以降を出" "力する\n" -#: src/tail.c:274 +#: src/tail.c:269 #, fuzzy msgid "" " -f, --follow[={name|descriptor}]\n" @@ -10893,7 +11220,7 @@ msgstr "" " は等価になる\n" " -F --follow=name --retry と等価\n" -#: src/tail.c:280 +#: src/tail.c:275 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10921,7 +11248,7 @@ msgstr "" " inotify と併せて使用した場合はほとんど有効ではな" "い\n" -#: src/tail.c:293 +#: src/tail.c:288 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -10937,7 +11264,7 @@ msgstr "" "し、\n" " ファイル名で追跡するときに役に立つ\n" -#: src/tail.c:298 +#: src/tail.c:293 #, fuzzy msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" @@ -10952,7 +11279,7 @@ msgstr "" " 最低 N 秒間に 1 回、プロセス P の確認を行う。\n" " -v, --verbose ファイル名を表すヘッダを常に出力する\n" -#: src/tail.c:307 +#: src/tail.c:302 #, fuzzy msgid "" "\n" @@ -10972,7 +11299,7 @@ msgstr "" "G 1024*1024*1024, その他 T, P, E, Z, Y など。\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -10989,177 +11316,178 @@ msgstr "" "用してください。これにより名前の変更、削除、作成などにあわせて名前のついた\n" "ファイルの末尾を追跡するようになります。\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "%s (fd=%d) を閉じています" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: ファイル終端からの相対オフセット %s まで探査 (seek) できません" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "%s の位置が決定できません。ポーリングに戻ります" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, fuzzy, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" "%s はリモートファイルに置き換えられました。このファイル名については処理を終了" "します" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s はアクセス不能になりました" -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" "%s は終端を追跡できないファイルに置き換えられました。このファイル名については" "処理を終了します" -#: src/tail.c:1006 +#: src/tail.c:999 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" "%s はリモートファイルに置き換えられました。このファイル名については処理を終了" "します" -#: src/tail.c:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s はアクセス可能になりました" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s が現れました。新しいファイルの終端を追跡します" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s は置き換えられました。新しいファイルの終端を追跡します" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: 非ブロッキングモードに変更できませんでした" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: ファイルが切り詰められました" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "ファイルが全く残っていません" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "%s の親ディレクトリを監視できません" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "inotify 資源を使い果たしました" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "%s を監視できません" -#: src/tail.c:1529 +# %s: ersetze `%s'? +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: %s を置き換えますか(yes/no)? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "inotify イベントを監視中にエラーが発生しました" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "inotify イベントの読み込み中にエラーが発生しました" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: この種類のファイル終端を追跡できません。このファイル名については処理を終" "了します" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "%s に含まれる番号は大きすぎます" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "%s: 無変化の状態の最大数が無効です" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: 無効なプロセス番号です" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: 無効な秒数です" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "無効な列数です: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "無効なコンテキストでオプションが使用されました -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, fuzzy, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "警告: PID は無視されました。--pid=PID は追跡をしているときのみ有効です" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "警告: PID は無視されました。--pid=PID は追跡をしているときのみ有効です" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "警告: --pid=PID はこのシステムではサポートされていません" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "%s を名前で追跡できません" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "警告: 標準入力を永久に追跡することは効果的ではありません" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "inotify を使用できません。ポーリングに戻ります" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -11171,60 +11499,72 @@ msgstr "" " -a, --append 指定されたファイルに追加し、上書きしない\n" " -i, --ignore-interrupts 割込みシグナルを無視\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"FILE に - を指定した場合、標準出力に再度コピーします\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "%s の後に引数がありません" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "%s: 無効な整数です" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "')' 予期されます" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "')' が予期されるところに %s があります" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: 単項演算子が予期されます" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt は -l を受け付けません" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef は -l を受け付けません" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot は -l を受け付けません" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "不明な二項演算子です" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: 二項演算子が予期されます" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11238,7 +11578,7 @@ msgstr "" "または: [ ]\n" "または: [ OPTION\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11246,7 +11586,7 @@ msgstr "" "終了ステータスは EXPRESSION によって決まります\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11257,7 +11597,7 @@ msgstr "" "の場合は EXPRESSION が真 (true) か偽 (false) かによって終了ステータス\n" "が設定されます。これは次のうちの一つになります:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11271,7 +11611,7 @@ msgstr "" " EXPRESSION1 -a EXPRESSION2 EXPRESSION1 と EXPRESSION2 の両方が真\n" " EXPRESSION1 -o EXPRESSION2 EXPRESSION1 と EXPRESSION2 のいずれかが真\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11287,7 +11627,7 @@ msgstr "" " STRING1 = STRING2 両方の文字列が等しい\n" " STRING1 != STRING2 両方の文字列が等しくない\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11305,7 +11645,7 @@ msgstr "" " INTEGER1 -lt INTEGER2 INTEGER1 が INTEGER2 未満\n" " INTEGER1 -ne INTEGER2 INTEGER1 が INTEGER2 に等しくない\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11317,7 +11657,7 @@ msgstr "" " FILE1 -nt FILE2 FILE1 が FILE2 より (更新された時刻が) 新しい\n" " FILE1 -ot FILE2 FILE1 が FILE2 より古い\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11331,7 +11671,7 @@ msgstr "" " -d FILE FILE が存在し、かつディレクトリである\n" " -e FILE FILE が存在する\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11345,7 +11685,7 @@ msgstr "" " -h FILE FILE が存在し、かつシンボリックリンクである (-L と同じ)\n" " -k FILE FILE が存在し、かつスティッキービットが立っている\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11359,7 +11699,7 @@ msgstr "" " -r FILE FILE が存在し、かつ読み込みが許可されている\n" " -s FILE FILE が存在し、かつ大きさが 0 より大きい\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11373,7 +11713,7 @@ msgstr "" " -w FILE FILE が存在し、かつ書き込みが許可されている\n" " -x FILE FILE が存在し、かつ実行 (または検索) が許可されている\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11389,7 +11729,7 @@ msgstr "" "に注意してください。INTEGER は文字列の長さを返す -l STRING を使うことも可能で" "す。\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11399,26 +11739,26 @@ msgstr "" "備考: [ では --help および --version オプションを使えますが、test では\n" "使えません。 test はそれらを空でない STRING として扱います。\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test および/または [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 #, fuzzy msgid "missing ']'" msgstr "`]' がありません" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "%s: 余分な引数です" @@ -11438,7 +11778,7 @@ msgstr "警告: timer_settime" msgid "warning: timer_create" msgstr "警告: timer_create" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11447,7 +11787,7 @@ msgstr "" "使用法: %s [OPTION] DURATION COMMAND [ARG]...\n" "または: %s [OPTION]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 #, fuzzy msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" @@ -11455,7 +11795,7 @@ msgstr "" "\n" "長いオプションに必須の引数は短いオプションにも必須です。\n" -#: src/timeout.c:238 +#: src/timeout.c:240 #, fuzzy msgid "" " --preserve-status\n" @@ -11490,7 +11830,7 @@ msgstr "" " は`HUP' のような名前か番号を使用する。シグナル\n" " 一覧については `kill -l` を参照\n" -#: src/timeout.c:257 +#: src/timeout.c:259 #, fuzzy msgid "" "\n" @@ -11502,7 +11842,7 @@ msgstr "" "DURATION は浮動小数で指定し、次の接尾辞を追加できます:\n" "`s' は秒 (デフォルト)、 `m' は分、`h' は時、`d' は日。\n" -#: src/timeout.c:262 +#: src/timeout.c:264 #, fuzzy msgid "" "\n" @@ -11520,7 +11860,7 @@ msgstr "" "は、プロセスでブロックか捕捉されない限りプロセスを終了させます。TERM で終\n" "了できないプロセスを終了させるためには KILL (9) シグナルが必要です。\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "警告: コアダンプの無効化に失敗しました" @@ -11535,6 +11875,11 @@ msgstr "コマンド待機中にエラーが発生しました" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "不明なコマンドの終了ステータスです (0x%X)" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -11907,12 +12252,12 @@ msgstr "終了コードは成功になります。" msgid "Exit with a status code indicating failure." msgstr "終了コードは失敗になります。" -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "使用法: %s OPTION... FILE...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 #, fuzzy msgid "" "Shrink or extend the size of each FILE to the specified size\n" @@ -11932,17 +12277,17 @@ msgstr "" "拡張した部分 (hole になる) を読み込んだときは値が 0 のバイトとなります。\n" "\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create ファイルを作成しない\n" -#: src/truncate.c:112 +#: src/truncate.c:85 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:115 +#: src/truncate.c:88 #, fuzzy msgid "" " -r, --reference=RFILE base size on RFILE\n" @@ -11951,7 +12296,7 @@ msgstr "" " -r, --reference=RFILE サイズとして RFILE のサイズを使用する\n" " -s, --size=SIZE ファイルサイズを SIZE に設定・調整する\n" -#: src/truncate.c:121 +#: src/truncate.c:94 #, fuzzy msgid "" "\n" @@ -11964,59 +12309,64 @@ msgstr "" "`+' 拡大する、 `-' 切り詰める、 `<' 最大、`>' 最小、\n" "`/' 倍数まで切り捨てる, `%' 倍数まで切り上げる。\n" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" "% * % バイトのブロックはファイル %s に対してオーバーフロー" "しています" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: は使用できません。負の大きさになっているようです" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "%s ののサイズを取得できません" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "ファイル %s の切り上げ時にオーバーフローが発生しました" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "ファイル %s の拡大時にオーバーフローが発生しました" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "ファイル %s を % バイトへ切り詰めるのに失敗しました" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "複数の相対位置を表すオプションが指定されています" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "%s : 無効な数字です" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "%s または %s のいずれかを指定しなければいけません" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "%2$s と併せて相対的な %1$s を指定しなければいけません" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "%s が指定されていますが %s が指定されていません" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "%s を書き込み用に開くことができません" @@ -12027,12 +12377,10 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "使用法: %s [OPTION] [FILE]\n" "FILE 内に含まれている部分的に順序づけられた項目を使用して、完全に順序づけられ" @@ -12041,12 +12389,17 @@ msgstr "" "FILE が指定されないか、- の場合、標準入力から読み込みます。\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: 入力に要素数が奇数の項目が含まれています" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: 入力にループが含まれています:" @@ -12115,9 +12468,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "各 FILE に含まれている空白をタブに変換して標準出力に書き込みます。\n" "FILE が指定されないか、 - が指定された場合、標準入力から読み込みます。\n" @@ -12177,8 +12528,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -12189,7 +12540,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -12339,11 +12690,6 @@ msgstr "" "平均\n" "負荷率には割り込み不可能な sleep 状態にあるプロセス数も影響します。\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -12364,12 +12710,17 @@ msgstr "" "FILE を指定しない場合、%s が使用されます。 FILE としては %s が一般的です。\n" "\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -12386,12 +12737,13 @@ msgstr "" " -m, --chars 文字数を表示する\n" " -l, --lines 改行の数を表示する\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=F 入力として NULL 文字で区切られたファイル F を使用\n" @@ -12554,10 +12906,10 @@ msgstr "" "現在の実効ユーザ ID に対応したユーザ名を表示します。 id -un と等価です。\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: ユーザID %lu に対するユーザ名が見つかりません\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "ユーザー ID %lu に対するユーザー名が見つかりません" #: src/yes.c:41 #, c-format @@ -12577,6 +12929,265 @@ msgstr "" "指定された全ての STRING または `y' からなる行を繰り返し出力します。\n" "\n" +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "PAGE_LENGTH <= 10 の場合は -t が暗黙的に利用されます。FILE を指定しない" +#~ "か、 FILE\n" +#~ "が - の時は標準入力から読み込みます。\n" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "ファイルの指定がなかったり, - であった場合, 標準入力から読み込みます.\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "強制的にディスクを変更されたブロックに変更し、スーパーブロックを更新す" +#~ "る。\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "全ての引数を無視します" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: 無効な番号です" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s は大きすぎて表示できません" + +#~ msgid "number of lines" +#~ msgstr "行数" + +#~ msgid "number of bytes" +#~ msgstr "バイト数" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: 無視する数が無効です" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: 無効なバイト数表記です" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: 無効な行数表記です" + +#~ msgid "number in %s is too large" +#~ msgstr "%s に含まれる番号は大きすぎます" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: 無効な秒数です" + +#, fuzzy +#~| msgid "failed to set supplemental group(s)" +#~ msgid "failed to %s supplemental groups" +#~ msgstr "追加グループの設定に失敗しました" + +#, fuzzy +#~| 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" +#~ 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 "" +#~ "\n" +#~ "%s シグナルを実行中の `dd' に送ると I/O 統計情報を標準出力に\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" +#~ " 9387674624 バイト (9.4 GB) コピーされました、 34.6279 秒、 271 MB/秒\n" +#~ "\n" +#~ "オプションは次の通りです:\n" +#~ "\n" + +#~ 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 は引用された次の文字を入力\n" +#~ " quit CHAR CHAR は終了シグナルを送信\n" +#~ " * rprnt CHAR CHAR は現在の行を再表示\n" +#~ " start CHAR CHAR は停止した出力を再開\n" + +#, 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" +#~| " csN set character size to N bits, N in [5..8]\n" +#~ 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 RTS/CTS ハンドシェイクを有効に\n" +#~ " csN 文字の大きさを N ビットに設定, N の範囲は [5..8]\n" + +#~ 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 "" +#~ "\n" +#~ "出力設定:\n" +#~ " * bsN バックスペースの遅延スタイル. N の範囲は [0..1]\n" +#~ " * crN 復帰 (CR) 遅延スタイル. N の範囲は [0..3]\n" +#~ " * ffN 用紙送り遅延スタイル. N の範囲は [0..1]\n" +#~ " * nlN 改行 (LF) 遅延スタイル. N の範囲は [0..1]\n" + +#, fuzzy +#~| 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" +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl 復帰 (CR) を改行 (LF) に翻訳\n" +#~ " * [-]ofdel ヌル文字の代わりに埋める文字として削除文字を使用\n" +#~ " * [-]ofill 遅延のタイミングの代わりに埋める文字を使用\n" +#~ " * [-]olcuc 小文字を大文字に翻訳\n" +#~ " * [-]onlcr 改行 (LF) を復帰改行 (CR-LF) に翻訳\n" +#~ " * [-]onlret 改行 (LF) が復帰 (CR) として振舞う\n" + +#~ 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 "" +#~ " * [-]onocr 1桁目の復帰 (CR) を表示しない\n" +#~ " [-]opost プロセス後出力\n" +#~ " * tabN 水平タブ遅延スタイル. N の範囲は [0..3]\n" +#~ " * tabs tab0 と同じ\n" +#~ " * -tabs tab3 と同じ\n" +#~ " * vtN 垂直タブ遅延スタイル. N の範囲は [0..1]\n" + +#, fuzzy +#~| 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" +#~ 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 "" +#~ " * [-]ctlecho ハット記号 (`^c') で制御文字をエコー\n" +#~ " [-]echo 入力文字をエコー\n" +#~ " * [-]echoctl [-]ctlecho と同じ\n" +#~ " [-]echoe [-]crterase と同じ\n" +#~ " [-]echok 削除文字の後で改行をエコー\n" + +#, fuzzy +#~| 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" +#~ 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 "" +#~ " * [-]echoke [-]crtkill と同じ\n" +#~ " [-]echonl 他の文字をエコーしなくても改行をエコー\n" +#~ " * [-]echoprt `\\' と '/' の間で, 削除された文字を逆順にエコー\n" +#~ " [-]icanon erase, kill, werase および rprnt 特殊文字を使用可能に\n" +#~ " [-]iexten 非 POSIX 特殊文字を使用可能に\n" + +#~ 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 "" +#~ " dec echoe echoctl echoke -ixany intr ^c erase 0177 kill ^u と" +#~ "同じ\n" +#~ " * [-]decctlq [-]ixany と同じ\n" +#~ " ek erase と kill 文字を標準の値に\n" +#~ " evenp parenb -parodd cs7 と同じ\n" + +#~ msgid "For complete documentation, run: info coreutils '%s invocation'\n" +#~ msgstr "" +#~ "完全な文書を参照する場合は info coreutils '%s invocation' を実行してくださ" +#~ "い。\n" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: ユーザID %lu に対するユーザ名が見つかりません\n" + #~ msgid "" #~ "\n" #~ "Examples:\n" @@ -12707,20 +13318,6 @@ msgstr "" #~ msgid "accessing %s" #~ msgstr "%s にアクセス中" -#~ msgid "" -#~ "Display the current time in the given FORMAT, or set the system date.\n" -#~ "\n" -#~ " -d, --date=STRING display time described by STRING, not `now'\n" -#~ " -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -#~ msgstr "" -#~ "与えられた FORMAT で現在時刻を表示します。またはシステム時刻を設定しま" -#~ "す。\n" -#~ "\n" -#~ " -d, --date=STRING 現在時刻ではなく STRING で記述された時刻を表示" -#~ "する\n" -#~ " -f, --file=DATEFILE DATEFILE の各行に対して --date と同様に動作す" -#~ "る\n" - #~ msgid "opening %s" #~ msgstr "%s を開いています" diff --git a/po/kk.gmo b/po/kk.gmo index 0c3bc3fc..b6c89c55 100644 Binary files a/po/kk.gmo and b/po/kk.gmo differ diff --git a/po/kk.po b/po/kk.po index adacd388..f7fdbb51 100644 --- a/po/kk.po +++ b/po/kk.po @@ -3,11 +3,12 @@ # This file is distributed under the same license as the coreutils package. # Baurzhan Muftakhidinov , 2010. # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: GNU coreutils 8.7\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2010-11-18 14:19+0600\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" @@ -38,18 +39,18 @@ msgstr "" msgid "error closing file" msgstr "Файлды жабу қатесі: %s" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "жазу қатесі" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "" @@ -236,57 +237,62 @@ msgstr "" msgid "Unknown error" msgstr "Белгісіз қате" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "" @@ -296,13 +302,13 @@ msgstr "" msgid "cannot change permissions of %s" msgstr "" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, fuzzy, c-format msgid "cannot create directory %s" msgstr "%s: %s бумасын жасау мүкін емес\n" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "" @@ -351,6 +357,12 @@ msgstr "" msgid "%s: end of file" msgstr "" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "" + #: lib/regcomp.c:131 #, fuzzy msgid "Success" @@ -460,7 +472,7 @@ msgstr "" msgid "^[nN]" msgstr "" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "" @@ -872,7 +884,7 @@ msgid "" "Base64 encode or decode FILE, or standard input, to standard output.\n" msgstr "" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -882,13 +894,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -897,51 +903,51 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "" -#: src/base64.c:231 +#: src/base64.c:229 #, fuzzy, c-format msgid "invalid input" msgstr "Енгізу қате" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, 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:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "" @@ -978,38 +984,41 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "" #: src/cat.c:92 +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" + +#: src/cat.c:98 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" @@ -1019,7 +1028,7 @@ msgid "" " -s, --squeeze-blank suppress repeated empty output lines\n" msgstr "" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1027,7 +1036,7 @@ msgid "" " -v, --show-nonprinting use ^ and M- notation, except for LFD and TAB\n" msgstr "" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1036,17 +1045,18 @@ msgid "" " %s Copy standard input to standard output.\n" msgstr "" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "" @@ -1058,10 +1068,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "" @@ -1075,8 +1085,8 @@ msgstr "" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "" @@ -1091,13 +1101,13 @@ msgstr "" msgid "failed to change context of %s to %s" msgstr "" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "" @@ -1113,7 +1123,7 @@ msgstr "" msgid "fts_read failed" msgstr "" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1197,7 +1207,7 @@ msgid "-R -h requires -P" msgstr "" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1214,9 +1224,8 @@ msgid "conflicting security context specifiers given" msgstr "" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "" @@ -1472,77 +1481,89 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" " or: %s OPTION\n" msgstr "" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" msgstr "" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" msgstr "" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "\"%s\" ашу сәтсіз аяқталды " -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" +msgid "failed to set supplemental groups" msgstr "\"%s\" ашу сәтсіз аяқталды " -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "" @@ -1579,7 +1600,13 @@ msgstr "" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1587,7 +1614,7 @@ msgid "" "and column three contains lines common to both files.\n" msgstr "" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1595,7 +1622,7 @@ msgid "" " -3 suppress column 3 (lines that appear in both files)\n" msgstr "" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1603,17 +1630,17 @@ msgid "" " --nocheck-order do not check that the input is correctly sorted\n" msgstr "" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1622,309 +1649,323 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 -#, fuzzy, c-format -msgid "error reading %s" -msgstr "%s: %s: оқу қатесі: %s\n" - -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:181 src/copy.c:452 #, c-format msgid "cannot lseek %s" msgstr "" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" +msgstr "%s: %s: оқу қатесі: %s\n" + +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 +#, fuzzy, c-format +msgid "error reading %s" +msgstr "%s: %s: оқу қатесі: %s\n" + +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, fuzzy, c-format msgid "error writing %s" msgstr "\"%s\" жазу қатесі: %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "%s: %s: оқу қатесі: %s\n" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "%s: %s өшіру сәтсіз аяқталды\n" -#: src/copy.c:383 +#: src/copy.c:478 #, fuzzy, c-format msgid "%s: write failed" msgstr "жабу сәтсіз" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "\"%s\" ашу сәтсіз аяқталды " -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "" -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" msgstr "\"%s\" ашу сәтсіз аяқталды " -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "\"%s\" ашу сәтсіз аяқталды " -#: src/copy.c:1580 +#: src/copy.c:1669 #, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "" -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, fuzzy, c-format msgid "%s: overwrite %s? " msgstr "Үстінен жазу ма?" -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr "" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "" -#: src/copy.c:2107 +#: src/copy.c:2187 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "" -#: src/copy.c:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, c-format +msgid "warning: source directory %s specified more than once" +msgstr "" + +#: src/copy.c:2294 #, c-format msgid "will not create hard link %s to directory %s" msgstr "" -#: src/copy.c:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" -#: src/copy.c:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "" @@ -1934,25 +1975,25 @@ msgstr "" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, fuzzy, c-format msgid "unknown program %s" msgstr "Белгісіз қате" @@ -2136,8 +2177,8 @@ msgstr "" msgid "failed to access %s" msgstr "\"%s\" ашу сәтсіз аяқталды " -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "" @@ -2209,137 +2250,143 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr "" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "" -#: src/csplit.c:1200 +#: src/csplit.c:1201 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "" -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "%s: '%s' күні қате\n" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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:1490 +#: src/csplit.c:1485 +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2347,26 +2394,21 @@ msgid "" " -k, --keep-files do not remove output files on errors\n" msgstr "" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 msgid "" "\n" +"Each PATTERN may be:\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" @@ -2390,14 +2432,14 @@ msgstr "" msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" -#: src/cut.c:182 +#: src/cut.c:183 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:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2405,20 +2447,20 @@ msgid "" " -n (ignored)\n" msgstr "" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" -#: src/cut.c:197 +#: src/cut.c:198 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:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2426,7 +2468,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:210 +#: src/cut.c:211 msgid "" "Each range is one of:\n" "\n" @@ -2434,64 +2476,63 @@ msgid "" " 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:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "" -#: src/cut.c:790 +#: src/cut.c:789 msgid "an input delimiter may be specified only when operating on fields" msgstr "" -#: src/cut.c:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" msgstr "" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "" @@ -2508,34 +2549,48 @@ 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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" + +#: src/date.c:138 +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" +msgstr "" + +#: src/date.c:145 +msgid "" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" -#: src/date.c:142 +#: src/date.c:149 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" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" -#: src/date.c:147 +#: src/date.c:155 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 (UTC)\n" +" -r, --reference=FILE display the last modification time of FILE\n" msgstr "" #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2543,7 +2598,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2551,7 +2606,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2559,14 +2614,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:177 +#: src/date.c:183 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 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2574,7 +2629,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2582,7 +2637,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2593,7 +2648,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2601,7 +2656,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:209 +#: src/date.c:215 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" @@ -2609,7 +2664,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2617,7 +2672,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2629,7 +2684,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2640,7 +2695,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2649,7 +2704,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -2663,35 +2718,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, fuzzy, c-format msgid "invalid date %s" msgstr "%s: '%s' күні қате\n" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "" -#: src/date.c:430 +#: src/date.c:436 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "" -#: src/date.c:437 +#: src/date.c:443 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" -#: src/date.c:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2699,30 +2754,30 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" " or: %s OPTION\n" msgstr "" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -2733,7 +2788,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:570 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2742,11 +2797,13 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -2757,7 +2814,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -2772,7 +2829,7 @@ msgid "" " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2782,7 +2839,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2791,123 +2848,103 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 +#: src/dd.c:661 #, 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:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" - -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "" -msgstr[1] "" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "" @@ -2921,164 +2958,179 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr "" -#: src/dd.c:877 +#: src/dd.c:809 +#, c-format +msgid ", %.6f s, %s/s" +msgstr "" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "" +msgstr[1] "" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "" -#: src/dd.c:1294 -msgid "invalid status flag" -msgstr "" - -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" +msgstr "%s: '%s' күні қате\n" -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" " of mt_type=0x%0lx -- see for the list of types" msgstr "" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, fuzzy, c-format msgid "failed to open %s" msgstr "\"%s\" ашу сәтсіз аяқталды " -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, fuzzy, c-format msgid "failed to discard cache for: %s" msgstr "%s: %s өшіру сәтсіз аяқталды\n" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "" @@ -3159,12 +3211,12 @@ msgstr "Сыйымдылығы" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3172,18 +3224,18 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3192,20 +3244,30 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:1409 +#: src/df.c:1429 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" +msgstr "" + +#: src/df.c:1435 +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" + +#: src/df.c:1439 +msgid "" " -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:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3213,25 +3275,25 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Ескерту:" -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "" @@ -3321,7 +3383,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3329,7 +3391,8 @@ msgid "" msgstr "" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" #: src/du.c:291 @@ -3413,61 +3476,55 @@ msgstr "" msgid "Infinity" msgstr "" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 #, fuzzy msgid "total" msgstr "Жалпы" @@ -3578,9 +3635,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" #: src/expand.c:114 @@ -3620,7 +3675,7 @@ msgid "input line is too long" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "" @@ -3726,12 +3781,12 @@ msgstr "" msgid "non-integer argument" msgstr "" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "" @@ -3742,38 +3797,38 @@ msgid "the strings compared were %s and %s" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" " or: %s OPTION\n" msgstr "" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -3812,7 +3867,7 @@ msgid "" "The option -WIDTH is an abbreviated form of --width=DIGITS.\n" msgstr "" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -3820,7 +3875,7 @@ msgid "" " -s, --split-only split long lines, but do not refill\n" msgstr "" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -3829,35 +3884,33 @@ msgid "" " -g, --goal=WIDTH goal width (default of 93% of width)\n" msgstr "" -#: src/fmt.c:359 +#: src/fmt.c:356 #, 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/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" +msgstr "Енгізу қате" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" -#: src/fold.c:77 +#: src/fold.c:76 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 "" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" +msgstr "%s: '%s' күні қате\n" #. This is a proper name. See the gettext manual, section Names. #: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 @@ -3923,14 +3976,13 @@ msgstr "" msgid "%s: no such user" msgstr "Ондай пайдаланушы жоқ." -#: src/head.c:109 +#: src/head.c:110 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 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -3940,13 +3992,13 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:125 +#: src/head.c:126 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 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -3954,48 +4006,36 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "" -#: src/head.c:886 +#: src/head.c:267 #, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "" - -#: src/head.c:887 -msgid "number of lines" -msgstr "" - -#: src/head.c:887 -msgid "number of bytes" +msgid "%s: number of bytes is too large" msgstr "" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "" @@ -4163,7 +4203,7 @@ msgstr "" msgid "cannot set time stamps for %s" msgstr "" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "" @@ -4279,7 +4319,7 @@ msgstr "" msgid "target directory not allowed when installing a directory" msgstr "" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "" @@ -4314,15 +4354,19 @@ msgstr "" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +msgid "" "\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:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -4330,7 +4374,7 @@ msgid "" " -t CHAR use CHAR as input and output field separator\n" msgstr "" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -4342,11 +4386,11 @@ msgid "" " print them without trying to pair them\n" msgstr "" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -4365,47 +4409,47 @@ msgid "" "warning message will be given.\n" msgstr "" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "" @@ -4469,17 +4513,17 @@ msgstr "" msgid "no process ID specified" msgstr "" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -4626,7 +4670,7 @@ msgstr "" msgid "FIXME: unknown" msgstr "" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "" @@ -4637,7 +4681,7 @@ msgid "" "\n" msgstr "" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "" @@ -4647,7 +4691,7 @@ msgstr "" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -4656,100 +4700,100 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" -msgstr "" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" +msgstr "Енгізу қате" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" -msgstr "" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" +msgstr "%s: '%s' күні қате\n" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "" -#: src/ls.c:4781 +#: src/ls.c:4775 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:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -4758,7 +4802,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -4772,18 +4816,19 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4798 msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -4793,11 +4838,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -4806,7 +4851,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -4814,7 +4859,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -4827,7 +4872,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -4839,7 +4884,7 @@ msgid "" " -k, --kibibytes default to 1024-byte blocks for disk usage\n" msgstr "" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -4849,7 +4894,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -4860,7 +4905,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -4872,7 +4917,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -4880,21 +4925,21 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4886 +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -4908,31 +4953,32 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4908 +#: src/ls.c:4904 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:4912 +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4919 +#: src/ls.c:4915 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 security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -4941,7 +4987,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -4970,39 +5016,40 @@ msgstr "" 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 +#: src/md5sum.c:175 msgid "" +"\n" " -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" +#: src/md5sum.c:180 +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr "" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -5014,96 +5061,97 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "" -#: src/md5sum.c:593 +#: src/md5sum.c:596 #, fuzzy msgid "FAILED" msgstr "Сәтсіз аяқталды!" -#: src/md5sum.c:595 +#: src/md5sum.c:598 #, fuzzy msgid "OK" msgstr "ОК" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -5133,22 +5181,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "%s: %s өшіру сәтсіз аяқталды\n" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -5317,7 +5365,7 @@ msgstr "" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" @@ -5428,9 +5476,7 @@ 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" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" #: src/nl.c:186 @@ -5503,27 +5549,27 @@ msgstr "" msgid "invalid footer numbering style: %s" msgstr "" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" -msgstr "" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" +msgstr "%s: '%s' күні қате\n" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" -msgstr "" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" +msgstr "%s: '%s' күні қате\n" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" -msgstr "" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" +msgstr "%s: '%s' күні қате\n" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" -msgstr "" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" +msgstr "%s: '%s' күні қате\n" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "" @@ -5545,7 +5591,7 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -5557,43 +5603,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "" @@ -5615,96 +5661,93 @@ msgid "" " --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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "%s: '%s' күні қате\n" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "Енгізу қате" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "Жазу үшін '%s' ашу сәтсіз: %s" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "%s: '%s' күні қате\n" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -5712,19 +5755,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -5734,30 +5777,30 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 #, fuzzy msgid "" "\n" @@ -5766,11 +5809,11 @@ msgstr "" "Басқа опциялар:\n" "\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -5779,7 +5822,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -5787,7 +5830,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -5795,7 +5838,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -5803,7 +5846,19 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -5812,9 +5867,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -5826,7 +5882,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -5841,118 +5897,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "Енгізу қате" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "Енгізу қате" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 #, c-format -msgid "value too large to be printed: '%Lg' (consider using --to)" +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1210 #, c-format -msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1219 #, c-format -msgid "large input value %s: possible precision loss" +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1308 +#: src/numfmt.c:1305 #, c-format -msgid "input line is too short, no numbers found to convert in field %ld" +msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1403 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, fuzzy, c-format -msgid "invalid padding value %s" +msgid "invalid field value %s" msgstr "%s: '%s' күні қате\n" -#: src/numfmt.c:1417 +#: src/numfmt.c:1631 #, fuzzy, c-format -msgid "invalid field value %s" +msgid "invalid padding value %s" msgstr "%s: '%s' күні қате\n" -#: src/numfmt.c:1447 +#: src/numfmt.c:1646 +#, c-format +msgid "multiple field specifications" +msgstr "" + +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "%s: '%s' күні қате\n" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "Команда көрсетілмеген" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "%s: %s: оқу қатесі: %s\n" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -5961,18 +6029,17 @@ msgid "" "[b]]\n" msgstr "" -#: src/od.c:326 +#: src/od.c:327 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:333 +#: src/od.c:335 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" @@ -5981,7 +6048,7 @@ msgid "" "suffixes may be . for octal and b for multiply by 512.\n" msgstr "" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -5990,7 +6057,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -6003,7 +6070,7 @@ msgid "" " --traditional accept arguments in third form above\n" msgstr "" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -6014,7 +6081,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6024,7 +6091,7 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -6033,7 +6100,7 @@ msgid "" " c printable character or backslash escape\n" msgstr "" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6042,7 +6109,7 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -6051,14 +6118,14 @@ msgid "" "for sizeof(double) or L for sizeof(long double).\n" msgstr "" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -6071,55 +6138,55 @@ msgid "" "and so on for G, T, P, E, Z, Y.\n" msgstr "" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte integral type" msgstr "" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte floating point type" msgstr "" -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" msgstr "" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "" -#: src/od.c:1650 +#: src/od.c:1658 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "" @@ -6138,7 +6205,6 @@ msgstr "" 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 @@ -6274,12 +6340,12 @@ msgstr "Қашан" msgid "Where" msgstr "" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6289,7 +6355,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6298,7 +6364,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -6306,96 +6372,91 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:597 +#: src/pinky.c:596 #, 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 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +msgid "'-N NUMBER' invalid starting line number" msgstr "" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +msgid "'-o MARGIN' invalid line offset" msgstr "" -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "" -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "" -#: src/pr.c:1096 +#: src/pr.c:1059 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" -#: src/pr.c:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" -#: src/pr.c:1196 +#: src/pr.c:1166 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6405,7 +6466,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6415,7 +6476,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6427,7 +6488,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -6440,16 +6501,21 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2798 +#: src/pr.c:2769 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2775 +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -6459,7 +6525,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -6468,7 +6534,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -6479,17 +6545,22 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2828 +#: src/pr.c:2802 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6503,7 +6574,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -6512,13 +6583,6 @@ msgid "" " with -S or -s\n" msgstr "" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" - #: src/printenv.c:62 #, c-format msgid "" @@ -6643,15 +6707,20 @@ msgid "" "files.\n" msgstr "" -#: src/ptx.c:1830 +#: src/ptx.c:1831 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:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -6659,7 +6728,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -6669,7 +6738,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -6677,17 +6746,16 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -6711,7 +6779,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "" @@ -6731,8 +6799,8 @@ msgstr "" msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "" @@ -6921,15 +6989,15 @@ msgid "" msgstr "" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " -msgstr[0] "" +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " +msgstr[0] "Өшіру" #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "Өшіру" #: src/rmdir.c:134 src/rmdir.c:233 @@ -7106,12 +7174,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -7127,7 +7195,13 @@ msgid "" "for even very expensive hardware probing to recover the data.\n" msgstr "" -#: src/shred.c:177 +#: src/shred.c:174 +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7136,7 +7210,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -7145,11 +7219,9 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:192 +#: src/shred.c:196 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.\n" @@ -7161,7 +7233,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -7172,7 +7244,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7184,7 +7256,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7193,7 +7265,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -7205,134 +7277,134 @@ msgid "" "\n" msgstr "" -#: src/shred.c:241 +#: src/shred.c:243 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:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "" -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:1078 +#: src/shred.c:1080 #, fuzzy, c-format msgid "%s: removing" msgstr "Өшірілуде %1..." -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "" -#: src/shred.c:1124 +#: src/shred.c:1126 #, fuzzy, c-format msgid "%s: failed to remove" msgstr "%s: %s өшіру сәтсіз аяқталды\n" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "" -#: src/shred.c:1171 +#: src/shred.c:1173 #, fuzzy, c-format msgid "%s: failed to open for writing" msgstr "Жазу үшін '%s' ашу сәтсіз: %s" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" -msgstr "" +#, fuzzy +msgid "invalid number of passes" +msgstr "%s: '%s' күні қате\n" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" -msgstr "" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" +msgstr "%s: '%s' күні қате\n" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -7340,11 +7412,11 @@ msgid "" " or: %s -i LO-HI [OPTION]...\n" msgstr "" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -7355,37 +7427,37 @@ msgid "" " -r, --repeat output lines can be repeated\n" msgstr "" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" -msgstr "" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" +msgstr "Енгізу қате" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" -msgstr "" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" +msgstr "%s: '%s' күні қате\n" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -7404,12 +7476,12 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "" @@ -7418,13 +7490,13 @@ msgstr "" msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -7432,19 +7504,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:443 +#: src/sort.c:444 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:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -7452,7 +7524,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7462,7 +7534,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -7470,13 +7542,13 @@ msgstr "" "Басқа опциялар:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -7485,7 +7557,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7494,13 +7566,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -7508,7 +7580,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7523,7 +7595,7 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -7542,479 +7614,483 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:524 +#: src/sort.c:525 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:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "жабу сәтсіз" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "" -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "%s: '%s' күні қате\n" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "%s: '%s' күні қате\n" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "%s: '%s' күні қате\n" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 +#: src/split.c:224 #, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "" -#: src/split.c:207 +#: src/split.c:228 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "%s: %s өшіру сәтсіз аяқталды\n" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "\"%s\" символдық сілтемесін жасау сәтсіз аяқталды" -#: src/split.c:427 +#: src/split.c:481 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "\"%s\" ашу сәтсіз аяқталды " -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" -msgstr "" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" +msgstr "%s: '%s' күні қате\n" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" -msgstr "" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" +msgstr "%s: '%s' күні қате\n" -#: src/split.c:1169 +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" +msgstr "Енгізу қате" + +#: src/split.c:1333 #, c-format -msgid "%s: invalid suffix length" +msgid "empty record separator" msgstr "" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1344 #, c-format -msgid "%s: invalid number of bytes" +msgid "multi-character separator %s" msgstr "" -#: src/split.c:1213 src/split.c:1360 +#: src/split.c:1352 #, c-format -msgid "%s: invalid number of lines" +msgid "multiple separator characters specified" msgstr "" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "" -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" -msgstr "" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" +msgstr "%s: '%s' күні қате\n" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, c-format msgid "%s: cannot determine file size" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8025,7 +8101,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8033,30 +8109,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8064,17 +8140,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8084,7 +8160,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -8096,7 +8172,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8106,7 +8182,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8119,7 +8195,7 @@ msgid "" " %T minor device type in hex, for character/block device special files\n" msgstr "" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8134,7 +8210,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8145,7 +8221,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -8200,8 +8276,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -8226,7 +8301,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8234,96 +8309,149 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 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:535 +#: src/stty.c:543 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:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +msgid "" " 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 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:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" msgstr "" -#: src/stty.c:559 +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" + +#: src/stty.c:614 +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 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:578 +#: src/stty.c:632 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" +msgstr "" + +#: src/stty.c:637 +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:584 +#: src/stty.c:641 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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -8331,10 +8459,13 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -8342,135 +8473,249 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +msgid "" " [-]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:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:619 +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +msgid "" " [-]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:627 +#: src/stty.c:712 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:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]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:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +msgid "" " * 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr "" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:672 +#: src/stty.c:843 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" +msgstr "" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:875 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:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -#: src/stty.c:699 +#: src/stty.c:919 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:707 +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8479,25 +8724,27 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8506,58 +8753,63 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "\"%s\" жазу қатесі: %s" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" -msgstr "" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" +msgstr "%s: '%s' күні қате\n" #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 @@ -8565,25 +8817,64 @@ msgid "Kayvan Aghaiepour" msgstr "" #: src/sum.c:62 +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" + +#: src/sum.c:68 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 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" +"\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" msgstr "" -#: src/sync.c:69 +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "%s: %s: оқу қатесі: %s\n" + +#: src/sync.c:124 #, c-format -msgid "ignoring all arguments" +msgid "couldn't reset non-blocking mode %s" msgstr "" -#: src/system.h:343 +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "%s: %s: оқу қатесі: %s\n" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "" + +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -8592,21 +8883,27 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr "" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr "" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -8614,7 +8911,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -8623,7 +8920,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -8634,22 +8931,27 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "Full documentation at: <%s%s>\n" msgstr "" -#: src/system.h:591 +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "" + +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Көбірек білу үшін \"%s --help\" көріңіз." -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -8665,9 +8967,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" #: src/tac.c:144 @@ -8677,66 +8977,65 @@ msgid "" " -s, --separator=STRING use STRING as the separator instead of newline\n" msgstr "" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "\"%s\" символдық сілтемесін жасау сәтсіз аяқталды" -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "Жазу үшін '%s' ашу сәтсіз: %s" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "%s: %s өшіру сәтсіз аяқталды\n" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "Жазу үшін '%s' ашу сәтсіз: %s" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "" -#: src/tail.c:262 +#: src/tail.c:257 #, 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 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -8744,7 +9043,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -8757,14 +9056,14 @@ msgid "" " with inotify, this option is rarely useful\n" msgstr "" -#: src/tail.c:293 +#: src/tail.c:288 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 if it is inaccessible\n" msgstr "" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -8773,7 +9072,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -8784,7 +9083,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -8794,169 +9093,168 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "" -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" -#: src/tail.c:1006 +#: src/tail.c:999 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" -#: src/tail.c:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "" -#: src/tail.c:1035 +#: src/tail.c:1032 #, c-format -msgid "%s has appeared; following end of new file" +msgid "%s has appeared; following new file" msgstr "" -#: src/tail.c:1046 +#: src/tail.c:1042 #, c-format -msgid "%s has been replaced; following end of new file" +msgid "%s has been replaced; following new file" msgstr "" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "А_лмастыру" + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +msgid "invalid maximum number of unchanged stats between opens" msgstr "" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" -msgstr "" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" +msgstr "Енгізу қате" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "%s: '%s' күні қате\n" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -8964,58 +9262,72 @@ msgid "" " -i, --ignore-interrupts ignore interrupt signals\n" msgstr "" -#: src/tee.c:71 +#: src/tee.c:93 +msgid "" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" +msgstr "" + +#: src/tee.c:98 msgid "" "\n" -"If a FILE is -, copy again to standard output.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -9024,20 +9336,20 @@ msgid "" " or: [ OPTION\n" msgstr "" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" msgstr "" -#: src/test.c:717 +#: src/test.c:719 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 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -9046,7 +9358,7 @@ msgid "" " EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n" msgstr "" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -9056,7 +9368,7 @@ msgid "" " STRING1 != STRING2 the strings are not equal\n" msgstr "" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -9067,7 +9379,7 @@ msgid "" " INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n" msgstr "" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -9075,7 +9387,7 @@ msgid "" " FILE1 -ot FILE2 FILE1 is older than FILE2\n" msgstr "" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -9084,7 +9396,7 @@ msgid "" " -e FILE FILE exists\n" msgstr "" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -9093,7 +9405,7 @@ msgid "" " -k FILE FILE exists and has its sticky bit set\n" msgstr "" -#: src/test.c:766 +#: src/test.c:768 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" @@ -9102,7 +9414,7 @@ msgid "" " -s FILE FILE exists and has a size greater than zero\n" msgstr "" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -9111,7 +9423,7 @@ msgid "" " -x FILE FILE exists and execute (or search) permission is granted\n" msgstr "" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -9120,33 +9432,33 @@ msgid "" "INTEGER may also be -l STRING, which evaluates to the length of STRING.\n" msgstr "" -#: src/test.c:786 +#: src/test.c:788 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 +#: src/test.c:793 msgid "test and/or [" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "" -#: src/test.c:858 +#: src/test.c:860 #, fuzzy msgid "missing ']'" msgstr "`]' жетіспейді" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "" @@ -9166,18 +9478,18 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" " or: %s [OPTION]\n" msgstr "" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -9195,7 +9507,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9203,7 +9515,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -9214,7 +9526,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -9229,6 +9541,11 @@ msgstr "" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -9506,12 +9823,12 @@ msgstr "" msgid "Exit with a status code indicating failure." msgstr "" -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -9522,22 +9839,22 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -9545,57 +9862,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "%s: '%s' күні қате\n" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "" @@ -9610,16 +9932,19 @@ msgstr "" 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:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "" @@ -9668,9 +9993,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" #: src/unexpand.c:124 @@ -9712,8 +10035,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -9724,7 +10047,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -9857,11 +10180,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "" - #: src/uptime.c:214 #, c-format msgid "" @@ -9877,12 +10195,16 @@ msgid "" "\n" msgstr "" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +msgid "" +"\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" @@ -9890,12 +10212,12 @@ msgid "" " -l, --lines print the newline counts\n" msgstr "" -#: src/wc.c:128 +#: src/wc.c:134 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" @@ -10043,9 +10365,9 @@ msgid "" "\n" msgstr "" -#: src/whoami.c:91 +#: src/whoami.c:87 #, c-format -msgid "%s: cannot find name for user ID %lu\n" +msgid "cannot find name for user ID %lu" msgstr "" #: src/yes.c:41 @@ -10061,6 +10383,10 @@ msgid "" "\n" msgstr "" +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "\"%s\" ашу сәтсіз аяқталды " + #, fuzzy #~ msgid "reading %s" #~ msgstr "Оқуда" diff --git a/po/ko.gmo b/po/ko.gmo index 8918d2a5..e5da687b 100644 Binary files a/po/ko.gmo and b/po/ko.gmo differ diff --git a/po/ko.po b/po/ko.po index 90924cdb..49102124 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3,11 +3,12 @@ # Bang Jun-Young , 1996-1997. # Changwoo Ryu , 2001-2002. # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: GNU textutils 2.0.22\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2002-07-22 20:02+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -35,18 +36,18 @@ msgstr "올바른 인자는:" msgid "error closing file" msgstr "파일 `%s'을(를) 만듦\n" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "쓰기 오류" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, fuzzy, c-format msgid "preserving permissions for %s" msgstr "%s의 허가를 바꿀 수 없습니다" @@ -237,57 +238,62 @@ msgstr "" msgid "Unknown error" msgstr "알 수 없는 시스템 오류" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: `%s'은(는) 모호한 옵션입니다\n" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: `-W %s'은(는) 모호한 옵션입니다\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: `--%s' 옵션은 인수를 허용하지 않습니다\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: `%c%s' 옵션은 인수를 허용하지 않습니다\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, fuzzy, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: `%s' 옵션은 인수가 필요합니다\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: 인식할 수 없는 옵션 `--%s'\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: 인식할 수 없는 옵션 `%c%s'\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 부적절한 옵션 -- %c\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: 이 옵션은 인수가 필요합니다 -- %c\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: `-W %s'은(는) 모호한 옵션입니다\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' 옵션은 인수를 허용하지 않습니다\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, fuzzy, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: `%s' 옵션은 인수가 필요합니다\n" @@ -297,13 +303,13 @@ msgstr "%s: `%s' 옵션은 인수가 필요합니다\n" msgid "cannot change permissions of %s" msgstr "%s의 허가를 바꿀 수 없습니다" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "메모리가 바닥남" @@ -352,6 +358,12 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: 읽기 오류" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: 읽기 오류" + #: lib/regcomp.c:131 msgid "Success" msgstr "" @@ -466,7 +478,7 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, fuzzy, c-format msgid "setting permissions for %s" msgstr "%s의 허가를 바꿀 수 없습니다" @@ -886,7 +898,7 @@ msgid "" "Base64 encode or decode FILE, or standard input, to standard output.\n" msgstr "" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -896,15 +908,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"<파일>이 주어지지 않거나 - 이면 표준 입력을 읽습니다.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -913,51 +917,51 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "읽기 오류" -#: src/base64.c:231 +#: src/base64.c:229 #, fuzzy, c-format msgid "invalid input" msgstr "부적절한 숫자" -#: src/base64.c:268 +#: src/base64.c:266 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "부적절한 타입의 문자열 `%s'" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, fuzzy, c-format msgid "extra operand %s" msgstr "불필요한 피연산자 `%s'" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, fuzzy, c-format msgid "closing standard input" msgstr "표준 입력" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 #, fuzzy msgid "David MacKenzie" @@ -997,40 +1001,48 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, fuzzy, c-format msgid "missing operand" msgstr "%s: `%c' 뒤에 정수가 와야함" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 #, fuzzy msgid "Richard M. Stallman" msgstr "Torbjorn Granlund 그리고 Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "사용법: %s [<옵션>]... [<파일>]...\n" #: src/cat.c:92 #, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"모든 <파일>(들)을 연결해서 정렬한 결과를 표준 출력에 씁니다.\n" +"\n" +"정렬 옵션은 다음과 같습니다:\n" +"\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1048,7 +1060,7 @@ msgstr "" " -n, --number 모든 출력행의 개수를 셉니다\n" " -s, --squeeze-blank 한줄 이상의 빈 행을 제거합니다\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1060,7 +1072,7 @@ msgstr "" " -u (무시됨)\n" " -v, --show-nonprinting ^ 와 M- 표기법을 사용합니다 (LFD와 TAB 제외)\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1069,17 +1081,18 @@ msgid "" " %s Copy standard input to standard output.\n" msgstr "" -#: src/cat.c:326 +#: src/cat.c:327 #, fuzzy, c-format msgid "cannot do ioctl on %s" msgstr "`%s'에서 ioctl을 할 수 없습니다" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "표준 출력" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: 입력 파일이 출력 파일입니다" @@ -1091,10 +1104,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 #, fuzzy msgid "Jim Meyering" msgstr "Mike Haertel 그리고 Paul Eggert" @@ -1109,8 +1122,8 @@ msgstr "%s의 시간을 유지합니다" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "%s의 시간을 유지합니다" @@ -1125,13 +1138,13 @@ msgstr "" msgid "failed to change context of %s to %s" msgstr "%s의 허가를 바꿀 수 없습니다" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, fuzzy, c-format msgid "cannot access %s" msgstr "`%s'에 chown을 실행할 수 없습니다" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, fuzzy, c-format msgid "cannot read directory %s" msgstr "%s 디렉토리를 만들 수 없습니다" @@ -1147,7 +1160,7 @@ msgstr "%s의 허가를 바꿀 수 없습니다" msgid "fts_read failed" msgstr "파일 읽기 실패" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, fuzzy, c-format msgid "fts_close failed" @@ -1234,7 +1247,7 @@ msgid "-R -h requires -P" msgstr "" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, fuzzy, c-format msgid "missing operand after %s" @@ -1251,9 +1264,8 @@ msgid "conflicting security context specifiers given" msgstr "" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, fuzzy, c-format msgid "failed to get attributes of %s" msgstr "%s의 시간을 유지합니다" @@ -1535,17 +1547,17 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, fuzzy, c-format msgid "invalid group %s" msgstr "잘못된 그룹" -#: src/chroot.c:150 +#: src/chroot.c:152 #, fuzzy, c-format msgid "invalid group list %s" msgstr "잘못된 그룹" -#: src/chroot.c:186 +#: src/chroot.c:185 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1554,60 +1566,72 @@ msgstr "" "사용법: %s [<파일>]...\n" " 혹은: %s [<옵션>]\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" msgstr "" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" msgstr "" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, fuzzy, c-format msgid "cannot change root directory to %s" msgstr "%s 디렉토리로 chdir할 수 없습니다" -#: src/chroot.c:315 +#: src/chroot.c:333 #, fuzzy, c-format msgid "cannot chdir to root directory" msgstr "%s 디렉토리로 chdir할 수 없습니다" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "null 그룹으로 바꿀 수 없습니다" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" +msgid "failed to set supplemental groups" msgstr "null 그룹으로 바꿀 수 없습니다" -#: src/chroot.c:402 +#: src/chroot.c:418 #, fuzzy, c-format msgid "failed to set group-ID" msgstr "사용자와 그룹을 모두 생략할 수는 없습니다" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, fuzzy, c-format msgid "failed to run command %s" msgstr "%s의 시간을 유지합니다" @@ -1648,7 +1672,16 @@ msgstr "사용법: %s [<옵션>]... <파일1> <파일2>\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"<파일>이 주어지지 않거나 - 이면 표준 입력을 읽습니다.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1656,7 +1689,7 @@ msgid "" "and column three contains lines common to both files.\n" msgstr "" -#: src/comm.c:116 +#: src/comm.c:120 #, fuzzy msgid "" "\n" @@ -1670,7 +1703,7 @@ msgstr "" " -2 오른쪽 파일에 유일한 행을 제거합니다\n" " -3 양쪽 파일에 유일한 행을 제거합니다\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1678,17 +1711,17 @@ msgid "" " --nocheck-order do not check that the input is correctly sorted\n" msgstr "" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1697,309 +1730,323 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 -#, c-format -msgid "error reading %s" -msgstr "%s을(를) 읽는 도중 오류 발생" - -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:181 src/copy.c:452 #, fuzzy, c-format msgid "cannot lseek %s" msgstr "%s: 오프셋 %s%s로(으로) 갈 수 없습니다" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" +msgstr "%s을(를) 읽는 도중 오류 발생" + +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 +#, c-format +msgid "error reading %s" +msgstr "%s을(를) 읽는 도중 오류 발생" + +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "%s에 쓰는 도중 오류 발생" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "%s을(를) 읽는 도중 오류 발생" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "%s의 시간을 유지합니다" -#: src/copy.c:383 +#: src/copy.c:478 #, fuzzy, c-format msgid "%s: write failed" msgstr "파일 쓰기 실패" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "%s의 시간을 유지합니다" -#: src/copy.c:687 +#: src/copy.c:789 #, fuzzy, c-format msgid "clearing permissions for %s" msgstr "%s의 허가를 바꿀 수 없습니다" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, fuzzy, c-format msgid "failed to preserve ownership for %s" msgstr "%s의 소유권을 유지합니다" -#: src/copy.c:748 +#: src/copy.c:850 #, fuzzy, c-format msgid "failed to lookup file %s" msgstr "%s의 시간을 유지합니다" -#: src/copy.c:753 +#: src/copy.c:855 #, fuzzy, c-format msgid "failed to preserve authorship for %s" msgstr "%s의 소유권을 유지합니다" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, fuzzy, c-format msgid "failed to set default file creation context to %s" msgstr "%s의 시간을 유지합니다" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "%s의 시간을 유지합니다" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "%s의 시간을 유지합니다" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, fuzzy, c-format msgid "cannot open %s for reading" msgstr "`%s'를 `%s'로 이동할 수 없습니다" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, fuzzy, c-format msgid "cannot fstat %s" msgstr "`%s'의 정보(stat)를 얻을 수 없습니다" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, fuzzy, c-format msgid "cannot remove %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, fuzzy, c-format msgid "removed %s\n" msgstr "%s를 지웁니다\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "" -#: src/copy.c:1070 +#: src/copy.c:1172 #, fuzzy, c-format msgid "cannot create regular file %s" msgstr "임시 파일을 만들 수 없습니다" -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" msgstr "%s의 그룹을 %s로 바꾸는데 실패했습니다\n" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "%s의 시간을 유지합니다" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "%s의 시간을 유지합니다" -#: src/copy.c:1580 +#: src/copy.c:1669 #, fuzzy, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: `%s'에 모드 %04lo으로 겹쳐쓰겠습니까? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, fuzzy, c-format msgid "%s: overwrite %s? " msgstr "%s: `%s'를 겹쳐씁니까? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (백업: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1706 +#: src/copy.c:1795 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, fuzzy, c-format msgid "cannot stat %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/copy.c:1777 +#: src/copy.c:1866 #, fuzzy, c-format msgid "omitting directory %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, fuzzy, c-format msgid "%s and %s are the same file" msgstr "`%s'와 `%s'는 같은 파일입니다" -#: src/copy.c:1939 +#: src/copy.c:2019 #, fuzzy, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "%s 디렉토리로 chdir할 수 없습니다" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, fuzzy, c-format msgid "will not overwrite just-created %s with %s" msgstr "%s: 디렉토리가 아닌 곳에 디렉토리를 겹쳐쓸 수 없습니다" -#: src/copy.c:1975 +#: src/copy.c:2055 #, fuzzy, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/copy.c:1989 +#: src/copy.c:2069 #, fuzzy, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "%s 디렉토리로 chdir할 수 없습니다" -#: src/copy.c:2019 +#: src/copy.c:2099 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "`%s'의 백업은 원래 파일을 손상할 것입니다; `%s'는 이동되지 않습니다" -#: src/copy.c:2020 +#: src/copy.c:2100 #, fuzzy, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "`%s'의 백업은 원래 파일을 손상할 것입니다; `%s'는 복사되지 않습니다" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, fuzzy, c-format msgid "cannot backup %s" msgstr "`%s'를 백업할 수 없습니다" -#: src/copy.c:2107 +#: src/copy.c:2187 #, fuzzy, c-format msgid "will not copy %s through just-created symlink %s" msgstr "%s: 디렉토리가 아닌 곳에 디렉토리를 겹쳐쓸 수 없습니다" -#: src/copy.c:2184 +#: src/copy.c:2264 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, c-format +msgid "warning: source directory %s specified more than once" +msgstr "" + +#: src/copy.c:2294 #, fuzzy, c-format msgid "will not create hard link %s to directory %s" msgstr "%s 디렉토리로 chdir할 수 없습니다" -#: src/copy.c:2258 +#: src/copy.c:2351 #, fuzzy, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "%s 디렉토리로 chdir할 수 없습니다" -#: src/copy.c:2301 +#: src/copy.c:2394 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "`%s'에서 ioctl을 할 수 없습니다" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:2357 +#: src/copy.c:2450 #, fuzzy, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "%s: 심볼릭 링크의 사이클은 복사할 수 없습니다" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s: 현재 디렉토리 안에서만 상대적인 심볼릭 링크를 만들 수 있습니다" -#: src/copy.c:2484 +#: src/copy.c:2577 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/copy.c:2545 +#: src/copy.c:2638 #, fuzzy, c-format msgid "cannot create special file %s" msgstr "문자 특수 파일" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "심볼릭 링크" -#: src/copy.c:2583 +#: src/copy.c:2676 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/copy.c:2615 +#: src/copy.c:2708 #, fuzzy, c-format msgid "%s has unknown file type" msgstr "%s: 알 수 없는 파일형" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, fuzzy, c-format msgid "cannot un-backup %s" msgstr "`%s'의 백업을 되돌릴 수 없습니다" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (백업 해제)\n" @@ -2009,25 +2056,25 @@ msgstr "%s -> %s (백업 해제)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, c-format msgid "unknown program %s" msgstr "" @@ -2333,8 +2380,8 @@ msgstr "%s이(가) 존재하지만 디렉토리가 아닙니다" msgid "failed to access %s" msgstr "`%s'에 chown을 실행할 수 없습니다" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, fuzzy, c-format msgid "missing file operand" msgstr "인수를 건너 뜀" @@ -2406,131 +2453,131 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "입력이 사라짐" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: 범위를 벗어난 행 번호" -#: src/csplit.c:713 +#: src/csplit.c:714 #, fuzzy, c-format msgid "%s: %s: line number out of range" msgstr "%s: `%s': 범위를 벗어난 행 번호" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, fuzzy, c-format msgid " on repetition %s\n" msgstr " %d 번째 반복중\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, fuzzy, c-format msgid "%s: %s: match not found" msgstr "%s: `%s': 맞는 짝을 찾지 못했음" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "정규식 탐색에 오류 발생" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, fuzzy, c-format msgid "write error for %s" msgstr "`%s'에 쓰기 오류" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, fuzzy, c-format msgid "%s: integer expected after delimiter" msgstr "%s: `%c' 뒤에 정수가 와야함" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: 반복 횟수에 `}'가 필요합니다" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: `{'과 `}' 사이에 정수가 필요함" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: 닫는 구분자 `%c'이(가) 없습니다" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: 부적절한 정규식: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: 부적절한 패턴" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: 행번호는 영보다 커야 합니다" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, fuzzy, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "행번호 `%s'이(가) 앞선 행번호 %s보다 작습니다" -#: src/csplit.c:1200 +#: src/csplit.c:1201 #, fuzzy, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "경고: 행번호 `%s'이(가) 앞선 행번호와 같습니다" -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "접미사에 변환 지정자가 빠졌음" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "접미사에 부적절한 변환 지정자: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "접미사에 부적절한 변환 지정자: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "접미사에 부적절한 변환 지정자: %c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "접미사에 %% 변환 지정자가 너무 많음" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "접미사에 %% 변환 지정자가 빠졌음" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: 부적절한 숫자" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "부적절한 숫자" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "사용법: %s [<옵션>]... <파일> <패턴>...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 #, fuzzy msgid "" "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n" @@ -2540,7 +2587,17 @@ msgstr "" "에\n" "출력하고, 각 조각들의 바이트 수를 표준 출력으로 출력합니다.\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"<파일>이 `-'이면 표준 입력을 읽습니다. 각 <패턴>에는 다음을 쓸 수 있습니" +"다:\n" + +#: src/csplit.c:1492 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2551,11 +2608,11 @@ msgstr "" " -f, --prefix=<접두어> `xx' 대신에 <접두어>를 씁니다\n" " -k, --keep-files 오류 발생시에도 출력 파일들을 지우지 않습니다\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2565,19 +2622,11 @@ msgstr "" " -s, --quiet, --silent 출력 파일의 크기를 표시하지 않습니다\n" " -z, --elide-empty-files 빈 출력 파일을 지웁니다\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"<파일>이 `-'이면 표준 입력을 읽습니다. 각 <패턴>에는 다음을 쓸 수 있습니" -"다:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 #, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2612,7 +2661,7 @@ msgstr "" "각 <파일>에서 선택한 줄들만 표준 출력에 표시합니다.\n" "\n" -#: src/cut.c:182 +#: src/cut.c:183 #, fuzzy msgid "" " -b, --bytes=LIST select only these bytes\n" @@ -2623,7 +2672,7 @@ msgstr "" " -c, --characters=<리스트> 이 문자들만을 표시합니다\n" " -d, --delimiter=<구분자> 필드 구분자로 탭 대신에 <구분자>를 씁니다\n" -#: src/cut.c:187 +#: src/cut.c:188 #, fuzzy msgid "" " -f, --fields=LIST select only these fields; also print any line\n" @@ -2636,7 +2685,7 @@ msgstr "" " 출력합니다\n" " -n (무시됨)\n" -#: src/cut.c:193 +#: src/cut.c:194 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2646,7 +2695,7 @@ msgstr "" "로\n" " 출력합니다\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2656,7 +2705,7 @@ msgstr "" " --output-delimiter=<문자열> <문자열>을 출력 구분자로 사용합니다\n" " 기본값은 입력 구분자로 사용하는 것입니다\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2664,7 +2713,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:210 +#: src/cut.c:211 #, fuzzy msgid "" "Each range is one of:\n" @@ -2673,8 +2722,6 @@ msgid "" " 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 "" "\n" "-b, -c 혹은 -f 중에서 한 개만을 쓰십시오. 각 <리스트>는 하나의 범위, \n" @@ -2687,54 +2734,54 @@ msgstr "" "\n" "<파일>이 주어지지 않거나, <파일>이 `-'이면, 표준 입력을 읽습니다.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "부적절한 바이트나 필드 목록" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "" -#: src/cut.c:320 +#: src/cut.c:319 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "부적절한 폭 옵션 `%s'" -#: src/cut.c:334 -#, fuzzy +#: src/cut.c:333 src/numfmt.c:1417 +#, fuzzy, c-format msgid "invalid decreasing range" msgstr "부적절한 타입의 문자열 `%s'" -#: src/cut.c:383 +#: src/cut.c:382 #, fuzzy, c-format msgid "byte offset %s is too large" msgstr "%s은(는) 너무 큽니다" -#: src/cut.c:386 +#: src/cut.c:385 #, fuzzy, c-format msgid "field number %s is too large" msgstr "필드 개수가 0입니다" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "오직 한가지 형태의 목록만이 지정될 수 있습니다" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "구획 문자는 단일 문자여야 합니다" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "바이트, 문자, 또는 필드로 된 목록을 지정해야 합니다" -#: src/cut.c:790 +#: src/cut.c:789 #, fuzzy msgid "an input delimiter may be specified only when operating on fields" msgstr "필드에 대해 연산할 때에만 구획 문자가 지정될 수 있습니다" -#: src/cut.c:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2742,11 +2789,11 @@ msgstr "" "구분자가 없는 줄을 무시하는 것은\n" "\t필드에 관해 동작하는 경우에만 이치에 맞습니다" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "필드의 목록이 빠졌음" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "위치의 목록이 빠졌음" @@ -2763,34 +2810,48 @@ 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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" + +#: src/date.c:138 +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" -#: src/date.c:142 +#: src/date.c:145 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" -#: src/date.c:147 +#: src/date.c:149 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" +msgstr "" + +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" msgstr "" #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2798,7 +2859,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2806,7 +2867,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2814,14 +2875,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:177 +#: src/date.c:183 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 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2829,7 +2890,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2837,7 +2898,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2848,7 +2909,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2856,7 +2917,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:209 +#: src/date.c:215 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" @@ -2864,7 +2925,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2872,7 +2933,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2884,7 +2945,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2895,7 +2956,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2904,7 +2965,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -2918,35 +2979,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "표준 입력" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, fuzzy, c-format msgid "invalid date %s" msgstr "부적절한 폭: `%s'" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "" -#: src/date.c:430 +#: src/date.c:436 #, fuzzy, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "--string과 --check 옵션은 상호 배타적입니다" -#: src/date.c:437 +#: src/date.c:443 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" -#: src/date.c:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2954,23 +3015,23 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:535 +#: src/date.c:541 #, fuzzy, c-format msgid "cannot set date" msgstr "`%s'의 정보(stat)를 얻을 수 없습니다" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "" -#: src/dd.c:527 +#: src/dd.c:556 #, fuzzy, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2979,7 +3040,7 @@ msgstr "" "사용법: %s [<파일>]...\n" " 혹은: %s [<옵션>]\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -2990,7 +3051,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:570 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2999,11 +3060,13 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3014,7 +3077,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:561 +#: src/dd.c:592 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3039,7 +3102,7 @@ msgstr "" " swab 입력하는 두 바이트의 순서를 바꿉니다\n" " sync ibs크기의 입력 레코드를 크기가 맞지 않으면 NUL로 채웁니다\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3055,7 +3118,7 @@ msgstr "" " fdatasync physically write output file data before finishing\n" " fsync likewise, but also write metadata\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3064,124 +3127,104 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:593 +#: src/dd.c:624 #, fuzzy msgid " directory fail unless a directory\n" msgstr "%s이(가) 존재하지만 디렉토리가 아닙니다" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 +#: src/dd.c:661 #, 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:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" - -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:754 -#, fuzzy, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "잘린 레코드" -msgstr[1] "잘린 레코드" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "" @@ -3195,168 +3238,182 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr "" -#: src/dd.c:877 +#: src/dd.c:809 +#, c-format +msgid ", %.6f s, %s/s" +msgstr "" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" + +#: src/dd.c:834 +#, fuzzy, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "잘린 레코드" +msgstr[1] "잘린 레코드" + +#: src/dd.c:920 #, fuzzy, c-format msgid "closing input file %s" msgstr "파일 `%s'을(를) 만듦\n" -#: src/dd.c:884 +#: src/dd.c:927 #, fuzzy, c-format msgid "closing output file %s" msgstr "%s를 지웁니다\n" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, fuzzy, c-format msgid "writing to %s" msgstr "%s에 쓰는 도중 오류 발생" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, fuzzy, c-format msgid "unrecognized operand %s" msgstr "인식할 수 없는 옵션 `-%c'" -#: src/dd.c:1285 +#: src/dd.c:1376 #, fuzzy msgid "invalid conversion" msgstr "부적절한 폭 옵션 `%s'" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 #, fuzzy msgid "invalid input flag" msgstr "필드 처음에 부적절한 숫자" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 #, fuzzy msgid "invalid output flag" msgstr "잘못된 그룹" -#: src/dd.c:1294 +#: src/dd.c:1385 #, fuzzy -msgid "invalid status flag" +msgid "invalid status level" msgstr "잘못된 사용자" -#: src/dd.c:1333 src/truncate.c:310 -#, fuzzy, c-format -msgid "invalid number %s" -msgstr "부적절한 숫자" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1417 +#: src/dd.c:1520 #, fuzzy, c-format msgid "cannot combine block and unblock" msgstr "사용자와 그룹을 모두 생략할 수는 없습니다" -#: src/dd.c:1419 +#: src/dd.c:1522 #, fuzzy, c-format msgid "cannot combine lcase and ucase" msgstr "비교한 문자열은 %s과(와) %s입니다." -#: src/dd.c:1421 +#: src/dd.c:1524 #, fuzzy, c-format msgid "cannot combine excl and nocreat" msgstr "%s에 대한 파일 포인터를 재위치할 수 없습니다" -#: src/dd.c:1424 +#: src/dd.c:1527 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "%s에 대한 파일 포인터를 재위치할 수 없습니다" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" " of mt_type=0x%0lx -- see for the list of types" msgstr "" -#: src/dd.c:1670 +#: src/dd.c:1773 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: 돌아갈 수 없습니다" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, fuzzy, c-format msgid "%s: cannot seek" msgstr "%s: 지울 수 없습니다" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1756 +#: src/dd.c:1859 #, fuzzy, c-format msgid "warning: invalid file offset after failed read" msgstr "경고: 부적절한 폭 %lu; 대신 %d을(를) 사용함" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1903 +#: src/dd.c:2006 #, fuzzy, c-format msgid "setting flags for %s" msgstr "%s의 시간을 유지합니다" -#: src/dd.c:1957 +#: src/dd.c:2060 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: 상대 오프셋 %s%s로(으로) 갈 수 없습니다" -#: src/dd.c:2172 +#: src/dd.c:2288 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "%s를 지웁니다\n" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, fuzzy, c-format msgid "failed to open %s" msgstr "%s의 시간을 유지합니다" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2306 +#: src/dd.c:2422 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "%s를 지웁니다\n" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, fuzzy, c-format msgid "failed to discard cache for: %s" msgstr "%s의 시간을 유지합니다" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "" @@ -3437,12 +3494,12 @@ msgstr "" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3450,18 +3507,18 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3470,20 +3527,34 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:1409 +#: src/df.c:1429 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" +msgstr "" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose 진단 내용을 각 출력 파일을 열기 직전에 표준 오류" +"로\n" +" 출력합니다\n" + +#: src/df.c:1439 +msgid "" " -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:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3491,26 +3562,26 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, fuzzy, c-format msgid "options %s and %s are mutually exclusive" msgstr "--string과 --check 옵션은 상호 배타적입니다" -#: src/df.c:1610 +#: src/df.c:1636 #, fuzzy, c-format msgid "file system type %s both selected and excluded" msgstr "파일시스템 `%s'를 동시에 선택하고 제외할 수 없습니다" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "경고: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 #, fuzzy msgid "cannot read table of mounted file systems" msgstr "%s: 마운트된 파일시스템의 테이블은 읽을 수 없습니다" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "" @@ -3617,7 +3688,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3627,7 +3698,8 @@ msgstr "" " 또는: %s --traditional [<파일>] [[+]<옵셋> [[+]<레이블>]]\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" #: src/du.c:291 @@ -3711,62 +3783,56 @@ msgstr "" msgid "Infinity" msgstr "" -#: src/du.c:636 +#: src/du.c:657 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "파일 읽기 실패" -#: src/du.c:787 +#: src/du.c:808 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "부적절한 폭: `%s'" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "부적절한 행번호 증가: `%s'" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "모든 디렉토리 내용을 표시하면서 요약할 수는 없습니다" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "경고: 요약은 --max-depth=0을 사용하는 것과 같습니다" -#: src/du.c:911 +#: src/du.c:932 #, fuzzy, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "경고: --max-depth=%d는 요약 옵션과 충돌합니다" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: 읽기 오류" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 #, fuzzy msgid "invalid zero-length file name" msgstr "잘못된 그룹" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "합계" @@ -3880,9 +3946,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "각 <파일>들의 탭을 공백으로 바꾸고, 표준 출력에 씁니다.\n" "<파일>이 주어지지 않거나, <파일>이 `-'이면, 표준 입력을 읽습니다.\n" @@ -3929,7 +3993,7 @@ msgid "input line is too long" msgstr "%s: 파일이 너무 깁니다" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "" @@ -4037,12 +4101,12 @@ msgstr "정규식 탐색에 오류 발생" msgid "non-integer argument" msgstr "인수 제한" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "이 문제를 피해 가려면 LC_ALL='C'하십시오." @@ -4053,31 +4117,31 @@ msgid "the strings compared were %s and %s" msgstr "비교한 문자열은 %s과(와) %s입니다." #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, fuzzy, c-format msgid "%s is not a valid positive integer" msgstr "%s: 부적절한 패턴" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s은(는) 너무 큽니다" -#: src/factor.c:2438 +#: src/factor.c:2528 #, fuzzy, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4086,7 +4150,7 @@ msgstr "" "사용법: %s [<파일>]...\n" " 혹은: %s [<옵션>]\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -4130,7 +4194,7 @@ msgstr "" "\n" # refill을 뭐라고 번역? -- 줄이 남을 때 아래 문장의 일부를 갖다 붙이는 것 -#: src/fmt.c:278 +#: src/fmt.c:279 #, fuzzy msgid "" " -c, --crown-margin preserve indentation of first two lines\n" @@ -4142,7 +4206,7 @@ msgstr "" " -p, --prefix=<문자열> <문자열>을 접두어로 가진 줄만을 결합합니다\n" " -s, --split-only 긴 줄을 나누되, 채워 넣지는 않습니다\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, fuzzy, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4155,30 +4219,28 @@ msgstr "" "백\n" " -w, --width=<개수> 한 줄의 최대 폭 (기본값은 75열)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, 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 -#, fuzzy, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "부적절한 폭: `%s'" # wrap을 뭐라고 한다? -#: src/fold.c:70 +#: src/fold.c:69 #, fuzzy -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "각 <파일>에서 (기본값은 표준입력에서) 입력된 줄을 나눠서, 표준 출력에\n" "씁니다.\n" "\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4188,9 +4250,9 @@ msgstr "" " -s, --spaces 공백에서 줄을 나눕니다\n" " -w, --width=<폭> 80열 대신에 <폭>열을 이용합니다\n" -#: src/fold.c:288 src/pr.c:832 -#, fuzzy, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "부적절한 열의 개수: `%s'" #. This is a proper name. See the gettext manual, section Names. @@ -4257,12 +4319,11 @@ msgstr "사용자와 그룹을 모두 생략할 수는 없습니다" msgid "%s: no such user" msgstr "" -#: src/head.c:109 +#: src/head.c:110 #, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "각 <파일>의 맨 첫 10줄을 표준 출력에 표시합니다.\n" "두 개 이상의 <파일>의 경우, 각각의 파일마다 파일이름을 나타내는 헤더를 먼" @@ -4271,7 +4332,7 @@ msgstr "" "다.\n" "\n" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4281,7 +4342,7 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4289,7 +4350,7 @@ msgstr "" " -q, --quiet, --silent 파일이름을 나타내는 헤더를 표시하지 않습니다\n" " -v, --verbose 언제나 파일이름을 나타내는 헤더를 표시합니다\n" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4297,48 +4358,36 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:237 src/head.c:1052 -#, fuzzy, c-format -msgid "%s: number of bytes is too large" -msgstr "비교할 바이트의 개수가 부적절합니다" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, fuzzy, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: 오프셋 %s%s로(으로) 갈 수 없습니다" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, fuzzy, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: 상대 오프셋 %s%s로(으로) 갈 수 없습니다" -#: src/head.c:886 -#, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "%s: %s은(는) 너무 커서 표시할 수 없습니다" - -#: src/head.c:887 -msgid "number of lines" -msgstr "행의 개수" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "바이트 수" +#: src/head.c:267 +#, fuzzy, c-format +msgid "%s: number of bytes is too large" +msgstr "비교할 바이트의 개수가 부적절합니다" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "부적절한 행의 개수" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "%s: 부적절한 바이트 수" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "%s: 부적절한 옵션 -- %c\n" @@ -4505,7 +4554,7 @@ msgstr "%s의 허가를 바꿀 수 없습니다" msgid "cannot set time stamps for %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, fuzzy, c-format msgid "fork system call failed" msgstr "블록 특수 파일" @@ -4624,7 +4673,7 @@ msgstr "strip옵션은 디렉토리를 설치할 때는 쓸 수 없습니다" msgid "target directory not allowed when installing a directory" msgstr "strip옵션은 디렉토리를 설치할 때는 쓸 수 없습니다" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, fuzzy, c-format msgid "invalid mode %s" msgstr "부적절한 폭: `%s'" @@ -4657,13 +4706,17 @@ msgstr "" msgid "Mike Haertel" msgstr "Mike Haertel 그리고 Paul Eggert" -# -a SIDE, -e EMPTY 재고려 #: src/join.c:195 -#, 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" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +# -a SIDE, -e EMPTY 재고려 +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -4677,7 +4730,7 @@ msgstr "" " -a <사이드> <사이드> 파일에서 쌍을 지울 수 없는 줄을 출력합니다\n" " -e <엠프티> 입력 필드가 없는 곳에 <엠프티>를 씁니다.\n" -#: src/join.c:204 +#: src/join.c:210 #, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" @@ -4692,7 +4745,7 @@ msgstr "" " -o <형식> 출력 줄을 만들 때 <형식>을 따릅니다\n" " -t <문자> 입력 및 출력 필드 구분자로 <문자>를 사용합니다\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -4704,12 +4757,12 @@ msgid "" " print them without trying to pair them\n" msgstr "" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 #, fuzzy msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr " -z, --zero-terminated 줄의 끝에 줄바꿈 대신 바이트 0을 씁니다\n" -#: src/join.c:225 +#: src/join.c:231 #, fuzzy msgid "" "\n" @@ -4737,47 +4790,47 @@ msgstr "" "<형식> 출력으로, join 필드, <파일1>에 남아 있는 필드, <파일2>에 남아 있는 \n" "필드의 순서대로 각각은 <문자>에 구분되어 출력됩니다.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, fuzzy, c-format msgid "invalid field number: %s" msgstr "부적절한 필드 번호: `%s'" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, fuzzy, c-format msgid "invalid field specifier: %s" msgstr "부적절한 필드 지정자: `%s'" -#: src/join.c:884 +#: src/join.c:890 #, fuzzy, c-format msgid "invalid file number in field spec: %s" msgstr "필드 지정에 부적절한 파일 번호: `%s'" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, fuzzy, c-format msgid "multi-character tab %s" msgstr "여러 문자로 된 탭 `%s'" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "두 파일이 모두 표준 입력이면 안 됩니다" @@ -4841,17 +4894,17 @@ msgstr "" msgid "no process ID specified" msgstr "" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, fuzzy, c-format msgid "invalid buffering mode %s for %s\n" msgstr "%2$s에 대해 부적절한 인자 %1$s" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -5003,7 +5056,7 @@ msgstr "%s 디렉토리를 만들 수 없습니다" msgid "FIXME: unknown" msgstr "" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, fuzzy, c-format msgid "Usage: %s [OPTION]\n" msgstr "사용법: %s [<옵션>] [<파일>]...\n" @@ -5014,7 +5067,7 @@ msgid "" "\n" msgstr "" -#: src/logname.c:84 +#: src/logname.c:79 #, fuzzy, c-format msgid "no login name" msgstr "%s: 부적절한 숫자" @@ -5024,7 +5077,7 @@ msgstr "%s: 부적절한 숫자" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 #, fuzzy msgid "%b %e %Y" msgstr " %Y %b %e %H:%M" @@ -5034,102 +5087,102 @@ msgstr " %Y %b %e %H:%M" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 #, fuzzy msgid "%b %e %H:%M" msgstr " %Y %b %e %H:%M" -#: src/ls.c:1590 -#, fuzzy, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "환경변수 COLUMNS의 값에 다음의 잘못된 폭이 지정되었습니다: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "환경변수 COLUMNS의 값에 다음의 잘못된 폭이 지정되었습니다: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "환경변수 TABSIZE의 값에 다음의 잘못된 탭 크기가 지정되었습니다: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, fuzzy, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "부적절한 폭: `%s'" -#: src/ls.c:1834 -#, fuzzy, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "부적절한 타입의 문자열 `%s'" -#: src/ls.c:2043 +#: src/ls.c:2021 #, fuzzy, c-format msgid "invalid time style format %s" msgstr "%2$s에 대해 부적절한 인자 %1$s" -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "올바른 인자는:" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "" -#: src/ls.c:2450 +#: src/ls.c:2428 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "인식할 수 없는 옵션 `-%c'" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "LS_COLORS환경변수의 해석할 수 없는 값" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, fuzzy, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "환경변수 COLUMNS의 값에 다음의 잘못된 폭이 지정되었습니다: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, fuzzy, c-format msgid "cannot open directory %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/ls.c:2572 +#: src/ls.c:2569 #, fuzzy, c-format msgid "cannot determine device and inode of %s" msgstr "%s에 대한 파일 포인터를 재위치할 수 없습니다" -#: src/ls.c:2581 +#: src/ls.c:2578 #, fuzzy, c-format msgid "%s: not listing already-listed directory" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, fuzzy, c-format msgid "reading directory %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/ls.c:2673 +#: src/ls.c:2670 #, fuzzy, c-format msgid "closing directory %s" msgstr "%s 디렉토리로 chdir할 수 없습니다" -#: src/ls.c:3362 +#: src/ls.c:3355 #, fuzzy, c-format msgid "cannot compare file names %s and %s" msgstr "비교한 문자열은 %s과(와) %s입니다." -#: src/ls.c:4781 +#: src/ls.c:4775 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:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5138,7 +5191,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5152,18 +5205,19 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4798 msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5173,11 +5227,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5186,7 +5240,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5194,7 +5248,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5207,7 +5261,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5219,7 +5273,7 @@ msgid "" " -k, --kibibytes default to 1024-byte blocks for disk usage\n" msgstr "" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5229,7 +5283,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5240,7 +5294,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4871 +#: src/ls.c:4866 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" @@ -5283,7 +5337,7 @@ msgstr "" " -R, --recursive 서브디렉토리까지 출력합니다\n" " -s, --size 각 파일의 블록 크기를 출력합니다\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5291,21 +5345,21 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4886 +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -5319,36 +5373,37 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4908 +#: src/ls.c:4904 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:4912 +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -f, --fields=<리스트> 이 필드만을 출력합니다; 또 -s 옵션이 사용되지\n" " 않았다면 구분자 문자가 들어 있지 않은 줄도\n" " 출력합니다\n" " -n (무시됨)\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5357,7 +5412,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5387,47 +5442,52 @@ msgstr "" 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 "" "사용법: %s [<옵션>] [<파일>]...\n" " 혹은: %s [<옵션>] --check [<파일>]\n" "%s (%d비트) 체크섬을 표시하거나 검사합니다.\n" "<파일>이 주어지지 않거나, <파일>이 `-'이면, 표준 입력을 읽습니다.\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" +"\n" +" -B, --binary 콘솔 장치에 이진 데이타를 씁니다\n" +"\n" -#: src/md5sum.c:178 +#: src/md5sum.c:180 #, fuzzy -msgid " -b, --binary read in binary mode\n" +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr "" "\n" " -B, --binary 콘솔 장치에 이진 데이타를 씁니다\n" "\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:195 +#: src/md5sum.c:198 #, fuzzy msgid "" "\n" @@ -5445,14 +5505,15 @@ msgstr "" " -w, --warn 틀린 형식의 체크섬 줄에 대해 경고합니다\n" "\n" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "체크섬은 %s에 기술된 대로 계산됩니다. 검사할 때, 입력은 이 \n" @@ -5460,87 +5521,87 @@ msgstr "" "나타내는 문자 (이진 파일은 `*', 문서 파일은 ` '), 그리고 각 <파일>의 \n" "이름입니다.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, fuzzy, c-format msgid "%s: too many checksum lines" msgstr "%s: 올바른 형식을 갖춘 %s 체크섬 행을 찾지 못했음" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, fuzzy, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %lu: 올바르지 않은 형식을 갖춘 %s 체크섬 행" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: 열기 또는 읽기 실패\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "실패" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "성공" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: 올바른 형식을 갖춘 %s 체크섬 행을 찾지 못했음" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, fuzzy, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % 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:645 +#: src/md5sum.c:648 #, fuzzy, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "경고: 계산된 %2$d개의 %3$s 중에서 %1$d 개가 서로 일치하지 않습니다" msgstr[1] "경고: 계산된 %2$d개의 %3$s 중에서 %1$d 개가 서로 일치하지 않습니다" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, fuzzy, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "--status 옵션은 오직 체크섬을 검사할 때만 의미가 있습니다" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "--binary와 --text 옵션은 오직 체크섬을 검사할 때만 의미가 있습니다" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "--status 옵션은 오직 체크섬을 검사할 때만 의미가 있습니다" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "--warn 옵션은 오직 체크섬을 검사할 때만 의미가 있습니다" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, fuzzy, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "--status 옵션은 오직 체크섬을 검사할 때만 의미가 있습니다" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "--status 옵션은 오직 체크섬을 검사할 때만 의미가 있습니다" @@ -5579,22 +5640,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "%s의 시간을 유지합니다" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "%s의 시간을 유지합니다" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, fuzzy, c-format msgid "created directory %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -5786,7 +5847,7 @@ msgstr "인수가 너무 많음" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" @@ -5916,9 +5977,7 @@ 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" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "각 <파일>을 줄번호를 붙여서 표준 출력에 씁니다.\n" "<파일>이 주어지지 않거나, <파일>이 `-'이면, 표준 입력을 읽습니다.\n" @@ -6027,27 +6086,27 @@ msgstr "부적절한 숫자" msgid "invalid footer numbering style: %s" msgstr "필드 지정에 부적절한 파일 번호: `%s'" -#: src/nl.c:503 -#, fuzzy, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "부적절한 시작 행번호: `%s'" -#: src/nl.c:512 -#, fuzzy, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "부적절한 행번호 증가: `%s'" -#: src/nl.c:524 -#, fuzzy, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "부적절한 빈줄의 개수: `%s'" -#: src/nl.c:538 -#, fuzzy, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "부적절한 행번호 필드 폭: `%s'" -#: src/nl.c:557 +#: src/nl.c:531 #, fuzzy, c-format msgid "invalid line numbering format: %s" msgstr "부적절한 행번호 증가: `%s'" @@ -6071,7 +6130,7 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6083,43 +6142,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "두 파일이 모두 표준 입력이면 안 됩니다" -#: src/nohup.c:131 +#: src/nohup.c:129 #, fuzzy, c-format msgid "ignoring input" msgstr "인수가 너무 많음" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "" -#: src/nohup.c:176 +#: src/nohup.c:174 #, fuzzy, c-format msgid "appending output to %s" msgstr "%s의 소유자 그리고/혹은 그룹을 바꿀 수 없습니다" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "" @@ -6141,96 +6200,93 @@ msgid "" " --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: 부적절한 행의 개수" - #. This is a proper name. See the gettext manual, section Names. -#: src/numfmt.c:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "부적절한 숫자" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "부적절한 폭: `%s'" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "%s의 시간을 유지합니다" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "부적절한 타입의 문자열 `%s'" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "사용법: %s [<옵션>]... [<파일>]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6238,19 +6294,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -6260,40 +6316,40 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" msgstr "" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6302,7 +6358,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -6310,7 +6366,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -6318,7 +6374,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -6326,7 +6382,30 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"\n" +"-b, -c 혹은 -f 중에서 한 개만을 쓰십시오. 각 <리스트>는 하나의 범위, \n" +"혹은 쉼표로 구분된 여러 개의 범위입니다. 각 범위는 다음 중 하나입니다:\n" +"\n" +" N N번째 바이트, 문자, 혹은 필드, 1부터 시작합니다\n" +" N- N번째 바이트, 문자, 혹은 필드부터 줄 끝까지\n" +" N-M N번째부터 M번째 바이트, 문자, 혹은 필드까지 (N, M번째 포함)\n" +" -M 처음부터 M번째 바이트, 문자, 혹은 필드까지 (M번째 포함)\n" +"\n" +"<파일>이 주어지지 않거나, <파일>이 `-'이면, 표준 입력을 읽습니다.\n" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -6335,9 +6414,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -6349,7 +6429,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -6364,118 +6444,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "%2$s에 대해 부적절한 인자 %1$s" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "부적절한 폭 옵션 `%s'" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "부적절한 폭: `%s'" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 #, c-format -msgid "value too large to be printed: '%Lg' (consider using --to)" +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1210 #, c-format -msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1219 #, c-format -msgid "large input value %s: possible precision loss" +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1308 +#: src/numfmt.c:1305 #, c-format -msgid "input line is too short, no numbers found to convert in field %ld" +msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1403 +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "부적절한 필드 번호: `%s'" + +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "부적절한 폭: `%s'" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "부적절한 필드 번호: `%s'" +msgid "multiple field specifications" +msgstr "%s: 부적절한 필드 지정 `%s'" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "부적절한 폭: `%s'" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "접미사에 변환 지정자가 빠졌음" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "%s을(를) 읽는 도중 오류 발생" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "" -#: src/od.c:320 +#: src/od.c:321 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6486,14 +6578,13 @@ msgstr "" "사용법: %s [<옵션>]... [<파일>]...\n" " 또는: %s --traditional [<파일>] [[+]<옵셋> [[+]<레이블>]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "<파일>의 내용을, 기본값으로는 8진수 바이트값으로, 표준 출력에 씁니다.\n" @@ -6503,9 +6594,10 @@ msgstr "" "\n" # 8진수 suffix에 대해서 좀 이상하다 -#: src/od.c:333 +#: src/od.c:335 #, 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" @@ -6525,7 +6617,7 @@ msgstr "" " a 문자 이름\n" " c ASCII 문자 혹은 백슬래쉬 이스케이프\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -6534,7 +6626,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 #, fuzzy msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" @@ -6556,7 +6648,7 @@ msgstr "" " -w, --width[=<바이트>] 출력의 한 줄에 <바이트> 바이트를 출력합니다\n" " --traditional 고전적인 형식으로 인자를 받습니다\n" -#: src/od.c:363 +#: src/od.c:366 #, fuzzy msgid "" "\n" @@ -6574,7 +6666,7 @@ msgstr "" " -c `-t c'와 동일하고, ASCII 문자 혹은 백슬래쉬 이스케이프로 지정합니다\n" " -d `-t u2'와 동일하고, 10진수 unsigned short로 지정합니다\n" -#: src/od.c:372 +#: src/od.c:375 #, fuzzy msgid "" " -f same as -t fF, select floats\n" @@ -6591,7 +6683,7 @@ msgstr "" " -o -t o2와 동일하고, 8진수 short를 선택합니다\n" " -x -t x2와 동일하고, 16진수 short를 선택합니다\n" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -6600,7 +6692,7 @@ msgid "" " c printable character or backslash escape\n" msgstr "" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6614,7 +6706,7 @@ msgstr "" " u[<크기>] 부호없는 10진수, 각 숫자마다 <크기> 바이트\n" " x[<크기>] 16진수, 각 숫자마다 <크기> 바이트\n" -#: src/od.c:394 +#: src/od.c:397 #, fuzzy msgid "" "\n" @@ -6629,14 +6721,14 @@ msgstr "" "<타입>이 f인 경우 <크기>는 sizeof(float)이 되고, D는 sizeof(double), L은\n" "(long double)이 됩니다.\n" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -6649,12 +6741,12 @@ msgid "" "and so on for G, T, P, E, Z, Y.\n" msgstr "" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, fuzzy, c-format msgid "invalid type string %s" msgstr "부적절한 타입의 문자열 `%s'" -#: src/od.c:690 +#: src/od.c:693 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6663,7 +6755,7 @@ msgstr "" "부적절한 형 문자열 `%s';\n" "이 시스템은 %lu 바이트 정수형을 제공하지 않습니다" -#: src/od.c:811 +#: src/od.c:814 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6672,39 +6764,39 @@ msgstr "" "부적절한 형 문자열 `%s';\n" "이 시스템은 %lu 바이트 부동소수점형을 제공하지 않습니다" -#: src/od.c:869 +#: src/od.c:872 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "부적절한 문자 %c' -- 형 문자열 `%s'" # combined input 번역 개선 -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "결합된 입력의 끝을 넘어갈 수는 없습니다." -#: src/od.c:1650 +#: src/od.c:1658 #, fuzzy, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" "출력 주소 기수 `%c'이(가) 부적절합니다; [odxn]중의 하나의 문자이어야 합니다" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "문자열을 덤프할 때에는 타입이 지정되면 안됩니다" -#: src/od.c:1863 +#: src/od.c:1871 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "호환 모드에서는 최대 셋까지의 인수만을 지정할 수 있습니다" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "경고: 부적절한 폭 %lu; 대신 %d을(를) 사용함" @@ -6724,7 +6816,6 @@ msgstr "표준 입력이 닫혔음" 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 "" "순서대로 각 <파일>에서 대응되는 줄들을, TAB으로 구분되어 구성해, 표준\n" "출력으로 출력합니다.\n" @@ -6864,12 +6955,12 @@ msgstr "" msgid "Where" msgstr "" -#: src/pinky.c:495 +#: src/pinky.c:494 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "사용법: %s [<옵션>]... [<파일>]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6879,7 +6970,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6888,7 +6979,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -6896,100 +6987,100 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:597 +#: src/pinky.c:596 #, fuzzy, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "--string을 사용할 땐 파일이 지정될 수 없습니다" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 #, fuzzy msgid "Roland Huebner" msgstr "Pete TerMaat 그리고 Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "`--pages=<첫_페이지>[:<끝_페이지>]' 인수가 없습니다" -#: src/pr.c:910 +#: src/pr.c:907 #, fuzzy, c-format msgid "invalid page range %s" msgstr "부적절한 타입의 문자열 `%s'" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "`-l 페이지_길이' 부적절한 행의 개수: `%s'" -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "`-N 번호' 부적절한 시작 행 번호: `%s'" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "`-o 여백' 부적절한 행 옵셋: `%s'" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "`-l 페이지_폭' 부적절한 문자 개수: `%s'" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "`-l 페이지_폭' 부적절한 문자 개수: `%s'" -#: src/pr.c:1096 +#: src/pr.c:1059 #, fuzzy, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "병렬로 인쇄할 때에는 열의 개수를 지정할 수 없습니다." -#: src/pr.c:1100 +#: src/pr.c:1063 #, fuzzy, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "병렬 인쇄와 열에 걸쳐서 인쇄하는 것을 동시에 지정할 수는 없습니다>" -#: src/pr.c:1196 +#: src/pr.c:1166 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "`-%c' 인자에서 불필요한 문자 혹은 부적절한 숫자가 들어 있습니다: `%s'" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "페이지 폭이 너무 좁음" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" -#: src/pr.c:2380 +#: src/pr.c:2350 #, fuzzy, c-format msgid "page number overflow" msgstr "필드 개수가 0입니다" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "" -#: src/pr.c:2757 +#: src/pr.c:2727 #, fuzzy msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "<파일>(들)을 페이지별로 나누거나 여러 열로 나누어 인쇄하기 좋도록 만듭니다.\n" "\n" -#: src/pr.c:2763 +#: src/pr.c:2734 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -7007,7 +7098,7 @@ msgstr "" " 인쇄합니다 (-a 옵션이 사용되지 않는다면). 페이지에서 \n" " 각각의 열에 들어 있는 줄 수가 같게 유지합니다.\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7025,7 +7116,7 @@ msgstr "" " -d, --double-space\n" " 한 줄씩 띄워서 인쇄합니다\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7045,7 +7136,7 @@ msgstr "" " (-F는 3줄의 페이지 헤더, -F 없이는 5줄의 헤더와 \n" " trailer)\n" -#: src/pr.c:2789 +#: src/pr.c:2760 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -7069,12 +7160,24 @@ msgstr "" " 정렬도 없습니다. --sep-string=[<문자열>]은 구분자를 지정" "합니다\n" -#: src/pr.c:2798 +#: src/pr.c:2769 #, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l <페이지_길이>, --length=<페이지_길이>\n" +" 페이지 길이를 <페이지_길이> (66) 줄로 만듭니다\n" +" (줄 수의 기본값은 56이고, -F 옵션을 쓰면 63입니다)\n" +" -m, --merge 모든 파일을 병렬적으로, 각 열에 하나씩 씁니다. 넘어가는\n" +" 줄을 자르지만, -J 옵션으로 여러 줄을 합쳐서 줄을 채웁니" +"다\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -7085,7 +7188,7 @@ msgstr "" " 줄을 자르지만, -J 옵션으로 여러 줄을 합쳐서 줄을 채웁니" "다\n" -#: src/pr.c:2805 +#: src/pr.c:2779 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -7102,7 +7205,7 @@ msgstr "" " 첫 번째 페이지의 첫 번째 줄을 <개수>로 해서 줄 번호를\n" " 세어 나갑니다 (+<첫_페이지> 참고)\n" -#: src/pr.c:2813 +#: src/pr.c:2787 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -7118,7 +7221,7 @@ msgstr "" " -r, --no-file-warnings\n" " 파일을 열 수 없을 때 경고를 생략합니다.\n" -#: src/pr.c:2820 +#: src/pr.c:2794 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -7137,7 +7240,7 @@ msgstr "" " -s[<문자>]는 모든 3열 옵션들의 (-<열>|-a -<열>|-m) \n" " 넘어가는 줄 자르기 기능을 (-w가 없으면) 끕니다.\n" -#: src/pr.c:2828 +#: src/pr.c:2802 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7145,7 +7248,6 @@ msgid "" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " 열들을 -S 없이 <문자열>로 구분합니다. \n" " 기본 구분자는 탭 문자와 -J이고 그 외의 경우 공백 문자입니" @@ -7153,7 +7255,13 @@ msgstr "" " (-S\" \"와 동일). 열 관련 옵션에 영향을 주지 않습니다\n" " -t, --omit-header 페이지 헤더와 트레일러를 생략합니다\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -7177,7 +7285,7 @@ msgstr "" " 텍스트-열 출력에서, -s[<문자>]를 쓰지 않았을 경우에\n" " 페이지 폭을 <페이지_폭>(72)으로 합니다\n" -#: src/pr.c:2845 +#: src/pr.c:2822 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -7192,16 +7300,6 @@ msgstr "" "면, \n" " -S나 -s에 영향을 받지 않습니다.\n" -#: src/pr.c:2853 -#, fuzzy -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"<파일>이 주어지지 않거나 - 이면 표준 입력을 읽습니다.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -7335,12 +7433,11 @@ msgstr "" "입력 파일에 들어 있는 단어들의 permuated 인덱스를 그 문맥과 함께 출력합니다\n" "\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 #, fuzzy 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 자동으로 만든 참조를 출력합니다\n" " -C, --copyright 저작권과 복사 조건을 표시합니ㄷ\n" @@ -7348,6 +7445,12 @@ msgstr "" " -F, --flag-truncation=<문자열> 넘어간 줄을 자를때 <문자열>로 표시합니다\n" #: src/ptx.c:1835 +msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -7363,7 +7466,7 @@ msgstr "" " -S, --sentence-regexp=<정규식> 줄의 끝이나 문자의 끝을 나타내는 정규식\n" " -T, --format=tex 출력을 TeX으로 합니다\n" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7380,7 +7483,7 @@ msgstr "" " -i, --ignore-file=<파일> 이 <파일>에 들어 있는 단어들을 무시합니다\n" " -o, --only-file=<파일> 이 <파일>에 들어 있는 단어들만 읽습니다\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7391,20 +7494,16 @@ msgstr "" " -t, --typeset-mode - 구현되지 않았음 -\n" " -w, --width=<개수> 출력할 열의 폭 (참조는 제외하고)\n" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"<파일>이 주어지지 않거나 - 이면 표준 입력을 읽습니다.\n" - #: src/ptx.c:1951 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "부적절한 폭: `%s'" +#: src/ptx.c:1978 +#, fuzzy, c-format +msgid "invalid line width: %s" +msgstr "부적절한 폭: `%s'" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -7428,7 +7527,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "%s의 그룹을 %s로 바꾸는데 실패했습니다\n" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, fuzzy, c-format msgid "failed to stat %s" msgstr "%s의 시간을 유지합니다" @@ -7448,8 +7547,8 @@ msgstr "옵션아닌 인수가 너무 많음" msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "사용법: %s [<옵션>]... [<파일>]...\n" @@ -7638,16 +7737,16 @@ msgid "" msgstr "" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " -msgstr[0] "" -msgstr[1] "" +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " +msgstr[0] "%s: `%s'를 지울까요? " +msgstr[1] "%s: `%s'를 지울까요? " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: `%s'를 지울까요? " msgstr[1] "%s: `%s'를 지울까요? " @@ -7839,12 +7938,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "부적절한 시작 행번호: `%s'" -#: src/seq.c:234 +#: src/seq.c:248 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s: 알 수 없는 파일형" -#: src/seq.c:557 +#: src/seq.c:603 #, fuzzy, c-format msgid "format string may not be specified when printing equal width strings" msgstr "문자열을 덤프할 때에는 타입이 지정되면 안됩니다" @@ -7860,7 +7959,16 @@ msgid "" "for even very expensive hardware probing to recover the data.\n" msgstr "" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"<파일>이 주어지지 않거나 - 이면 표준 입력을 읽습니다.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7869,7 +7977,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -7878,11 +7986,9 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:192 +#: src/shred.c:196 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.\n" @@ -7894,7 +8000,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -7905,7 +8011,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7917,7 +8023,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7926,7 +8032,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -7938,134 +8044,134 @@ msgid "" "\n" msgstr "" -#: src/shred.c:241 +#: src/shred.c:243 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:340 +#: src/shred.c:342 #, fuzzy, c-format msgid "%s: fdatasync failed" msgstr "stat 실패" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: 돌아갈 수 없습니다" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: 진행중 %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, fuzzy, c-format msgid "%s: error writing at offset %s" msgstr "%s에 쓰는 도중 오류 발생" -#: src/shred.c:549 +#: src/shred.c:551 #, fuzzy, c-format msgid "%s: lseek failed" msgstr "파일 닫기 실패" -#: src/shred.c:561 +#: src/shred.c:563 #, fuzzy, c-format msgid "%s: file too large" msgstr "%s: 파일이 너무 깁니다" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: 진행중 %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, fuzzy, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: 진행중 %lu/%lu (%s)...%s/%s" -#: src/shred.c:859 +#: src/shred.c:861 #, fuzzy, c-format msgid "%s: fstat failed" msgstr "stat 실패" -#: src/shred.c:870 +#: src/shred.c:872 #, fuzzy, c-format msgid "%s: invalid file type" msgstr "%s: 부적절한 접미어 길이" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: 파일이 음의 크기를 갖습니다" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, fuzzy, c-format msgid "%s: error truncating" msgstr "%s: 파일이 잘렸음" -#: src/shred.c:989 +#: src/shred.c:991 #, fuzzy, c-format msgid "%s: fcntl failed" msgstr "stat 실패" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: 쓰기 전용 파일 디스크립터는 파기할 수 없습니다" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: 삭제중" -#: src/shred.c:1102 +#: src/shred.c:1104 #, fuzzy, c-format msgid "%s: renamed to %s" msgstr "%s: 읽기 오류" -#: src/shred.c:1124 +#: src/shred.c:1126 #, fuzzy, c-format msgid "%s: failed to remove" msgstr "%s: 파일이 너무 깁니다" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: 삭제되었음" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, fuzzy, c-format msgid "%s: failed to close" msgstr "%s: 파일이 너무 깁니다" -#: src/shred.c:1171 +#: src/shred.c:1173 #, fuzzy, c-format msgid "%s: failed to open for writing" msgstr "%s: 파일이 너무 깁니다" #: src/shred.c:1236 -#, fuzzy, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: 부적절한 초" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "" -#: src/shred.c:1264 -#, fuzzy, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: 부적절한 접미어 길이" -#: src/shuf.c:61 +#: src/shuf.c:62 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -8076,11 +8182,11 @@ msgstr "" " 혹은: %s -G [<옵션>]... [<입력> [<출력>]]\n" "\n" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -8091,37 +8197,37 @@ msgid "" " -r, --repeat output lines can be repeated\n" msgstr "" -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "옵션아닌 인수가 너무 많음" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "" -#: src/shuf.c:452 -#, fuzzy, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "부적절한 숫자" -#: src/shuf.c:465 +#: src/shuf.c:459 #, fuzzy, c-format -msgid "invalid line count %s" +msgid "invalid line count: %s" msgstr "부적절한 폭: `%s'" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, fuzzy, c-format msgid "multiple output files specified" msgstr "%s를 지웁니다\n" -#: src/shuf.c:502 +#: src/shuf.c:496 #, fuzzy, c-format msgid "cannot combine -e and -i options" msgstr "%s에 대한 파일 포인터를 재위치할 수 없습니다" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -8140,12 +8246,12 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, fuzzy, c-format msgid "invalid time interval %s" msgstr "부적절한 필드 번호: `%s'" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, fuzzy, c-format msgid "cannot read realtime clock" msgstr "링크 `%s'를 만들 수 없습니다" @@ -8159,13 +8265,13 @@ msgstr "" "정렬 옵션은 다음과 같습니다:\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:437 +#: src/sort.c:438 #, fuzzy msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" @@ -8177,7 +8283,7 @@ msgstr "" " -d, --dictionary-order 공백, 알파벳, 숫자만을 고려합니다\n" " -f, --ignore-case 소문자와 대문자를 구별하지 않습니다\n" -#: src/sort.c:443 +#: src/sort.c:444 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -8191,12 +8297,12 @@ msgstr "" " -r, --reverse 비교의 결과를 뒤바꿉니다\n" "\n" -#: src/sort.c:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 #, fuzzy msgid "" " -n, --numeric-sort compare according to string numerical value\n" @@ -8211,7 +8317,7 @@ msgstr "" " -r, --reverse 비교의 결과를 뒤바꿉니다\n" "\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8221,19 +8327,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -8242,7 +8348,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8251,14 +8357,14 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 #, fuzzy msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" @@ -8279,7 +8385,7 @@ msgstr "" "다\n" " -S, --buffer-size=<크기> 메인 메모리 버퍼를 <크기>만큼 씁니다\n" -#: src/sort.c:497 +#: src/sort.c:498 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8303,7 +8409,7 @@ msgstr "" "다:\n" " 동일한 것중 첫 번째만 출력합니다\n" -#: src/sort.c:511 +#: src/sort.c:512 #, fuzzy msgid "" "\n" @@ -8330,12 +8436,11 @@ msgstr "" "\n" "<크기> 다음에는 다음 곱하기 접미어가 따라올 수 있습니다:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -8351,253 +8456,251 @@ msgstr "" "바이트값에 따라 정렬된 전통적인 정렬 방식을 원한다면 \"LC_ALL=C\"로\n" "환경변수를 세팅하십시오\n" -#: src/sort.c:725 +#: src/sort.c:724 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "%s에 쓰는 도중 오류 발생" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:884 +#: src/sort.c:883 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "임시 파일을 만들 수 없습니다" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "파일 열기 실패" -#: src/sort.c:998 +#: src/sort.c:997 #, fuzzy msgid "fflush failed" msgstr "파일 닫기 실패" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "파일 닫기 실패" -#: src/sort.c:1140 +#: src/sort.c:1139 #, fuzzy msgid "couldn't create temporary file" msgstr "임시 파일을 만들 수 없습니다" -#: src/sort.c:1179 +#: src/sort.c:1178 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/sort.c:1252 +#: src/sort.c:1251 #, fuzzy, c-format msgid "warning: cannot remove: %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/sort.c:1338 +#: src/sort.c:1337 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "%2$s에 대해 부적절한 인자 %1$s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "%2$s에 대해 애매한 인자 %1$s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s: 일련번호 `%.*s'은(는) 너무 큽니다" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "stat 실패" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "파일 읽기 실패" -#: src/sort.c:2076 +#: src/sort.c:2075 #, fuzzy, c-format msgid "string transformation failed" msgstr "문자열 비교가 실패했습니다" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "%s: `-W %s'은(는) 모호한 옵션입니다\n" msgstr[1] "%s: `-W %s'은(는) 모호한 옵션입니다\n" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "파일 쓰기 실패" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: 순서가 맞지 않음: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "표준 오류" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "fork() 할 수 없습니다" -#: src/sort.c:4017 +#: src/sort.c:4016 #, fuzzy, c-format msgid "%s: invalid field specification %s" msgstr "%s: 부적절한 필드 지정 `%s'" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "" # count? -#: src/sort.c:4079 +#: src/sort.c:4078 #, fuzzy, c-format msgid "%s: invalid count at start of %s" msgstr "%s: `%s' 시작 부분에 부적절한 갯수" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "`-' 다음에 부적절한 숫자" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "`.' 다음에 부적절한 숫자" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "필드 스펙에 벗어난 문자" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "필드 처음에 부적절한 숫자" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "필드 개수가 0입니다" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "문자 오프셋이 0입니다" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "`,' 다음에 부적절한 숫자" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, fuzzy, c-format msgid "cannot read file names from %s" msgstr "비교한 문자열은 %s과(와) %s입니다." -#: src/sort.c:4613 +#: src/sort.c:4612 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s: 부적절한 접미어 길이" -#: src/sort.c:4619 +#: src/sort.c:4618 #, fuzzy, c-format msgid "no input from %s" msgstr "파일 `%s'을(를) 만듦\n" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" # extra operand? 뭔 소리야? -#: src/sort.c:4699 +#: src/sort.c:4698 #, fuzzy, c-format msgid "extra operand %s not allowed with -%c" msgstr "-c 옵션에서는 추가 피연산자 `%s'을(를) 쓸 수 없습니다" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 +#: src/split.c:224 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "사용법: %s [<옵션>] [<입력> [<접두어>]]\n" -#: src/split.c:207 +#: src/split.c:228 #, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" "입력을 고정된 크기의 조각 <접두어>aa, <접두어>ab, ... 으로 나누어 씁니다; 기" "본\n" @@ -8605,25 +8708,28 @@ msgstr "" "을\n" "읽습니다.\n" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 #, fuzzy msgid "" " --verbose print a diagnostic just before each\n" @@ -8633,201 +8739,206 @@ msgstr "" "로\n" " 출력합니다\n" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "출력파일 접미어를 다 썼습니다" -#: src/split.c:365 +#: src/split.c:419 #, fuzzy, c-format msgid "creating file %s\n" msgstr "파일 `%s'을(를) 만듦\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "LS_COLORS환경변수의 해석할 수 없는 값" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "%s의 시간을 유지합니다" -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" msgstr "%s 디렉토리로 chdir할 수 없습니다" -#: src/split.c:410 +#: src/split.c:464 #, fuzzy, c-format msgid "closing output pipe" msgstr "%s를 지웁니다\n" -#: src/split.c:414 +#: src/split.c:468 #, fuzzy, c-format msgid "moving input pipe" msgstr "파일 `%s'을(를) 만듦\n" -#: src/split.c:416 +#: src/split.c:470 #, fuzzy, c-format msgid "closing input pipe" msgstr "파일 `%s'을(를) 만듦\n" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "%s의 그룹을 %s로 바꾸는데 실패했습니다\n" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "한 가지 이상의 방법으로 분할할 수 없습니다" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: 부적절한 초" -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: 부적절한 숫자" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: 부적절한 접미어 길이" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: 부적절한 바이트의 개수" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: 부적절한 행의 개수" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "여러 문자로 된 탭 `%s'" -#: src/split.c:1286 +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "문자 특수 파일" + +#: src/split.c:1383 #, fuzzy, c-format msgid "line count option -%s%c... is too large" msgstr "%s: 일련번호 `%.*s'은(는) 너무 큽니다" -#: src/split.c:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "부적절한 시작 행번호: `%s'" -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: 부적절한 접미어 길이" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "%s: 인식할 수 없는 옵션 `%c%s'\n" -#: src/stat.c:1184 +#: src/stat.c:1187 #, fuzzy, c-format msgid "%s: invalid directive" msgstr "%s: 부적절한 패턴" -#: src/stat.c:1231 +#: src/stat.c:1234 #, fuzzy, c-format msgid "warning: backslash at end of format" msgstr "문자열 끝에 부적절한 역슬래쉬 이스케이프" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, fuzzy, c-format msgid "cannot read file system information for %s" msgstr "%s에 대한 파일 포인터를 재위치할 수 없습니다" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8838,7 +8949,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8846,30 +8957,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8877,17 +8988,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8897,7 +9008,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -8909,7 +9020,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8919,7 +9030,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8932,7 +9043,7 @@ msgid "" " %T minor device type in hex, for character/block device special files\n" msgstr "" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8947,7 +9058,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8958,7 +9069,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9013,8 +9124,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -9039,7 +9149,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9047,96 +9157,149 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 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:535 +#: src/stty.c:543 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:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +msgid "" " 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 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:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" msgstr "" -#: src/stty.c:559 +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" + +#: src/stty.c:614 +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 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:578 +#: src/stty.c:632 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" +msgstr "" + +#: src/stty.c:637 +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:584 +#: src/stty.c:641 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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -9144,10 +9307,13 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -9155,135 +9321,249 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +msgid "" " [-]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:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:619 +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +msgid "" " [-]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:627 +#: src/stty.c:712 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:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]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:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +msgid "" " * 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr "" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:672 +#: src/stty.c:843 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" +msgstr "" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:875 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:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -#: src/stty.c:699 +#: src/stty.c:919 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:707 +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -9292,25 +9572,27 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -9319,57 +9601,62 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:800 +#: src/stty.c:1124 #, fuzzy, c-format msgid "only one device may be specified" msgstr "오직 한 개의 인수만 지정할 수 있습니다" -#: src/stty.c:830 +#: src/stty.c:1154 #, fuzzy, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "--string과 --check 옵션은 상호 배타적입니다" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, fuzzy, c-format msgid "invalid argument %s" msgstr "%2$s에 대해 부적절한 인자 %1$s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, fuzzy, c-format msgid "missing argument to %s" msgstr "%2$s에 대해 애매한 인자 %1$s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: 파일이 잘렸음" + +#: src/stty.c:1331 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "부적절한 폭: `%s'" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "" -#: src/stty.c:1924 -#, fuzzy, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "부적절한 행번호 증가: `%s'" #. This is a proper name. See the gettext manual, section Names. @@ -9380,8 +9667,14 @@ msgstr "Kayvan Aghaiepour 그리고 David MacKenzie" #: src/sum.c:62 #, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"각 <파일>에 대해 CRC 체크섬과 바이트 개수를 출력합니다.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -9391,18 +9684,54 @@ msgstr "" " -r -s를 무시, BSD 합 알고리즘 사용, 1K 블럭 사용\n" " -s, --sysv 시스템 V 합 알고리즘 사용, 512 바이트 블럭 사용\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "사용법: %s [<옵션>] [<파일>]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" +"\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" msgstr "" -#: src/sync.c:69 +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 #, fuzzy, c-format -msgid "ignoring all arguments" -msgstr "인수가 너무 많음" +msgid "error opening %s" +msgstr "%s을(를) 읽는 도중 오류 발생" -#: src/system.h:343 +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s의 소유자 그리고/혹은 그룹을 바꿀 수 없습니다" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "%s을(를) 읽는 도중 오류 발생" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "" + +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -9411,22 +9740,30 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help 이 도움말을 표시하고 끝냅니다\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version 버전 정보를 출력하고 끝냅니다\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"<파일>이 주어지지 않거나 - 이면 표준 입력을 읽습니다.\n" + +#: src/system.h:544 #, fuzzy msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "긴 옵션에서 꼭 필요한 인수는 짧은 옵션에도 꼭 필요합니다.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -9434,7 +9771,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -9443,7 +9780,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -9454,22 +9791,27 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -#: src/system.h:591 +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "더 많은 정보를 보려면 `%s --help' 하십시오.\n" -#: src/system.h:633 +#: src/system.h:655 #, fuzzy, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9490,9 +9832,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "각 <파일>을 마지막 줄부터 표준 출력에 씁니다.\n" "<파일>이 주어지지 않거나, <파일>이 `-'이면, 표준 입력을 읽습니다.\n" @@ -9508,57 +9848,56 @@ msgstr "" " -r, --regex 구분자를 정규식으로 생각합니다\n" " -s, --separator=<문자열> 줄바꿈 대신에 <문자열>을 구분자로 씁니다\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, fuzzy, c-format msgid "%s: seek failed" msgstr "파일 닫기 실패" -#: src/tac.c:263 +#: src/tac.c:277 #, fuzzy, c-format msgid "record too large" msgstr "%s: 파일이 너무 깁니다" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "임시 파일을 만들 수 없습니다" -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "`%s'를 `%s'로 이동할 수 없습니다" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "%s의 시간을 유지합니다" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, fuzzy, c-format msgid "%s: write error" msgstr "쓰기 오류" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "`%s'를 `%s'로 이동할 수 없습니다" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "구분 단위가 빈 문자열이 될 수는 없습니다" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "" -#: src/tail.c:262 +#: src/tail.c:257 #, 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" msgstr "" "각 <파일>의 맨 마지막 %d줄을 표준 출력에 표시합니다.\n" "두 개 이상의 <파일>의 경우, 각각의 파일마다 파일이름을 나타내는 헤더를 먼" @@ -9567,13 +9906,13 @@ msgstr "" "다.\n" "\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 #, fuzzy msgid "" " -f, --follow[={name|descriptor}]\n" @@ -9587,7 +9926,7 @@ msgstr "" " 같은 기능을 합니다\n" " -F --follow=name --retry와 같습니다\n" -#: src/tail.c:280 +#: src/tail.c:275 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -9607,7 +9946,7 @@ msgstr "" "다\n" " (회전된 로그 파일의 경우 이러합니다)\n" -#: src/tail.c:293 +#: src/tail.c:288 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -9621,7 +9960,7 @@ msgstr "" " S초(기본값 1초)만큼 지속되도록 합니다\n" " -v, --verbose 언제나 파일이름이 들어 있는 헤더를 출력합니다\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -9630,7 +9969,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 +#: src/tail.c:302 #, fuzzy msgid "" "\n" @@ -9647,7 +9986,7 @@ msgstr "" "표시합니다. N 뒤에 곱하기 접미어가 올 수 있습니다: b는 512, k는 1024, m은 \n" "1048576 (1메가)입니다.\n" -#: src/tail.c:316 +#: src/tail.c:311 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -9664,22 +10003,22 @@ msgstr "" "파일을 다시 열어 지워졌거나 다른 프로그램에 의해 다시 만들어 졌는지 여부를 \n" "검사하게 될 것입니다.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "%s(fd=%d)을(를) 닫습니다 " -#: src/tail.c:461 +#: src/tail.c:456 #, fuzzy, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: 끝 상대 오프셋 %s%s로(으로) 갈 수 없습니다" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -9687,158 +10026,158 @@ msgid "" msgstr "" # 좀 더 자연스럽게 -#: src/tail.c:965 +#: src/tail.c:958 #, fuzzy, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" "`%s'이(가) tail을 실행할 수 없는 파일로 대체되었습니다; 이 이름은 포기합니다" -#: src/tail.c:980 +#: src/tail.c:973 #, fuzzy, c-format msgid "%s has become inaccessible" msgstr "`%s'이(가) 접근 불가능하게 되었습니다" # 좀 더 자연스럽게 -#: src/tail.c:997 +#: src/tail.c:990 #, fuzzy, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" "`%s'이(가) tail을 실행할 수 없는 파일로 대체되었습니다; 이 이름은 포기합니다" # 좀 더 자연스럽게 -#: src/tail.c:1006 +#: src/tail.c:999 #, fuzzy, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" "`%s'이(가) tail을 실행할 수 없는 파일로 대체되었습니다; 이 이름은 포기합니다" -#: src/tail.c:1027 +#: src/tail.c:1020 #, fuzzy, c-format msgid "%s has become accessible" msgstr "`%s'이(가) 접근 가능하게 되었습니다" # 좀 더 자연스럽게 -#: src/tail.c:1035 +#: src/tail.c:1032 #, fuzzy, c-format -msgid "%s has appeared; following end of new file" +msgid "%s has appeared; following new file" msgstr "`%s'이(가) 나타났습니다; 새로운 파일의 끝에 이어서 나타났습니다" # 좀 더 자연스럽게 -#: src/tail.c:1046 +#: src/tail.c:1042 #, fuzzy, c-format -msgid "%s has been replaced; following end of new file" +msgid "%s has been replaced; following new file" msgstr "`%s'이(가) 대체되었습니다; 새로운 파일의 끝에 이어서 대체되었습니다" -#: src/tail.c:1163 +#: src/tail.c:1159 #, fuzzy, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s의 소유자 그리고/혹은 그룹을 바꿀 수 없습니다" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: 파일이 잘렸음" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "파일이 남아 있지 않습니다" -#: src/tail.c:1424 +#: src/tail.c:1440 #, fuzzy, c-format msgid "cannot watch parent directory of %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, fuzzy, c-format msgid "inotify resources exhausted" msgstr "메모리가 바닥남" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, fuzzy, c-format msgid "cannot watch %s" msgstr "%s 디렉토리를 만들 수 없습니다" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: `%s'를 바꿀까요? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1597 #, fuzzy, c-format msgid "error reading inotify event" msgstr "%s을(를) 읽는 도중 오류 발생" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "`%s'은(는) 이런 종류의 파일 뒤에 이어서 나올 수 없습니다; 이 이름은 포기합니" "다" -#: src/tail.c:1961 -#, fuzzy, c-format -msgid "number in %s is too large" -msgstr "%s은(는) 너무 큽니다" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "%s: 열기중에 바뀌지 않은 stat의 최대 개수가 부적절합니다" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: 부적절한 PID" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: 부적절한 초" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "부적절한 열의 개수: `%s'" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "" -#: src/tail.c:2096 +#: src/tail.c:2135 #, fuzzy, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" "경고: PID 무시; `--pid=PID'는 --follow 옵션과 같이 사용했을 경우만 유효합니다" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" "경고: PID 무시; `--pid=PID'는 --follow 옵션과 같이 사용했을 경우만 유효합니다" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "경고: `--pid=PID'는 이 시스템에서 지원하지 않습니다" -#: src/tail.c:2209 +#: src/tail.c:2250 #, fuzzy, c-format msgid "cannot follow %s by name" msgstr "임시 파일을 만들 수 없습니다" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -9846,62 +10185,73 @@ msgid "" " -i, --ignore-interrupts ignore interrupt signals\n" msgstr "" -#: src/tee.c:71 -#, fuzzy +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"<파일>이 주어지지 않거나 - 이면 표준 입력을 읽습니다.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, fuzzy, c-format msgid "missing argument after %s" msgstr "%2$s에 대해 애매한 인자 %1$s" -#: src/test.c:159 +#: src/test.c:161 #, fuzzy, c-format msgid "invalid integer %s" msgstr "부적절한 숫자" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "" -#: src/test.c:367 +#: src/test.c:369 #, fuzzy msgid "unknown binary operator" msgstr "알 수 없는 시스템 오류" -#: src/test.c:646 +#: src/test.c:648 #, fuzzy, c-format msgid "%s: binary operator expected" msgstr "알 수 없는 시스템 오류" -#: src/test.c:704 +#: src/test.c:706 #, fuzzy msgid "" "Usage: test EXPRESSION\n" @@ -9913,20 +10263,20 @@ msgstr "" "사용법: %s [<파일>]...\n" " 혹은: %s [<옵션>]\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" msgstr "" -#: src/test.c:717 +#: src/test.c:719 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 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -9935,7 +10285,7 @@ msgid "" " EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n" msgstr "" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -9945,7 +10295,7 @@ msgid "" " STRING1 != STRING2 the strings are not equal\n" msgstr "" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -9956,7 +10306,7 @@ msgid "" " INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n" msgstr "" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -9964,7 +10314,7 @@ msgid "" " FILE1 -ot FILE2 FILE1 is older than FILE2\n" msgstr "" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -9973,7 +10323,7 @@ msgid "" " -e FILE FILE exists\n" msgstr "" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -9982,7 +10332,7 @@ msgid "" " -k FILE FILE exists and has its sticky bit set\n" msgstr "" -#: src/test.c:766 +#: src/test.c:768 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" @@ -9991,7 +10341,7 @@ msgid "" " -s FILE FILE exists and has a size greater than zero\n" msgstr "" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -10000,7 +10350,7 @@ msgid "" " -x FILE FILE exists and execute (or search) permission is granted\n" msgstr "" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -10009,32 +10359,32 @@ msgid "" "INTEGER may also be -l STRING, which evaluates to the length of STRING.\n" msgstr "" -#: src/test.c:786 +#: src/test.c:788 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 +#: src/test.c:793 msgid "test and/or [" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "" -#: src/test.c:872 +#: src/test.c:874 #, fuzzy, c-format msgid "extra argument %s" msgstr "인수가 너무 많음" @@ -10054,7 +10404,7 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -10063,11 +10413,11 @@ msgstr "" "사용법: %s [<파일>]...\n" " 혹은: %s [<옵션>]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -10085,7 +10435,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -10093,7 +10443,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -10104,7 +10454,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -10119,6 +10469,11 @@ msgstr "%s에 쓰는 도중 오류 발생" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -10447,12 +10802,12 @@ msgstr "" msgid "Exit with a status code indicating failure." msgstr "" -#: src/truncate.c:96 +#: src/truncate.c:69 #, fuzzy, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "사용법: %s [<옵션>]... [<파일>]...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -10463,22 +10818,22 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -10486,57 +10841,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: 파일이 음의 크기를 갖습니다" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "한 가지 이상의 방법으로 분할할 수 없습니다" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "부적절한 숫자" + +#: src/truncate.c:307 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "바이트, 문자, 또는 필드로 된 목록을 지정해야 합니다" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, fuzzy, c-format msgid "cannot open %s for writing" msgstr "`%s'를 `%s'로 이동할 수 없습니다" @@ -10547,24 +10907,27 @@ msgid "Mark Kettenis" msgstr "" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "사용법: %s [옵션] [<파일>]\n" "<파일>의 partial 정렬에 따르는 완전히 정렬된 리스트를 씁니다.\n" "<파일>이 주어지지 않거나, <파일>이 `-'이면, 표준 입력을 읽습니다.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "" + +#: src/tsort.c:475 #, fuzzy, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: 입력에 루프가 들어가 있습니다 loop:" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: 입력에 루프가 들어가 있습니다 loop:" @@ -10613,9 +10976,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "각 <파일>의 탭을 공백문자로 변환하여, 표준 출력에 씁니다.\n" "<파일>이 주어지지 않거나, <파일>이 `-'이면, 표준 입력을 읽습니다.\n" @@ -10667,8 +11028,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -10679,7 +11040,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -10820,11 +11181,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "" - #: src/uptime.c:214 #, c-format msgid "" @@ -10840,13 +11196,17 @@ msgid "" "\n" msgstr "" -#: src/wc.c:117 -#, fuzzy +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -10860,12 +11220,12 @@ msgstr "" " -l, --lines 행의 개수를 표시합니다\n" " -w, --words 단어의 개수를 표시합니다\n" -#: src/wc.c:128 +#: src/wc.c:134 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" @@ -11001,9 +11361,9 @@ msgid "" "\n" msgstr "" -#: src/whoami.c:91 +#: src/whoami.c:87 #, fuzzy, c-format -msgid "%s: cannot find name for user ID %lu\n" +msgid "cannot find name for user ID %lu" msgstr "%s의 소유자 그리고/혹은 그룹을 바꿀 수 없습니다" #: src/yes.c:41 @@ -11021,6 +11381,66 @@ msgid "" "\n" msgstr "" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "<파일>이 주어지지 않거나 - 이면 표준 입력을 읽습니다.\n" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "<파일>이 주어지지 않거나 - 이면 표준 입력을 읽습니다.\n" + +#, fuzzy +#~ msgid "ignoring all arguments" +#~ msgstr "인수가 너무 많음" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: 부적절한 숫자" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s은(는) 너무 커서 표시할 수 없습니다" + +#~ msgid "number of lines" +#~ msgstr "행의 개수" + +#~ msgid "number of bytes" +#~ msgstr "바이트 수" + +#, fuzzy +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: 부적절한 행의 개수" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: 부적절한 바이트의 개수" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: 부적절한 행의 개수" + +#, fuzzy +#~ msgid "number in %s is too large" +#~ msgstr "%s은(는) 너무 큽니다" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: 부적절한 초" + +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "null 그룹으로 바꿀 수 없습니다" + +#, fuzzy +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s의 소유자 그리고/혹은 그룹을 바꿀 수 없습니다" + #~ msgid "program error" #~ msgstr "프로그램 오류" @@ -11058,9 +11478,6 @@ msgstr "" #~ msgid "too few arguments" #~ msgstr "인수가 너무 적음" -#~ msgid "Usage: %s [OPTION] [FILE]...\n" -#~ msgstr "사용법: %s [<옵션>] [<파일>]...\n" - #, fuzzy #~ msgid "closing standard output" #~ msgstr "표준 출력" diff --git a/po/lg.gmo b/po/lg.gmo index 9714b5d1..8101d122 100644 Binary files a/po/lg.gmo and b/po/lg.gmo differ diff --git a/po/lg.po b/po/lg.po index a4bd2626..0a15b880 100644 --- a/po/lg.po +++ b/po/lg.po @@ -4,11 +4,12 @@ # This file is distributed under the same license as the coreutils package. # # Kizito Birabwa , 2011. +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils 8.7\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2011-02-15 20:47+0000\n" "Last-Translator: Kizito Birabwa \n" "Language-Team: Luganda \n" @@ -37,18 +38,18 @@ msgstr "Augumenti z'oyinza okuwa ziri:" msgid "error closing file" msgstr "wazzewo kiremya mu kubikka fayiro" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "Wazzewo kiremya mu kuwandika mu fayiro" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "endukusa ez'oku %s tezikyusidwa" @@ -260,57 +261,62 @@ msgstr "Paramita ewandikidwa bubi" msgid "Unknown error" msgstr "Wazzewo kiremya atategeereka" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: akawayiro '%s' kabuzabuza\n" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: akawayiro '-W %s' kabuzabuza\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: akawayiro '--%s' tekabeerako agumenti\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: akawayiro '%c%s' tekabeerako agumenti\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: akawayiro '--%s' kateekwa okubaako agumenti\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: akawayiro '--%s' tekamanyidwa\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: akawayiro '%c%s' tekamanyidwa\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: akawayiro -- %c tekakola\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: akawayiro kateekwa okubaako agumenti -- '%c'\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: akawayiro '-W %s' kabuzabuza\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: akawayiro '-W %s' tekabeerako agumenti\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: akawayiro '-W %s' kateekwa okubaako agumenti\n" @@ -320,13 +326,13 @@ msgstr "%s: akawayiro '-W %s' kateekwa okubaako agumenti\n" msgid "cannot change permissions of %s" msgstr "nnemedwa okukyusa obuyinza obw'oku %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "nnemedwa okukolawo tterekero %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "ggwanika lijjudde" @@ -375,6 +381,12 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: nkomerero ya fayiro" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: wazzewo kiremya mu kusoma" + #: lib/regcomp.c:131 msgid "Success" msgstr "Omulimu gumalirizidwa bulungi" @@ -485,7 +497,7 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "ntegeka endukusa ez'oku %s" @@ -989,7 +1001,7 @@ msgstr "" "bulijjo.\n" "\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -999,16 +1011,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Bw'oba towadde FAYIRO, oba nga FAYIRO ogiwadde nga '-', ekiragiro kisoma\n" -"ebiva ku nnono eya bulijjo.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -1024,51 +1027,51 @@ 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:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "wazzewo kiremya mu kusoma" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "ebiyingizibwa tebikkirizibwa" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "ebifo by'ogambye ekiragiro okuwandika mu nnyiriri tebisoboka: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "waliwo ekifuulibwa eky'enfissi %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "nsibako awayingizibwa awa bulijjo" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1112,38 +1115,46 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "kubulako ekifuulibwa" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [FAYIRO]...\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate 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/cat.c:98 +#, fuzzy 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" @@ -1169,7 +1180,7 @@ msgstr "" "olwereere\n" " lumu lwokka mu bivaamu\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1186,7 +1197,7 @@ msgstr "" "obubonero\n" " obulagira kugenda ku lunyiriri lupya\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1201,17 +1212,18 @@ msgstr "" " %s Kiwandika ebiva awayingizibwa awa bulijjo nga kibiwandikira\n" "awateekebwa ebivaamu awa bulijjo.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "nemedwa okukola ioctl ku %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "awateekebwa ebiva mu zipulogulamu awa bulijjo" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: fayiro ey'okusomwamu ate y'ey'okuwandikibwamu" @@ -1223,10 +1235,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1240,8 +1252,8 @@ msgstr "nnemedwa okukolawo endukusa eza SELinux: %s" msgid "failed to set %s security context component to %s" msgstr "nnemedwa okutegeka olukusa olwa %s olwa SELinux lubeere %s" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "nnemedwa okukebera endukusa eza SELinux eza %s" @@ -1260,13 +1272,13 @@ msgstr "" "nnemedwa okukyusa endukusa eza\n" "SELinux ez'oku %s zifuuke %s" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "nnemedwa okubikkula %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "nemedwa okusoma mu tterekero %s" @@ -1282,7 +1294,7 @@ msgstr "nkyusa endukusa eza SELinux ez'oku %s\n" msgid "fts_read failed" msgstr "fts_read eremedwa okuzuula ebikwata ku fayiro" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1424,7 +1436,7 @@ msgstr "" "okujjako nga kuliko n'aka '-P'" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1441,9 +1453,8 @@ msgid "conflicting security context specifiers given" msgstr "owaddeyo ebitundu eby'endukusa ebitakolagana" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "nemedwa okufuna atiributo eza %s" @@ -1766,17 +1777,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "tewali guluupu eyitibwa %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "olukalala lwa guluupu, %s, ssi lutuufu" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1785,7 +1796,7 @@ msgstr "" "Enkozesa entuufu eri: %s [KAWAYIRO] MUSINGIMUPYA [KIRAGIRO.[AGUMENTI]...]\n" " oba: %s KAWAYIRO\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1794,10 +1805,19 @@ msgstr "" "ery'oku musingi liri MUSINGIMUPYA.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" +" --userspec=MUKOZESA:GULUUPU Akawayiro kano kaleetera ekiragiro\n" +" okukola nga ekiyisidwa omukozesa MUKOZESA nga\n" +" ali mu guluupu GULUUPU.\n" +" --groups=ZI-GULUUPU Kano ko kaleetera ekiragiro okukola nga ekiyisidwa\n" +" omukozesa alina guluupu ez'enyongeza g1,g2,..,gN\n" + +#: src/chroot.c:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" " --userspec=MUKOZESA:GULUUPU Akawayiro kano kaleetera ekiragiro\n" " okukola nga ekiyisidwa omukozesa MUKOZESA nga\n" @@ -1805,7 +1825,12 @@ msgstr "" " --groups=ZI-GULUUPU Kano ko kaleetera ekiragiro okukola nga ekiyisidwa\n" " omukozesa alina guluupu ez'enyongeza g1,g2,..,gN\n" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 #, fuzzy msgid "" "\n" @@ -1817,42 +1842,47 @@ msgstr "" "eya\n" "bulijjo ye: /bin/sh).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "etterekero %s nemedwa okulifuula ery'oku musingi" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "nnemedwa kukyusa okugenda ku tterekero ery'oku musingi" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "tekisobose okwongerako guluupu ey'enyongeza" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" +msgid "failed to set supplemental groups" msgstr "tekisobose okwongerako guluupu ey'enyongeza" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "nnemedwa okutegeka namba ya guluupu" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "nnemedwa okutegeka namba ya mukozesa" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "nnemedwa okutandika ekiragiro %s" @@ -1896,7 +1926,17 @@ msgstr "" "Kino fayiro ensengeke FAYIRO1 ne FAYIRO2 kiziyitamu nga kizigeraageranya\n" "lunyiriri ku lunyiriri.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Bw'oba towadde FAYIRO, oba nga FAYIRO ogiwadde nga '-', ekiragiro kisoma\n" +"ebiva ku nnono eya bulijjo.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1910,7 +1950,7 @@ msgstr "" "olukumbo olwokubiri lubeera mu ennyiriri eziri mu FAYIRO2 yokka, ate\n" "olwokusatu lubeera mu ennyiriri ezisangibwa mu fayiro zombi.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1928,7 +1968,7 @@ msgstr "" " mu fayiro zombi tekiziwandika\n" " (bye ebyanidirabise mu lukumbo olwokusatu)\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1942,14 +1982,14 @@ msgstr "" " --nocheck-order Kano bwe kabaako, ekiragiro ne kisanga ebitali\n" " bisengeke mu biyingizibwa, kikolabukozi\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" " --output-delimiter=BUBONERO Kano bwe kabaako, ekiragiro\n" " kissaawo BUBONERO okulaga olukumbo\n" " olumu we lukoma olulala ne lutandika\n" -#: src/comm.c:133 +#: src/comm.c:137 #, fuzzy msgid "" "\n" @@ -1959,7 +1999,7 @@ msgstr "" "Ekiragiro bwe kiba kigeraageranya, kigoberera mateeka agatekedwa\n" "mu kigambo ekikongozzi 'LC_COLLATE'.\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1974,76 +2014,86 @@ msgstr "" " %s -3 fayiro1 fayiro2 Ennyiriri eziri mu fayiro1 yokka n'eziri\n" " mu fayiro2 yokka ze ziwandikibwa.\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "fayiro %d ssi nsengeke" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "tokkirizibwa kutegeka ebyawuluzangana nkumbo ebisukka mu kimu" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "%s tekikkirizibwa kulekebwa kyereere" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "nnemedwa okukola lseek ku %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "wazzewo kiremya mu kusoma %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "nnemedwa okukola lseek ku %s" +msgid "error reading %s" +msgstr "wazzewo kiremya mu kusoma %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "wazzewo kiremya nga mpandikira mu %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "wazzewo kiremya mu kusoma %s" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "nnemedwa okutegeera endukusa eza SELinux ezisangidwawo" -#: src/copy.c:383 +#: src/copy.c:478 #, fuzzy, c-format msgid "%s: write failed" msgstr "sisobode okuwandika" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "nemedwa okubikkula %s" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "nziramu endukusa ez'oku %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "nnemedwa okukuuma obwa nannyini ku %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "nemedwa okuzuula fayiro %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "nnemedwa okusigaza obuwandisi obw'oku %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" @@ -2051,208 +2101,212 @@ msgstr "" "%s nnemedwa okugitegekera endukusa eza SELinux ezo\n" "ezitegekebwa bulijjo ku fayiro ezakakolebwawo" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "" "%s nnemedwa okugitegekera endukusa eza SELinux ezo\n" "ezitegekebwa bulijjo ku fayiro ezakakolebwawo" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "nnemedwa okutegeka endukusa eza SELinux ez'oku %s zibe %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "sisobodde okubikkula %s kugisoma" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "fstat eremedwa okuzuula ebikwata ku %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "" "fayiro %s ngibuuka kubanga eyo yawanyisidwamu endala bwe yabadde ekoppebwa" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "sisobola okuggyawo %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "%s egyidwawo\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "ennyunzi ey'eyawudde %s tewali kigenda kuwandikibwayo" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "nnemedwa okukolawo fayiro eya bulijjo %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" msgstr "nnemedwa okugya koppi mu %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "essawa %s z'ebadde erambidwa nazo zigenda okusigazibwa" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "nnemedwa okugya koppi mu %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, fuzzy, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "" "%s: oyagala okugezako okuwandika ku %s, enkola eya %04lo (%s) nga " "tegobererwa?" -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: %s ngiwandikeko ng'empya? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (kkopi ey'okwerinda: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, 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:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "sisobola okukolawo enyunzi et'eyawudde %s egguka ku %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "stat eremedwa okuzuula ebikwata ku fayiro %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "etterekero %s ndibuuka" -#: src/copy.c:1791 +#: src/copy.c:1880 #, 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:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "fayiro %s ne %s fayiro y'emu" -#: src/copy.c:1939 +#: src/copy.c:2019 #, 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:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "%s eyakakolebwawo sijja okugiwandikako ebiri mu %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "%s tterekero, sisobola okugiwandikako ebivudde mu etali tterekero" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "sisobola okusimbuliza tterekero ku etali tterekero: %s -> %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "%s nnemedwa okugiggyamu kkopi ey'okwerinda" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, 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:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "kulabula: fayiro ey'ensibuko %s eweredwa emirundi egisukka mu gumu" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "sisobola okusimbuliza %s egende ku %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "sisobola okuggya kkopi mu nyunzi ey'eyawudde eyeggukako %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" @@ -2260,42 +2314,42 @@ msgstr "" "ga fayiro kwe zigguka gajja okulaga etterekero lino nga\n" "y'entandikwa yago" -#: src/copy.c:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "sisobola okukolawo enyunzi eyeyawudde %s egguka ku %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "sisobola okukolawo fifo %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "sisobola okukolawo fayiro ey'enjawulo %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "sisobola okusoma enyunzi eyeyawudde %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "sisobola okukolawo enyunzi eyeyawudde %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "fayiro %s ya kika ekitamanyidwa" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "sisobola okuggyawo kkopi ey'okwerinda eya %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (ggyawo kkopi ey'okwerinda)\n" @@ -2305,25 +2359,25 @@ msgstr "%s -> %s (ggyawo kkopi ey'okwerinda)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, fuzzy, c-format msgid "unknown program %s" msgstr "ekifo ekitamanyidwa" @@ -2649,8 +2703,8 @@ msgstr "%s gy'eri nayi ssi tterekero" msgid "failed to access %s" msgstr "nnemedwa okugya koppi mu %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "kubulako fayiro ey'okukolako" @@ -2731,141 +2785,141 @@ msgstr "" "sisobola kukuuma atiributo ez'enyongeza" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "ennono ebuzewo" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: eno namba esinga obungi bw'ennyiriri mu fayiro" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: eno namba esinga obungi bw'ennyiriri mu fayiro" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " ku miku egiddinngana %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: nnoonyezza %s ne sigiraba" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "emboozi enoonya zinnewayo egudde ku kiremya" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "%s ezzeko kiremya mu kuwandika" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: akabonero ak'awuzi kateekwa okuddibwako ennamba enzijjuvu" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, 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:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: wateekwa okubaawo ennamba enzijjuvu wakati wa '{' ne '}'" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: kubulako akabonero ak'awuzi '%c' akaggalawo" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: eno emboozi enoonya ebifaanagana tekola: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: kino ekigambo tekikola" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: ennamba ey'olunnyiriri eteekwa okusukka ku zeero" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "" "ekiweredwa nga akafundikwa kibuzeeko\n" "akabonero akalaga kye kinaafuulibwa" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "" "akafundikwa kalimu akabonero akalaga\n" "kye kanaafuulibwa akatakola: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "" "akafundikwa kalimu akabonero akalaga\n" "kye kanaafuulibwa akatakola: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "ekigambo ekifuga okufuulibwa kirimu obubonero obutakola: %%%c%c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "" "akafundikwa kalimu obubonero obulaga\n" "kye kanaafuulibwa %% obuyitiridde obungi" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "" "akafundikwa kabulamu akabonero akalaga\n" "kye kanaafuulibwa %%" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: eno namba tekola wano" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "namba %s tekkirizibwa" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... FAYIRO KIGAMBO...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 #, fuzzy msgid "" "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n" @@ -2876,7 +2930,17 @@ msgstr "" "Era kiwandika, awateekebwa ebivaamu ebya zipulogulamu mu ebya bulijjo,\n" "obungi bwa bayiti eziri mu buli kitundu.\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"FAYIRO bwe kiba - , ekiragiro kisoma ebiva ku nnono eya\n" +"bulijjo. Zi KIGAMBO zisobola okubeera:\n" + +#: src/csplit.c:1492 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2891,11 +2955,11 @@ msgstr "" " -k, --keep-files Buno bwo bukireetera butagyawo fayiro ze\n" " kyakakolawo bwe waba nga wazzewo kiremya\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2910,19 +2974,11 @@ msgstr "" " -z, --elide-empty-files Buno bwo bukireetera okugyawo fayiro ze\n" " kikozewo bwe ziba njereere\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"FAYIRO bwe kiba - , ekiragiro kisoma ebiva ku nnono eya\n" -"bulijjo. Zi KIGAMBO zisobola okubeera:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 #, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2968,7 +3024,7 @@ msgstr "" "'cut' kiwandikawo ebitundu ebirondemu ebya mu nnyiriri eza mu buli\n" "FAYIRO awateekebwa ebivaamu ebya zipulogulamu mu ebya bulijjo.\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2981,7 +3037,7 @@ msgstr "" " -d, --delimiter=K'AWULUZI Ebitundu eby'emoboozi kikozese K'AWULUZI \n" " okubyawuluzaamu mu kifo eky'oluseetuka\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2994,7 +3050,7 @@ msgstr "" " okuggyako nga akawayiro -s kwekali\n" " -n (Kano tekalina kye kakola)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -3002,7 +3058,7 @@ msgstr "" " --complement Kano kaleetera ekiragiro okukola ku bayiti,\n" " bubonero oba firidi ebitali ebyo ebikiragidwa\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -3016,7 +3072,7 @@ msgstr "" " kweyambisa akabonero akakozesedwa mu ebiva ku\n" " nnono\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -3028,7 +3084,8 @@ 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:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -3036,8 +3093,6 @@ msgid "" " 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 "" "Olubu lusobola okubeera kimu ku:\n" "\n" @@ -3054,54 +3109,55 @@ msgstr "" "Bw'oba towadde FAYIRO, oba FAYIRO bw'eba '-' , 'cut' esoma okuva\n" "ku nyingiza eya bulijjo.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "olukalala olwa bayiti oba ebitundu eby'emboozi ssi lutuufu" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "ennamba za firidi n'ebifo mu nnyiriri zitandikira ku 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "olubu olutaliko kkomo terukkirizibwa: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "olubu olw'ebigenda bikendeera terukkirizibwa" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "bayiti ey'okutandikirako %s eyitiridde okubeera ewala" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "ekitundu eky'emboozi eky'okutandikirako %s kiyitiridde okubeera ewala" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "okkirizibwa okulagira ekika eky'olukalala kimu kyokka" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "akabonero akaawuluzi kateekwa okubeera ennukuta emu" -#: src/cut.c:787 +#: src/cut.c:786 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:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -3109,11 +3165,11 @@ msgstr "" "tekigassa okulagira enyiriri ezit'awuluzidwamu zireme okulagibwa,\n" "okuggyako nga okola ku firidi" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "kubuzzeeko olukalala lwa firidi" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "kubuzzeeko olukalala olw'ebifo" @@ -3131,20 +3187,38 @@ msgid "Display the current time in the given FORMAT, or set the system date.\n" msgstr "" #: src/date.c:134 +#, fuzzy +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" +"Ekiragiro kino kiwandika essaawa nga ziwandikidwa mu MPANDIKA. Era " +"kyeyambisibwa okutegeka obudde n'ennaku sisitemu by'ekolerako.\n" +"\n" +" -d, --date=BUDDE Buno bukireetera okuwandika BUDDE mukifo ekya \n" +" obwa kakati (singa BUDDE kiba 'now' ekiragiro\n" +" kiwandika obudde obwa kakano)\n" +" -f, --file=FAYIRO Buno bukireetera okusoma FAYIRO kiryoke " +"kiwandike\n" +" obudde obuwandikidwa ku buli lunyiriri lwa yo.\n" +" FAYIRO bw'ebeera - , kisoma ebiva ku nnono eya\n" +" bulijjo\n" + +#: src/date.c:138 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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=FAYIRO Buno bukireetera okuwandika obudde FAYIRO\n" " kweyasembera okukyusakyusibwamu\n" @@ -3152,16 +3226,14 @@ msgstr "" " eya RFC-2822\n" " Okugeza: Bal, 07 Agu 2006 12:34:56 -0600\n" -#: src/date.c:147 +#: src/date.c:149 #, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=TTUUSO Kano kakireetera okuwandika budde mu mpandika\n" " eya RFC-3339.\n" @@ -3174,8 +3246,19 @@ msgstr "" "ku\n" " budde obwa UTC\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -3191,7 +3274,7 @@ msgstr "" " %a Kiwandike ekifunze eky'olunaku olwa mu sande\n" " (San..Lw6)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -3208,7 +3291,7 @@ msgstr "" " %c Ennaku ez'omwezi n'obudde\n" " (Lw6 Nov 04 12:02:33 EST 1989)\n" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -3224,7 +3307,7 @@ msgstr "" " %e Ennaku ez'omwezi, nga awandibadde zeero\n" " ezikulembedde waliwo mabanga ( 1..31)\n" -#: src/date.c:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -3239,7 +3322,7 @@ msgstr "" "ogugendana\n" " ne sande eya kakano okubeera eya %V mu mwaka\n" -#: src/date.c:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -3251,7 +3334,7 @@ msgstr "" " %I Essaawa (01..12)\n" " %j Olunaku lwakumeka mu mwaka (001..366)\n" -#: src/date.c:188 +#: src/date.c:194 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -3264,7 +3347,7 @@ msgstr "" " %m Omwezi (01..12)\n" " %M Dakiika (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -3291,7 +3374,7 @@ msgstr "" "buleetedwa\n" " aba GNU)\n" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3308,7 +3391,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:209 +#: src/date.c:215 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" @@ -3326,7 +3409,7 @@ msgstr "" "ebalibwa\n" " nga etandikira ku lwa Balaza (00..53)\n" -#: src/date.c:215 +#: src/date.c:221 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 +3423,7 @@ msgstr "" " %y Digiti ez'omwaka ezisembayo (00..99)\n" " %Y Omwaka (1970...)\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3373,7 +3456,7 @@ msgstr "" "'date', mu ebya bulijjo, bw'ebeera ewandika obudde ennamba ezisookerwako " "digiti emu yokka ez'ongerako zeero ekulembedde.\n" -#: src/date.c:230 +#: src/date.c:236 #, fuzzy msgid "" "The following optional flags may follow '%':\n" @@ -3400,7 +3483,7 @@ msgstr "" " kyanditadde ntono ate ne kiteekawo ntono we kyanditadde\n" " nnene\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3416,7 +3499,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:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3430,38 +3513,38 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "ennono eya bulijjo" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "obudde, %s, tebukkirizibwa" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "olagide empandika z'ebivaamu ezisoba mu emu" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3473,23 +3556,23 @@ msgstr "" "y'ebiseera, agumenti endala ezitali buwayiro ziteekwa\n" "kusookerwako ka '+'" -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "nemedwa okuteeka ennaku" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3498,7 +3581,7 @@ msgstr "" "Enkozesa entuufu eri: %s [EKIKOLEBWAKO]...\n" " oba: %s KAWAYIRO\n" -#: src/dd.c:532 +#: src/dd.c:561 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3529,7 +3612,7 @@ msgstr "" " ibs=BAYITI Kano kakireetera okusomanga bayiti BAYITI ku\n" " buli muku\n" -#: src/dd.c:541 +#: src/dd.c:570 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3539,8 +3622,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=FAYIRO Kano kakireetera okusoma mu FAYIRO mu kifo ekya\n" " kulinda ebiva ku 'stdin'\n" @@ -3562,7 +3647,7 @@ msgstr "" " status=noxfer Kano kakireetera butalaga bifa ku mulimu\n" " ogw'okukola koppi\n" -#: src/dd.c:552 +#: src/dd.c:583 #, fuzzy msgid "" "\n" @@ -3581,7 +3666,7 @@ msgstr "" "BIGAMBO_BYAWULE bisobola okubeera:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3615,7 +3700,7 @@ msgstr "" " 'block' oba 'unblock', kikozeseemu\n" " mabangirizi mu kifo ekya zi NUL\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3636,7 +3721,7 @@ msgstr "" " zzibizi nga kigenda kumala omulimu. Kigattako\n" " n'okukaza meta-data wakwo.\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3652,27 +3737,27 @@ msgstr "" " Tekagasa ku mirimu egikola ku biyingizibwa.\n" " Kusaana kubaako n'akawayiro conv=notrunc.\n" -#: src/dd.c:589 +#: src/dd.c:620 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:591 +#: src/dd.c:622 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:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr "" " directory Kano kaleetera omulimu okugaana\n" " ekikolebwako bwe litaba tterekero\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" " dsync Kano kaleetera data okukolebwako\n" @@ -3681,20 +3766,20 @@ msgstr "" " oba ebiwandikibwa lwe biggwa mu\n" " ggwanika zzibizi\n" -#: src/dd.c:597 +#: src/dd.c:628 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:598 +#: src/dd.c:629 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:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr "" " nonblock Kano kaleetera data okukolebwako\n" @@ -3702,7 +3787,7 @@ msgstr "" " birala nga ebisomebwa oba ebiwandikibwa\n" " tebinnaba kuggwa mu ggwanika zzibizi\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr "" " noatime Kano kaleetera omulimu\n" @@ -3711,25 +3796,25 @@ msgstr "" " ebiraga obudde lwe\n" " byasemba kukeberwa\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 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:612 +#: src/dd.c:643 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:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr "" " nolinks Kano kaleetera omulimu kugaana\n" @@ -3737,95 +3822,59 @@ msgstr "" " egguka ku fayiro ezisukka mu\n" " emu nga tez'eyawuddeko\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr "" " binary Kano kakireetera kuyisa data\n" " nga ebya binariyo\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr "" " text Kano kakireetera kuyisa data\n" " nga ebitegeereka bantu\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 -#, fuzzy, c-format +#: src/dd.c:661 +#, 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 "" -"\n" -"Bw'osindikira omulimu ogwa 'dd' ekiragiro ekya %s kiguleetera\n" -"okusibamu ne gumala okuwandikira awasindikibwa bulijjo ebifa ku\n" -"kiremya obungi obw'ebiwandise bye gwakasoma n'okuwandika. Ekyo bwe\n" -"kiggwa omulimu gweyongerayo.\n" -"\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ kill -%s $pid; sleep 1. -kill $pid\n" -" ebiwandise 10899206+0 bisomedwa\n" -" ebiwandise 10899206+0 biwandikidwa\n" -" bayiti 9387674624 (9.4 GB) zikoppedwa, sikonda 34.6279, 271 MB/s\n" -"\n" -"Obuwayiro buno bwe bukkirizibwa:\n" -"\n" -#: src/dd.c:676 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:698 +#: src/dd.c:721 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" -msgstr "" - -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -"ebiwandise %+% bisomedwa\n" -"ebiwandise %+% biwandikidwa\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "ekiwandise % kitemedwamu\n" -msgstr[1] "ebiwandise % bitemedwamu\n" -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "bayiti % (%s) ekoppedwa" msgstr[1] "bayiti % (%s) zikoppedwa" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "Infinity B" @@ -3839,83 +3888,100 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"ebiwandise %+% bisomedwa\n" +"ebiwandise %+% biwandikidwa\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "ekiwandise % kitemedwamu\n" +msgstr[1] "ebiwandise % bitemedwamu\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "mbikka fayiro egyibwamu ebiyingizibwa %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "mbikka fayiro egenzemu ebizzibwa %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "nnemedwa okuyimiriza O_DIRECT: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "mpandika mu %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "ekikolebwako %s tekimanyidwa" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "okufuula kuno tekukkirizibwa" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "akatuuti akafuga ebiyingizibwa tekakkirizibwa" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "akatuuti akafuga ebivaamu tekakkirizibwa" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "akatuuti akalaga embeera tekakkirizibwa" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "namba %s tekkirizibwa" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "tekisoboka okugattika ebibiri ku {ascii,ebcdic,ibm}" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "tekisoboka okugattika block ne unblock" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "tekisoboka kugattika lcase ne ucase" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "tekisoboka kugattika excl ne nocreat" -#: src/dd.c:1424 +#: src/dd.c:1527 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "tekisoboka kugattika excl ne nocreat" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3925,68 +3991,68 @@ msgstr "" "ya lseek ku fayiro (%s) ey'ekika kya mt_type=0x%0lx -- kebera \n" "okulaba olukalala olwa zi mt_type" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: sisobola kubuuka" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: sisobola kufuna aw'okutandika kusoma" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "" "ennamba eraga ow'okutandika okusoma fayiro %s tejja mu ggwanika zzibizi" -#: src/dd.c:1756 +#: src/dd.c:1859 #, 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:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "tekisobose okuvvuunuka ekitali kituufu mu nnombe" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "ntegeka obutuuti obwa %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "" "%s: tekisobose okugenda ennamba\n" "eraga aw'okusoma w'egamba" -#: src/dd.c:2172 +#: src/dd.c:2288 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" "ogw'okutemamu kutuuka ku bayiti % gugaanye ku fayiro ey'ebivaamu %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "ku %s enkola eya fdatasync egaanye" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "ku %s enkola eya sync egaanye" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "nemedwa okubikkula %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3995,20 +4061,20 @@ msgstr "" "ennamba eraga aw'okusoma eyitiridde obunene: sisobola kutemamu okutuuka ku\n" "buloka eya seek=% (bayiti-%lu)" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" "ogw'okutemamu kutuuka ku bayiti % gugaanye ku fayiro ey'ebivaamu %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, fuzzy, c-format msgid "failed to discard cache for: %s" msgstr "nnemedwa kukyusa kudda mu tterekero %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -4089,12 +4155,12 @@ msgstr "eziriwo" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 #, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" @@ -4106,14 +4172,14 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 #, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -4137,7 +4203,7 @@ msgstr "" "mu\n" " kifo kya bya 1024\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -4155,7 +4221,7 @@ msgstr "" "'sync',\n" " (eno y'enkola eya bulijjo)\n" -#: src/df.c:1409 +#: src/df.c:1429 #, fuzzy msgid "" " --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" @@ -4163,6 +4229,32 @@ msgid "" "omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" +msgstr "" +" -P, --portability Buno bukireetera ebivaamu okubitereeza mu ngeri\n" +" eya POSIX\n" +" --sync Kano kakireetera okitandika ogwa 'sync' nga\n" +" tekinnaba okuwanuza ebifa ku nkozesa\n" +" -t, --type=KIKA Buno bukireetera okulaga ebifa ku sisitemu eza\n" +" fayiro ez'ekika kya KIKA zokka\n" +" -T, --print-type Buno bukireetera okulaga ekika ekya sistemu ya\n" +" fayiro\n" +" -x, --exclude-type=KIKA Buno bukireetera okulaga ebifa ku sistemu eza\n" +" fayiro zo zokka ezitali za kika kya KIKA\n" +" -v (Kano tekakolebwako)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose Kano kaleetera ekiragiro okusooka kuwandikawo\n" +" ebikwata ku mulimu buli lwe kiba kigenda\n" +" kutandika fayiro ey'ekikoledwa empya\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -4180,7 +4272,7 @@ msgstr "" " fayiro zo zokka ezitali za kika kya KIKA\n" " -v (Kano tekakolebwako)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -4188,27 +4280,27 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, fuzzy, c-format msgid "options %s and %s are mutually exclusive" msgstr "obuwayiro --compare (-C) ne --strip tebukolagana" -#: src/df.c:1610 +#: src/df.c:1636 #, 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:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Kulabula: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "nnemedwa okusoma endagiriro eya sistemu eza fayiro eziwangidwa" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "tewali sisitemu eya fayiro ekoledwako" @@ -4338,7 +4430,7 @@ msgstr "" " %s /usr/bin/ kivaamu \"/usr\".\n" " %s stdio.h kivaamu \".\".\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -4349,7 +4441,8 @@ msgstr "" #: src/du.c:285 #, fuzzy -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, 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" @@ -4503,65 +4596,59 @@ msgstr "" msgid "Infinity" msgstr "Infinity B" -#: src/du.c:636 +#: src/du.c:657 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fts_read eremedwa okuzuula ebikwata ku fayiro" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "tekikkirizibwa okukka ku mutendera %s gw'oyagala" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "agumenti eya --%s, %s tekkirizibwa" -#: src/du.c:898 +#: src/du.c:919 #, 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:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "Kulabula: okulagira kuwandika mu bufunze kikontana ne --max-depth=%lu" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 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:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: wazzewo kiremya mu kusoma" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "erinnya lya fayiro terikkirizibwa kusigala lyereere" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "omugatte" @@ -4729,9 +4816,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "Ekiragiro kino, ebiri mu buli FAYIRO ekiweredwa, kibiwandikira awateekebwa\n" "ebiva mu pulogulamu mu ebya bulijjo nga bwe kisangamu enseetuka kizifuula\n" @@ -4788,7 +4873,7 @@ msgid "input line is too long" msgstr "ebiyingizibwa birimu olunyiriri oluyitiridde obuwanvu" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4984,12 +5069,12 @@ msgstr "emboozi enoonya zinnewayo erimu ensobi" msgid "non-integer argument" msgstr "agumenti ssi namba nzijjuvu" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "waliwo okugabiza mu zero" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "okuvvuunuka kiremy'ono, tegeka nti LC_ALL='C'" @@ -5000,31 +5085,31 @@ msgid "the strings compared were %s and %s" msgstr "ebigambo ebigerageranyizidwa biri %s ne %s." #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s tekkirizibwa nga ennamba esukka ku 0 etakolebwa ndala" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s: kiyitiridde obunene" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -5033,7 +5118,7 @@ msgstr "" "Enkozesa entuufu eri: %s [NAMBA]\n" " oba: %s KAWAYIRO\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -5082,7 +5167,7 @@ msgstr "" "Akawayiro -BUWANVU bwe bufunze obw'akawyiro --width=BUWANVU.\n" "\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -5098,7 +5183,7 @@ msgstr "" " ate bwe wasigalawo ebbanga ddene ne " "kitalijjuzamu\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, fuzzy, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -5118,7 +5203,7 @@ msgstr "" "tezikkirizibwa\n" " okusukka BUWANVU (mu ebya bulijjo by'ebifo 75)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -5127,23 +5212,21 @@ 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:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "obuwanvu obuweeredwa bulimu ensobi: %s" -#: src/fold.c:70 +#: src/fold.c:69 #, fuzzy -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +msgid "Wrap input lines in each FILE, writing to standard output.\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:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -5157,9 +5240,9 @@ msgstr "" " obustasukka ebifo BUWANVU, mu kifo kya\n" " 80 obwa bulijjo\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "obungi obw'ebifo: %s tebukkirizibwa" #. This is a proper name. See the gettext manual, section Names. @@ -5235,12 +5318,11 @@ msgstr "nnemedwa okutegeka ennamba ey'omukozesa" msgid "%s: no such user" msgstr "%s: omukozesa ono taliyo" -#: src/head.c:109 +#: src/head.c:110 #, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Ekiragiro kino kiwandika, awateekebwa ebivaamu ebya pulogulamu nu ebya\n" "bulijjo, ennyiriri 10 ezisooka eza mu buli FAYIRO.\n" @@ -5250,7 +5332,7 @@ msgstr "" "bivudde awayingizibwa awa bulijjo.\n" "\n" -#: src/head.c:117 +#: src/head.c:118 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -5269,7 +5351,7 @@ msgstr "" " K bw'ekulemberwa '-', kiwandika nnyiriri zonna\n" " okuggyako K ezisembayo\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -5280,7 +5362,7 @@ msgstr "" " kubikulembezenga obutundu oulimu amannya\n" " gaazo\n" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -5292,50 +5374,38 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: fayiro ekendedde ekiyitiridde" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: bayiti ziyitiridde obungi" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: nnemedwa okukola lseek okudda ku awandikirwa awajjulule %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "" "%s: tekisobose okutandikira mulimu nnyiriri %s okuva awanditandidwa mu bya " "bulijjo" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "obungi bw'ennyiriri" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "obungi obwa bayiti" +msgid "%s: number of bytes is too large" +msgstr "%s: bayiti ziyitiridde obungi" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "obungi obw'ennyiriri tebukkirizibwa" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "obungi obwa bayiti tebukkirizibwa" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "akawayiro -%c tekategreese" @@ -5549,7 +5619,7 @@ msgstr "sisobola okukyusa obwanannyini ku %s" msgid "cannot set time stamps for %s" msgstr "sisobola okuteeka wo ebilambe ebiraga %s we yakolebwawo" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "ekiragiro ekya sisitemu ekya \"fork\" kigaanye" @@ -5738,7 +5808,7 @@ msgstr "" "tokkirizibwa okutegeeza ekiragiro etterekero mwe kiba kiteeka\n" "ekintu ssing ekintu ekyo kiba nga nakyo tterekero" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "enkola %s wano teja wo" @@ -5775,11 +5845,15 @@ msgid "Mike Haertel" msgstr "Mike Haertel" #: src/join.c:195 -#, 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" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5800,7 +5874,7 @@ msgstr "" " -e KABONERO Kano kakireetera okuteekeewo KABONERO buli awabula\n" " bitundu by'ennyiriri eziyingizibwa ebyandikoledwako\n" -#: src/join.c:204 +#: src/join.c:210 #, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" @@ -5817,7 +5891,7 @@ msgstr "" " -t NUKUTA Kano kakireetera okubala NUKUTA ng'ekyawuluza mu\n" " bitundu bya nnyiriri eziyingizibwa n'ez'omu bivaamu\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5843,7 +5917,7 @@ msgstr "" " ku buli lupapula nga emitwe gy'ebitundu, era\n" " tegigeza okuzigatta na ndala\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 #, fuzzy msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" @@ -5852,7 +5926,7 @@ msgstr "" " ebyawulaganidwa akabonero akategeeza\n" " bayiti 0\n" -#: src/join.c:225 +#: src/join.c:231 #, fuzzy msgid "" "\n" @@ -5896,50 +5970,50 @@ msgstr "" "Fayiro ezikolebwako bwe ziba nga tezaasengekebwa, ekiragiro ne kisangamu\n" "ennyiriri ezitasobola okukwataganyizibwa, kiwandikawo okulabula.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "ennamba ey'ekitundu eky'olunyiriri ekikolebwako: `%s', tekola" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "ekigambo ekifuga ekitundu eky'olunyiriri ekikolebwako: %s, tekikola" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "" "ekigambo ekifuga ekitundu eky'olunyiriri ekikolebwako\n" "kirimu ennamba etakola: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "ebitundu eby'ennyiriri %lu ne %lu tebisobola kukozesebwa kugatta" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "embigambo ebiy'okujuza mu bitundu eby'ennyiriri ebyereere tebikolagana" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "" "ekikozesebwa mu kifo eky'oluseetuka, %s, kirimu obubonero obusukka mu kimu" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "akabonero ak'awuzi kasobaganye" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "awayingizibwa awa bulijjo tewasobola okubeera ennono eya fayiro zombi" @@ -6023,17 +6097,17 @@ msgstr "ekiragiro tekisobola okugattibwa n'akawayiro -l oba -t" msgid "no process ID specified" msgstr "ennamba ey'omulimu teweredwa" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "nnemedwa okutegekawo eggwanika zzibizi erya bayiti %\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "agumenti %s tekkirizibwa ku %s\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -6260,7 +6334,7 @@ msgstr "sisobola okukolawo enyunzi eyeyawudde %s" msgid "FIXME: unknown" msgstr "FIXME: ono omuwandisi teyeyanjudde" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]\n" @@ -6273,7 +6347,7 @@ msgstr "" "Ekiragiro kino kiwandika linnya ery'omukozesa aliwo kakano.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "Tewali linnya ery'okwewandisaako" @@ -6283,7 +6357,7 @@ msgstr "Tewali linnya ery'okwewandisaako" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -6292,101 +6366,101 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" -"ekikongojjedwa mu kigambo ekya mu enviromenti QUOTING_STYLE tekikkirizibwa \n" -"era sigenda okukikozesa: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "" "omuwendo ogukongojjedwa mu kigambo COLUMNS tegukkirizibwa: %s era tegugenda\n" "kukozesebwa" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "omuwendo ogukongojjedwa mu kigambo TABSIZE tegukkirizibwa: %s era tegugenda\n" "kukozesebwa" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "obuwanvu obw'emboozi obuweeredwa: %s tebukkirizibwa" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "obuwanvu obw'oluseetuka obuweeredwa: %s tebukkirizibwa" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "entereeza ey'okulaga obudde eweredwa, %s, tekkirizibwa" -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "Augumenti z'oyinza okuwa ziri:" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "wazzewo kiremya mu kutegeka mannya g'emyezi" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "akakulembera: %s tekategerekese" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "ekikongojjedwa mu kigambo LS_COLORS tekivvunulika" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" +"ekikongojjedwa mu kigambo ekya mu enviromenti QUOTING_STYLE tekikkirizibwa \n" +"era sigenda okukikozesa: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "nemedwa okubikkula tterekero %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "nemedwa okulaba kyuma %s kw'eri ne \"inodi\" yayo ennemye okuzuula" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: etterekero lino limaz'okukolebwako, terijjakuddimwamu" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "nsoma mu etterekero %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "mbikka tterekero %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "tekisobose okunoonya njawulo wakati wa mannya aga fayiro gano:%s ne %s" -#: src/ls.c:4781 +#: src/ls.c:4775 #, fuzzy msgid "" "List information about the FILEs (the current directory by default).\n" @@ -6399,7 +6473,7 @@ msgstr "" "mannya ga fayiro ezo nga egoberera walifu.\n" "\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -6418,7 +6492,7 @@ msgstr "" " obw'enkola eyomu lulimi lwa C obufuga enneyisa\n" " ey'obubonero obutalabika\n" -#: src/ls.c:4794 +#: src/ls.c:4788 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." @@ -6454,13 +6528,14 @@ msgstr "" "ge\n" " gasooka\n" -#: src/ls.c:4804 +#: src/ls.c:4798 #, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -6476,7 +6551,7 @@ msgstr "" " etabagana ne Emacs ekolera mu nkola yayo\n" " eya \"dired\"\n" -#: src/ls.c:4812 +#: src/ls.c:4807 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -6507,13 +6582,13 @@ msgstr "" " 'vertical' kyekimu n'akawayiro -C\n" " --full-time Kyekimu ne -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 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:4823 +#: src/ls.c:4818 #, fuzzy msgid "" " --group-directories-first\n" @@ -6532,7 +6607,7 @@ msgstr "" " ekiragiro n'eby'okusooka kuwandika materekero\n" " tekibikola\n" -#: src/ls.c:4829 +#: src/ls.c:4824 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -6547,7 +6622,7 @@ msgstr "" "readable',\n" " naye nga birengo bya 1000 mu kifo ekya 1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 #, fuzzy msgid "" " -H, --dereference-command-line\n" @@ -6578,7 +6653,7 @@ msgstr "" " aka -a oba -A, ekiragiro fayiro ezo ate " "kiziraga\n" -#: src/ls.c:4845 +#: src/ls.c:4840 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -6602,7 +6677,7 @@ msgstr "" " kigambo eky'omu nzivvuunuzi KIGAMBO\n" " -k Kye kimu ne --block-size=1K\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -6618,7 +6693,7 @@ msgstr "" " ekiwandikiro ate nga amannya aga fayiro\n" " g'awulibwa zi \",\"\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -6640,7 +6715,7 @@ msgstr "" " Buno bukireetera okuwayira akabonero aka / ku\n" " mannya ag'amaterekero ge kiba kiwandisewo\n" -#: src/ls.c:4871 +#: src/ls.c:4866 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" @@ -6665,7 +6740,7 @@ msgstr "" " literal, locale, shell, shell-always, c, ne " "escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -6679,19 +6754,19 @@ msgstr "" " -s, --size Buno bukireetera okulaga buloka buli\n" " fayiro gye kisanga ze kikozesa\n" -#: src/ls.c:4886 +#: src/ls.c:4881 #, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S Kano kakireetera okusengeka amannya okusinzira\n" " ku bunene bwa fayiro\n" @@ -6716,7 +6791,7 @@ msgstr "" " kakireetera n'okusengeka amannya okusinzira\n" " ku fayiro esinga okubeera n'obudde obw'okumpi\n" -#: src/ls.c:4896 +#: src/ls.c:4892 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -6747,7 +6822,7 @@ msgstr "" "MUSONO\n" " tekikola ku ebyo ebitali mu lokale eya POSIX\n" -#: src/ls.c:4908 +#: src/ls.c:4904 #, fuzzy msgid "" " -t sort by modification time, newest first\n" @@ -6758,12 +6833,12 @@ msgstr "" " -T, --tabsize=BIFO Buno bukireetera okubala nti oluseetuka\n" " lumalawo ebifo BIFO, sso ssi 8\n" -#: src/ls.c:4912 +#: src/ls.c:4908 #, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -6781,14 +6856,15 @@ msgstr "" " fayiro ezirin'amannya agalimu ennamba mu ngeri\n" " egoberera ennamba ezo\n" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=KOL Buno bukireetera okubala nti obugazi\n" " obw'olutimbe bulimu nkumbo NKU\n" @@ -6802,7 +6878,7 @@ msgstr "" " -1 Kano kakireetera okuwandika buli linnya lya\n" " fayiro ku lunyiriri lwa lyo\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6821,7 +6897,7 @@ msgstr "" "y'ekiragiro ku nsonga ya kuwandika mu langi. Ekiragiro ekya 'dircolors' kye\n" "kitegeka ekigambo kino\n" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6851,12 +6927,10 @@ msgid "David Madore" msgstr "David Madore" #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" "Enkozesa entuufu eri: %s [KAWAYIRO] [FAYIRO]...\n" "Ekiragiro kino kya kuwandika oba kukebera ennamba enkuumi\n" @@ -6866,9 +6940,10 @@ msgstr "" "awa bulijjo.\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 #, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" @@ -6878,15 +6953,17 @@ msgstr "" " y'enkola eya bulijjo okujjako nga\n" " stdin kiwandikirio)\n" -#: src/md5sum.c:178 +#: src/md5sum.c:180 #, fuzzy -msgid " -b, --binary read in binary mode\n" +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr "" " -b, --binary Buno bukireetera okukitwala\n" " nti data ey'omu fayiro eterekedwa\n" " mu ntereeza eya binariyo\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, fuzzy, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" @@ -6894,11 +6971,11 @@ msgstr "" " ez'ekika kya %s kizigeraageranye n'eziri\n" " mu lukalala olukiweredwa\n" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 #, fuzzy msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" @@ -6907,14 +6984,14 @@ msgstr "" " fayiro teyetaaga kuvvuunulwa (y'enkola eya\n" " bulijjo)\n" -#: src/md5sum.c:192 +#: src/md5sum.c:195 #, 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:195 +#: src/md5sum.c:198 #, fuzzy msgid "" "\n" @@ -6939,14 +7016,15 @@ msgstr "" " zaazo enkuumi\n" "\n" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "Engeri pulogulamu gy'efumba mu ennamba ennyonyoledwa mu %s. Okukola omulimu\n" @@ -6957,68 +7035,68 @@ msgstr "" "bantu),\n" "n'erinnya erya FAYIRO\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: ennyiriri mu namba enkuumi zisukkiridde obungi" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "" "%s: %: ennamba enkuumi ey'ekika kya %s erimu\n" "olunyiriri olwandikidwa bubi" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: okubikkula oba okusoma KUGAANYE\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "KIGAANYE" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "KALE" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, 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:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "KULABULA: olunyiriri % lulimu ensobi mu mpandika ya lwo" msgstr[1] "KULABULA: ennyiriri % zirimu ensobi mu mpandika ya zo" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "KULABULA: fayiro % mu lukalala tesomese" msgstr[1] "KULABULA: fayiro % mu lukalala tezisomese" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "KULABULA: ennamba enkuumi % ebalidwa ssi ntuufu" msgstr[1] "KULABULA: ennamba enkuumi % ezibalidwa ssi ntuufu" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, 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:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -7026,22 +7104,22 @@ msgstr "" "bw'obeera okukakasabukakasa ennamba enkuumi, obuwayiro --binary ne --text\n" "tebulina kye bukolawo" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "akawayiro --quiet kagasa mu kukakasa nnamba nkuumi wokka" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "omugaso ogw'akawayiro --status gukoma ku kukakasa ennamba enkuumi" @@ -7085,24 +7163,24 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "" "%s nnemedwa okugitegekera endukusa eza SELinux ezo\n" "ezitegekebwa bulijjo ku fayiro ezakakolebwawo" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "nemedwa okukuuma `saawa' ez'oku %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "nkozewo tterekero eliyitibwa %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, fuzzy, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -7356,7 +7434,7 @@ msgstr "" msgid "with --suffix, template %s must end in X" msgstr "bw'obanga otaddewo aka '--suffix', olutiba %s kiteekwa okusembyayo 'X'" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "akafundikwa %s kasobu, kalimu akasaze" @@ -7531,9 +7609,7 @@ msgstr "Scott Bartram" #: src/nl.c:179 #, fuzzy -msgid "" -"Write each FILE to standard output, with line numbers added.\n" -"With no FILE, or when FILE is -, read standard input.\n" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "Kino buli FAYIRO ebigirimu kibiwandika awateekebwa ebivaamu ebya \n" "zipuloguramu mu ebya bulijjo, nga kuliko n'ennamba ez'ennyiriri.\n" @@ -7665,27 +7741,27 @@ msgstr "omusono ogw'ennamba eza ku nnyiriri eza mu kiwandike ssi ntuufu: %s" msgid "invalid footer numbering style: %s" msgstr "empandika y'ennamba eza ku nnyiriri eza mu bizibirizi ssi ntuufu: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "ennamba ey'olunyiriri tekkirizibwa: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "enjawulo mu nnamba ez'ennyiriri ezigobereragana tekkirizibwa: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "obungi obw'ennyiriri enjereere tebukkirizibwa: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "obungi obw'ebifo ebiweredwa ennamba ez'ennyiriri tebukkirizibwa: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "entereeza eya namba ez'ennyiriri tekkirizibwa: %s" @@ -7712,7 +7788,7 @@ msgstr "" #, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -7734,47 +7810,47 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "sisobodde okulemesa bintu kuva awayingizibwa awa bulijjo" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "ebiyigizibwa tebigenda kufiibwako" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "" "ebiyingizibwa tebigenda kufiibwako ate\n" "ebivaamu byo byongerwa ku %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "ebivaamu mbiwayira ku %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "nemedwa okutegeka eby'okuwandika 'stderr' bikome nga omulimu guwedde" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" "ebiyingizibwa tebigenda kufiibwako ate ebyandigenze\n" "ku stderr byo bigenda kusindikibwa ku stdout" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "ebyandigenze ku stderr bigenda kusindikibwa ku stdout" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -7804,96 +7880,93 @@ msgstr "" " --ignore=N Bwe kiba kibala ebitundu ebibazi ebiri mu kompyuta,\n" " kano kakireetera kubuukako N, ebyo ne kitabibalirimu\n" -#: 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, fuzzy, c-format msgid "value too large to be converted: %s" msgstr "%s: obubonero bumu bwokka bwe bukoledwako" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "namba %s tekkirizibwa" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "agumenti %s%s erina akatandikwa '%s' akatakoler'awo" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "%s nnemedwa okugibikkula kugiwandikamu" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "obuwanvu obw'oluseetuka obuweeredwa: %s tebukkirizibwa" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [AKOZESA]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -7901,19 +7974,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -7923,30 +7996,30 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 #, fuzzy msgid "" "\n" @@ -7955,11 +8028,11 @@ msgstr "" "Obuwayiro obulala:\n" "\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -7968,7 +8041,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -7976,7 +8049,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7984,7 +8057,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7992,7 +8065,34 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Olubu lusobola okubeera kimu ku:\n" +"\n" +" N Bayiti, bubonero oba ekitundu eky'emboozi ekya N, nga\n" +" otandikidde ku 1\n" +" N- Bayiti, bubonero oba ekitundu eky'emboozi ekya N, nga\n" +" ovudde olunyiriri gye lukoma\n" +" N-M Okuva ku bayiti, obubonero oba ekitundu eky'emboozi\n" +" ekya N (nga kitwalidwamu) okutuuka ku ekya M\n" +" -M Okutuuka ku bayiti, bubonero oba ekitundu eky'emboozi\n" +" ekya M (nga kitwalidwamu) nga ovudde olunyiriri gye\n" +" lutandikira\n" +"\n" +"Bw'oba towadde FAYIRO, oba FAYIRO bw'eba '-' , 'cut' esoma okuva\n" +"ku nyingiza eya bulijjo.\n" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -8001,9 +8101,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -8015,7 +8116,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -8030,120 +8131,132 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "empandika %s ebulako ekitundu ekya %%" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "entereeza ey'obudde, %s, tekkirizibwa" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "empandika %s ekomekkerezedwa %%" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "obwo obungi bwa digiti ezigoberera akatonyeze tebukkirizibwa: %s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "empandika %s erimu ebitundu ebya %% ebiyitiridde obungi" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "agumenti %s%s erina akatandikwa '%s' akatakoler'awo" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "ennamba ey'ekitundu eky'olunyiriri ekikolebwako: `%s', tekola" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "olubu lw'empapula %s terusoboka" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "ennamba ey'ekitundu eky'olunyiriri ekikolebwako: `%s', tekola" +msgid "multiple field specifications" +msgstr "%s: %s tekisobola kukozesebwa okulaga ekitundu ky'olunyiriri" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "obudde, %s, tebukkirizibwa" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, 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:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "obuwayiro obwa -i buyitiridde obungi" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, 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:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "wazzewo kiremya mu kusoma %s" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, fuzzy, c-format msgid "failed to convert some of the input numbers" msgstr "sisobodde okulemesa bintu kuva awayingizibwa awa bulijjo" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -8156,14 +8269,13 @@ msgstr "" " oba: %s --traditional [FAYIRO] [FAYIRO] [[+]AWATANDIKIRWA[.][b] [+]" "[KIPANDE][.][b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Ekiragiro kino kiwandika ebiri mu FAYIRO awateekebwa ebizzibwa pulogulamu " @@ -8177,9 +8289,10 @@ msgstr "" "kibifuna okuva awayingizibwa awa bulijjo.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 #, 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" @@ -8200,7 +8313,7 @@ msgstr "" "'.' ekitegeeza ntibinaabalibwa mu okitariyo, oba 'b', ekitegeeza nti\n" "ennamba zikubisibwamu 512.\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -8209,7 +8322,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 #, fuzzy msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" @@ -8241,7 +8354,7 @@ msgstr "" " --traditional Kano kakireetera okukolera ne ku agumenti\n" " ez'enkola eyasookawo\n" -#: src/od.c:363 +#: src/od.c:366 #, fuzzy msgid "" "\n" @@ -8264,7 +8377,7 @@ msgstr "" " -d Kye kimu ne -t u2, kano kakireetera okukozesa nnamba eza\n" " dekanariyo enfunze\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -8284,7 +8397,7 @@ msgstr "" " -x Kyekimu ne -t x2, kaleetera ekiragiro okuwandika ennamba mu\n" " mpandiika eya namba enzijjuvu enfunda eza mu hekisadekanariyo\n" -#: src/od.c:380 +#: src/od.c:383 #, fuzzy msgid "" "\n" @@ -8301,7 +8414,7 @@ msgstr "" "akasumulula\n" " ebikagoberera okuva mu nkola yaabyo eya bulijjo\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -8321,7 +8434,7 @@ msgstr "" " x[BUNGI] Ennamba eya hekisadekanariyo. Buli digiti ya mu etwala bayiti\n" " BUNGI\n" -#: src/od.c:394 +#: src/od.c:397 #, fuzzy msgid "" "\n" @@ -8341,14 +8454,14 @@ msgstr "" "ne\n" "sizeof(long double).\n" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 #, fuzzy msgid "" "\n" @@ -8366,12 +8479,12 @@ msgstr "" "b 512, kB 1000, K 1024, MB 1,000,000, M 1024*1024,\n" "GB 1000*1000*1000, G 1024*1024*1024, ko ne T, P, E, Z, Y bwebutyo.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "%s tekikkirizibwa kukola ng'ekigambo ekifuga 'kika'" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -8380,7 +8493,7 @@ msgstr "" "%s tekikkirizibwa kukola ng'ekiganbo ekifuga 'kika';\n" "anti sisitemu eno tekozesa namba nzijuvu eza bayiti %lu" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -8389,19 +8502,19 @@ msgstr "" "%s tekikkirizibwa kukola ng'ekiganbo ekifuga 'kika';\n" "anti sisitemu eno tekozesa namba nzijuvu eza bayiti %lu" -#: src/od.c:869 +#: src/od.c:872 #, 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:1094 +#: src/od.c:1105 #, 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:1650 +#: src/od.c:1658 #, fuzzy, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" @@ -8409,27 +8522,27 @@ msgstr "" "fayiro\n" "kw'etandikira; kozesa kamu ku buno obubonero obuna: d o x n" -#: src/od.c:1788 +#: src/od.c:1796 #, 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:1863 +#: src/od.c:1871 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:1884 +#: src/od.c:1892 #, 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:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "kulabula: obuwanvu %lu tebusoboka; 'od' egenda kukozesaamu %d" @@ -8449,7 +8562,6 @@ msgstr "awayingizibwa awa bulijjo wabikkidwa" 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 "" "Ekiragiro kino ebivaamu byakyo kibiwandika awateekebwa ebiva mu " "zipuloguramu\n" @@ -8613,12 +8725,12 @@ msgstr "Ddi" msgid "Where" msgstr "Wa" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [AKOZESA]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -8642,7 +8754,7 @@ msgstr "" " MUKOZESA mu bufunze, eno y'enkola yakyo eya bulijjo ne\n" " bw'otateekawo akawayiro kano\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -8666,7 +8778,7 @@ msgstr "" " n'obudde bw'amaze ng'asirikiriridde bwe kiba nga\n" " kiwandika eby'omubufunze\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, fuzzy, c-format msgid "" "\n" @@ -8678,7 +8790,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:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -8686,62 +8798,62 @@ msgstr "" "oteekwa okuweerako n'erinnya ly'omukozesa wakiri omu" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "'--pages=OLUSOOKERWAKO[:OLUMALIRWAKO]'kukyabulako agumenti" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "olubu lw'empapula %s terusoboka" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "" "'-l BUNGI_BW'ENNYIRIRI' obungi obw'ennyiriri ku\n" "lupapula, %s, tebusoboka" -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "'-N LUNYIRIRI' okutandikira ku lunyiriri olwo tekisoboka: %s" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "" "'-o' BBANGA eryo ebbanga ery'okulekangawo\n" "ku ntandikwa z'ennyiriri terisoboka: %s" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "'-w BUGAZI_BW'OLUPAPULA' obuwo obungi bw'obubonero tebusoboka: %s" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "'-W BUGAZI_BW'OLUPAPULA' obuwo obungi bw'obubonero tebusoboka: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" @@ -8749,36 +8861,36 @@ msgstr "" "nga buli emu ebigirimu kibiteeka mu lukumbo lwa byo, tosobola\n" "kufuga bungi bw'enkumbo ezikolebwawo." -#: src/pr.c:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "olupapula lujjakuyitirira okufunda" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" "olupapula lw'ogambye okutandikirako, %,\n" "eziri mu fayiro, %, zo tezituukayo" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "ennamba y'olupapula tejja mu ggwanika zzibizi" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Lupapula %" -#: src/pr.c:2757 +#: src/pr.c:2727 #, fuzzy msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" @@ -8786,7 +8898,7 @@ msgstr "" "nkumbo bisobole okulabika obulungi na bikubisidwa ku kyapa (pulinta).\n" "\n" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -8806,7 +8918,7 @@ msgstr "" " Era kigezako okulaba nti ku lupapula enkumbo zonna\n" " z'enkanyankanya obungi bw'ennyiriri ezizirimu\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -8828,7 +8940,7 @@ msgstr "" " olunyiriri olwereere wakati w'ennyiriri ezidirinngana\n" " eziva mu FAYIRO\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -8875,7 +8987,7 @@ msgstr "" " eky'obulagira kutandika lunyiriri lupya obw'emirundi\n" " esatu\n" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -8916,11 +9028,36 @@ msgstr "" " agandibadde g'awula nkumbo zazo. Akawayiro kano\n" " kasobola okukozesebwa n'aka '--sep-string'\n" -#: src/pr.c:2798 +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l NNYIRIRI, --length=NNYIRIRI\n" +" Kano akawayiro kakyusa obungi bw'ennyiriri eziba ku\n" +" buli lupapula olukolebwawa okuva ku 66 eza bulijjo\n" +" (okwo 56 ze zibeera ebivudde mu FAYIRO oba, bwe " +"kubaako\n" +" akawayiro '-F', 63). Ekikongozzi NNYIRIRI z'ennyiriri\n" +" z'oyagala ziwezenga olupapula. Bwe zitasukka mu kkumi\n" +" (oba 3 nga '-F' kwekali) ekiragiro empapula " +"tekiziteekako\n" +" mitwe era kirekayo n'okuteekangamu obubonero " +"obulagira\n" +" kutandika lupya\n" +" -m, --merge Kano bwe kabeerako, buli FAYIRO ekiragiro kigiteeka " +"mu\n" +" lukumbo lwa yo. Ennyiriri ezisinga nkumbo obugazi " +"zisalwako,\n" +" ebitundu ebiyitamu ne bitawandikibwa. Akawayiro kano\n" +" kasobola kukolagana n'aka '-J'\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -8943,7 +9080,7 @@ msgstr "" " ebitundu ebiyitamu ne bitawandikibwa. Akawayiro kano\n" " kasobola kukolagana n'aka '-J'\n" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -8976,7 +9113,7 @@ msgstr "" " ennamba kiziwandika ne ku nnyiriri ezikulembera\n" " n'ezigoberera ezo eziriko ebiva mu FAYIRO ekolebwako\n" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -8994,7 +9131,7 @@ msgstr "" " Buno obukozesa nga toyagala ekiragiro kikulabule nga\n" " kiremedwa okuggula FAYIRO\n" -#: src/pr.c:2820 +#: src/pr.c:2794 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -9024,7 +9161,7 @@ msgstr "" " okuzigyisa mu nkumbo. Bwe kubaako n'aka -w ate\n" " ekiragiro kisigala ennyiriri kizitemamu\n" -#: src/pr.c:2828 +#: src/pr.c:2802 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -9032,7 +9169,6 @@ msgid "" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -SBUBONERO, --sep-string[=BUBONERO]\n" " Obuwayiro buno buleetera ekiragiro okuwandikangawo\n" @@ -9044,7 +9180,13 @@ msgstr "" " -t, --omit-header Buno bwo bukireetera butawandikawo mitwe n'obugambo\n" " obuba ku nkomerero ez'empapula\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -9076,7 +9218,7 @@ msgstr "" "Olukumbo\n" " bwe luba lumu obuwayiro buno tebulina kye bukolawo\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -9099,20 +9241,6 @@ msgstr "" " ekiragoro ennyiriri tekizitemamu. Bwo obuwayiro '-s'\n" " ne '-S' tebulina kye bukyusa ku nkola eya buno\n" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"BUNGI bwe kiba tekisukka mu 10, ekiragiro tekiwandikawo mitwe\n" -"gy'empapula era kirekayo okuwandika obubonero obulagira\n" -"kutandika lupya bwe kisanga mu FAYIRO. kwe kugamba nti kyeyisa\n" -"nga eyakozesezza n'akawayiro '-t'. Agumenti eya FAYIRO\n" -"bw'otogiteekawo, kyo kirinda kukola ku by'owandika\n" -"awayingizibwa awa bulijjo.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -9302,12 +9430,11 @@ msgstr "" " omosonso nnungi sso/ mese nsolima ssi nnungi naye mese ey'\n" "\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 #, fuzzy 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 bw'ossaako kamu ku buno, ekiragiro, ku\n" " ntandikwa ya buli lunyiriri mu ebivaamu,\n" @@ -9322,6 +9449,12 @@ msgstr "" "olw'ebikolebwako\n" #: src/ptx.c:1835 +msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -9356,7 +9489,7 @@ msgstr "" " bisobole okukozesebwa mu puloguramu eya " "'TeX'\n" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -9406,7 +9539,7 @@ msgstr "" "tekikikolako\n" " era mu lukalala olukolebwawo tekibaamu\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -9427,21 +9560,16 @@ msgstr "" " obukola ebigambo ebikozesebwa okulamba\n" " ennyiriri ezo\n" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Bw'oba towadde FAYIRO, oba nga FAYIRO ogiwadde nga '-', ekiragiro kisoma\n" -"ebiva ku nnono eya bulijjo.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "obunene obw'ekibangirizi, %s, tebukkirizibwa" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "obuwanvu obw'emboozi obuweeredwa: %s tebukkirizibwa" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -9472,7 +9600,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "nnemedwa kukyusa kudda mu tterekero %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "nnemedwa okufuna ebifa ku %s" @@ -9492,8 +9620,8 @@ msgstr "agumenti ezitafuula eneyisa ey'ebiragiro tezikoledwako" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... FAYIRO...\n" @@ -9779,15 +9907,15 @@ msgstr "" #: src/rm.c:342 #, fuzzy, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: ameterekero agali mu agumenti n'ebigalimu mbigyewo? " msgstr[1] "%s: ameterekero agali mu agumenti n'ebigalimu mbigyewo? " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: byonna ebimenyedwa mu agumenti mbigyewo? " msgstr[1] "%s: byonna ebimenyedwa mu agumenti mbigyewo? " @@ -10042,12 +10170,12 @@ msgid "invalid floating point argument: %s" msgstr "" "agument: %s tekkirizibwa ku nnamba ey'ekika ekifunzidwa mu bitundu bisatu" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "empandika %s erimu ekitundu %%%c ekitategeereka" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -10070,7 +10198,17 @@ msgstr "" "kibeere kizibu nnyo okuzikomyawo, ne bwe babeera bakozesezza\n" "sofitiweya eyenkana wa.\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"FAYIRO bw'oteekawo ng'eri '-', ekiragiro ebivaamu\n" +"kibiwandikira awateekebwa ebivaamu awa bulijjo\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -10089,7 +10227,7 @@ msgstr "" " okussaako obukulembekkereza obulaga ebirengo,\n" " nga K, M, ne G)\n" -#: src/shred.c:183 +#: src/shred.c:187 #, fuzzy msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" @@ -10111,12 +10249,10 @@ msgstr "" " w'ebadde kiwandikawo mazero, waleme okulabika nga we\n" " bakozesezza ekiragiro ekya shred ekyo. Ebivaamu\n" -#: src/shred.c:192 +#: src/shred.c:196 #, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -10138,7 +10274,7 @@ msgstr "" "bakola ku fayiro eza bulijjo.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -10156,7 +10292,7 @@ msgstr "" "ku ezo shred kwayinza obutabeera na mugaso:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -10179,7 +10315,7 @@ msgstr "" " ekiwereza ekya NFS ekikolebwa ba Network Appliance\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -10193,7 +10329,7 @@ msgstr "" "* sisitemu eza fayiro ezifunzidwa\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -10216,7 +10352,7 @@ msgstr "" "mount).\n" "\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -10227,129 +10363,129 @@ msgstr "" "eya fayiro gy'oyagala okukolako shred. Olwo fayiro eyo ebeera\n" "ekyayinza okukomezebwawo.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "ku %s enkola eya fdatasync egaanye" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "ku %s enkola eya fsync egaanye" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: sisobola okudda mabega" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: muku %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: kiremya mu kuwandikira ku bujjulule obwa %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "ku %s enkola eya lseek egaanye" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: fayiro eyitiridde obunene" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: muku %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: muku %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat eremedwa okugikebera ebigikwatako" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: kino ekika kya fayiro tekikkirizibwa" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: obunene obwa fayiro eno buli wansi wa zero" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: wazzewo kiremya mu kusalako fayiro" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: emirimu egya 'fcntl' gizzeko kiremya" -#: src/shred.c:994 +#: src/shred.c:996 #, 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:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: ngigyawo" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: erinnya lyayo ndikyusiza libeere %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "nnemedwa okugyawo %s" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: egyidwawo" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "nnemedwa okubika %s" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s nnemedwa okugibikkula kugiwandikamu" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: obwo obungi bw'emiku tebusoboka" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "otegese ennono eza data eya muwawa ezisoba mu emu" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: buno obunene bwa fayiro tebukkirizibwa" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -10360,7 +10496,7 @@ msgstr "" " oba: %s -e [KAWAYIRO]... [AGU]..\n" " oba: %s -i ESOOKA-ESEMBA [KAWAYIRO]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 #, fuzzy msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" @@ -10368,7 +10504,7 @@ msgstr "" "kikyusakyusizza engobereragana yazo mu ngeri eya muwawa.\n" "\n" -#: src/shuf.c:73 +#: src/shuf.c:75 #, fuzzy msgid "" " -e, --echo treat each ARG as an input line\n" @@ -10412,37 +10548,37 @@ msgstr "" " eya zero eyo mu kifo eky'akabonero aka bulijjo\n" " akalaga enkomerero y'olunyiriri\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "ennyiriri ezifaanagana ziyitiridde obungi" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "obuwayiro obwa -i buyitiridde obungi" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "olubu lw'ebiyingizibwa %s terukkirizibwa" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "obungi bw'ennyiriri %s tebusoboka" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "ebivaamu bigambidwa okugenda mu fayiro ezisukka mu emu" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "obuwayiro -e ne -i tebukolagana" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -10476,12 +10612,12 @@ msgstr "" "ne bubeera obudde enzivvunuzi bw'en'esirikirira.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "ekiseera %s tekisoboka" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "nnemedwa okusoma essawa ebalirawo" @@ -10494,7 +10630,7 @@ msgstr "" "mu ngeri ensengeke awateekebwa ebivaamu awa bulijjo.\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -10502,7 +10638,7 @@ msgstr "" "Buno bwe buwayiro obufuga engeri gye kisengekamu ennyiriri ezo:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -10521,7 +10657,7 @@ msgstr "" " -f, --ignore-case Buno bukireetera obutawula mu nnukuta nnene\n" " n'entono bwe kiba kisengeka\n" -#: src/sort.c:443 +#: src/sort.c:444 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -10546,7 +10682,7 @@ msgstr "" "engobereragana\n" " y'emyezi < 'JAN' < .. < 'DES'\n" -#: src/sort.c:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" @@ -10568,7 +10704,7 @@ msgstr "" " y'olunyiriri, olwo kirutwala ng'olutandise ne\n" " nnamba 0\n" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -10598,7 +10734,7 @@ msgstr "" "ya\n" " bye kimaz'okusengeka\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -10617,7 +10753,7 @@ msgstr "" " ntandikwa yazo\n" "\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -10625,7 +10761,7 @@ msgstr "" "Obuwayiro obulala:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -10635,7 +10771,7 @@ msgstr "" " nga tekyetaaze kukolawo fayiro " "ez'ekiseerabuseera\n" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -10657,7 +10793,7 @@ msgstr "" " puloguramu PULOG. Kizipakuluza ekiragiro kya\n" " 'PULOG -d'\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -10678,7 +10814,7 @@ msgstr "" "awayingizibwa\n" " awa bulijjo\n" -#: src/sort.c:487 +#: src/sort.c:488 #, fuzzy msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" @@ -10699,7 +10835,7 @@ msgstr "" " Ebivaamu bibeera wamu nga ebivudde mu fayiro\n" " emu.\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -10716,7 +10852,7 @@ msgstr "" " ggwanika lya kompyuta ekiragiro mwe kisobola\n" " okuteraka bye kikolako\n" -#: src/sort.c:497 +#: src/sort.c:498 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -10753,7 +10889,7 @@ msgstr "" " fayiro nesengeke n'okulaba oba mulimu ennyiriri\n" " ezifaanagana\n" -#: src/sort.c:511 +#: src/sort.c:512 #, fuzzy msgid "" "\n" @@ -10789,12 +10925,11 @@ msgstr "" "Ku namba 'BUNENE' osobola okusembyako kamu ku bukomekkereza buno\n" "obuddako:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -10820,258 +10955,256 @@ msgstr "" "gifuule\n" "eya C (mu enviromenti LC_ALL=C).\n" -#: src/sort.c:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "nninda %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] gukomye mu ngeri etali ya bulijjo" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "sisobola okukolawo fayiro ey'ekiseerabuseera mu %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "sisobodde okubikkula fayiro" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "ogwa fflush gugaanye" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "sisobodde okubikka fayiro" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "nnemedwa okukolawo fayiro ey'ekiseerabuseera" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "nnemedwa okutandika omulimu ogwa %s -d" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "kulabula: sisobola kuggyawo %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "agumenti eya --%s, %s tekkirizibwa" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "agumenti eya --%s esembayo obutono ekkirizibwa eri %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "agumenti eya --%s, %s, eyitiridde obunene" -#: src/sort.c:1359 +#: src/sort.c:1358 #, 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:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "stat tesobode okuzza ebifa ku fayiro" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "sisobodde okusoma fayiro" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "waliwo ekigambo ekitafuulise" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "%s kye kyagaanye okufuulibwa" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, 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:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "sisobode okuwandika" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: wano ssi nsengeke" -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "awateekebwa ebivaamu awa bulijjo" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "%s: sisobola okudda mabega" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: %s tekisobola kukozesebwa okulaga ekitundu ky'olunyiriri" -#: src/sort.c:4028 +#: src/sort.c:4027 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "obuwayiro '-%s' tebukolagana" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: entandikwa ya %s eriko ennamba etakkirizibwa" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "ennamba eddirira '-' tekkirizibwa" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "ennamba eddirira '.' tekkirizibwa" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "" "ebiraga ekitundu eky'ennyiriri ekiba kikolebwako\n" "birimu akabonero akatandibaddemu" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "otegese puloguramu ezipakirisibwa ezisukka mu emu" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "" "ekitundu eky'olunyiriri kiriko ennamba etakkirizibwa ku ntandikwa yakyo" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "ennamba ey'ekitundu ky'olunyiriri eri zero" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "" "ogambye okutandikira ku kabonero namba 0 -\n" "akasembayo mu kitundu ekitandikirwako" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "ennamba eddirira ',' tekkirizibwa" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "tewalaze kabonero ak'awuzi akaba kadda mu kifo eky'akabulijjo" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "sisbola okusoma amannya aga fayiro okuva mu %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: tekisoboka kuba na linnya lya fayiro eritalina buwanvu" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "tewali biyingizibwa biva ku %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, 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:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [EBIKOLEBWAKO [KATANDIKWA]]\n" -#: src/split.c:207 +#: src/split.c:228 #, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" "Ekiragiro ekya `split' kimenya mu EBIKOLEBWAKO ebitundu ne\n" "kibikolamu zi-fayiro ezituumidwa amanya nga KATANDIKWAaa,\n" @@ -11082,25 +11215,28 @@ msgstr "" "kikola ku by'owandika awayingizibwa awa bulijjo.\n" "\n" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -11109,206 +11245,212 @@ msgstr "" " ebikwata ku mulimu buli lwe kiba kigenda\n" " kutandika fayiro ey'ekikoledwa empya\n" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "Obukomekkereza bwakuteeka ku zi-fayiro ze nkolawo buweddeyo" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "nkolawo fayiro %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "nnemedwa okwongera %s ku nviromenti" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "nnemedwa okukolawo enyunzi et'eyawudde %s" -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" msgstr "mbikka tterekero %s" -#: src/split.c:410 +#: src/split.c:464 #, fuzzy, c-format msgid "closing output pipe" msgstr "mbikka fayiro egenzemu ebizzibwa %s" -#: src/split.c:414 +#: src/split.c:468 #, fuzzy, c-format msgid "moving input pipe" msgstr "mbikka fayiro egyibwamu ebiyingizibwa %s" -#: src/split.c:416 +#: src/split.c:470 #, fuzzy, c-format msgid "closing input pipe" msgstr "mbikka fayiro egyibwamu ebiyingizibwa %s" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "nnemedwa okutandika ekiragiro %s" -#: src/split.c:427 +#: src/split.c:481 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "nnemedwa okugya koppi mu %s" -#: src/split.c:463 +#: src/split.c:517 #, fuzzy, c-format msgid "waiting for child process" msgstr "nnindirira mulimu ogwa strip" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "ekiragiro kiraze ennamba y'embeera etategeereka (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "tekisoboka okumenyamu mu ngeri esukka mu emu" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: buno obungi bwa sikonda tebukkirizibwa" -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: eno namba tekola wano" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: akafundikwa tekakkirizibwa kwenkan'awo" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: obwo obungi bwa bayiti tebusoboka" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: obwo obungi bw'ennyiriri tebusoboka" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "" +"ekikozesebwa mu kifo eky'oluseetuka, %s, kirimu obubonero obusukka mu kimu" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "fayiro ey'enjawulo ey'ekika kya nnukuta" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "akawayiro -%s%c... kateeka nyiriri eziyitiridde obungi" -#: src/split.c:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "ennamba ey'olunyiriri tekkirizibwa: %s" -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: buno obunene bwa fayiro tebukkirizibwa" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "nnemedwa okuzza %s mu mpandika eya bulijjo" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "" "kulabula: akabonero akufuula enneyisa ya bunnaako, '\\%c', tekategeerekese" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: okulagira kuno tekukola" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "" "kulabula: ekigambo ekifuga empandika\n" "kikomekkerezedwa akasaze ak'akaddanyuma" -#: src/stat.c:1262 +#: src/stat.c:1265 #, 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:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "sisbola okusoma embuulire ekwata ku %s mu sisitemu eya fayiro" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -11319,7 +11461,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -11327,30 +11469,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "Olukusa lwa SELinux: %C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -11358,11 +11500,11 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 #, fuzzy msgid "" " -L, --dereference follow links\n" @@ -11376,7 +11518,7 @@ msgstr "" " embeera eya fayiro, ekiragiro kiraga eya sisitemu\n" " eya fayiro yonna\n" -#: src/stat.c:1422 +#: src/stat.c:1425 #, fuzzy msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" @@ -11403,7 +11545,7 @@ msgstr "" "Ate kamu ku buno bwe kabaako, ekiragiro ebivaamu\n" " kibwandika mu bufunze\n" -#: src/stat.c:1433 +#: src/stat.c:1436 #, fuzzy msgid "" "\n" @@ -11426,7 +11568,7 @@ msgstr "" " bayiti\n" " %C - Kirage n'endukusa eza SELinux\n" -#: src/stat.c:1442 +#: src/stat.c:1445 #, fuzzy msgid "" " %d device number in decimal\n" @@ -11443,7 +11585,7 @@ msgstr "" " %g - ID eya guluupu nanyini gy'ali mu\n" " %G - Linnya lya guluupu nanyini gy'ali mu\n" -#: src/stat.c:1450 +#: src/stat.c:1453 #, fuzzy msgid "" " %h number of hard links\n" @@ -11467,7 +11609,7 @@ msgstr "" " %t - Kika ekikulu ekya kyuma, mu ki-hekisi\n" " %T - Kika ekito ekya kyuma, mu ki-hekisi\n" -#: src/stat.c:1461 +#: src/stat.c:1464 #, fuzzy msgid "" " %u user ID of owner\n" @@ -11498,7 +11640,7 @@ msgstr "" " okukyuka mu\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -11520,7 +11662,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:1484 +#: src/stat.c:1487 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -11613,8 +11755,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -11651,7 +11792,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "oteekwa okutegekawo %s awali %s" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -11662,11 +11803,11 @@ msgstr "" " oba: %s [-F KYUMA | --file=KYUMA] [-a|--all]\n" " oba: %s [-F KYUMA | --file=KYUMA] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 #, fuzzy msgid "" " -a, --all print all current settings in human-readable form\n" @@ -11685,7 +11826,7 @@ msgstr "" " KYUUMA mu kifo eky'ekiwandikiro oba omutwe ogwa\n" " bulijjo\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -11701,11 +11842,24 @@ msgstr "" "z'osobola kulonda kisinzira ku sisitemu ey'oku kompyuta yo\n" "\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -11727,9 +11881,13 @@ msgstr "" " kifuga, KABONERO ke kalaga awali enkomerero " "y'olunyiriri\n" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -11746,30 +11904,28 @@ msgstr "" " kill KABONERO Bino bitegeka nti bw'oyingiza KABONERO, olunyiriri\n" " lw'oliko lwonna lugibwawo\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" msgstr "" -" * lnext KABONERO Bino bitegeka nti mu kiwandikiro bw'oyingiza KABONERO,\n" -" akabonero k'oddako okuyingiza kalabikabulabisi ne bwe\n" -" kandibadde nga bulijjo kakolawo ekyenjawulo\n" -" quit KABONERO Bino byo bitegeka nti bw'oyingiza KABONERO,\n" -" ekiwandikiro kimazisa pulogulamu gye kibadde kifuga\n" -" * rprnt KABONERO Bino bitegeka nti bw'oyingiza KABONERO ekiwandikiro\n" -" kiddamu obuto olunyiriri lw'oliko\n" -" start KABONERO Bino bitegeka nti bw'obanga obadde oyimirizza ebivamu\n" -" mu mulimu ogwa pulogulamu efugibwa ekiwandikiro kyo,\n" -" bw'oyingiza KABONERO ebivaamu ebyo biddamu okukolebwa\n" -#: src/stty.c:559 +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 KABONERO Bino bitegeka nti KABONERO ke kayimiriza okukolebwawo\n" " ebivaamu mu mulimu ogwa pulogulamu efugibwa\n" @@ -11783,11 +11939,33 @@ msgstr "" " * werase KABONERO Bino byo bitegeka nti bw'oyingiza KABONERO, ekigambo\n" " kyewasembye kuwandika kigibwawo\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 +#, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Obutegeke obw'enjawulo:\n" +" N N eba namba. Kino kileetera omutwe oba ekiwandikiro\n" +" okufuna enyingiza n'okuwereza ebivaamu ku bwangu obwa\n" +" baud N\n" +" * cols N Kino kimanyisa enombe nti omutwe oba ekiwandikiro\n" +" bikolera ku nkumbo N\n" +" * columns N Kino kyekimu ne cols N\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -11800,10 +11978,17 @@ msgstr "" " bikolera ku nkumbo N\n" " * columns N Kino kyekimu ne cols N\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -11819,11 +12004,29 @@ msgstr "" " ospeed N Kino kitegeka nti ekiwandikiro oba omutwe biwereza\n" " ebivaamu ku bwangu obwa N\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N Kino kimanyisa ennombe nti omutwe oba ekiwandikiro\n" +" bikolera ku nnyiriri N\n" +" * size Kino kiraga obungi bw'enkumbo n'ennyiriri ennombe\n" +" z'erowooza nti ekiwandikiro oba omutwe gwa kompyuta\n" +" bikolerako\n" +" speed Kino kiraga obwangu ekiwandikiro bwe kikolerako -\n" +" obw'okuwereza n'okufuna obubonero\n" +" time N Kino kikola nga akawayiro -icanon kwekali. Ekiwandikiro\n" +" bwe kiraba nga wayise ebitundu N ku kkumi " +"eby'akasikonda\n" +" nga tekinnawerezebwa bubonero obulala, bwe kirinawo\n" +" kibusindika ku kigendererwa kya bwo\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -11840,28 +12043,27 @@ msgstr "" " nga tekinnawerezebwa bubonero obulala, bwe kirinawo\n" " kibusindika ku kigendererwa kya bwo\n" -#: src/stty.c:584 -#, fuzzy +#: src/stty.c:641 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" -"Ebifuga ensindika ey'obubaka:\n" -" [-]clocal Kino kigyamu obubonero obufuga modemu\n" -" [-]cread Kino kikkirizisa ekiwandikiro okuwerezebwa obubonero\n" -" * [-]crtscts Kino kireetera ekiwandikiro okukozesa enkola eya RTS/" -"CTS\n" -" mu kulunngamya empanyisigana ey'obubonero\n" -" csN kino kitegeka nti obubonero bunaabangamu biti N. N\n" -" esobola okubeera kimu ku 5, 6, 7 oba 8\n" -#: src/stty.c:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -11870,7 +12072,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb Kino kitegeka nti buli kabonero akawerezebwa " "kagenderako\n" @@ -11889,7 +12090,12 @@ msgstr "" " ezikozesebwa kukakasa obutuufu bwabyo zigifuula\n" " etagabanizika mu bbiri\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -11897,6 +12103,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Ebifuga enyingiza ya tty:\n" @@ -11912,10 +12119,14 @@ msgstr "" " [-]igncr Kino kitegeka nti tty tegoberera kiragiro eky'akabonero\n" " akalagira akasonga okudda ku ntandikwa y'olunyiriri\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -11939,19 +12150,31 @@ msgstr "" " bigyamu biti ey'omanaana ey'oku buli kabonero\n" " akabiwerezebwa\n" -#: src/stty.c:616 +#: src/stty.c:692 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:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" +" * [-]iutf8 Akawayiro kano kaleetera ekiragiro okukitwala\n" +" nti obubonero bwonna bwe kikolako bwa mpandika eya " +"UTF-8\n" + +#: src/stty.c:702 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" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" +" [-]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 "" @@ -11977,109 +12200,83 @@ msgstr "" " endala bbiri ez'okukalamba\n" " [-]tandem Kino kyekimu ne [-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Ebifuga ebivaamu ebyimirimu ku kiwandikiro oba mutwe gwa kompyuta:\n" -" * bsN Kino kitegeka ebbanga eriyitawo okuva ekiwandikiro\n" -" lwe kifuna akabonero akalagira okusiimula okudda\n" -" mabega ne lwe kituukiriza ekiragiro ekyo oba akabonero\n" -" ne kikasindika ku kigenderwa ekirala. N esobola okuba\n" -" 0 oba 1\n" -" * crN Kino kitegeka ebbanga eriyitawo okuva ekiwandikiro lwe\n" -" kifuna akabonero akalagira akasonga okudda ku ntadikwa\n" -" y'olunyiriri ne lwe kituukiriza ekiragiro ekyo oba\n" -" akabonero ne kikasindika ku kigenderwa ekirala. N " -"esobola\n" -" okuba 0, 1, 2 oba 3\n" -" * ffN Kino kitegeka ebbanga eriyitawo okuva ekiwandikiro lwe\n" -" kifuna akabonero akakiragira okuba " -"ng'ekikyusizz'olupapula\n" -" ne lwe kituukiriza ekiragiro ekyo oba akabonero ne\n" -" kikasindika ku kigenderwa ekirala. N esobola okuba 0 oba " -"1\n" -" * nlN Kino kitegeka ebbanga eriyitawo okuva ekiwandikiro lwe\n" -" kifuna akabonero akalagira okutadika lunyiriri olupya " -"ne\n" -" lwe kituukiriza ekiragiro ekyo oba akabonero ne " -"kikasindika\n" -" ku kigenderwa ekirala. N esobola okuba 0 oba 1\n" +msgstr "" -#: src/stty.c:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" msgstr "" -" * [-]ocrnl Kino kitegeka nti ekiwandikiro buli kabonero akalagira\n" -" akasonga kudda ku ntandikwa y'olunyiriri akakituukako " -"kyo\n" -" kizzaawo akalagira kutandika lunyiriri lupya\n" -" * [-]ofdel Kino kyo kitegeka nti ekiwandikiro bwe kiba kikyalinda\n" -" kuwereza akabonero akakiyingizidwa kigira nga kiwereza\n" -" obulagira kusiimula nga bwe bukola nga obulaga nti " -"waliwo\n" -" okulinda, mu kifo eky'okuwereza obwa mpiri\n" -" * [-]ofill Kino kitegeka nti ekiwandikiro bwe kiba kirina kusooka\n" -" kulekayo kuwereza obubonero bwe kifunye, mu kifo\n" -" eky'okusirikabusirisi kigira nga kiwerezamu obubonero " -"bwa\n" -" kujjuzamu biseera\n" -" * [-]olcuc Kino kitegeka nti ekiwandikiro buli kabonero akaba ka\n" -" nukuta ntono ke kifuna kizzaawo akabonero aka nukuta " -"eyo\n" -" nga nnene\n" -" * [-]onlcr Kino kitegeka nti tty bw'efuna akabonero akalagira\n" -" kutandika lunyiriri lupya yo ezzawo akalagira akasonga\n" -" okudda ku ntadikwa y'olunyiriri\n" -" * [-]onlret Kino ate kyo kitegeka nti akabonero akalagira kutundika\n" -" lunyiriri lupya kava ku nkola eyo ne kaba nga kalagira\n" -" akasonga kudda ku ntandikwa y'olunyiriri\n" -#: src/stty.c:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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 "" -" * [-]onocr Kino kitegeka nti obubonero obulagira akasonga kudda ku\n" -" ntandikwa y'olunyiriri tebulabika bwe buba nga bwe " -"bubonero\n" -" obusooka mu lunyiriri olwandikubisidwa ku kyapa\n" -" [-]opost Kino kitegeka nti ebivaamu eby'oku kiwandikiro oba " -"mutwe\n" -" gwa kompyuta bisooka kubako ebibikolebwako nga\n" -" tebinnawerezebwa awalala\n" -" * tabN Kino kitegeka ebbanga eriyitawo okuva ekiwandikiro lwe\n" -" kifuna akabonero akalagira kukolawo oluseetuka\n" -" olw'omumbiriizi ne lwe kituukiriza ekiragiro ekyo oba\n" -" akabonero ne kikasindika. N esobola kuba 0, 1, 2 oba 3\n" -" * tabs Kino kikola nga awabadde 'tab0'\n" -" * -tabs Kino kikola nga awabadde 'tab3'\n" -" * vtN Kino kitegeka ebbanga eriyitawo okuva ekiwandikiro lwe\n" -" kifuna akabonero akalagira kukolawo oluseetuka\n" -" olw'omubusimba ne lwe kituukiriza ekiragiro ekyo oba\n" -" akabonero ne kikasindika. N esobola kuba 0 oba 1\n" - -#: src/stty.c:651 + +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -12096,63 +12293,75 @@ msgstr "" " olunyiriri lwonna kituukirizibwa ku nkola eleetebwawo\n" " 'echoctl' ne 'echok'\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 #, fuzzy +msgid " [-]echo echo input characters\n" +msgstr "" +" * [-]iutf8 Akawayiro kano kaleetera ekiragiro okukitwala\n" +" nti obubonero bwonna bwe kikolako bwa mpandika eya " +"UTF-8\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]ctlecho Kino kitegeka nti obubonero obufuga ekiwandikiro " -"bulagibwa\n" -" mu mpandika 'ey'akakofiira' ('^c')\n" -" [-]echo Kino kitegeka nti buli kabonero akawerezebwa ku " -"kiwandikiro\n" -" era kalabika\n" -" * [-]echoctl Kino kikola nga [-]ctlecho\n" -" [-]echoe Kino kikola nga [-]crterase\n" -" [-]echok Kino kitegeka nti ekiwandikiro buli lwe kiraga " -"akabonero\n" -" akasiimula olunyiriri olulamba kizzaako akabonero " -"akalagira\n" -" kutandika lunyiriri lupya\n" - -#: src/stty.c:665 -#, fuzzy -msgid "" -" * [-]echoke same as [-]crtkill\n" -" [-]echonl echo newline even if not echoing other characters\n" + +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 +msgid "" " * [-]echoprt echo erased characters backward, between '\\' and '/'\n" -" [-]icanon enable erase, kill, werase, and rprnt special characters\n" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]echoke Kino kikola nga awabadde [-]crtkill\n" -" [-]echonl Kino kitegeka nti ekiwandikiro kiraga obubonero " -"obulagira\n" -" kutandika lunyiriri lupya, ne bwekiba nga obubonero\n" -" obukifuga obulala bwo tekibulaga\n" -" * [-]echoprt Kino kitegeka nti ekiwandikiro obubonero obugenda\n" -" busiimulwawo kisooka kubulaga, nga kibuwandise " -"kitandikira\n" -" ku kasembye kusiimulwa ate nga buteeredwa wakati\n" -" w'obubonero obwa '\\' ne '/'\n" -" [-]icanon Kino kitegeka nti osobola okukozesa obubonero " -"bwayawulibwa\n" -" bukongojjenga ebiragiro ebya 'kill', 'werase' ne rprnt'\n" -" [-]iexten Kino kyo kitegeka nti osobola okukozesa obubonero\n" -" obutagoberera mutindo ogwa POSIX\n" +" [-]isig Kino kikusobozesa okukozesa obubonero obulagira emirimu\n" +" kuyimirizibwamu kulinda ginnagyo, obukomya mirimu,\n" +" n'obuyimiriz'emirumu girinde ekiragiro eky'okuddamu\n" +" [-]noflsh Kino kireetawo obubonero obuli mu kiwandikiro " +"okusigalumu\n" +" nga wazzewo ekiragiro eky'okuyimirizaamu omulimu " +"gulinde\n" +" gunnaagwo oba ekiragiro ekikomya omulimu\n" +" * [-]prterase Kino kikola kimu ne '[-]echoprt'\n" +" * [-]tostop Kino bwe kibawo, bwe wabawo omulimu ogukolera mu\n" +" kiwandikiro, emirala egyetongodde naye nga gyakola " +"nagyo\n" +" okusindika ebivaamu byagyo ku kiwandikiro ekyo " +"giyimirira\n" +" * [-]xcase Kino bwe kibawo nga waliwo ne 'icanon', kitegeeza nti\n" +" okozesa obubonero `\\' okukyusa enkola y'obubonero\n" +" obukozesa ennukuta ennene okuva ku eya bulijjo\n" -#: src/stty.c:672 +#: src/stty.c:843 #, fuzzy 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 "" " [-]isig Kino kikusobozesa okukozesa obubonero obulagira emirimu\n" " kuyimirizibwamu kulinda ginnagyo, obukomya mirimu,\n" @@ -12172,11 +12381,33 @@ msgstr "" " okozesa obubonero `\\' okukyusa enkola y'obubonero\n" " obukozesa ennukuta ennene okuva ku eya bulijjo\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -12186,12 +12417,12 @@ msgstr "" " cbreak Kino kikola kimu ne '-icanon'\n" " -cbreak Kino kikola kimu ne 'icanon'\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 Kino kizza ebigambo brkint, ignpar, istrip, icrnl, " "ixon,\n" @@ -12201,32 +12432,38 @@ msgstr "" " -cooked Kino kikola kimu ne 'raw'\n" " crt Kino kikola ng'eyagattise 'echoe echoctl echoke'\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -" dec Kino kikola ng'eyagattise\n" -" 'echoe echoctl echoke -ixany intr ^c erase 0177 kill " -"^u'\n" -" * [-]decctlq Kino kikola kimu ne '[-]ixany'\n" -" ek Kino kireetera ekiragiro eky'okusiimula akabonero kamu\n" -" n'eky'okusiimulawo olunyiriri olulamba okudda ku " -"bubonero\n" -" obubireetawo obwa bulijjo\n" -" evenp Kino kikola ng'eyagattise 'parenb -parodd cs7'\n" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 +#, fuzzy 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 "" " -evenp Kino kikola ng'eyagattise '-parenb cs8'\n" " * [-]lcase Kino kikola ng'eyagattise 'xcase iuclc olcuc'\n" @@ -12236,7 +12473,19 @@ msgstr "" " -nl Kino kikola ng'eyagattise 'icrnl -inlcr -igncr onlcr\n" " -ocrnl -onlret'\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"Ebiragiro ebikola nga eyagattise ebirala ebisukka mu kimu:\n" +" * [-]LCASE Kino kikola kimu ne '[-]lcase'\n" +" cbreak Kino kikola kimu ne '-icanon'\n" +" -cbreak Kino kikola kimu ne 'icanon'\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -12250,11 +12499,12 @@ msgstr "" " pass8 Kino kikola ng'eyagattise '-parenb -istrip cs8'\n" " -pass8 Kino kikola ng'eyagattise 'parenb istrip cs7'\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw Kino kikola ng'eyagattise '-ignbrk -brkint -ignpar\n" @@ -12263,14 +12513,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0'\n" " -raw Kino kikola kimu ne 'cooked'\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane Kino kikola ng'eyagattise 'cread -ignbrk brkint -inlcr\n" " -igncr icrnl -iutf8 -ixoff -iuclc -ixany imaxbel opost\n" @@ -12280,7 +12531,7 @@ msgstr "" " ate kizz'ebiragiro ebirala ebireetebwa ku bubonero\n" " obwayawulwamu ku bubonero bwa byo obwa bulijjo.\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -12307,12 +12558,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:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "Oteekangawo linnya lya kyuma kimu kyokka" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -12321,49 +12572,54 @@ msgstr "" "akawayiro ak'okuwandika mu ngeri etegeereka bantu n'ak'okuwandika\n" "mu ngeri esobola okukozesebwa nga agumenti tebukukozesebwa wamu" -#: src/stty.c:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, 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:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "agumenti %s tekola wano" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "agumenti %s tekola wano" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: wazzewo kiremya mu kusalako fayiro" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "entegeka ey'ebisindikibwa, %s, tekola" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: tekisobose okukola emikolo gyonna egisabidwa" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: tewali biraga ebifa ku bunene obw'ekyuma kino" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "'%s' tekkirizibwa nga agumenti ey'ekika kya nnamba enzijivu" #. This is a proper name. See the gettext manual, section Names. @@ -12372,8 +12628,16 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Ekiragiro kino kikebera buli FAYIRO ne kiwandika ennamba ya yo enkuumi\n" +"ey'ekika kya CRC n'obungi obwa bayiti ezigirimu.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -12389,21 +12653,56 @@ msgstr "" " -s, --sysv Bw'okozesa kamu ku buno ate kikozesa buloka ezirenga\n" " bbiti 512 - enkola ey'oku sistemu ez'ekika kya 'System V'\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, fuzzy, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Enkozesa entuufu eri: %s [KAWAYIRO]... [FAYIRO]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Ekiragiro kino kiwaliriza buloka ezikyuseemu zikazzibwe ku disiki,\n" -"semabuloka ne kigitumbula okunyweeza enkyuukakyuuka zino.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" -#: src/sync.c:69 +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "wazzewo kiremya mu kusoma %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "" +"%s: tekisobose okuzza kiwandikiro ku nkola ey'okusindika n'okufunira\n" +"mu bitole" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "wazzewo kiremya mu kusoma %s" + +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "agumenti zonna nzibodde" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -12420,19 +12719,28 @@ msgstr "" "kebera ebiwandiko ebikwata ku nzivvuunuzi okumanya obuwayiro " "obugigenderako.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr "" " --help Kano kaleetera ekiragiro okukoma ku kulaga okunnyonyola " "kuno\n" -#: src/system.h:351 +#: src/system.h:345 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:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Bw'oba towadde FAYIRO, oba nga FAYIRO ogiwadde nga '-', ekiragiro kisoma\n" +"ebiva ku nnono eya bulijjo.\n" + +#: src/system.h:544 #, fuzzy msgid "" "\n" @@ -12441,7 +12749,7 @@ msgstr "" "Agumenti ezibeera ez'etteeka ku buwayiro obujjuvu era ziba za tteeka ne\n" "ku buwayiro obufunze.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -12449,7 +12757,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -12465,7 +12773,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:570 +#: src/system.h:590 #, fuzzy, c-format msgid "" "\n" @@ -12476,25 +12784,28 @@ msgstr "Enfo ey'oku neti eya %s esangibwa ku: <%s>\n" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" "Bw'osanga ebitali bituufu %s, tegeeza \n" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -"Ekiragiro info coreutils '%s invocation' kikubikkulira ebiwandiko\n" -"ebinnyonyola kiragiro kino mu bujjuvu\n" -#: src/system.h:591 +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Wandika '%s --help' oyongere okuwebwa amagezi.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -12516,9 +12827,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "Ekiragiro kino kisoma zi FAYIRO, buli emu ebigirimu ne kibiwandikira\n" "awateekebwa ebivaamu awa bulijjo. Ebiri mu FAYIRO ekiragiro bwe " @@ -12551,57 +12860,56 @@ msgstr "" " y'ekiwandise, mu kifo eky'obubonero obulagira\n" " kutandika lunyiriri olupya\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: tekisobose kutereeza aw'okusoma mu fayiro" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "ekiwandise kiyitiridde obunene" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "sisobola okukolawo fayiro ey'ekiseerabuseera mu %s" -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s nnemedwa okugibikkula kugiwandikamu" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "nemedwa okukuuma `saawa' ez'oku %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: wazzewo kiremya mu kuwandika" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "sisobodde okubikkula %s kugisoma" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "tekikkirizibwa butaba na kabonero k'awula mu biwandise" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 +#: src/tail.c:257 #, 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" msgstr "" "Ekiragiro kino kiwandika ennyiriri %d ezisembayo ez'omu buli FAYIRO, nga\n" "kiwandikira awateekebwa ebivaamu awa bulijjo.\n" @@ -12612,7 +12920,7 @@ msgstr "" "olwo kirinda ebiva awayingizibwa awa bulijjo\n" "\n" -#: src/tail.c:270 +#: src/tail.c:265 #, fuzzy msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" @@ -12625,7 +12933,7 @@ msgstr "" " bayiti K okuva ku ntandikwa ya yo ne kiwandika\n" " ebigirimu okuva awo\n" -#: src/tail.c:274 +#: src/tail.c:269 #, fuzzy msgid "" " -f, --follow[={name|descriptor}]\n" @@ -12648,7 +12956,7 @@ msgstr "" " kyeyongere okukikolako. Kino kye kimu n'okussawo\n" " --follow=name --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -12675,7 +12983,7 @@ msgstr "" " linnya, oba, bw'eba nga nnyunzi kw'ebadde egguka\n" " evuddewo.\n" -#: src/tail.c:293 +#: src/tail.c:288 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -12694,7 +13002,7 @@ msgstr "" " bw'egira n'eba nga evuddewoko. Kano tekagasa\n" " okugyako nga kuliko n'akawayiro '--follow=name'\n" -#: src/tail.c:298 +#: src/tail.c:293 #, fuzzy msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" @@ -12711,7 +13019,7 @@ msgstr "" " okuwandikangawo emitwe egiraga zifayiro\n" " ebintu mwe biva\n" -#: src/tail.c:307 +#: src/tail.c:302 #, fuzzy msgid "" "\n" @@ -12734,7 +13042,7 @@ msgstr "" "n'obubonero T, P, E, Z, Y bweyongera mu ngeri eyo.\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -12750,188 +13058,188 @@ msgstr "" "fayiro kigera ebiseera ne kigibikka ate ne kiddamu okugibikkula kisobola\n" "okutegeera oba erinnya eryo litwalidwa ku fayiro endala.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "mbikka %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, 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:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "%s sigirabye. kati ngirindirira okulabika" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, fuzzy, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" "erinnya %s ligenze ku fayiro eteri ku sistemu eno; erinnya lino ndekedd'awo " "kulikolako" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s tekyatuukikako" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s tekyatuukikako" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s erabise; ntadise kugoberera ebigyongerwako" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "" "erinnya %s ligenze ku fayiro ndala; ntandise kugoberera ebyongerwa ku\n" "fayiro empya eyo" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "" "%s: tekisoboka kukkiriza omulimu ogutandise\n" "tail kukola birala tail nga ekyakola" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: fayiro eno ekendezedwa" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "fayiro zonna zivuddewo" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "tekisoboka kugoberera etterekero omuli %s" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "Omulimu ogwa inotify bye gukozesa biweddey" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "%s tegobererekaS" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: %s ngigyewo nteekewo ekipya? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "omulimu ogw'okulindirira okubagguliza okwa 'inotify' kuzzemu kiremya" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "wazzewo kiremya mu kusoma okubagguliza okwa 'inotify'" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: tekisoboka okugoberera ebyongerwa mu fayiro ez'ekika kino;\n" "erinnya lino ndekedd'awo kulikolako" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "%s erimu ennamba eyitiridde obunene" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "%s: tekikkirizibwa kukebera fayiro emirundi gino" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: eno ennamba y'omulimu tekkirizibwa" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: buno obungi bwa sikonda tebukkirizibwa" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "obungi obw'ebifo: %s tebukkirizibwa" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "akawayiro %c kakozesebwa we katajjirawo" -#: src/tail.c:2096 +#: src/tail.c:2135 #, fuzzy, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" "kulabula: ekya PID tekigyakukolebwako; anti akawyiro --pid=PID\n" "tekagasa okugyako nga tail esigala egoberera ebyongerwa ku fayiro" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" "kulabula: ekya PID tekigyakukolebwako; anti akawyiro --pid=PID\n" "tekagasa okugyako nga tail esigala egoberera ebyongerwa ku fayiro" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "kulabula: akawayiro --pid=PID tekakola ku sisitemu eno" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "tekisobose kugoberera %s nga n'esigamye ku linnya" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" "kulabula: tekigasa kusigala nga ogoberera ebiteekebwa\n" "awayingizibwa awa bulijjo" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" "tekisobose okukozesa 'inotify' okutegeera enkyukakyuka\n" "ez'okusisitemu. Nngenda kugikeberangabukebezi" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -12950,61 +13258,72 @@ msgstr "" "tee\n" " obutalinda oba kuyimirizibwamu mirimu mirala\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"FAYIRO bw'oteekawo ng'eri '-', ekiragiro ebivaamu\n" -"kibiwandikira awateekebwa ebivaamu awa bulijjo\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "%s kibulako agumenti" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "ennamba enzijjuvu %s tekola" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "wabulawo ka ')'" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "nsanzewo %s awandibadde ka ')'" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: wetaagawo ekifuula ekikola ku agumenti emu yokka" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-l tekagendera ku -nt" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-l tekagendera ku -ef" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-l tekagendera ku -ot" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "waliwo ekifuula ekikola ku agumenti bbiri ekitamanyidwa" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: wetaagawo ekifuula ekikola ku agumenti bbiri" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -13018,7 +13337,7 @@ msgstr "" " oba: [ ]\n" " oba: [ KAWAYIRO (era towandikawo ekigambo 'test'. Tossawo ka ']')\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -13027,7 +13346,7 @@ msgstr "" "y'omulimu gwakyo esinzira ku biva mu MBOOZI.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -13039,7 +13358,7 @@ msgstr "" "Ebiddako lukalala l'obukalu bw'osobola okuteeka mu mboozi n'ebinnyonyola\n" "empandika z'emboozi:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -13068,7 +13387,7 @@ msgstr "" "MBOOZI-2\n" " okukebera kubalibwa ng'okuyiseemu\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -13085,7 +13404,7 @@ msgstr "" " KIGAMBO-1 != KIGAMBO-2 Kano ke kakalu nti KIGAMBO-1 tekyenkana\n" " KIGAMBO-2\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -13119,7 +13438,7 @@ msgstr "" " NAMBA-NZIJJUVU-1\n" " erina but'enkana NAMBA-NZIJJUVU-2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -13138,7 +13457,7 @@ msgstr "" "yasemba\n" " okukyusibwamu\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -13154,7 +13473,7 @@ msgstr "" " -d FAYIRO Kano ke kakalu nti FAYIRO gyeri ate nga tterekero\n" " -e FAYIRO Kano ke kakalu nti FAYIRO gyeri\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -13174,7 +13493,7 @@ msgstr "" " ligaana abatali ba nanyini fayiro okuzigyawo na kuzikyusa\n" " manya\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -13191,7 +13510,7 @@ msgstr "" " -s FAYIRO Kano ke kakalu nti FAYIRO gyeri ate nga obunene bwayo\n" " businga ku zero\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -13210,7 +13529,7 @@ msgstr "" " -w FAYIRO Kano ke kakalu nti FAYIRO gyeri era nga ewandikikamu\n" " -x FAYIRO Kano ke kakalu nti FAYIRO gyeri ate nga puloguramu\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -13227,7 +13546,7 @@ msgstr "" "KIGAMBO'\n" "kyenkana obungi bw'ennukuta eziri mu KIGAMBO (eyo eba namba nzijjuvu).\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -13239,26 +13558,26 @@ msgstr "" "Bw'owandika nti test --help oba test --version, ekiragiro kirowoza nti\n" "okiwadde agumenti ez'okukolako.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "[ oba test ne [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 #, fuzzy msgid "missing ']'" msgstr "kubulako ka ']'" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "%s agumenti ya nfissi" @@ -13278,7 +13597,7 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -13287,7 +13606,7 @@ msgstr "" "Enkozesa entuufu eri: %s [KAWAYIRO] KISEERA KIRAGIRO [AGUMENTI]...]\n" " oba: %s [KAWAYIRO]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 #, fuzzy msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" @@ -13297,7 +13616,7 @@ msgstr "" "Agumenti ezibeera ez'etteeka ku buwayiro obujjuvu era ziba za tteeka ne\n" "ku buwayiro obufunze.\n" -#: src/timeout.c:238 +#: src/timeout.c:240 #, fuzzy msgid "" " --preserve-status\n" @@ -13333,7 +13652,7 @@ msgstr "" " Ob'oyagala kulaba olukalala lw'ebiragiro ebya sisitemu,\n" " tandika omulimu ogwa 'kill -l'.\n" -#: src/timeout.c:257 +#: src/timeout.c:259 #, fuzzy msgid "" "\n" @@ -13351,7 +13670,7 @@ msgstr "" "Bw'otossawo KATANDIKWA, KISEERA ziba sikonda.\n" "\n" -#: src/timeout.c:262 +#: src/timeout.c:264 #, fuzzy msgid "" "\n" @@ -13368,7 +13687,7 @@ msgstr "" "terinnatuuka, emmala yagwo eba yagwo eya bulijjo. Emirimu egimu\n" "tegiwulira 'TERM' era gyo gyetaaga kugisindikira ekya KILL (9).\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -13383,6 +13702,11 @@ msgstr "wazzewo kiremya mu kulindirira kiragiro" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "ekiragiro kiraze ennamba y'embeera etategeereka (0x%X)" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -13855,12 +14179,12 @@ msgstr "" "Ekiragiro kino omulimu gwa kyo kuwa sisitemu akabonero akalaga\n" "nti waliwo puloguramu eyalemeredwa okumalirizz'omulimu gwayo obulungi." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Enkozesa entuufu eri: %s KAWAYIRO... FAYIRO...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 #, fuzzy msgid "" "Shrink or extend the size of each FILE to the specified size\n" @@ -13881,13 +14205,13 @@ msgstr "" "Ekitundu ekyongedwamu kiba kyereere.\n" "\n" -#: src/truncate.c:109 +#: src/truncate.c:82 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:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" @@ -13895,7 +14219,7 @@ msgstr "" "ennamba\n" " kigitwala nga obungi bwa buloka mu kifo kya bayiti\n" -#: src/truncate.c:115 +#: src/truncate.c:88 #, fuzzy msgid "" " -r, --reference=RFILE base size on RFILE\n" @@ -13907,7 +14231,7 @@ msgstr "" " -s, --size=BUNENE Buno bwo bukireetera okutegeka\n" " obunene obwa fayiro ne buba BUNENE\n" -#: src/truncate.c:121 +#: src/truncate.c:94 #, fuzzy msgid "" "\n" @@ -13928,65 +14252,70 @@ msgstr "" " gy'osobola okugabizaamu BUNENE. Bw'ebulako oba bw'esukkako ku BUNENE,\n" " eyongezebwko okutuusa lw'esobola okugabizibwamu BUNENE.\n" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" "obungi bwa bayiti, % * %, ez'oku\n" "fayiro %s nnamba etajja mu ggwanika zzibizi" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "obunene obwa %s buliko kiremya, bulabika ng'ennamba ey'ebbanja" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "sisobola okuzuula obunene obwa %s" -#: src/truncate.c:205 +#: src/truncate.c:178 #, 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:215 +#: src/truncate.c:188 #, 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:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "nnemedwa %s okugitemamu esigalemu bayiti %" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "" "fayiro ezifuga enkyuka mu bunene bwa\n" "zinnaazo otegese esukka mu emu" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "namba %s tekkirizibwa" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "oteekwa okutegekawo kimu ku %s oba %s" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "oteekwa okutegekawo %s awali %s" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "%s kitegekedwa naye %s kyo tekitegekedwa" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "nnemedwa okubikkula %s ngiwandikemu" @@ -13997,12 +14326,10 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Enkozesa entuufu eri: %s [KAWAYIRO] [FAYIRO]\n" "Ekiragiro kino kisoma FAYIRO ne kibala nti buli bigambo bibiri bye kisanga\n" @@ -14013,12 +14340,17 @@ msgstr "" "ekiragiro kikola ku bye kiraba awayingizibwa awa bulijjo.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: mu biyingizibwa mulimu ekigambo ekitaliko kinne wa kyo" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "" @@ -14101,9 +14433,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "Ekiragiro kino buli we kisanga akabonero akategeeza akabanga akatwala\n" "ekifo ekimu mu FAYIRO kizzawo akategeeza oluseetuka.\n" @@ -14189,8 +14519,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -14201,7 +14531,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -14372,11 +14702,6 @@ msgstr "" "tekinnatuuka\n" "kigibaliramu.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -14401,13 +14726,17 @@ msgstr "" "erinnya lya fayiro batera okukozesa erya %s.\n" "\n" -#: src/wc.c:117 -#, fuzzy +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -14425,12 +14754,13 @@ msgstr "" " -l, --lines Buno bwo bukireetera okukoma ku kuwandika\n" " obungi bw'ennyiriri\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=F Kano bwe kabaako, kakireetera okukola ku\n" @@ -14630,10 +14960,10 @@ msgstr "" "Ekivaamu eky'okuyisa ekiragiro kino kye kimu n'eky'okuyisa ekya 'id -un'.\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: erinnya ery'omukozesa ow'ennamba %lu linnemye okuzuula\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "erinnya ery'omukozesa ow'ennamba %lu linnemye okuzuula" #: src/yes.c:41 #, c-format @@ -14653,6 +14983,333 @@ msgstr "" "Kino kigenda nga kiddinngana okuwandika KIGMABO oba BIGAMBO ku lunyiriri\n" "olupya. Bw'obeera towadde KIGMABO oba BIGMABO, kiwandikamu 'y'.\n" +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "BUNGI bwe kiba tekisukka mu 10, ekiragiro tekiwandikawo mitwe\n" +#~ "gy'empapula era kirekayo okuwandika obubonero obulagira\n" +#~ "kutandika lupya bwe kisanga mu FAYIRO. kwe kugamba nti kyeyisa\n" +#~ "nga eyakozesezza n'akawayiro '-t'. Agumenti eya FAYIRO\n" +#~ "bw'otogiteekawo, kyo kirinda kukola ku by'owandika\n" +#~ "awayingizibwa awa bulijjo.\n" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Bw'oba towadde FAYIRO, oba nga FAYIRO ogiwadde nga '-', ekiragiro kisoma\n" +#~ "ebiva ku nnono eya bulijjo.\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Ekiragiro kino kiwaliriza buloka ezikyuseemu zikazzibwe ku disiki,\n" +#~ "semabuloka ne kigitumbula okunyweeza enkyuukakyuuka zino.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "agumenti zonna nzibodde" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: eno namba tekola wano" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: olw'obunene bwayo obusukkiridde, %s tesobola okulagibwa" + +#~ msgid "number of lines" +#~ msgstr "obungi bw'ennyiriri" + +#~ msgid "number of bytes" +#~ msgstr "obungi obwa bayiti" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: tekigasa kubuukako ebitundu ebibazi ebyenkana awo" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: obwo obungi bwa bayiti tebusoboka" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: obwo obungi bw'ennyiriri tebusoboka" + +#~ msgid "number in %s is too large" +#~ msgstr "%s erimu ennamba eyitiridde obunene" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: buno obungi bwa sikonda tebukkirizibwa" + +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "tekisobose okwongerako guluupu ey'enyongeza" + +#, fuzzy +#~ 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 "" +#~ "\n" +#~ "Bw'osindikira omulimu ogwa 'dd' ekiragiro ekya %s kiguleetera\n" +#~ "okusibamu ne gumala okuwandikira awasindikibwa bulijjo ebifa ku\n" +#~ "kiremya obungi obw'ebiwandise bye gwakasoma n'okuwandika. Ekyo bwe\n" +#~ "kiggwa omulimu gweyongerayo.\n" +#~ "\n" +#~ " $ dd if=/dev/zero of=/dev/null& pid=$!\n" +#~ " $ kill -%s $pid; sleep 1. -kill $pid\n" +#~ " ebiwandise 10899206+0 bisomedwa\n" +#~ " ebiwandise 10899206+0 biwandikidwa\n" +#~ " bayiti 9387674624 (9.4 GB) zikoppedwa, sikonda 34.6279, 271 MB/s\n" +#~ "\n" +#~ "Obuwayiro buno bwe bukkirizibwa:\n" +#~ "\n" + +#~ 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 KABONERO Bino bitegeka nti mu kiwandikiro bw'oyingiza " +#~ "KABONERO,\n" +#~ " akabonero k'oddako okuyingiza kalabikabulabisi ne " +#~ "bwe\n" +#~ " kandibadde nga bulijjo kakolawo ekyenjawulo\n" +#~ " quit KABONERO Bino byo bitegeka nti bw'oyingiza KABONERO,\n" +#~ " ekiwandikiro kimazisa pulogulamu gye kibadde kifuga\n" +#~ " * rprnt KABONERO Bino bitegeka nti bw'oyingiza KABONERO ekiwandikiro\n" +#~ " kiddamu obuto olunyiriri lw'oliko\n" +#~ " start KABONERO Bino bitegeka nti bw'obanga obadde oyimirizza " +#~ "ebivamu\n" +#~ " mu mulimu ogwa pulogulamu efugibwa ekiwandikiro kyo,\n" +#~ " bw'oyingiza KABONERO ebivaamu ebyo biddamu " +#~ "okukolebwa\n" + +#, 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" +#~ "Ebifuga ensindika ey'obubaka:\n" +#~ " [-]clocal Kino kigyamu obubonero obufuga modemu\n" +#~ " [-]cread Kino kikkirizisa ekiwandikiro okuwerezebwa obubonero\n" +#~ " * [-]crtscts Kino kireetera ekiwandikiro okukozesa enkola eya RTS/" +#~ "CTS\n" +#~ " mu kulunngamya empanyisigana ey'obubonero\n" +#~ " csN kino kitegeka nti obubonero bunaabangamu biti N. N\n" +#~ " esobola okubeera kimu ku 5, 6, 7 oba 8\n" + +#~ 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 "" +#~ "\n" +#~ "Ebifuga ebivaamu ebyimirimu ku kiwandikiro oba mutwe gwa kompyuta:\n" +#~ " * bsN Kino kitegeka ebbanga eriyitawo okuva ekiwandikiro\n" +#~ " lwe kifuna akabonero akalagira okusiimula okudda\n" +#~ " mabega ne lwe kituukiriza ekiragiro ekyo oba " +#~ "akabonero\n" +#~ " ne kikasindika ku kigenderwa ekirala. N esobola " +#~ "okuba\n" +#~ " 0 oba 1\n" +#~ " * crN Kino kitegeka ebbanga eriyitawo okuva ekiwandikiro " +#~ "lwe\n" +#~ " kifuna akabonero akalagira akasonga okudda ku " +#~ "ntadikwa\n" +#~ " y'olunyiriri ne lwe kituukiriza ekiragiro ekyo oba\n" +#~ " akabonero ne kikasindika ku kigenderwa ekirala. N " +#~ "esobola\n" +#~ " okuba 0, 1, 2 oba 3\n" +#~ " * ffN Kino kitegeka ebbanga eriyitawo okuva ekiwandikiro " +#~ "lwe\n" +#~ " kifuna akabonero akakiragira okuba " +#~ "ng'ekikyusizz'olupapula\n" +#~ " ne lwe kituukiriza ekiragiro ekyo oba akabonero ne\n" +#~ " kikasindika ku kigenderwa ekirala. N esobola okuba 0 " +#~ "oba 1\n" +#~ " * nlN Kino kitegeka ebbanga eriyitawo okuva ekiwandikiro " +#~ "lwe\n" +#~ " kifuna akabonero akalagira okutadika lunyiriri olupya " +#~ "ne\n" +#~ " lwe kituukiriza ekiragiro ekyo oba akabonero ne " +#~ "kikasindika\n" +#~ " ku kigenderwa ekirala. N esobola okuba 0 oba 1\n" + +#, fuzzy +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl Kino kitegeka nti ekiwandikiro buli kabonero " +#~ "akalagira\n" +#~ " akasonga kudda ku ntandikwa y'olunyiriri akakituukako " +#~ "kyo\n" +#~ " kizzaawo akalagira kutandika lunyiriri lupya\n" +#~ " * [-]ofdel Kino kyo kitegeka nti ekiwandikiro bwe kiba " +#~ "kikyalinda\n" +#~ " kuwereza akabonero akakiyingizidwa kigira nga " +#~ "kiwereza\n" +#~ " obulagira kusiimula nga bwe bukola nga obulaga nti " +#~ "waliwo\n" +#~ " okulinda, mu kifo eky'okuwereza obwa mpiri\n" +#~ " * [-]ofill Kino kitegeka nti ekiwandikiro bwe kiba kirina " +#~ "kusooka\n" +#~ " kulekayo kuwereza obubonero bwe kifunye, mu kifo\n" +#~ " eky'okusirikabusirisi kigira nga kiwerezamu obubonero " +#~ "bwa\n" +#~ " kujjuzamu biseera\n" +#~ " * [-]olcuc Kino kitegeka nti ekiwandikiro buli kabonero akaba " +#~ "ka\n" +#~ " nukuta ntono ke kifuna kizzaawo akabonero aka nukuta " +#~ "eyo\n" +#~ " nga nnene\n" +#~ " * [-]onlcr Kino kitegeka nti tty bw'efuna akabonero akalagira\n" +#~ " kutandika lunyiriri lupya yo ezzawo akalagira " +#~ "akasonga\n" +#~ " okudda ku ntadikwa y'olunyiriri\n" +#~ " * [-]onlret Kino ate kyo kitegeka nti akabonero akalagira " +#~ "kutundika\n" +#~ " lunyiriri lupya kava ku nkola eyo ne kaba nga " +#~ "kalagira\n" +#~ " akasonga kudda ku ntandikwa y'olunyiriri\n" + +#~ 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 "" +#~ " * [-]onocr Kino kitegeka nti obubonero obulagira akasonga kudda " +#~ "ku\n" +#~ " ntandikwa y'olunyiriri tebulabika bwe buba nga bwe " +#~ "bubonero\n" +#~ " obusooka mu lunyiriri olwandikubisidwa ku kyapa\n" +#~ " [-]opost Kino kitegeka nti ebivaamu eby'oku kiwandikiro oba " +#~ "mutwe\n" +#~ " gwa kompyuta bisooka kubako ebibikolebwako nga\n" +#~ " tebinnawerezebwa awalala\n" +#~ " * tabN Kino kitegeka ebbanga eriyitawo okuva ekiwandikiro " +#~ "lwe\n" +#~ " kifuna akabonero akalagira kukolawo oluseetuka\n" +#~ " olw'omumbiriizi ne lwe kituukiriza ekiragiro ekyo " +#~ "oba\n" +#~ " akabonero ne kikasindika. N esobola kuba 0, 1, 2 oba " +#~ "3\n" +#~ " * tabs Kino kikola nga awabadde 'tab0'\n" +#~ " * -tabs Kino kikola nga awabadde 'tab3'\n" +#~ " * vtN Kino kitegeka ebbanga eriyitawo okuva ekiwandikiro " +#~ "lwe\n" +#~ " kifuna akabonero akalagira kukolawo oluseetuka\n" +#~ " olw'omubusimba ne lwe kituukiriza ekiragiro ekyo oba\n" +#~ " akabonero ne kikasindika. N esobola kuba 0 oba 1\n" + +#, fuzzy +#~ 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 "" +#~ " * [-]ctlecho Kino kitegeka nti obubonero obufuga ekiwandikiro " +#~ "bulagibwa\n" +#~ " mu mpandika 'ey'akakofiira' ('^c')\n" +#~ " [-]echo Kino kitegeka nti buli kabonero akawerezebwa ku " +#~ "kiwandikiro\n" +#~ " era kalabika\n" +#~ " * [-]echoctl Kino kikola nga [-]ctlecho\n" +#~ " [-]echoe Kino kikola nga [-]crterase\n" +#~ " [-]echok Kino kitegeka nti ekiwandikiro buli lwe kiraga " +#~ "akabonero\n" +#~ " akasiimula olunyiriri olulamba kizzaako akabonero " +#~ "akalagira\n" +#~ " kutandika lunyiriri lupya\n" + +#, fuzzy +#~ 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 "" +#~ " * [-]echoke Kino kikola nga awabadde [-]crtkill\n" +#~ " [-]echonl Kino kitegeka nti ekiwandikiro kiraga obubonero " +#~ "obulagira\n" +#~ " kutandika lunyiriri lupya, ne bwekiba nga obubonero\n" +#~ " obukifuga obulala bwo tekibulaga\n" +#~ " * [-]echoprt Kino kitegeka nti ekiwandikiro obubonero obugenda\n" +#~ " busiimulwawo kisooka kubulaga, nga kibuwandise " +#~ "kitandikira\n" +#~ " ku kasembye kusiimulwa ate nga buteeredwa wakati\n" +#~ " w'obubonero obwa '\\' ne '/'\n" +#~ " [-]icanon Kino kitegeka nti osobola okukozesa obubonero " +#~ "bwayawulibwa\n" +#~ " bukongojjenga ebiragiro ebya 'kill', 'werase' ne " +#~ "rprnt'\n" +#~ " [-]iexten Kino kyo kitegeka nti osobola okukozesa obubonero\n" +#~ " obutagoberera mutindo ogwa POSIX\n" + +#~ 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 "" +#~ " dec Kino kikola ng'eyagattise\n" +#~ " 'echoe echoctl echoke -ixany intr ^c erase 0177 kill " +#~ "^u'\n" +#~ " * [-]decctlq Kino kikola kimu ne '[-]ixany'\n" +#~ " ek Kino kireetera ekiragiro eky'okusiimula akabonero " +#~ "kamu\n" +#~ " n'eky'okusiimulawo olunyiriri olulamba okudda ku " +#~ "bubonero\n" +#~ " obubireetawo obwa bulijjo\n" +#~ " evenp Kino kikola ng'eyagattise 'parenb -parodd cs7'\n" + +#~ 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" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: erinnya ery'omukozesa ow'ennamba %lu linnemye okuzuula\n" + #~ msgid "" #~ "\n" #~ "Examples:\n" @@ -14824,28 +15481,6 @@ msgstr "" #~ msgid "accessing %s" #~ msgstr "n'etuusako %s" -#~ msgid "" -#~ "Display the current time in the given FORMAT, or set the system date.\n" -#~ "\n" -#~ " -d, --date=STRING display time described by STRING, not `now'\n" -#~ " -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -#~ msgstr "" -#~ "Ekiragiro kino kiwandika essaawa nga ziwandikidwa mu MPANDIKA. Era " -#~ "kyeyambisibwa okutegeka obudde n'ennaku sisitemu by'ekolerako.\n" -#~ "\n" -#~ " -d, --date=BUDDE Buno bukireetera okuwandika BUDDE mukifo " -#~ "ekya \n" -#~ " obwa kakati (singa BUDDE kiba 'now' " -#~ "ekiragiro\n" -#~ " kiwandika obudde obwa kakano)\n" -#~ " -f, --file=FAYIRO Buno bukireetera okusoma FAYIRO kiryoke " -#~ "kiwandike\n" -#~ " obudde obuwandikidwa ku buli lunyiriri lwa " -#~ "yo.\n" -#~ " FAYIRO bw'ebeera - , kisoma ebiva ku nnono " -#~ "eya\n" -#~ " bulijjo\n" - #~ msgid "opening %s" #~ msgstr "mbikkula %s" diff --git a/po/lt.gmo b/po/lt.gmo index 644324c5..071b40c5 100644 Binary files a/po/lt.gmo and b/po/lt.gmo differ diff --git a/po/lt.po b/po/lt.po index 792c7b91..699a2a82 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4,11 +4,12 @@ # # Gintautas Miliauskas , 2008, 2009. # Andrius Štikonas , 2009. +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils-7.1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2009-03-25 17:13+0200\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" @@ -37,18 +38,18 @@ msgstr "Galimi argumentai:" msgid "error closing file" msgstr "klaida užveriant failą" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "rašymo klaida" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "" @@ -233,57 +234,62 @@ msgstr "Netaisyklingai užkoduota parametro eilutė" msgid "Unknown error" msgstr "Nežinoma klaida" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: parametras `%s' dviprasmis\n" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: parametras „-W %s“ dviprasmis\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: argumentas „--%s“ neleidžia parametro\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: argumentas „%c%s“ neleidžia parametro\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, fuzzy, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: parametrui „%s“ reikia argumento\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: neatpažintas argumentas „--%s“\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: neatpažintas argumentas „%c%s“\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: netaisyklingas argumentas – %c\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: parametrui reikia argumento – %c\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: parametras „-W %s“ dviprasmis\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: parametras „-W %s“ neleidžia argumento\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, fuzzy, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: parametrui „%s“ reikia argumento\n" @@ -293,13 +299,13 @@ msgstr "%s: parametrui „%s“ reikia argumento\n" msgid "cannot change permissions of %s" msgstr "neįmanoma pakeisti %s teisių" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "neįmanoma sukurti %s aplanko" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "baigėsi atmintis" @@ -348,6 +354,12 @@ msgstr "“" msgid "%s: end of file" msgstr "%s: failo pabaiga" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: skaitymo klaida" + #: lib/regcomp.c:131 msgid "Success" msgstr "Sėkmė" @@ -455,7 +467,7 @@ msgstr "^[yYtT]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "nustatomos %s teisės" @@ -891,7 +903,7 @@ msgstr "" "\n" "Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -901,15 +913,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -918,51 +922,51 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "skaitymo klaida" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "netinkama įvestis" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "papildomas operandas %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "užveriama standartinė įvestis" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1005,38 +1009,44 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "trūksta operando" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Naudojimas: %s [PARAMETRAI]... [FAILAS]...\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"Spausdinti pasirinktas eilutes ekrane iš kiekvieno FAILO.\n" +"\n" + +#: src/cat.c:98 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" @@ -1046,7 +1056,7 @@ msgid "" " -s, --squeeze-blank suppress repeated empty output lines\n" msgstr "" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1058,7 +1068,7 @@ msgstr "" " -u (ignoruojamas)\n" " -v, --show-nonprinting naudoti ^ ir M- žymėjimą, išskyrus LFD ir TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1071,17 +1081,18 @@ msgstr "" "%s f - g Išvesti f turinį, tada standartinę įvestį, poto g turinį.\n" "%s Kopijuoti standartinę įvestį į standartinę išvestį.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "negaliu įvykdyti ioctl %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "standartinė išvestis" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: įvesties failas yra išvesties failas" @@ -1093,10 +1104,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1110,8 +1121,8 @@ msgstr "" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "" @@ -1126,13 +1137,13 @@ msgstr "" msgid "failed to change context of %s to %s" msgstr "" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "negaliu pasiekti %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "negaliu perskaityti %s aplanko turinio" @@ -1148,7 +1159,7 @@ msgstr "keičiamos %s teisės" msgid "fts_read failed" msgstr "nepavyko fts_read" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, fuzzy, c-format msgid "fts_close failed" @@ -1242,7 +1253,7 @@ msgid "-R -h requires -P" msgstr "-R -h reikalauja -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1259,9 +1270,8 @@ msgid "conflicting security context specifiers given" msgstr "" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "nepavyko gauti %s parametrų" @@ -1537,17 +1547,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "netinkama grupė %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, fuzzy, c-format msgid "invalid group list %s" msgstr "netinkama grupė %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1556,7 +1566,7 @@ msgstr "" "Naudojimas: %s NAUJAŠAKNIS [KOMANDA...]\n" "arba: %s NUSTATYMAS\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1564,13 +1574,20 @@ msgstr "" "Įvykdyti KOMANDĄ su šakniniu aplanku, kuris nustatytas į NAUJAŠAKNIS\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:207 #, fuzzy msgid "" "\n" @@ -1579,42 +1596,47 @@ msgstr "" "\n" "Jei nenurodyta komanda, vykdyti ``${SHELL} -i'' (numatytasis: /bin/sh).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "nepavyko pakeisti šakninio aplanko į %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "nepavyko atverti šakninio aplanko" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "Nepavyko pakeisti %s grupės į %s\n" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" -msgstr "nepavyko atverti %s" +msgid "failed to set supplemental groups" +msgstr "Nepavyko pakeisti %s grupės į %s\n" -#: src/chroot.c:402 +#: src/chroot.c:418 #, fuzzy, c-format msgid "failed to set group-ID" msgstr "nepavyko atverti %s" -#: src/chroot.c:405 +#: src/chroot.c:421 #, fuzzy, c-format msgid "failed to set user-ID" msgstr "nepavyko atverti %s" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, fuzzy, c-format msgid "failed to run command %s" msgstr "nepavyko įvykdyti komandos %s" @@ -1656,7 +1678,16 @@ msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "" "Palyginti surikiuotus failus FAILAS1 ir FAILAS2 pagal kiekvieną eilutę.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1664,7 +1695,7 @@ msgid "" "and column three contains lines common to both files.\n" msgstr "" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1672,7 +1703,7 @@ msgid "" " -3 suppress column 3 (lines that appear in both files)\n" msgstr "" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1680,17 +1711,17 @@ msgid "" " --nocheck-order do not check that the input is correctly sorted\n" msgstr "" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1699,310 +1730,324 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "failas %d nesurikiuotas" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "neleidžiamas tuščias %s" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "nepavyko įvykdyti lseek failui %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "klaida skaitant %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "nepavyko įvykdyti lseek failui %s" +msgid "error reading %s" +msgstr "klaida skaitant %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "klaida rašant %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "klaida skaitant %s" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "nepavyko gauti %s parametrų" -#: src/copy.c:383 +#: src/copy.c:478 #, fuzzy, c-format msgid "%s: write failed" msgstr "%s: rašymo klaida" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "nepavyko atverti %s" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "nepavyko išlaikyti %s savininko" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "nepavyko rasti failo %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "nepavyko išlaikyti %s autoriaus" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "nepavyko užverti aplanko %s" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "keičiamos %s teisės" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "nepavyksta atverti skaitymui %s" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "nepavyksta įvykdyti fstat %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "failas %s praleidžiamas, jis buvo pakeistas, kol buvo kopijuojamas" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "nepavyko pašalinti %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "pašalintas %s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "nepavyko sukurti paprasto failo %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" msgstr "nepavyko užverti aplanko %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "išlaikomos %s datos" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "nepavyko atverti %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "" -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: perrašyti %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (atsarginė kopija: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "nepavyko sukurti kietosios nuorodos %s į %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "nepavyksta patikrinti %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "praleidžiamas aplankas %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "perspėjimas: išeities failas %s nurodytas kelis kartus" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s ir %s yra tas pats failas" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "nepavyksta perrašyti ne aplanką %s naudojant aplanką %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "nebus perrašoma, tik sukuriama %s su %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "nepavyko pakeisti aplanko %s su ne aplanku" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "nepavyko perkelti aplanko ant ne aplanko: %s -> %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "saugojant %s būtų sunaikinta šaltinis; %s neperkelta" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "saugojant %s būtų sunaikintas šaltinis; %s nenukopijuota" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "nepavyko padaryti atsarginės %s kopijos" -#: src/copy.c:2107 +#: src/copy.c:2187 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "" -#: src/copy.c:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "negalima kopijuoti aplanko %s į patį save, %s" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "perspėjimas: išeities failas %s nurodytas kelis kartus" + +#: src/copy.c:2294 #, c-format msgid "will not create hard link %s to directory %s" msgstr "nepavyko sukurti kietosios nuorodos %s į aplanką %s" -#: src/copy.c:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "nepavyko perkelti %s į žemiau esantį savo aplanką, %s" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "negaliu perkelti %s į %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "negalima nukopijuoti cikliškos simbolines nuorodos %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "nepavyksta susieti %s su %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "negalima sukūrti fifo %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "nepavyksta sukurti specialaus failo %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "negaliu perskaityti simbolinės nuorodos %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "negaliu sukurti simbolinės nuorodos %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s yra nežinomo tipo failas" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "nepavyko atkurti %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (atkurti)\n" @@ -2012,25 +2057,25 @@ msgstr "%s -> %s (atkurti)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, fuzzy, c-format msgid "unknown program %s" msgstr "nežinomas srautas" @@ -2214,8 +2259,8 @@ msgstr "%s jau yra, bet nėra aplankas" msgid "failed to access %s" msgstr "nepavyko atverti %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "trūksta failo operando" @@ -2288,132 +2333,132 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: eilutės numeris už ribų" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: eilutės numeris už ribų" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr "" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: nerasta atitikimų" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "%s rašymo klaida" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: po skirtuko tikimasi rasti sveikąjį skaičių" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: „}“ yra privalomas kartojimo skaičiavime" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: tarp „{“ ir „}“ reikalingas sveikas skaičius" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: trūksta „%c“ uždarančiojo skirtuko" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: netaisyklinga paprasta išraiška: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: netaisyklingas šablonas" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, 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:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" msgstr "%s: netaisyklingas skaičius" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Naudojimas: %s [PARAMETRAS]... FAILŲ ŠABLONAS...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 #, fuzzy msgid "" "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n" @@ -2423,7 +2468,16 @@ msgstr "" "ir į standartinę išvestį išvedamas baitų skaičius kiekvienoje dalyje.\n" "\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Jeigu FAILAS yra -, skaityti iš standartinės įvesties. Galimi ŠABLONAI:\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2431,11 +2485,11 @@ msgid "" " -k, --keep-files do not remove output files on errors\n" msgstr "" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2445,18 +2499,11 @@ 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:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Jeigu FAILAS yra -, skaityti iš standartinės įvesties. Galimi ŠABLONAI:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 #, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2495,7 +2542,7 @@ msgstr "" "Spausdinti pasirinktas eilutes ekrane iš kiekvieno FAILO.\n" "\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2506,7 +2553,7 @@ msgstr "" " -d, --delimiter=SKIRTUKAS panaudoti SKIRTUKĄ vietoj TABo kaip laukų " "skirtuką.\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2519,7 +2566,7 @@ msgstr "" " -s parametras yra apibrėžtas\n" " -n (ignoruojama)\n" -#: src/cut.c:193 +#: src/cut.c:194 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2528,14 +2575,14 @@ msgstr "" " --complement rinkinio papildymas pasirinktais baitais, ženklais\n" " arba laukais\n" -#: src/cut.c:197 +#: src/cut.c:198 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:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2543,7 +2590,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:210 +#: src/cut.c:211 msgid "" "Each range is one of:\n" "\n" @@ -2551,55 +2598,54 @@ msgid "" " 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:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "turite pateikti baitų, ženklų ar laukų sąrašą" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "laukelio numeris %s per didelis" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "gali būti nurodytas tik vienas sąrašo tipas" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "skirtukas turi būti vienas simbolis" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "turite pateikti baitų, ženklų ar laukų sąrašą" -#: src/cut.c:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2607,11 +2653,11 @@ msgstr "" "linijų be skirtukų rodymo blokavimas yra prasmingas\n" "\ttik operacijoms su laukais" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "trūksta laukų sąrašo" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "trūksta pozicijų sąrašo" @@ -2629,34 +2675,53 @@ msgid "Display the current time in the given FORMAT, or set the system date.\n" msgstr "" #: src/date.c:134 +#, fuzzy +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" +"Parodo dabartinį laiką duotu FORMATU, arba nustatyti sisteminį laiką\n" +" -d, --date=STRING parodo laiką apibrėžtą STRINGU, ne dabartinį (now)\n" +" -f, --file=DATAFILE kaip --date, vieną kartą kiekvienai linijai DATAFILE " +"faile\n" + +#: src/date.c:138 +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" +msgstr "" + +#: src/date.c:145 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" -#: src/date.c:142 +#: src/date.c:149 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" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" -#: src/date.c:147 +#: src/date.c:155 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 (UTC)\n" +" -r, --reference=FILE display the last modification time of FILE\n" msgstr "" #: src/date.c:158 +msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 #, fuzzy msgid "" "\n" @@ -2673,7 +2738,7 @@ msgstr "" " %% procento ženklas %\n" " %a lokalusis savaitės dienos sutrumpinimas (pvz., pirm)\n" -#: src/date.c:165 +#: src/date.c:171 #, fuzzy msgid "" " %A locale's full weekday name (e.g., Sunday)\n" @@ -2686,7 +2751,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:171 +#: src/date.c:177 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2699,7 +2764,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:177 +#: src/date.c:183 #, fuzzy msgid "" " %F full date; same as %Y-%m-%d\n" @@ -2712,7 +2777,7 @@ msgstr "" " %G metai atitinkantys ISO savaitės numeriui (žiūrėkite %V); įprastai " "naudinga tik su %V\n" -#: src/date.c:182 +#: src/date.c:188 #, fuzzy msgid "" " %h same as %b\n" @@ -2725,7 +2790,7 @@ msgstr "" " %I valanda (01...12)\n" " %j metų diena (001...366)\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2733,7 +2798,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2744,7 +2809,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2752,7 +2817,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:209 +#: src/date.c:215 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" @@ -2760,7 +2825,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2768,7 +2833,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2780,7 +2845,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2791,7 +2856,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2800,7 +2865,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -2814,35 +2879,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "standartinė įvestis" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "klaidinga data %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "buvo pateikta daug išeities formatų" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2850,30 +2915,30 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "negalima nustatyti datos" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" " or: %s OPTION\n" msgstr "" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -2884,7 +2949,7 @@ msgid "" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -#: src/dd.c:541 +#: src/dd.c:570 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2893,11 +2958,13 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -2908,7 +2975,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -2923,7 +2990,7 @@ msgid "" " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2933,7 +3000,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2942,123 +3009,103 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 +#: src/dd.c:661 #, 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:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" - -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "" -msgstr[1] "" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "" @@ -3072,168 +3119,182 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr "" -#: src/dd.c:877 +#: src/dd.c:809 +#, c-format +msgid ", %.6f s, %s/s" +msgstr "" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "" +msgstr[1] "" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "" -#: src/dd.c:1089 +#: src/dd.c:1142 #, fuzzy, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "nepavyko pašalinti %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "rašoma į %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "" -#: src/dd.c:1285 +#: src/dd.c:1376 #, fuzzy msgid "invalid conversion" msgstr "nesamas naudotojas" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 #, fuzzy msgid "invalid input flag" msgstr "klaidinga data %s" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 #, fuzzy msgid "invalid output flag" msgstr "nesama grupė" -#: src/dd.c:1294 +#: src/dd.c:1385 #, fuzzy -msgid "invalid status flag" +msgid "invalid status level" msgstr "klaidinga data %s" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "" -#: src/dd.c:1424 +#: src/dd.c:1527 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "nepavyksta suderinti režimo ir --reference parametro" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" " of mt_type=0x%0lx -- see for the list of types" msgstr "" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: nepavyksta praleisti" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "nepavyko atverti %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, fuzzy, c-format msgid "failed to discard cache for: %s" msgstr "nepavyko išlaikyti %s laikų" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3314,12 +3375,12 @@ msgstr "" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3327,18 +3388,18 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3347,20 +3408,33 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:1409 +#: src/df.c:1429 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" +msgstr "" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --complement rinkinio papildymas pasirinktais baitais, ženklais\n" +" arba laukais\n" + +#: src/df.c:1439 +msgid "" " -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:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3368,25 +3442,25 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, fuzzy, c-format msgid "options %s and %s are mutually exclusive" msgstr "parametrai specifikuojantys datas spausdinimui išskiria vieni kitus" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Dėmesio: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "" @@ -3476,7 +3550,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3484,7 +3558,8 @@ msgid "" msgstr "" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" #: src/du.c:291 @@ -3568,61 +3643,55 @@ msgstr "" msgid "Infinity" msgstr "" -#: src/du.c:636 +#: src/du.c:657 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "nepavyko fts_read" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "netinkamas argumentas %s" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: skaitymo klaida" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "viso" @@ -3735,9 +3804,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "\n" "Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" @@ -3779,7 +3846,7 @@ msgid "input line is too long" msgstr "įvesties eilutė per ilga" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -3885,12 +3952,12 @@ msgstr "" msgid "non-integer argument" msgstr "ne skaitinis argumentas" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "dalyba iš nulio" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "nustatykite LC_ALL='C', kad išvengtumėte problemos" @@ -3901,31 +3968,31 @@ msgid "the strings compared were %s and %s" msgstr "buvo palygintos eilutės %s ir %s" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s yra per didelis" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -3934,7 +4001,7 @@ msgstr "" "Naudojimas: %s [SKAIČIUS]...\n" " arba: %s PARAMETRAS\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -3973,7 +4040,7 @@ msgid "" "The option -WIDTH is an abbreviated form of --width=DIGITS.\n" msgstr "" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -3981,7 +4048,7 @@ msgid "" " -s, --split-only split long lines, but do not refill\n" msgstr "" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -3990,35 +4057,36 @@ msgid "" " -g, --goal=WIDTH goal width (default of 93% of width)\n" msgstr "" -#: src/fmt.c:359 +#: src/fmt.c:356 #, 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" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "netinkamas plotis: %s" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +#, fuzzy +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" +"Spausdinti pasirinktas eilutes ekrane iš kiekvieno FAILO.\n" +"\n" -#: src/fold.c:77 +#: src/fold.c:76 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 "" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" +msgstr "%s: netaisyklingas skaičius" #. This is a proper name. See the gettext manual, section Names. #: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 @@ -4084,14 +4152,13 @@ msgstr "negalima nustatyti datos" msgid "%s: no such user" msgstr "%s: nėra tokio naudotojo" -#: src/head.c:109 +#: src/head.c:110 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 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4101,13 +4168,13 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:125 +#: src/head.c:126 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 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4115,48 +4182,36 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "" -#: src/head.c:886 +#: src/head.c:267 #, c-format -msgid "%s: %s is so large that it is not representable" +msgid "%s: number of bytes is too large" msgstr "" -#: src/head.c:887 -msgid "number of lines" -msgstr "eilučių skaičius" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "baitų skaičius" - -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "" @@ -4324,7 +4379,7 @@ msgstr "" msgid "cannot set time stamps for %s" msgstr "" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "" @@ -4440,7 +4495,7 @@ msgstr "" msgid "target directory not allowed when installing a directory" msgstr "" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "netinkamos teisės %s" @@ -4475,15 +4530,19 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +msgid "" "\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:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -4491,7 +4550,7 @@ msgid "" " -t CHAR use CHAR as input and output field separator\n" msgstr "" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -4503,11 +4562,11 @@ msgid "" " print them without trying to pair them\n" msgstr "" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -4526,47 +4585,47 @@ msgid "" "warning message will be given.\n" msgstr "" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "" @@ -4630,17 +4689,17 @@ msgstr "" msgid "no process ID specified" msgstr "" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, fuzzy, c-format msgid "invalid buffering mode %s for %s\n" msgstr "netaisyklingas argumentas %s %s" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -4788,7 +4847,7 @@ msgstr "negaliu sukurti simbolinės nuorodos %s" msgid "FIXME: unknown" msgstr "" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Naudojimas: %s [PARAMETRAS]\n" @@ -4801,7 +4860,7 @@ msgstr "" "išvesti dabartinio naudotojo vardą.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "" @@ -4811,7 +4870,7 @@ msgstr "" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%Y-%m-%d" @@ -4820,101 +4879,101 @@ msgstr "%Y-%m-%d" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%Y-%m-%d %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" -msgstr "" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" +msgstr "netinkamas plotis: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" -msgstr "" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" +msgstr "netinkamas naudotojas %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "" -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "Galimi argumentai:" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "neatpažintas priešdėlis: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "nepavyko atverti aplanko %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "skaitomas aplankas %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "užveriamas aplankas %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "negalima palyginti failų vardų %s ir %s" -#: src/ls.c:4781 +#: src/ls.c:4775 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:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -4923,7 +4982,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -4937,18 +4996,19 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4798 msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -4958,11 +5018,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -4971,7 +5031,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -4979,7 +5039,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -4992,7 +5052,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5004,7 +5064,7 @@ msgid "" " -k, --kibibytes default to 1024-byte blocks for disk usage\n" msgstr "" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5014,7 +5074,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5025,7 +5085,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -5037,7 +5097,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5045,21 +5105,21 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4886 +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -5073,31 +5133,32 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4908 +#: src/ls.c:4904 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:4912 +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4919 +#: src/ls.c:4915 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 security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5106,7 +5167,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5135,41 +5196,42 @@ msgstr "David Madore" 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 "" "\n" "Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 msgid "" +"\n" " -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" +#: src/md5sum.c:180 +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr "" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -5181,45 +5243,46 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "NEPAVYKO" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "OK" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" @@ -5227,7 +5290,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" @@ -5235,7 +5298,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" @@ -5243,38 +5306,38 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -5304,22 +5367,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "nepavyko gauti %s parametrų" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "nepavyko išlaikyti %s laikų" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "sukurtas aplankas %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -5488,7 +5551,7 @@ msgstr "per daug šablonų" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" @@ -5600,9 +5663,7 @@ msgstr "Scott Bartram" #: src/nl.c:179 #, fuzzy -msgid "" -"Write each FILE to standard output, with line numbers added.\n" -"With no FILE, or when FILE is -, read standard input.\n" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "\n" "Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" @@ -5677,27 +5738,27 @@ msgstr "" msgid "invalid footer numbering style: %s" msgstr "" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" -msgstr "" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" +msgstr "klaidinga data %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" -msgstr "" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" +msgstr "%s: netaisyklingas skaičius" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" -msgstr "" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" +msgstr "%s: netaisyklingas skaičius" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" -msgstr "" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" +msgstr "%s: netaisyklingas skaičius" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "" @@ -5721,7 +5782,7 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -5733,43 +5794,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "" -#: src/nohup.c:176 +#: src/nohup.c:174 #, fuzzy, c-format msgid "appending output to %s" msgstr "keičiama %s grupė" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "" @@ -5791,96 +5852,93 @@ msgid "" " --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: netaisyklingas skaičius" - #. This is a proper name. See the gettext manual, section Names. -#: src/numfmt.c:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "netinkamas naudotojas %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "netinkama įvestis" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "nepavyko išlaikyti %s laikų" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "netinkamas naudotojas %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Naudojimas: %s [PARAMETRAS]... [NAUDOTOJAS]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -5888,19 +5946,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -5910,40 +5968,40 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" msgstr "" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -5952,7 +6010,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -5960,7 +6018,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -5968,7 +6026,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -5976,7 +6034,19 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -5985,9 +6055,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -5999,7 +6070,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -6014,118 +6085,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "formatas %s neturi %% direktyvos" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "netaisyklingas datos formatas %s" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "netaisyklingas datos formatas %s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "netaisyklingas argumentas %s %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "klaidinga data %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "netinkamas argumentas %s" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "klaidinga data %s" +msgid "multiple field specifications" +msgstr "blokinis specialus failas" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "klaidinga data %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "klaida skaitant %s" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6134,18 +6217,17 @@ msgid "" "[b]]\n" msgstr "" -#: src/od.c:326 +#: src/od.c:327 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:333 +#: src/od.c:335 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" @@ -6154,7 +6236,7 @@ msgid "" "suffixes may be . for octal and b for multiply by 512.\n" msgstr "" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -6163,7 +6245,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -6176,7 +6258,7 @@ msgid "" " --traditional accept arguments in third form above\n" msgstr "" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -6187,7 +6269,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6197,7 +6279,7 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -6206,7 +6288,7 @@ msgid "" " c printable character or backslash escape\n" msgstr "" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6215,7 +6297,7 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -6224,14 +6306,14 @@ msgid "" "for sizeof(double) or L for sizeof(long double).\n" msgstr "" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -6244,55 +6326,55 @@ msgid "" "and so on for G, T, P, E, Z, Y.\n" msgstr "" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte integral type" msgstr "" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte floating point type" msgstr "" -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" msgstr "" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "" -#: src/od.c:1650 +#: src/od.c:1658 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "" @@ -6308,11 +6390,13 @@ 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" msgstr "" +"Spausdinti pasirinktas eilutes ekrane iš kiekvieno FAILO.\n" +"\n" #: src/paste.c:447 msgid "" @@ -6443,12 +6527,12 @@ msgstr "Kada" msgid "Where" msgstr "Kur" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Naudojimas: %s [PARAMETRAS]... [NAUDOTOJAS]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6458,7 +6542,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6467,7 +6551,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -6475,96 +6559,94 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:597 +#: src/pinky.c:596 #, 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 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" -#: src/pr.c:910 +#: src/pr.c:907 #, fuzzy, c-format msgid "invalid page range %s" msgstr "netinkamas argumentas %s" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" -msgstr "" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" +msgstr "%s: netaisyklingas skaičius" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +msgid "'-N NUMBER' invalid starting line number" msgstr "" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +msgid "'-o MARGIN' invalid line offset" msgstr "" -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" -msgstr "" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" +msgstr "%s: netaisyklingas skaičius" -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" -msgstr "" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" +msgstr "%s: netaisyklingas skaičius" -#: src/pr.c:1096 +#: src/pr.c:1059 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" -#: src/pr.c:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" -#: src/pr.c:1196 +#: src/pr.c:1166 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6574,7 +6656,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6584,7 +6666,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6596,7 +6678,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -6609,16 +6691,21 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2798 +#: src/pr.c:2769 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2775 +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -6628,7 +6715,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -6637,7 +6724,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -6648,17 +6735,22 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2828 +#: src/pr.c:2802 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6672,7 +6764,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -6681,16 +6773,6 @@ msgid "" " with -S or -s\n" msgstr "" -#: src/pr.c:2853 -#, fuzzy -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -6823,15 +6905,20 @@ msgid "" "files.\n" msgstr "" -#: src/ptx.c:1830 +#: src/ptx.c:1831 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:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -6839,7 +6926,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -6849,7 +6936,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -6857,20 +6944,16 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -6894,7 +6977,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "" @@ -6914,8 +6997,8 @@ msgstr "" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Naudojimas: %s [PARAMETRAS]... FAILAS...\n" @@ -7105,16 +7188,16 @@ msgstr "" #: src/rm.c:342 #, fuzzy, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: rekursyviai pašalinti visus argumentus? " msgstr[1] "%s: rekursyviai pašalinti visus argumentus? " msgstr[2] "%s: rekursyviai pašalinti visus argumentus? " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: pašalinti visus argumentus? " msgstr[1] "%s: pašalinti visus argumentus? " msgstr[2] "%s: pašalinti visus argumentus? " @@ -7293,12 +7376,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "formatas %s turi nežinomą %%%c direktyvą" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -7314,7 +7397,16 @@ msgid "" "for even very expensive hardware probing to recover the data.\n" msgstr "" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7323,7 +7415,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -7332,11 +7424,9 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:192 +#: src/shred.c:196 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.\n" @@ -7348,7 +7438,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -7359,7 +7449,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7371,7 +7461,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7380,7 +7470,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -7392,134 +7482,134 @@ msgid "" "\n" msgstr "" -#: src/shred.c:241 +#: src/shred.c:243 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:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "" -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: failas per didelis" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: šalinama" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: pašalinta" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" -msgstr "" +#, fuzzy +msgid "invalid number of passes" +msgstr "netinkamas naudotojas %s" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: blogas failo dydis" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -7527,11 +7617,11 @@ msgid "" " or: %s -i LO-HI [OPTION]...\n" msgstr "" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -7542,37 +7632,37 @@ msgid "" " -r, --repeat output lines can be repeated\n" msgstr "" -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "per daug šablonų" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" -msgstr "" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" +msgstr "klaidinga data %s" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" -msgstr "" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" +msgstr "nesama grupė: %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -7591,12 +7681,12 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "" @@ -7608,13 +7698,13 @@ msgstr "" "Spausdinti pasirinktas eilutes ekrane iš kiekvieno FAILO.\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -7622,19 +7712,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:443 +#: src/sort.c:444 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:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -7642,7 +7732,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7652,19 +7742,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -7673,7 +7763,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7682,13 +7772,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -7696,7 +7786,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7711,7 +7801,7 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -7730,129 +7820,127 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:524 +#: src/sort.c:525 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:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:884 +#: src/sort.c:883 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "nepavyksta sukurti laikino failo %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "" -#: src/sort.c:1338 +#: src/sort.c:1337 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "netinkamas argumentas %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "dviprasmis argumentas %s %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s yra per didelis" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -7860,152 +7948,153 @@ msgstr[0] "%s: parametras „-W %s“ dviprasmis\n" msgstr[1] "%s: parametras „-W %s“ dviprasmis\n" msgstr[2] "%s: parametras „-W %s“ dviprasmis\n" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "" -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "standartinė klaida" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "negalima nustatyti datos" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "%s: netaisyklingas skaičius" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "%s: netaisyklingas skaičius" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "%s: netaisyklingas skaičius" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Naudojimas: %s [PARAMETRAS]... [ĮVESTIS [PRIEŠDĖLIS]]\n" -#: src/split.c:207 +#: src/split.c:228 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 #, fuzzy msgid "" " --verbose print a diagnostic just before each\n" @@ -8014,201 +8103,206 @@ msgstr "" " --complement rinkinio papildymas pasirinktais baitais, ženklais\n" " arba laukais\n" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "kuriamas failas %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "nepavyko pašalinti %s" -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" msgstr "užveriamas aplankas %s" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "" -#: src/split.c:416 +#: src/split.c:470 #, fuzzy, c-format msgid "closing input pipe" msgstr "užveriama standartinė įvestis" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "nepavyko įvykdyti komandos %s" -#: src/split.c:427 +#: src/split.c:481 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "nepavyko užverti aplanko %s" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: netaisyklingas skaičius" -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: netaisyklingas skaičius" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" -msgstr "" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" +msgstr "netinkama įvestis" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" +msgid "empty record separator" msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "specialus simbolinis failas" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "specialus simbolinis failas" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "" -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "" -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: blogas failo dydis" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "nepavyko atverti %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "%s: neatpažintas argumentas „%c%s“\n" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: netinkama direktyva" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8219,7 +8313,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8227,30 +8321,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, fuzzy, c-format msgid "Context: %C\n" msgstr "nepavyksta įvykdyti %s" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8258,17 +8352,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8278,7 +8372,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -8290,7 +8384,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8300,7 +8394,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8313,7 +8407,7 @@ msgid "" " %T minor device type in hex, for character/block device special files\n" msgstr "" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8328,7 +8422,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8339,7 +8433,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -8394,8 +8488,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -8420,7 +8513,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "privalote nurodyti vieną iš %s arba %s" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8428,96 +8521,149 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 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:535 +#: src/stty.c:543 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:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +msgid "" " 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 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:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" msgstr "" -#: src/stty.c:559 +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" + +#: src/stty.c:614 +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 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:578 +#: src/stty.c:632 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" +msgstr "" + +#: src/stty.c:637 +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:584 +#: src/stty.c:641 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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -8525,10 +8671,13 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -8536,135 +8685,249 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +msgid "" " [-]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:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:619 +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +msgid "" " [-]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:627 +#: src/stty.c:712 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:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]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:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +msgid "" " * 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr "" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:672 +#: src/stty.c:843 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" +msgstr "" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:875 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:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -#: src/stty.c:699 +#: src/stty.c:919 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:707 +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8673,25 +8936,27 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8700,58 +8965,63 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "netinkamas argumentas %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "klaida rašant %s" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" -msgstr "" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" +msgstr "ne skaitinis argumentas" #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 @@ -8759,25 +9029,67 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Išrašo patikrinimo sumą CRC ir kiekvieno FAILO baitų skaičių.\n" +"\n" + +#: src/sum.c:68 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 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Naudojimas: %s [PARAMETRAS] [FAILAS]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" +"\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" msgstr "" -#: src/sync.c:69 +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "klaida skaitant %s" + +#: src/sync.c:124 #, c-format -msgid "ignoring all arguments" -msgstr "ignoruojami visi argumentai" +msgid "couldn't reset non-blocking mode %s" +msgstr "" -#: src/system.h:343 +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "klaida skaitant %s" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "" + +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -8786,21 +9098,29 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help parodyti šią pagalbą ir išeiti\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version išvesti informaciją apie versiją ir išeiti\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -8808,7 +9128,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -8817,7 +9137,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -8828,22 +9148,27 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -#: src/system.h:591 +#: src/system.h:613 #, 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:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -8860,9 +9185,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "\n" "Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" @@ -8874,66 +9197,65 @@ msgid "" " -s, --separator=STRING use STRING as the separator instead of newline\n" msgstr "" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "įrašas per didelis" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "nepavyksta sukurti laikino failo %s" -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "nepavyksta atverti %s rašymui" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "nepavyko išlaikyti %s laikų" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: rašymo klaida" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "nepavyksta atverti skaitymui %s" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "atskyriklis negali būti tuščias" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 +#: src/tail.c:257 #, 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 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -8941,7 +9263,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -8954,14 +9276,14 @@ msgid "" " with inotify, this option is rarely useful\n" msgstr "" -#: src/tail.c:293 +#: src/tail.c:288 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 if it is inaccessible\n" msgstr "" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -8970,7 +9292,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -8981,7 +9303,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -8991,169 +9313,168 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "" -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" -#: src/tail.c:1006 +#: src/tail.c:999 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" -#: src/tail.c:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "" -#: src/tail.c:1035 +#: src/tail.c:1032 #, c-format -msgid "%s has appeared; following end of new file" +msgid "%s has appeared; following new file" msgstr "" -#: src/tail.c:1046 +#: src/tail.c:1042 #, c-format -msgid "%s has been replaced; following end of new file" +msgid "%s has been replaced; following new file" msgstr "" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "nebeliko failų" -#: src/tail.c:1424 +#: src/tail.c:1440 #, fuzzy, c-format msgid "cannot watch parent directory of %s" msgstr "neįmanoma sukurti %s aplanko" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, fuzzy, c-format msgid "inotify resources exhausted" msgstr "baigėsi atmintis" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, fuzzy, c-format msgid "cannot watch %s" msgstr "nepavyksta patikrinti %s" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: pakeisti %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1597 #, fuzzy, c-format msgid "error reading inotify event" msgstr "klaida skaitant %s" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +msgid "invalid maximum number of unchanged stats between opens" msgstr "" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" -msgstr "" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" +msgstr "nesamas naudotojas" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "netinkamas naudotojas %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -9161,58 +9482,72 @@ msgid "" " -i, --ignore-interrupts ignore interrupt signals\n" msgstr "" -#: src/tee.c:71 +#: src/tee.c:93 +msgid "" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" +msgstr "" + +#: src/tee.c:98 msgid "" "\n" -"If a FILE is -, copy again to standard output.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "trūksta argumento po %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "netinkamas sveikasis skaičius %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "tikėtasi „)“" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "tikėtasi „)“, rasta %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: tikėtasi unarinio operatoriaus" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt nepriima -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef nepriima -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot nepriima -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "nežinomas binarinis operatorius" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: tikėtasi binarinio operatoriaus" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -9221,20 +9556,20 @@ msgid "" " or: [ OPTION\n" msgstr "" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" msgstr "" -#: src/test.c:717 +#: src/test.c:719 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 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -9243,7 +9578,7 @@ msgid "" " EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n" msgstr "" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -9253,7 +9588,7 @@ msgid "" " STRING1 != STRING2 the strings are not equal\n" msgstr "" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -9264,7 +9599,7 @@ msgid "" " INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n" msgstr "" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -9272,7 +9607,7 @@ msgid "" " FILE1 -ot FILE2 FILE1 is older than FILE2\n" msgstr "" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -9281,7 +9616,7 @@ msgid "" " -e FILE FILE exists\n" msgstr "" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -9290,7 +9625,7 @@ msgid "" " -k FILE FILE exists and has its sticky bit set\n" msgstr "" -#: src/test.c:766 +#: src/test.c:768 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" @@ -9299,7 +9634,7 @@ msgid "" " -s FILE FILE exists and has a size greater than zero\n" msgstr "" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -9308,7 +9643,7 @@ msgid "" " -x FILE FILE exists and execute (or search) permission is granted\n" msgstr "" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -9317,33 +9652,33 @@ msgid "" "INTEGER may also be -l STRING, which evaluates to the length of STRING.\n" msgstr "" -#: src/test.c:786 +#: src/test.c:788 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 +#: src/test.c:793 msgid "test and/or [" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 #, fuzzy msgid "missing ']'" msgstr "trūksta „]“" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "" @@ -9363,7 +9698,7 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -9372,11 +9707,11 @@ msgstr "" "Naudojimas: %s KOMANDA [ARG]...\n" " arba: %s PARAMETRAS\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -9394,7 +9729,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9402,7 +9737,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -9413,7 +9748,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -9428,6 +9763,11 @@ msgstr "klaida rašant %s" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -9705,12 +10045,12 @@ msgstr "" msgid "Exit with a status code indicating failure." msgstr "" -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Naudojimas: %s PARAMETRAS... FAILAS...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -9721,22 +10061,22 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -9744,57 +10084,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "negalima sukūrti fifo %s" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "" -#: src/truncate.c:303 +#: src/truncate.c:276 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "nurodyta keletas tikslo aplankų" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "%s: netaisyklingas skaičius" + +#: src/truncate.c:307 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "privalote nurodyti vieną iš %s arba %s" -#: src/truncate.c:340 +#: src/truncate.c:314 #, fuzzy, c-format msgid "you must specify a relative %s with %s" msgstr "privalote nurodyti vieną iš %s arba %s" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "nepavyksta atverti %s rašymui" @@ -9809,16 +10154,19 @@ msgstr "Mark Kettenis" 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:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: įvestis turi ciklą:" @@ -9867,9 +10215,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "\n" "Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę įvestį.\n" @@ -9913,8 +10259,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -9925,7 +10271,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -10061,11 +10407,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -10081,12 +10422,16 @@ msgid "" "\n" msgstr "" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +msgid "" +"\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" @@ -10094,12 +10439,12 @@ msgid "" " -l, --lines print the newline counts\n" msgstr "" -#: src/wc.c:128 +#: src/wc.c:134 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" @@ -10234,10 +10579,10 @@ msgid "" "\n" msgstr "" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "negalima palyginti failų vardų %s ir %s" #: src/yes.c:41 #, c-format @@ -10257,6 +10602,40 @@ msgstr "" "Pakartotinai išvesti eilutę su nurodyta EILUTĖ(čių) reikšme, arba `y'.\n" "\n" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę " +#~ "įvestį.\n" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Kai nenurodytas FAILAS, arba FAILAS yra -, nuskaityti standartinę " +#~ "įvestį.\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "ignoruojami visi argumentai" + +#~ msgid "number of lines" +#~ msgstr "eilučių skaičius" + +#~ msgid "number of bytes" +#~ msgstr "baitų skaičius" + +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "nepavyko atverti %s" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: neleistinas parametras – %c\n" @@ -10303,18 +10682,6 @@ msgstr "" #~ msgid "accessing %s" #~ msgstr "dirbama su %s" -#, fuzzy -#~ msgid "" -#~ "Display the current time in the given FORMAT, or set the system date.\n" -#~ "\n" -#~ " -d, --date=STRING display time described by STRING, not `now'\n" -#~ " -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -#~ msgstr "" -#~ "Parodo dabartinį laiką duotu FORMATU, arba nustatyti sisteminį laiką\n" -#~ " -d, --date=STRING parodo laiką apibrėžtą STRINGU, ne dabartinį (now)\n" -#~ " -f, --file=DATAFILE kaip --date, vieną kartą kiekvienai linijai " -#~ "DATAFILE faile\n" - #~ msgid "opening %s" #~ msgstr "atveriamas %s" @@ -10376,9 +10743,6 @@ msgstr "" #~ "\n" #~ "Atkreipkite dėmesį, kad negalima kartu naudoti parametrų -r ir -s.\n" -#~ msgid "Usage: %s [OPTION] [FILE]...\n" -#~ msgstr "Naudojimas: %s [PARAMETRAS] [FAILAS]...\n" - #~ msgid "the --reply option is deprecated; use -i or -f instead" #~ msgstr "--reply parametras nebenaudojamas; vietoj jo naudokite -i arba -f" diff --git a/po/ms.gmo b/po/ms.gmo index b2e9327a..a0a4bc7b 100644 Binary files a/po/ms.gmo and b/po/ms.gmo differ diff --git a/po/ms.po b/po/ms.po index dd4bbeec..6b28f572 100644 --- a/po/ms.po +++ b/po/ms.po @@ -2,11 +2,12 @@ # Copyright (C) 2001 Free Software Foundation, Inc. # Hasbullah Bin Pit , 2003. # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils 5.0.90\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2003-08-10 16:00+0800\n" "Last-Translator: Hasbullah Bin Pit \n" "Language-Team: Malay \n" @@ -34,18 +35,18 @@ msgstr "Hujah sah adalah:" msgid "error closing file" msgstr "menutup fail input %s" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "ralat menulis" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, fuzzy, c-format msgid "preserving permissions for %s" msgstr "menetapkan keizinan pada %s" @@ -236,57 +237,62 @@ msgstr "" msgid "Unknown error" msgstr "Ralat sistem yang tidak diketahui" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: opsyen `%s' adalah ambiguous\n" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: opsyen `-W %s' adalah ambiguous\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: opsyen `--%s' tidak mengizinkan hujah\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: opsyen `%c%s' tidak mengizinkan hujah\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, fuzzy, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: opsyen `%s' memerlukan hujah\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: opensyen tidak dikenali `--%s'\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: opensyen tidak dikenali `%c%s'\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opsyen tidak sah -- %c\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opsyen memerlukan hujah -- %c\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: opsyen `-W %s' adalah ambiguous\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: opsyen `-W %s' tidak mengizinkan hujan\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, fuzzy, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: opsyen `%s' memerlukan hujah\n" @@ -296,13 +302,13 @@ msgstr "%s: opsyen `%s' memerlukan hujah\n" msgid "cannot change permissions of %s" msgstr "tak dapat menukar keizinan %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "tak dapat mencipta direktori %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "memori keletihan" @@ -351,6 +357,12 @@ msgstr "`" msgid "%s: end of file" msgstr "fail istimewa blok" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: ralat penulisan" + #: lib/regcomp.c:131 msgid "Success" msgstr "" @@ -465,7 +477,7 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[tT]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "menetapkan keizinan pada %s" @@ -882,7 +894,7 @@ msgid "" "Base64 encode or decode FILE, or standard input, to standard output.\n" msgstr "" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -892,15 +904,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -909,51 +913,51 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "ralat membaca" -#: src/base64.c:231 +#: src/base64.c:229 #, fuzzy, c-format msgid "invalid input" msgstr "pengguna tidak sah" -#: src/base64.c:268 +#: src/base64.c:266 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "saiz tab tidak sah: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, fuzzy, c-format msgid "extra operand %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "menutup input piawai" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 #, fuzzy msgid "David MacKenzie" @@ -996,39 +1000,45 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, fuzzy, c-format msgid "missing operand" msgstr "kehilangan hujah fail" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 #, fuzzy msgid "Richard M. Stallman" msgstr "Torbjorn Granlund and Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"Cetak bahagian ibaris dipilih drpd setiap FAIL ke output piawai.\n" +"\n" + +#: src/cat.c:98 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" @@ -1038,7 +1048,7 @@ msgid "" " -s, --squeeze-blank suppress repeated empty output lines\n" msgstr "" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1050,7 +1060,7 @@ msgstr "" " -u (diabaikan)\n" " -v, --show-nonprinting guna notasi ^ and M- , kecuali bagi LFD dan TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1059,17 +1069,18 @@ msgid "" " %s Copy standard input to standard output.\n" msgstr "" -#: src/cat.c:326 +#: src/cat.c:327 #, fuzzy, c-format msgid "cannot do ioctl on %s" msgstr "tak dapat ioctl pada `%s'" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "output standard" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: fail input adalah fail output" @@ -1081,10 +1092,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "" @@ -1098,8 +1109,8 @@ msgstr "gagal mendapatkan atribut bagi %s" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "gagal mendapatkan atribut bagi %s" @@ -1114,13 +1125,13 @@ msgstr "" msgid "failed to change context of %s to %s" msgstr "gagal menukar hakmilik %s ke %s\n" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "Tak dapat mengakses %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "tak dapat membaca direktori %s" @@ -1136,7 +1147,7 @@ msgstr "menukar keizinan %s" msgid "fts_read failed" msgstr "fail biasa" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, fuzzy, c-format msgid "fts_close failed" @@ -1223,7 +1234,7 @@ msgid "-R -h requires -P" msgstr "" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, fuzzy, c-format msgid "missing operand after %s" @@ -1240,9 +1251,8 @@ msgid "conflicting security context specifiers given" msgstr "" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "gagal mendapatkan atribut bagi %s" @@ -1510,17 +1520,17 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "kumpulan tidak sah %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, fuzzy, c-format msgid "invalid group list %s" msgstr "kumpulan tidak sah %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1529,7 +1539,7 @@ msgstr "" "Pengunaan: %s ROOTBARU [ARAHAN...]\n" " atau: %s OPSYEN\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1537,54 +1547,66 @@ msgstr "" "Laksana ARAHAN dengan direktori root ditetapkan ke ROOTBARU.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" msgstr "" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "Gagal menukar direktori root ke %s " -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "tak dapat chdir ke direktori root" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "tak dapat perolehi senarai kumpulan tambahan" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" +msgid "failed to set supplemental groups" msgstr "tak dapat perolehi senarai kumpulan tambahan" -#: src/chroot.c:402 +#: src/chroot.c:418 #, fuzzy, c-format msgid "failed to set group-ID" msgstr "tak dapat menukar ke kumpulan null" -#: src/chroot.c:405 +#: src/chroot.c:421 #, fuzzy, c-format msgid "failed to set user-ID" msgstr "gagal mengekalkan masa bagi %s" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, fuzzy, c-format msgid "failed to run command %s" msgstr "takboleh nyahpaut %s" @@ -1623,7 +1645,16 @@ msgstr "Penggunaan: %s [OPSYEN]...FAIL1 FAIL2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1631,7 +1662,7 @@ msgid "" "and column three contains lines common to both files.\n" msgstr "" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1639,7 +1670,7 @@ msgid "" " -3 suppress column 3 (lines that appear in both files)\n" msgstr "" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1647,17 +1678,17 @@ msgid "" " --nocheck-order do not check that the input is correctly sorted\n" msgstr "" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1666,309 +1697,323 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "" -#: src/comm.c:407 +#: src/comm.c:411 #, fuzzy, c-format msgid "multiple delimiters specified" msgstr "%s: banyak isyarat dinyatakan" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 -#, fuzzy, c-format -msgid "error reading %s" -msgstr "membaca %s" - -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:181 src/copy.c:452 #, c-format msgid "cannot lseek %s" msgstr "tak dapat lseek %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" +msgstr "membaca %s" + +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 +#, fuzzy, c-format +msgid "error reading %s" +msgstr "membaca %s" + +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, fuzzy, c-format msgid "error writing %s" msgstr "menulis %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "membaca %s" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "gagal mendapatkan atribut bagi %s" -#: src/copy.c:383 +#: src/copy.c:478 #, fuzzy, c-format msgid "%s: write failed" msgstr "fail pelik" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/copy.c:687 +#: src/copy.c:789 #, fuzzy, c-format msgid "clearing permissions for %s" msgstr "menetapkan keizinan pada %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "gagal mengekalkan hakmilik bagi %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "gagal mencari fail %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "gagal mengekalkan hakmilik bagi %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, fuzzy, c-format msgid "failed to set default file creation context to %s" msgstr "gagal mendapatkan atribut bagi %s" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "gagal mendapatkan atribut bagi %s" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "gagal mendapatkan atribut bagi %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "tak dapat buka %s untuk dibaca" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "tak dapat fstat %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "tak dapat membuang %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "%s dibuang \n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "tak dapat memcipta fail biasa %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "mengekalkan masa pada %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, fuzzy, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: menindih %s, menindih mod %04lo? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: tindih %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (backup: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "tak dapat mencipta pautan keras %s ke %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "tak dapat stat %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "Amaran: fail sumber %s dinyatakan lebih drpd sekali" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s dan %s adalah fail yang sama" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "tak boleh menindih bukan-direktori %s dengan direktori %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "tak akan menindih baru-dicipta %s dengan %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "tak boleh menindih direktori %s dengan direktori" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "tak dapat pindah direktori ke bukan-direktori: %s -> %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "backup %s akan memusnahkan sumber; %s tidak dipindahkan" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "backup %s akan memusnahkan sumber; %s tidak disalin" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "tak dapat backup %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "tak dapat salin direktori, %s ke dirinya, %s" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "Amaran: fail sumber %s dinyatakan lebih drpd sekali" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "tak dapat pindahkan %s ke subdirektori dirinya, %s" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "tak dapat pindahkan %s ke %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "tak boleh salin pautan simbolik cyclic %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "tak dapat mencipta pautan simbolik %s ke %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "tak boleh mencipta fifo %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "tak boleh mencipta fail istimewa %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "tak dapat membaca pautan simbolik %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "tak dapat mencipta pautan simbolik %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s mempunyai jenis fail yang tidak diketahui" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "tak dapat nyahbackup %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (nyahbackup)\n" @@ -1978,25 +2023,25 @@ msgstr "%s -> %s (nyahbackup)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, c-format msgid "unknown program %s" msgstr "" @@ -2194,8 +2239,8 @@ msgstr "%s wujud tapi ianya bukan direktori" msgid "failed to access %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, fuzzy, c-format msgid "missing file operand" msgstr "kehilangan hujah fail" @@ -2267,137 +2312,144 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "input menghilang" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: bilangan baris di luar julat" -#: src/csplit.c:713 +#: src/csplit.c:714 #, fuzzy, c-format msgid "%s: %s: line number out of range" msgstr "%s: `%s': bilangan baris di luar julat" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, fuzzy, c-format msgid " on repetition %s\n" msgstr " pada ulangan %d\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, fuzzy, c-format msgid "%s: %s: match not found" msgstr "%s: `%s': padanan tak dijumpai" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "ralat pada carian ungkapan biasa (regexp)" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, fuzzy, c-format msgid "write error for %s" msgstr "ralat menulis bagi `%s'" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, fuzzy, c-format msgid "%s: integer expected after delimiter" msgstr "%s: integer dijangka selepas `%c'" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: `}' diperluka untuk kiraan ulangan" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: integer diperlukan diantara `{' dan `}'" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: pemisah penutup `%c' hilang" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: ungkapan biasa (regexp) tidak sah: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: corak tidak sah" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: bilangan baris mesti lebih besar drpd sifar" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "" -#: src/csplit.c:1200 +#: src/csplit.c:1201 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "" -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "Pengspesifikasi penukaran tidak sah pada suffiks: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "pengspesifikasi penukaran tidak sah pada suffiks: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "Pengspesifikasi penukaran tidak sah pada suffiks: %c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "terlalu banyak spesifikasi penukaran %% pada suffiks" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "kehilangan spesifikasi penukaran %% pada suffiks" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: nombor tidak sah" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "nombor tidak sah %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Penggunaan: %s [OPSYEN]... FAIL CORAK...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "input piawai" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2405,26 +2457,21 @@ msgid "" " -k, --keep-files do not remove output files on errors\n" msgstr "" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 msgid "" "\n" +"Each PATTERN may be:\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" @@ -2451,14 +2498,14 @@ msgstr "" "Cetak bahagian ibaris dipilih drpd setiap FAIL ke output piawai.\n" "\n" -#: src/cut.c:182 +#: src/cut.c:183 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:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2466,20 +2513,20 @@ msgid "" " -n (ignored)\n" msgstr "" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" -#: src/cut.c:197 +#: src/cut.c:198 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:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2487,7 +2534,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:210 +#: src/cut.c:211 msgid "" "Each range is one of:\n" "\n" @@ -2495,67 +2542,65 @@ msgid "" " 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:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "byte atau senarai medan tidak sah" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "" -#: src/cut.c:320 +#: src/cut.c:319 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "opsyen lebar tidak sah: `%s'" -#: src/cut.c:334 -#, fuzzy +#: src/cut.c:333 src/numfmt.c:1417 +#, fuzzy, c-format msgid "invalid decreasing range" msgstr "rentetan mod tidak sah: %s" -#: src/cut.c:383 +#: src/cut.c:382 #, fuzzy, c-format msgid "byte offset %s is too large" msgstr "%s adalah terlalu besar" -#: src/cut.c:386 +#: src/cut.c:385 #, fuzzy, c-format msgid "field number %s is too large" msgstr "nombor tidak sah %s" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "hanya satu jenis senarai boleh dinyatakan" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "pemisah mestilah aksara tunggal" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "anda mesti nyatakan senarai byte, aksara, atau medan" -#: src/cut.c:790 +#: src/cut.c:789 msgid "an input delimiter may be specified only when operating on fields" msgstr "" -#: src/cut.c:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" msgstr "" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "kehilangan senarai medan" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "kehilangan senarai posisi" @@ -2573,14 +2618,20 @@ 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" +msgstr "" + +#: src/date.c:138 #, fuzzy msgid "" -" -d, --date=STRING display time described by STRING, not 'now'\n" -" -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -" -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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" "Papar masa semasa dalam FORMAT diberi, atau tetapkan tarikh sistem.\n" "\n" @@ -2596,31 +2647,39 @@ msgstr "" " --iso-8601 tanpa TIMESPEC default kepada " "`date'.\n" -#: src/date.c:142 +#: src/date.c:145 #, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=FAIL papar tarikh ubahsuai bagi FAIL\n" " -R, --rfc-822 output rentetan tarikh serasi RFC-822\n" " -s, --set=RENTETAN tetapkan masa dihuraikan oleh RENTETAN\n" " -u, --utc, --universal cetak atau tetapkan Coordinated Universal Time\n" -#: src/date.c:147 +#: src/date.c:149 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" +msgstr "" + +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" msgstr "" #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2628,7 +2687,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:165 +#: src/date.c:171 #, fuzzy msgid "" " %A locale's full weekday name (e.g., Sunday)\n" @@ -2641,7 +2700,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:171 +#: src/date.c:177 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2654,14 +2713,14 @@ msgstr "" " %D tarikh (bb/hh/tt)\n" " %e hari drpd bulan, ruang kosong ditambah ( 1..31)\n" -#: src/date.c:177 +#: src/date.c:183 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 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2673,7 +2732,7 @@ msgstr "" " %I jam (01..12)\n" " %j hari dalam tahun (001..366)\n" -#: src/date.c:188 +#: src/date.c:194 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2686,7 +2745,7 @@ msgstr "" " %m bulan (01..12)\n" " %M minit (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2697,7 +2756,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:203 +#: src/date.c:209 #, fuzzy msgid "" " %S second (00..60)\n" @@ -2710,7 +2769,7 @@ msgstr "" " %T masa, 24-jam (jj:mm:ss)\n" " %u hari dalam minggu (1..7); 1 mewakili Isnin\n" -#: src/date.c:209 +#: src/date.c:215 #, fuzzy msgid "" " %U week number of year, with Sunday as first day of week (00..53)\n" @@ -2726,7 +2785,7 @@ msgstr "" " %W nombor minggu drpd tahun dengan Isnin sebagai hari pertama dlm minggu " "(00..53)\n" -#: src/date.c:215 +#: src/date.c:221 #, fuzzy msgid "" " %x locale's date representation (e.g., 12/31/99)\n" @@ -2739,7 +2798,7 @@ msgstr "" " %y dua digit akhir bagi tahun (00..99)\n" " %Y tahun (1975...)\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2751,7 +2810,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2762,7 +2821,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2771,7 +2830,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -2785,35 +2844,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "input piawai" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, fuzzy, c-format msgid "invalid date %s" msgstr "tarikh tak sah `%s'" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, fuzzy, c-format msgid "multiple output formats specified" msgstr "banyak opsyen -l or -t dinyatakan" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2824,23 +2883,23 @@ msgstr "" "Bila menggunakan satu opsyen untuk menyatakan tarikh, sebarang\n" "hujah bukan-opsyen mesti dalam rentetan format bermula dengan`+'." -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "tak dapat menetapkan tarikh" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "" -#: src/dd.c:527 +#: src/dd.c:556 #, fuzzy, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2849,7 +2908,7 @@ msgstr "" "Pengunaan: %s [NOMBOR]...\n" " atau: %s OPSYEN\n" -#: src/dd.c:532 +#: src/dd.c:561 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -2868,7 +2927,7 @@ msgstr "" " count=BLOK salin hanya BLOK blok input\n" " ibs=BAIT baca BAIT bait dlm satu masa\n" -#: src/dd.c:541 +#: src/dd.c:570 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2877,11 +2936,13 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -2892,7 +2953,7 @@ msgid "" "\n" msgstr "" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -2907,7 +2968,7 @@ msgid "" " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2917,7 +2978,7 @@ msgid "" " fsync likewise, but also write metadata\n" msgstr "" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2926,124 +2987,104 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:593 +#: src/dd.c:624 #, fuzzy msgid " directory fail unless a directory\n" msgstr "%s: Direktori sasaran yang dinyatakan adalah bukan direktori" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 +#: src/dd.c:661 #, 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:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" - -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "" -msgstr[1] "" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "" msgstr[1] "" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "" @@ -3057,168 +3098,182 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr "" -#: src/dd.c:877 +#: src/dd.c:809 +#, c-format +msgid ", %.6f s, %s/s" +msgstr "" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "" +msgstr[1] "" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "menutup fail input %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "menutup fail output %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "Menulis ke %s." -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, fuzzy, c-format msgid "unrecognized operand %s" msgstr "opsyen tidak dikenali %s" -#: src/dd.c:1285 +#: src/dd.c:1376 #, fuzzy msgid "invalid conversion" msgstr "penukaran tidak sah: %s" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 #, fuzzy msgid "invalid input flag" msgstr "nombor tidak sah %s" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 #, fuzzy msgid "invalid output flag" msgstr "kumpulan tidak sah" -#: src/dd.c:1294 +#: src/dd.c:1385 #, fuzzy -msgid "invalid status flag" +msgid "invalid status level" msgstr "pengguna tidak sah %s" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "nombor tidak sah %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1417 +#: src/dd.c:1520 #, fuzzy, c-format msgid "cannot combine block and unblock" msgstr "tak dapat omit kedua-dua pengguna dan kumpulan" -#: src/dd.c:1419 +#: src/dd.c:1522 #, fuzzy, c-format msgid "cannot combine lcase and ucase" msgstr "tak boleh banding nama fail %s dan %s" -#: src/dd.c:1421 +#: src/dd.c:1524 #, fuzzy, c-format msgid "cannot combine excl and nocreat" msgstr "tak boleh gabungkan isyarat dengan -l atau -t" -#: src/dd.c:1424 +#: src/dd.c:1527 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "tak dapat menentukan peranti dan inod bagi %s" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" " of mt_type=0x%0lx -- see for the list of types" msgstr "" -#: src/dd.c:1670 +#: src/dd.c:1773 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: tak dapat buang" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, fuzzy, c-format msgid "%s: cannot seek" msgstr "%s: tak dapat buang" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1903 +#: src/dd.c:2006 #, fuzzy, c-format msgid "setting flags for %s" msgstr "menetapkan masa untuk %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "tak boleh mencipta fifo %s" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "" -#: src/dd.c:2195 +#: src/dd.c:2311 #, fuzzy, c-format msgid "fsync failed for %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, fuzzy, c-format msgid "failed to open %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, fuzzy, c-format msgid "failed to discard cache for: %s" msgstr "gagal mengekalkan masa bagi %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "" @@ -3299,12 +3354,12 @@ msgstr "Kapasiti" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3312,18 +3367,18 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -#: src/df.c:1402 +#: src/df.c:1422 #, fuzzy msgid "" " -i, --inodes list inode information instead of block usage\n" @@ -3338,7 +3393,7 @@ msgstr "" " --no-sync jangan panggil sync sebelum mendapat maklumat " "penggunaan (default)\n" -#: src/df.c:1409 +#: src/df.c:1429 #, fuzzy msgid "" " --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" @@ -3346,6 +3401,25 @@ msgid "" "omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" +msgstr "" +" -P, --portability menggunakan format output POSIX\n" +" --sync panggil sync sebelum mendapatkan maklumat " +"penggunaan\n" +" -t, --type=JENIS hadkan penyenaraian ke sistemfail jenis JENIS\n" +" -T, --print-type cetak jenis sistemfail\n" +" -x, --exclude-type=TYPE hadkan penyenaraian ke ke sistemfail bukan jenis " +"JENIS\n" +" -v (diabaikan)\n" + +#: src/df.c:1435 +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3360,7 +3434,7 @@ msgstr "" "JENIS\n" " -v (diabaikan)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3368,26 +3442,26 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, fuzzy, c-format msgid "options %s and %s are mutually exclusive" msgstr "opseyn untuk menyatakan tarikh untuk dicetak adalah eksklusif" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Amaran: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 #, fuzzy msgid "cannot read table of mounted file systems" msgstr "%stak dapat membaca jadual sistemfail dilekapkan" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "" @@ -3485,7 +3559,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3496,7 +3570,8 @@ msgstr "" #: src/du.c:285 #, fuzzy -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Ringkasan penggunaan cakera bagi setiap FAIL, rekursif bagi direktori.\n" "\n" @@ -3582,62 +3657,56 @@ msgstr "" msgid "Infinity" msgstr "" -#: src/du.c:636 +#: src/du.c:657 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fail biasa" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "Kedalaman maksimum %s" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "hujah tidak sah %s bagi %s" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "tak dapat meringkaskan dan menunjukkan semua kemasukan" -#: src/du.c:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, fuzzy, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "amaran: peringkasan konflik dengan --max-depth=%d" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: ralat penulisan" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 #, fuzzy msgid "invalid zero-length file name" msgstr "nama kumpulan tak dah %s" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "jumlah" @@ -3751,9 +3820,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "\n" "Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" @@ -3795,7 +3862,7 @@ msgid "input line is too long" msgstr "%s: fail terlalu panjang" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "" @@ -3903,12 +3970,12 @@ msgstr "ralat pada carian ungkapan biasa (regexp)" msgid "non-integer argument" msgstr "hujah bukan-numerik" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "dibahagi dengan sifar" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Tetapkan LC_ALL='C' untuk mengatasi masalah." @@ -3919,31 +3986,31 @@ msgid "the strings compared were %s and %s" msgstr "Rentetan dibandingkan adalah %s dan %s." #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, fuzzy, c-format msgid "%s is not a valid positive integer" msgstr "`%s' adalah bukan integer positif yang sah" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s adalah terlalu besar" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -3952,7 +4019,7 @@ msgstr "" "Pengunaan: %s [NOMBOR]...\n" " atau: %s OPSYEN\n" -#: src/factor.c:2443 +#: src/factor.c:2533 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -3995,7 +4062,7 @@ msgid "" "The option -WIDTH is an abbreviated form of --width=DIGITS.\n" msgstr "" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4003,7 +4070,7 @@ msgid "" " -s, --split-only split long lines, but do not refill\n" msgstr "" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4012,38 +4079,36 @@ msgid "" " -g, --goal=WIDTH goal width (default of 93% of width)\n" msgstr "" -#: src/fmt.c:359 +#: src/fmt.c:356 #, 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 -#, fuzzy, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "lebar tidak sah: `%s'" -#: src/fold.c:70 +#: src/fold.c:69 #, fuzzy -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "Balut baris input pada setiap FAIL (pinput piawai secara default),\n" " menulis keoutput piawai.\n" "\n" -#: src/fold.c:77 +#: src/fold.c:76 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 -#, fuzzy, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "bilangan kolum tidak sah: `%s'" #. This is a proper name. See the gettext manual, section Names. @@ -4110,14 +4175,13 @@ msgstr "tak dapat stat %s" msgid "%s: no such user" msgstr "%s: Tiada pengguna sebegitu" -#: src/head.c:109 +#: src/head.c:110 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 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4127,7 +4191,7 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4135,7 +4199,7 @@ msgstr "" " -q, --quiet, --silent tidak cetak pengepala nama fail diberi\n" " -v, --verbose sentiasa cetak pengepala nama fail diberi\n" -#: src/head.c:131 +#: src/head.c:132 #, fuzzy msgid "" "\n" @@ -4148,48 +4212,36 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:237 src/head.c:1052 -#, fuzzy, c-format -msgid "%s: number of bytes is too large" -msgstr "nombor tidak sah %s" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, fuzzy, c-format msgid "%s: cannot seek to offset %s" msgstr "tak dapat lseek %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, fuzzy, c-format msgid "%s: cannot seek to relative offset %s" msgstr "tak boleh mencipta fifo %s" -#: src/head.c:886 -#, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "%s: %s adalah terlalu besar dan tak boleh diperwakilkan" - -#: src/head.c:887 -msgid "number of lines" -msgstr "bilangan baris" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "bilangan byte" +#: src/head.c:267 +#, fuzzy, c-format +msgid "%s: number of bytes is too large" +msgstr "nombor tidak sah %s" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "bilangan baris tidak sah" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "bilangan byte tidak sah" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "opsyen tidak sah -- %c" @@ -4376,7 +4428,7 @@ msgstr "tak dapat menukar keizinan %s" msgid "cannot set time stamps for %s" msgstr "Tak dapat tetapkan setem masa bagi %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "panggilan sistem fork() gagal" @@ -4518,7 +4570,7 @@ msgstr "opsyen dikikis tak boleh digunakan bila memasang direktori" msgid "target directory not allowed when installing a directory" msgstr "opsyen dikikis tak boleh digunakan bila memasang direktori" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "mod tak sah %s" @@ -4553,15 +4605,19 @@ msgstr "" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +msgid "" "\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:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -4569,7 +4625,7 @@ msgid "" " -t CHAR use CHAR as input and output field separator\n" msgstr "" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -4581,11 +4637,11 @@ msgid "" " print them without trying to pair them\n" msgstr "" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -4604,47 +4660,47 @@ msgid "" "warning message will be given.\n" msgstr "" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, fuzzy, c-format msgid "invalid field number: %s" msgstr "bilangan medan tidak sah: `%s'" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, fuzzy, c-format msgid "invalid field specifier: %s" msgstr "pengspesifikasi medan tidak sah: `%s'" -#: src/join.c:884 +#: src/join.c:890 #, fuzzy, c-format msgid "invalid file number in field spec: %s" msgstr "nombor tidak sah %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, fuzzy, c-format msgid "multi-character tab %s" msgstr "aksara tidak sah pada %s pada rentetan mod %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "kedua-dua fail tak boleh menjadi input piawai" @@ -4714,17 +4770,17 @@ msgstr "tak boleh gabungkan isyarat dengan -l atau -t" msgid "no process ID specified" msgstr "tiada ID proses dinyatakan" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, fuzzy, c-format msgid "invalid buffering mode %s for %s\n" msgstr "hujah tidak sah %s bagi %s" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -4887,7 +4943,7 @@ msgstr "tak dapat mencipta pautan simbolik %s" msgid "FIXME: unknown" msgstr "" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Pengunan: %s [OPSYEN]\n" @@ -4900,7 +4956,7 @@ msgstr "" "Cetak nama bagi pengguna semasa.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, fuzzy, c-format msgid "no login name" msgstr "%s: tiada nama logmasuk\n" @@ -4910,7 +4966,7 @@ msgstr "%s: tiada nama logmasuk\n" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -4919,97 +4975,97 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" -"mengabai nilai pembolehubah persekitaran QUOTING_STYLE yang tidak sah: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "mengabai lebar yg. tak sah pada pembolehubah persekitaran COLUMNS: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "mengabai saiz tab yg. tak sah pada pembolehubah persekitaran TABSIZE: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "lebar baris tidak sah: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "saiz tab tidak sah: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "format gaya tarikh tidak sah %s" -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "Hujah sah adalah:" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "prefix tidak dikenali: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "nilai pembolehubah persekitaran LS_COLORS tidak boleh dihantar" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" +"mengabai nilai pembolehubah persekitaran QUOTING_STYLE yang tidak sah: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "tak dapat membuka direktori %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "tak dapat menentukan peranti dan inod bagi %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, fuzzy, c-format msgid "%s: not listing already-listed directory" msgstr "tak dapat menyenaraikan direktori tersedia-tersenarai: %s" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "membaca direktori %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, fuzzy, c-format msgid "closing directory %s" msgstr "mencipta direktori %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "tak boleh banding nama fail %s dan %s" -#: src/ls.c:4781 +#: src/ls.c:4775 #, fuzzy msgid "" "List information about the FILEs (the current directory by default).\n" @@ -5019,7 +5075,7 @@ msgstr "" "Inih semasukan mengikut abjad jika tiada -cftuSUX atau --sort.\n" "\n" -#: src/ls.c:4788 +#: src/ls.c:4782 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5033,7 +5089,7 @@ msgstr "" " --author cetak penulis bagi setiap fail\n" " -b, --escape cetak escape oktal bagi aksara bukangrafik\n" -#: src/ls.c:4794 +#: src/ls.c:4788 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." @@ -5057,13 +5113,14 @@ msgstr "" "nama\n" " sebaliknya: isih mengikut ctime\n" -#: src/ls.c:4804 +#: src/ls.c:4798 #, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5076,7 +5133,7 @@ msgstr "" "kandungannya\n" " -D, --dired jana output direka untuk mod dired Emacs\n" -#: src/ls.c:4812 +#: src/ls.c:4807 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5092,11 +5149,11 @@ msgstr "" " kolum-tunggal -1, verbose -l, menegak -C\n" " --full-time seperti -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5105,7 +5162,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 +#: src/ls.c:4824 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5119,7 +5176,7 @@ msgstr "" "1K 234M 2G)\n" " -H, --si sebaliknya, guna kuasa 1000 bukannya 1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5132,7 +5189,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5144,7 +5201,7 @@ msgid "" " -k, --kibibytes default to 1024-byte blocks for disk usage\n" msgstr "" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5154,7 +5211,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5165,7 +5222,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -5177,7 +5234,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4881 +#: src/ls.c:4876 #, fuzzy msgid "" " -r, --reverse reverse order while sorting\n" @@ -5189,21 +5246,21 @@ msgstr "" " -R, --recursive senarai subdirektori secara rekursif\n" " -s, --size cetak saiz bagi setiap fail, dalam blok\n" -#: src/ls.c:4886 +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -5217,31 +5274,32 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4908 +#: src/ls.c:4904 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:4912 +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4919 +#: src/ls.c:4915 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 security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5250,7 +5308,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5280,45 +5338,50 @@ msgstr "" 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 "" "\n" "Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" +"\n" +" -B, --binary menggunakan penulisan binari ke peranti okonsol.\n" +"\n" -#: src/md5sum.c:178 +#: src/md5sum.c:180 #, fuzzy -msgid " -b, --binary read in binary mode\n" +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr "" "\n" " -B, --binary menggunakan penulisan binari ke peranti okonsol.\n" "\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -5330,97 +5393,98 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "GAGAL" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "OK" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "" msgstr[1] "" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -5453,22 +5517,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "gagal mendapatkan atribut bagi %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "direktori %s dicipta" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -5650,7 +5714,7 @@ msgstr "terlalu banyak hujah" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" @@ -5773,9 +5837,7 @@ 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" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "\n" "Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" @@ -5850,27 +5912,27 @@ msgstr "nombor tidak sah %s" msgid "invalid footer numbering style: %s" msgstr "nombor tidak sah %s" -#: src/nl.c:503 -#, fuzzy, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "nombor baris permulaan tidak sah `%s'" -#: src/nl.c:512 -#, fuzzy, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "lebar baris tidak sah: %s" -#: src/nl.c:524 -#, fuzzy, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "nombor tidak sah %s" -#: src/nl.c:538 -#, fuzzy, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "lebar baris tidak sah: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, fuzzy, c-format msgid "invalid line numbering format: %s" msgstr "lebar baris tidak sah: %s" @@ -5894,7 +5956,7 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -5906,43 +5968,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "menutup output piawai" -#: src/nohup.c:131 +#: src/nohup.c:129 #, fuzzy, c-format msgid "ignoring input" msgstr "mengabaikan segala hujah" -#: src/nohup.c:175 +#: src/nohup.c:173 #, fuzzy, c-format msgid "ignoring input and appending output to %s" msgstr "penukaran kumpulan %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, fuzzy, c-format msgid "appending output to %s" msgstr "penukaran kumpulan %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "" @@ -5964,96 +6026,93 @@ msgid "" " --ignore=N if possible, exclude N processing units\n" msgstr "" -#: 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "nombor tidak sah %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "lebar baris tidak sah: %s" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "gagal mengekalkan masa bagi %s" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "saiz tab tidak sah: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6061,19 +6120,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -6083,40 +6142,40 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" msgstr "" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6125,7 +6184,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -6133,7 +6192,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -6141,7 +6200,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -6149,7 +6208,19 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -6158,9 +6229,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -6172,7 +6244,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -6187,118 +6259,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "format tarikh tidak sah %s" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "penukaran tidak sah: %s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "lebar baris tidak sah: %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "bilangan medan tidak sah: `%s'" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "tarikh tak sah `%s'" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "bilangan medan tidak sah: `%s'" +msgid "multiple field specifications" +msgstr "%s: fail saiz tidak sah" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "bilangan medan tidak sah: `%s'" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, fuzzy, c-format msgid "--grouping cannot be combined with --format" msgstr "tak boleh gabungkan isyarat dengan -l atau -t" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "tiada ID proses dinyatakan" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, fuzzy, c-format msgid "grouping cannot be combined with --to" msgstr "tak boleh gabungkan isyarat dengan -l atau -t" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "membaca %s" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "" -#: src/od.c:320 +#: src/od.c:321 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6309,18 +6393,17 @@ msgstr "" "Penggunaan: %s [OPTION]... GROUP FILE...\n" " atau: %s [OPTION]... --reference=RFILE FILE...\n" -#: src/od.c:326 +#: src/od.c:327 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:333 +#: src/od.c:335 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" @@ -6329,7 +6412,7 @@ msgid "" "suffixes may be . for octal and b for multiply by 512.\n" msgstr "" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -6338,7 +6421,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -6351,7 +6434,7 @@ msgid "" " --traditional accept arguments in third form above\n" msgstr "" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -6362,7 +6445,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6372,7 +6455,7 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -6381,7 +6464,7 @@ msgid "" " c printable character or backslash escape\n" msgstr "" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6390,7 +6473,7 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -6399,14 +6482,14 @@ msgid "" "for sizeof(double) or L for sizeof(long double).\n" msgstr "" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 #, fuzzy msgid "" "\n" @@ -6424,55 +6507,55 @@ msgstr "" "berikut:\n" "kB 1000, K 1024, MB 1,000,000, M 1,048,576, dan lagi bagi G, T, P, E, Z, Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, fuzzy, c-format msgid "invalid type string %s" msgstr "jenis rentetan m tidak sah `%s'" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte integral type" msgstr "" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte floating point type" msgstr "" -#: src/od.c:869 +#: src/od.c:872 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "aksara tidak sah pada %s pada rentetan mod %s" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "" -#: src/od.c:1650 +#: src/od.c:1658 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "" @@ -6488,11 +6571,13 @@ msgid "standard input is closed" msgstr "input piawai" #: src/paste.c:439 +#, fuzzy msgid "" "Write lines consisting of the sequentially corresponding lines from\n" "each FILE, separated by TABs, to standard output.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" +"Cetak bahagian ibaris dipilih drpd setiap FAIL ke output piawai.\n" +"\n" #: src/paste.c:447 msgid "" @@ -6624,12 +6709,12 @@ msgstr "" msgid "Where" msgstr "" -#: src/pinky.c:495 +#: src/pinky.c:494 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6639,7 +6724,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6648,7 +6733,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -6656,96 +6741,96 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:597 +#: src/pinky.c:596 #, 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 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" -#: src/pr.c:910 +#: src/pr.c:907 #, fuzzy, c-format msgid "invalid page range %s" msgstr "jenis rentetan m tidak sah `%s'" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "bilangan baris tidak sah" -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "nombor peranti minor tidak sah %s" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "lebar baris tidak sah: %s" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "nombor tidak sah %s" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "nombor tidak sah %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" -#: src/pr.c:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" -#: src/pr.c:1196 +#: src/pr.c:1166 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "Lebar halaman terlalu sempit" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" -#: src/pr.c:2380 +#: src/pr.c:2350 #, fuzzy, c-format msgid "page number overflow" msgstr "nombor tidak sah %s" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6755,7 +6840,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6765,7 +6850,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6777,7 +6862,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -6790,16 +6875,21 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2798 +#: src/pr.c:2769 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2775 +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -6809,7 +6899,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -6818,7 +6908,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -6829,17 +6919,22 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2828 +#: src/pr.c:2802 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6853,7 +6948,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -6862,16 +6957,6 @@ msgid "" " with -S or -s\n" msgstr "" -#: src/pr.c:2853 -#, fuzzy -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -6998,15 +7083,20 @@ msgid "" "files.\n" msgstr "" -#: src/ptx.c:1830 +#: src/ptx.c:1831 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:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -7014,7 +7104,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7024,7 +7114,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7032,20 +7122,16 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" - #: src/ptx.c:1951 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "lebar tidak sah: `%s'" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "lebar baris tidak sah: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -7069,7 +7155,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, fuzzy, c-format msgid "failed to stat %s" msgstr "gagal mengekalkan masa bagi %s" @@ -7089,8 +7175,8 @@ msgstr "mengabaikan segala hujah" msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Penggunaan: %s [OPSYEN]... FAIL...\n" @@ -7279,16 +7365,16 @@ msgid "" msgstr "" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " -msgstr[0] "" -msgstr[1] "" +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " +msgstr[0] "%s: buang %s %s? " +msgstr[1] "%s: buang %s %s? " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: buang %s %s? " msgstr[1] "%s: buang %s %s? " @@ -7480,12 +7566,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "format tarikh tidak sah %s" -#: src/seq.c:234 +#: src/seq.c:248 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s mempunyai jenis fail yang tidak diketahui" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -7501,7 +7587,16 @@ msgid "" "for even very expensive hardware probing to recover the data.\n" msgstr "" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" + +#: src/shred.c:181 #, fuzzy, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7513,7 +7608,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:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -7522,11 +7617,9 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:192 +#: src/shred.c:196 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.\n" @@ -7538,7 +7631,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -7549,7 +7642,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7561,7 +7654,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7570,7 +7663,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -7582,134 +7675,134 @@ msgid "" "\n" msgstr "" -#: src/shred.c:241 +#: src/shred.c:243 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:340 +#: src/shred.c:342 #, fuzzy, c-format msgid "%s: fdatasync failed" msgstr "fail istimewa blok" -#: src/shred.c:351 +#: src/shred.c:353 #, fuzzy, c-format msgid "%s: fsync failed" msgstr "fail istimewa blok" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "" -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "" -#: src/shred.c:549 +#: src/shred.c:551 #, fuzzy, c-format msgid "%s: lseek failed" msgstr "fail istimewa blok" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "" -#: src/shred.c:859 +#: src/shred.c:861 #, fuzzy, c-format msgid "%s: fstat failed" msgstr "stat gagal" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: jenis fail tidak sah" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: fail mempunya saiz negatif" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "" -#: src/shred.c:989 +#: src/shred.c:991 #, fuzzy, c-format msgid "%s: fcntl failed" msgstr "fail istimewa blok" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: membuang" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: ditukarnama ke %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, fuzzy, c-format msgid "%s: failed to remove" msgstr "%s: tak dapat buang" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: dibuang" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, fuzzy, c-format msgid "%s: failed to close" msgstr "%s: fail terlalu panjang" -#: src/shred.c:1171 +#: src/shred.c:1173 #, fuzzy, c-format msgid "%s: failed to open for writing" msgstr "%s: fail terlalu panjang" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" -msgstr "" +#, fuzzy +msgid "invalid number of passes" +msgstr "bilangan baris tidak sah" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, fuzzy, c-format msgid "multiple random sources specified" msgstr "banyak opsyen -l or -t dinyatakan" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: fail saiz tidak sah" -#: src/shuf.c:61 +#: src/shuf.c:62 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -7720,11 +7813,11 @@ msgstr "" " atau: %s [OPSYEN]... SUMBER... DIREKTORI\n" " atau: %s [OPSYEN]... --target-directory=DIREKTORI SUMBER...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -7735,37 +7828,37 @@ msgid "" " -r, --repeat output lines can be repeated\n" msgstr "" -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "terlalu banyak hujah bukan-opsyen" -#: src/shuf.c:431 +#: src/shuf.c:428 #, fuzzy, c-format msgid "multiple -i options specified" msgstr "banyak opsyen -l or -t dinyatakan" -#: src/shuf.c:452 -#, fuzzy, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "nombor tidak sah %s" -#: src/shuf.c:465 +#: src/shuf.c:459 #, fuzzy, c-format -msgid "invalid line count %s" +msgid "invalid line count: %s" msgstr "lebar baris tidak sah: %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, fuzzy, c-format msgid "multiple output files specified" msgstr "banyak opsyen -l or -t dinyatakan" -#: src/shuf.c:502 +#: src/shuf.c:496 #, fuzzy, c-format msgid "cannot combine -e and -i options" msgstr "tak boleh gabungkan isyarat dengan -l atau -t" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -7784,12 +7877,12 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, fuzzy, c-format msgid "invalid time interval %s" msgstr "format gaya tarikh tidak sah %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, fuzzy, c-format msgid "cannot read realtime clock" msgstr "tak boleh mencipta pautan %s" @@ -7801,13 +7894,13 @@ msgstr "" "Cetak bahagian ibaris dipilih drpd setiap FAIL ke output piawai.\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -7815,19 +7908,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:443 +#: src/sort.c:444 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:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -7835,7 +7928,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7845,19 +7938,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -7866,7 +7959,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7875,13 +7968,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -7889,7 +7982,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7904,7 +7997,7 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -7923,491 +8016,495 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:524 +#: src/sort.c:525 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:725 +#: src/sort.c:724 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "Menulis ke %s." -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:884 +#: src/sort.c:883 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "tak dapat memcipta fail biasa %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "pembukaan gagal" -#: src/sort.c:998 +#: src/sort.c:997 #, fuzzy msgid "fflush failed" msgstr "fail istimewa blok" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 #, fuzzy msgid "close failed" msgstr "fail istimewa blok" -#: src/sort.c:1140 +#: src/sort.c:1139 #, fuzzy msgid "couldn't create temporary file" msgstr "tak dapat memcipta fail biasa %s" -#: src/sort.c:1179 +#: src/sort.c:1178 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "tak dapat mencipta direktori %s" -#: src/sort.c:1252 +#: src/sort.c:1251 #, fuzzy, c-format msgid "warning: cannot remove: %s" msgstr "tak dapat membuang %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "hujah tidak sah %s bagi %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "hujah ambiguous %s bagi %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s adalah terlalu besar" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "stat gagal" -#: src/sort.c:1788 +#: src/sort.c:1787 #, fuzzy msgid "read failed" msgstr "fail biasa" -#: src/sort.c:2076 +#: src/sort.c:2075 #, fuzzy, c-format msgid "string transformation failed" msgstr "perbandingan rentetan gagal" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "%s: opsyen `-W %s' adalah ambiguous\n" msgstr[1] "%s: opsyen `-W %s' adalah ambiguous\n" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 #, fuzzy msgid "write failed" msgstr "fail pelik" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "" -#: src/sort.c:2819 +#: src/sort.c:2818 #, fuzzy msgid "standard error" msgstr "output standard" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "tak dapat menetapkan tarikh" -#: src/sort.c:4017 +#: src/sort.c:4016 #, fuzzy, c-format msgid "%s: invalid field specification %s" msgstr "%s: fail saiz tidak sah" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "" -#: src/sort.c:4079 +#: src/sort.c:4078 #, fuzzy, c-format msgid "%s: invalid count at start of %s" msgstr "hujah tidak sah %s bagi %s" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "nombor tidak sah %s" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "nombor tidak sah %s" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 #, fuzzy msgid "stray character in field spec" msgstr "fail istimewa aksara" -#: src/sort.c:4403 +#: src/sort.c:4402 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "banyak opsyen -l or -t dinyatakan" -#: src/sort.c:4420 +#: src/sort.c:4419 #, fuzzy msgid "invalid number at field start" msgstr "nombor tidak sah %s" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 #, fuzzy msgid "field number is zero" msgstr "nombor tidak sah %s" -#: src/sort.c:4433 +#: src/sort.c:4432 #, fuzzy msgid "character offset is zero" msgstr "fail istimewa aksara" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "nombor tidak sah %s" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, fuzzy, c-format msgid "cannot read file names from %s" msgstr "tak boleh banding nama fail %s dan %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s: jenis fail tidak sah" -#: src/sort.c:4619 +#: src/sort.c:4618 #, fuzzy, c-format msgid "no input from %s" msgstr "menutup fail input %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 +#: src/split.c:224 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Penggunaan: %s [OPSYEN]...[FAIL]...\n" -#: src/split.c:207 +#: src/split.c:228 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "" -#: src/split.c:365 +#: src/split.c:419 #, fuzzy, c-format msgid "creating file %s\n" msgstr "mencipta %s" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "nilai pembolehubah persekitaran LS_COLORS tidak boleh dihantar" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "gagal mengekalkan masa bagi %s" -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" msgstr "menutup fail input %s" -#: src/split.c:410 +#: src/split.c:464 #, fuzzy, c-format msgid "closing output pipe" msgstr "menutup fail output %s" -#: src/split.c:414 +#: src/split.c:468 #, fuzzy, c-format msgid "moving input pipe" msgstr "menutup fail input %s" -#: src/split.c:416 +#: src/split.c:470 #, fuzzy, c-format msgid "closing input pipe" msgstr "menutup fail input %s" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "takboleh nyahpaut %s" -#: src/split.c:427 +#: src/split.c:481 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "gagal mengekalkan masa bagi %s" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, fuzzy, c-format msgid "cannot split in more than one way" msgstr "tak boleh nyatakan masa lebih daripada satu sumber" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "nombor tidak sah %s" -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: nombor tidak sah" -#: src/split.c:1169 -#, fuzzy, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: fail saiz tidak sah" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 +#, c-format +msgid "empty record separator" +msgstr "" + +#: src/split.c:1344 #, fuzzy, c-format -msgid "%s: invalid number of bytes" -msgstr "nombor tidak sah %s" +msgid "multi-character separator %s" +msgstr "aksara tidak sah pada %s pada rentetan mod %s" -#: src/split.c:1213 src/split.c:1360 +#: src/split.c:1352 #, fuzzy, c-format -msgid "%s: invalid number of lines" -msgstr "nombor tidak sah %s" +msgid "multiple separator characters specified" +msgstr "fail istimewa aksara" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "" -#: src/split.c:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "nombor baris permulaan tidak sah `%s'" -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: fail saiz tidak sah" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "" -#: src/stat.c:887 +#: src/stat.c:890 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "%s: opensyen tidak dikenali `%c%s'\n" -#: src/stat.c:1184 +#: src/stat.c:1187 #, fuzzy, c-format msgid "%s: invalid directive" msgstr "%s: fail saiz tidak sah" -#: src/stat.c:1231 +#: src/stat.c:1234 #, fuzzy, c-format msgid "warning: backslash at end of format" msgstr "aksara tidak sah pada %s pada rentetan mod %s" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "tak dapat membaca maklumat sistem fail bagi %s" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8418,7 +8515,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8426,30 +8523,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8457,17 +8554,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8477,7 +8574,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -8489,7 +8586,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8499,7 +8596,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8512,7 +8609,7 @@ msgid "" " %T minor device type in hex, for character/block device special files\n" msgstr "" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8527,7 +8624,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8538,7 +8635,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -8593,8 +8690,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -8619,7 +8715,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8627,96 +8723,149 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 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:535 +#: src/stty.c:543 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:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +msgid "" " 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 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:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" msgstr "" -#: src/stty.c:559 +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" + +#: src/stty.c:614 +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 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:578 +#: src/stty.c:632 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" +msgstr "" + +#: src/stty.c:637 +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:584 +#: src/stty.c:641 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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -8724,10 +8873,13 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -8735,135 +8887,249 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +msgid "" " [-]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:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:619 +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +msgid "" " [-]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:627 +#: src/stty.c:712 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:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]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:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +msgid "" " * 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr "" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:672 +#: src/stty.c:843 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" +msgstr "" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:875 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:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 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:707 +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8872,25 +9138,27 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8899,57 +9167,62 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "" -#: src/stty.c:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, fuzzy, c-format msgid "invalid argument %s" msgstr "hujah tidak sah %s bagi %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, fuzzy, c-format msgid "missing argument to %s" msgstr "kehilangan hujah fail" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "menulis %s" + +#: src/stty.c:1331 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "lebar baris tidak sah: %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: tiada maklumat saiz bagi peranti ini" -#: src/stty.c:1924 -#, fuzzy, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "hujah tidak sah %s bagi %s" #. This is a proper name. See the gettext manual, section Names. @@ -8959,25 +9232,64 @@ msgid "Kayvan Aghaiepour" msgstr "Mike Parker and David MacKenzie" #: src/sum.c:62 +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" + +#: src/sum.c:68 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 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Penggunaan: %s [OPSYEN] [FAIL]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" +"\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" msgstr "" -#: src/sync.c:69 +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "membaca %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "tak dapat menukar ke kumpulan null" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "membaca %s" + +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "mengabaikan segala hujah" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -8986,15 +9298,23 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr "" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr "" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" + +#: src/system.h:544 #, fuzzy msgid "" "\n" @@ -9003,7 +9323,7 @@ msgstr "" "Hujah mandatori kepada opsyen panjang andalah mandatori bagi opsyen pendek " "juga.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -9011,7 +9331,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -9020,7 +9340,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -9031,22 +9351,27 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -#: src/system.h:591 +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Cuba `%s --help' untuk maklumat lanjut .\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9063,9 +9388,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "\n" "Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" @@ -9077,66 +9400,65 @@ msgid "" " -s, --separator=STRING use STRING as the separator instead of newline\n" msgstr "" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, fuzzy, c-format msgid "%s: seek failed" msgstr "fail istimewa blok" -#: src/tac.c:263 +#: src/tac.c:277 #, fuzzy, c-format msgid "record too large" msgstr "%s adalah terlalu besar" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "tak dapat memcipta fail biasa %s" -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "gagal mengekalkan masa bagi %s" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "gagal mengekalkan masa bagi %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, fuzzy, c-format msgid "%s: write error" msgstr "ralat menulis" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "tak dapat buka %s untuk dibaca" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "pemisah tak boleh kosong" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "" -#: src/tail.c:262 +#: src/tail.c:257 #, 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 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -9144,7 +9466,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -9157,14 +9479,14 @@ msgid "" " with inotify, this option is rarely useful\n" msgstr "" -#: src/tail.c:293 +#: src/tail.c:288 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 if it is inaccessible\n" msgstr "" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -9173,7 +9495,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -9184,7 +9506,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -9194,169 +9516,168 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:368 +#: src/tail.c:363 #, fuzzy, c-format msgid "closing %s (fd=%d)" msgstr "menutup %s" -#: src/tail.c:461 +#: src/tail.c:456 #, fuzzy, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "tak boleh mencipta fifo %s" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" -#: src/tail.c:980 +#: src/tail.c:973 #, fuzzy, c-format msgid "%s has become inaccessible" msgstr "`%s' menjadi tidak boleh diakses" -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" -#: src/tail.c:1006 +#: src/tail.c:999 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" -#: src/tail.c:1027 +#: src/tail.c:1020 #, fuzzy, c-format msgid "%s has become accessible" msgstr "`%s' menjadi boleh diakses" -#: src/tail.c:1035 +#: src/tail.c:1032 #, c-format -msgid "%s has appeared; following end of new file" +msgid "%s has appeared; following new file" msgstr "" -#: src/tail.c:1046 +#: src/tail.c:1042 #, c-format -msgid "%s has been replaced; following end of new file" +msgid "%s has been replaced; following new file" msgstr "" -#: src/tail.c:1163 +#: src/tail.c:1159 #, fuzzy, c-format msgid "%s: cannot change nonblocking mode" msgstr "tak dapat menukar ke kumpulan null" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, fuzzy, c-format msgid "no files remaining" msgstr "kehilangan hujah fail" -#: src/tail.c:1424 +#: src/tail.c:1440 #, fuzzy, c-format msgid "cannot watch parent directory of %s" msgstr "tak dapat mencipta direktori %s" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, fuzzy, c-format msgid "inotify resources exhausted" msgstr "memori keletihan" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, fuzzy, c-format msgid "cannot watch %s" msgstr "tak dapat stat %s" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: mengganti %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1597 #, fuzzy, c-format msgid "error reading inotify event" msgstr "membaca %s" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" -#: src/tail.c:1961 -#, fuzzy, c-format -msgid "number in %s is too large" -msgstr "nombor tidak sah %s" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +msgid "invalid maximum number of unchanged stats between opens" msgstr "" -#: src/tail.c:2049 -#, fuzzy, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: fail saiz tidak sah" -#: src/tail.c:2068 +#: src/tail.c:2107 #, fuzzy, c-format -msgid "%s: invalid number of seconds" -msgstr "nombor tidak sah %s" +msgid "invalid number of seconds: %s" +msgstr "bilangan kolum tidak sah: `%s'" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" -#: src/tail.c:2108 +#: src/tail.c:2147 #, fuzzy, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "pautan simbolik tidak disokong pada sistem ini" -#: src/tail.c:2209 +#: src/tail.c:2250 #, fuzzy, c-format msgid "cannot follow %s by name" msgstr "tak dapat perolehi nama sistem" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -9364,66 +9685,77 @@ msgid "" " -i, --ignore-interrupts ignore interrupt signals\n" msgstr "" -#: src/tee.c:71 -#, fuzzy +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, fuzzy, c-format msgid "missing argument after %s" msgstr "kehilangan hujah fail" -#: src/test.c:159 +#: src/test.c:161 #, fuzzy, c-format msgid "invalid integer %s" msgstr "nombor tidak sah %s" -#: src/test.c:241 +#: src/test.c:243 #, fuzzy msgid "')' expected" msgstr "')' dijangka\n" -#: src/test.c:244 +#: src/test.c:246 #, fuzzy, c-format msgid "')' expected, found %s" msgstr "')' dijangka\n" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, fuzzy, c-format msgid "%s: unary operator expected" msgstr "%s: ungkapan biasa (regexp) tidak sah: %s" -#: src/test.c:329 +#: src/test.c:331 #, fuzzy msgid "-nt does not accept -l" msgstr "-nt tak boleh menerima -l\n" -#: src/test.c:342 +#: src/test.c:344 #, fuzzy msgid "-ef does not accept -l" msgstr "-ef tak boleh menerima -l\n" -#: src/test.c:358 +#: src/test.c:360 #, fuzzy msgid "-ot does not accept -l" msgstr "-ot tak boleh menerima -l\n" -#: src/test.c:367 +#: src/test.c:369 #, fuzzy msgid "unknown binary operator" msgstr "Ralat sistem yang tidak diketahui" -#: src/test.c:646 +#: src/test.c:648 #, fuzzy, c-format msgid "%s: binary operator expected" msgstr "%s: ungkapan biasa (regexp) tidak sah: %s" -#: src/test.c:704 +#: src/test.c:706 #, fuzzy msgid "" "Usage: test EXPRESSION\n" @@ -9435,7 +9767,7 @@ msgstr "" "Pengunaan: %s FAIL\n" " atau: %s OPSYEN\n" -#: src/test.c:711 +#: src/test.c:713 #, fuzzy msgid "" "Exit with the status determined by EXPRESSION.\n" @@ -9444,14 +9776,14 @@ msgstr "" "Pengunaan: %s FAIL\n" " atau: %s OPSYEN\n" -#: src/test.c:717 +#: src/test.c:719 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 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -9460,7 +9792,7 @@ msgid "" " EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n" msgstr "" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -9470,7 +9802,7 @@ msgid "" " STRING1 != STRING2 the strings are not equal\n" msgstr "" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -9481,7 +9813,7 @@ msgid "" " INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n" msgstr "" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -9489,7 +9821,7 @@ msgid "" " FILE1 -ot FILE2 FILE1 is older than FILE2\n" msgstr "" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -9498,7 +9830,7 @@ msgid "" " -e FILE FILE exists\n" msgstr "" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -9507,7 +9839,7 @@ msgid "" " -k FILE FILE exists and has its sticky bit set\n" msgstr "" -#: src/test.c:766 +#: src/test.c:768 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" @@ -9516,7 +9848,7 @@ msgid "" " -s FILE FILE exists and has a size greater than zero\n" msgstr "" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -9525,7 +9857,7 @@ msgid "" " -x FILE FILE exists and execute (or search) permission is granted\n" msgstr "" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -9534,32 +9866,32 @@ msgid "" "INTEGER may also be -l STRING, which evaluates to the length of STRING.\n" msgstr "" -#: src/test.c:786 +#: src/test.c:788 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 +#: src/test.c:793 msgid "test and/or [" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "" -#: src/test.c:872 +#: src/test.c:874 #, fuzzy, c-format msgid "extra argument %s" msgstr "terlalu banyak hujah" @@ -9579,7 +9911,7 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -9588,11 +9920,11 @@ msgstr "" "Pengunaan: %s FAIL\n" " atau: %s OPSYEN\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -9610,7 +9942,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9618,7 +9950,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -9629,7 +9961,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -9644,6 +9976,11 @@ msgstr "menulis %s" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -9929,12 +10266,12 @@ msgstr "" msgid "Exit with a status code indicating failure." msgstr "" -#: src/truncate.c:96 +#: src/truncate.c:69 #, fuzzy, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Penggunaan: %s [OPSYEN]... FAIL...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -9945,22 +10282,22 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -9968,57 +10305,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: fail mempunya saiz negatif" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "Tak dapat perolehi masa bagi hari" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "" -#: src/truncate.c:303 +#: src/truncate.c:276 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "banyak opsyen -l or -t dinyatakan" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "nombor tidak sah %s" + +#: src/truncate.c:307 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "anda mesti nyatakan senarai byte, aksara, atau medan" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, fuzzy, c-format msgid "cannot open %s for writing" msgstr "tak dapat buka %s untuk dibaca" @@ -10033,16 +10375,19 @@ msgstr "" 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:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "" + +#: src/tsort.c:475 #, fuzzy, c-format msgid "%s: input contains an odd number of tokens" msgstr "nombor tidak sah %s" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "" @@ -10097,9 +10442,7 @@ msgstr "tak dapat perolehi 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "\n" "Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" @@ -10143,8 +10486,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -10155,7 +10498,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -10294,11 +10637,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "" - #: src/uptime.c:214 #, c-format msgid "" @@ -10314,12 +10652,16 @@ msgid "" "\n" msgstr "" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +msgid "" +"\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" @@ -10327,12 +10669,12 @@ msgid "" " -l, --lines print the newline counts\n" msgstr "" -#: src/wc.c:128 +#: src/wc.c:134 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" @@ -10469,9 +10811,9 @@ msgid "" "\n" msgstr "" -#: src/whoami.c:91 +#: src/whoami.c:87 #, fuzzy, c-format -msgid "%s: cannot find name for user ID %lu\n" +msgid "cannot find name for user ID %lu" msgstr "tak dapat menjumpai nama bagi ID pengguna %u" #: src/yes.c:41 @@ -10489,6 +10831,68 @@ msgid "" "\n" msgstr "" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Dengan tiada FAIL, atau bila FAIL adalah -, baca input piawai.\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "mengabaikan segala hujah" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: nombor tidak sah" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s adalah terlalu besar dan tak boleh diperwakilkan" + +#~ msgid "number of lines" +#~ msgstr "bilangan baris" + +#~ msgid "number of bytes" +#~ msgstr "bilangan byte" + +#, fuzzy +#~ msgid "%s: invalid number to ignore" +#~ msgstr "nombor tidak sah %s" + +#, fuzzy +#~ msgid "%s: invalid number of bytes" +#~ msgstr "nombor tidak sah %s" + +#, fuzzy +#~ msgid "%s: invalid number of lines" +#~ msgstr "nombor tidak sah %s" + +#, fuzzy +#~ msgid "number in %s is too large" +#~ msgstr "nombor tidak sah %s" + +#, fuzzy +#~ msgid "%s: invalid number of seconds" +#~ msgstr "nombor tidak sah %s" + +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "tak dapat perolehi senarai kumpulan tambahan" + +#, fuzzy +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "tak dapat menjumpai nama bagi ID pengguna %u" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: opsyen tidak dibenarkan -- %c\n" @@ -10518,9 +10922,6 @@ msgstr "" #~ msgid "too few arguments" #~ msgstr "terlalu sedikit hujah" -#~ msgid "Usage: %s [OPTION] [FILE]...\n" -#~ msgstr "Penggunaan: %s [OPSYEN] [FAIL]...\n" - #~ msgid "closing standard output" #~ msgstr "menutup output piawai" diff --git a/po/nb.gmo b/po/nb.gmo index 9d5362de..6231b4c3 100644 Binary files a/po/nb.gmo and b/po/nb.gmo differ diff --git a/po/nb.po b/po/nb.po index bcf40988..bf70d961 100644 --- a/po/nb.po +++ b/po/nb.po @@ -2,14 +2,15 @@ # Copyright (C) 1996 Free Software Foundation, Inc. # This file is distributed under the same license as the coreutils package. # Eivind Tagseth , 1996, 1997, 1999. -# Åka Sikrom , 2014. +# Åka Sikrom , 2015. # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils-8.23-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" -"PO-Revision-Date: 2014-07-18 11:36+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" +"PO-Revision-Date: 2015-01-24 14:47+0100\n" "Last-Translator: Åka Sikrom \n" "Language-Team: Norwegian Bokmaal \n" "Language: nb\n" @@ -37,21 +38,21 @@ msgstr "Følgende argumenter er gyldige:" msgid "error closing file" msgstr "feil ved lukking av fil" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "feil ved skriving" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" -msgstr "bevarer rettigheter for %s" +msgstr "bevarer rettigheter til %s" #: lib/error.c:191 msgid "Unknown system error" @@ -59,7 +60,7 @@ msgstr "Ukjent systemfeil" #: lib/file-type.c:40 msgid "regular empty file" -msgstr "vanlig, tom fil" +msgstr "vanlig tom fil" #: lib/file-type.c:40 msgid "regular file" @@ -95,7 +96,7 @@ msgstr "blokk-spesiell fil" #: lib/file-type.c:69 msgid "character special file" -msgstr "spesial-tegnfil" +msgstr "tegn-spesialfil" #: lib/file-type.c:72 msgid "contiguous data" @@ -229,57 +230,62 @@ msgstr "Parameterstreng er feilkodet" msgid "Unknown error" msgstr "Ukjent feil" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: valget «%s» er tvetydig. Mulige valg:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: valget «-W %s» er tvetydig\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: valget «--%s» tillater ikke argumenter\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: valget «%c%s» tillater ikke argumenter\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: valget «--%s» krever et argument\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: valget «--%s» er ukjent\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: valget «%c%s» er ukjent\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: valget -- «%c» er ugyldig\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: valget -- «%c» krever et argument\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: valget «-W %s» er tvetydig\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: valget «-W %s» tillater ikke argumenter\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: valget «-W %s» krever et argument\n" @@ -287,18 +293,18 @@ msgstr "%s: valget «-W %s» krever et argument\n" #: lib/mkdir-p.c:181 src/install.c:487 #, c-format msgid "cannot change permissions of %s" -msgstr "klarte ikke å endre rettigheter for «%s»" +msgstr "klarte ikke å endre rettigheter til %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" -msgstr "klarte ikke å opprette mappa «%s»" +msgstr "klarte ikke å opprette mappa %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" -msgstr "minnet er oppbrukt" +msgstr "minnet er fullt" #: lib/openat-die.c:38 #, c-format @@ -344,6 +350,12 @@ msgstr "»" msgid "%s: end of file" msgstr "%s: slutt på fil" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: lesefeil" + #: lib/regcomp.c:131 msgid "Success" msgstr "Fullført" @@ -358,7 +370,7 @@ msgstr "Ugyldig regulært uttrykk" #: lib/regcomp.c:140 msgid "Invalid collation character" -msgstr "Ugyldig sammenligningstegn" +msgstr "Ugyldig sammenlikningstegn" #: lib/regcomp.c:143 msgid "Invalid character class name" @@ -398,7 +410,7 @@ msgstr "Minnet er fullt" #: lib/regcomp.c:170 msgid "Invalid preceding regular expression" -msgstr "Ugyldig forestående regulært uttrykk" +msgstr "Ugyldig foregående regulært uttrykk" #: lib/regcomp.c:173 msgid "Premature end of regular expression" @@ -424,7 +436,7 @@ msgstr "det er farlig å jobbe rekursivt på %s" #: lib/root-dev-ino.h:41 #, c-format msgid "it is dangerous to operate recursively on %s (same as %s)" -msgstr "det er farlig å jobbe rekursivt på %s (samme som %s)" +msgstr "det er farlig å jobbe rekursivt på %s (tilsvarer %s)" #: lib/root-dev-ino.h:43 #, c-format @@ -451,7 +463,7 @@ msgstr "^[jJ]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "angir rettigheter til %s" @@ -671,7 +683,7 @@ msgstr "" "Lisens GPLv3+: GNU GPL versjon 3 eller senere .\n" "Dette er fri programvare. Du kan endre den og dele den videre.\n" -"Det stilles INGEN GARANTI, så langt aktuelt lovverk tillater det.\n" +"Det stilles INGEN GARANTI, i den grad dette tillates av gjeldende lovverk.\n" "\n" #. TRANSLATORS: %s denotes an author name. @@ -793,12 +805,13 @@ msgid "" "Report bugs to: %s\n" msgstr "" "\n" -"Rapporter feil til: %s\n" +"Rapporter programfeil til: %s\n" +"Rapporter oversettelsesfeil til: \n" #: lib/version-etc.c:247 #, c-format msgid "Report %s bugs to: %s\n" -msgstr "Rapporter feil som oppstår med %s til: %s\n" +msgstr "Rapporter programfeil i %s til: %s\n" #: lib/version-etc.c:251 #, c-format @@ -817,15 +830,15 @@ msgstr "" #: lib/xfreopen.c:35 msgid "stdin" -msgstr "standard innkanal" +msgstr "std.innkanal" #: lib/xfreopen.c:36 msgid "stdout" -msgstr "standard utkanal" +msgstr "std.utkanal" #: lib/xfreopen.c:37 msgid "stderr" -msgstr "standardfeil" +msgstr "std.feilkanal" #: lib/xfreopen.c:38 msgid "unknown stream" @@ -839,7 +852,7 @@ msgstr "klarte ikke å åpne %s på nytt med modus %s" #: lib/xmemcoll.c:39 src/expr.c:878 #, c-format msgid "string comparison failed" -msgstr "strengsammenligning mislyktes" +msgstr "sammenlikning av strenger mislyktes" #: lib/xmemcoll.c:40 #, c-format @@ -849,7 +862,7 @@ msgstr "Velg LC_ALL='C' for å omgå problemet." #: lib/xmemcoll.c:42 #, c-format msgid "The strings compared were %s and %s." -msgstr "Strengene som ble sammenlignet var «%s» og «%s»." +msgstr "Strengene som ble sammenliknet var %s og %s." #: lib/xprintf.c:50 lib/xprintf.c:76 #, c-format @@ -869,7 +882,7 @@ msgstr "ugyldig suffiks i %s%s-argument «%s»" #: lib/xstrtol-error.c:72 #, c-format msgid "%s%s argument '%s' too large" -msgstr "%s%s-argumentet «%s» er for stort/langt" +msgstr "%s%s-argumentet «%s» er for stort" #. This is a proper name. See the gettext manual, section Names. #: src/base64.c:40 @@ -886,7 +899,7 @@ msgstr "" "Konverter FIL eller inndata til eller fra base64-format, og send til " "standardutdata.\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -902,16 +915,7 @@ msgstr "" " Bruk 0 for å deaktivere linjekutting\n" "\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet fra " -"standard inndata.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -925,51 +929,51 @@ msgstr "" "base64-alfabetet. Bruk «--ignore-garbage» for å forsøke å ignorere ikke-\n" "alfabetiske tegn i den kodede datastrømmen.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "lesefeil" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "ugyldig inndata" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" -msgstr "«%s» er en ugyldig linjebruddsstørrelse" +msgstr "%s er en ugyldig linjebruddsstørrelse" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "ekstra operand %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "lukker standard inndata" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1020,38 +1024,43 @@ msgstr "" " %s -a any/str1 any/str2 -> «str1» etterfulgt av «str2»\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "mangler operand" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Bruk: %s [VALG] … [FIL] …\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "Skriv ut sorterte sammenslåinger av alle FILer til standardutdata.\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1070,19 +1079,19 @@ msgstr "" " -n, --number nummerer alle linjer\n" " -s, --squeeze-blank ikke skriv ut flere tomme linjer på rad\n" -#: src/cat.c:102 +#: src/cat.c:107 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 "" -" -t tilsvarer -vT\n" +" -t tilsvarer «-vT»\n" " -T, --show-tabs vis tabulatortegn som ^I\n" " -u (ignorert)\n" " -v, --show-nonprinting bruk ^ og M-notasjon, unntatt for LFD og TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1094,19 +1103,20 @@ msgstr "" "Eksempler:\n" " %s f - g Skriv innholdet av f, deretter standard input, og til slutt\n" " innholdet av g.\n" -" %s Kopier standard inndata til standard utdata.\n" +" %s Kopier standard inndata til standardutdata.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "klarte ikke å utføre ioctl på %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" -msgstr "standard utdata" +msgstr "standardutdata" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: inndatafil er utdatafil" @@ -1118,10 +1128,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1135,8 +1145,8 @@ msgstr "klarte ikke å opprette sikkerhetskontekst: %s" msgid "failed to set %s security context component to %s" msgstr "klarte ikke å velge %s-sikkerhetskontekst %s" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "klarte ikke å hente sikkerhetskontekst fra %s" @@ -1151,16 +1161,16 @@ msgstr "klarte ikke å bruke delkontekst på umarkert fil %s" msgid "failed to change context of %s to %s" msgstr "klarte ikke å endre kontekst på %s til %s" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "klarte ikke å åpne %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" -msgstr "klarte ikke å lese mappa «%s»" +msgstr "klarte ikke å lese mappa %s" #: src/chcon.c:292 #, c-format @@ -1173,7 +1183,7 @@ msgstr "endrer sikkerhetskontekst for %s\n" msgid "fts_read failed" msgstr "fts_read mislyktes" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1270,9 +1280,9 @@ msgstr "" "det siste som gjelder.\n" "\n" " -H hvis et argument er en symbolsk lenke\n" -" som peker til en mappe, skal mappa gjennomgås\n" +" som peker på en mappe, skal mappa gjennomgås\n" " -L gå gjennom hver symbolske lenke som\n" -" dukker opp, og som peker til en mappe\n" +" dukker opp, og som peker på en mappe\n" " -P ikke gå gjennom symbolske lenkemål (standard)\n" "\n" @@ -1288,11 +1298,11 @@ msgid "-R -h requires -P" msgstr "valget «-R -h» krever at du også bruker «-P»" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" -msgstr "mangler operand etter %s" +msgstr "operand mangler etter %s" #: src/chcon.c:560 src/runcon.c:250 #, c-format @@ -1305,9 +1315,8 @@ msgid "conflicting security context specifiers given" msgstr "valgte spesifikasjoner av sikkerhetskontekster samsvarer ikke" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "klarte ikke å hente attributtene til %s" @@ -1315,7 +1324,7 @@ msgstr "klarte ikke å hente attributtene til %s" #: src/chgrp.c:92 #, c-format msgid "invalid group: %s" -msgstr "gruppa «%s» er ugyldig" +msgstr "%s er en ugyldig gruppe" #: src/chgrp.c:108 #, c-format @@ -1384,7 +1393,7 @@ msgstr "henter nye attributter for %s" #: src/chmod.c:151 src/chown-core.c:147 #, c-format msgid "neither symbolic link %s nor referent has been changed\n" -msgstr "hverken den symbolske lenka «%s» eller målet den peker til er endret\n" +msgstr "hverken den symbolske lenka %s eller målet den peker på er endret\n" #: src/chmod.c:165 #, c-format @@ -1404,8 +1413,7 @@ msgstr "modus for %s er fremdeles %04lo (%s)\n" #: src/chmod.c:238 #, c-format msgid "cannot operate on dangling symlink %s" -msgstr "" -"klarte ikke å jobbe med den symbolsk lenka «%s», som har ugyldig lenkemål" +msgstr "klarte ikke å jobbe med symbolsk lenke %s, som har ugyldig lenkemål" #: src/chmod.c:278 #, c-format @@ -1463,67 +1471,67 @@ msgstr "du kan ikke velge modus samtidig som du bruker valget «--reference»" #: src/chmod.c:547 #, c-format msgid "invalid mode: %s" -msgstr "modus «%s» er ugyldig" +msgstr "modus %s er ugyldig" #: src/chown-core.c:158 #, c-format msgid "changed ownership of %s from %s to %s\n" -msgstr "eier av «%s» er endret fra %s til %s\n" +msgstr "eier av %s er endret fra %s til %s\n" #: src/chown-core.c:159 #, c-format msgid "changed group of %s from %s to %s\n" -msgstr "gruppeeierskapet til «%s» er endret fra %s til %s\n" +msgstr "gruppeeierskapet til %s er endret fra %s til %s\n" #: src/chown-core.c:160 #, c-format msgid "no change to ownership of %s\n" -msgstr "eierskapet til «%s» er uendret\n" +msgstr "eierskapet til %s er uendret\n" #: src/chown-core.c:165 #, c-format msgid "failed to change ownership of %s from %s to %s\n" -msgstr "klarte ikke å skifte eier av «%s» fra %s til %s\n" +msgstr "klarte ikke å bytte eier av %s fra %s til %s\n" #: src/chown-core.c:166 #, c-format msgid "failed to change group of %s from %s to %s\n" -msgstr "klarte ikke å endre gruppeeierskapet til «%s» fra %s til %s\n" +msgstr "klarte ikke å endre gruppeeierskapet til %s fra %s til %s\n" #: src/chown-core.c:167 src/chown-core.c:173 #, c-format msgid "failed to change ownership of %s\n" -msgstr "klarte ikke å endre eier av «%s»\n" +msgstr "klarte ikke å endre eier av %s\n" #: src/chown-core.c:171 #, c-format msgid "failed to change ownership of %s to %s\n" -msgstr "klarte ikke å endre eier av «%s» til %s\n" +msgstr "klarte ikke å endre eier av %s til %s\n" #: src/chown-core.c:172 #, c-format msgid "failed to change group of %s to %s\n" -msgstr "klarte ikke å endre gruppe for «%s» til %s\n" +msgstr "klarte ikke å endre gruppetilhørighet for %s til %s\n" #: src/chown-core.c:180 #, c-format msgid "ownership of %s retained as %s\n" -msgstr "eier av «%s» er fremdeles %s\n" +msgstr "eier av %s er fremdeles %s\n" #: src/chown-core.c:181 #, c-format msgid "group of %s retained as %s\n" -msgstr "gruppetilhørighet for «%s» er fremdeles %s\n" +msgstr "gruppetilhørighet for %s er fremdeles %s\n" #: src/chown-core.c:182 #, c-format msgid "ownership of %s retained\n" -msgstr "eier av «%s» er ikke endret\n" +msgstr "eier av %s er ikke endret\n" #: src/chown-core.c:379 #, c-format msgid "cannot dereference %s" -msgstr "klarte ikke å følge lenka «%s»" +msgstr "klarte ikke å følge lenka %s" #: src/chown-core.c:467 #, c-format @@ -1623,17 +1631,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" -msgstr "gruppa «%s» er ugyldig" +msgstr "gruppa %s er ugyldig" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" -msgstr "gruppelista «%s» er ugyldig" +msgstr "gruppelista %s er ugyldig" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1642,7 +1650,7 @@ msgstr "" "Bruk: %s [VALG] NYROT [KOMMANDO [ARG]…]\n" " eller: %s VALG\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1650,16 +1658,28 @@ msgstr "" "Kjør KOMMANDO med NYROT som rotmappe.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" msgstr "" " --userspec=BRUKER:GRUPPE velg bruker og gruppe (uttrykt med ID eller " "navn) som skal brukes\n" " --groups=G_LIST velg tilleggsgrupper, som f.eks. g1, g2,…gN\n" -#: src/chroot.c:203 +#: src/chroot.c:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" +" --userspec=BRUKER:GRUPPE velg bruker og gruppe (uttrykt med ID eller " +"navn) som skal brukes\n" +" --groups=G_LIST velg tilleggsgrupper, som f.eks. g1, g2,…gN\n" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" @@ -1668,45 +1688,50 @@ msgstr "" "Hvis du ikke velger en kommando, kjøres «${SHELL} -i» (standard: «/bin/sh -" "i»).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "klarte ikke å bytte rotmappe til %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "klarte ikke å bytte til rotmappe" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "ingen gruppe er valgt for %d, som er en ukjent uid" -#: src/chroot.c:383 +#: src/chroot.c:400 #, c-format msgid "failed to get supplemental groups" msgstr "klarte ikk å hente tilleggsgrupper" -#: src/chroot.c:395 -#, c-format -msgid "failed to %s supplemental groups" -msgstr "klarte ikke å kjøre %s på tilleggsgrupper" +#: src/chroot.c:412 +#, fuzzy, c-format +msgid "failed to set supplemental groups" +msgstr "klarte ikk å hente tilleggsgrupper" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "klarte ikke å velge gruppe-ID" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "klarte ikke å velge bruker-ID" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" -msgstr "klarte ikke å kjøre kommandoen «%s»" +msgstr "klarte ikke å kjøre kommandoen %s" #. This is a proper name. See the gettext manual, section Names. #: src/cksum.c:40 @@ -1742,9 +1767,19 @@ msgstr "Bruk: %s [VALG] … FIL1 FIL2\n" #: src/comm.c:107 msgid "Compare sorted files FILE1 and FILE2 line by line.\n" -msgstr "Sammenlign de sorterte filene FIL1 og FIL2, linje for linje.\n" +msgstr "Sammenlikn de sorterte filene FIL1 og FIL2, linje for linje.\n" + +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet standard " +"inndata.\n" -#: src/comm.c:110 +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1756,7 +1791,7 @@ msgstr "" "som er unike for FIL1, kolonne to inneholder linjene som er unike for FIL2,\n" "mens kolonne tre inneholder linjene som er felles for begge filene.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1768,7 +1803,7 @@ msgstr "" " -2 utelat kolonne 2 (linjer som kun finnes i FIL2)\n" " -3 utelat kolonne 2 (linjer som finnes i begge filer)\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1780,19 +1815,19 @@ msgstr "" " selv om alle inndatalinjer kan pares\n" " --nocheck-order sjekker ikke om inndata er korrekt sortert\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=STR skiller kolonner med STR\n" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" "\n" -"Merk at sammenligningsprosessen følger reglene som velges av «LC_COLLATE».\n" +"Merk at sammenlikningsprosessen følger reglene som velges av «LC_COLLATE».\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1805,314 +1840,325 @@ msgstr "" " %s -12 fil1 fil2 Bare skriv ut linjer som finnes i både fil1 og fil2.\n" " %s -3 fil1 fil2 Bare skriv ut linjer som ikke finnes i begge filer.\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "fila «%d» er ikke sortert" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "flere skilletegn er valgt" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" -msgstr "«%s» kan ikke være tom" +msgstr "%s kan ikke være tom" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "klarte ikke å søke til posisjon %s med lseek" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "det oppstod en feil ved lesing av %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "kan ikke søke til posisjon %s med lseek" +msgid "error reading %s" +msgstr "det oppstod en feil ved lesing av %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "det oppstod en feil ved skriving av %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "det oppstod en feil ved lesing av %s" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s: klarte ikke å hente info om omfang" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: klarte ikke å skrive" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" -msgstr "klarte ikke å utvide «%s»" +msgstr "klarte ikke å utvide %s" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" -msgstr "fjerner rettigheter for %s" +msgstr "fjerner rettigheter til %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "klarte ikke å beholde eierskap til %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" -msgstr "klarte ikke å finne fila «%s»" +msgstr "fant ikke fila %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "klarte ikke å beholde forfatterskap for %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" -msgstr "klarte ikke å velge «%s» som standard opprettelseskontekst for filer" +msgstr "klarte ikke å velge %s som standard opprettelseskontekst for filer" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" -msgstr "klarte ikke å velge standard opprettelseskontekst for filer på «%s»" +msgstr "klarte ikke å velge standard opprettelseskontekst for filer på %s" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "klarte ikke å gi %s ny sikkerhetskontekst" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "klarte ikke å lese %s" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "klarte ikke å bruke fstat på %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" -msgstr "hopper over fila «%s», fordi den ble byttet ut mens den ble kopiert" +msgstr "hopper over %s, fordi den ble byttet ut mens den ble kopiert" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "klarte ikke å fjerne %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "%s er fjernet\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" -msgstr "skriver ikke gjennom den symbolsk lenka «%s», som har ugyldig lenkemål" +msgstr "skriver ikke gjennom den symbolske lenka %s, som har ugyldig lenkemål" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" -msgstr "klarte ikke å opprette den vanlige fila «%s»" +msgstr "klarte ikke å opprette vanlig fil %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" -msgstr "klarte ikke å klone «%s» fra «%s»" +msgstr "klarte ikke å klone %s fra %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "beholder tidsstempel for %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "klarte ikke å lukke %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: vil du prøve å overskrive %s og overstyre modus %04lo (%s)? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "%s: %s kan ikke skrives til (modus %04lo, %s). Vil du prøve likevel? " -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " -msgstr "%s: vil du overskrive «%s»? " +msgstr "%s: vil du overskrive %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (sikkerhetskopi: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "klarte ikke å gjenopprette standard opprettingskontekst for filer" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" -msgstr "klarte ikke å lage den harde lenka «%s» med lenkemål «%s»" +msgstr "klarte ikke å lage hard lenke %s med lenkemål %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "klarte ikke å hente informasjon om %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" -msgstr "hopper over mappa «%s»" +msgstr "hopper over mappa %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" -msgstr "advarsel: kildefila «%s» er valgt flere ganger." +msgstr "advarsel: kildefil %s er valgt flere ganger." -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" -msgstr "«%s» og «%s» er samme fil" +msgstr "%s og %s er samme fil" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" -msgstr "" -"klarte ikke å overskrive «%s» med «%s», fordi førstnevnte ikke er en mappe" +msgstr "du kan ikke overskrive %s med %s, fordi førstnevnte ikke er en mappe" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "den nyopprettede %s blir ikke overskrevet av %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" -msgstr "klarte ikke å overskrive mappa «%s» med noe som ikke er en mappe" +msgstr "mappe %s kan ikke overskrives med noe som ikke er en mappe" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" -msgstr "klarte ikke å flytte «%s» til «%s», fordi førstnevnte ikke er en mappe" +msgstr "du kan ikke flytte mappe %s til %s, fordi sistnevnte ikke er en mappe" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" -msgstr "" -"sikkerhetskopiering av «%s» ville ha ødelagt kilden. «%s» er ikke flyttet" +msgstr "sikkerhetskopiering av %s ville ha ødelagt kilden. %s er ikke flyttet" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" -msgstr "" -"sikkerhetskopiering av «%s» ville ha ødelagt kilden. «%s» er ikke kopiert" +msgstr "sikkerhetskopiering av %s ville ha ødelagt kilden. %s er ikke kopiert" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" -msgstr "klarte ikke å sikkerhetskopiere «%s»" +msgstr "klarte ikke å sikkerhetskopiere %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, c-format msgid "will not copy %s through just-created symlink %s" -msgstr "«%s» kopieres ikke via den nyopprettede symbolske lenka «%s»" +msgstr "%s kopieres ikke via nyopprettet symbolsk lenke %s" -#: src/copy.c:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" -msgstr "du kan ikke kopiere mappa «%s» til seg selv («%s»)" +msgstr "du kan ikke kopiere mappa %s til seg selv (%s)" + +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "advarsel: kildefil %s er valgt flere ganger." -#: src/copy.c:2201 +#: src/copy.c:2294 #, c-format msgid "will not create hard link %s to directory %s" -msgstr "den harde lenka «%s» til mappa «%s» blir ikke opprettet" +msgstr "hard lenke %s til mappa %s blir ikke opprettet" -#: src/copy.c:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" -msgstr "du kan ikke flytte «%s» til en undermappe av seg selv («%s»)" +msgstr "du kan ikke flytte %s til en undermappe av seg selv (%s)" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" -msgstr "klarte ikke å flytte «%s» til «%s»" +msgstr "klarte ikke å flytte %s til %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "flytting mellom enheter (%s til %s) mislyktes. Klarte ikke å fjerne målet" -#: src/copy.c:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" -msgstr "klarte ikke å kopiere den symbolske lenka «%s», som peker til seg selv" +msgstr "klarte ikke å kopiere den symbolske lenka %s, som peker på seg selv" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: relative symbolske lenker må ta utgangspunkt i mappa du befinner deg i" -#: src/copy.c:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" -msgstr "klarte ikke å lage symbolsk lenke med navnet «%s» og lenkemålet «%s»" +msgstr "klarte ikke å lage symbolsk lenke med navnet %s og lenkemål %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "klarte ikke å lage fifo %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" -msgstr "klarte ikke å lage spesialfil «%s»" +msgstr "klarte ikke å lage spesialfil %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" -msgstr "klarte ikke å lese den symbolske lenka «%s»" +msgstr "klarte ikke å lese symbolsk lenke %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" -msgstr "klarte ikke å lage symbolsk lenke med navnet «%s»" +msgstr "klarte ikke å lage symbolsk lenke med navnet %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s er av ukjent filtype" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" -msgstr "klarte ikke å reversere sikkerhetskopien «%s»" +msgstr "klarte ikke å reversere sikkerhetskopien %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (reverser sikkerhetskopi)\n" @@ -2122,12 +2168,12 @@ msgstr "%s -> %s (reverser sikkerhetskopi)\n" msgid "Alex Deymo" msgstr "Alex Deymo" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "Bruk: %s --coreutils-prog=PROGRAMNAVN [PARAMETRE] … \n" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" @@ -2135,7 +2181,7 @@ msgstr "" "Kjør innebygd PROGRAMNAVN med valgte PARAMETRE.\n" "\n" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" @@ -2145,10 +2191,10 @@ msgstr "" "Skriv «%s --coreutils-prog=PROGRAMNAVN --help» for hjelp med " "enkeltprogrammer.\n" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, c-format msgid "unknown program %s" -msgstr "programmet «%s» er ukjent" +msgstr "%s er et ukjent program" #: src/cp.c:157 src/mv.c:288 #, c-format @@ -2181,7 +2227,7 @@ msgstr "" " -a, --archive tilsvarer «-dR --preserve=all»\n" " --attributes-only ikke kopier fildataene, bare attributtene\n" " --backup[=CONTROL] lag en sikkerhetskopi av hver målfil\n" -" -b samme som «--backup», men kan ikke brukes med " +" -b likner «--backup», men kan ikke brukes med " "argumenter\n" " --copy-contents kopier innholdet i spesialfiler når " "operasjonen kjører rekursivt\n" @@ -2404,12 +2450,12 @@ msgstr "klarte ikke å bevare rettigheter til %s" #: src/cp.c:482 #, c-format msgid "cannot make directory %s" -msgstr "klarte ikke å lage mappa «%s»" +msgstr "klarte ikke å opprette mappa %s" #: src/cp.c:531 src/cp.c:550 #, c-format msgid "%s exists but is not a directory" -msgstr "«%s» eksisterer, men er ikke en mappe" +msgstr "%s eksisterer, men er ikke en mappe" #: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133 #: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405 @@ -2417,8 +2463,8 @@ msgstr "«%s» eksisterer, men er ikke en mappe" msgid "failed to access %s" msgstr "fikk ikke tilgang til %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "mangler fil-operand" @@ -2426,7 +2472,7 @@ msgstr "mangler fil-operand" #: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450 #, c-format msgid "missing destination file operand after %s" -msgstr "mangler målfil-operand etter «%s»" +msgstr "mangler operand for målfil etter %s" #: src/cp.c:608 src/install.c:968 src/mv.c:459 #, c-format @@ -2440,7 +2486,7 @@ msgstr "" #: src/mv.c:473 #, c-format msgid "target %s is not a directory" -msgstr "målet «%s» er ikke en mappe" +msgstr "målet %s er ikke en mappe" #: src/cp.c:735 #, c-format @@ -2467,7 +2513,7 @@ msgstr "du kan ikke lage både hard og symbolsk lenke samtidig" #: src/cp.c:1144 src/mv.c:480 #, c-format msgid "options --backup and --no-clobber are mutually exclusive" -msgstr "valgene «--backup» og «--no-clobber» kan ikke kombineres" +msgstr "du kan ikke velge både «--backup» og «--no-clobber» samtidig" #: src/cp.c:1150 #, c-format @@ -2500,131 +2546,131 @@ msgstr "" "ble bygget uten «xattr»-støtte" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "input forsvant" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: linjenummeret er utenfor tillatt tallrekkevidde" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: linjenummeret er utenfor tillatt rekkevidde" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " ved repetisjon %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: ingen treff" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "feil i søk med regulært uttrykk" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "skrivefeil for %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: forventet heltall etter skilletegn" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: «}» er obligatorisk i gjentagelsesteller" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: du må oppgi et heltall mellom «{» og «}»" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: mangler avsluttende skilletegn «%c»" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" -msgstr "%s: det regulære uttrykket «%s» er ugyldig" +msgstr "%s: regulært uttrykk %s er ugyldig" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: ugyldig mønster" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: linjenummeret må være høyere enn null" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "linjenummer %s er lavere enn forrige linjenummer (%s)" -#: src/csplit.c:1200 +#: src/csplit.c:1201 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "advarsel: linjenummer %s er det samme som forrige linjenummer" -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "suffiks mangler konverteringsspesifikasjon" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "suffiks bruker ugyldig konverteringsspesifikasjon («%c»)" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "suffiks bruker ugyldig konverteringsspesifikasjon («\\%.3o»)" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "ugyldige flagg i konverteringsspesifikasjon («%%%c%c»)" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "suffikset bruker for mange %%-konverteringsspesifikasjoner" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "suffiks mangler %%-konverteringsspesifikasjon" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: ugyldig tall" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "tallet %s er ugyldig" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Bruk: %s [VALG] … FIL MØNSTER …\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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" @@ -2633,7 +2679,17 @@ msgstr "" "osv.,\n" "og skriv ut antall byte for hver del til standardutdata.\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Les standard inndata hvis FIL er «-». Hvert MØNSTER må baseres på en av " +"følgende:\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2644,12 +2700,12 @@ msgstr "" " -f, --prefix=PREFIKS bruk PREFIKS i stedet for «xx»\n" " -k, --keep-files ikke slett opprettede filer ved feil\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" " -m, --suppress-matched utelat linjer som samsvarer med valgt MØNSTER\n" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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,18 +2715,11 @@ msgstr "" " -s, --quiet, --silent ikke skriv ut utdata-filstørrelser\n" " -z, --elide-empty-files fjern tomme ut-filer\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Les standard inndata hvis FIL er «-». Hvert MØNSTER må baseres på en av " -"følgende:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 +#, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2705,9 +2754,9 @@ msgstr "Bruk: %s VALG … [FIL] …\n" #: src/cut.c:176 msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" -"Skriv ut utvalgte deler av linjer fra hver valgt FIL til standard utdata.\n" +"Skriv ut utvalgte deler av linjer fra hver valgt FIL til standardutdata.\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2717,7 +2766,7 @@ msgstr "" " -c, --characters=LISTE bare velg disse tegnene\n" " -d, --delimiter=SKILLE bruk valgt SKILLEtegn i stedet for TAB\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2729,7 +2778,7 @@ msgstr "" " med mindre «-s» er valgt\n" " -n (ignorert)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2737,7 +2786,7 @@ msgstr "" " --complement fyll ut valgte byte, tegn\n" " eller felter\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2748,7 +2797,7 @@ msgstr "" " --output-delimiter=STRENG bruk STRENG som skilletegn i utdata\n" " (inndata-skilletegnet brukes som standard)\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2762,7 +2811,8 @@ msgstr "" "skrevet i samme rekkefølge som det blir lest, og blir skrevet nøyaktig én " "gang.\n" -#: src/cut.c:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2770,8 +2820,6 @@ msgid "" " 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 "" "Hvert område er en av følgende:\n" " N N'te byte, tegn eller felt, talt fra 1\n" @@ -2779,53 +2827,54 @@ msgstr "" " N-M fra N'te til M'te (inklusive) byte, tegn eller felt\n" " -M fra første til M'te (inklusive) byte, tegn eller felt\n" "\n" -"Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet fra " -"standard inndata.\n" +"Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet standard " +"inndata.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "byte-, tegn- eller feltlista er ugyldig" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "felter og posisjoner er nummerert fra 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "ugyldig område uten endepunkt: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "ugyldig minkende område" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" -msgstr "byte-forskyvninga «%s» er for stor" +msgstr "byte-forskyvning %s er for stor" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "feltnummer %s er for høyt" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "du kan bare velge én listetype" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "skilletegnet må være ett enkelt tegn" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "du må spesifisere en liste over bytes, tegn eller felt" -#: src/cut.c:790 +#: src/cut.c:789 msgid "an input delimiter may be specified only when operating on fields" msgstr "et skilletegn kan bare settes under behandling av felt" -#: src/cut.c:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2833,11 +2882,11 @@ msgstr "" "det er meningsløst å fjerne linjer uten skilletegn hvis du ikke\n" "\tbehandler felt" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "feltliste mangler" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "posisjonsliste mangler" @@ -2852,16 +2901,23 @@ msgstr "" #: src/date.c:128 msgid "Display the current time in the given FORMAT, or set the system date.\n" -msgstr "Vis nåværende tid i valgt FORMAT, eller still systemklokka.\n" +msgstr "Vis gjeldende tid i valgt FORMAT, eller still systemklokka.\n" #: 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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" + +#: src/date.c:138 +#, fuzzy +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" " -d, --date=STRENG vis tid som beskrevet i STRENG, ikke som i " "«now»\n" @@ -2875,25 +2931,24 @@ msgstr "" " eller «ns» for tid of dato med angitt " "presisjon.\n" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=FIL vis når aktuell FIL ble endret sist\n" " -R, --rfc-2822 skriv ut dato og klokkeslett i RFC 2822-format.\n" " Eksempel: Mon, 07 Aug 2006 12:34:56 +0200\n" -#: src/date.c:147 +#: src/date.c:149 +#, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=TIDSPES skriv ut dato og klokkeslett i RFC 3339-format.\n" " Erstatt TIDSPES med «date», «seconds» eller «ns» " @@ -2906,8 +2961,19 @@ msgstr "" " -u, --utc, --universal skriv ut eller still klokka etter UTC " "(Coordinated Universal Time)\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2920,7 +2986,7 @@ msgstr "" " %% et rent %-tegn (prosenttegn)\n" " %a forkortet lokalt ukedagsnavn (f.eks. «Søn»)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2933,7 +2999,7 @@ msgstr "" " %c regiontilpasset dato og klokkeslett (f.eks.: \n" " to. 03. mars 2005 kl. 23.05 +0100)\n" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2942,10 +3008,10 @@ msgid "" msgstr "" " %C århundre. Likner %Y, men utelater de to siste tallene (f.eks. 20)\n" " %d månedsdag (f.eks. 01)\n" -" %D dato. Samme som «%m/%d/%y»\n" +" %D dato. tilsvarer «%m/%d/%y»\n" " %e månedsdag, med mellomrom (tilsvarer «%_d»)\n" -#: src/date.c:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2956,7 +3022,7 @@ msgstr "" " %G år etter ISO-ukenummer. Dette er vanligvis bare nyttig sammen med " "«%V»\n" -#: src/date.c:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2968,7 +3034,7 @@ msgstr "" " %l time (01 … 12)\n" " %j dag i året (001 … 366)\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2980,7 +3046,7 @@ msgstr "" " %m måned (01 … 12)\n" " %M minutt (00 … 59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2993,12 +3059,12 @@ msgstr "" " %n et linjeskift\n" " %N nanosekunder (000000000 … 999999999)\n" " %p regiontilpasset variant av AM eller PM; blank hvis ukjent\n" -" %P samme som %p, men med små bokstaver\n" +" %P likner «%p», men bruker små bokstaver\n" " %r regiontilpasset 12-timers klokkeslett (f.eks. 11:11:04)\n" " %R 24-timers timer og minutter (tilsvarer «%H:%M»)\n" " %s sekunder siden 1970-01-01 00:00:00 UTC\n" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3010,7 +3076,7 @@ msgstr "" " %T klokkeslett (tilsvarer «%H:%M:%S»)\n" " %u ukedag (1… 7; «1» betyr mandag)\n" -#: src/date.c:209 +#: src/date.c:215 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" @@ -3022,7 +3088,7 @@ msgstr "" " %w ukedag (0 … 6; «0» betyr søndag)\n" " %W ukenummer i året, med mandag som første ukedag (00 … 53)\n" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3034,7 +3100,7 @@ msgstr "" " %y siste to sifre i årstall (00 … 99)\n" " %Y årstall\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3054,7 +3120,7 @@ msgstr "" "\n" "Date legger til nuller i ensifrede tidsverdier som standard.\n" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3072,7 +3138,7 @@ msgstr "" " ^ bruk store bokstaver, hvis mulig\n" " # bruk omvendt bokstavstørrelse, hvis mulig\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3086,7 +3152,7 @@ msgstr "" "«E» for å bruke evt. regiontilpassede datoformat, eller\n" "«O» for å bruke evt. regiontilpassede tallformat.\n" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3111,62 +3177,62 @@ msgstr "" "Vis lokal tid for kl. 09:00 neste fredag på vestkysten i USA\n" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "standard inndata" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" -msgstr "datoen «%s» er ugyldig" +msgstr "%s er en ugyldig dato" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "du har valgt flere visningsformat" -#: src/date.c:430 +#: src/date.c:436 #, c-format msgid "the options to specify dates for printing are mutually exclusive" -msgstr "du kan bare velge ett dato-utskriftsformat av gangen" +msgstr "du kan ikke velge flere utskriftsformater for dato samtidig" -#: src/date.c:437 +#: src/date.c:443 #, c-format msgid "the options to print and set the time may not be used together" msgstr "du kan ikke både skrive ut og stille dato/klokkeslett samtidig" -#: src/date.c:458 +#: src/date.c:464 #, 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 "" -"argumentet «%s» mangler et ledende «+»-tegn.\n" +"argumentet %s mangler ledende «+»-tegn.\n" "Alle argumentstrenger som ikke er «date»-komnandovalg \n" "må være formatstrenger og begynne med «+»" -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "klarte ikke å stille dato/klokkeslett" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, c-format msgid "time %s is out of range" -msgstr "tid «%s» er utenfor tilatt område" +msgstr "tidspunkt %s er utenfor tilatt område" #. This is a proper name. See the gettext manual, section Names. -#: src/dd.c:44 src/factor.c:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3175,7 +3241,7 @@ msgstr "" "Bruk: %s [OPERAND] …\n" "eller: %s VALG\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3193,7 +3259,8 @@ msgstr "" " count=N bare kopier N antall inndatablokker\n" " ibs=BYTE les opptil et gitt antall BYTE om gangen (standard: 512)\n" -#: src/dd.c:541 +#: src/dd.c:570 +#, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3202,8 +3269,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=FIL les fra FIL i stedet for standard innkanal\n" " iflag=FLAGG les i henhold til den kommaseparerte symbollista\n" @@ -3217,7 +3286,7 @@ msgstr "" " «noxfer» utelater overføringsstatistikk, og «none» " "utelater all info\n" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3235,7 +3304,7 @@ msgstr "" "Hvert CONV-symbol kan være som følgende:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3256,8 +3325,8 @@ msgstr "" "dimensjonert mellomrom\n" " unblock erstatt avsluttende mellomrom i cbs-dimensjonerte oppføringer " "med en ny linje\n" -" lcase erstatt versaler med minuskler\n" -" ucase erstatt minuskler med versaler\n" +" lcase erstatt store bokstaver med små\n" +" ucase erstatt små bokstaver med store\n" " sparse prøv å søke i stedet for å faktisk skrive ut NUL- (tomme) " "blokker\n" " swab bytt om hvert par med inngangsbyte\n" @@ -3265,7 +3334,7 @@ msgstr "" " Når dette brukes med block eller unblock, skyves blokkene med " "mellomrom i stedet for NUL-ler\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3281,7 +3350,7 @@ msgstr "" " fdatasync ikke avslutt før utdata er fysisk ferdigstilt\n" " fsync som ovenfor, men skriv metadata i tillegg\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3295,142 +3364,107 @@ msgstr "" " append tilføyingsmodus (gir kun mening for utdata; conv=notrunc " "foreslått)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio bruk sammenfallende inn- og utkanal for data\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct benytt direkte inn- og utkanal for data\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory avslutt med feil, med mindre det er en mappe\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync bruk synkronisert inn- og utkanal for data\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync som dsync, men også for metadata\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock samle opp fulle inndata-blokker (kun iflag)\n" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock benytt ikke-blokkerende inn- og utkanal\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime ikke oppdater tilgangstidsstempel\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nocache forkast hurtiglagret data\n" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty ikke tildel kontrollerende terminal fra fil\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow ikke følg symbolske lenker\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks avbryt hvis flerkoblet\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary bruk binær inn- og utkanal for data\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text bruk tekstbasert inn- og utkanal for data\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr " count_bytes behandle «count=N» som et antall byte (kun iflag)\n" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr " skip_bytes behandle «skip=N» som et antall byte (kun iflag)\n" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr " seek_bytes behandle «seek=N» som et antall byte (kun oflag)\n" -#: src/dd.c:631 +#: src/dd.c:661 #, 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 "" -"\n" -"En pågående «dd»-prosess skriver ut inn- og utstatistikk til " -"standardfeilkanal\n" -"og fortsetter kopiering når den mottar et %s-signal.\n" -"\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ kill -%s $pid; sleep 1; kill $pid\n" -" 18335302+0 records in\n" -" 18335302+0 records out\n" -" 9387674624 bytes (9.4 GB) copied, 34.6279 seconds, 271 MB/s\n" -"\n" -"Mulige valg:\n" -"\n" -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +#: src/dd.c:699 +#, fuzzy, c-format +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" "minnet er oppbrukt av mellomlager for inndata, med en størrelse på %zu byte " "(%s)" -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +#: src/dd.c:721 +#, fuzzy, c-format +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" "minnet er oppbrukt av mellomlager for utdata, med en størrelse på %zu byte " "(%s)" -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" -"%+% oppføringer inn\n" -"%+% oppføringer ut\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% forkortet oppføring\n" -msgstr[1] "% forkortede oppføringer\n" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "% byte (%s) kopiert" msgstr[1] "% byte (%s) kopiert" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "Uendelig B" @@ -3444,85 +3478,102 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% oppføringer inn\n" +"%+% oppføringer ut\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% forkortet oppføring\n" +msgstr[1] "% forkortede oppføringer\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" -msgstr "lukker inndatafil «%s»" +msgstr "lukker inndatafil %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" -msgstr "lukker utdatafil «%s»" +msgstr "lukker utdatafil %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "klarte ikke å skru av «O_DIRECT». %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" -msgstr "skriver til «%s»" +msgstr "skriver til %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" -msgstr "operand «%s» er ukjent" +msgstr "operand %s er ukjent" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "ugyldig konvertering" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "ugyldig inndataflagg" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "ugyldig utdataflagg" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "ugyldig statusflagg" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "tallet %s er ugyldig" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "du kan ikke kombinere to av disse: {ascii,ebcdic,ibm}" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "du kan ikke kombinere valgene «block» og «unblock»" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "" "du kan ikke velge både «lcase» (konverter til små bokstaver) og " "«ucase» (konverter til store bokstaver)" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "du kan ikke kombinere valgene «excl» og «nocreat»" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "du kan ikke kombinere valgene «direct» og «nocache»" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3531,83 +3582,83 @@ msgstr "" "advarsel: jobber rundt lseek-kjernefeil for fil (%s)\n" " med mt_type=0x%0lx . Se lista over typer dette gjelder" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: klarte ikke å hoppe over" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: klarte ikke å søke" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" -msgstr "for stor forskyvning ved lesing av fila «%s»" +msgstr "for stor forskyvning ved lesing av fila %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "advarsel: ugyldig forskyvning i fil etter mislykket lesing" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "klarte ikke å jobbe rundt kjernefeil likevel" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" -msgstr "velger flagg for «%s»" +msgstr "velger flagg for %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: klarte ikke å hoppe til valgt forskyvning" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" -msgstr "klarte ikke å korte ned til % byte i utdatafil «%s»" +msgstr "klarte ikke å korte ned til % byte i utdatafil %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" -msgstr "fdatasync mislyktes med «%s»" +msgstr "fdatasync mislyktes med %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" -msgstr "fsync mislyktes med «%s»" +msgstr "fsync mislyktes med %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" -msgstr "klarte ikke å åpne «%s»" +msgstr "klarte ikke å åpne %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "" -"forskyvningen er for stor. Du kan ikke forkorte til en lengde av seek=" +"forskyvninga er for stor. Du kan ikke forkorte til en lengde av seek=" "% (%lu-byte) blokker" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" -msgstr "klarte ikke å forkorte til % byte i utdatafil «%s»" +msgstr "klarte ikke å forkorte til % byte i utdatafil %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" -msgstr "klarte ikke å tømme mellomlageret for «%s»" +msgstr "klarte ikke å tømme mellomlager for %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3662,12 +3713,12 @@ msgstr "Fil" #: src/df.c:387 #, c-format msgid "option --output: field %s unknown" -msgstr "«--output»-valg: felt «%s» er ukjent" +msgstr "«--output»: felt %s er ukjent" #: src/df.c:394 #, c-format msgid "option --output: field %s used more than once" -msgstr "«--output»-valg: felt «%s» er brukt flere ganger" +msgstr "«--output»: felt %s er brukt flere ganger" #: src/df.c:415 src/df.c:454 msgid "Size" @@ -3688,12 +3739,12 @@ msgstr "Kapasitet" msgid "%s-%s" msgstr "%s-%s" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "fikk ikke tilgang til %s, som er overmontert av en annen enhet" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3703,13 +3754,14 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 +#, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3725,7 +3777,7 @@ msgstr "" " -H, --si som ovenfor, men regner 1 kilobyte som 1000 byte i " "stedet for 1024 byte\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3739,13 +3791,39 @@ msgstr "" " --no-sync ikke kall sync før bruksinformasjon hentes " "(standard)\n" -#: src/df.c:1409 +#: src/df.c:1429 +#, 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" +msgstr "" +" --output[=FELTLISTE] bruk utskriftsformat slik det er definert i " +"FETLISTE,\n" +" eller skriv ut alle felt hvis FELTLISTE " +"utelates.\n" +" -P, --portability bruk utskriftsformatet POSIX\n" +" --sync start synkronisering før bruksinfo hentes\n" +" -t, --type=TYPE begrens oppføringer til angitt TYPE filsystemer\n" +" -T, --print-type skriv ut filsystemtype\n" +" -x, --exclude-type=TYPE begrens oppføringer til filsystemer som ikke er " +"av angitt TYPE\n" +" -v (ignoreres)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose skriv ut diagnostikk rett før hver\n" +" utdata-fil åpnes\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3763,7 +3841,7 @@ msgstr "" "av angitt TYPE\n" " -v (ignoreres)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3776,25 +3854,25 @@ msgstr "" "«ipcent»,\n" "«size», «used», «avail», «pcent» og «target» (les mer på infosiden).\n" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" -msgstr "du kan ikke velge både «%s» og «%s» samtidig" +msgstr "du kan ikke velge både %s og %s samtidig" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" -msgstr "filsystemtype «%s» er både valgt og utelatt" +msgstr "filsystemtype %s er både valgt og utelatt" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Advarsel: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "klarte ikke å lese tabell over monterte filsystemer" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "ingen filsystemer ble behandlet" @@ -3848,7 +3926,7 @@ msgstr "%s:%lu: ugyldig linje. Mangler parameter nummer to" #: src/dircolors.c:358 #, c-format msgid "%s:%lu: unrecognized keyword %s" -msgstr "%s:%lu: kjenner ikke igjen nøkkelordet «%s»" +msgstr "%s:%lu: %s er et ukjent nøkkelord" #: src/dircolors.c:359 msgid "" @@ -3908,7 +3986,7 @@ msgstr "" " %s dir1/str dir2/str -> «dir1» etterfulgt av «dir2»\n" " %s stdio.h -> «.»\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3918,7 +3996,9 @@ msgstr "" " eller: %s [VALG] … --files0-from=F\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +#, fuzzy +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "Oppsummer diskplassen som hver FIL tar (rekursivt for mapper).\n" #: src/du.c:291 @@ -3937,7 +4017,7 @@ msgstr "" " --apparent-size skriv ut tilsynelatende størrelser\n" " (selv om denne verdien ofte er mindre, kan den\n" " også være større for hullete filer, ved intern\n" -" fragmentering, indirekte blokker, og lignende)\n" +" fragmentering, indirekte blokker, og liknende)\n" #: src/du.c:300 msgid "" @@ -3967,7 +4047,7 @@ msgstr "" "all»)\n" " kun hvis den er N eller færre nivå under " "kommandolinje-argumentet\n" -" («--max-depth=0» tilsvarer --summarize)\n" +" («--max-depth=0» tilsvarer «--summarize»)\n" #: src/du.c:313 msgid "" @@ -3981,7 +4061,8 @@ msgid "" msgstr "" " --files0-from=F summer plassbruk for tomrom-avsluttede filnavn som\n" " er spesifisert i fila F\n" -" (navn leses fra standardinndata hvis F er «-»)\n" +" (hvis F er «-», leser programmet fra standard " +"inndata)\n" " -H tilsvarer «--dereference-args» og «-D»\n" " -h, --human-readable skriv ut størrelser i menneskelig lesbart format (f." "eks. 1K 234M 2G)\n" @@ -4010,7 +4091,7 @@ msgid "" msgstr "" " -P, --no-dereference ikke følg symbolske lenker (dette er standard)\n" " -S, --separate-dirs ikke ta med størrelser på undermapper\n" -" --si ligner «-h», men regner enheter i 1000 i stedet for " +" --si likner «-h», men regner enheter i 1000 i stedet for " "1024\n" " -s, --summarize bare vis en totalsum for hvert argument\n" @@ -4054,64 +4135,58 @@ msgstr "" msgid "Infinity" msgstr "Uendelighet" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "fts_read mislykket. %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" -msgstr "maksimaldybden «%s» er ugyldig" +msgstr "%s er en ugyldig maksimaldybde" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "argumentet «-0» er ugyldig for «--threshold»" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "du kan ikke både summere og vise alle oppføringer" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "advarsel: valget «--max-depth=0» tilsvarer «-s»" -#: src/du.c:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "advarsel: konflikt mellom summering og valget «--max-depth=%lu»" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" "advarsel: valgene «--apparent-size» og «-b» er ugyldige når også «--inodes» " "er valgt" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" -msgstr "Du kan ikke kombinere filparametre med «--files0-from»" - -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: lesefeil" +msgstr "du kan ikke kombinere filparametre med «--files0-from»" -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" "du kan ikke bruke filnavn som %s når filnavn leses fra standard innkanal" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "filnavn med null i lengde er ugyldig" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "totalt" @@ -4140,7 +4215,7 @@ msgid "" "\n" " -n do not output the trailing newline\n" msgstr "" -"Gjenta STRENG(er) til standard utdata.\n" +"Gjenta STRENG(er) til standardutdata.\n" "\n" " -n ikke avslutt siste linje med linjeskift\n" @@ -4239,12 +4314,12 @@ msgstr "" #: src/env.c:124 #, c-format msgid "cannot unset %s" -msgstr "klarte ikke å fjerne «%s»" +msgstr "klarte ikke å velge bort %s" #: src/env.c:135 #, c-format msgid "cannot set %s" -msgstr "klarte ikke å gi «%s» en verdi" +msgstr "klarte ikke å velge %s" #: src/env.c:152 #, c-format @@ -4252,12 +4327,11 @@ msgid "cannot specify --null (-0) with command" msgstr "«--null» (-0) kan ikke velges med kommando" #: 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" +#, fuzzy +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "Konverter tabulatorer til mellomrom i FIL(er), og skriv resultatet til " -"standard utdata.\n" +"standardutdata.\n" "Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet standard " "inndata.\n" @@ -4284,7 +4358,7 @@ msgstr "tabulatorlengden %s er for stor" #: src/expand.c:179 src/unexpand.c:198 #, c-format msgid "tab size contains invalid character(s): %s" -msgstr "tabulatorstørrelsen «%s» inneholder ugyldig(e) tegn" +msgstr "tabulatorstørrelse %s inneholder ugyldig(e) tegn" #: src/expand.c:205 src/unexpand.c:224 #, c-format @@ -4302,7 +4376,7 @@ msgid "input line is too long" msgstr "inndatalinje er for lang" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4331,7 +4405,7 @@ msgid "" " ARG1 & ARG2 ARG1 if neither argument is null or 0, otherwise 0\n" msgstr "" "\n" -"Skriv ut verdien av UTTRYKK til standard utdata. En tom linje under skiller\n" +"Skriv ut verdien av UTTRYKK til standardutdata. En tom linje under skiller\n" "grupper med økende presedens. UTTRYKK kan være:\n" "\n" " ARG1 | ARG2 ARG1 hvis den hverken er null eller 0. Ellers ARG2.\n" @@ -4393,7 +4467,7 @@ msgstr "" "\n" " STRENG : REGEXP forankret mønstersøk med REGEXP i STRENG\n" "\n" -" match STRENG REGEXP samme som STRENG : REGEXP\n" +" match STRENG REGEXP tilsvarer STRENG : REGEXP\n" " substr STRENG POS LENGDE delstreng av STRENG, POS teller fra 1\n" " index STRENG TEGN indeks i STRENG hvor man finner et av tegnene " "i \n" @@ -4425,7 +4499,7 @@ msgid "" msgstr "" "\n" "Vær oppmerksom på at mange operatører må vernes eller siteres for skall.\n" -"Sammenligninger er aritmetiske hvis begge ARG er tall, ellers " +"Sammenlikninger er aritmetiske hvis begge ARG er tall, ellers " "leksikografisk.\n" "Treff på mønster returnerer strengen mellom \\( og \\) eller null. Hvis\n" "\\( og \\) ikke er brukt, returneres antall tegn som passet mønsteret, eller " @@ -4459,12 +4533,12 @@ msgstr "feil i regulæruttrykk-utlikning" msgid "non-integer argument" msgstr "du har brukt et argument som ikke er heltall" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "du har forsøkt å dele på null" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "bruk miljøvariabel «LC_ALL='C'» for å omgå problemet" @@ -4472,34 +4546,34 @@ msgstr "bruk miljøvariabel «LC_ALL='C'» for å omgå problemet" #: src/expr.c:881 #, c-format msgid "the strings compared were %s and %s" -msgstr "tekststrengene som ble sammenlignet var «%s» og «%s»" +msgstr "tekststrengene som ble sammenliknet var %s og %s" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "Niels Moller" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "Feil under Lucas-primærtest. Dette skal ikke skje" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "squfof-køen er full" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s er ikke et gyldig positivt heltall" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s er for stort" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4508,15 +4582,15 @@ msgstr "" "Bruk: %s [TALL] …\n" "eller: %s VALG\n" -#: src/factor.c:2443 +#: src/factor.c:2533 msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" "are specified on the command line, read them from standard input.\n" "\n" msgstr "" "Skriv ut primtallet for hvert spesifiserte helTALL.\n" -"Hvis ingen tall står spesifisert på kommandolinjen, leser programmet fra " -"standard inndata.\n" +"Hvis ingen tall står spesifisert på kommandolinja, leser programmet standard " +"inndata.\n" "\n" #: src/find-mount-point.c:40 @@ -4528,12 +4602,12 @@ msgstr "klarte ikke å hente gjeldende mappe" #: src/find-mount-point.c:92 #, c-format msgid "cannot change to directory %s" -msgstr "klarte ikke å bytte til mappa «%s»" +msgstr "klarte ikke å bytte til mappa %s" #: src/find-mount-point.c:70 #, c-format msgid "cannot stat current directory (now %s)" -msgstr "klarte ikke å hente informasjon om gjeldende mappe («%s»)" +msgstr "klarte ikke å hente informasjon om gjeldende mappe (%s)" #. This is a proper name. See the gettext manual, section Names. #: src/fmt.c:38 @@ -4554,7 +4628,7 @@ msgstr "" "standardutdata.\n" "Valget -BREDDE er en forkortet vairant av «--width=TALL».\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4568,7 +4642,7 @@ msgstr "" " linjene\n" " -s, --split-only del opp lange linjer, men ikke fyll igjen\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4582,7 +4656,7 @@ msgstr "" " -w, --width=BREDDE maks linjebredde (standard er 75 kolonner)\n" " -g, --goal=BREDDE målbredde (standard er 93% av hele bredden)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4591,21 +4665,20 @@ msgstr "" "valget «-- %c» er ugyldig. «-BREDDE» kjennes bare igjen som første\n" "valg i kommandoen. Bruk «-w N» i stedet" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" -msgstr "«%s» er en ugyldig bredde" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" +msgstr "%s er en ugyldig bredde" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +#, fuzzy +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" -"Pakk sammen inndatalinjer i FIL (eller standardinndata hvis FIL ikke er " +"Pakk sammen inndatalinjer i FIL (eller standard inndata hvis FIL ikke er " "valgt),\n" "og skriv ut resultatet til standardutdata.\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4615,10 +4688,10 @@ msgstr "" " -s, --spaces bryt ved mellomrom\n" " -w, --width=BREDDE bruk BREDDE antall kolonner i stedet for 80\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" -msgstr "«%s» er et ugyldig kolonneantall" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" +msgstr "%s er et ugyldig kolonneantall" #. This is a proper name. See the gettext manual, section Names. #: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 @@ -4688,13 +4761,13 @@ msgstr "klarte ikke å hente reell GID" #: src/groups.c:128 src/id.c:246 #, c-format msgid "%s: no such user" -msgstr "brukeren «%s» finnes ikke" +msgstr "brukeren %s finnes ikke" -#: src/head.c:109 +#: src/head.c:110 +#, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Skriv ut de første 10 linjene i hver FIL til standardutdata.\n" "Hvis flere enn én FIL behandles, lages det en overskrift per fil med " @@ -4702,7 +4775,7 @@ msgstr "" "Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet standard " "inndata.\n" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4719,7 +4792,7 @@ msgstr "" " (ved bruk av «-» vises alle linjer unntatt de\n" " siste K antall fra hver fil)\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4727,7 +4800,7 @@ msgstr "" " -q, --quiet, --silent ikke ta med filnavn i toppen\n" " -v, --verbose ta med filnavn i toppen uansett type inndata\n" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4735,52 +4808,40 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" "\n" -"K kan brukes med et multiplikasjonssuffiks, f.eks. slik:\n" +"K kan brukes med multiplikasjonssuffiks, f.eks. slik:\n" "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n" "GB 1000*1000*1000, G 1024*1024*1024, og så videre for T, P, E, Z, Y.\n" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" -msgstr "fila «%s» har krympet for mye" - -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: for mange byte" +msgstr "fila %s har krympet for mye" -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: klarte ikke å søke til posisjon %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: fant ikke frem til relativ posisjon %s" -#: src/head.c:886 +#: src/head.c:267 #, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "%s: «%s» er så stor at den ikke kan vises" - -#: src/head.c:887 -msgid "number of lines" -msgstr "antall linjer" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "antall byte" +msgid "%s: number of bytes is too large" +msgstr "%s: for mange byte" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "ugyldig antall linjer" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "ugyldig antall byte" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "avsluttende valg -- «%c» er ugyldig" @@ -4813,7 +4874,7 @@ msgstr "" #: src/hostname.c:94 #, c-format msgid "cannot set name to %s" -msgstr "klarte ikke å endre navn til «%s»" +msgstr "klarte ikke å endre navn til %s" #: src/hostname.c:97 #, c-format @@ -4894,7 +4955,7 @@ msgstr "" #: src/id.c:198 #, c-format msgid "cannot print \"only\" of more than one choice" -msgstr "du kan ikke bruke flere «bare skriv ut»-valg på én gang" +msgstr "du kan ikke bruke flere «bare skriv ut»-valg samtidig" #: src/id.c:205 #, c-format @@ -4953,24 +5014,24 @@ msgstr " kontekst=%s" #: src/install.c:376 #, c-format msgid "warning: %s: failed to change context to %s" -msgstr "advarsel: %s: klarte ikke å bytte kontekst til «%s»" +msgstr "advarsel: %s: klarte ikke å bytte kontekst til %s" #: src/install.c:417 #, c-format msgid "creating directory %s" -msgstr "oppretter mappa «%s»" +msgstr "oppretter mappe %s" #: src/install.c:485 #, c-format msgid "cannot change ownership of %s" -msgstr "klarte ikke å endre eier av «%s»" +msgstr "klarte ikke å endre eier av %s" #: src/install.c:509 #, c-format msgid "cannot set time stamps for %s" -msgstr "klarte ikke å gi «%s» et tidsstempel" +msgstr "klarte ikke å gi tidsstempel til %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "systemkallet «fork» mislyktes" @@ -4978,7 +5039,7 @@ msgstr "systemkallet «fork» mislyktes" #: src/install.c:535 #, c-format msgid "cannot run %s" -msgstr "klarte ikke å kjøre «%s»" +msgstr "klarte ikke å kjøre %s" #: src/install.c:539 #, c-format @@ -4993,7 +5054,7 @@ msgstr "«strip»-prosessen avsluttet på en unormal måte" #: src/install.c:565 #, c-format msgid "invalid user %s" -msgstr "«%s» er en ugyldig bruker" +msgstr "%s er en ugyldig bruker" #: src/install.c:601 #, c-format @@ -5047,7 +5108,7 @@ msgstr "" " -b fungerer som --backup, men kan ikke brukes med " "argumenter\n" " -c (ignoreres)\n" -" -C, --compare sammenlign kilde- og målfiler, og\n" +" -C, --compare sammenlikn kilde- og målfiler, og\n" " ikke endre målet i det hele tatt i enkelte " "tilfeller\n" " -d, --directory behandle alle argumenter som mappenavn.\n" @@ -5116,7 +5177,7 @@ msgstr "" #: src/install.c:696 src/unlink.c:86 #, c-format msgid "cannot unlink %s" -msgstr "klarte ikke å fjerne lenke til «%s»" +msgstr "klarte ikke å fjerne lenke til %s" #: src/install.c:877 #, c-format @@ -5136,10 +5197,10 @@ msgstr "«strip»-valget kan ikke brukes ved installasjon av mapper" msgid "target directory not allowed when installing a directory" msgstr "du kan ikke velge målmappe når du installerer en mappe" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" -msgstr "«%s» er en ugyldig modus" +msgstr "%s er en ugyldig modus" #: src/install.c:996 #, c-format @@ -5151,13 +5212,12 @@ msgstr "" #, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" msgstr "" -"du kan ikke både velge «--compare» («-C») og «--preserve-timestamps» på én " -"gang" +"du kan ikke både velge «--compare» («-C») og «--preserve-timestamps» samtidig" #: src/install.c:1008 #, c-format msgid "options --compare (-C) and --strip are mutually exclusive" -msgstr "du kan ikke både velge «--compare» («-C») og «--strip» på én gang" +msgstr "du kan ikke velge både «--compare» («-C») og «--strip» samtidig" #: src/install.c:1014 #, c-format @@ -5176,8 +5236,13 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5186,14 +5251,14 @@ msgstr "" "Skriv én linje til standardutdata for hvert inndata-linjepar som inneholder\n" "identiske sammenføyningsfelter. Første sammenføyningsfelt er\n" "standardfelt, og avsluttes med tomrom. Når FIL1 eller FIL2 (ikke begge)\n" -"er «-», leser programmet fra standard inndata.\n" +"er «-», leser programmet standard inndata.\n" "\n" " -a FILNUM skriv også ut ikke-kombinerbare linjer fra fila FILNUM,\n" " der FILNUM er 1 or 2 og korresponderer med FIL1 eller " "FIL2\n" " -e TOM erstatt manglende inndatafelter med TOM\n" -#: src/join.c:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5201,12 +5266,12 @@ msgid "" " -t CHAR use CHAR as input and output field separator\n" msgstr "" " -i, --ignore-case ignorer forskjell på store og små bokstaver når felter " -"sammenlignes\n" +"sammenliknes\n" " -j FELT tilsvarer «-1 FELT -2 FELT»\n" " -o FORMAT bruk FORMAT ved oppbygging av utskriftslinje\n" " -t TEGN bruk TEGN som skilletegn mellom inn- og utskriftsfelt\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5227,13 +5292,13 @@ msgstr "" " --header behandle første linje i hver fil som felthoder,\n" " og ikke forsøk å sammenkoble dem når de skrives ut\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated skill mellom linjer med NUL i stedet for " "linjeskift\n" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5267,51 +5332,51 @@ msgstr "" "Merk: FIL1 og FIL2 må sorteres i sammenføyningsfeltene.\n" "Bruk f.eks. «sort -k 1b,1» hvis «join» ikke har noen valg,\n" "eller «join -t » hvis «sort» ikke har noen valg.\n" -"Sammenligninger gjøres i henhold til regler som angis av «LC_COLLATE».\n" +"Sammenlikninger gjøres i henhold til regler som angis av «LC_COLLATE».\n" "Hvis datakilden is er sortert, og enkelte linjer ikke kan sammenføyes,\n" "gir programmet en advarsel.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:%: er ikke sortert: %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" -msgstr "«%s» er et ugyldig feltnummer" +msgstr "%s er et ugyldig feltnummer" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" -msgstr "«%s» er en ugyldig feltspesifikasjon" +msgstr "%s er en ugyldig feltspesifikasjon" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" -msgstr "«%s» er et ugyldig filnummer feltspesifikasjon" +msgstr "%s er et ugyldig filnummer i feltspesifikasjon" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "sammenføyningsfelt «%lu» og «%lu» er uforenlige" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "strenger for tomme felt er i konflikt med hverandre" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" -msgstr "tabulator «%s» består av flere tegn" +msgstr "tabulator %s består av flere tegn" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "uforenlige tabulatorer" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "du kan ikke velge begge filene som standard inndata" @@ -5376,7 +5441,7 @@ msgstr "%s: flere signal er valgt" #: src/kill.c:282 #, c-format msgid "multiple -l or -t options specified" -msgstr "du har brukt flere «-l»- og/eller «-t»-valg på én gang" +msgstr "du har brukt flere «-l»- og/eller «-t»-valg samtidig" #: src/kill.c:299 #, c-format @@ -5388,20 +5453,20 @@ msgstr "du kan ikke kombinere signaler med «-l» eller «-t»" msgid "no process ID specified" msgstr "ingen prosess-ID valgt" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "klarte ikke å tildele et stdio-mellomlager på %\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" -msgstr "mellomlagermodus «%s» er ugyldig for «%s»\n" +msgstr "mellomlagermodus %s er ugyldig for %s\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" -msgstr "klarte ikke å endre mellomlagermodus for «%s» til «%s»\n" +msgstr "klarte ikke å endre mellomlagermodus for %s til %s\n" #. This is a proper name. See the gettext manual, section Names. #: src/link.c:36 src/unlink.c:36 src/who.c:50 @@ -5429,7 +5494,7 @@ msgstr "" #: src/link.c:90 #, c-format msgid "cannot create link %s to %s" -msgstr "klarte ikke å opprette en lenke fra «%s» til «%s»" +msgstr "klarte ikke å opprette lenke %s til %s" #: src/ln.c:206 #, c-format @@ -5449,12 +5514,12 @@ msgstr "%s: vil du erstatte %s? " #: src/ln.c:362 #, c-format msgid "failed to create symbolic link %s" -msgstr "klarte ikke å lage den symbolske lenka «%s»" +msgstr "klarte ikke å lage symbolsk lenke %s" #: src/ln.c:363 #, c-format msgid "failed to create symbolic link %s -> %s" -msgstr "klarte ikke å lage den symbolske lenka «%s» -> «%s»" +msgstr "klarte ikke å lage symbolsk lenke %s -> %s" #: src/ln.c:365 #, c-format @@ -5464,12 +5529,12 @@ msgstr "klarte ikke å lage hard lenke til %.0s%s" #: src/ln.c:368 #, c-format msgid "failed to create hard link %s" -msgstr "klarte ikke å lage hard lenke «%s»" +msgstr "klarte ikke å lage hard lenke %s" #: src/ln.c:369 #, c-format msgid "failed to create hard link %s => %s" -msgstr "klarte ikke å lage hard lenke «%s» => «%s»" +msgstr "klarte ikke å lage hard lenke %s => %s" #: src/ln.c:391 #, c-format @@ -5540,7 +5605,7 @@ msgstr "" " -i, --interactive spør brukeren om målfiler skal fjernes\n" " -L, --logical følg symbolske lenker i MÅLfiler\n" " -n, --no-dereference behandle LENKENAVN som en normal fil\n" -" hvis den er symbolsk og peker til en mappe\n" +" hvis den er symbolsk og peker på en mappe\n" " -P, --physical lag harde lenker som peker direkte til " "symbolske lenker\n" " -r, --relative lag symbolske lenker ut i fra lenkeplassering\n" @@ -5571,8 +5636,7 @@ msgstr "" "\n" "Ved bruk av «-s», ignoreres evt. valgene «-L» og «-P». Ellers, når MÅL er en " "symbolsk lenke, \n" -"kjører programmet i henhold til det sist brukte valget med «%s» som " -"standard.\n" +"kjører programmet i henhold til sist brukte valg med %s som standard.\n" #: src/ln.c:571 #, c-format @@ -5589,7 +5653,7 @@ msgstr "du kan ikke velge «--relative» uten å bruke «--symbolic»" msgid "FIXME: unknown" msgstr "FIXME: ukjent" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Bruk: %s [VALG]\n" @@ -5602,7 +5666,7 @@ msgstr "" "Skriv ut navnet på gjeldende bruker.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "intet brukernavn" @@ -5612,7 +5676,7 @@ msgstr "intet brukernavn" #. 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:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -5621,96 +5685,96 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" -"verdien «%s» er ugyldig for miljøvariabelen «QUOTING_STYLE», og ignoreres" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" -msgstr "bredden «%s» er ugyldig for miljøvariabelen «COLUMNS», og ignoreres" +msgstr "%s er ugyldig bredde for miljøvariabelen «COLUMNS», og blir ignorert" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" -"tabulatorlengden «%s» er ugyldig for miljøvariabelen «TABSIZE», og ignoreres" +"%s er ugyldig tabulatorlengde for miljøvariabelen «TABSIZE», og blir ignorert" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" -msgstr "«%s» er en ugyldig linjebredde" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" +msgstr "%s er en ugyldig linjebredde" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" -msgstr "«%s» er en ugyldig tabulatorlengde" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" +msgstr "%s er en ugyldig tabulatorlengde" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" -msgstr "«%s» er et ugyldig tidsformat" +msgstr "%s er et ugyldig tidsformat" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "Følgende argumenter er gyldige:\n" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr " - +FORMAT (f.eks. «+%H:%M») for å få et format à la «date»\n" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "feil ved klargjøring av månedsstrenger" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" -msgstr "prefikset «%s» er ukjent" +msgstr "prefiks %s er ukjent" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "verdien av miljøvariablen «LS_COLORS» kan ikke tolkes" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" +"%s er ugyldig verdi for miljøvariabelen «QUOTING_STYLE», og blir ignorert" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" -msgstr "klarte ikke å åpne mappa «%s»" +msgstr "klarte ikke å åpne mappa %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" -msgstr "fant ikke enhet og inode for «%s»" +msgstr "fant ikke enhet og inode for %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: lar være å vise en mappe som allerede ligger i lista" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" -msgstr "leser mappa «%s»" +msgstr "leser mappa %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" -msgstr "lukker mappa «%s»" +msgstr "lukker mappa %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" -msgstr "klarte ikke å sammenlikne filnavnene «%s» og «%s»" +msgstr "klarte ikke å sammenlikne filnavn %s med %s" -#: src/ls.c:4781 +#: src/ls.c:4775 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" @@ -5719,7 +5783,7 @@ msgstr "" "Oppføringene sorteres alfabetisk hvis ingen av valgene -cftuvSUX eller --" "sort brukes.\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5734,7 +5798,7 @@ msgstr "" " -b, --escape skriv ut skiftetegn («escapes») i C-stil for " "ikke-grafiske tegn\n" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5760,12 +5824,14 @@ msgstr "" " ellers: sorter etter «ctime», i aldrende " "rekkefølge.\n" -#: src/ls.c:4804 +#: src/ls.c:4798 +#, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5780,7 +5846,7 @@ msgstr "" " -D, --dired lag utskrift for Emacs-programmets «dired»-" "modus\n" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5799,11 +5865,11 @@ msgstr "" " enkeltkolonne -1, deltaljert -l, vertikal -C\n" " --full-time tilsvarer «-l --time-style=full-iso»\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr " -g likner «-l», men ikke vis eier\n" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5817,7 +5883,7 @@ msgstr "" " all bruk av «--sort=none (-U)» deaktiverer " "gruppering.\n" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5832,7 +5898,7 @@ msgstr "" " --si som over, men bruker 1000 som faktor i stedet " "for 1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5848,12 +5914,12 @@ msgstr "" " følg symbolske lenker som inngår på " "kommandolinja\n" " --dereference-command-line-symlink-to-dir\n" -" følg hver symbolsk lenke som inngår på\n" -" kommandolinja og peker til en mappe \n" +" følg hver symbolske lenke på\n" +" kommandolinja som peker på en mappe \n" " --hide=MØNSTER ikke vis oppføringer som passer skall-MØNSTER\n" " (overstyres av -a eller -A)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5872,7 +5938,7 @@ msgstr "" "MØNSTER\n" " -k, --kibibytes bruk 1024 byte-blokkformat som standard\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5886,7 +5952,7 @@ msgstr "" " i stedet for lenkene i seg selv\n" " -m fyll bredde med en kommaseparert liste\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5904,7 +5970,7 @@ msgstr "" " -p, --indicator-style=slash\n" " legg til «/»-indikator i mappenavn\n" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -5924,7 +5990,7 @@ msgstr "" " «literal», «locale», «shell», «shell-always», " "«c», eller «escape»\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5936,18 +6002,19 @@ msgstr "" " -s, --size skriv ut tidelt størrelse for hver fil, i " "blokker\n" -#: src/ls.c:4886 +#: src/ls.c:4881 +#, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S sorter etter filstørrelse\n" " --sort=ORD sorter etter ORD i stedet for navn: none -U,\n" @@ -5958,7 +6025,7 @@ msgstr "" " bruk -u, ctid -c, eller status -c. Valgt tid\n" " brukes som sorteringsnøkkel hvis «--sort=time»\n" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -5984,7 +6051,7 @@ msgstr "" " Hvis STIL starter med «posix-», gjelder STIL\n" " kun utenfor POSIX-lokaliteten.\n" -#: src/ls.c:4908 +#: src/ls.c:4904 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -5994,11 +6061,12 @@ msgstr "" " -T, --tabsize=KOL legg til grunn at fanen stopper ved oppgitt " "antall KOLonner i stedet for 8\n" -#: src/ls.c:4912 +#: src/ls.c:4908 +#, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -6011,13 +6079,15 @@ msgstr "" "og ikke sorter for øvrig\n" " -v sorter etter evt. versionsnummer i tekst\n" -#: src/ls.c:4919 +#: src/ls.c:4915 +#, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=KOL bruk valgt skjermbredde i stedet for gjeldende " "verdi\n" @@ -6028,7 +6098,7 @@ msgstr "" "hver fil\n" " -1 vis én fil per linje\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6043,7 +6113,7 @@ msgstr "" "Miljøvariabelen\n" "LS_COLORS kan endre fargene. Bruk kommandoen «dircolors» for å endre den.\n" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6074,12 +6144,10 @@ msgid "David Madore" msgstr "David Madore" #: src/md5sum.c:164 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" "Print or check %s (%d-bit) checksums.\n" -"With no FILE, or when FILE is -, read standard input.\n" -"\n" msgstr "" "Bruk: %s [VALG] … [FIL] …\n" "Skriv ut eller kontroller %s- (%d-bit-) -kontrollsummer.\n" @@ -6087,39 +6155,44 @@ msgstr "" "inndata.\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" " -b, --binary les i binærmodus (standard, med mindre standard " "inndata leses fra tty)\n" -#: src/md5sum.c:178 -msgid " -b, --binary read in binary mode\n" +#: src/md5sum.c:180 +#, fuzzy +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary les i binærmodus\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check les %s-summer fra FILEne, og kontroller dem\n" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr " --tag lag en kontrollsum i BSD-stil\n" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" " -t, --text les i tekstmodus (standard hvis inndata leses fra " "tty)\n" -#: src/md5sum.c:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text les i tekstmodus (standard)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -6140,14 +6213,15 @@ msgstr "" " -w, --warn advar mot feilformaterte kontrollsumlinjer\n" "\n" -#: src/md5sum.c:206 -#, c-format +#: src/md5sum.c:209 +#, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "Summene beregnes som beskrevet i %s. Ved kontroll bør inndata\n" @@ -6155,88 +6229,88 @@ msgstr "" "med kontrollsum, et tegn som indikerer lesemodus («*» betyr binær,\n" "mellomrom betyr tekst) samt et filnavn per FIL.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: for mange kontrollsumlinjer" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: en %s-kontrollsumlinje er feilformatert" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: FEIL ved åpning eller lesing\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "MISLYKTES" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "OK" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: fant ingen korrekt formaterte %s-kontrollsumlinjer" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "ADVARSEL: % linje er feilformatert" msgstr[1] "ADVARSEL: % linjer er feilformatert" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "ADVARSEL: klarte ikke å lese % oppført fil" msgstr[1] "ADVARSEL: klarte ikke å lese % oppførte filer" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "ADVARSEL: % kontrollsum stemmer ikke" msgstr[1] "ADVARSEL: % kontrollsummer stemmer ikke" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "«--tag» støtter ikke «--text»-modus" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "valget «--tag» er ubrukelig til å bekrefte kontrollsummer" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" "valgene «--binary» og «--text» er ubrukelige til sjekk av kontrollsummer" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "valget «--status» er bare nyttig ved sjekk av kontrollsummer" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "valget «--warn» er bare nyttig ved sjekk av kontrollsummer" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "valget «--quiet» er bare nyttig ved sjekk av kontrollsummer" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "valget «--strict» er bare nyttig ved sjekk av kontrollsummer" @@ -6274,22 +6348,22 @@ msgstr "" " --context[=CTX] likner «-Z», men hvis CTX er valgt,\n" " gjelder konteksten også for SMACK\n" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" -msgstr "klarte ikke å velge standard opprettelseskontekst for «%s»" +msgstr "klarte ikke å velge standard opprettelseskontekst for %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" -msgstr "klarte ikke å gjenopprette kontekst for «%s»" +msgstr "klarte ikke å gjenopprette kontekst for %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" -msgstr "mappa «%s» er opprettet" +msgstr "mappa %s er opprettet" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6336,7 +6410,7 @@ msgstr "modus kan bare velge filrettighetsbiter" #: src/mkfifo.c:174 src/mknod.c:269 #, c-format msgid "cannot set permissions of %s" -msgstr "klarte ikke å velge tilgangsrettigheter til «%s»" +msgstr "klarte ikke å endre tilgangsrettigheter til %s" #: src/mknod.c:54 #, c-format @@ -6396,12 +6470,12 @@ msgstr "tegn-spesialfiler støttes ikke" #: src/mknod.c:235 #, c-format msgid "invalid major device number %s" -msgstr "«%s» er et ugyldig øvre enhetsnummer" +msgstr "%s er et ugyldig øvre enhetsnummer" #: src/mknod.c:240 #, c-format msgid "invalid minor device number %s" -msgstr "«%s» er et ugyldig nedre enhetsnummer" +msgstr "%s er et ugyldig nedre enhetsnummer" #: src/mknod.c:245 #, c-format @@ -6411,7 +6485,7 @@ msgstr "«%s %s» er en ugyldig enhet" #: src/mknod.c:264 #, c-format msgid "invalid device type %s" -msgstr "«%s» er en ugyldig enhetstype" +msgstr "%s er en ugyldig enhetstype" #. This is a proper name. See the gettext manual, section Names. #: src/mktemp.c:36 @@ -6500,38 +6574,37 @@ msgstr "for mange maler" #: src/mktemp.c:230 #, c-format msgid "with --suffix, template %s must end in X" -msgstr "malen «%s» må slutte på X ved bruk av «--suffix»" +msgstr "malen %s må slutte på X ved bruk av «--suffix»" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" -msgstr "suffikset «%s» er ugyldig, fordi det inneholder mappeskilletegn" +msgstr "suffiks %s er ugyldig, fordi det inneholder mappeskilletegn" #: src/mktemp.c:260 #, c-format msgid "too few X's in template %s" -msgstr "malen «%s» har for få X-er" +msgstr "mal %s har for få X-er" #: src/mktemp.c:276 #, c-format msgid "invalid template, %s, contains directory separator" -msgstr "malen «%s» er ugyldig, fordi den inneholder mappeskilletegn" +msgstr "mal %s er ugyldig, fordi den inneholder mappeskilletegn" #: src/mktemp.c:290 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" -msgstr "" -"malen «%s» er ugyldig. Den kan ikke være absolutt når «--tmpdir» brukes" +msgstr "mal %s er ugyldig. Den kan ikke være absolutt når «--tmpdir» brukes" #: src/mktemp.c:311 #, c-format msgid "failed to create directory via template %s" -msgstr "klarte ikke å lage mappe via malen «%s»" +msgstr "klarte ikke å lage mappe via mal %s" #: src/mktemp.c:322 #, c-format msgid "failed to create file via template %s" -msgstr "klarte ikke å lage fil via malen «%s»" +msgstr "klarte ikke å opprette fil via mal %s" #: src/mv.c:294 msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" @@ -6595,7 +6668,7 @@ msgstr "" #: src/nice.c:72 #, c-format msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" -msgstr "" +msgstr "Bruk: %s [VALG [KOMMANDO [ARG] …]\n" #: src/nice.c:73 #, c-format @@ -6604,41 +6677,48 @@ msgid "" "With no COMMAND, print the current niceness. Niceness values range from\n" "%d (most favorable to the process) to %d (least favorable to the process).\n" msgstr "" +"Kjør en KOMMANDO med en bestemt prioritet («niceness»).\n" +"Hvis ingen KOMMANDO er valgt, skrives gjeldende prioritetsfaktor ut. Laveste " +"faktor er %d, og høyeste er %d.\n" #: src/nice.c:82 msgid " -n, --adjustment=N add integer N to the niceness (default 10)\n" msgstr "" +" -n, --adjustment=N juster prioriteten opp N antall enheter (standard: " +"10)\n" #: src/nice.c:172 #, c-format msgid "invalid adjustment %s" -msgstr "" +msgstr "%s er en ugyldig justering" #: src/nice.c:181 #, c-format msgid "a command must be given with an adjustment" -msgstr "" +msgstr "du må velge justering av prioritet for kommandoen" #: src/nice.c:188 src/nice.c:199 #, c-format msgid "cannot get niceness" -msgstr "" +msgstr "klarte ikke å hente prioritet" #: src/nice.c:205 #, c-format msgid "cannot set niceness" -msgstr "" +msgstr "klarte ikke å velge prioritet" #. This is a proper name. See the gettext manual, section Names. #: src/nl.c:40 msgid "Scott Bartram" -msgstr "" +msgstr "Scott Bartram" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" +"Skriv ut hver FIL til standardutdata, og marker linjenumre.\n" +"Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet standard " +"inndata.\n" #: src/nl.c:186 msgid "" @@ -6646,6 +6726,9 @@ msgid "" " -d, --section-delimiter=CC use CC for separating logical pages\n" " -f, --footer-numbering=STYLE use STYLE for numbering footer lines\n" msgstr "" +" -b, --body-numbering=STIL bruk STIL for nummerering\n" +" -d, --section-delimiter=CC bruk CC for å skille logiske sider\n" +" -f, --footer-numbering=STIL bruk STIL for å nummerere bunntekst\n" #: src/nl.c:191 msgid "" @@ -6658,12 +6741,22 @@ msgid "" "pages\n" " -s, --number-separator=STRING add STRING after (possible) line number\n" msgstr "" +" -h, --header-numbering=STIL bruk STIL ved nummerering av overskrifter\n" +" -i, --line-increment=NUMMER hvor mye linjenummeret skal økes per " +"linje\n" +" -l, --join-blank-lines=NUMMER hvor mange tomme linjer som regnes som én\n" +" -n, --number-format=FORMAT sett inn linjenumre i angitt FORMAT\n" +" -p, --no-renumber ikke tilbakestill linjenumre på logiske " +"sider\n" +" -s, --number-separator=STRENG legg til STRENG etter (mulig) linjenummer\n" #: 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=NUMMER første linjenummer på en logisk side\n" +" -w, --number-width=NUMMER plasser linjenumre i NUMMERkolonner\n" #: src/nl.c:205 msgid "" @@ -6672,6 +6765,10 @@ msgid "" "two delimiter characters for separating logical pages, a missing\n" "second character implies :. Type \\\\ for \\. STYLE is one of:\n" msgstr "" +"\n" +"Standard er -v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn. CC er\n" +"to skilletegn for å skille logiske sider, et manglende andretegn\n" +"impliserer «:». Bruk «\\\\» for «\\». STIL er en av følgende:\n" #: src/nl.c:211 msgid "" @@ -6689,51 +6786,65 @@ msgid "" " rz right justified, leading zeros\n" "\n" msgstr "" +"\n" +" a gi alle linjer et nummer\n" +" t gi kun linjenummer til linjer som ikke er tomme\n" +" n ikke gi linjer et nummer\n" +" pBRE gi kun linjenummer til linjer hvis innhold samsvarer med et " +"regulært\n" +" uttrykk (BRE)\n" +"\n" +"FORMAT er enten\n" +"\n" +" ln venstrejustert uten ledende nuller,\n" +" rn høyrejustert uten ledende nuller, eller\n" +" rz høyrejustert med ledende nuller\n" +"\n" #: src/nl.c:278 #, c-format msgid "line number overflow" -msgstr "" +msgstr "for mange linjer" #: src/nl.c:478 #, c-format msgid "invalid header numbering style: %s" -msgstr "" +msgstr "%s er en ugyldig nummereringsstil for overskrifter." #: src/nl.c:486 #, c-format msgid "invalid body numbering style: %s" -msgstr "" +msgstr "%s er en ugyldig nummereringsstil for brødtekst." #: src/nl.c:494 #, c-format msgid "invalid footer numbering style: %s" -msgstr "" +msgstr "%s er en ugyldig nummereringsstil for bunntekst." -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" -msgstr "" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" +msgstr "%s er ugyldig som første linjenummer." -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" -msgstr "" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" +msgstr "%s er en ugyldig økning av linjenummer." -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" -msgstr "" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" +msgstr "%s er et ugyldig antall tommer linjer." -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" -msgstr "" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" +msgstr "%s er en ugyldig bredde på felt for linjenummer." -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" -msgstr "" +msgstr "%s er et ugyldig format på linjenummer." #: src/nohup.c:53 #, c-format @@ -6741,73 +6852,87 @@ msgid "" "Usage: %s COMMAND [ARG]...\n" " or: %s OPTION\n" msgstr "" +"Bruk: %s KOMANDO [ARG] …\n" +" eller: %s VALG\n" #: src/nohup.c:59 msgid "" "Run COMMAND, ignoring hangup signals.\n" "\n" msgstr "" +"Kjør KOMMANDO, og ignorer legg på-signal.\n" +"\n" #: src/nohup.c:65 -#, c-format +#, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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 "" +"\n" +"Videresend fra /dev/null hvis standard inndata er en terminal.\n" +"Kopier utskrift til «nohup.out» hvis mulig, eller eventuelt «$HOME/nohup." +"out»,\n" +"gitt at standardutdata er en terminal.\n" +"Hvis standardfeilkanal er en terminal, videresendes feil til " +"standardutdata.\n" +"Bruk «%s KOMMANDO > FIL» for å lagre utskrift til en FIL.\n" #: src/nohup.c:127 #, c-format msgid "failed to render standard input unusable" -msgstr "" +msgstr "klarte ikke å merke standard inndata som ubrukelig" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" -msgstr "" +msgstr "inndata ignoreres" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" -msgstr "" +msgstr "inndata ignoreres, og utskrift kopieres til %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" -msgstr "" +msgstr "utskrift kopieres til %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" +"klarte ikke å velge at kopering av standardfeilkanal skal slutte når " +"kommandoen begynner å kjøre" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" -msgstr "" +msgstr "inndata ignoreres, og standardfeil videresendes til standard utkanal" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" -msgstr "" +msgstr "standardfeil videresendes til standard utkanal" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" -msgstr "" +msgstr "klarte ikke å videresende standardfeilkanal" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" -msgstr "" +msgstr "Giuseppe Scrivano" #: 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 "" +msgstr "Bruk: %s [VALG] …\n" #: src/nproc.c:58 msgid "" @@ -6815,123 +6940,146 @@ msgid "" "which may be less than the number of online processors\n" "\n" msgstr "" +"Skriv ut antall prosessorenheter som er tilgjengelig for gjeldende prosess.\n" +"Dette tallet kan være lavere enn antall prosessorenheter som systemet kjører " +"på totalt.\n" +"\n" #: 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 "" +" --all skriv ut antall installerte prosessorer\n" +" --ignore=N utelat N antall prosessorenheter, hvis mulig\n" #. This is a proper name. See the gettext manual, section Names. -#: src/numfmt.c:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" -msgstr "" +msgstr "Assaf Gordon" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" -msgstr "" +msgstr "verdien %s er for stor til å konverteres" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, c-format msgid "invalid number: %s" -msgstr "" +msgstr "%s er et ugyldig tall" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" -msgstr "" +msgstr "suffiks %s i inndata er avvist (vurder å bruke «--from»)" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" -msgstr "" +msgstr "suffiks %s i inndata er ugyldig" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" -msgstr "" +msgstr "inndata %s mangler et «i»-suffiks (f.eks. «Ki», «Mi» eller «Gi»)" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" -msgstr "" +msgstr "klarte ikke å forberede utskrift av «%Lf»" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, c-format msgid "invalid unit size: %s" -msgstr "" +msgstr "%s er en ugyldig enhetsstørrelse" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" -msgstr "" +msgstr "Bruk: %s [VALG] … [TALL] …\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" +"Omformater TALL, eller tall fra standard inndata hvis ingen TALL er valgt.\n" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" -msgstr "" +msgstr " --debug vis advarsler om ugyldig inndata\n" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" +" -d, --delimiter=X bruk X som felt-skilletegn, i stedet for tomrom\n" -#: src/numfmt.c:827 +#: src/numfmt.c:893 +#, fuzzy msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" +" --field=N erstatt tallet i inndatafelt N (standard er 1)\n" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" +" --format=FORMAT bruk flyttallsFORMAT i printf-stil\n" +" (les mer om FORMAT nedenfor)\n" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" +" --from=ENHET skaler inndatatall til ønsket ENHET (standard er " +"«none» - ingen)\n" +" (les mer om ENHETer nedenfor)\n" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" +" --from-unit=N velg enhetsstørrelsen på inndata (i stedet for 1, som " +"er standard)\n" -#: src/numfmt.c:841 +#: src/numfmt.c:908 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 bruk regiontilpasset gruppering av tall (f.eks. " +"«1,000,000»)\n" +" (dette påvirker ikke C/POSIX-regioninnstillinger)\n" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" +" --header[=N] skriv ut de N antall første overskriftslinjene uten å " +"konvertere dem\n" +" (N er 1, med mindre noe annet velges)\n" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" +" --invalid=MODUS feilmodus for ugyldige tall. MODUS kan være én av " +"følgende:\n" +" «abort» (standard), «fail», «warn» eller «ignore»\n" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -6940,41 +7088,63 @@ msgid "" "whitespace\n" " is found\n" msgstr "" +" --padding=N utfyll utskriften til N antall tegn\n" +" Positiv N gir høyrejustering, og negativ N " +"venstrejustering.\n" +" Teksten utfylles ikke hvis den allerede er bredere " +"enn N.\n" +" Standard metode er å ufylle automatisk hvis det " +"finnes\n" +" tomrom.\n" -#: src/numfmt.c:860 +#: src/numfmt.c:927 msgid "" " --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" " up, down, from-zero (default), towards-zero, " "nearest\n" msgstr "" +" --round=METODE bruk METODE for å runde av skalering. METODE kan være " +"én av følgende:\n" +" «up» (opp), «down» (ned), «from-zero» (fra null, " +"standard), \n" +" «towards-zero» (mot null) eller «nearest» (nærmeste " +"heltall)\n" -#: src/numfmt.c:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" +" --suffix=SUFFIKS legg til SUFFIKS i tall, og aksepter valgfrie\n" +" SUFFIKSer i inndatatall\n" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" +" --to=ENHET auto-skaler utdatatall til ønskede ENHET(er) (les " +"mer om ENHETer nedenfor)\n" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" +" --to-unit=N enhetsstørrelse på utdata (i stedet for 1, som er " +"standard)\n" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" msgstr "" +"\n" +"Valg av ENHET:\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" -msgstr "" +msgstr " none ikke autoskaler (bruk av suffiks utløser feilsignal)\n" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6982,33 +7152,71 @@ msgid "" " 1M = 1000000,\n" " 1Mi = 1048576,\n" msgstr "" +" auto godta valgfritt ett- eller totegnsuffiks:\n" +" 1K = 1000,\n" +" 1Ki = 1024,\n" +" 1M = 1000000,\n" +" 1Mi = 1048576,\n" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" " 1M = 1000000,\n" " ...\n" msgstr "" +" si godta ettegn-suffiks:\n" +" 1K = 1000,\n" +" 1M = 1000000,\n" +" …\n" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" " 1M = 1048576,\n" " ...\n" msgstr "" +" iec godta valgfritt ettegn-suffiks:\n" +" 1K = 1024,\n" +" 1M = 1048576,\n" +" …\n" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" " 1Mi = 1048576,\n" " ...\n" msgstr "" +" iec-i godta valfritt totegn-suffiks:\n" +" 1Ki = 1024,\n" +" 1Mi = 1048576,\n" +" …\n" -#: src/numfmt.c:906 -#, c-format +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Hvert område er en av følgende:\n" +" N N'te byte, tegn eller felt, talt fra 1\n" +" N- fra N'te byte, tegn eller felt, til slutten av linja\n" +" N-M fra N'te til M'te (inklusive) byte, tegn eller felt\n" +" -M fra første til M'te (inklusive) byte, tegn eller felt\n" +"\n" +"Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet standard " +"inndata.\n" + +#: src/numfmt.c:983 +#, fuzzy, c-format msgid "" "\n" "FORMAT must be suitable for printing one floating-point argument '%f'.\n" @@ -7016,9 +7224,17 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" +"\n" +"FORMAT må kunne brukes til å skrive ut ett flyttallsargument «%f».\n" +"Valgfritt anførselstegn (%'f) slår på «--grouping» (hvis mulig i gjeldende " +"region).\n" +"Valgfri breddeverdi (%10f) utfyller utskriften. Valgfri nullbredde (%010f)\n" +"utfyller tallet mot null. Valgfrie negative verdier (%-10f) gir " +"venstrejustering.\n" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7029,9 +7245,17 @@ msgid "" "diagnosed, but the exit status is 0. With --invalid='ignore' conversion\n" "errors are not diagnosed and the exit status is 0.\n" msgstr "" +"\n" +"Avslutningsstatus er 0 hvis alle inndatatall er konvertert uten feil.\n" +"%s stanser ved første konverteringsfeil med status 2 som standard.\n" +"Ved valg av «--invalid='fail'» skrives det ut et advarsel for hver feil,\n" +"og avslutningsstatus blir 2. Ved valg av «--invalid='warn'» blir alle\n" +"feil undersøkt, men statusen forblir 0. Ved «--invalid='ignore'» ignoreres " +"feil,\n" +"og avslutningsstatusen forblir 0.\n" -#: src/numfmt.c:922 -#, c-format +#: src/numfmt.c:1000 +#, fuzzy, c-format msgid "" "\n" "Examples:\n" @@ -7045,118 +7269,148 @@ msgid "" " -> \"1000\"\n" " $ echo 1K | %s --from=iec\n" " -> \"1024\"\n" +" $ df -B1 | %s --header --field 2-4 --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" +"Eksempler:\n" +" $ %s --to=si 1000\n" +" -> «1.0K»\n" +" $ %s --to=iec 2048\n" +" -> «2.0K»\n" +" $ %s --to=iec-i 4096\n" +" -> «4.0Ki»\n" +" $ echo 1K | %s --from=si\n" +" -> «1000»\n" +" $ echo 1K | %s --from=iec\n" +" -> «1024»\n" " $ df | %s --header --field 2 --to=si\n" " $ ls -l | %s --header --field 5 --to=iec\n" " $ ls -lh | %s --header --field 5 --from=iec --padding=10\n" " $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n" -msgstr "" -#: src/numfmt.c:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" -msgstr "" +msgstr "format %s har intet %%-direktiv" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" -msgstr "" +msgstr "%s er et ugyldig format (bredden er for stor)" -#: src/numfmt.c:1008 -#, c-format -msgid "--format padding overridding --padding" -msgstr "" +#: src/numfmt.c:1085 +#, fuzzy, c-format +msgid "--format padding overriding --padding" +msgstr "«--format»-justering overstyrer «--padding»" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" -msgstr "" +msgstr "format %s slutter med %%" -#: src/numfmt.c:1030 -#, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" -msgstr "" +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "%s er en ugyldig presisjonsgrad" + +#: src/numfmt.c:1126 +#, fuzzy, c-format +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" +msgstr "%s er et ugyldig format. Direktivet må være %%['][-][N]f" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" -msgstr "" +msgstr "format %s har for mange %%-direktiver" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, c-format msgid "invalid suffix in input %s: %s" -msgstr "" +msgstr "inndata %s inneholder ugyldig suffiks %s" + +#: src/numfmt.c:1206 +#, fuzzy, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "verdien «%Lg» er for stor til å skrives ut (vurder å bruke «--to»)" -#: src/numfmt.c:1103 +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" -msgstr "" +msgstr "verdien «%Lg» er for stor til å skrives ut (vurder å bruke «--to»)" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" +"verdien «%Lg» er for stor til å skrives ut (verdier over 999Y kan ikke " +"håndteres)" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" -msgstr "" +msgstr "inndata-verdi %s er stor, og kan forårsake unøyaktighet" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +msgid "invalid field value %s" +msgstr "%s er en ugyldig feltverdi" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, c-format msgid "invalid padding value %s" -msgstr "" +msgstr "%s er en ugyldig utfyllingsverdi" -#: src/numfmt.c:1417 -#, c-format -msgid "invalid field value %s" -msgstr "" +#: src/numfmt.c:1646 +#, fuzzy, c-format +msgid "multiple field specifications" +msgstr "%s: %s er en ugyldig feltspesifikasjon" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, c-format msgid "invalid header value %s" -msgstr "" +msgstr "%s er en ugyldig overskriftsverdi" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" -msgstr "" +msgstr "du kan ikke velge både «--grouping» og «--format»" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" -msgstr "" +msgstr "du har ikke gjort noen konverteringsvalg" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" -msgstr "" +msgstr "du kan ikke velge både gruppering og «--to»" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" -msgstr "" +msgstr "gruppering fungerer ikke med dine regioninnstillinger" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" -msgstr "" +msgstr "«--header» ignoreres når kommandolinje gir inndata" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" -msgstr "" +msgstr "feil ved lesing av inndata" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" -msgstr "" +msgstr "klarte ikke å konvertere noen av inndata-tallene" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7164,19 +7418,29 @@ msgid "" " or: %s --traditional [OPTION]... [FILE] [[+]OFFSET[.][b] [+][LABEL][.]" "[b]]\n" msgstr "" +"Bruk: %s [VALG] … [FIL] …\n" +" eller: %s [-abcdfilosx] … [FIL] [[+]FORSKYV[.][b]]\n" +" eller: %s --traditional [VALG] … [FIL] [[+]FORSKYV[.][b] [+][ETIKETT][.]" +"[b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" +"Skriv en entydig representasjon - i oktale bytes som standard - av FIL\n" +"til standardutdata. Hvis ingen FIL er valgt, eller hvis FIL er «-», \n" +"leser programmet standard inndata.\n" +"\n" -#: src/od.c:333 +#: src/od.c:335 +#, 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" @@ -7184,8 +7448,15 @@ 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 "" +"Hvis både første og andre kalleformat gjelder, og siste parameter (av minst " +"2)\n" +"beynner med «+» eller et tall, brukes det siste formatet.\n" +"En FORSKYVnings-operand betyr «-j [FORSKYV]». ETIKETTen er\n" +"pseudoadressen hvor første byte skrives ut, som økes mens dumping pågår.\n" +"Et «0x»- eller «0X»-prefiks for FORSKYV og ETIKETT betyr heksadesimal.\n" +"(suffiks kan være «.» for oktal, og «b» for å gange med 512)\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7193,8 +7464,15 @@ msgid "" "order\n" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" +" -A, --address-radix=GRUNNTALL utskriftsformat for filforskyvninger. " +"GRUNNTALLet\n" +" er en av bokstavene i [doxn], som står for " +"desimal, oktal, heksadesimal eller null/none\n" +" --endian={big|little} bytt om inndata-byte i henhold til valgt " +"rekkefølge\n" +" -j, --skip-bytes=BYTE hopp over valgt antall BYTE med inndata først\n" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -7206,8 +7484,18 @@ msgid "" " 32 is implied when BYTES is not specified\n" " --traditional accept arguments in third form above\n" msgstr "" +" -N, --read-bytes=BYTE begrens dumping til valgt antall inndataBYTE\n" +" -S BYTES, --strings[=BYTE] skriv ut strenger med minst valgt antall BYTE " +"med grafiske tegn.\n" +" 3 gjelder implisitt når BYTE ikke er valgt\n" +" -t, --format=TYPE velg utskriftsformat(er)\n" +" -v, --output-duplicates ikke marker utelatte linjer med «*» \n" +" -w[BYTES], --width[=BYTE] skriv ut valgt antall BYTE per linje.\n" +" 32 gjelder implisitt når BYTE ikke er valgt\n" +" --traditional godta argumenter av tredje type som nevt " +"ovenfor\n" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -7217,8 +7505,15 @@ msgid "" " -c same as -t c, select printable characters or backslash escapes\n" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" +"\n" +"\n" +"Du kan bruke nye og tradisjonelle formatspesifikasjoner om hverandre, slik:\n" +" -a tilsvarer «-t a» (velg navngitte tegn, og ignorer «high-order»-bit)\n" +" -b tilsvarer «-t o1» (velg oktale byte)\n" +" -c tilsvarer «-t c» (velg ASCII-tegn, eller skråstrek-skiftetegn)\n" +" -d tilsvarer «-t u2» (velg desimale 2 byte-enheter uten fortegn)\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7227,8 +7522,14 @@ msgid "" " -s same as -t d2, select decimal 2-byte units\n" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" +" -f tilsvarer «-t fF» (velg flyttall)\n" +" -i tilsvarer «-t dI» (velg heltall med desimaler)\n" +" -l tilsvarer «-t dL» (velg lange tall med desimaler)\n" +" -o tilsvarer «-t o2» (velg oktale 2 byte-enheter)\n" +" -s tilsvarer «-t d2» (velg desimaltall i 2 byte-enheter)\n" +" -x tilsvarer «-t x2» (velg heksadesimale 2 byte-enheter)\n" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -7236,8 +7537,13 @@ msgid "" " a named character, ignoring high-order bit\n" " c printable character or backslash escape\n" msgstr "" +"\n" +"\n" +"TYPE må følge én eller flere av følgende spesifikasjoner:\n" +" a navngitt tegn (ignorerer «high-order»-bit)\n" +" c ASCII-tegn, eller skråstrek-skiftetegn\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7245,8 +7551,13 @@ msgid "" " u[SIZE] unsigned decimal, SIZE bytes per integer\n" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" +" d[STØRR] desimal med fortegn, STØRRelse byte per tall\n" +" f[STØRR] flyttall, STØRRelse byte per tall\n" +" o[STØRR] oktal, STØRRelse byte per tall\n" +" u[STØRR] desimal uten fortegn, STØRRelse byte per tall\n" +" x[STØRR] heksadesimal, STØRRelse byte per tall\n" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -7254,15 +7565,23 @@ msgid "" "sizeof(long). If TYPE is f, SIZE may also be F for sizeof(float), D\n" "for sizeof(double) or L for sizeof(long double).\n" msgstr "" +"\n" +"STØRRelsen er et tall. For TYPEne [doux] kan STØRR også være\n" +"C for sizeof(char), S for sizeof(short), I for sizeof(int) eller L for\n" +"sizeof(long). Hvis TYPE er «f», kan STØRR også være F for sizeof(float), D\n" +"for sizeof(double) eller L for sizeof(long double).\n" -#: src/od.c:401 +#: src/od.c:404 msgid "" "\n" "Adding a z suffix to any type displays printable characters at the end of\n" "each output line.\n" msgstr "" +"\n" +"Du kan vise utskrivbare tegn i slutten av hver linje ved å legge et\n" +"«z»-suffiks til hvilken som helst av typene.\n" -#: src/od.c:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -7274,87 +7593,108 @@ msgid "" " M 1024*1024\n" "and so on for G, T, P, E, Z, Y.\n" msgstr "" +"\n" +"\n" +"BYTE er hex-verdier med «0x»- eller «0X»-prefiks som også kan brukes med " +"gangesuffiks:\n" +" b 512\n" +" KB 1000\n" +" K 1024\n" +" MB 1000*1000\n" +" M 1024*1024\n" +"og så videre (G, T, P, E, Z, Y).\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" -msgstr "" +msgstr "%s er en ugyldig typestreng" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte integral type" msgstr "" +"%s er en ugyldig typestreng.Dette systemet støtter ikke en %lu-byte " +"integraltype" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte floating point type" msgstr "" +"%s er en ugyldig typestreng.\n" +"Dette systemet støtter ikke en %lu-byte flyttallstype" -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" -msgstr "" +msgstr "tegnet «%c» er ugyldig i typestrengen %s" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" -msgstr "" +msgstr "klarte ikke å hoppe forbi slutten av kombinert inndata" -#: src/od.c:1650 +#: src/od.c:1658 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" +"utskriftsadressens grunntall «%c» er ugyldig. Det må være et tegn fra [doxn]" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" -msgstr "" +msgstr "du kan ikke velge type ved dumping av strenger" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" -msgstr "" +msgstr "kompatiblitetsmodus støtter bare én fil av gangen" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" -msgstr "" +msgstr "summen av «skip-bytes» + «read-bytes» er for stor" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" -msgstr "" +msgstr "advarsel: «%lu» er en gyldig bredde. Bruker %d i stedet" #: src/operand2sig.c:69 #, c-format msgid "%s: invalid signal" -msgstr "" +msgstr "%s: ugyldig signal" #: src/paste.c:220 #, c-format msgid "standard input is closed" -msgstr "" +msgstr "standard inndata er stengt" #: src/paste.c:439 +#, fuzzy msgid "" "Write lines consisting of the sequentially corresponding lines from\n" "each FILE, separated by TABs, to standard output.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" +"Skriv ut linjer som svarer til linjene i hver FIL til standardutdata,\n" +"adskilt med TABulatorer.\n" +"Hvis FIL ikke er valgt, eller hvis FIL er «-», leser programmet standard " +"inndata.\n" #: src/paste.c:447 msgid "" " -d, --delimiters=LIST reuse characters from LIST instead of TABs\n" " -s, --serial paste one file at a time instead of in parallel\n" msgstr "" +" -d, --delimiters=LISTE bruk tegn fra LISTE istedet for tabulatorer\n" +" -s, --serial ta én fil om gangen i steder for flere parallelt\n" #: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" -msgstr "" +msgstr "skilletegnslista slutter på en skråstrek (%s) uten skiftetegn" #: src/pathchk.c:90 msgid "" @@ -7364,122 +7704,128 @@ msgid "" " -P check for empty names and leading \"-\"\n" " --portability check for all POSIX systems (equivalent to -p -P)\n" msgstr "" +"Diagnotiser ugyldige eller ikke-overførbare filnavn.\n" +"\n" +" -p se etter POSIX-systemer\n" +" -P se etter tomme filnavn og ledende «-»-tegn\n" +" --portability se etter alle POSIX-systemer (tilsvarer «-p -P»)\n" #: src/pathchk.c:170 #, c-format msgid "leading '-' in a component of file name %s" -msgstr "" +msgstr "filnavn %s har en komponent som inneholder ledende «-»-tegn" #: src/pathchk.c:196 #, c-format msgid "nonportable character %s in file name %s" -msgstr "" +msgstr "%s er et ikke-flyttbart tegn i filnavnet %s" #: src/pathchk.c:272 #, c-format msgid "empty file name" -msgstr "" +msgstr "tomt filnavn" #: src/pathchk.c:314 #, c-format msgid "%s: unable to determine maximum file name length" -msgstr "" +msgstr "%s: klarte ikke å bestemme maksimal lengde på filnavn" #: src/pathchk.c:325 #, c-format msgid "limit %lu exceeded by length %lu of file name %s" -msgstr "" +msgstr "grensa på %lu er overskredet av en lengde på %lu i filnavnet %s" #: src/pathchk.c:411 #, c-format msgid "limit %lu exceeded by length %lu of file name component %s" msgstr "" +"grensa på %lu er overskredet av en lengde på %lu i filnavnkomponenten %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 msgid "Joseph Arceneaux" -msgstr "" +msgstr "Joseph Arceneaux" #. This is a proper name. See the gettext manual, section Names. #: src/pinky.c:38 src/uptime.c:47 msgid "Kaveh Ghazi" -msgstr "" +msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. #: src/pinky.c:242 msgid " ???" -msgstr "" +msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. #: src/pinky.c:266 msgid "?????" -msgstr "" +msgstr "?????" #: src/pinky.c:314 #, c-format msgid "Login name: " -msgstr "" +msgstr "Brukernavn: " #: src/pinky.c:317 #, c-format msgid "In real life: " -msgstr "" +msgstr "Ekte navn: " #. TRANSLATORS: Real name is unknown; no hard limit. #: src/pinky.c:321 msgid "???\n" -msgstr "" +msgstr "???\n" #: src/pinky.c:341 #, c-format msgid "Directory: " -msgstr "" +msgstr "Mappe: " #: src/pinky.c:343 #, c-format msgid "Shell: " -msgstr "" +msgstr "Skall: " #: src/pinky.c:362 #, c-format msgid "Project: " -msgstr "" +msgstr "Prosjekt: " #: src/pinky.c:386 #, c-format msgid "Plan:\n" -msgstr "" +msgstr "Plan:\n" #: src/pinky.c:405 msgid "Login" -msgstr "" +msgstr "Brukernavn" #: src/pinky.c:407 msgid "Name" -msgstr "" +msgstr "Navn" #: src/pinky.c:408 msgid " TTY" -msgstr "" +msgstr " TTY" #: src/pinky.c:410 msgid "Idle" -msgstr "" +msgstr "Inaktiv" #: src/pinky.c:411 msgid "When" -msgstr "" +msgstr "Når" #: src/pinky.c:414 msgid "Where" -msgstr "" +msgstr "Hvor" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" -msgstr "" +msgstr "Bruk: %s [VALG] … [BRUKER] …\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7488,8 +7834,15 @@ 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 gjør en langformatert utskrift av aktuelle BRUKERe\n" +" -b utelat brukerens hjemmemappe og innloggingsskall ved " +"utskrift i langformat\n" +" -h utelat brukerens prosjektfil ved utskrift i langformat\n" +" -p utelat brukerens planfil ved utskrift i langformat\n" +" -s skriv ut i kort format (dette er standard)\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7497,105 +7850,116 @@ msgid "" " -q omit the user's full name, remote host and idle time\n" " in short format\n" msgstr "" +" -f utelat kolonneoverskrifter ved utskrift i kort format\n" +" -w utelat fullt navn på brukeren ved utskrift i kort format\n" +" -i utelat fullt navn og vertsadresse på brukeren ved utskrift " +"i kort format\n" +" -q utelat fullt navn, vertsadresse og inaktivitetstid\n" +" ved utskrift i kort format\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" "A lightweight 'finger' program; print user information.\n" "The utmp file will be %s.\n" msgstr "" +"\n" +"Et lettdrevet «finger»-program. Gir informasjon om bruker(e).\n" +"utmp-fila er %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" +"ingen brukernavn er valgt. Du må velge minst ett brukernavn ved bruk av «-l»" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" -msgstr "" +msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" -msgstr "" +msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" -msgstr "" +msgstr "argument mangler for --pages=FØRSTE[:SISTE]" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" -msgstr "" +msgstr "%s er et ugyldig sidespenn" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" -msgstr "" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" +msgstr "%s er et ugyldig antall linjer for «-l LENGDE»" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" -msgstr "" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" +msgstr "%s er et ugyldig nummer på første linje i «-N NUMMER»" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" -msgstr "" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" +msgstr "%s er en ugyldig linjeforskyvning for «-o MARGIN»" -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" -msgstr "" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" +msgstr "%s er et ugyldig antall tegn for «-w BREDDE»" -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" -msgstr "" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" +msgstr "%s er et ugyldig antall tegn for «-W BREDDE»" -#: src/pr.c:1096 +#: src/pr.c:1059 #, c-format msgid "cannot specify number of columns when printing in parallel" -msgstr "" +msgstr "du kan ikke velge antall kolonner kan ved utskrift i parallellmodus" -#: src/pr.c:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" -msgstr "" +msgstr "du kan ikke velge både utskrift på tvers og parallellmodus samtidig" -#: src/pr.c:1196 +#: src/pr.c:1166 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "" +"argumentet for «-%c» (%s) inneholder ekstrategn og/eller et ugyldig tall" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" -msgstr "" +msgstr "sidebredden er for liten" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" -msgstr "" +msgstr "første sidetall (%) er høyere enn antall sider (%)" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" -msgstr "" +msgstr "for mange sider" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" -msgstr "" +msgstr "Side %" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" -msgstr "" +msgstr "Merk valgte FIL(er) med sidetall, eller gi dem spalter.\n" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7604,8 +7968,14 @@ msgid "" " unless -a is used. Balance number of lines in the\n" " columns on each page\n" msgstr "" +" +FØRSTE_SIDE[:SISTE_SIDE], --pages=FØRSTE_SIDE[:SISTE_SIDE]\n" +" start [stans] utskrift ved FØRSTE_[SISTE_]SIDE\n" +" -KOL, --columns=KOL\n" +" skriv ut KOL antall kolonner og skriv kolonner nedover,\n" +" med mindre «-a» er valgt. Balanser antall linjer\n" +" i kolonnene på neste side\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7614,8 +7984,15 @@ msgid "" " -d, --double-space\n" " double space the output\n" msgstr "" +" -a, --across skriv kolonner på tvers i stedet for nedover (brukes " +"sammen\n" +" med -KOLONNE)\n" +" -c, --show-control-chars\n" +" bruk hattnotasjon (^G) og oktal backslah-notasjon\n" +" -d, --double-space\n" +" bruk dobbel linjeavstand\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7626,8 +8003,16 @@ msgid "" " (by a 3-line page header with -F or a 5-line header\n" " and trailer without -F)\n" msgstr "" +" -D, --date-format=FORMAT\n" +" bruk valgt datoFORMAT i topptekst\n" +" -e[TEGN[BREDDE]], --expand-tabs[=TEGN[BREDDE]]\n" +" utvid inndataTEGN (TAB) til tabulatorBREDDE (8)\n" +" -F, -f, --form-feed\n" +" bruk sideskift i stedet for linjeskift for å separere\n" +" sider. (ved en 3-linjers topptekst med -F eller en\n" +" 5-linjers topptekst og bunntekst uten -F)\n" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7639,17 +8024,48 @@ msgid "" "column\n" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" +" -h, --header=OVERSKRIFT\n" +" bruk en midtstilt overskrift, i stedet for filnavnet i " +"sideoverskriften.\n" +" «-h \"\"» skriver ut en tom linje (ikke bruk «-h\"\"»)\n" +" -i[TEGN[BREDDE]], --output-tabs[=TEGN[BREDDE]]\n" +" erstatt mellomrom med TEGN (TAB-er) til tabulatorBREDDE " +"(8)\n" +" -J, --join-lines slå sammen hele linjer (skrur av «-W»-valget " +"linjeforkortelse uten kolonneoppstilling)\n" +" --sep-string[=STRENG] velger skilletegn\n" -#: src/pr.c:2798 +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l, --length=SIDELENGDE\n" +" velg SIDELENGDE i form av antall (66) linjer\n" +" (standard antall tekstfylte linjer er 56, eller 63 ved " +"bruk av «-F»)\n" +" -m, --merge skriv ut alle filer parallellt, med én fil per kolonne.\n" +" Linjer kortes ned hvis nødvendig, og fylte linjer slås " +"sammen med valget «J»\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" +" -l, --length=SIDELENGDE\n" +" velg SIDELENGDE i form av antall (66) linjer\n" +" (standard antall tekstfylte linjer er 56, eller 63 ved " +"bruk av «-F»)\n" +" -m, --merge skriv ut alle filer parallellt, med én fil per kolonne.\n" +" Linjer kortes ned hvis nødvendig, og fylte linjer slås " +"sammen med valget «J»\n" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7658,8 +8074,17 @@ msgid "" " start counting with NUMBER at 1st line of first\n" " page printed (see +FIRST_PAGE)\n" msgstr "" +" -n[SEP[SIFF]], --number-lines[=SEP[SIFF]]\n" +" nummerer linjer, med angitt antall SIFFre (5) , og " +"deretter SEP (TAB).\n" +" Telling starter ved første linje i inndatafila som " +"standard\n" +" -N, --first-line-number=NUMMER\n" +" start tellinga fra valgt linjeNUMMER etter første linje " +"på\n" +" første utskriftsside (se +FØRSTE_SIDE)\n" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7667,8 +8092,15 @@ msgid "" " -r, --no-file-warnings\n" " omit warning when a file cannot be opened\n" msgstr "" +" -o, --indent=MARG\n" +" forskyv hver linje med valgt MARG (tomrom). Dette " +"påvirker hverken\n" +" «-w» eller «-W». MARG legges til i BREDDE\n" +" -r, --no-file-warnings\n" +" ikke gi advarsel når programmet ikke klarer å åpne en " +"fil\n" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7678,18 +8110,38 @@ msgid "" " -s[CHAR] turns off line truncation of all 3 column\n" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" +" -s[TEGN], --separator[=TEGN]\n" +" skill kolonner fra hverandre med ett enkelt tegn (TEGN " +"er\n" +" som standard, uten «-w» og «no char» med «-w»).\n" +" Skru av linjeforkortelse for alle 3 kolonnevalg med «-" +"s[TEGN]»\n" +" (-KOL|-a -KOL|-m), unntatt når «-w» er valgt.\n" -#: src/pr.c:2828 +#: src/pr.c:2802 +#, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" +msgstr "" +" -S[STRENG], --sep-string[=STRENG]\n" +" skill kolonner fra hverandre med STRENG,\n" +" uten «-S». Standard skilletegn er ved bruk av «-" +"J», og ellers \n" +" (tilsvarer «-S\" \"»). Dette påvirker ikke " +"øvrige kolonnevalg.\n" " -t, --omit-header omit page headers and trailers\n" + +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" msgstr "" -#: src/pr.c:2835 +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7702,8 +8154,19 @@ msgid "" " multiple text-column output only, -s[char] turns off " "(72)\n" msgstr "" +" -T, --omit-pagination\n" +" utelat topp- og bunntekst, og fjern eventuell " +"sidetallsmerking\n" +" fra utforming i inndatafiler\n" +" -v, --show-nonprinting\n" +" bruk oktal skråstreknotasjon\n" +" -w, --width=BREDDE\n" +" velg sidebredde i form av antall tegn, i henhold til " +"BREDDE (72), kun\n" +" for utskrift av flere tekstkolonner. «-s[tegn] skrur av " +"(72).\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7711,13 +8174,12 @@ msgid "" "interference\n" " with -S or -s\n" msgstr "" - -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" +" -W, --page-width=BREDDE\n" +" velg sidebredde i form av antall tegn, i henhold til " +"BREDDE (72),\n" +" og kort ned linjer med mindre «-J» er valgt. Dette " +"påvirker ikke\n" +" valgene «-S» eller «-s».\n" #: src/printenv.c:62 #, c-format @@ -7727,16 +8189,22 @@ msgid "" "If no VARIABLE is specified, print name and value pairs for them all.\n" "\n" msgstr "" +"Bruk: %s [VALG] … [VAR] …\n" +"Skriv ut verdiene av valgt(e) miljøVARiab(-el/-ler).\n" +"Alle gjeldende navn og verdier skrives ut hvis du ikke velger VAR.\n" +"\n" #: src/printenv.c:69 msgid " -0, --null end each output line with NUL, not newline\n" msgstr "" +" -0, --null avslutt hver utskriftslinje med 0 byte, i stedet for " +"linjeskift\n" #: src/printf.c:79 #, c-format msgid "" "warning: %s: character(s) following character constant have been ignored" -msgstr "" +msgstr "advarsel: %s: tegn som kommer etter tegnkonstant(er) ble ignorert" #: src/printf.c:88 #, c-format @@ -7744,12 +8212,16 @@ msgid "" "Usage: %s FORMAT [ARGUMENT]...\n" " or: %s OPTION\n" msgstr "" +"Bruk: %s FORMAT [ARGUMENT] …\n" +" eller: %s VALG\n" #: src/printf.c:93 msgid "" "Print ARGUMENT(s) according to FORMAT, or execute according to OPTION:\n" "\n" msgstr "" +"Skriv ut ARGUMENT(er) i valgt FORMAT, eller kjør med bestemt VALG:\n" +"\n" #: src/printf.c:99 msgid "" @@ -7758,6 +8230,10 @@ msgid "" "\n" " \\\" double quote\n" msgstr "" +"\n" +"FORMAT styrer utskriften som i C printf. Følgende sekvenser tolkes:\n" +"\n" +" \\\" hermetegn\n" #: src/printf.c:117 msgid "" @@ -7766,6 +8242,11 @@ msgid "" " \\uHHHH Unicode (ISO/IEC 10646) character with hex value HHHH (4 digits)\n" " \\UHHHHHHHH Unicode character with hex value HHHHHHHH (8 digits)\n" msgstr "" +" \\NNN byte med oktalverdi NNN (1 til 3 sifre)\n" +" \\xHH byte med heksadesimalverdi HH (1 til 2 sifre)\n" +" \\uHHHH Unicode (ISO/IEC 10646)-tegn med heksadesimalverdi HHHH (4 " +"sifre)\n" +" \\UHHHHHHHH Unicode-tegn med heksadesimalverdi HHHHHHHH (8 sifre)\n" #: src/printf.c:123 msgid "" @@ -7776,46 +8257,53 @@ 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 "" +" %% ett «%»-tegn\n" +" %b ARGUMENT som en streng med tolkning av «\\»-skiftetegn,\n" +" bortsett fra oktale skiftetegn av typen «\\0» eller «\\0NNN»\n" +"\n" +"og alt øvrig som samsvarer med C-formatet og slutter på en av bokstavene " +"diouxXfeEgGcs, hvor\n" +"ARGUMENTer tolkes før de kjøres. Variable bredder håndteres.\n" #: src/printf.c:148 #, c-format msgid "%s: expected a numeric value" -msgstr "" +msgstr "%s: forventet en numerisk verdi" #: src/printf.c:150 #, c-format msgid "%s: value not completely converted" -msgstr "" +msgstr "%s: verdien ble ikke konvertert skikkelig" #: src/printf.c:247 src/printf.c:274 #, c-format msgid "missing hexadecimal number in escape" -msgstr "" +msgstr "du mangler et heksadesimalt tall i skiftesekvensen" #: src/printf.c:286 #, c-format msgid "invalid universal character name \\%c%0*x" -msgstr "" +msgstr "universaltegn-navnet «\\%c%0*x» er ugyldig" #: src/printf.c:547 #, c-format msgid "invalid field width: %s" -msgstr "" +msgstr " %s er en ugyldig feltbredde" #: src/printf.c:582 #, c-format msgid "invalid precision: %s" -msgstr "" +msgstr "%s er en ugyldig presisjonsgrad" #: src/printf.c:609 #, c-format msgid "%.*s: invalid conversion specification" -msgstr "" +msgstr "%.*s: ugyldig konverteringsspesifikasjon" #: src/printf.c:692 #, c-format msgid "warning: ignoring excess arguments, starting with %s" -msgstr "" +msgstr "advarsel: overflødige argumenter blir ignorert, hvorav første er %s" #. TRANSLATORS: Please translate "F. Pinard" to "François Pinard" #. if "ç" (c-with-cedilla) is available in the translation's character @@ -7823,12 +8311,12 @@ msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/ptx.c:42 msgid "F. Pinard" -msgstr "" +msgstr "François Pinard" #: src/ptx.c:420 #, c-format msgid "%s (for regexp %s)" -msgstr "" +msgstr "%s (for reg. uttrykk %s)" #: src/ptx.c:1820 #, c-format @@ -7836,30 +8324,52 @@ msgid "" "Usage: %s [OPTION]... [INPUT]... (without -G)\n" " or: %s -G [OPTION]... [INPUT [OUTPUT]]\n" msgstr "" +"Bruk : %s [VALG] … [INNDATA] … (uten «-G»)\n" +"eller: %s -G [VALG] … [INNDATA [UTDATA]]\n" #: src/ptx.c:1824 msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" msgstr "" +"Skriv ut en omrokkert indeks, inklusiv kontekst, over ordene i " +"inndatafilene.\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 +#, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" " -G, --traditional behave more like System V 'ptx'\n" -" -F, --flag-truncation=STRING use STRING for flagging line truncations\n" msgstr "" +" -A, --auto-reference skriv ut automatisk genererte " +"innstillinger\n" +" -G, --traditional simuler oppførselen til System V «ptx»\n" +" -F, --flag-truncation=STRENG bruk STRENG til å markere " +"linjeforkortelser\n" #: src/ptx.c:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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 "" +" -M, --macro-name=STRENG makronavn som skal brukes, i stedet for " +"«xx»\n" +" -O, --format=roff skriv ut i form av roff-direktiver\n" +" -R, --right-side-refs legg innstillinger til høyre, ikke talt opp " +"med «-w»\n" +" -S, --sentence-regexp=REG.UTTRYKK for linje- eller setningsslutt\n" +" -T, --format=tex skriv ut i form av TeX-direktiver\n" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7868,80 +8378,100 @@ 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=REGUT bruk REGUT for å finne nøkkelord\n" +" -b, --break-file=FIL tegn for orddeling i denne FILa\n" +" -f, --ignore-case ikke sorter etter små og store bokstaver\n" +" -g, --gap-size=TALL størrelse på mellomrom mellom spalter i " +"utdatafelt\n" +" -i, --ignore-file=FIL hent liste over ord som skal ignoreres fra " +"FIL\n" +" -o, --only-file=FIL hent liste over ord som skal leses fra FIL\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 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:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" +" -r, --references første felt på hver linje er en referanse\n" +" -t, --typeset-mode - ikke implementert -\n" +" -w, --width=BREDDE utskriftbredde for spalter, utenom " +"referanser\n" #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" -msgstr "" +msgstr "%s er en ugyldig spaltebredde" + +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "%s er en ugyldig linjebredde" #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" "\n" msgstr "" +"Skriv ut hele filnavnet på gjeldende arbeidsmappe.\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 bruk PWD-miljøvariabelen, også hvis den inneholder " +"symbolske lenker\n" +" -P, --physical unngå alle symbolske lenker\n" #: src/pwd.c:67 msgid "" "\n" "If no option is specified, -P is assumed.\n" msgstr "" +"\n" +"Hvis ingenting er valgt, brukes «-P» som standard.\n" #: src/pwd.c:169 #, c-format msgid "failed to chdir to %s" -msgstr "" +msgstr "klarte ikke å bytte mappe til %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" -msgstr "" +msgstr "klarte ikke å hente informasjon om %s" #: src/pwd.c:238 #, c-format msgid "couldn't find directory entry in %s with matching i-node" -msgstr "" +msgstr "fant ingen mappe i %s med samsvarende inode" #: src/pwd.c:367 #, c-format msgid "ignoring non-option arguments" -msgstr "" +msgstr "argumenter som ikke er programvalg blir ignorert" #. This is a proper name. See the gettext manual, section Names. #: src/readlink.c:32 msgid "Dmitry V. Levin" -msgstr "" +msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "" +msgstr "Bruk: %s [VALG] … FIL …\n" #: src/readlink.c:63 msgid "" "Print value of a symbolic link or canonical file name\n" "\n" msgstr "" +"Skriv ut verdien av en symbolsk lenke, eller hele stien til målfilnavnet\n" +"\n" #: src/readlink.c:65 msgid "" @@ -7954,6 +8484,12 @@ msgid "" "recursively,\n" " all components must exist\n" msgstr "" +" -f, --canonicalize følg hver symbolske lenke i hver\n" +" komponent for aktuell lenke, rekursivt\n" +" (alle komponenter unntatt den siste må " +"eksistere)\n" +" -e, --canonicalize-existing som ovenfor, men alle komponenter må " +"eksistere\n" #: src/readlink.c:75 msgid "" @@ -7968,11 +8504,23 @@ msgid "" " -v, --verbose report error messages\n" " -z, --zero end each output line with NUL, not newline\n" msgstr "" +" -m, --canonicalize-missing generaliser ved å følge hver symbolske lenke " +"rekursivt\n" +" i hver komponent i valgt navn, uten å kreve " +"at komponentene\n" +" skal eksistere\n" +" -n, --no-newline ikke skriv ut avsluttende skilletegn\n" +" -q, --quiet,\n" +" -s, --silent la være å skrive ut de fleste typer " +"feilmeldinger\n" +" -v, --verbose vis feilmeldinger\n" +" -z, --zero del opp utskrift med tomrom, i stedet for " +"linjeskift\n" #: src/readlink.c:152 #, c-format msgid "ignoring --no-newline with multiple arguments" -msgstr "" +msgstr "valget «--no-newline» ignoreres ved bruk av flere argumenter" #: src/realpath.c:72 msgid "" @@ -7980,6 +8528,9 @@ msgid "" "all but the last component must exist\n" "\n" msgstr "" +"Skriv ut fullstendig navn på målfil\n" +"(alle komponentene må eksistere, unntatt den siste)\n" +"\n" #: src/realpath.c:77 msgid "" @@ -7994,20 +8545,34 @@ msgid "" " -z, --zero end each output line with NUL, not newline\n" "\n" msgstr "" +" -e, --canonicalize-existing alle komponenter i stien må eksistere\n" +" -m, --canonicalize-missing ingen komponenter i stien må eksistere\n" +" -L, --logical følg «..»-komponenter før symbolske lenker\n" +" -P, --physical følg symbolske lenker når de dukker opp " +"(standard)\n" +" -q, --quiet la være å skrive ut de fleste feilmeldinger\n" +" --relative-to=FIL skriv ut den oppslåtte filbanen, relativt til " +"FIL\n" +" --relative-base=FIL skriv ut fullstendige filbaner, med mindre " +"aktuell sti ligger under FIL\n" +" -s, --strip, --no-symlinks ikke utvid symbolske lenker\n" +" -z, --zero del opp utskrift med NUL (tomrom) i stedet " +"for linjeskift\n" +"\n" #: src/relpath.c:130 msgid "generating relative path" -msgstr "" +msgstr "lager relativ sti" #: src/remove.c:273 #, c-format msgid "%s: descend into write-protected directory %s? " -msgstr "" +msgstr "%s: vil du fortsette i den skrivebeskyttede undermappa %s? " #: src/remove.c:274 #, c-format msgid "%s: descend into directory %s? " -msgstr "" +msgstr "%s: vil du fortsette i undermappa %s? " #. TRANSLATORS: In the next two strings the second %s is #. replaced by the type of the file. To avoid grammatical @@ -8018,31 +8583,32 @@ msgstr "" #, c-format msgid "%s: remove write-protected %s %s? " msgstr "" +"%1$s: %3$s er en skrivebeskyttet %2$s. Er du sikker på at du vil fjerne den? " #: src/remove.c:292 #, c-format msgid "%s: remove %s %s? " -msgstr "" +msgstr "%s: vil du fjerne %s %s? " #: src/remove.c:375 #, c-format msgid "removed directory: %s\n" -msgstr "" +msgstr "mappa %s er fjernet\n" #: src/remove.c:447 #, c-format msgid "refusing to remove %s or %s directory: skipping %s" -msgstr "" +msgstr "systemet nekter å fjerne %s eller %s. Hopper over %s" #: src/remove.c:505 #, c-format msgid "skipping %s, since it's on a different device" -msgstr "" +msgstr "hopper over %s, fordi den ligger på en annen enhet" #: src/remove.c:525 #, c-format msgid "traversal failed: %s" -msgstr "" +msgstr "feil ved gjennomgang av %s" #: src/remove.c:531 #, c-format @@ -8050,11 +8616,13 @@ msgid "" "unexpected failure: fts_info=%d: %s\n" "please report to %s" msgstr "" +"uventet feil: fts_info=%d: %s\n" +"vi ber om at du rapporterer dette til %s" #: src/rm.c:119 #, c-format msgid "Try '%s ./%s' to remove the file %s.\n" -msgstr "" +msgstr "Prøv «%s ./%s» for å fjerne fila %s.\n" #: src/rm.c:136 msgid "" @@ -8064,6 +8632,11 @@ msgid "" "prompt\n" " -i prompt before every removal\n" msgstr "" +"Fjern FIL(er).\n" +"\n" +" -f, --force ignorer filer og argumenter som ikke eksisterer, og " +"ikke spør om noe)\n" +" -i be om bekreftelse før fil(er) fjernes\n" #: src/rm.c:142 msgid "" @@ -8076,6 +8649,15 @@ msgid "" " --interactive[=WHEN] prompt according to WHEN: never, once (-I), or\n" " always (-i); without WHEN, prompt always\n" msgstr "" +" -I spør én gang før fjerning av flere enn tre filer og/" +"eller eller\n" +" ved rekursiv fjerning. Dette er mindre irriterende " +"enn «-i»,\n" +" og beskytter fremdeles mot de fleste uhell\n" +" --interactive[=NÅR] spør om bekreftelse ihht. NÅR: «never» (aldri), " +"«once» (tilsvarer «-I»), \n" +" eller «always» (tilsvarer «-i»). Uten angitt NÅR, " +"spør programmet alltid.\n" #: src/rm.c:149 msgid "" @@ -8083,6 +8665,8 @@ msgid "" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" +" --one-file-system hopp over mapper som finnes på\n" +" andre filsystemer enn selve kommandoargumentet\n" #: src/rm.c:154 msgid "" @@ -8092,6 +8676,11 @@ msgid "" " -d, --dir remove empty directories\n" " -v, --verbose explain what is being done\n" msgstr "" +" --no-preserve-root ikke gi «/» spesialbehandling\n" +" --preserve-root ikke fjern «/» (standard)\n" +" -r, -R, --recursive fjern mappe(r) og mappeinnhold rekursivt\n" +" -d, --dir fjern tom(me) mappe(r)\n" +" -v, --verbose forklar hva som blir gjort\n" #: src/rm.c:163 msgid "" @@ -8100,6 +8689,10 @@ msgid "" "option to remove each listed directory, too, along with all of its " "contents.\n" msgstr "" +"\n" +"rm fjerner ikke mapper som standard. Bruk valget «--recursive» («-r» eller " +"«-R»)\n" +"for å fjerne både fil(er) og mappe(r), inkludert mappeinnhold.\n" #: src/rm.c:168 #, c-format @@ -8111,6 +8704,12 @@ msgid "" "\n" " %s ./-foo\n" msgstr "" +"\n" +"Bruk én av følgende kommandoer for å fjerne filer\n" +"med navn som starter på «-» (f.eks. «-foo»):\n" +" %s -- -foo\n" +"\n" +" %s ./-foo\n" #: src/rm.c:177 msgid "" @@ -8119,30 +8718,36 @@ msgid "" "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 "" +"\n" +"Merk: hvis du bruker rm for å fjerne en fil, kan det fremdeles være mulig " +"å \n" +"gjenopprette hele eller deler av den, for den som har nok tid og kunnskap.\n" +"Du bør vurdere å bruke «shred» hvis du ikke vil at innholdet skal kunne " +"gjenopprettes.\n" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " -msgstr[0] "" -msgstr[1] "" +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " +msgstr[0] "%s: vil du fjerne %zu argument rekursivt?" +msgstr[1] "%s: vil du fjerne %zu argumenter rekursivt?" #: src/rm.c:345 -#, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " -msgstr[0] "" -msgstr[1] "" +#, fuzzy, c-format +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " +msgstr[0] "%s: vil du fjerne %zu argument?" +msgstr[1] "%s: vil du fjerne %zu argumenter?" #: src/rmdir.c:134 src/rmdir.c:233 #, c-format msgid "removing directory, %s" -msgstr "" +msgstr "fjerner mappa %s" #: src/rmdir.c:148 #, c-format msgid "failed to remove directory %s" -msgstr "" +msgstr "klarte ikke å fjerne mappa %s" #: src/rmdir.c:165 msgid "" @@ -8152,6 +8757,10 @@ msgid "" " ignore each failure that is solely because a directory\n" " is non-empty\n" msgstr "" +"Fjern MAPPE(r) hvis de(n) er tom(me).\n" +"\n" +" --ignore-fail-on-non-empty\n" +" ignorer feil som kun skyldes at en mappe ikke er tom\n" #: src/rmdir.c:172 msgid "" @@ -8160,11 +8769,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 fjern MAPPE og foreldermapper (f.eks.: «rmdir -p a/b/c»\n" +" tilsvarer «rmdir a/b/c a/b a»)\n" +" -v, --verbose skriv ut diagnostikk for hver mappe som behandles\n" #: src/rmdir.c:242 #, c-format msgid "failed to remove %s" -msgstr "" +msgstr "klarte ikke å fjerne %s" #: src/runcon.c:83 #, c-format @@ -8172,12 +8784,18 @@ msgid "" "Usage: %s CONTEXT COMMAND [args]\n" " or: %s [ -c ] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n" msgstr "" +"Bruk: %s KONTEKST KOMMANDO [argu]\n" +" eller: %s [ -c ] [-u BRUKER] [-r ROLLE] [-t TYPE] [-l REKKEV] KOMMANDO " +"[argu]\n" #: src/runcon.c:87 msgid "" "Run a program in a different SELinux security context.\n" "With neither CONTEXT nor COMMAND, print the current security context.\n" msgstr "" +"Kjør et program i en annen SELinux-sikkerhetskontekst.\n" +"Hvis hverken KONTEKST eller KOMMANDO er valgt, skrives gjeldende kontekst " +"ut.\n" #: src/runcon.c:94 msgid "" @@ -8189,81 +8807,88 @@ msgid "" " -l, --range=RANGE levelrange\n" "\n" msgstr "" +" KONTEKST Fullstendig sikkerhetskontekst\n" +" -c, --compute regn ut overgangskontekst for prosessen før endring\n" +" -t, --type=TYPE type (for samme rolle som forelder)\n" +" -u, --user=BRUKER brukeridentitet\n" +" -r, --role=ROLLE rolle\n" +" -l, --range=REKKEV nivå-rekkevidde\n" +"\n" #: src/runcon.c:144 #, c-format msgid "multiple roles" -msgstr "" +msgstr "flere roller" #: src/runcon.c:149 #, c-format msgid "multiple types" -msgstr "" +msgstr "flere typer" #: src/runcon.c:154 #, c-format msgid "multiple users" -msgstr "" +msgstr "flere brukere" #: src/runcon.c:159 #, c-format msgid "multiple levelranges" -msgstr "" +msgstr "flere nivårekkevidder" #: src/runcon.c:177 src/runcon.c:213 #, c-format msgid "failed to get current context" -msgstr "" +msgstr "klarte ikke å finne gjeldende sikkerhetskontekst" #: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" -msgstr "" +msgstr "du må velge -c, -t, -u, -l, -r eller kontekst" #: src/runcon.c:195 #, c-format msgid "no command specified" -msgstr "" +msgstr "ingen kommando ble gitt" #: src/runcon.c:200 #, c-format msgid "%s may be used only on a SELinux kernel" -msgstr "" +msgstr "%s kan bare brukes på en SELinux-kjerne" #: src/runcon.c:226 #, c-format msgid "failed to compute a new context" -msgstr "" +msgstr "klarte ikke å beregne en ny kontekst" #: src/runcon.c:240 #, c-format msgid "failed to set new user %s" -msgstr "" +msgstr "klarte ikke å velge %s som ny bruker" #: src/runcon.c:242 #, c-format msgid "failed to set new type %s" -msgstr "" +msgstr "klarte ikke å velge %s som ny type" #: src/runcon.c:244 #, c-format msgid "failed to set new range %s" -msgstr "" +msgstr "klarte ikke å velge %s som ny rekkevidde" #: src/runcon.c:246 #, c-format msgid "failed to set new role %s" -msgstr "" +msgstr "klarte ikke å velge %s som ny rolle" #: src/runcon.c:254 #, c-format msgid "unable to set security context %s" -msgstr "" +msgstr "klarte ikke å velge sikkerhetskontekst %s" #: src/selinux.c:127 src/selinux.c:300 #, c-format msgid "error canonicalizing %s" -msgstr "" +msgstr "det oppstod en feil under generalisering av %s" #: src/seq.c:68 #, c-format @@ -8272,10 +8897,13 @@ msgid "" " or: %s [OPTION]... FIRST LAST\n" " or: %s [OPTION]... FIRST INCREMENT LAST\n" msgstr "" +"Bruk: %s [VALG] … SISTE\n" +" eller: %s [VALG] … FØRSTE SISTE\n" +" eller: %s [VALG] … FØRSTE ØKNING SISTE\n" #: src/seq.c:73 msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" -msgstr "" +msgstr "Skriv ut tall mellom FØRSTE og SISTE, med valgt ØKNING per steg.\n" #: src/seq.c:79 msgid "" @@ -8283,6 +8911,11 @@ msgid "" " -s, --separator=STRING use STRING to separate numbers (default: \\n)\n" " -w, --equal-width equalize width by padding with leading zeroes\n" msgstr "" +" -f, --format=FORMAT bruk flyttallsFORMAT i printf-stil\n" +" -s, --separator=STRENG bruk STRENG for å skille tall fra hverandre " +"(standard: «\\n»)\n" +" -w, --equal-width likestill bredde ved å utfylle forskjeller med " +"ledende nuller\n" #: src/seq.c:86 msgid "" @@ -8295,6 +8928,13 @@ msgid "" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" msgstr "" +"\n" +"FØRSTE og/eller ØKNING er 1 som standard, med mindre du velger noe annet. \n" +"Det vil si at ØKNING er 1 som standard, selv om SISTE evt. er lavere enn " +"FØRSTE.\n" +"FØRSTE, ØKNING og SISTE tolkes som flyttallverdier.\n" +"ØKNINGen er vanligvis positiv hvis FØRSTE er lavere enn SISTE,\n" +"eller negativ hvis FØRSTE er høyere enn SISTE.\n" #: src/seq.c:96 msgid "" @@ -8302,34 +8942,48 @@ msgid "" "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 "" +"FORMATet må kunne brukes til å skrive ut et argument av typen «double».\n" +"Det er %.PRECf som standard hvis både FØRSTE, ØKNING og SISTE er \n" +"faste desimaltall med maskismal maskimal presisjon PREC. Ellers brukes %g.\n" #: src/seq.c:142 #, c-format msgid "invalid floating point argument: %s" -msgstr "" +msgstr "%s er et ugyldig flyttallsargument" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" -msgstr "" +msgstr "format %s har ukjent %%%c-direktiv" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" -msgstr "" +msgstr "formatstrengen kan ikke angis ved utskrift av like breddestrenger" #. This is a proper name. See the gettext manual, section Names. #: src/shred.c:74 msgid "Colin Plumb" -msgstr "" +msgstr "Colin Plumb" #: src/shred.c:170 msgid "" "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n" "for even very expensive hardware probing to recover the data.\n" msgstr "" +"Overskriv valgt(e) FIL(er) flere ganger, slik at det blir vanskelig\n" +"selv for svært kostbare gjenopprettingstjenester å finne igjen dataene.\n" + +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Hvis en FIL er «-», kopieres informasjonen igjen til standardutdata.\n" -#: src/shred.c:177 +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8337,8 +8991,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 endre tillatelser slik at overskriving blir mulig, hvis " +"nødvendig\n" +" -n, --iterations=N overskriv N antall ganger, i stedet for standard (%d)\n" +" --random-source=FIL hent tilfeldighetsdata fra FIL\n" +" -s, --size=N makuler N antall byte (suffiks som f.eks. K, M, G kan " +"brukes)\n" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -8346,12 +9006,17 @@ 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 [=HVORDAN] forkort og fjern fil etter overskriving (se " +"nedenfor)\n" +" -v, --verbose vis framdrift\n" +" -x, --exact ikke rund av filstørrelser opp til nærmeste hele blokk.\n" +" (dette er standard for ikke-normale filer)\n" +" -z, --zero skriv over med nuller til slutt, for å skjule makulering\n" -#: src/shred.c:192 +#: src/shred.c:196 +#, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -8362,8 +9027,21 @@ msgid "" "The default mode is 'wipesync', but note it can be expensive.\n" "\n" msgstr "" +"\n" +"Hvis FIL er «-», makuleres standardutdata.\n" +"\n" +"FIL(er) slettes hvis «--remove» («-u») er valgt. Dette er ikke standard,\n" +"fordi det er vanlig å kjøre programmet på enhetsfiler som f.eks. «/dev/" +"hda»,\n" +"og slike filer bør normalt ikke slettes.\n" +"Valgfritt HOW-parmeter styrer hvordan mappeoppføringer skal fjernes.\n" +"«unlink» => bruk et standard «unlink»-kall.\n" +"«wipe» => som «unlink», men tilslører også byte i filnavnet.\n" +"«wipesync» => som «wipe», men synkroniserer også tilslørte byte med disken.\n" +"Standardmodus er «wipesync». Merk at denne kan kreve mye maskinkraft.\n" +"\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8373,8 +9051,14 @@ msgid "" "modes:\n" "\n" msgstr "" +"MERK: shred legger til grunn at filsystemet overskriver datafiler\n" +"der de faktisk (fysisk) ligger på disken. Dette er den tradisjonelle\n" +"måten disker fungerer på, men mange moderne filsystemer \n" +"fungerer annerledes. shred gir ikke ønsket effekt, eller kan \n" +"ikke garanteres å gi det i alle systemmoduser på følgende filsystemer:\n" +"\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8385,8 +9069,17 @@ msgid "" "* file systems that make snapshots, such as Network Appliance's NFS server\n" "\n" msgstr "" +"* logg-strukturerte eller journalførende filsystemer, som de som følger\n" +"med AIX og Solaris (og JFS, ReiserFS, XFS, Ext3, etc.)\n" +"\n" +"* filsystemer som skriver redundante data, og som virker selv om enkelte\n" +"skriveoperasjoner feiler, som RAID-baserte filesystemer\n" +"\n" +"* filsystemer som kan «tas bilde av», slik som Network Appliances NFS-" +"server\n" +"\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8394,8 +9087,13 @@ msgid "" "* compressed file systems\n" "\n" msgstr "" +"* filsystemer som hurtiglagrer data midlertidig, som NFS\n" +"versjon 3-klienter\n" +"\n" +"* komprimerte filsystemer\n" +"\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -8406,147 +9104,164 @@ msgid "" "as documented in the mount man page (man mount).\n" "\n" msgstr "" +"Advarselen over gjelder ext3-filsystemer \n" +"(shred har altså begrenset virkning) kun i modusen «data=journal»,\n" +"som journalfører filinformasjon i tillegg til metadata. shred virker\n" +"som det skal i modusene «data=ordered» (standard) og «data=writeback».\n" +"Journalføringsmodus for ext3 kan endres med «data=[ettellerannet]»-valget\n" +"for aktuelle filsystemer i fila «/etc/fstab», som også er dokumentert\n" +"i man-siden for programmet mount (kjør «man mount» i en terminal).\n" +"\n" -#: src/shred.c:241 +#: src/shred.c:243 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 "" +"Husk også at sikkerhetskopier av filsystemer og eksterne speiltjenere kan\n" +"ha lagret kopi(er) av fila hos seg, og at en makulert fil i så fall\n" +"kan gjenopprettes senere.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" -msgstr "" +msgstr "%s: fdatasync mislyktes" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" -msgstr "" +msgstr "%s: fsync mislyktes" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" -msgstr "" +msgstr "%s: klarte ikke å gå tilbake" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." -msgstr "" +msgstr "%s: runde %lu av %lu (%s) …" -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" -msgstr "" +msgstr "%s: det oppstod en feil ved skriving til punktet %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" -msgstr "" +msgstr "%s: lseek mislyktes" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" -msgstr "" +msgstr "%s: fila er for stor" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" -msgstr "" +msgstr "%s: runde %lu av %lu (%s) …%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" -msgstr "" +msgstr "%s: runde %lu av %lu (%s) … %s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" -msgstr "" +msgstr "%s: fstat mislyktes" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" -msgstr "" +msgstr "%s: filtypen er ugyldig" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" -msgstr "" +msgstr "%s: fila har negativ størrelse" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" -msgstr "" +msgstr "%s: det oppstod en feil ved forkortelse" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" -msgstr "" +msgstr "%s: fcntl mislyktes" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" +"%s: klarte ikke å makulere filbeskrivelse som bare kan utvides («append-" +"only») " -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" -msgstr "" +msgstr "%s: fjerner" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" -msgstr "" +msgstr "%s: har fått det nye navnet %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" -msgstr "" +msgstr "%s: klarte ikke å fjerne" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" -msgstr "" +msgstr "%s: fjernet" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" -msgstr "" +msgstr "%s: klarte ikke å lukke" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" -msgstr "" +msgstr "%s: klarte ikke å åpne fila for (over-)skriving" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" -msgstr "" +#, fuzzy +msgid "invalid number of passes" +msgstr "%s: antall runder er ugyldig" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" -msgstr "" +msgstr "du har oppgitt flere vilkårlighets(random-)kilder samtidig" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" -msgstr "" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" +msgstr "%s: ugyldig filstørrelse" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" " or: %s -e [OPTION]... [ARG]...\n" " or: %s -i LO-HI [OPTION]...\n" msgstr "" +"Bruk: %s [VALG] … [FIL]\n" +" eller: %s -e [VALG] … [ARG] …\n" +" eller: %s -i LAV-HØY [VALG] …\n" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" +"Skriv ut inndatalinjer med en vilkårlig omsortering til stanardutdata.\n" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -8556,41 +9271,50 @@ msgid "" " --random-source=FILE get random bytes from FILE\n" " -r, --repeat output lines can be repeated\n" msgstr "" +" -e, --echo behandle valgt(e) ARGument(er) som " +"inndatalinjer\n" +" -i, --input-range=LAV-HØY behandle hvert tall mellom LAV og HØY som en " +"inndatalinje\n" +" -n, --head-count=ANT ikke skriv ut flere enn angitt ANTall linjer\n" +" -o, --output=FIL skriv resultat til valgt FIL, i stedet for " +"standardutdata\n" +" --random-source=FIL hent vilkårlighetsdata fra FIL\n" +" -r, --repeat utdatalinjer kan gjentas\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" -msgstr "" +msgstr "for mange inndatalinjer" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" -msgstr "" +msgstr "du har brukt flere «-i»-valg" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" -msgstr "" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" +msgstr "%s er en ugyldig rekkevidde" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" -msgstr "" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" +msgstr "%s er et ugyldig linjeantall" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" -msgstr "" +msgstr "du har valgt flere utdatafiler samtidig" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" -msgstr "" +msgstr "du kan ikke velge både «-e» og «-i» samtidig" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" -msgstr "" +msgstr "ingen linjer til gjentakelse" #: src/sleep.c:44 #, c-format @@ -8605,56 +9329,80 @@ msgid "" "specified by the sum of their values.\n" "\n" msgstr "" +"Bruk: %s ANTALL[SUFFIKS] …\n" +" eller: %s VALG\n" +"Ta en pause i valgt ANTALL sekunder. SUFFIKS kan være «s» for sekunder " +"(standard),\n" +"«m» for minutter, «h» for timer eller «d» for dager. ANTALLet kan oppgis " +"enten som et\n" +"heltall, eller med desimaler. Hvis to eller flere argumenter er brukt, varer " +"pausen tilsvarende\n" +"summen av argumentenes verdi.\n" +"\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" -msgstr "" +msgstr "%s er et ugyldig tidsintervall" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" -msgstr "" +msgstr "klarte ikke å lese fra sanntidsklokke" #: src/sort.c:427 msgid "Write sorted concatenation of all FILE(s) to standard output.\n" -msgstr "" +msgstr "Skriv ut sorterte sammenslåinger av alle FILer til standardutdata.\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" msgstr "" +"Sorteringsvalg:\n" +"\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " "characters\n" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" +" -b, --ignore-leading-blanks ignorer ledende tomrom\n" +" -d, --dictionary-order bare sjekk tomrom-, alfabet- og talltegn\n" +" -f, --ignore-case behandle store og små bokstaver likt\n" -#: src/sort.c:443 +#: src/sort.c:444 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 sammenlikn i henhold til generell tallverdi\n" +" -i, --ignore-nonprinting bare vurder utskrivbare tegn\n" +" -M, --month-sort sammenlikn (ukjent) < «JAN» < … < «DEC»\n" -#: src/sort.c:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" +" -h, --human-numeric-sort sammenlikne menneskelig lesbare tall (f.eks. " +"2K 1G)\n" -#: src/sort.c:451 +#: src/sort.c:452 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 sammenlikne i henhold til strengens tallverdi\n" +" -R, --random-sort sorter etter vilkårlig nøkkeltabell\n" +" --random-source=FIL bruk FIL som vilkårlighetskilde\n" +" -r, --reverse vend om på rekkefølgen av resutater\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8663,20 +9411,33 @@ msgid "" " -V, --version-sort natural sort of (version) numbers within text\n" "\n" msgstr "" +" --sort=ORD sorter i henhold til ORD:\n" +" general-numeric -g, human-numeric -h, month -" +"M,\n" +" numeric -n, random -R, version -V\n" +" -V, --version-sort sorter naturlig etter (versjons-)numre i " +"teksten\n" +"\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" msgstr "" +"Andre valg:\n" +"\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" +" --batch-size=NMERGE ikke slå sammen flere enn NMERGE antall inndata " +"på én gang\n" +" (bruk midlertidige filer for å slå sammen " +"flere)\n" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -8684,8 +9445,14 @@ msgid "" " --compress-program=PROG compress temporaries with PROG;\n" " decompress them with PROG -d\n" msgstr "" +" -c, --check, --check=diagnose-first sjekk om inndata allerede er sortert " +"(ikke sorter)\n" +" -C, --check=quiet, --check=silent likner «-c», men rapporterer ikke " +"første feilaktige linje\n" +" --compress-program=PROG pakker ned midlertidige filer med PROG\n" +" (pakk dem ut med PROG -d)\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8693,22 +9460,38 @@ msgid "" " NUL-terminated names in file F;\n" " If F is - then read names from standard input\n" msgstr "" +" --debug marker den delen av linja som brukes i " +"sortering,\n" +" og varsle om tvilsom bruk til standardfeil\n" +" --files0-from=F les inndata fra NUL(tomrom-)-adskilte filnavn i " +"fil F\n" +" (hvis F er «-», leser programmet standard " +"inndata)\n" -#: src/sort.c:487 +#: src/sort.c:488 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=KNAPPDEF sorter via en knapp (KNAPPDEF angir plassering " +"og type)\n" +" -m, --merge slå sammen filer som allerede er sortert (ikke " +"sorter)\n" -#: src/sort.c:491 +#: src/sort.c:492 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=FIL skriv resultat til FIL, i stedet for " +"standardutdata\n" +" -s, --stable stabiliser programmet ved å deaktivere siste " +"løsning-metoden\n" +" -S, --buffer-size=STØRR bruk valgt STØRRelse på hovedmellomlager\n" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8722,8 +9505,19 @@ msgid "" " without -c, output only the first of an equal " "run\n" msgstr "" +" -t, --field-separator=SKIL bruk valgt SKILletegn, i stedet for overgang " +"fra ikke-tomrom til tomrom\n" +" -T, --temporary-directory=MAP bruk angitt MAPpe for midlertidige filer, i " +"stedet for $TMPDIR eller %s\n" +" (flere valg angir flere mapper her)\n" +" --parallel=N endre hvor mange (N) sorteringer som kan utføres " +"samtidig\n" +" -u, --unique ved bruk sammen med «-c»: se etter streng " +"sortering\n" +" ved bruk uten «-c»: bare skriv ut det første " +"tilfellet av en tilsvarende kjøring\n" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -8741,478 +9535,535 @@ msgid "" "\n" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" +"\n" +"KNAPPDEF er F[.C][VALG][,F[.C][VALG]] for start- og stoppunkt, der F er et\n" +"feltnummer og C en tegnposisjon innenfor feltet. Begge telles fra 1, og\n" +"stoppunktet er slutten av linja som standard. Hvis hverken «-t» eller «-b» " +"er i\n" +"bruk, telles tegnene i et felt fra tomrommet som ligger foran.\n" +"VALGene kan gjøres i form av énbokstavs-sorteringsvalg [bdfgiMhnRrV],\n" +"og overstyrer globale sorteringsvalg for aktuell nøkkel. Hele linja brukes\n" +"som nøkkel hvis ingen nøkkel oppgis.\n" +"\n" +"STØRRelsen kan etterfølges av følgende multiplikasjonssuffikser:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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 "" +"% 1% av minne, b 1, K 1024 (standard) og så videre (M, G, T, P, E, Z, Y).\n" +"\n" +"Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet standard " +"inndata.\n" +"\n" +"*** ADVARSEL ***\n" +"Miljøets regioninnstilling påvirker sorteringsrekkefølge.\n" +"Velg LC_ALL=C for tradisjonell sortering med\n" +"negative oktettverdier.\n" -#: src/sort.c:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" -msgstr "" +msgstr "venter på %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" -msgstr "" +msgstr "%s [-d] ble avsluttet på unormal måte" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" -msgstr "" +msgstr "klarte ikke å opprette midlertidig fil i %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" -msgstr "" +msgstr "åpning av fil mislyktes" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" -msgstr "" +msgstr "fflush mislyktes" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" -msgstr "" +msgstr "lukking av fil mislyktes" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" -msgstr "" +msgstr "klarte ikke å lage midlertidig fil" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" -msgstr "" +msgstr "klarte ikke å lage en prosess til %s -d" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" -msgstr "" +msgstr "advarsel: klarte ikke å fjerne %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" -msgstr "" +msgstr "«--%s»: argumentet %s er ugyldig" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" -msgstr "" +msgstr "valget «--%s» må minst brukes med argumentet %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" -msgstr "" +msgstr "«--%s»-argumentet %s er for stort" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" -msgstr "" +msgstr "høyeste mulige argument for «--%s» med gjeldende rlimit er %s" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" -msgstr "" +msgstr "parallelltall kan ikke være null" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" -msgstr "" +msgstr "henting av informasjon mislyktes" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" -msgstr "" +msgstr "feil ved lesing" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" -msgstr "" +msgstr "omforming av streng mislyktes" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" -msgstr "" +msgstr "den uendrede strengen var %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" -msgstr "" +msgstr "^ fant ikke nøkkelen\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" -msgstr "" +msgstr "nøkkelen %s er utgått. Vurder å bruke %s i stedet" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" -msgstr "" +msgstr "nøkkelen %lu har ingen bredde, og blir ignorert" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" -msgstr "" +msgstr "ledende tomrom er betydelig i nøkkelen %lu. Du bør vurdere å bruke «b»" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" -msgstr "" +msgstr "nøkkelen %lu er numerisk, og strekker seg over flere felt" -#: src/sort.c:2484 +#: src/sort.c:2483 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "valget «-%s» ignoreres" +msgstr[1] "valgene «-%s» ignoreres" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" -msgstr "" +msgstr "valget «-r» er bare gyldig for siste løsning-metoden" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" -msgstr "" +msgstr "feil ved skriving" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " -msgstr "" +msgstr "%s: %s:%s: uorden: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" -msgstr "" +msgstr "standardfeilkanal" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" -msgstr "" +msgstr "klarte ikke å lese" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" -msgstr "" +msgstr "%s: %s er en ugyldig feltspesifikasjon" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" -msgstr "" +msgstr "valgene «-%s» er ikke kompatible" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" -msgstr "" +msgstr "%s: ugyldig antall i starten av %s" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" -msgstr "" +msgstr "ugyldig tall etter «-»" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" -msgstr "" +msgstr "ugyldig tall etter «.»" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" -msgstr "" +msgstr "ugyldig tegn i feltspesifikasjon" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" -msgstr "" +msgstr "du har valgt flere komprimeringsprogrammer samtidig" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" -msgstr "" +msgstr "ugyldig tall i feltstart" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" -msgstr "" +msgstr "feltnummer er null" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" -msgstr "" +msgstr "tegnposisjon er null" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" -msgstr "" +msgstr "ugyldig tall etter «,»" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" -msgstr "" +msgstr "tom tabulator" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" -msgstr "" +msgstr "klarte ikke å lese filnavn fra %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" -msgstr "" +msgstr "%s:%lu: tomt filnavn er ugyldig" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" -msgstr "" +msgstr "ingen inndata fra %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" -msgstr "" +msgstr "bruker sorteringsregler fra %s" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" -msgstr "" +msgstr "bruker enkel byte-sammenlikning" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" -msgstr "" +msgstr "du kan ikke bruke %s som ekstra parameter ved bruk av «-%c»" -#: src/split.c:186 -#, c-format -msgid "the suffix length needs to be at least %zu" -msgstr "" +#: src/split.c:207 +#, fuzzy, c-format +msgid "the suffix length needs to be at least %" +msgstr "suffikset må ha en lengde på minst «%zu»" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" -msgstr "" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" +msgstr "Bruk: %s [VALG] … [INNDATA [PREFIKS]]\n" -#: src/split.c:207 +#: src/split.c:228 +#, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" +"Skriv ut stykker av INNDATA til PREFIKSaa, PREFIKSab, osv.\n" +"Standard stykkestørrelse er 1000 linjer, og standard PREFIKS er «x». \n" +"Hvis ingen INNDATA er valgt, eller hvis INNDATA er «-», leser programmet " +"standard inndata.\n" -#: src/split.c:215 -#, c-format +#: src/split.c:236 +#, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file names\n" " -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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" - -#: src/split.c:228 +" -a, --suffix-length=N lag suffikser med valgt (N) lengde (standard: %d)\n" +" --additional-suffix=SUFFIKS gi filnavn et ekstra SUFFIX.\n" +" -b, --bytes=STØRR lag utdata-filer på minst STØRR antall byte\n" +" -C, --line-bytes=STØRR lag utdata-filer på maks STØRR antall byte\n" +" -d, --numeric-suffixes[=FRA] bruk numeriske suffikser i stedet for " +"alfabetiske.\n" +" Endre det første tallet som skal brukes " +"med FRA (standard: 0).\n" +" -e, --elide-empty-files ikke lag tomme filer ved bruk av «-n»\n" +" --filter=KOMMANDO skriv til skall-KOMMANDO (filnavn er $FILE)\n" +" -l, --lines=TALL lag utdata-filer med minst anTALL valgte linjer\n" +" -n, --number=STYK lag utdatafiler med minst antall valgte STYKker (les " +"mer nedenfor)\n" +" -u, --unbuffered kopier inndata til utdata umiddelbart med «-n r/ " +"…»\n" + +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" +" --verbose skriv ut diagnostikk rett før hver\n" +" utdata-fil åpnes\n" -#: src/split.c:235 +#: src/split.c:258 +#, fuzzy 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" +"\n" +"STYK kan være følgende:\n" +"N splitt opp i N antall filer, basert på inndata-filstørrelse\n" +"K/N skriv ut K av N til standard utkanal\n" +"l/N splitt opp i N antall filer, uten å splitte linjer\n" +"l/K/N skriv ut K av N til standard utkanal, uten å splitte linjer\n" +"r/N likner «l», men bruker «round robin»-fordeling\n" +"r/K/N som ovenfor, men skriver kun ut K av N til standard utkanal\n" -#: src/split.c:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" -msgstr "" +msgstr "utdata-filsuffikset er for stort" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" -msgstr "" +msgstr "oppretter fila %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" -msgstr "" +msgstr "%s ville ha overskrevet inndata. Avbryter" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" -msgstr "" +msgstr "klarte ikke å gi miljøvariabelen «FILE» en verdi" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" -msgstr "" +msgstr "kjører med %s som «FILE»-verdi\n" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" -msgstr "" +msgstr "klarte ikke å lage datarør" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" -msgstr "" +msgstr "lukker forrige datarør" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" -msgstr "" +msgstr "lukker utdatarør" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" -msgstr "" +msgstr "flytter inndatarør" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" -msgstr "" +msgstr "lukker inndatarør" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" -msgstr "" +msgstr "klarte ikke å kjøre kommandoen «%s -c %s»" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" -msgstr "" +msgstr "klarte ikke å lukke inndatarør" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" -msgstr "" +msgstr "venter på underprosess" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" -msgstr "" +msgstr "med %s som «FILE»-verdi, signal %s fra kommando %s" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" -msgstr "" +msgstr "med %s som «FILE»-verdi, avslutningskode %d fra kommando %s" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" -msgstr "" +msgstr "ukjent status fra kommando (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" -msgstr "" +msgstr "du kan ikke dele opp på flere måter samtidig" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" -msgstr "" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" +msgstr "%s: ugyldig antall stykker" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" -msgstr "" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" +msgstr "%s: ugyldig stykkenummer" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" -msgstr "" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" +msgstr "%s: ugyldig suffikslengde" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" +msgid "empty record separator" msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "tabulator %s består av flere tegn" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "multipleksert tegn-spesialfil" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" -msgstr "" +msgstr "-%s%c … er et for stort valg av linjeantall" -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" -msgstr "" +msgstr "%s: ugyldig startverdi for suffiks i tallformat" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" -msgstr "" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" +msgstr "%s: ugyldig blokkstørrelse på inn-/utdata" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" +"«--filter» behandler ikke et stykke som er pakket ut til standard utkanal" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" -msgstr "" +msgstr "numerisk startverdi på suffikset er for stor for suffikslengden" -#: src/split.c:1419 +#: src/split.c:1528 #, c-format msgid "%s: cannot determine file size" -msgstr "" +msgstr "%s: fant ikke filstørrelsen" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:178 +#: src/stat.c:179 msgid "Michael Meskes" -msgstr "" +msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" -msgstr "" +msgstr "klarte ikke å generalisere %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" -msgstr "" +msgstr "advarsel: skiftetegnet «\\%c» er ukjent" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" -msgstr "" +msgstr "%s: ugyldig direktiv" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" -msgstr "" +msgstr "advarsel: det er en skråstrek i slutten av formatstrengen" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" -msgstr "" +msgstr "%s kan ikke brukes til å tolke inndata i filsystem-modus" -#: src/stat.c:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" -msgstr "" +msgstr "klarte ikke å lese informasjon om filsystemet for %s" -#: src/stat.c:1290 +#: src/stat.c:1293 #, c-format msgid "cannot stat standard input" -msgstr "" +msgstr "klarte ikke å få orden i standard inndata" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' with --file-system, and NOT from printf. -#: src/stat.c:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9220,59 +10071,72 @@ msgid "" "Blocks: Total: %-10b Free: %-10f Available: %a\n" "Inodes: Total: %-10c Free: %d\n" msgstr "" +" Fil: «%n»\n" +" ID: %-8i Navnlengde: %-7l Type: %T\n" +"Blokkstørrelse: %-10s Fundamental blokkstørrelse: %S\n" +"Blokker: Totalt: %-10b Ledig: %-10f Tilgjengelig: %a\n" +"Datanoder: Totalt: %-10c Ledig: %d\n" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" msgstr "" +" Fil: %N\n" +" Størrelse: %-10s[tab]Blokker: %-10b IO Blokk: %-6o %F\n" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 msgid "Device: %Dh/%dd\tInode: %-10i Links: %-5h Device type: %t,%T\n" -msgstr "" +msgstr "Enhet: %Dh/%dd\tDatanode: %-10i Lenker: %-5h Enhetstype: %t,%T\n" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1367 +#: src/stat.c:1370 msgid "Device: %Dh/%dd\tInode: %-10i Links: %h\n" -msgstr "" +msgstr "Enhet: %Dh/%dd\tDatanode: %-10i Lenker: %h\n" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1376 +#: src/stat.c:1379 msgid "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" -msgstr "" +msgstr "Tilgang: (%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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" -msgstr "" +msgstr "Kontekst: %C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" "Change: %z\n" " Birth: %w\n" msgstr "" +"Tilgang: %x\n" +"Omgjøring: %y\n" +"Endring: %z\n" +" Fødsel: %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" -msgstr "" +msgstr "Vis fil- eller filsystem-status.\n" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" +" -L, --dereference følg lenker\n" +" -f, --file-system vis filsystem-status, i stedet for filstatus\n" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9281,8 +10145,16 @@ msgid "" " if you want a newline, include \\n in FORMAT\n" " -t, --terse print the information in terse form\n" msgstr "" +" -c --format=FORMAT bruk valgt FORMAT, i stedet for standardformat,\n" +" og lag ny linje hver gang FORMATet er brukt\n" +" --printf=FORMAT likner «--format», men tar hensyn til skråstrek-" +"skiftetegn\n" +" og lager ikke ny linje i slutten av strengen.\n" +" Ta med «\\n» i FORMATstrengen hvis du vil ha " +"linjeskift likevel\n" +" -t, --terse skriv ut kortfattet informasjon\n" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9293,8 +10165,16 @@ msgid "" " %B the size in bytes of each block reported by %b\n" " %C SELinux security context string\n" msgstr "" +"\n" +"Følgende formatstrenger er gyldige (uten «--file-system»):\n" +"\n" +" %a tilgangsrettigheter i oktalformat\n" +" %A tilgangsretigheter i menneskevennlig format\n" +" %b antall tildelte blokker (se %B)\n" +" %B blokkstørrelse som rapporteres av %b, i byte\n" +" %C streng for SELinux-sikkerhetskontekst\n" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9303,8 +10183,14 @@ msgid "" " %g group ID of owner\n" " %G group name of owner\n" msgstr "" +" %d enhetsnummer i desimalform\n" +" %D enhetsnummer i heksadesimaltall\n" +" %f råmodus i heksadesimaltall\n" +" %F filtype\n" +" %g eierens gruppe-ID\n" +" %G eierens gruppenavn\n" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9316,8 +10202,17 @@ msgid "" " %t major device type in hex, for character/block device special files\n" " %T minor device type in hex, for character/block device special files\n" msgstr "" +" %h antall harde lenker\n" +" %i inode-nummer\n" +" %m monteringspunkt\n" +" %n filnavn\n" +" %N filnavn med hermetegn (målfil hvis aktuell fil er en symbolsk lenke)\n" +" %o hint om optimal inn-/utdata-overføringsstørrelse\n" +" %s fullstendig størrelse, i byte\n" +" %t største enhetstype, i heksadesimaltall\n" +" %T minste enhetstype, i heksadesimaltall\n" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9331,8 +10226,21 @@ msgid "" " %Z time of last status change, seconds since Epoch\n" "\n" msgstr "" +" %u eierens bruker-ID\n" +" %U eierens brukernavn\n" +" %w filas fødselstidspunkt, i menneskevennlig format («-» hvis ukjent)\n" +" %W filas fødselstidspunkt, i sekunder siden Unix-epokens begynnelse (0 " +"hvis ukjent)\n" +" %x nyligste brukstidspunkt, i menneskevennlig format\n" +" %X nyligste brukstidspunkt, i sekunder siden Unix-epokens begynnelse\n" +" %y nyligste endringstidspunkt, i menneskevennlig format\n" +" %Y nyligste endringstidspunkt, i sekunder siden Unix-epokens begynnelse\n" +" %z nyligste tidspunkt for statusendring, i menneskevennlig format\n" +" %Z nyligste tidspunkt for statusendring, i sekunder siden Unix-epokens " +"begynnelse\n" +"\n" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9342,8 +10250,15 @@ msgid "" " %d free file nodes in file system\n" " %f free blocks in file system\n" msgstr "" +"Følgende formatstrenger er gyldige for filsystemer:\n" +"\n" +" %a ledige blokker som kan brukes av vanlige brukere\n" +" %b totalt antall datablokker i filsystemet\n" +" %c totalt antall noder i filsystemet\n" +" %d ledige filnoder i filsystemet\n" +" %f ledige blokker i filsystemet\n" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9353,16 +10268,23 @@ msgid "" " %t file system type in hex\n" " %T file system type in human readable form\n" msgstr "" +" %i filsystem-ID i heksadesimaltall\n" +" %l maksimal lengde på filnavn\n" +" %n filnavn\n" +" %s blokkstørrelse (for raskere overføringer)\n" +" %S fundamental blokkstørrelse (for opptelling av blokker)\n" +" %t filsystemtype i heksadesimaltall\n" +" %T filsystemtype i menneskevennlig format\n" #: src/stdbuf.c:90 #, c-format msgid "Usage: %s OPTION... COMMAND\n" -msgstr "" +msgstr "Bruk: %s VALG … KOMMANDO\n" #: src/stdbuf.c:91 msgid "" "Run COMMAND, with modified buffering operations for its standard streams.\n" -msgstr "" +msgstr "Kjør KOMMANDO med endret mellomlagring av datastrømmer.\n" #: src/stdbuf.c:97 msgid "" @@ -9370,6 +10292,9 @@ msgid "" " -o, --output=MODE adjust standard output stream buffering\n" " -e, --error=MODE adjust standard error stream buffering\n" msgstr "" +" -i, --input=MODUS juster mellomlagring av inndata\n" +" -o, --output=MODUS juster mellomlagring av utdata\n" +" -e, --error=MODUS juster mellomlagring av feilkanal\n" #: src/stdbuf.c:104 msgid "" @@ -9377,12 +10302,17 @@ msgid "" "If MODE is 'L' the corresponding stream will be line buffered.\n" "This option is invalid with standard input.\n" msgstr "" +"\n" +"Datastrømmer mellomlagres per linje hvis MODUS er «L».\n" +"Dette valget er ugyldig for standard inndata.\n" #: src/stdbuf.c:107 msgid "" "\n" "If MODE is '0' the corresponding stream will be unbuffered.\n" msgstr "" +"\n" +"Datastrømmer kjører uten mellomlager hvis modus er «0».\n" #: src/stdbuf.c:110 msgid "" @@ -9393,135 +10323,265 @@ msgid "" "buffer\n" "size set to MODE bytes.\n" msgstr "" +"\n" +"Ellers er MODUS et tall som kan etterfølges av en multiplikator, slik:\n" +"KB for 1000, K for 1024, MB for 1000*1000, M for 1024*1024, osv. (G, T, P, " +"E, Z, Y).\n" +"I dette tilfellet blir aktuell datastrøm mellomlagret med en " +"bufferstørrelse\n" +"i henhold til MODUSens valgte antall byte.\n" #: src/stdbuf.c:116 +#, fuzzy 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" +"for example) then that will override corresponding changes 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 "" +"\n" +"MERK: Hvis aktuell KOMMANDO styrer mellomlagring av datastrømmer selv (som f." +"eks. «tee»),\n" +"overstyres valgene som gjøres av «stdbuf». Enkelte filtre (som «dd», «cat» o." +"l.) \n" +"bruker ikke datastrømmer for inn- og utdata, og påvirkes derfor ikke av " +"«stdbuf»-valg.\n" #: src/stdbuf.c:241 #, c-format msgid "failed to find %s" -msgstr "" +msgstr "fant ikke %s" #: src/stdbuf.c:265 src/stdbuf.c:299 #, c-format msgid "failed to update the environment with %s" -msgstr "" +msgstr "klarte ikke å oppdatere miljøet med %s" #: src/stdbuf.c:345 #, c-format msgid "line buffering stdin is meaningless" -msgstr "" +msgstr "linje-mellomlager i standard inndata gir ikke mening" #: src/stdbuf.c:376 #, c-format msgid "you must specify a buffering mode option" -msgstr "" +msgstr "du må velge mellomlagringsmodus" -#: src/stty.c:516 +#: src/stty.c:524 #, 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 "" +"Bruk: %s [-F ENHET | --file=ENHET] [VALG] …\n" +" eller: %s [-F ENHET | --file=ENHET] [-a|--all]\n" +" eller: %s [-F ENHET | --file=ENHET] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" -msgstr "" +msgstr "Skriv ut eller endre terminalegenskaper.\n" -#: src/stty.c:528 +#: src/stty.c:536 msgid "" " -a, --all print all current settings in human-readable form\n" " -g, --save print all current settings in a stty-readable form\n" " -F, --file=DEVICE open and use the specified DEVICE instead of stdin\n" msgstr "" +" -a, --all skriv ut gjeldende innstillinger i menneskevennlig " +"format\n" +" -g, --save skriv ut gjeldende innstillinger i stty-vennlig format\n" +" -F, --file=ENHET åpne og bruk valgt ENHET, i stedet for standard " +"innkanal\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" "settings. The underlying system defines which settings are available.\n" msgstr "" +"\n" +"Et valgfritt «-»-tegn før VALG gir negativ verdi. En «*» markerer valg som\n" +"ikke er POSIX. Vertssystemet bestemmer hvilke innstillinger som er " +"tilgjengelig.\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" +"\n" +"Spesialtegn:\n" +" * dsusp TEGN TEGN sender et stoppsignal til terminalen når inndata " +"tømmes\n" +" eof TEGN TEGN sender et slutt-på-fil-(eof-)signal (avslutter " +"inndata)\n" +" eol TEGN TEGN avslutter linja\n" + +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" -#: src/stty.c:547 +#: src/stty.c:570 +#, fuzzy 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 TEGN alternativt TEGN som avslutter linja\n" +" erase TEGN valgt TEGN sletter forrige skrevne tegn\n" +" intr TEGN TEGN sender et forstyrrelsessignal\n" +" kill TEGN TEGN sletter gjeldende linje\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" msgstr "" -#: src/stty.c:559 +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 TEGN TEGN stanser utdata\n" +" susp TEGN TEGN sender et terminal-stoppsignal\n" +" * swtch TEGN TEGN bytter til et annet skall-lag\n" +" * werase TEGN TEGN sletter det nyligste ordet som ble skrevet\n" + +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" msgstr "" -#: src/stty.c:565 +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 +#, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Spesialinnstillinger:\n" +" N velg baudfrekvens på inn- og utdata\n" +" * cols N fortell kjernen at terminalen har N antall kolonner\n" +" * columns N tilsvarer «cols N»\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" +"\n" +"Spesialinnstillinger:\n" +" N velg baudfrekvens på inn- og utdata\n" +" * cols N fortell kjernen at terminalen har N antall kolonner\n" +" * columns N tilsvarer «cols N»\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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 "" +" ispeed N velg N som inndata-hastighet\n" +" * line N bruk linjedisiplin N\n" +" min N ved bruk sammen med «-icanon» kreves minst N antall tegn " +"for fullstendig lesing\n" +" ospeed N velg N som utdata-hastighet\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N fortell kjernen at terminalen har N antall rader\n" +" * size skriv ut antall rader og kolonner som kjernen mener at " +"terminalen har\n" +" speed skriv ut terminalhastigheten\n" +" time N ved bruk sammen med «-icanon» velges N tideler av et sekund " +"som lesetidsavbrudd\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" +" * rows N fortell kjernen at terminalen har N antall rader\n" +" * size skriv ut antall rader og kolonner som kjernen mener at " +"terminalen har\n" +" speed skriv ut terminalhastigheten\n" +" time N ved bruk sammen med «-icanon» velges N tideler av et sekund " +"som lesetidsavbrudd\n" -#: src/stty.c:584 +#: src/stty.c:641 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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 +#, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -9529,10 +10589,21 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" +" [-]cstopb bruk to stoppebit per tegn (ett ved bruk av «-»)\n" +" [-]hup send et legg på-signal når siste prosess lukker tty-en\n" +" [-]hupcl tilsvarer «[-]hup»\n" +" [-]parenb lag paritetsbit i utdata, og forvent paritetsbit i inndata\n" +" [-]parodd velg oddetallsparitet (eller partallsparitet ved bruk av " +"«-»)\n" +" * [-]cmspar bruk «stick»-paritet (markør/mellomrom)\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -9540,135 +10611,299 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" +"\n" +"Inndata-innstillinger:\n" +" [-]brkint avbrudd gir et forstyrrelsessignal\n" +" [-]icrnl oversett linjeskift-tegn til linjeskift\n" +" [-]ignbrk ignorer avbruddstegn\n" +" [-]igncr ignorer linjeskift-tegn\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" +" [-]ignpar ignorer tegn som har paritetsfeil\n" +" * [-]imaxbel lag pipelyd og ikke rens et fullt mellomlager på et tegn\n" +" [-]inlcr oversett linjeskift til linjeskift-tegn\n" +" [-]inpck aktiver paritetssjekk av inndata\n" +" [-]istrip fjern høyste (åttende) bit av inndatategn\n" -#: src/stty.c:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" -msgstr "" +msgstr " * [-]iutf8 forvent at inndatategn er kodet i UTF-8-format\n" -#: src/stty.c:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr " * [-]iutf8 forvent at inndatategn er kodet i UTF-8-format\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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 "" +" * [-]iuclc oversett store bokstaver til små\n" +" * [-]ixany la alle tegn - ikke bare starttegnet - starte utdata på " +"nytt\n" +" [-]ixoff slå på sending av start- og stopptegn\n" +" [-]ixon slå på flytkontroll av XON/XOFF\n" +" [-]parmrk marker paritetsfeil (med en 255-0-tegnsekvens)\n" +" [-]tandem tilsvarer «[-]ixoff»\n" -#: src/stty.c:627 +#: src/stty.c:712 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:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]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:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" +"\n" +"Lokale innstillinger:\n" +" [-]crterase skriv ut slettetegn som rettetast-mellomrom-rettetast\n" +" * crtkill drep linjer ved å følge «echoprt»- og «echoe»-" +"innstillingene\n" +" * -crtkill drep linjer ved å følge «echoctl»- og «echok»-" +"innstillingene\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +#, fuzzy +msgid " [-]echo echo input characters\n" +msgstr " * [-]iutf8 forvent at inndatategn er kodet i UTF-8-format\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:672 +#: src/stty.c:843 +#, fuzzy 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" +msgstr "" +" [-]isig bruk spesialtegn for forstyrrelse, avslutning og " +"hvilemodus\n" +" [-]noflsh ikke rens etter forstyrrelses- og avslutningsspesialtegn\n" +" * [-]prterase tilsvarer «[-]echoprt»\n" +" * [-]tostop stans bakgrunnsjobber som prøver å skrive til terminalen\n" +" * [-]xcase ved bruk sammen med «icanon», bruk skiftetegnet «\\» for " +"store bokstaver\n" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" +"\n" +"Kombinasjonsinnstillinger:\n" +" * [-]LCASE tilsvarer «[-]lcase»\n" +" cbreak tilsvarer «-icanon»\n" +" -cbreak tilsvarer «icanon»\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 tilsvarer bruk av «brkint», «ignpar», «istrip», «icrnl», " +"«ixon», «opost», «isig»,\n" +" «icanon», «eof», og «eol» med standardverdier\n" +" -cooked tilsvarer «raw»\n" +" crt tilsvarer «echoe echoctl echoke»\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -#: src/stty.c:699 +#: src/stty.c:919 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:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr " -g likner «-l», men ikke vis eier\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -9676,26 +10911,43 @@ msgid "" " pass8 same as -parenb -istrip cs8\n" " -pass8 same as parenb istrip cs7\n" msgstr "" +" oddp tilsvarer «parenb parodd cs7»\n" +" -oddp tilsvarer «-parenb cs8»\n" +" [-]parity tilsvarer «[-]evenp»\n" +" pass8 tilsvarer «-parenb -istrip cs8»\n" +" -pass8 tilsvarer «parenb istrip cs7»\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" +" raw tilsvarer «-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 tilsvarer «cooked»\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, fuzzy, c-format msgid "" -" sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" +msgstr "" +" sane tilsvarer «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 "" +" -xcase -tostop -echoprt echoctl echoke», med\n" +" standardverdier på alle spesialtegn\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -9703,85 +10955,144 @@ msgid "" "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 "" +"\n" +"Håndter tty-linje som er koblet til standard inndata. Uten argumenter\n" +"skrives baudrate, linjedisiplin og avvik fra stty ut.\n" +"TEGN tolkes bokstavelig eller kodet, som i «^c», «0x37», «0177» eller\n" +"«127». Spesialverdiene «^-» eller «undef» brukes til å slå av spesialtegn.\n" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" -msgstr "" +msgstr "du kan bare velge én enhet" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "" +"du kan ikke velge både detaljert og stty-lesbar\n" +"utskriftsstil samtidig" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" -msgstr "" +msgstr "du kan ikke velge modus når du velger utskriftsstil" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" -msgstr "" +msgstr "%s: klarte ikke å starte ikke-blokkeringsmodus på nytt" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" -msgstr "" +msgstr "%s er et ugyldig argument" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" -msgstr "" +msgstr "valget %s mangler et argument" + +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: det oppstod en feil ved forkortelse" -#: src/stty.c:987 +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" -msgstr "" +msgstr "%s er en ugyldig linjedisiplin" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" -msgstr "" +msgstr "%s: klarte ikke å utføre alle valgte handlinger" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" -msgstr "" +msgstr "%s: denne enheten oppgir ingen størrelsesinformasjon" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" -msgstr "" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" +msgstr "%s er et ugyldig heltallsargument" #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 msgid "Kayvan Aghaiepour" -msgstr "" +msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Skriv ut CRC-sjekksum og antall byte per FIL.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" msgstr "" +"Skriv ut sjekksum og antall blokker for hver FIL.\n" +"\n" +" -r bruk BSD-summeringsalgoritme , og bruk 1K-blokker\n" +" -s, --sysv bruk System V-summeringsalgoritme og 512 byte-blokker\n" + +#: src/sync.c:64 +#, fuzzy, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Bruk: %s [VALG] … [FIL] …\n" + +#: src/sync.c:65 +msgid "" +"Synchronize cached writes to persistent storage\n" +"\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" +"\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "det oppstod en feil ved lesing av %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: klarte ikke å starte ikke-blokkeringsmodus på nytt" -#: src/sync.c:41 -msgid "" -"Force changed blocks to disk, update the super block.\n" -"\n" +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "det oppstod en feil ved lesing av %s" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" msgstr "" -#: src/sync.c:69 +#: src/sync.c:216 #, c-format -msgid "ignoring all arguments" +msgid "--data needs at least one argument" msgstr "" -#: src/system.h:343 +#: src/system.h:337 #, c-format msgid "" "\n" @@ -9789,30 +11100,51 @@ msgid "" "the version described here. Please refer to your shell's documentation\n" "for details about the options it supports.\n" msgstr "" +"\n" +"MERK: det er mulig at skallet ditt bruker en egen versjon av %s, som ofte\n" +"er nyere enn versjonen som beskrives her. Les dokumentasjonen for skallet\n" +"for mer informasjon om hvilke valg som støttes.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" -msgstr "" +msgstr " --help vis denne hjelpteksten og avslutt\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" +msgstr " --version vis programversjon og avslutt\n" + +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" msgstr "" +"\n" +"Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet standard " +"inndata.\n" -#: src/system.h:543 +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" +"\n" +"Argumenter som er obligatoriske for lange valg, er også obligatoriske for " +"korte valg.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " "10*1024).\n" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" +"\n" +"STØRRelse er et valgfritt argument i heltallsformat (eks.: 10M er " +"10*1024*1024).\n" +"Gyldige enheter er K, M, G, T, P, E, Z og Y (1024-byte-enheter) - evt. KB, " +"MB, osv. (1000-byte-enheter).\n" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -9820,34 +11152,47 @@ msgid "" "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 "" +"\n" +"Verdier vises i enheter etter angitt STØRRelsesformat fra «--block-size»,\n" +"og miljøvariablene %s_BLOCK_SIZE, BLOCK_SIZE og BLOCKSIZE.\n" +"Standardenhet er 1024 byte (eller 512 hvis POSIXLY_CORRECT er valgt).\n" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" "%s online help: <%s>\n" msgstr "" +"\n" +"Få hjelp til bruk av %s på nett: <%s>\n" #. TRANSLATORS: Replace LANG_CODE in this URL with your language code #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" +"Rapporter oversettelsesfeil i %s til \n" -#: src/system.h:584 +#: src/system.h:604 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "Full documentation at: <%s%s>\n" msgstr "" -#: src/system.h:591 +#: src/system.h:606 #, c-format -msgid "Try '%s --help' for more information.\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -#: src/system.h:633 +#: src/system.h:613 +#, c-format +msgid "Try '%s --help' for more information.\n" +msgstr "Prøv å skrive «%s --help» for mer informasjon.\n" + +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9856,17 +11201,24 @@ msgid "" "The following directory is part of the cycle:\n" " %s\n" msgstr "" +"ADVARSEL: Sirkulær/sløyfet mappestruktur.\n" +"Dette betyr høyst sannsynligvis at filsystemet er skadet.\n" +"MELD FRA TIL SYSTEMADMINISTRATOREN OM FEILEN.\n" +"Følgende mappe en del av sløyfa:\n" +" %s\n" #. This is a proper name. See the gettext manual, section Names. #: src/tac.c:58 msgid "Jay Lepreau" -msgstr "" +msgstr "Jay Lepreau" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, last line first.\n" msgstr "" +"Skriv hver FIL til standardutdata, og begynn med siste linje.\n" +"Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet standard " +"inndata.\n" #: src/tac.c:144 msgid "" @@ -9874,75 +11226,91 @@ msgid "" " -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 legg til skilletegnet foran, i stedet for bak\n" +" -r, --regex tolk skilletegnet som et regulært uttrykk\n" +" -s, --separator=STRENG bruk valgt STRENG - i stedet for linjeskift - som " +"skilletegn\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" -msgstr "" +msgstr "%s: søk mislyktes" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" -msgstr "" +msgstr "oppføringa er for stor" -#: src/tac.c:450 +#: src/tac.c:459 #, c-format msgid "failed to create temporary file in %s" -msgstr "" +msgstr "klarte ikke å lage midlertidig fil i %s" -#: src/tac.c:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" -msgstr "" +msgstr "klarte ikke å åpne %s for skriving" -#: src/tac.c:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" -msgstr "" +msgstr "klarte ikke å tilbakestille datastrøm for %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" -msgstr "" +msgstr "%s: feil ved skriving" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" -msgstr "" +msgstr "klarte ikke å åpne %s for lesing" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" -msgstr "" +msgstr "skilletegn kan ikke stå tomt" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" -msgstr "" +msgstr "Ian Lance Taylor" -#: src/tail.c:262 -#, c-format +#: src/tail.c:257 +#, 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" msgstr "" +"Skriv ut de siste %d linjene fra hver FIL til standardutdata.\n" +"Hvis flere FILer er valgt, vises hver av dem med filnavnet sitt som " +"overskrift.\n" +"Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet standard " +"inndata.\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" +" -c, --bytes=K skriv ut siste K antall byte. Du kan også bruke «-" +"c +K»\n" +" for å skrive ut byte fra og med den K-ende av " +"hver fil\n" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" " an absent option argument means 'descriptor'\n" " -F same as --follow=name --retry\n" msgstr "" +" -f, --follow[={name|descriptor}]\n" +" skriv ut mer data etter hvert som fila vokser.\n" +" (hvis du ikke argumenterer, brukes «descriptor»)\n" +" -F tilsvarer «--follow=name --retry»\n" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -9954,15 +11322,34 @@ msgid "" " (this is the usual case of rotated log files);\n" " with inotify, this option is rarely useful\n" msgstr "" - -#: src/tail.c:293 +" -n, --lines=K skriv ut de siste K antall linjene, i stedet for " +"de siste %d\n" +" (eller bruk «-n +K» for å skrive ut linjer fra og " +"med den K-ende)\n" +" --max-unchanged-stats=N\n" +" ved bruk sammen med «--follow=name», åpnes en FIL " +"som\n" +" ikke har endret størrelse etter N (standard: %d) " +"endringer på nytt,\n" +" for å se om den har blitt avlenket eller fått " +"nytt navn\n" +" (sistnevnte er typisk for rullerende loggfiler).\n" +" Dette valget er sjeldent nyttig når du bruker " +"«inotify».\n" + +#: src/tail.c:288 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 if it is inaccessible\n" msgstr "" +" --pid=PID ved bruk sammen med «-f» avsluttes tail etter at " +"valgt prosess-ID dør\n" +" -q, --quiet, --silent ikke skriv ut filnavn som overskrifter\n" +" --retry prøv å åpne en fil på nytt hvis den er eller blir " +"utilgjengelig\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -9970,8 +11357,15 @@ msgid "" " least once every N seconds\n" " -v, --verbose always output headers giving file names\n" msgstr "" +" -s, --sleep-interval=N ved bruk sammen med «-f» tar programmet pause i\n" +" cirka N antall sekunder (standard: 1.0) mellom " +"gjennomkjøringer.\n" +" Ved bruk sammen med «inotify» og «--pid=P», " +"sjekkes prosess P\n" +" minst én gang per N antall sekunder.\n" +" -v, --verbose skriv alltid ut overskrifter med filnavn\n" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -9981,8 +11375,15 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" "\n" msgstr "" +"\n" +"Hvis første tegn i K (antall byte eller linjer) er «+»,\n" +"skrives fila fra og med det K-ende punktet. Ellers skrives\n" +"de siste K delene av fila. K kan inneholde et gangesuffiks:\n" +"b betyr 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n" +"GB 1000*1000*1000, G 1024*1024*1024, osv. (T, P, E, Z, Y).\n" +"\n" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -9991,229 +11392,270 @@ 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 "" +"Ved bruk av «--follow» («-f») følger tail etter filbeskriveren, som\n" +"betyr at tail kan fortsette overvåking av filer selv om de evt. får nye " +"navn.\n" +"Denne standardoppførselen er uønskelig når du vil overvåke det\n" +"faktiske filnavnet fremfor filbeskriveren (aktuelt f.eks. for roterende " +"loggfiler). \n" +"Bruk i så fall «--follow=name», som gjør at tail ikke forholder seg bevisst\n" +"til annet enn filnavnet, uansett om du fjerner og oppretter aktuell\n" +"fil på nytt.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" -msgstr "" +msgstr "lukker %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" -msgstr "" +msgstr "%s: klarte ikke å søke fram til den slutt-relative forskyvninga %s" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" -msgstr "" +msgstr "fant ikke ut hvor %s ligger. Går tilbake til prøvemodus" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" +"filsystemtypen «0x%08lx» ble ikke gjenkjent for %s. Vi ber om at du " +"rapporterer dette til %s. Går tilbake til prøvemodus" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" +"%s er erstattet med en symbolsk lenke. Gir opp å følge med på dette navnet" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" -msgstr "" +msgstr "%s er nå utilgjengelig" -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" +"%s er erstattet med en fil som ikke kan følges. Gir opp å følge med på dette " +"navnet" -#: src/tail.c:1006 +#: src/tail.c:999 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" +"%s er erstattet med en ekstern fil. Gir opp å følge med på dette navnet" -#: src/tail.c:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" -msgstr "" +msgstr "%s er nå tilgjengelig" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" -msgstr "" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" +msgstr "%s har dukket opp. Følger slutten av den nye fila" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" -msgstr "" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" +msgstr "%s er nå erstattet. Følger slutten av den nye fila" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" -msgstr "" +msgstr "%s: klarte ikke å endre ikke-blokkeringsmodus" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" -msgstr "" +msgstr "%s: fila er forkortet" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" -msgstr "" +msgstr "ingen filer gjenstår" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" -msgstr "" +msgstr "klarte ikke å se på foreldermappa til %s" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" -msgstr "" +msgstr "tomt for inotify-ressurser" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" -msgstr "" +msgstr "klarte ikke å følge med på %s" + +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: vil du erstatte %s? " -#: src/tail.c:1529 +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" -msgstr "" +msgstr "klarte ikke å se på inotify-hendelse" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" -msgstr "" +msgstr "feil ved lesing av inotify-hendelse" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" +"%s: kan ikke følge slutten av denne typen filer. Gir opp å følge med på " +"dette filnavnet" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "" +"%s: ugyldig maksimum antall av uendrete resultat av kall til stat() mellom " +"kall til open()" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" -msgstr "" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" +msgstr "%s: ugyldig PID" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "%s er et ugyldig kolonneantall" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" -msgstr "" +msgstr "valget «%c» er brukt i en ugyldig kontekst" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" +"advarsel: valget «--retry» ignoreres. Det er i hovedsak nyttig når du følger " +"filnavn" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" -msgstr "" +msgstr "advarsel: «--retry» er bare nyttig ved første åpning av fil" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" +"advarsel: PID ignoreres. «--pid» er bare nyttig når du bruker «--follow»" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" -msgstr "" +msgstr "advarsel: «--pid» støttes ikke på dette systemet" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" -msgstr "" +msgstr "klarte ikke å følge %s ut i fra filnavnet" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" -msgstr "" +msgstr "advarsel: det er unyttig å følge standard inndata over tid" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" -msgstr "" +msgstr "klarte ikke å bruke inotify. Går tilbake til prøvemodus" -#: src/tee.c:63 +#: src/tee.c:87 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 "" +"Kopier standard inndata til hver FIL, og til standardutdata.\n" +"\n" +" -a, --append legg til data i valgt(e) FIL(er), ikke overskriv " +"noe\n" +" -i, --ignore-interrupts ignorer forstyrrelsessignal\n" + +#: src/tee.c:93 +msgid "" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" +msgstr "" -#: src/tee.c:71 +#: src/tee.c:98 msgid "" "\n" -"If a FILE is -, copy again to standard output.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" -msgstr "" +msgstr "argument mangler etter %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" -msgstr "" +msgstr "%s er et ugyldig heltall" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" -msgstr "" +msgstr " forventet «)»" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" -msgstr "" +msgstr "forventet «)», men fant %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" -msgstr "" +msgstr "%s: forventet monadisk operatør" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" -msgstr "" +msgstr "valget «-nt» kan ikke kombineres med «-l»" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" -msgstr "" +msgstr "valget «-ef» kan ikke kombineres med «-l»" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" -msgstr "" +msgstr "valget «-ot» aksepterer ikke bruk av «-l»" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" -msgstr "" +msgstr "ukjent binæroperatør" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" -msgstr "" +msgstr "%s: forventet binæroperatør" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -10221,21 +11663,32 @@ msgid "" " or: [ ]\n" " or: [ OPTION\n" msgstr "" +"Bruk: test UTTRYKK\n" +" eller: test\n" +" eller: [ UTTRYKK ]\n" +" eller: [ ]\n" +" eller: [ VALG\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" msgstr "" +"Avslutt med statusen som avgjøres av angitt UTTRYKK.\n" +"\n" -#: src/test.c:717 +#: src/test.c:719 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 "" +"\n" +"Hvis du ikke bruker et UTTRYKK, avslutter programmet med falsk verdi. \n" +"UTTRYKKet er enten sant eller usant, og avgjør status. \n" +"Det er i siste instans ett av følgende:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -10243,8 +11696,13 @@ msgid "" " EXPRESSION1 -a EXPRESSION2 both EXPRESSION1 and EXPRESSION2 are true\n" " EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n" msgstr "" +"\n" +" ( UTTRYKK ) UTTRYKK er sant\n" +" ! UTTRYKK UTTRYKK er usant\n" +" UTTRYKK1 -a UTTRYKK2 både UTTRYKK1 og UTTRYKK2 er sanne\n" +" UTTRYKK1 -o UTTRYKK2 enten UTTRYKK1 eller UTTRYKK2 er sant\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -10253,8 +11711,14 @@ msgid "" " STRING1 = STRING2 the strings are equal\n" " STRING1 != STRING2 the strings are not equal\n" msgstr "" +"\n" +" -n STRENG STRENGens lengde er ikke null\n" +" STRENG tilsvarer «-n STRENG»\n" +" -z STRENG STRENGens lengde er null\n" +" STRENG1 = STRENG2 strengene er identiske\n" +" STRENG1 != STRENG2 strengene er ikke identiske\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -10264,16 +11728,29 @@ msgid "" " INTEGER1 -lt INTEGER2 INTEGER1 is less than INTEGER2\n" " INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n" msgstr "" +"\n" +" HELTALL1 -eq HELTALL2 HELTALL1 er identisk med HELTALL2\n" +" HELTALL1 -ge HELTALL2 HELTALL1 er identisk med, eller større enn " +"HELTALL2\n" +" HELTALL1 -gt HELTALL2 HELTALL1 er høyere enn HELTALL2\n" +" HELTALL1 -le HELTALL2 HELTALL1 er lavere enn, eller identisk med " +"HELTALL2\n" +" HELTALL1 -lt HELTALL2 HELTALL1 er lavere enn HELTALL2\n" +" HELTALL1 -ne HELTALL2 HELTALL1 er ikke identisk med HELTALL2\n" -#: src/test.c:746 +#: src/test.c:748 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 "" +"\n" +" FIL1 -ef FIL2 FIL1 og FIL2 har samme enhets- og inode-nummer\n" +" FIL1 -nt FIL2 FIL1 er nyere (har senere endringstidspunkt) enn FIL2\n" +" FIL1 -ot FIL2 FIL1 er eldre enn FIL2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -10281,8 +11758,13 @@ msgid "" " -d FILE FILE exists and is a directory\n" " -e FILE FILE exists\n" msgstr "" +"\n" +" -b FIL FIL finnes, og er en blokk-spesialfil\n" +" -c FIL FIL finnes, og er tegn-spesialfil\n" +" -d FIL FIL finnes, og er en mappe\n" +" -e FIL FIL finnes\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -10290,8 +11772,13 @@ 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 FIL FIL finnes, og er en vanlig fil\n" +" -g FIL FIL finnes, og er tildelt gruppe-ID\n" +" -G FIL FIL finnes, og eies av effektiv gruppe-ID\n" +" -h FIL FIL finnes, og er en symbolsk lenke (tilsvarer «-L»)\n" +" -k FIL FIL finnes, og er låst («sticky bit» er markert)\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -10299,8 +11786,13 @@ 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 FIL FIL finnes, og er en symbolsk lenke (tilsvarer «-h»)\n" +" -O FIL FIL finnes, og eies av effektiv gruppe-ID\n" +" -p FIL FIL finnes, og er et navngitt rør\n" +" -r FIL FIL finnes, og leserettigheter er gitt\n" +" -s FIL FIL finnes, og har en størrelse som er over null\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -10308,8 +11800,13 @@ msgid "" " -w FILE FILE exists and write permission is granted\n" " -x FILE FILE exists and execute (or search) permission is granted\n" msgstr "" +" -S FIL FIL finnes, og er en sokkelfil\n" +" -t FD fildeskriptor FD er åpen i en terminal\n" +" -u FIL FIL finnes, og «set-user-ID»-biten er valgt\n" +" -w FIL FIL finnes, og skrivetillatelse er gitt\n" +" -x FIL FIL finnes, og kjøre-/søketillatelse er gitt\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -10317,64 +11814,78 @@ msgid "" "shells.\n" "INTEGER may also be -l STRING, which evaluates to the length of STRING.\n" msgstr "" +"\n" +"Alle FILrelaterte tester følger symbolske lenker, unntatt ved valg av «-h» " +"og «-L».\n" +"Merk at parentestegn må vernes med skiftetegn (f.eks. med «\\») i skall.\n" +"HELTALLet kan også være «-l STRENG», som sjekker lengden på STRENGen.\n" -#: src/test.c:786 +#: src/test.c:788 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 "" +"\n" +"MERK: «[» tar hensyn til valgene «--help» og «--version», i motsetning til " +"«test».\n" +"«test» behandler begge deler på samme måte som alle andre STRENGer som\n" +"ikke er tomme.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" -msgstr "" +msgstr "test og/eller [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" -msgstr "" +msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" -msgstr "" +msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" -msgstr "" +msgstr "du mangler et «]»" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" -msgstr "" +msgstr "ekstraargument %s" #: src/timeout.c:112 #, c-format msgid "warning: sigprocmask" -msgstr "" +msgstr "advarsel: sigprocmask" #: src/timeout.c:146 #, c-format msgid "warning: timer_settime" -msgstr "" +msgstr "advarsel: timer_settime" #: src/timeout.c:151 #, c-format msgid "warning: timer_create" -msgstr "" +msgstr "advarsel: timer_create" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" " or: %s [OPTION]\n" msgstr "" +"Bruk: %s [VALG] VARIGHET KOMMANDO [ARG] …\n" +" eller: %s [VALG]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" +"Start en KOMMANDO, og drep den hvis den fremdeles kjører etter valgt " +"VARIGHET.\n" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -10391,16 +11902,38 @@ 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" +" avslutt med samme status som KOMMANDO, selv om\n" +" kommandoen evt. overskrider VARIGHET\n" +" --foreground\n" +" Når timeout ikke kjøres direkte fra et kommandoskall, kan\n" +" KOMMANDO lese og skrive TTY-signaler.\n" +" I denne modusen går ikke underprosesser av KOMMANDO ut på " +"tid.\n" +" -k, --kill-after=VARIGHET\n" +" send et KILL-signal hvis KOMMANDOen fremdeles\n" +" kjører i valgt tid etter at det opprinnelige signalet ble " +"sendt.\n" +" -s, --signal=SIGNAL\n" +" velg hvilket signal som skal sendes når tiden har gått ut.\n" +" SIGNAL kan være et navn, som «HUP», eller et tall.\n" +" Bruk kommandoen «kill -l» for å vise en liste over mulige " +"signaler\n" -#: src/timeout.c:257 +#: src/timeout.c:259 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 "" +"\n" +"VARIGHET velges i form av et desimaltall, og kan brukes med eller uten " +"følgende suffikser:\n" +"«s» for sekunder (standard), «m» for minutter, «h» for timer eller «d» for " +"dager.\n" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -10410,46 +11943,63 @@ msgid "" "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 går ut på tid, og «--preserve-status» ikke er valgt, " +"avsluttes\n" +"aktuell kommando med status 124. Ellers avsluttes programmet ihht. " +"KOMMANDO.\n" +"Hvis intet signal er valgt, sendes TERM-signalet når tiden har gått ut. TERM-" +"signalet\n" +"dreper alle prosesser som ikke blokkerer ellerfanger signalet. Det kan bli " +"nødvendig\n" +"å bruke KILL (9)-signalet, som ikke kan fanges. I så fall blir avsluttende " +"status \n" +"128+9, i stedet for 124.\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" -msgstr "" +msgstr "advarsel: klarte ikke å deaktivere kjernedumping" #: src/timeout.c:474 #, c-format msgid "error waiting for command" -msgstr "" +msgstr "feil ved venting på kommando" #: src/timeout.c:485 #, c-format msgid "the monitored command dumped core" -msgstr "" +msgstr "kommandoen dumpet kjernen" + +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "ukjent status fra kommando (0x%X)" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" -msgstr "" +msgstr "Jim Kingdon" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:45 msgid "Randy Smith" -msgstr "" +msgstr "Randy Smith" #: src/touch.c:115 src/touch.c:309 #, c-format msgid "invalid date format %s" -msgstr "" +msgstr "%s er et ugyldig datoformat" #: src/touch.c:191 #, c-format msgid "cannot touch %s" -msgstr "" +msgstr "klarte ikke å kjøre touch på %s" #: src/touch.c:197 #, c-format msgid "setting times of %s" -msgstr "" +msgstr "velger tidspunkt for %s" #: src/touch.c:213 msgid "" @@ -10461,6 +12011,13 @@ msgid "" "A FILE argument string of - is handled specially and causes touch to\n" "change the times of the file associated with standard output.\n" msgstr "" +"Oppdater tilgangs- og endringstidspunkt for valgte FIL(er) til nåtid.\n" +"\n" +"Hvis en argumentert FIL ikke eksisterer, opprettes den med mindre «-c» \n" +"eller «-h» er valgt.\n" +"\n" +"En argumentstreng som lyder «-» behandles spesielt, og ber touch om\n" +"å endre tidsverdier på fil(er) i henhold til standardutdata.\n" #: src/touch.c:225 msgid "" @@ -10469,6 +12026,11 @@ msgid "" " -d, --date=STRING parse STRING and use it instead of current time\n" " -f (ignored)\n" msgstr "" +" -a bare endre tilgangstid\n" +" -c, --no-create ikke opprett fil(er)\n" +" -d, --date=STRENG tolk STRENG, og bruk den som tidspunkt i stedet for " +"nåtid\n" +" -f (ignoreres)\n" #: src/touch.c:231 msgid "" @@ -10478,6 +12040,11 @@ msgid "" " timestamps of a symlink)\n" " -m change only the modification time\n" msgstr "" +" -h, --no-dereference endre symbolske lenker i stedet for lenkemålene " +"deres\n" +" (dette er bare nyttig på systemer som støtter\n" +" endring av tider på symbolske lenker)\n" +" -m bare endre endringstid\n" #: src/touch.c:237 msgid "" @@ -10487,28 +12054,39 @@ msgid "" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" +" -r, --reference=FIL bruk tidspunktene for denne fila, i stedet for " +"nåtid\n" +" -t STAMP bruk [[CC]YY]MMDDhhmm[.ss] i stedet for nåtid\n" +" --time=ORD endre valgt tid:\n" +" ORD er «access», «atime», or «use» (tilsvarer «-" +"a»)\n" +" ORD er «modify» eller «mtime» (tilsvarer «-m»)\n" #: src/touch.c:246 msgid "" "\n" "Note that the -d and -t options accept different time-date formats.\n" msgstr "" +"\n" +"Merk at valgene «-d» og «-t» godtar ulike tids- og datoformat.\n" #: src/touch.c:335 #, c-format msgid "cannot specify times from more than one source" -msgstr "" +msgstr "du kan ikke hente tider fra flere enn én kilde" #: src/touch.c:409 #, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" msgstr "" +"advarsel: «touch %s» er utgått. Bruk heller «touch -t %04ld%02d%02d%02d%02d." +"%02d»" #: src/tr.c:286 #, c-format msgid "Usage: %s [OPTION]... SET1 [SET2]\n" -msgstr "" +msgstr "Bruk: %s [VALG] … SETT1 [SETT2]\n" #: src/tr.c:290 msgid "" @@ -10523,6 +12101,14 @@ msgid "" " of that character\n" " -t, --truncate-set1 first truncate SET1 to length of SET2\n" msgstr "" +"Oversett, klem sammen og/eller slett tegn fra standard inndata,\n" +"og skriv deretter resultatet til standardutdata.\n" +"\n" +" -c, -C, --complement bruk komplementæren for SETT1\n" +" -d, --delete slett tegn i SETt1, og ikke oversett\n" +" -s, --squeeze-repeats erstatt hver inndata-sekvens med et gjentatt tegn\n" +" basert på et som forekommer én gang i SETT1\n" +" -t, --truncate-set1 forkort SETT1 til lengden av SETT2 først\n" #: src/tr.c:303 msgid "" @@ -10539,6 +12125,18 @@ msgid "" " \\r return\n" " \\t horizontal tab\n" msgstr "" +"\n" +"SETT spesifiseres med strenger av tegn. De fleste tegnene står for seg\n" +"selv. Følgende sekvenser tolkes spesielt:\n" +"\n" +" \\NNN tegn med oktalverdi NNN (1 til 3 oktale siffer)\n" +" \\\\ backslash\n" +" \\a beep\n" +" \\b backspace\n" +" \\f sideskift (FF)\n" +" \\n linjeskift (LF)\n" +" \\r vognretur (CR)\n" +" \\t horisontal tabulator\n" #: src/tr.c:317 msgid "" @@ -10552,6 +12150,16 @@ msgid "" " [:cntrl:] all control characters\n" " [:digit:] all digits\n" msgstr "" +" \\v vertikal tabulator\n" +" TEGN1-TEGN2 alle tegn fra TEGN1 til TEGN2, stigende\n" +" [TEGN1-TEGN2] tilsvarer TEGN1-TEGN2, dersom begge sett bruker dette\n" +" [TEGN*] i SETT2, kopier av TEGN inntil samme lengde til SETT1\n" +" [TEGN*ANT] ANT kopier av TEGN, ANT er oktal, hvis det begynner med 0\n" +" [:alnum:] alle bokstaver og tall\n" +" [:alpha:] alle bokstaver\n" +" [:blank:] alle horisontale blanke tegn\n" +" [:cntrl:] alle kontrolltegn\n" +" [:digit:] alle siffer\n" #: src/tr.c:328 msgid "" @@ -10564,6 +12172,14 @@ msgid "" " [:xdigit:] all hexadecimal digits\n" " [=CHAR=] all characters which are equivalent to CHAR\n" msgstr "" +" [:graph:] alle skrivbare tegn, unntatt blanke tegn\n" +" [:lower:] alle små bokstaver\n" +" [:print:] alle skrivbare tegn, inkludert blanke tegn\n" +" [:punct:] alle tegnsettingstegn\n" +" [:space:] alle horisontale og vertikale blanke tegn\n" +" [:upper:] alle store bokstaver\n" +" [:xdigit:] alle hexadesimale siffer\n" +" [=TEGN=] alle tegn som tilsvarer TEGN\n" #: src/tr.c:338 msgid "" @@ -10577,6 +12193,17 @@ msgid "" "translating nor deleting; else squeezing uses SET2 and occurs after\n" "translation or deletion.\n" msgstr "" +"\n" +"Programmet oversetter hvis «-d» ikke er valgt, og SETT1 og SETT2 finnes.\n" +"Du kan bare bruke «-t» ved oversetting. SETT2 utvides til lengden av\n" +"SETT1 ved å gjenta dets siste tegn hvis nødvendig. Overskytende tegn\n" +"i SETT2 ignoreres. Det er bare [:lower:] og [:upper:] som garanteres å\n" +"utvide i stigende rekkefølge. Hvis de brukes i SETT2 under oversetting, kan\n" +"de også brukes parvis for å velge stor/liten bokstavkonvertering. «-s» " +"bruker SETT1 \n" +"hvis du hverken oversetter eller sletter. Ellers bruker sammenklemming " +"SETT2,\n" +"og utføres etter oversetting eller sletting.\n" #: src/tr.c:509 #, c-format @@ -10584,51 +12211,55 @@ msgid "" "warning: the ambiguous octal escape \\%c%c%c is being\n" "\tinterpreted as the 2-byte sequence \\0%c%c, %c" msgstr "" +"advarsel: det tvetydige okale skiftetegnet «\\%c%c%c» tolkes\n" +"[tab]som 2 byte-sekvensen «\\0%c%c, %c»" #: src/tr.c:518 #, c-format msgid "warning: an unescaped backslash at end of string is not portable" msgstr "" +"advarsel: en ubeskyttet skråstrek («\\») i slutten av strengen blir ikke " +"tatt med" #: src/tr.c:673 #, c-format msgid "range-endpoints of '%s-%s' are in reverse collating sequence order" -msgstr "" +msgstr "rekkevidden «%s-%s» er i omvendt sekvens" #: src/tr.c:829 #, c-format msgid "invalid repeat count %s in [c*n] construct" -msgstr "" +msgstr "du har brukt et ugyldig repetisjonsantall (%s) med [c*n]-konstruksjon" #: src/tr.c:910 #, c-format msgid "missing character class name '[::]'" -msgstr "" +msgstr "tegnklassenavn mangler for «[::]»" #: src/tr.c:913 #, c-format msgid "missing equivalence class character '[==]'" -msgstr "" +msgstr "likhetsklasse-tegn mangler for «[==]»" #: src/tr.c:928 #, c-format msgid "invalid character class %s" -msgstr "" +msgstr "%s er en ugyldig tegnklasse" #: src/tr.c:947 #, c-format msgid "%s: equivalence class operand must be a single character" -msgstr "" +msgstr "%s: ekvivalensklasseparametret må være enkeltstående tegn" #: src/tr.c:1229 #, c-format msgid "misaligned [:upper:] and/or [:lower:] construct" -msgstr "" +msgstr "feilplassert «[:upper:]»- og/eller «[:lower:]»-konstruksjon" #: src/tr.c:1335 #, c-format msgid "too many characters in set" -msgstr "" +msgstr "det er for mange tegn i settet" #: src/tr.c:1420 #, c-format @@ -10636,21 +12267,23 @@ msgid "" "when translating with string1 longer than string2,\n" "the latter string must not end with a character class" msgstr "" +"hvis streng1 er lengre enn streng2 ved oversettelse,\n" +"kan ikke streng2 slutte med en tegnklasse" #: src/tr.c:1480 #, c-format msgid "the [c*] repeat construct may not appear in string1" -msgstr "" +msgstr "gjentagelseskonstruktet [c*] kan ikke finnes i streng1" #: src/tr.c:1490 #, c-format msgid "only one [c*] repeat construct may appear in string2" -msgstr "" +msgstr "det kan bare finnes ett [c*] gjentagelseskonstrukt i streng2" #: src/tr.c:1498 #, c-format msgid "[=c=] expressions may not appear in string2 when translating" -msgstr "" +msgstr "[=c=]-uttrykk kan ikke finnes i streng2 under oversetting" #: src/tr.c:1505 #, c-format @@ -10658,11 +12291,13 @@ msgid "" "when translating, the only character classes that may appear in\n" "string2 are 'upper' and 'lower'" msgstr "" +"de eneste tillatte tegnklassene i streng2 ved oversettelse\n" +"er «upper» og «lower»" #: src/tr.c:1520 #, c-format msgid "when not truncating set1, string2 must be non-empty" -msgstr "" +msgstr "når sett1 ikke blir forkortet, kan ikke streng2 være tom" #: src/tr.c:1529 #, c-format @@ -10670,23 +12305,26 @@ msgid "" "when translating with complemented character classes,\n" "string2 must map all characters in the domain to one" msgstr "" +"når det oversettes med komplementerte tegnklasser\n" +"må streng2 peke alle tegn i domenet til én klasse" #: src/tr.c:1538 #, c-format msgid "the [c*] construct may appear in string2 only when translating" -msgstr "" +msgstr "[c*]-konstruktet kan bare finnes i streng2 ved oversetting+" #: src/tr.c:1788 msgid "Two strings must be given when both deleting and squeezing repeats." msgstr "" +"Du må oppgi to strenger når repetisjoner både skal slettes og klemmes sammen." #: src/tr.c:1790 msgid "Two strings must be given when translating." -msgstr "" +msgstr "Du må oppgi to strenger ved oversettelse." #: src/tr.c:1800 msgid "Only one string may be given when deleting without squeezing repeats." -msgstr "" +msgstr "Du kan bare oppgi én streng ved sletting uten gjentatt sammenklemming." #: src/true.c:38 #, c-format @@ -10694,21 +12332,23 @@ msgid "" "Usage: %s [ignored command line arguments]\n" " or: %s OPTION\n" msgstr "" +"Bruk: %s [ignorer kommandolinje-argumenter]\n" +" eller: %s VALG\n" #: src/true.c:45 msgid "Exit with a status code indicating success." -msgstr "" +msgstr "Avslutt med en statuskode som indikerer suksess." #: src/true.c:46 msgid "Exit with a status code indicating failure." -msgstr "" +msgstr "Avslutt med en statuskode som indikerer feil." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" -msgstr "" +msgstr "Bruk: %s VALG … FIL …\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -10718,108 +12358,136 @@ msgid "" "If a FILE is shorter, it is extended and the extended part (hole)\n" "reads as zero bytes.\n" msgstr "" +"Krymp eller utvid hver FIL til valgt størrelse\n" +"\n" +"Ikke-eksisterende FILer blir opprettet.\n" +"\n" +"Overskytende data går tapt hvis FIL(er) er større enn valgt størrelse.\n" +"Hvis en FIL er mindre enn valgt størrelse, utvides den med\n" +"tomme byte så langt det er nødvendig.\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" -msgstr "" +msgstr " -c, --no-create ikke opprett filer\n" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" +" -o, --io-blocks behandle STØRRelse som antall inn-/utdatablokker i " +"stedet for antall byte\n" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" +" -r, --reference=RFIL baser størrelse på RFIL\n" +" -s, --size=STØRR velg eller juster filSTØRRelsen\n" -#: src/truncate.c:121 +#: src/truncate.c:94 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 "" +"\n" +"STØRRelse kan velges med følgende prefiks-tegn:\n" +"«+» (utvid med), «-» (krymp), «<» (maksimalt), «>» (minst),\n" +"«/» (avrund ned til noe som er delelig med), eller «%» (avrund opp).\n" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" -msgstr "" +msgstr "det er for mange % * % byte-blokker i fila %s" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" -msgstr "" +msgstr "%s har ubrukelig og tilsynelatende negativ størrelse" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" -msgstr "" +msgstr "klarte ikke å finne størrelsen på %s" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" -msgstr "" +msgstr "for mye data å behandle ved avrundet økning av filstørrelsen på %s" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" -msgstr "" +msgstr "for mye data å behandle ved økning av størrelse på fila %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" -msgstr "" +msgstr "klarte ikke å forkorte %s ved % byte" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" -msgstr "" +msgstr "du har gjort flere relative endringsvalg samtidig" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "tallet %s er ugyldig" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" -msgstr "" +msgstr "du må velge enten %s eller %s" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" -msgstr "" +msgstr "du må velge en relativ %s med %s" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" -msgstr "" +msgstr "du har valgt %s uten å oppgi %s" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" -msgstr "" +msgstr "klarte ikke å åpne %s for skriving" #. This is a proper name. See the gettext manual, section Names. #: src/tsort.c:40 msgid "Mark Kettenis" -msgstr "" +msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" +"Bruk: %s [VALG] [FIL]\n" +"Skriv en fullstendig sortert liste som følger den delvise sorteringa\n" +"i valgt FIL. Hvis ingen FIL er valgt, eller hvis FIL er «-», leser " +"programmet standard inndata.\n" +"\n" + +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" -#: src/tsort.c:471 +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" -msgstr "" +msgstr "%s: inndata inneholder et stort antall symboler" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" -msgstr "" +msgstr "%s: inndata inneholder en løkke:" #: src/tty.c:65 msgid "" @@ -10827,10 +12495,13 @@ msgid "" "\n" " -s, --silent, --quiet print nothing, only return an exit status\n" msgstr "" +"Skriv ut filnavnet på terminalen som er tilkoblet standard inndata.\n" +"\n" +" -s, --silent, --quiet ikke skriv ut noe (bare gi en avslutningsstatus)\n" #: src/tty.c:120 msgid "not a tty" -msgstr "" +msgstr "ikke en tty" #: src/uname.c:124 msgid "" @@ -10842,6 +12513,13 @@ msgid "" " -n, --nodename print the network node hostname\n" " -r, --kernel-release print the kernel release\n" msgstr "" +"Skriv ut informasjon om systemet. Hvis du ikke gjør et VALG, brukes «-s».\n" +"\n" +" -a, --all skriv ut all informasjon i følgende rekkefølge\n" +" (men utelat «-p» og «-i» hvis de er ukjent):\n" +" -s, --kernel-name skriv ut kjernenavnet\n" +" -n, --nodename skriv ut vertsnavnet\n" +" -r, --kernel-release skriv ut utgivelsesnummeret på kjernen\n" #: src/uname.c:133 msgid "" @@ -10851,23 +12529,33 @@ msgid "" " -i, --hardware-platform print the hardware platform or \"unknown\"\n" " -o, --operating-system print the operating system\n" msgstr "" +" -v, --kernel-version skriv ut kjernens versjonsnavn\n" +" -m, --machine skriv ut maskinvarenavnet\n" +" -p, --processor skriv ut prosessortypen, eller «unknown»\n" +" -i, --hardware-platform skriv ut maskinvareplattformen, eller «unknown»\n" +" -o, --operating-system skriv ut operativsystemets navn\n" #: src/uname.c:143 msgid "" "Print machine architecture.\n" "\n" msgstr "" +"Skriv ut maskinarkitektur.\n" +"\n" #: src/uname.c:286 #, c-format msgid "cannot get system name" -msgstr "" +msgstr "klarte ikke å hente systemnavn" #: 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" +#, fuzzy +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" +"Konverter tomme tegn i hver FIL til tabulatorer, og skriv til " +"standardutdata.\n" +"Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet standard " +"inndata.\n" #: src/unexpand.c:124 msgid "" @@ -10876,21 +12564,28 @@ msgid "" " -t, --tabs=N have tabs N characters apart instead of 8 (enables -a)\n" " -t, --tabs=LIST use comma separated LIST of tab positions (enables -a)\n" msgstr "" +" -a, --all konverter alle tomrom\n" +" --first-only bare konverter ledende rekker av tomrom (overstyrer «-" +"a»)\n" +" -t, --tabs=N legg tabulatorer N tegn fra hverandre, i stedet for 8 " +"(medfører «-a»)\n" +" -t, --tabs=LISTE bruk kommaseparert LISTE over tabulatorpunkter (medfører " +"«-a»)\n" #: src/unexpand.c:152 #, c-format msgid "tabs are too far apart" -msgstr "" +msgstr "fanene er for langt unna hverandre" #: src/unexpand.c:504 #, c-format msgid "tab stop value is too large" -msgstr "" +msgstr "tabulatorstopp-verdi er for stor" #: src/uniq.c:170 #, c-format msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" -msgstr "" +msgstr "Bruk: %s [VALG] … [INNDATA [UTDATA]]\n" #: src/uniq.c:174 msgid "" @@ -10899,30 +12594,45 @@ msgid "" "\n" "With no options, matching lines are merged to the first occurrence.\n" msgstr "" +"Filtrer nærliggende samsvarende linjer ut av INNDATA (eller standard " +"inndata),\n" +"og skriv til UTDATA (eller standardutdata).\n" +"\n" +"Hvis du ikke bruker noen av valgene, slåes samsvarende linjer sammen til " +"første forekomst.\n" #: src/uniq.c:183 msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines, one for each group\n" msgstr "" +" -c, --count vis antall forekomster i begynnelsen av hver linje\n" +" -d, --repeated bare skriv ut duplikatlinjer (én per gruppe)\n" #: src/uniq.c:187 +#, fuzzy msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" +" -D, --all-repeated[=METODE] skriv ut alle duplikatlinjer.\n" +" Grupper kan holdes adskilt med tomme linjer.\n" +" METODE={none(standard),prepend,separate}\n" #: src/uniq.c:192 msgid " -f, --skip-fields=N avoid comparing the first N fields\n" -msgstr "" +msgstr " -f, --skip-fields=N ikke sammenlikn de første N antall feltene\n" #: src/uniq.c:195 +#, fuzzy msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" +" --group[=METODE] vis alt, og skill mellom grupper med tomme linjer\n" +" METODE={separate(standard),prepend,append,both}\n" #: src/uniq.c:199 msgid "" @@ -10930,10 +12640,14 @@ msgid "" " -s, --skip-chars=N avoid comparing the first N characters\n" " -u, --unique only print unique lines\n" msgstr "" +" -i, --ignore-case ignorer små og store bokstaver ved sammenlikning\n" +" -s, --skip-chars=N ikke sammenlikn de første N antall tegnene\n" +" -u, --unique bare skriv ut unike linjer\n" #: src/uniq.c:207 msgid " -w, --check-chars=N compare no more than N characters in lines\n" msgstr "" +" -w, --check-chars=N ikke sammenlikn flere enn N antall tegn per linje\n" #: src/uniq.c:212 msgid "" @@ -10941,6 +12655,10 @@ msgid "" "A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" "characters. Fields are skipped before chars.\n" msgstr "" +"\n" +"Et felt er en streng med tomrom (i form av mellomrom og/eller " +"tabulator(er)), etterfulgt av\n" +"tegn som ikke betyr tomrom. Programmet hopper over felt før tegn.\n" #: src/uniq.c:217 msgid "" @@ -10949,38 +12667,48 @@ msgid "" "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" +"Merk: «uniq» oppdager ikke duplikatlinjer med mindre de ligger etter " +"hverandre.\n" +"Det kan være lurt å sortere inndata, f.eks. med «sort -u», før den kjøres " +"gjennom uniq.\n" +"Ved sammenlikning følger programmet reglene som settes av «LC_COLLATE».\n" #: src/uniq.c:428 #, c-format msgid "too many repeated lines" -msgstr "" +msgstr "for mange duplikatlinjer" #: src/uniq.c:604 msgid "invalid number of fields to skip" -msgstr "" +msgstr "ugyldig antall felt å hoppe over" #: src/uniq.c:613 msgid "invalid number of bytes to skip" -msgstr "" +msgstr "ugyldig antall byte å hoppe over" #: src/uniq.c:623 msgid "invalid number of bytes to compare" -msgstr "" +msgstr "ugyldig antall byte å sammenlikne" #: src/uniq.c:645 #, c-format msgid "--group is mutually exclusive with -c/-d/-D/-u" msgstr "" +"du kan ikke velge «--group» samtidig som «-c», «-d», «-D» og/eller «-u»" #: src/uniq.c:652 #, c-format msgid "grouping and printing repeat counts is meaningless" msgstr "" +"det er meningsløst å både gruppere og skriv ut gjentakelsesantall samtidig" #: src/uniq.c:659 #, c-format msgid "printing all duplicated lines and repeat counts is meaningless" msgstr "" +"det er meningsløst å skrive ut både alle dupliserte linjer og " +"gjentakelsesantall samtidig" #: src/unlink.c:45 #, c-format @@ -10988,56 +12716,60 @@ msgid "" "Usage: %s FILE\n" " or: %s OPTION\n" msgstr "" +"Bruk: %s FIL\n" +" eller: %s VALG\n" #: src/unlink.c:48 msgid "" "Call the unlink function to remove the specified FILE.\n" "\n" msgstr "" +"Bruk unlink-funksjonen for å fjerne valgt FIL.\n" +"\n" #: src/uptime.c:125 #, c-format msgid "couldn't get boot time" -msgstr "" +msgstr "klarte ikke å hente oppstartstidspunkt" #. TRANSLATORS: This prints the current clock time. #: src/uptime.c:136 msgid " %H:%M%P " -msgstr "" +msgstr " %H:%M%P " #: src/uptime.c:138 #, c-format msgid " ??:???? " -msgstr "" +msgstr " ??:???? " #: src/uptime.c:140 #, c-format msgid "up ???? days ??:??, " -msgstr "" +msgstr "oppetid ???? dager og ??:??, " #: src/uptime.c:144 #, c-format msgid "up %ld day %2d:%02d, " msgid_plural "up %ld days %2d:%02d, " -msgstr[0] "" -msgstr[1] "" +msgstr[0] "oppetid %ld dag og %2d:%02d, " +msgstr[1] "oppetid %ld dager og %2d:%02d, " #: src/uptime.c:149 #, c-format msgid "up %2d:%02d, " -msgstr "" +msgstr "oppetid %2d:%02d, " #: src/uptime.c:151 #, c-format msgid "%lu user" msgid_plural "%lu users" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%lu bruker" +msgstr[1] "%lu brukere" #: src/uptime.c:161 #, c-format msgid ", load average: %.2f" -msgstr "" +msgstr ", snittbelastning: %.2f" #: src/uptime.c:199 #, c-format @@ -11046,6 +12778,9 @@ 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 "" +"Skriv ut klokkeslett, hvor lenge systemet har kjørt, antall brukere på " +"systemet\n" +"og gjennomsnittlig antall jobber i kjørekøen de siste 1, 5 og 15 minuttene." #: src/uptime.c:208 #, c-format @@ -11053,11 +12788,8 @@ msgid "" " Processes in\n" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" - -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "" +" Prosesser som er\n" +"i sovemodus og ikke kan forstyrres bidrar også til snittbelastning.\n" #: src/uptime.c:214 #, c-format @@ -11065,6 +12797,8 @@ msgid "" "If FILE is not specified, use %s. %s as FILE is common.\n" "\n" msgstr "" +"Hvis FIL ikke er valgt, brukes %s. Det er vanlig å bruke %s som FIL.\n" +"\n" #: src/users.c:106 #, c-format @@ -11073,64 +12807,89 @@ msgid "" "If FILE is not specified, use %s. %s as FILE is common.\n" "\n" msgstr "" +"Vis hvem som er logget inn nå i følge FIL.\n" +"Hvis FIL ikke er valgt, brukes %s. Det er vanlig å bruke %s som FIL.\n" +"\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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 "" +"Finn antall linjeskift, ord og byte i hver FIL, og regn ut totalsum\n" +"hvis flere enn én FIL er valgt. Hvis ingen FIL er valgt, eller hvis FIL er " +"«-», \n" +"leser programmet standard inndata. Med «ord» menes alle tegnsekvenser som " +"er\n" +"minst ett tegn lange, og som avsluttes med mellomrom.\n" +"Valgene nedenfor kan brukes til å velge hvilke antall som skrives ut, i\n" +"følgende rekkefølge: linjeskift, ord, tegn, byte og maksimal linjelengde.\n" +" -c, --bytes skriv ut antall byte\n" +" -m, --chars skriv ut antall tegn\n" +" -l, --lines skriv ut antall linjeskift\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" +" --files0-from=F les inndata fra filene som er spesifisert av\n" +" NUL-adskilte navn i fila F;\n" +" Hvis F er «-», leses navn fra standard inndata\n" +" -L, --max-line-length skriv ut lengden på den lengste linja\n" +" -w, --words skriv ut antall ord\n" #: src/who.c:210 msgid " old " -msgstr "" +msgstr " gammel " #: src/who.c:440 msgid "system boot" -msgstr "" +msgstr "systemoppstart" #: src/who.c:447 src/who.c:449 msgid "id=" -msgstr "" +msgstr "id=" #: src/who.c:462 src/who.c:467 msgid "term=" -msgstr "" +msgstr "term=" #: src/who.c:464 src/who.c:468 msgid "exit=" -msgstr "" +msgstr "exit=" #: src/who.c:485 msgid "LOGIN" -msgstr "" +msgstr "BRUKERNAVN" #: src/who.c:505 msgid "clock change" -msgstr "" +msgstr "klokkeendring" #: src/who.c:517 src/who.c:518 msgid "run-level" -msgstr "" +msgstr "kjørenivå" #: src/who.c:521 src/who.c:522 msgid "last=" -msgstr "" +msgstr "last=" #: src/who.c:553 #, c-format @@ -11138,43 +12897,45 @@ msgid "" "\n" "# users=%lu\n" msgstr "" +"\n" +"# brukere=%lu\n" #: src/who.c:559 msgid "NAME" -msgstr "" +msgstr "NAVN" #: src/who.c:559 msgid "LINE" -msgstr "" +msgstr "LINJE" #: src/who.c:559 msgid "TIME" -msgstr "" +msgstr "TID" #: src/who.c:559 msgid "IDLE" -msgstr "" +msgstr "LEDIG" #: src/who.c:560 msgid "PID" -msgstr "" +msgstr "PID" #: src/who.c:560 msgid "COMMENT" -msgstr "" +msgstr "KOMMENTAR" #: src/who.c:560 msgid "EXIT" -msgstr "" +msgstr "AVSLUTT" #: src/who.c:640 #, c-format msgid "Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n" -msgstr "" +msgstr "Bruk: %s [VALG] … [ FIL | ARG1 ARG2 ]\n" #: src/who.c:641 msgid "Print information about users who are currently logged in.\n" -msgstr "" +msgstr "Skriv ut informasjon om innloggede brukere.\n" #: src/who.c:644 msgid "" @@ -11184,10 +12945,15 @@ msgid "" " -d, --dead print dead processes\n" " -H, --heading print line of column headings\n" msgstr "" +"\n" +" -a, --all tilsvarer «-b -d --login -p -r -t -T -u»\n" +" -b, --boot vis når systemet startet opp sist\n" +" -d, --dead vis døde prosesser\n" +" -H, --heading skriv ut linje med kolonneoverskrifter\n" #: src/who.c:651 msgid " -l, --login print system login processes\n" -msgstr "" +msgstr " -l, --login skriv ut systemets innloggingsprosesser\n" #: src/who.c:654 msgid "" @@ -11195,6 +12961,10 @@ msgid "" " -m only hostname and user associated with stdin\n" " -p, --process print active processes spawned by init\n" msgstr "" +" --lookup prøv å forenkle vertsnavn via DNS\n" +" -m bare vertsnavn og brukernavn i forbindelse med standard " +"innkanal\n" +" -p, --process vis aktive prosesser som init har startet\n" #: src/who.c:659 msgid "" @@ -11203,6 +12973,10 @@ msgid "" " -s, --short print only name, line, and time (default)\n" " -t, --time print last system clock change\n" msgstr "" +" -q, --count vis navn på alle påloggede brukere\n" +" -r, --runlevel vis gjeldende kjørenivå\n" +" -s, --short bare vis navn, linje og tidspunkt (standard)\n" +" -t, --time vis forrige endring av systemklokka\n" #: src/who.c:665 msgid "" @@ -11211,6 +12985,11 @@ msgid "" " --message same as -T\n" " --writable same as -T\n" msgstr "" +" -T, -w, --mesg legg til brukerens meldingsstatus som «+», «-» eller " +"«?»\n" +" -u, --brukere vis en liste over innloggede brukere\n" +" --message tilsvarer «-T»\n" +" --writable tilsvarer «-T»\n" #: src/who.c:673 #, c-format @@ -11219,6 +12998,10 @@ msgid "" "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 valgt, brukes %s. Det er vanlig å bruke %s som FIL.\n" +"Hvis ARG1 ARG2 er valgt, gjelder «-m». Det er vanlig med argumenter som «er " +"jeg» eller «mamma liker».\n" #: src/whoami.c:45 msgid "" @@ -11226,11 +13009,14 @@ msgid "" "Same as id -un.\n" "\n" msgstr "" +"Skriv ut brukernavnet knyttet til gjeldende brukers ID.\n" +"Tilsvarer «id -un».\n" +"\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "fant ikke navn på bruker med ID %s" #: src/yes.c:41 #, c-format @@ -11238,12 +13024,250 @@ msgid "" "Usage: %s [STRING]...\n" " or: %s OPTION\n" msgstr "" +"Bruk: %s [STRENG] …\n" +" eller: %s VALG\n" #: src/yes.c:47 msgid "" "Repeatedly output a line with all specified STRING(s), or 'y'.\n" "\n" msgstr "" +"Skriv ut en linje gjentatte ganger, med enten alle valgte STRENG(er) eller " +"«y».\n" +"\n" + +#~ msgid "input line is too short, no numbers found to convert in field %ld" +#~ msgstr "" +#~ "inndatalinja er for kort, og ingen konverterbare tall ble funnet i feltet " +#~ "«%ld»" + +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "-t gjelder implisitt hvis BREDDE <= 10. Hvis ingen FIL er valgt, eller " +#~ "hvis FIL er «-», leser\n" +#~ "programmet standard inndata.\n" + +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Hvis ingen FIL er valgt, eller hvis FIL er «-», leser programmet standard " +#~ "inndata. «-F /» brukes som standard.\n" + +#~ msgid "failed to %s supplemental groups" +#~ msgstr "klarte ikke å kjøre %s på tilleggsgrupper" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: ugyldig tall" + +#~ 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 "" +#~ "\n" +#~ "En pågående «dd»-prosess skriver ut inn- og utstatistikk til " +#~ "standardfeilkanal\n" +#~ "og fortsetter kopiering når den mottar et %s-signal.\n" +#~ "\n" +#~ " $ dd if=/dev/zero of=/dev/null& pid=$!\n" +#~ " $ kill -%s $pid; sleep 1; kill $pid\n" +#~ " 18335302+0 records in\n" +#~ " 18335302+0 records out\n" +#~ " 9387674624 bytes (9.4 GB) copied, 34.6279 seconds, 271 MB/s\n" +#~ "\n" +#~ "Mulige valg:\n" +#~ "\n" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s er så stor at den ikke kan vises" + +#~ msgid "number of lines" +#~ msgstr "antall linjer" + +#~ msgid "number of bytes" +#~ msgstr "antall byte" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s er et ugyldig ignoreringsantall" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: ugyldig antall byte" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: ugyldig antall linjer" + +#~ 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 TEGN TEGN setter anførselstegn på neste skrevne tegn\n" +#~ " quit TEGN TEGN sender et avslutningssignal\n" +#~ " * rprnt TEGN TEGN opptegner gjeldende linje på nytt\n" +#~ " start TEGN TEGN starter utdata på nytt\n" + +#~ 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" +#~ "Kontrollinnstillinger:\n" +#~ " [-]clocal slå av kontrollsignaler for modem\n" +#~ " [-]cread tillat mottak av inndata\n" +#~ " * [-]crtscts slå på RTS-/CTS-håndhilsefunksjon\n" +#~ " * [-]cdtrdsr slå på DTR-/DSR-håndhilsefunksjon\n" +#~ " csN velg N antall bit som tegnstørrelse, med N som [5…8]\n" + +#~ 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 "" +#~ "\n" +#~ "Utdata-innstillinger:\n" +#~ " * bsN rettetast-forsinkelse - N i [0…1]\n" +#~ " * crN linjeskift-/vognretur-forsinkelse - N i [0…3]\n" +#~ " * ffN sideskift-forsinkelse - N i [0…1]\n" +#~ " * nlN linjeskift-forsinkelse - N i [0…1]\n" + +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl oversett linjeskift-tegn til linjeskift\n" +#~ " * [-]ofdel bruk slettetegn til utfylling, i stedet for tomrom-tegn\n" +#~ " * [-]ofill bruk utfyllingstegn i stedet for å beregne forsinkelser\n" +#~ " * [-]olcuc oversett små bokstaver til store bokstaver\n" +#~ " * [-]onlcr oversett linjeskift til linjeskift-tegn\n" +#~ " * [-]onlret linjeskift utfører et linjeskift-tegn\n" + +#~ 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 "" +#~ " * [-]onocr ikke skriv ut linjeskift-tegn i første kolonne\n" +#~ " [-]opost etterbehandle utskriften\n" +#~ " * tabN horisonal tabulator-forsinkelse - N i [0…3]\n" +#~ " * tabs tilsvarer «tab0»\n" +#~ " * -tabs tilsvarer «tab3»\n" +#~ " * vtN vertikal tabulator-forsinkelse - N i [0…1]\n" + +#~ 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 "" +#~ " * [-]ctlecho skriv ut kontrolltegn med hattnotasjon («^c»)\n" +#~ " [-]echo skriv ut inndatategn\n" +#~ " * [-]echoctl tilsvarer «[-]ctlecho»\n" +#~ " [-]echoe tilsvarer «[-]crterase»\n" +#~ " [-]echok skriv ut et linjeskift etter et drapstegn\n" + +#~ 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 "" +#~ " * [-]echoke tilsvarer «[-]crtkill»\n" +#~ " [-]echonl skriv ut linjeskift selv hvis ingen andre tegn skrives " +#~ "ut\n" +#~ " * [-]echoprt skriv ut slettede tegn baklengs, mellom «\\» og «/»\n" +#~ " [-]icanon bruk spesialtegnene «erase», «kill», «werase» og " +#~ "«rprnt»\n" +#~ " [-]iexten bruk spesialtegn som ikke er POSIX-tegn\n" + +#~ 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 "" +#~ " dec tilsvarer «echoe echoctl echoke -ixany intr\n" +#~ " ^c erase 0177 kill ^u»\n" +#~ " * [-]decctlq tilsvarer «[-]ixany»\n" +#~ " ek slett og drep tegn til standardverdier\n" +#~ " evenp tilsvarer «parenb -parodd cs7»\n" + +#~ 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 "" +#~ " -evenp tilsvarer «-parenb cs8»\n" +#~ " * [-]lcase tilsvarer «xcase iuclc olcuc»\n" +#~ " litout tilsvarer «-parenb -istrip -opost cs8»\n" +#~ " -litout tilsvarer «parenb istrip opost cs7»\n" +#~ " nl tilsvarer «-icrnl -onlcr»\n" +#~ " -nl tilsvarer «icrnl -inlcr -igncr onlcr -ocrnl -onlret»\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Tving endrede blokker til disken, og oppdater superblokken.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "alle argumenter blir ignorert" + +#~ msgid "For complete documentation, run: info coreutils '%s invocation'\n" +#~ msgstr "" +#~ "Kjør følgende kommando for fullstendig dokumentasjon: info coreutils '%s " +#~ "invocation'\n" + +#~ msgid "number in %s is too large" +#~ msgstr "tall i %s er for stort" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: ugyldig antall sekunder" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: finner ikke navn på bruker-ID %lu\n" #~ msgid "cannot create pipe" #~ msgstr "klarte ikke å opprette rør" diff --git a/po/nl.gmo b/po/nl.gmo index ff4b7bb3..c905b5f3 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index a4272376..6a7ad99f 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,5 +1,5 @@ # Dutch translations for GNU coreutils. -# Copyright (C) 2014 Free Software Foundation, Inc. +# Copyright (C) 2015 Free Software Foundation, Inc. # This file is distributed under the same license as the coreutils package. # # « Kontraŭ neesto ne helpas protesto. » @@ -10,12 +10,13 @@ # Freek de Kruijf , 2004, 2005, 2006, 2007, 2008, 2009, 2010. # Ivo Timmermans , 2000. # Erick Branderhorst , 1996. +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils 8.23-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" -"PO-Revision-Date: 2014-07-17 23:01+0200\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" +"PO-Revision-Date: 2015-04-23 11:28+0200\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -43,18 +44,18 @@ msgstr "Geldige argumenten zijn:" msgid "error closing file" msgstr "fout bij sluiten van bestand" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "fout bij schrijven" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "behouden van toegangsrechten van %s" @@ -235,57 +236,62 @@ msgstr "Parametertekst is niet juist gecodeerd" msgid "Unknown error" msgstr "Onbekende fout" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: optie '%s' is niet eenduidig; mogelijkheden zijn:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: optie '-W %s' is niet eenduidig\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: optie '--%s' staat geen argument toe\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: optie '%c%s' staat geen argument toe\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: optie '--%s' vereist een argument\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: onbekende optie '--%s'\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: onbekende optie '%c%s'\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ongeldige optie -- '%c'\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: optie vereist een argument -- '%c'\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: optie '-W %s' is niet eenduidig\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: optie '-W %s' staat geen argument toe\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: optie '-W %s' vereist een argument\n" @@ -295,13 +301,13 @@ msgstr "%s: optie '-W %s' vereist een argument\n" msgid "cannot change permissions of %s" msgstr "kan de toegangsrechten van %s niet veranderen" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "kan map %s niet aanmaken" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "onvoldoende geheugen beschikbaar" @@ -350,6 +356,12 @@ msgstr "’" msgid "%s: end of file" msgstr "%s: einde van bestand" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: fout bij lezen" + #: lib/regcomp.c:131 msgid "Success" msgstr "Gelukt" @@ -458,7 +470,7 @@ msgstr "^[jJyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "instellen van toegangsrechten van %s" @@ -901,7 +913,7 @@ msgstr "" "Codeert of decodeert het gegeven BESTAND (of standaardinvoer)\n" "volgens de base64-methode naar standaarduitvoer.\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -918,15 +930,7 @@ msgstr "" "regel\n" "\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -943,51 +947,51 @@ msgstr "" "over andere niet-alfabetische tekens in de gecodeerde reeks bytes te " "stappen.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "fout bij lezen" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "ongeldige invoer" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "ongeldige waarde van optie '-w'/'--wrap': %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "overtollig argument: %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "sluiten van standaardinvoer" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1040,31 +1044,31 @@ msgstr "" " %s -a een/rks1 een/rks2 -> \"rks1\" gevolgd door \"rks2\"\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "ontbrekend argument" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "" @@ -1072,8 +1076,15 @@ msgstr "" "\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"Stuurt gegeven BESTAND(en samengevoegd en) gesorteerd naar " +"standaarduitvoer.\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1093,7 +1104,7 @@ msgstr "" " -n, --number alle uitvoerregels nummeren\n" " -s, --squeeze-blank opeenvolgende blanco regels comprimeren tot één\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1106,7 +1117,7 @@ msgstr "" " -v, --show-nonprinting notatie met ^ en M- gebruiken, behalve voor LF/" "TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1120,17 +1131,18 @@ msgstr "" "g.\n" " %s Kopieert standaardinvoer naar standaarduitvoer.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "kan geen ioctl() doen op %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "standaarduitvoer" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: invoerbestand is gelijk aan uitvoerbestand" @@ -1142,10 +1154,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1159,8 +1171,8 @@ msgstr "kan beveiligingscontext %s niet aanmaken" msgid "failed to set %s security context component to %s" msgstr "kan component %s van beveiligingscontext niet instellen op %s" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "kan de beveiligingscontext van %s niet verkrijgen" @@ -1175,13 +1187,13 @@ msgstr "kan gedeeltelijke context niet toepassen op ongelabeld bestand %s" 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:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "kan geen toegang krijgen tot %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "kan map %s niet lezen" @@ -1197,7 +1209,7 @@ msgstr "veranderen van beveiligingscontext van %s\n" msgid "fts_read failed" msgstr "fts_read() is mislukt" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1317,7 +1329,7 @@ msgid "-R -h requires -P" msgstr "de combinatie '-R -h' vereist '-P'" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1334,9 +1346,8 @@ msgid "conflicting security context specifiers given" msgstr "conflicterende specificaties voor beveiligingscontext gegeven" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "kan de eigenschappen van %s niet verkrijgen" @@ -1651,17 +1662,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "ongeldige groep: %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "ongeldige groepslijst: %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1670,7 +1681,7 @@ msgstr "" "Gebruik: %s [OPTIE] DOELMAP [COMMANDO [ARGUMENT...]]\n" " of: %s OPTIE\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1678,15 +1689,26 @@ msgstr "" "Voert het gegeven COMMANDO (plus ARGUMENTEN) uit, met DOELMAP als basismap.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" +" --userspec=GEBRUIKER:GROEP te gebruiken gebruiker en groep (ID of naam)\n" +" --groups=GROEPENLIJST extra groepen (kommagescheiden lijst)\n" + +#: src/chroot.c:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" " --userspec=GEBRUIKER:GROEP te gebruiken gebruiker en groep (ID of naam)\n" " --groups=GROEPENLIJST extra groepen (kommagescheiden lijst)\n" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" @@ -1695,43 +1717,47 @@ msgstr "" "Als geen commando gegeven is, dan '${SHELL} -i' uitvoeren (standaard: /bin/" "sh).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "kan '%s' niet als basismap instellen" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "kan hoofdmap niet als huidige map instellen" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "geen groep opgegeven voor onbekend UID: %d" -#: src/chroot.c:383 +#: src/chroot.c:400 #, c-format msgid "failed to get supplemental groups" msgstr "kan aanvullende groepen niet achterhalen" -# FIXME: don't use fill-in words -#: src/chroot.c:395 -#, c-format -msgid "failed to %s supplemental groups" -msgstr "kan aanvullende groepen niet «%s»" +#: src/chroot.c:412 +#, fuzzy, c-format +msgid "failed to set supplemental groups" +msgstr "kan aanvullende groepen niet achterhalen" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "instellen van groeps-ID is mislukt" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "instellen van gebruikers-ID is mislukt" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "kan commando %s niet uitvoeren" @@ -1776,7 +1802,16 @@ msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "" "Vergelijkt de gesorteerde bestanden BESTAND1 en BESTAND2 regel voor regel.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1789,7 +1824,7 @@ msgstr "" "die uniek zijn voor BESTAND1, de tweede kolom de regels die uniek zijn voor\n" "BESTAND2, en de derde kolom de regels die in beide bestanden voorkomen.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1801,7 +1836,7 @@ msgstr "" " -2 regels die alleen in BESTAND2 voorkomen weglaten\n" " -3 regels die in beide bestanden voorkomen weglaten\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1814,12 +1849,12 @@ msgstr "" " van alle invoerregels paren gemaakt kunnen worden\n" " --nocheck-order niet controleren of de invoer juist gesorteerd is\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" " --output-delimiter=REEKS deze tekenreeks als kolomscheiding gebruiken\n" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" @@ -1828,7 +1863,7 @@ msgstr "" "Opmerking: het vergelijken volgt de regels gespecificeerd door " "'LC_COLLATE'.\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1843,314 +1878,328 @@ msgstr "" " %s -3 bestand1 bestand2 Regels die alleen in één van de bestanden " "staan.\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "bestand %d is niet gesorteerd" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "meer dan één scheiding gegeven" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "een lege %s is niet toegestaan" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "kan geen 'lseek' doen op %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "fout bij lezen van %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "kan geen 'lseek' doen op %s" +msgid "error reading %s" +msgstr "fout bij lezen van %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "fout bij schrijven van %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "fout bij lezen van %s" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s: kan 'extents'-informatie niet verkrijgen" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: schrijven is mislukt" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "kan %s niet uitbreiden" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "wissen van toegangsrechten van %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "behouden van eigenaar van %s is mislukt" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "kan bestand %s niet vinden" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "behouden van het auteurschap van %s is mislukt" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "kan de standaard aanmaakcontext niet instellen op %s" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "kan de standaard aanmaakcontext niet instellen op %s" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "kan de beveiligingscontext van %s niet instellen" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "kan %s niet openen om te lezen" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "kan status van %s niet opvragen" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "" "bestand %s wordt overgeslagen, omdat het werd vervangen tijdens het kopiëren" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "kan %s niet verwijderen" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "%s is verwijderd\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "zal niet schrijven via loze symbolische koppeling %s" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "kan het normale bestand %s niet aanmaken" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "kan %2$s niet klonen naar %1$s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "behouden van tijdsstempels van %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "sluiten van %s is mislukt" -#: src/copy.c:1580 +#: src/copy.c:1669 #, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: %s toch vervangen, modus %04lo (%s) negeren? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "%s: %s is onschrijfbaar (modus %04lo, %s); toch proberen? " -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: %s overschrijven? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (reservekopie: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "kan de standaard aanmaakcontext niet herstellen" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "kan geen harde koppeling %s maken naar %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "kan status van %s niet opvragen" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "map %s wordt overgeslagen" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "waarschuwing: bronbestand %s is meerdere keren opgegeven" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s en %s zijn hetzelfde bestand" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "kan niet-map %s niet overschrijven met map %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "zal zojuist aangemaakte %s niet overschrijven met %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "kan map %s niet overschrijven met een niet-map" -#: src/copy.c:1989 +#: src/copy.c:2069 #, 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:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "kan geen reservekopie maken van %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, 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:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "waarschuwing: bronbestand %s is meerdere keren opgegeven" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "kan %s niet verplaatsen naar %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "verplaatsing tussen apparaten is mislukt: %s naar %s; kan het doel niet " "verwijderen" -#: src/copy.c:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "kan cyclische symbolische koppeling %s niet kopiëren" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "kan symbolische koppeling %s naar %s niet aanmaken" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "kan fifo %s niet aanmaken" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "kan speciaal bestand %s niet aanmaken" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "kan symbolische koppeling %s niet lezen" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "kan symbolische koppeling %s niet aanmaken" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s heeft onbekend bestandstype" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "kan %s niet uit reservekopie herstellen" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (uit reservekopie hersteld)\n" @@ -2161,12 +2210,12 @@ msgid "Alex Deymo" msgstr "Alex Deymo" # FIXME: singular PARAM, dots within -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "Gebruik: %s --coreutils-prog=PROGRAMMA [ARGUMENTEN]\n" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" @@ -2174,7 +2223,7 @@ msgstr "" "Voert het gegeven ingebouwde PROGRAMMA uit met de gegeven ARGUMENTEN.\n" "\n" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" @@ -2183,7 +2232,7 @@ msgstr "" "\n" "Typ '%s --coreutils-prog=PROGRAMMANAAM --help' voor hulp bij een programma.\n" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, c-format msgid "unknown program %s" msgstr "onbekend programma %s" @@ -2466,8 +2515,8 @@ msgstr "%s bestaat maar is geen map" msgid "failed to access %s" msgstr "kan geen toegang krijgen tot %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "geen bestand opgegeven" @@ -2545,133 +2594,133 @@ msgstr "" "'cp' is gecompileerd zonder ondersteuning voor 'xattr'" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "invoer is verdwenen" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: regelnummer valt buiten bereik" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: regelnummer valt buiten bereik" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " tijdens herhaling %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: geen overeenkomst gevonden" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "fout in zoeken met reguliere expressie" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "fout bij schrijven naar %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: geheel getal verwacht na scheidingsteken" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: '}' is vereist bij een herhalingsaantal" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: geheel getal is vereist tussen '{' en '}'" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: afsluitend scheidingsteken '%c' ontbreekt" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: ongeldige reguliere expressie: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: ongeldig patroon" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: regelnummer moet groter zijn dan nul" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "specificatie voor conversie ontbreekt in achtervoegsel" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "ongeldige conversiespecificatie in achtervoegsel: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "ongeldige conversiespecificatie in achtervoegsel: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "ongeldige vlaggen in conversiespecificatie: %%%c%c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "te veel specificaties voor %%-conversie in achtervoegsel" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "ontbrekende specificatie voor %%-conversie in achtervoegsel" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: ongeldig getal" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "ongeldig getal: %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "" "Gebruik: %s [OPTIE...] BESTAND PATROON...\n" "\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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" @@ -2681,7 +2730,18 @@ msgstr "" "patronen, schrijft de delen naar de bestanden 'xx00', 'xx01', 'xx02', enz.,\n" "en toont het aantal bytes van elk deel op standaarduitvoer.\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Als BESTAND - is, wordt van standaardinvoer gelezen.\n" +"\n" +"Elk PATROON mag zijn:\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2693,13 +2753,13 @@ msgstr "" " -f, --prefix=VOORVOEGSEL te gebruiken voorvoegsel in plaats van 'xx'\n" " -k, --keep-files uitvoerbestanden niet verwijderen bij fouten\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" " -m, --suppress-matched regels die overeenkomen met PATROON " "onderdrukken\n" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2709,19 +2769,11 @@ msgstr "" " -s, --quiet, --silent de lengte van de uitvoerbestanden niet tonen\n" " -z, --elide-empty-files lege uitvoerbestanden verwijderen\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Als BESTAND - is, wordt van standaardinvoer gelezen.\n" -"\n" -"Elk PATROON mag zijn:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 +#, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2758,7 +2810,7 @@ msgstr "" "Stuurt de geselecteerde delen van regels uit elk BESTAND naar " "standaarduitvoer.\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2769,7 +2821,7 @@ msgstr "" " -d, --delimiter=TEKEN dit veldscheidingsteken gebruiken in plaats van " "TAB\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2782,7 +2834,7 @@ msgstr "" "gegeven\n" " -n (genegeerde optie)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2790,7 +2842,7 @@ msgstr "" " --complement het complement maken van de set van geselecteerde\n" " bytes, tekens of velden\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2800,7 +2852,7 @@ msgstr "" " --output-delimiter=TEKST deze tekst als uitvoerscheiding gebruiken;\n" " standaard het invoerscheidingsteken\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2814,7 +2866,8 @@ msgstr "" "in dezelfde volgorde als ze gelezen werd en slechts precies één keer.\n" "\n" -#: src/cut.c:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2822,8 +2875,6 @@ msgid "" " 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 "" "Een bereik kan zijn:\n" "\n" @@ -2834,51 +2885,52 @@ msgstr "" "\n" "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "ongeldige lijst van bytes of velden" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "velden en posities worden genummerd vanaf 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "ongeldig bereik zonder eindpunt: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "ongeldig aflopend bereik" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "byte-positie %s is te groot" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "veldnummer %s is te groot" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "er mag slechts één soort lijst worden opgegeven" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "het scheidingsteken moet een enkel teken zijn" -#: src/cut.c:787 +#: src/cut.c:786 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:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2886,11 +2938,11 @@ msgstr "" "het onderdrukken van onbegrensde regels heeft\n" " alleen zin als met velden gewerkt wordt" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "ontbrekende lijst van velden" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "ontbrekende lijst van posities" @@ -2911,13 +2963,27 @@ msgstr "" "of stelt de systeemdatum en/of -tijd in (Maand, Dag, uren, minuten).\n" #: src/date.c:134 +#, fuzzy +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +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" + +#: src/date.c:138 +#, fuzzy msgid "" -" -d, --date=STRING display time described by STRING, not 'now'\n" -" -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -" -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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" " -d, --date=DATUMTIJD deze DATUMTIJD tonen i.p.v. de huidige tijd\n" " -f, --file=DATUMTIJDBESTAND als '--date' voor elke regel in " @@ -2931,11 +2997,11 @@ msgstr "" " 'ns' voor datum+tijd in de aangegeven " "precisie\n" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=BESTAND de laatste wijzigingstijd van dit bestand " "tonen\n" @@ -2943,15 +3009,14 @@ msgstr "" " bijvoorbeeld: Mon, 07 Aug 2006 12:34:56 " "-0600\n" -#: src/date.c:147 +#: src/date.c:149 +#, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=SOORT datum en tijd in RFC 3339-opmaak tonen;\n" " 'date' toont alleen de datum, 'seconds' " @@ -2963,8 +3028,19 @@ msgstr "" " -s, --set=DATUMTIJD deze tijd en/of datum instellen\n" " -u, --utc, --universal de standaard wereldtijd (UTC) gebruiken\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2977,7 +3053,7 @@ msgstr "" " %% het procentteken\n" " %a de afkorting van de dag volgens de taalregio (bijv. zo)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2990,7 +3066,7 @@ msgstr "" " %c de datum/tijd volgens de taalregio (bijv. za 01 okt 2005 16:57:09 " "CEST)\n" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -3002,7 +3078,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:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -3013,7 +3089,7 @@ msgstr "" " %G het jaar van het ISO-weeknummer (zie %V); normaal alleen nuttig met " "%V\n" -#: src/date.c:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -3025,7 +3101,7 @@ msgstr "" " %I het uur (01...12)\n" " %j de dag in het jaar (001...366)\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -3037,7 +3113,7 @@ msgstr "" " %m de maand (01...12)\n" " %M de minuut (00...59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -3056,7 +3132,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:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3068,7 +3144,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:209 +#: src/date.c:215 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" @@ -3082,7 +3158,7 @@ msgstr "" " %W weeknummer in het jaar, met maandag als eerste dag van de week " "(00...53)\n" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3094,7 +3170,7 @@ msgstr "" " %y de laatste twee cijfers van het jaar (00...99)\n" " %Y het jaar\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3113,7 +3189,7 @@ msgstr "" "\n" "Standaard gebruikt 'date' voorloopnullen bij numerieke velden.\n" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3131,7 +3207,7 @@ msgstr "" " ^ hoofdletters gebruiken, indien mogelijk\n" " # hoofd- in kleine letters wijzigen en omgekeerd, indien mogelijk\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3146,7 +3222,7 @@ msgstr "" "en een O betekent alternatieve cijfers uit de taalregio te gebruiken,\n" "waarbij voor beide geldt: indien beschikbaar.\n" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3172,36 +3248,36 @@ msgstr "" "aan de westkust van de Verenigde Staten:\n" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "standaardinvoer" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "ongeldige datum: %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "meer dan één uitvoeropmaak opgegeven" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3212,23 +3288,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:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "kan datum niet instellen" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3238,7 +3314,7 @@ msgstr "" " of: %s OPTIE\n" "\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3257,7 +3333,8 @@ msgstr "" " count=BLOKKEN slechts dit aantal invoerblokken kopiëren\n" " ibs=BYTES aantal tegelijk te lezen bytes (standaard: 512)\n" -#: src/dd.c:541 +#: src/dd.c:570 +#, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3266,8 +3343,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=BESTAND uit dit bestand lezen i.p.v. van standaardinvoer\n" " iflag=VLAGGEN lezen met deze kommagescheiden eigenschappen\n" @@ -3283,7 +3362,7 @@ msgstr "" # Het getal N komt niet voor in mijn vertaling # (en BLOCKS niet meer in het origineel). -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3301,7 +3380,7 @@ msgstr "" "\n" "Mogelijke CONVERSIES zijn:\n" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3331,7 +3410,7 @@ msgstr "" "wanneer\n" " samen met 'block' of 'unblock', dan uitvullen met spaties\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3347,7 +3426,7 @@ msgstr "" " fdatasync het uitvoerbestand fysiek naar schijf schrijven vóór afsluiten\n" " fsync idem, maar ook de metagegevens schrijven\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3361,142 +3440,107 @@ msgstr "" " append achtervoegen (alleen zinvol bij uitvoer; suggestie: " "conv=notrunc)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio gelijktijdige I/O gebruiken voor de gegevens\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct directe I/O gebruiken voor de gegevens\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory weigeren als het geen map is\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync gesynchroniseerde I/O gebruiken voor de gegevens\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync idem, maar ook voor de metagegevens\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" " fullblock volledige blokken invoer verzamelen (alleen bij 'iflag')\n" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock niet-blokkerende I/O gebruiken\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime toegangstijdsstempels niet wijzigen\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nocache gecachte gegevens verwerpen\n" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty bestand is geen besturende terminal\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow symbolische koppelingen niet volgen\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks weigeren als bestand meer dan één harde koppeling heeft\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary binaire I/O gebruiken voor de gegevens\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text tekst-I/O gebruiken voor de gegevens\n" -#: src/dd.c:620 +#: src/dd.c:651 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:623 +#: src/dd.c:654 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:626 +#: src/dd.c:657 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:631 +#: src/dd.c:661 #, 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 "" -"\n" -"Het zenden van een %s-signaal naar een werkend 'dd'-proces zorgt ervoor dat\n" -"I/O-statistieken naar standaardfoutuitvoer gaan, waarna het kopiëren " -"doorgaat.\n" -"\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ kill -%s $pid; sleep 1; kill $pid\n" -" 18335302+0 records gelezen\n" -" 18335302+0 records geschreven\n" -" 9387674624 bytes (9.4 GB) gekopieerd, 34.6279 seconden, 271 MB/s\n" -"\n" -"Opties zijn:\n" -"\n" -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +#: src/dd.c:699 +#, fuzzy, c-format +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "onvoldoende geheugen beschikbaar voor invoerbuffer van %zu bytes (%s)" -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +#: src/dd.c:721 +#, fuzzy, c-format +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "onvoldoende geheugen beschikbaar voor uitvoerbuffer van %zu bytes (%s)" -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" -"%+% records gelezen\n" -"%+% records geschreven\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% afgebroken record\n" -msgstr[1] "% afgebroken records\n" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "% byte (%s) gekopieerd" msgstr[1] "% bytes (%s) gekopieerd" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "oneindig" @@ -3510,83 +3554,100 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% records gelezen\n" +"%+% records geschreven\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% afgebroken record\n" +msgstr[1] "% afgebroken records\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "sluiten van invoerbestand %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "sluiten van uitvoerbestand %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "uitschakelen van O_DIRECT is mislukt: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "schrijven naar %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "niet-herkend argument: %s" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "ongeldige conversie" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "ongeldige invoervlag" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "ongeldige uitvoervlag" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "ongeldige statusvlag" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "ongeldig getal: %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "slechts één van {ascii,ebcdic,ibm} is mogelijk" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "'block' en 'unblock' gaan niet samen" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "'lcase' en 'ucase' gaan niet samen" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "'excl' en 'nocreat' gaan niet samen" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "'direct' en 'nocache' gaan niet samen" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3595,63 +3656,63 @@ msgstr "" "waarschuwing: er wordt om de 'lseek'-kernelfout heen gewerkt voor bestand\n" "%s met mt_type=0x%0lx -- zie voor de lijst met typen" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: kan niet overslaan" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: kan geen 'seek' doen" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "positie werd te groot tijdens lezen van bestand %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" "waarschuwing: positie in bestand klopt niet meer na mislukte leesopdracht" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "kan toch niet om de kernelfout heen werken" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "instellen van vlaggen voor %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: kan niet naar de gegeven positie springen" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "afkorten op % bytes van uitvoerbestand %s is mislukt" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "'fdatasync' is mislukt voor %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "'fsync' is mislukt voor %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "openen van %s is mislukt" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3660,19 +3721,19 @@ msgstr "" "positie is te groot: kan niet afkorten tot een lengte van seek=% " "(%lu-byte) blokken" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "afkorten op % bytes van uitvoerbestand %s is mislukt" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "verwerpen van cache voor %s is mislukt" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3754,14 +3815,14 @@ msgstr "Vulgraad" msgid "%s-%s" msgstr "%s-%s" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" "kan geen toegang krijgen tot %s: een ander apparaat is eroverheen " "aangekoppeld" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3772,13 +3833,14 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 +#, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3792,7 +3854,7 @@ msgstr "" " -h, --human-readable groottes in machten van 1024 tonen (bijv. 234M)\n" " -H, --si groottes in machten van 1000 tonen (bijv. 245M)\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3808,13 +3870,38 @@ msgstr "" " --no-sync geen 'sync' doen vóór ophalen van info " "(standaard)\n" -#: src/df.c:1409 +#: src/df.c:1429 +#, 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" +msgstr "" +" --output[=VELDENLIJST] de gegeven uitvoeropmaak gebruiken, of\n" +" alle velden tonen als VELDENLIJST " +"ontbreekt\n" +" -P, --portability de POSIX-uitvoeropmaak gebruiken\n" +" --sync een 'sync' doen vóór het ophalen van " +"gebruiksinfo\n" +" -t, --type=TYPE alleen bestandssystemen van dit type tonen\n" +" -T, --print-type van elk bestandssysteem ook het type tonen\n" +" -x, --exclude-type=TYPE bestandssystemen van dit type niet tonen\n" +" -v (genegeerde optie)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose een melding tonen vóór openen van elk " +"uitvoerbestand\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3831,7 +3918,7 @@ msgstr "" " -x, --exclude-type=TYPE bestandssystemen van dit type niet tonen\n" " -v (genegeerde optie)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3843,25 +3930,25 @@ msgstr "" "veldnamen zijn: 'source', 'fstype', 'itotal', 'iused', 'iavail', 'ipcent',\n" "'size', 'used', 'avail', 'pcent', 'file' en 'target' (zie de Info-pagina).\n" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "de opties '%s' en '%s' sluiten elkaar uit" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "bestandssysteemtype %s is zowel gekozen als uitgesloten" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Waarschuwing: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "kan tabel van aangekoppelde bestandssystemen niet lezen" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "geen bestandssystemen verwerkt" @@ -3975,7 +4062,7 @@ msgstr "" " %s map1/rks map2/rks -> \"map1\" gevolgd door \"map2\"\n" " %s stdio.h -> \".\"\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3986,7 +4073,9 @@ msgstr "" "\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +#, fuzzy +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Vat het schijfgebruik samen van elk gegeven BESTAND, recursief voor mappen.\n" @@ -4134,65 +4223,59 @@ msgstr "" msgid "Infinity" msgstr "oneindig" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "fts_read() is mislukt: %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "ongeldige maximum diepte %s" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "ongeldig argument van '--threshold': '-0'" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "kan niet zowel alleen totalen tonen als alle items tonen" -#: src/du.c:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "fout: totalen tonen gaat niet samen met '--max-depth=%lu'" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" "waarschuwing: de opties '--apparent-size' en '-b' hebben geen effect samen " "met '--inodes'" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "bestandsargumenten gaan niet samen met de optie '--files0-from'" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: fout bij lezen" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "ongeldige bestandsnaam (lengte nul)" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "totaal" @@ -4338,9 +4421,8 @@ msgid "cannot specify --null (-0) with command" msgstr "optie '--null' (-0) gaat niet samen met een commando" #: 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" +#, fuzzy +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "Stuurt elk BESTAND naar standaarduitvoer met tabs geconverteerd naar " "spaties.\n" @@ -4387,7 +4469,7 @@ msgid "input line is too long" msgstr "invoerregel is te lang" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4547,12 +4629,12 @@ msgstr "fout in zoeken met reguliere expressie" msgid "non-integer argument" msgstr "argument is geen geheel getal" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "deling door nul" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "zet LC_ALL='C' om het probleem te omzeilen" @@ -4563,31 +4645,31 @@ msgid "the strings compared were %s and %s" msgstr "de te vergelijken tekenreeksen waren %s en %s" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "Niels Moller" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, 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:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "wachtrij-overloop in SQUFOF" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s is geen geldig positief geheel getal" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s is te groot" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4597,7 +4679,7 @@ msgstr "" " of: %s OPTIE\n" "\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -4644,7 +4726,7 @@ msgstr "" "Stuurt elk BESTAND naar standaarduitvoer met de alinea's opnieuw ingedeeld.\n" "De optie -GETAL is een afkorting van --width=GETAL.\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4658,7 +4740,7 @@ msgstr "" " -s, --split-only lange regels splitsen maar niet opnieuw " "uitvullen\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4673,7 +4755,7 @@ msgstr "" " -g, --goal=GETAL doelbreedte (standaard 93% van maximale " "regelbreedte)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4682,22 +4764,21 @@ msgstr "" "ongeldige optie: '%c'; -GETAL wordt alleen herkend als\n" "het het eerste argument is; gebruik anders '-w GETAL'" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "ongeldige breedte: %s" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +#, fuzzy +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "Stuurt elk BESTAND naar standaarduitvoer met de regels op een bepaalde " "lengte\n" "afgebroken. Zonder argumenten wordt standaardinvoer gelezen.\n" "\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4707,9 +4788,9 @@ msgstr "" " -s, --spaces bij voorkeur afbreken op spaties\n" " -w, --width=GETAL te gebruiken afbreekbreedte in plaats van 80\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "ongeldige afbreekbreedte: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4782,18 +4863,18 @@ msgstr "kan werkelijke GID niet verkrijgen" msgid "%s: no such user" msgstr "%s: onbekende gebruiker" -#: src/head.c:109 +#: src/head.c:110 +#, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "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" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4809,7 +4890,7 @@ msgstr "" " met een minteken, alle regels behalve de " "laatste N\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4817,7 +4898,7 @@ msgstr "" " -q, --quiet, --silent geen bestandsnaamkopjes tonen\n" " -v, --verbose altijd bestandsnaamkopjes tonen\n" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4829,48 +4910,36 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: bestand is te veel geslonken" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: aantal bytes is te groot" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: kan niet naar positie %s springen" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: kan niet naar relatieve positie %s springen" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "aantal regels" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "aantal bytes" +msgid "%s: number of bytes is too large" +msgstr "%s: aantal bytes is te groot" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "ongeldig aantal regels" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "ongeldig aantal bytes" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "ongeldige optie aan het eind: %c" @@ -5065,7 +5134,7 @@ msgstr "kan de eigenaar van %s niet veranderen" msgid "cannot set time stamps for %s" msgstr "kan de tijdsstempels van %s niet instellen" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "kan geen nieuw proces starten" @@ -5231,7 +5300,7 @@ msgstr "" msgid "target directory not allowed when installing a directory" msgstr "een doelmap is niet toegestaan bij het installeren van een map" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "ongeldige modus %s" @@ -5271,8 +5340,13 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5288,7 +5362,7 @@ msgstr "" " 1 of 2 is, overeenkomend met BESTAND1 of BESTAND2\n" " -e TEKST ontbrekende invoervelden vervangen door \"TEKST\"\n" -#: src/join.c:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5301,7 +5375,7 @@ msgstr "" " -t TEKEN te gebruiken veldscheidingsteken voor invoer en " "uitvoer\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5324,13 +5398,13 @@ msgstr "" "behandelen;\n" " deze samenvoegen zonder proberen ze te paren\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated regels afsluiten met 0-byte, niet met " "nieuweregel\n" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5375,47 +5449,47 @@ msgstr "" "Als de invoer niet gesorteerd is en sommige regels niet samengevoegd kunnen\n" "worden, dan wordt er een waarschuwing gegeven.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:%: is niet gesorteerd: %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "ongeldig veldnummer: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "ongeldige veldspecificatie: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "ongeldig bestandsnummer in veldspecificatie: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "incompatibele join-velden: %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "conflicterende vervangingstekenreeksen voor lege velden" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "meerdere tekens in scheidingsteken %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "incompatibele scheidingstekens" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "niet beide bestanden mogen de standaardinvoer zijn" @@ -5495,19 +5569,19 @@ msgstr "een signaal gaat niet samen met optie '-l' of '-t'" msgid "no process ID specified" msgstr "geen proces-ID gegeven" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" "het reserveren van % bytes voor een invoer-/uitvoerbuffer is " "mislukt\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "ongeldige bufferingsmodus %s voor %s\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "kan de buffering van %s niet in modus %s zetten\n" @@ -5605,14 +5679,18 @@ msgid "" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\n" msgstr "" +" \n" "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" -"In de 3de en 4de vorm: koppelingen maken naar elk DOEL in MAP.\n" +"In de 2de vorm: een koppeling naar DOEL maken (met zelfde naam, in huidige " +"map).\n" +"In de 3de en 4de vorm: koppelingen maken in MAP naar elk gegeven DOEL.\n" +"\n" "Standaard wordt een harde koppeling gemaakt, met '-s' een symbolische; en\n" "standaard hoort de KOPPELINGSNAAM (naam van nieuwe link) nog niet te " "bestaan.\n" "Bij het maken van een harde koppeling moet elk DOEL bestaan. Symbolische\n" -"koppelingen kunnen een willekeurige tekst bevatten; bij het later herleiden\n" +"koppelingen kunnen een willekeurige tekst bevatten. Bij het later " +"herleiden\n" "wordt een relatieve koppeling geïnterpreteerd in relatie tot haar ouder-" "map.\n" @@ -5712,7 +5790,7 @@ msgid "FIXME: unknown" msgstr "(onbekend)" # Deze commando's kennen alleen de opties --help en --version. -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "" @@ -5727,7 +5805,7 @@ msgstr "" "Toont de naam van de huidige gebruiker.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "geen inlognaam" @@ -5737,7 +5815,7 @@ msgstr "geen inlognaam" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%e %b %Y" @@ -5746,94 +5824,94 @@ msgstr "%e %b %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%e %b %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "genegeerd: ongeldige waarde %s van omgevingsvariabele QUOTING_STYLE" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "genegeerd: ongeldige breedte %s in omgevingsvariabele COLUMNS" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "genegeerd: ongeldige tab-grootte %s in omgevingsvariabele TABSIZE" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "ongeldige regelbreedte: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "ongeldige tab-grootte: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "ongeldige opmaakstijl %s voor de tijd" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "Geldige argumenten zijn:\n" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr " - +OPMAAK (bijvoorbeeld: +%H:%M) voor een opmaak zoals met 'date'\n" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "fout bij het initialiseren van maand-tekenreeksen" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "niet-herkend voorvoegsel: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "niet-ontleedbare waarde in omgevingsvariabele LS_COLORS" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "genegeerd: ongeldige waarde %s van omgevingsvariabele QUOTING_STYLE" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "kan map %s niet openen" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "kan het apparaat en de inode van %s niet bepalen" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "reeds getoonde map %s wordt niet opnieuw getoond" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "lezen van map %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "sluiten van map %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "kan bestandsnamen %s en %s niet vergelijken" -#: src/ls.c:4781 +#: src/ls.c:4775 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" @@ -5843,7 +5921,7 @@ msgstr "" "De items worden alfabetisch gesorteerd als geen van de opties '-cftuvSUX'\n" "noch '--sort' gegeven is.\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5857,7 +5935,7 @@ msgstr "" " -b, --escape niet-grafische tekens tonen als codes in C-" "stijl\n" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5883,12 +5961,14 @@ msgstr "" " met '-l': op naam sorteren en 'ctime' tonen;\n" " anders: op 'ctime' sorteren, recentste eerst\n" -#: src/ls.c:4804 +#: src/ls.c:4798 +#, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5904,7 +5984,7 @@ msgstr "" " -D, --dired uitvoer produceren voor de 'dired'-modus van " "Emacs\n" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5925,11 +6005,11 @@ msgstr "" "column' (-1)\n" " --full-time hetzelfde als '-l --time-style=full-iso'\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr " -g als '-l', maar geen eigenaar tonen\n" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5942,7 +6022,7 @@ msgstr "" " worden met een '--sort', maar gebruik van\n" " '--sort=none' of '-U' deactiveert groepering\n" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5956,7 +6036,7 @@ msgstr "" " --si idem, maar machten van 1000 i.p.v. 1024 " "gebruiken\n" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5978,7 +6058,7 @@ msgstr "" " --hide=PATROON de namen die voldoen aan PATROON niet tonen\n" " (geldt niet samen met '-a' of '-A')\n" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5999,7 +6079,7 @@ msgstr "" " -k, --kibibytes blokken van 1024 bytes gebruiken bij " "schijfgebruik\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -6017,7 +6097,7 @@ msgstr "" " in plaats van over de koppeling zelf\n" " -m geen kolommen maar kommagescheiden lijst tonen\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -6035,7 +6115,7 @@ msgstr "" " -p, --indicator-style=slash\n" " een '/'-indicator achter mapnamen toevoegen\n" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -6057,7 +6137,7 @@ msgstr "" " 'shell', 'shell-always', 'c' (-Q), 'escape' (-" "b)\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -6069,18 +6149,19 @@ msgstr "" " -s, --size toegewezen aantal blokken tonen voor ieder " "bestand\n" -#: src/ls.c:4886 +#: src/ls.c:4881 +#, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S op bestandsgrootte sorteren\n" " --sort=WIJZE te gebruiken sorteerwijze;\n" @@ -6091,7 +6172,7 @@ msgstr "" " SOORT kan zijn: 'ctime' of 'status' (-c),\n" " 'atime' of 'access' of 'use' (-u)\n" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -6118,7 +6199,7 @@ msgstr "" "dan\n" " geldt deze alleen buiten de POSIX-taalregio\n" -#: src/ls.c:4908 +#: src/ls.c:4904 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -6126,11 +6207,12 @@ msgstr "" " -t op de tijd van laatste wijziging sorteren\n" " -T, --tabsize=AANTAL te gebruiken tabbreedte in plaats van 8\n" -#: src/ls.c:4912 +#: src/ls.c:4908 +#, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -6143,13 +6225,15 @@ msgstr "" "plaatsingsvolgorde\n" " -v logisch sorteren op (versie)nummers in de naam\n" -#: src/ls.c:4919 +#: src/ls.c:4915 +#, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=BREEDTE te gebruiken schermbreedte i.p.v. huidige " "waarde\n" @@ -6158,7 +6242,7 @@ msgstr "" " -Z, --context beveiligingscontext van elk bestand tonen\n" " -1 één item per regel tonen\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6173,7 +6257,7 @@ msgstr "" "Omgevingsvariabele LS_COLORS kan deze instellingen wijzigen. Gebruik\n" "het commando 'dircolors' om deze variabele in te stellen.\n" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6204,12 +6288,10 @@ msgid "David Madore" msgstr "David Madore" #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" "Gebruik: %s [OPTIE] [BESTAND...]\n" "\n" @@ -6218,40 +6300,45 @@ msgstr "" "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" " -b, --binary in binaire modus lezen (standaard, behalve bij " "standaardinvoer)\n" -#: src/md5sum.c:178 -msgid " -b, --binary read in binary mode\n" +#: src/md5sum.c:180 +#, fuzzy +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary in binaire modus lezen\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr " --tag een controlesom in BSD-stijl genereren\n" -#: src/md5sum.c:188 +#: src/md5sum.c:191 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:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text in tekstmodus lezen (standaard)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -6274,14 +6361,15 @@ msgstr "" " -w, --warn waarschuwen bij onjuist opgemaakte controlesomregels\n" "\n" -#: src/md5sum.c:206 -#, c-format +#: src/md5sum.c:209 +#, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "De sommen worden berekend zoals beschreven in %s. Bij het controleren\n" @@ -6291,42 +6379,42 @@ msgstr "" "type\n" "aangeeft ('*' voor binair, ' ' voor tekst), en de naam van het bestand.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: te veel regels met controlesommen" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: onjuist opgemaakte regel met %s-controlesom" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: openen of lezen is MISLUKT\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "VERKEERD" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "goed" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: geen correct opgemaakte regels met %s-controlesommen gevonden" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "WAARSCHUWING: % regel is onjuist opgemaakt" msgstr[1] "WAARSCHUWING: % regels zijn onjuist opgemaakt" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" @@ -6334,7 +6422,7 @@ msgstr[0] "WAARSCHUWING: % getoond bestand kan niet gelezen worden" msgstr[1] "" "WAARSCHUWING: % getoonde bestanden kunnen niet gelezen worden" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" @@ -6342,17 +6430,17 @@ msgstr[0] "WAARSCHUWING: % berekende controlesom komt NIET overeen" msgstr[1] "" "WAARSCHUWING: % berekende controlesommen komen NIET overeen" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "optie '--tag' gaat niet samen met '--text'" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, 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:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6360,23 +6448,23 @@ msgstr "" "de opties '--binary' en '--text' gelden niet voor het verifiëren van " "controlesommen" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -6419,22 +6507,22 @@ msgstr "" " op standaard instellen (of op CNTXT indien " "gegeven)\n" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "kan de standaard aanmaakcontext voor %s niet instellen" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" msgstr "kan de context voor %s niet herstellen" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "map %s is aangemaakt" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6660,7 +6748,7 @@ msgstr "te veel sjablonen" msgid "with --suffix, template %s must end in X" msgstr "met '--suffix' moet sjabloon %s eindigen op een X" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "ongeldig achtervoegsel %s; het bevat een mapscheidingsteken" @@ -6802,9 +6890,8 @@ msgid "Scott Bartram" msgstr "Scott Bartram" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "Stuurt elk gegeven BESTAND naar standaarduitvoer, met regelnummers " "toegevoegd.\n" @@ -6918,27 +7005,27 @@ msgstr "ongeldige stijl voor regelnummers: %s" msgid "invalid footer numbering style: %s" msgstr "ongeldige stijl voor voetregelnummering: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "ongeldig regelnummer voor beginregel: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "ongeldige ophoging voor regelnummers: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "ongeldig aantal lege regels: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "ongeldige veldbreedte voor regelnummer: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "ongeldige opmaak voor nummering: %s" @@ -6962,10 +7049,10 @@ msgstr "" "\n" #: src/nohup.c:65 -#, c-format +#, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6984,46 +7071,46 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "kan standaardinvoer niet onbruikbaar maken" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "invoer wordt genegeerd" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "invoer wordt genegeerd en uitvoer wordt aan %s toegevoegd" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "uitvoer wordt aan %s toegevoegd" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" "kan kopie van standaardfoutuitvoer niet instellen om te sluiten bij " "uitvoering" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" "invoer wordt genegeerd en standaardfoutuitvoer gaat naar standaarduitvoer" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "standaardfoutuitvoer gaat naar standaarduitvoer" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -7053,60 +7140,55 @@ msgstr "" " --all het aantal geïnstalleerde processoren tonen\n" " --ignore=N indien mogelijk, N processoreenheden uitsluiten\n" -#: 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "Assaf Gordon" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "waarde is te groot om geconverteerd te kunnen worden: %s" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, c-format msgid "invalid number: %s" msgstr "ongeldig getal: %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" "afgewezen achtervoegsel in invoer: %s (overweeg om '--from' te gebruiken)" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" msgstr "ongeldig achtervoegsel in invoer: %s" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "ontbrekend achtervoegsel 'i' in invoer: %s (bijvoorbeeld Ki/Mi/Gi)" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "voorbereiden van waarde '%Lf' voor tonen is mislukt" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, c-format msgid "invalid unit size: %s" msgstr "ongeldige eenheidsgrootte: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "" "Gebruik: %s [OPTIE...] [GETAL...]\n" "\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" @@ -7115,31 +7197,34 @@ msgstr "" "of de getallen van standaardinvoer als er geen gegeven zijn.\n" "\n" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr " --debug waarschuwingen tonen bij ongeldige invoer\n" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" " -d, --delimiter=X te gebruiken scheidingsteken (in plaats van " "witruimte)\n" -#: src/numfmt.c:827 +#: src/numfmt.c:893 +#, fuzzy msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" " --field=NUMMER het getal in veld met dit nummer (standaard 1) " "vervangen\n" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" @@ -7149,14 +7234,14 @@ msgstr "" "onder);\n" " standaard is 'none'\n" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" " --from-unit=GETAL de grootte van de invoereenheid (in plaats van 1)\n" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -7167,7 +7252,7 @@ msgstr "" "gebruiken\n" " (heeft dus geen effect in C- of POSIX-taalregio)\n" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" @@ -7175,7 +7260,7 @@ msgstr "" " --header[=N] de eerste N kopregels zonder converteren tonen;\n" " N is 1 wanneer niet opgegeven\n" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" @@ -7183,7 +7268,7 @@ msgstr "" " --invalid=MODUS wat te doen bij ongeldige getallen; MODUS kan zijn:\n" " 'abort' (standaard), 'fail', 'warn', 'ignore'\n" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -7200,7 +7285,7 @@ msgstr "" " standaard wordt uitgevuld als witruimte gevonden " "wordt\n" -#: src/numfmt.c:860 +#: src/numfmt.c:927 msgid "" " --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" " up, down, from-zero (default), towards-zero, " @@ -7210,7 +7295,7 @@ msgstr "" " METHODE kan zijn: 'up', 'down',\n" " 'from-zero' (standaard), 'towards-zero', 'nearest'\n" -#: src/numfmt.c:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" @@ -7218,20 +7303,20 @@ msgstr "" " --suffix=SUFFIX dit achtervoegsel toevoegen aan uitvoergetallen,\n" " en accepteren bij invoergetallen\n" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" " --to=EENHEID uitvoergetallen herschalen naar deze EENHEID (zie " "onder)\n" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" " --to-unit=GETAL de grootte van de uitvoereenheid (in plaats van 1)\n" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" @@ -7239,12 +7324,12 @@ msgstr "" "\n" "Mogelijkheden voor EENHEID zijn:\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" " none geen automatische herschaling; achtervoegsels geven een fout\n" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -7256,7 +7341,7 @@ msgstr "" "accepteren:\n" " 1K = 1000, 1Ki = 1024, 1M = 1000000, 1Mi = 1048576, ...\n" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -7266,7 +7351,7 @@ msgstr "" " si een optioneel achtervoegsel van één letter accepteren:\n" " 1K = 1000, 1M = 1000000, ...\n" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7276,7 +7361,7 @@ msgstr "" " iec een optioneel achtervoegsel van één letter accepteren:\n" " 1K = 1024, 1M = 1048576, ...\n" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7286,7 +7371,28 @@ msgstr "" " iec-i een optioneel achtervoegsel van twee letters accepteren:\n" " 1Ki = 1024, 1Mi = 1048576, ...\n" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Een bereik kan zijn:\n" +"\n" +" N N-de byte, teken of veld (tellend vanaf 1)\n" +" N- van N-de byte, teken of veld, tot het einde van de regel\n" +" N-M van N-de tot en met M-de byte, teken of veld\n" +" -M van eerste tot en met M-de byte, teken of veld\n" +"\n" +"Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -7295,9 +7401,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7309,8 +7416,8 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 -#, c-format +#: src/numfmt.c:1000 +#, fuzzy, c-format msgid "" "\n" "Examples:\n" @@ -7324,8 +7431,8 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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 "" @@ -7346,118 +7453,131 @@ msgstr "" " $ ls -lh | %s --header --field 5 --from=iec --padding=10\n" " $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n" -#: src/numfmt.c:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "opmaakspecificatie %s bevat geen '%%'" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "ongeldige opmaak %s (breedte is te groot)" # FIXME: typo -#: src/numfmt.c:1008 -#, c-format -msgid "--format padding overridding --padding" +#: src/numfmt.c:1085 +#, fuzzy, c-format +msgid "--format padding overriding --padding" msgstr "de opvulling van --format overtroeft --padding" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "opmaakspecificatie %s eindigt in '%%'" -#: src/numfmt.c:1030 -#, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "ongeldige precisie: %s" + +#: src/numfmt.c:1126 +#, fuzzy, c-format +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "ongeldige opmaak %s; een opmaakspecificatie moet %%[0]['][-][N]f zijn" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "opmaakspecificatie %s bevat te veel '%%'" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, c-format msgid "invalid suffix in input %s: %s" msgstr "ongeldig achtervoegsel in invoer %s: %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, fuzzy, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" +"waarde is te groot om weer te kunnen geven: '%Lg' (overweeg om '--to' te " +"gebruiken)" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" "waarde is te groot om weer te kunnen geven: '%Lg' (overweeg om '--to' te " "gebruiken)" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" "waarde is te groot om weer te kunnen geven: '%Lg' (kan geen waardes > 999Y " "aan)" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "grote invoerwaarde %s: mogelijk verlies van precisie" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, 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" +msgid "invalid field value %s" +msgstr "ongeldige veldwaarde %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, c-format msgid "invalid padding value %s" msgstr "ongeldige opvulwaarde %s" -#: src/numfmt.c:1417 -#, c-format -msgid "invalid field value %s" -msgstr "ongeldige veldwaarde %s" +#: src/numfmt.c:1646 +#, fuzzy, c-format +msgid "multiple field specifications" +msgstr "%s: ongeldige veldspecificatie %s" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, c-format msgid "invalid header value %s" msgstr "ongeldige kopregelwaarde %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "de opties '--grouping' en '--format' gaan niet samen" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "geen conversie-optie gegeven" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "groepering gaat niet samen met optie '--to'" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "groepering heeft geen effect in deze taalregio" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "optie '--header' wordt genegeerd met invoer op de opdrachtregel" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "fout bij lezen van invoer" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "enkele van de invoergetallen zijn niet geconverteerd" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7470,14 +7590,13 @@ msgstr "" " of: %s --traditional [OPTIES] [BSTND] [[+]POSITIE[.][b] [+][LABEL][.]" "[b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Stuurt een eenduidige representatie (standaard in octale bytes) van het\n" @@ -7487,8 +7606,10 @@ msgstr "" "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 +#, 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" @@ -7507,7 +7628,7 @@ msgstr "" "Voor POSITIE en LABEL betekenen een voorgevoegde '0x' of '0X' hexadecimaal;\n" "het achtervoegsel '.' betekent octaal en 'b' vermenigvuldiging met 512.\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7524,7 +7645,7 @@ msgstr "" " -j, --skip-bytes=BYTES dit aantal bytes aan begin van invoer " "overslaan\n" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -7546,7 +7667,7 @@ msgstr "" " -w, --width[=GETAL] aantal te tonen bytes per uitvoerregel\n" " --traditional ook argumenten in traditionele vorm accepteren\n" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -7564,7 +7685,7 @@ msgstr "" " -c als '-t c', afdrukbare tekens of backslash-codes tonen\n" " -d als '-t u2', decimale getallen van 2 bytes zonder teken tonen\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7580,7 +7701,7 @@ 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:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -7593,7 +7714,7 @@ msgstr "" " a tekennaam, het hoogste bit negerend\n" " c ASCII-teken of backslash-code\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7608,7 +7729,7 @@ 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:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -7624,7 +7745,7 @@ msgstr "" "machineafhankelijke\n" "functie sizeof() geeft de lengte in bytes aan van de gegeven eenheid.)\n" -#: src/od.c:401 +#: src/od.c:404 msgid "" "\n" "Adding a z suffix to any type displays printable characters at the end of\n" @@ -7634,7 +7755,7 @@ msgstr "" "Met het achtervoegsel 'z' achter een TYPE, worden aan het eind\n" "van elke uitvoerregel als extra de afdrukbare tekens getoond.\n" -#: src/od.c:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -7652,12 +7773,12 @@ 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/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "ongeldig type: %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7666,7 +7787,7 @@ msgstr "" "ongeldig type: %s;\n" "dit systeem kent geen geheelgetaltype van %lu bytes " -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7675,37 +7796,37 @@ msgstr "" "ongeldig type: %s;\n" "dit systeem kent geen drijvendekommagetal van %lu bytes " -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" msgstr "ongeldig teken '%c' in opmaakreeks %s" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "kan niet voorbij het einde van de gecombineerde invoer springen" -#: src/od.c:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, 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:1863 +#: src/od.c:1871 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:1884 +#: src/od.c:1892 #, 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:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "waarschuwing: ongeldige breedte %lu; zal %d gebruiken" @@ -7721,10 +7842,10 @@ msgid "standard input is closed" msgstr "standaardinvoer is gesloten" #: src/paste.c:439 +#, fuzzy msgid "" "Write lines consisting of the sequentially corresponding lines from\n" "each FILE, separated by TABs, to standard output.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Scheidt de overeenkomstige regels uit de gegeven BESTANDen met tabs en " "stuurt\n" @@ -7875,12 +7996,12 @@ msgstr "Ingelogd" msgid "Where" msgstr "Waar" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Gebruik: %s [OPTIE...] [GEBRUIKER...]\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7896,7 +8017,7 @@ msgstr "" " -p het planbestand weglaten in de lange uitvoer\n" " -s de korte uitvoer tonen (standaard)\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7910,7 +8031,7 @@ msgstr "" " -q volledige naam, externe host en inactief weglaten in de korte " "uitvoer\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -7921,100 +8042,100 @@ msgstr "" "Een lichtgewicht 'finger'-programma dat gebruikersinformatie toont.\n" "Het geraadpleegde 'utmp'-bestand is %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" "als '-l' wordt gebruikt, moet minstens één gebruikersnaam gegeven worden" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "ontbrekend argument in '--pages=EERSTE[:LAATSTE]'" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "ongeldige paginareeks %s" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "'-l PAGINALENGTE', ongeldig aantal regels: %s" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "'-N AANTAL', ongeldig beginregelnummer: %s" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "'-o MARGE', ongeldige regelpositie: %s" -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "'-w PAGINABREEDTE', ongeldig aantal tekens: %s" -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "'-W PAGINABREEDTE', ongeldig aantal tekens: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "kan niet zowel verticaal als horizontaal afdrukken" -#: src/pr.c:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "te smalle paginabreedte" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" "startpaginanummer % is hoger dan het aantal pagina's %" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "paginanummer loopt over" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Pagina %" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "Maakt van de gegeven BESTAND(en) pagina's of kolommen, om ze af te drukken.\n" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -8031,7 +8152,7 @@ msgstr "" " tenzij '-a' gegeven is; het aantal regels per kolom\n" " voor elke pagina gelijk houden\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -8048,7 +8169,7 @@ msgstr "" " -d, --double-space\n" " tussen elk paar regels een lege regel toevoegen\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -8072,7 +8193,7 @@ msgstr "" "regels\n" " en geen paginavoet printen\n" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -8097,11 +8218,24 @@ msgstr "" " van '-W' uit; kolommen worden niet uitgelijnd;\n" " '--sep-string[=TEKST]' stelt scheidingstekens in\n" -#: src/pr.c:2798 +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l, --length=PAGINALENGTE\n" +" te gebruiken paginalengte (standaard 66 regels -- " +"waarvan\n" +" 56 regels tekst en met '-F 63')\n" +" -m, --merge de bestanden naast elkaar printen, elk in een kolom;\n" +" lange regels afkappen, tenzij '-J' gegeven is\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -8112,7 +8246,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:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -8131,7 +8265,7 @@ msgstr "" "regel\n" " op de eerste te printen pagina (zie +EERSTEPAGINA)\n" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -8150,7 +8284,7 @@ msgstr "" "worden\n" # FIXME: use semicolon -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -8168,14 +8302,14 @@ msgstr "" " drie kolomopties ('-KOLOMMEN'|'-a -KOLOMMEN'|'-m')\n" " behalve als ook '-w' gegeven is\n" -#: src/pr.c:2828 +#: src/pr.c:2802 +#, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -S[TEKST], --sep-string[=TEKST]\n" " kolommen scheiden door TEKST; zonder '-S' is deze " @@ -8186,7 +8320,13 @@ msgstr "" "kolomopties\n" " -t, --omit-header paginakop- en voetteksten weglaten\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -8210,7 +8350,7 @@ msgstr "" " tekstkolommen; -s[TEKEN] schakelt de standaardbreedte " "uit\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -8223,16 +8363,6 @@ msgstr "" " lange regels afkappen, tenzij '-J' gegeven is;\n" " '-S' en '-s' hebben geen invloed\n" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"Optie '-t' is standaard als PAGINALENGTE kleiner of gelijk aan 10 is.\n" -"Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -8392,11 +8522,11 @@ msgstr "" "Produceert een gepermuteerde index, inclusief context,\n" "van de woorden in de invoerbestanden.\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 +#, fuzzy 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 bestandsnaam- en regelnummer toevoegen\n" " -G, --traditional meer zoals de oude 'ptx' van System V\n" @@ -8404,6 +8534,12 @@ msgstr "" #: src/ptx.c:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -8417,7 +8553,7 @@ msgstr "" "zinnen\n" " -T, --format=tex als uitvoer 'TeX'-directieven produceren\n" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8433,7 +8569,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:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8446,20 +8582,16 @@ msgstr "" " -w, --width=GETAL uitvoerbreedte in kolommen, zonder " "referentie\n" -#: src/ptx.c:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" -"Optie '-F /' is standaard.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "ongeldige breedte van tussenruimte: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "ongeldige regelbreedte: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8490,7 +8622,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "kan niet naar map %s gaan" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "kan status van %s niet opvragen" @@ -8510,8 +8642,8 @@ msgstr "argumenten die geen optie zijn worden genegeerd" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "" @@ -8777,16 +8909,16 @@ msgstr "" "'shred'.\n" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: %zu argument recursief verwijderen? " msgstr[1] "%s: %zu argumenten recursief verwijderen? " #: src/rm.c:345 -#, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +#, fuzzy, c-format +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: %zu argument verwijderen? " msgstr[1] "%s: %zu argumenten verwijderen? " @@ -9010,12 +9142,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "ongeldig drijvendekomma-argument: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "opmaakspecificatie %s bevat onbekende '%%%c'" -#: src/seq.c:557 +#: src/seq.c:603 #, 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" @@ -9033,7 +9165,16 @@ msgstr "" "Overschrijft gegeven BESTAND(en) meerdere malen, om het zelfs voor heel\n" "dure apparatuur moeilijk te maken de inhoud ervan te herstellen.\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Als een BESTAND - is, dan nog eens naar standaarduitvoer kopiëren.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -9049,7 +9190,7 @@ msgstr "" " -s, --size=N dit aantal bytes vernietigen (achtervoegsels als K, M, G " "mogen)\n" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -9066,11 +9207,10 @@ msgstr "" " -z, --zero tot slot met nullen overschrijven om vernietiging te " "verhullen\n" -#: src/shred.c:192 +#: src/shred.c:196 +#, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -9098,7 +9238,7 @@ msgstr "" "De standaardmodus is 'wipesync', maar merk op dat dit \"duur\" kan zijn.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -9115,7 +9255,7 @@ msgstr "" "niet gegarandeerd dat het werkt in elke modus van het bestandssysteem:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -9137,7 +9277,7 @@ msgstr "" "Appliance\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -9151,7 +9291,7 @@ msgstr "" "* gecomprimeerde bestandssystemen\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -9176,7 +9316,7 @@ msgstr "" "zoals gedocumenteerd in de man-pagina van mount ('man mount').\n" "\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -9186,129 +9326,129 @@ msgstr "" "vernietigde bestanden bevatten die door 'shred' niet gezien worden, zodat\n" "het dus mogelijk is dat de bestanden later toch hersteld worden.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "" "%s: synchronisatie van data in geheugen en op schijf (fdatasync) is mislukt" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "" "%s: synchronisatie van data in geheugen en op schijf (fsync) is mislukt" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: kan niet terugspoelen" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: doorloop %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: fout tijdens schrijven op positie %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: 'lseek' is mislukt" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: bestand is te groot" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: doorloop %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: doorloop %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: opvragen van bestandsstatus is mislukt" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: ongeldig bestandstype" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: bestand heeft een negatieve grootte" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: fout bij inkorten" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: manipuleren van bestandsdescriptor is mislukt" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: kan een alleen-toevoegen-bestand niet vernietigen" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "verwijderen van %s" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s is hernoemd tot %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "verwijderen van %s is mislukt" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s is verwijderd" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "sluiten van %s is mislukt" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "openen voor schrijven van %s is mislukt" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "ongeldig aantal doorlopen: %s" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "meer dan één bron van willekeurige bytes gegeven" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "ongeldige bestandsgrootte: %s" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -9320,13 +9460,13 @@ msgstr "" " of: %s -i LAAG-HOOG [OPTIE...]\n" "\n" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" "Stuurt een willekeurige husseling van de invoerregels naar " "standaarduitvoer.\n" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -9345,37 +9485,37 @@ msgstr "" " --random-source=BSTND bestand BSTND is bron van willekeurige bytes\n" " -r, --repeat uitvoerregels mogen herhaald worden\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "te veel invoerregels" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "meer dan één optie '-i' gegeven" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "ongeldig invoerbereik: %s" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "ongeldig aantal regels: %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "meer dan één uitvoerbestand gegeven" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "opties '-e' en '-i' gaan niet samen" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "geen regels om te herhalen" @@ -9404,12 +9544,12 @@ msgstr "" "er gepauzeerd gedurende een tijd die de som is van de waarden.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "ongeldig tijdsinterval: %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "kan de realtime-klok niet lezen" @@ -9420,13 +9560,13 @@ msgstr "" "Stuurt gegeven BESTAND(en samengevoegd en) gesorteerd naar " "standaarduitvoer.\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" msgstr "Sorteeropties:\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9438,7 +9578,7 @@ msgstr "" "beschouwen\n" " -f, --ignore-case kleine letters als hoofdletters beschouwen\n" -#: src/sort.c:443 +#: src/sort.c:444 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -9449,13 +9589,13 @@ msgstr "" " -i, --ignore-nonprinting alleen afdrukbare tekens beschouwen\n" " -M, --month-sort ordenen: (onbekend) < 'JAN' < ... < 'DEC'\n" -#: src/sort.c:448 +#: src/sort.c:449 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:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9467,7 +9607,7 @@ msgstr "" " --random-source=BSTND willekeurige bytes uit dit bestand halen\n" " -r, --reverse het resultaat van de vergelijking omkeren\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9486,13 +9626,13 @@ msgstr "" "sorteren\n" "\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" msgstr "Andere opties:\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9501,7 +9641,7 @@ msgstr "" "samenvoegen;\n" " bij meer, tijdelijke bestanden gebruiken\n" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -9516,7 +9656,7 @@ msgstr "" " --compress-program=PROG tijdelijke bestanden met PROG comprimeren;\n" " decomprimeren met 'PROG -d'\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9534,7 +9674,7 @@ msgstr "" " '-' is, dan de namen van standaardinvoer " "lezen\n" -#: src/sort.c:487 +#: src/sort.c:488 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -9545,7 +9685,7 @@ msgstr "" " -m, --merge gesorteerde bestanden samenvoegen; niet " "sorteren\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9559,7 +9699,7 @@ msgstr "" " noodvergelijking als niets werkt\n" " -S, --buffer-size=GROOTTE te gebruiken grootte voor hoofdgeheugenbuffer\n" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9585,7 +9725,7 @@ msgstr "" "tonen;\n" " met '-c': op strikte ordening controleren\n" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9622,12 +9762,11 @@ msgstr "" "\n" "GROOTTE mag gevolgd worden door een vermenigvuldigingsachtervoegsel:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -9641,245 +9780,244 @@ msgstr "" "sorteervolgorde. Stel 'LC_ALL=C' in voor de traditionele sorteervolgorde\n" "die de gewone bytewaarde gebruikt.\n" -#: src/sort.c:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "wachten op %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] is niet normaal geëindigd" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "kan tijdelijk bestand %s niet aanmaken" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "openen is mislukt" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "alles naar schijf wegschrijven (fflush) is mislukt" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "sluiten is mislukt" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "kan geen tijdelijk bestand aanmaken" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "kan geen proces voor '%s -d' aanmaken" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "waarschuwing: kan %s niet verwijderen" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "ongeldig argument van '--%s': %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "minimum argument van '--%s' is %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "argument %2$s van '--%1$s' is te groot" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "met huidige 'rlimit' is maximum argument van '--%s': %s" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "maximaal aantal parallelle processen mag niet nul zijn" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "opvragen van bestandsstatus is mislukt" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "lezen is mislukt" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "transformatie van tekenreeks is mislukt" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "de niet-getransformeerde tekenreeks was %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "^ geen overeenkomst voor sleutel\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "verouderde sleutel %s is gebruikt; gebruik liever %s" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "sleutel %lu heeft breedte nul en wordt genegeerd" -#: src/sort.c:2439 +#: src/sort.c:2438 #, 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:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "sleutel %lu is numeriek en beslaat meerdere velden" -#: src/sort.c:2484 +#: src/sort.c:2483 #, 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:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "optie '-r' betreft alleen de noodvergelijking" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "schrijven is mislukt" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: wanorde: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "standaardfoutuitvoer" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "kan niet lezen" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: ongeldige veldspecificatie %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "opties '-%s' gaan niet samen" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: ongeldig aantal bij het begin van %s" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "ongeldig getal na '-'" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "ongeldig getal na '.'" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "verdwaald teken in veldspecificatie" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "meer dan één compressieprogramma opgegeven" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "ongeldig getal aan het begin van een veld" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "veldnummer is nul" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "tekenpositie is nul" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" msgstr "ongeldig getal na ','" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "lege tab" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "kan geen bestandsnamen uit %s lezen" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: ongeldige bestandsnaam (lengte nul)" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "geen invoer van %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "sorteerregels van %s worden gebruikt" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "eenvoudige byte-vergelijking wordt gebruikt" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "extra argument %s is niet toegestaan bij optie '-%c'" -#: src/split.c:186 -#, c-format -msgid "the suffix length needs to be at least %zu" +#: src/split.c:207 +#, fuzzy, c-format +msgid "the suffix length needs to be at least %" msgstr "de lengte van het achtervoegsel moet minstens %zu zijn" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Gebruik: %s [OPTIE...] [INVOER [VOORVOEGSEL]]\n" -#: src/split.c:207 +#: src/split.c:228 +#, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" "Schrijft stukken van de INVOER met een vaste grootte naar VOORVOEGSELaa,\n" "VOORVOEGSELab, VOORVOEGSELac, ...; de standaardgrootte is 1000 regels en\n" @@ -9887,21 +10025,24 @@ msgstr "" "\n" "Zonder INVOER, of wanneer INVOER - is, wordt standaardinvoer gelezen.\n" -#: src/split.c:215 -#, c-format +#: src/split.c:236 +#, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file names\n" " -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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" " -a, --suffix-length=L achtervoegsels gebruiken met deze lengte " @@ -9924,7 +10065,7 @@ msgstr "" " -u, --unbuffered invoer direct naar uitvoer kopiëren met '-n " "r/...'\n" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9932,16 +10073,17 @@ msgstr "" " --verbose een melding tonen vóór openen van elk " "uitvoerbestand\n" -#: src/split.c:235 +#: src/split.c:258 +#, fuzzy 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" "\n" "BROKKEN mag zijn:\n" @@ -9953,192 +10095,197 @@ 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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "achtervoegsels voor uitvoerbestanden zijn verbruikt" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "aanmaken van bestand %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "%s zou invoer overschrijven -- gestopt" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "instellen van omgevingsvariabele FILE is mislukt" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "wordt uitgevoerd met FILE=%s\n" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "aanmaken van pijp is mislukt" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "sluiten van eerdere pijp" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "sluiten van uitvoerpijp" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "verplaatsen van invoerpijp" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "sluiten van invoerpijp" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "kan commando \"%s -c %s\" niet uitvoeren" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "kan invoerpijp niet sluiten" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "wachten op dochterproces" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "met FILE=%s, signaal %s van commando: %s" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "met FILE=%s, afsluitwaarde %d van commando: %s" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "onbekende afsluitwaarde (0x%X) van commando" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "kan niet op meerdere manieren splitsen" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "ongeldig aantal brokken: %s" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "ongeldig broknummer: %s" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "ongeldige lengte voor achtervoegsel: %s" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "ongeldig aantal bytes: %s" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "ongeldig aantal regels: %s" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "meerdere tekens in scheidingsteken %s" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "gemultiplexed byte-apparaat" # Engelse foutmelding is onduidelijk. -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "regelaantal '-%s%c...' is te groot" -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: ongeldige startwaarde voor numeriek achtervoegsel" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "ongeldige IO-blokgrootte: %s" -#: src/split.c:1347 +#: src/split.c:1437 #, 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:1384 +#: src/split.c:1477 #, 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:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "canoniseren van %s is mislukt" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "waarschuwing: onbekende stuurcode '\\%c'" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: ongeldige directief" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "waarschuwing: backslash aan eind van opmaakaanduiding" -#: src/stat.c:1262 +#: src/stat.c:1265 #, 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:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "kan informatie in bestandssysteem niet lezen voor %s" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -10154,7 +10301,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -10164,31 +10311,31 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "Context: %C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -10200,11 +10347,11 @@ msgstr "" "Veranderd: %z\n" "Ontstaan: %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "Toont de status van een bestand (of van een bestandssysteem).\n" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" @@ -10212,7 +10359,7 @@ msgstr "" " -L, --dereference symbolische koppelingen volgen\n" " -f, --file-system status tonen van bestandssysteem i.p.v. van bestand\n" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -10229,7 +10376,7 @@ msgstr "" " een nieuweregel wilt, voeg dan \\n toe in OPMAAK\n" " -t, --terse de informatie in beknopte vorm tonen\n" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -10249,7 +10396,7 @@ msgstr "" " %B de grootte in bytes van elk blok gerapporteerd door %b\n" " %C SELinux-beveiligingscontext-tekenreeks\n" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -10265,7 +10412,7 @@ msgstr "" " %g groeps-ID van eigenaar\n" " %G groepsnaam van eigenaar\n" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -10287,7 +10434,7 @@ msgstr "" " %t hoofdapparaattype in hex (voor apparaatbestanden)\n" " %T subapparaattype in hex (voor apparaatbestanden)\n" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -10313,7 +10460,7 @@ msgstr "" " %Z tijdstip van laatste statusverandering, in seconden sinds Epoch\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -10331,7 +10478,7 @@ msgstr "" " %d aantal vrije inodes in bestandssysteem\n" " %f aantal vrije blokken in bestandssysteem\n" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -10404,11 +10551,11 @@ msgstr "" "met de grootte ingesteld op MODUS bytes.\n" #: src/stdbuf.c:116 +#, fuzzy 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" +"for example) then that will override corresponding changes 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 "" @@ -10442,7 +10589,7 @@ msgstr "regelbuffering van standaardinvoer is zinloos" msgid "you must specify a buffering mode option" msgstr "u moet een bufferingsmodusoptie opgeven " -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10453,11 +10600,11 @@ msgstr "" " of: %s [-F APPARAAT | --file=APPARAAT] [-a|--all]\n" " of: %s [-F APPARAAT | --file=APPARAAT] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "Toont terminalkarakteristieken of stelt ze in.\n" -#: src/stty.c:528 +#: src/stty.c:536 msgid "" " -a, --all print all current settings in human-readable form\n" " -g, --save print all current settings in a stty-readable form\n" @@ -10467,7 +10614,7 @@ msgstr "" " -g, --save alle huidige instellingen in herbruikbare vorm tonen\n" " -F, --file=APPARAAT te gebruiken apparaat in plaats van standaardinvoer\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10478,11 +10625,24 @@ msgstr "" "Niet-POSIX-instellingen zijn met een '*' gemarkeerd. Het hangt van het\n" "onderliggende systeem af welke instellingen beschikbaar zijn.\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -10493,9 +10653,13 @@ 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -10505,35 +10669,58 @@ msgstr "" " intr TEKEN TEKEN zendt een interruptsignaal\n" " kill TEKEN TEKEN verwijdert de huidige regel\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" msgstr "" -" * lnext TEKEN TEKEN voert het volgende TEKEN aangehaald in\n" -" quit TEKEN TEKEN zendt een afsluitingssignaal\n" -" * rprnt TEKEN TEKEN herschrijft de huidige regel\n" -" start TEKEN TEKEN herstart de uitvoer nadat deze is gestopt\n" -#: src/stty.c:559 +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 TEKEN TEKEN stopt de uitvoer\n" " susp TEKEN TEKEN zendt een terminal-stopsignaal\n" " * swtch TEKEN TEKEN schakelt naar een andere shell-laag\n" " * werase TEKE TEKEN verwijdert het laatst getypte woord\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 +#, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Speciale instellingen:\n" +" N de in- en uitvoersnelheid op N bits per seconde zetten\n" +" * cols N de kernel laten weten dat de terminal N kolommen heeft\n" +" * columns N hetzelfde als 'cols N'\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -10543,10 +10730,17 @@ msgstr "" " * cols N de kernel laten weten dat de terminal N kolommen heeft\n" " * columns N hetzelfde als 'cols N'\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -10557,11 +10751,22 @@ msgstr "" "tekens\n" " ospeed N de uitvoersnelheid op N zetten\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N de kernel laten weten dat de terminal N rijen heeft\n" +" * size het aantal rijen en kolommen volgens de kernel tonen\n" +" speed de snelheid van de terminal tonen\n" +" time N met '-icanon': leestijdslimiet op N tiende seconde " +"instellen\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -10571,25 +10776,28 @@ msgstr "" " time N met '-icanon': leestijdslimiet op N tiende seconde " "instellen\n" -#: src/stty.c:584 +#: src/stty.c:641 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-\n" -" * [-]cdtrdsr DTR/DSR-handshake inschakelen\n" -" csN tekengrootte op N bits instellen; N in [5..8]\n" -#: src/stty.c:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 +#, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -10597,7 +10805,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb twee stopbits per teken gebruiken (één met '-')\n" " [-]hup 'opgehangen'-signaal sturen wanneer laatste proces de TTY " @@ -10607,7 +10814,12 @@ msgstr "" " [-]parodd oneven pariteit instellen (of even pariteit met '-')\n" " * [-]cmspar \"stick\"-pariteit (altijd aan of uit) gebruiken\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -10615,6 +10827,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Invoerinstellingen:\n" @@ -10624,10 +10837,14 @@ msgstr "" " [-]ignbrk break-tekens negeren\n" " [-]igncr CR-tekens negeren\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -10640,14 +10857,23 @@ msgstr "" " [-]inpck controle op invoerpariteit inschakelen\n" " [-]istrip hoogste bit (het achtste) van invoertekens nul maken\n" -#: src/stty.c:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 aannemen dat invoertekens in UTF-8 gecodeerd zijn\n" -#: src/stty.c:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr " * [-]iutf8 aannemen dat invoertekens in UTF-8 gecodeerd zijn\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -10661,64 +10887,83 @@ msgstr "" " [-]parmrk pariteitsfouten markeren (met een 255-0-tekencombinatie)\n" " [-]tandem hetzelfde als '[-]ixoff'\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Uitvoerinstellingen:\n" -" * bsN backspace-vertragingsstijl; N in [0..1]\n" -" * crN 'carriage return'-vertragingsstijl, N in [0..3]\n" -" * ffN 'form feed'-vertragingsstijl; N in [0..1]\n" -" * nlN nieuweregel-vertragingsstijl; N in [0..1]\n" -#: src/stty.c:635 -msgid "" -" * [-]ocrnl translate carriage return to newline\n" -" * [-]ofdel use delete characters for fill instead of NUL characters\n" -" * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" msgstr "" -" * [-]ocrnl CR-teken (naar regelbegin) omzetten in LF-teken " -"(nieuweregel)\n" -" * [-]ofdel als opvulling DEL-tekens gebruiken in plaats van NUL-" -"tekens\n" -" * [-]ofill voor vertragingen opvultekens gebruiken in plaats van " -"pauzes\n" -" * [-]olcuc kleine letters omzetten in hoofdletters\n" -" * [-]onlcr LF-teken (nieuweregel) omzetten in CR-teken (naar " -"regelbegin)\n" -" * [-]onlret 'nieuweregel' voert ook een 'naar regelbegin' uit\n" -#: src/stty.c:643 -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" +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 +msgid "" +" * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" +" * [-]ofill use fill (padding) characters instead of timing for delays\n" +msgstr "" + +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 +msgid "" +" * 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 "" -" * [-]onocr geen 'naar regelbegin' uitvoeren wanneer in de eerste " -"kolom\n" -" [-]opost na-proces-uitvoer\n" -" * tabN vertragingsstijl voor horizontale tab; N in [0..3]\n" -" * tabs hetzelfde als 'tab0'\n" -" * -tabs hetzelfde als 'tab3'\n" -" * vtN vertragingsstijl voor verticale tab; N in [0..1]\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10728,44 +10973,55 @@ msgstr "" " * crtkill gehele regel verwijderen via 'echoprt' en 'echoe'\n" " * -crtkill gehele regel verwijderen via 'echoctl' en 'echok'\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +#, fuzzy +msgid " [-]echo echo input characters\n" +msgstr " * [-]iutf8 aannemen dat invoertekens in UTF-8 gecodeerd zijn\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]ctlecho stuurtekens in dakjesnotatie tonen (^c)\n" -" [-]echo invoertekens echoën\n" -" * [-]echoctl hetzelfde als '[-]ctlecho'\n" -" [-]echoe hetzelfde als '[-]crterase'\n" -" [-]echok een nieuweregel-teken echoën na een kill-teken\n" -#: src/stty.c:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]echoke hetzelfde als '[-]crtkill'\n" -" [-]echonl nieuweregel echoën zelfs als geen andere tekens worden " -"geëchood\n" -" * [-]echoprt verwijderde tekens achterwaarts echoën, tussen '\\' en '/'\n" -" [-]icanon speciale tekens voor erase, kill, werase, en rprnt " -"inschakelen\n" -" [-]iexten niet-POSIX speciale tekens inschakelen\n" -#: src/stty.c:672 +#: src/stty.c:843 +#, fuzzy 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 "" " [-]isig speciale tekens voor interrupt, quit, en suspend " "inschakelen\n" @@ -10775,11 +11031,33 @@ msgstr "" "schrijven\n" " * [-]xcase met 'icanon': '\\' voor kleine letter maakt hoofdletter\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -10789,49 +11067,59 @@ msgstr "" " cbreak hetzelfde als '-icanon'\n" " -cbreak hetzelfde als 'icanon'\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 hetzelfde als 'brkint ignpar istrip icrnl ixon opost isig\n" " icanon', met eof- en eol-tekens op hun standaardwaarden\n" " -cooked hetzelfde als 'raw'\n" " crt hetzelfde als 'echoe echoctl echoke'\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -" dec hetzelfde als 'echoe echoctl echoke -ixany intr ^c\n" -" erase 0177 kill ^u'\n" -" * [-]decctlq hetzelfde als '[-]ixany'\n" -" ek de erase- en kill-tekens op hun standaardwaarden zetten\n" -" evenp hetzelfde als 'parenb -parodd cs7'\n" -#: src/stty.c:699 +#: src/stty.c:919 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 "" -" -evenp hetzelfde als '-parenb cs8'\n" -" * [-]lcase hetzelfde als 'xcase iuclc olcuc'\n" -" litout hetzelfde als '-parenb -istrip -opost cs8'\n" -" -litout hetzelfde als 'parenb istrip opost cs7'\n" -" nl hetzelfde als '-icrnl -onlcr\n" -" -nl hetzelfde als 'icrnl -inlcr -igncr onlcr -ocrnl -onlret'\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr " -g als '-l', maar geen eigenaar tonen\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10845,11 +11133,12 @@ msgstr "" " pass8 hetzelfde als '-parenb -istrip cs8'\n" " -pass8 hetzelfde als 'parenb istrip cs7'\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw hetzelfde als '-ignbrk -brkint -ignpar -parmrk -inpck\n" @@ -10857,14 +11146,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0'\n" " -raw hetzelfde als 'cooked'\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane hetzelfde als 'cread -ignbrk brkint -inlcr -igncr icrnl -" "iutf8\n" @@ -10874,7 +11164,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke', met\n" " alle speciale tekens op hun standaardwaarden\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10891,12 +11181,12 @@ msgstr "" "0177 of 127; de speciale waarden '^-' of 'undef' kunnen gebruikt worden om\n" "speciale tekens inactief te maken.\n" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "er mag slechts één apparaat gegeven worden" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10904,45 +11194,50 @@ msgid "" msgstr "" "de opties voor duidelijke en voor 'stty'-leesbare uitvoer gaan niet samen" -#: src/stty.c:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: kan niet-blokkerende modus niet herstellen" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "ongeldig argument: %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "ontbrekend argument bij %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: fout bij inkorten" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "ongeldig lijnprotocol: %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: kan niet alle gevraagde acties uitvoeren" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: er is geen grootte-informatie voor dit apparaat" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "ongeldig geheelgetal-argument: %s" #. This is a proper name. See the gettext manual, section Names. @@ -10951,8 +11246,15 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Toont de CRC-controlesom en het aantal bytes van elk gegeven BESTAND.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -10963,20 +11265,56 @@ msgstr "" " -s, --sysv System V-sommatie-algoritme gebruiken en blokken van 512 " "bytes\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, fuzzy, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "" +"Gebruik: %s [OPTIE...] [BESTAND...]\n" +"\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Schrijft veranderde blokken naar schijf, en werkt het superblok bij.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "fout bij lezen van %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: kan niet-blokkerende modus niet herstellen" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "fout bij lezen van %s" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/sync.c:69 +#: src/sync.c:216 #, c-format -msgid "ignoring all arguments" -msgstr "alle argumenten worden genegeerd" +msgid "--data needs at least one argument" +msgstr "" -#: src/system.h:343 +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10989,15 +11327,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:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help deze hulptekst tonen en stoppen\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version programmaversie tonen en stoppen\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -11005,7 +11351,7 @@ msgstr "" "\n" "(Een verplicht argument bij een lange optie geldt ook voor de korte vorm.)\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -11018,7 +11364,7 @@ msgstr "" "Mogelijke eenheden zijn: K, M, G, T, P, E, Z, Y (machten van 1024)\n" "of KB, MB, ... (machten van 1000). Bijvoorbeeld: 10MB is 10*1000*1000.\n" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -11032,7 +11378,7 @@ msgstr "" "BLOCKSIZE. Anders is de eenheid standaard 1024 bytes (of 512 als\n" "POSIXLY_CORRECT gezet is).\n" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -11045,23 +11391,27 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "Meld vertalingsfouten in '%s' aan .\n" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -"Voor volledige documentatie, gebruik: info coreutils '%s invocation'\n" -#: src/system.h:591 +#: src/system.h:613 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Typ '%s --help' voor meer informatie.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -11082,9 +11432,8 @@ msgid "Jay Lepreau" msgstr "Jay Lepreau" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "Schrijft elk gegeven BESTAND naar standaarduitvoer, laatste regel eerst.\n" "\n" @@ -11100,57 +11449,56 @@ msgstr "" " -r, --regex scheider als reguliere expressie interpreteren\n" " -s, --separator=TEKST deze scheider gebruiken in plaats van nieuweregel\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: 'seek' is mislukt" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "record is te groot" -#: src/tac.c:450 +#: src/tac.c:459 #, c-format msgid "failed to create temporary file in %s" msgstr "kan geen tijdelijk bestand aanmaken in %s" -#: src/tac.c:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" msgstr "openen voor schrijven van %s is mislukt" -#: src/tac.c:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" msgstr "terugspringen in stroom voor %s is mislukt" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: fout bij schrijven" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "kan %s niet openen om te lezen" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "scheidingsteken mag niet leeg zijn" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 -#, c-format +#: src/tail.c:257 +#, 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" msgstr "" "Kopieert de laatste %d regels van elk gegeven BESTAND naar " "standaarduitvoer.\n" @@ -11159,7 +11507,7 @@ msgstr "" "voorafgegaan door een kopje met de bestandsnaam.\n" "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" @@ -11169,7 +11517,7 @@ msgstr "" " bytes beginnend met Kde van elk bestand " "uitgevoerd\n" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -11183,7 +11531,7 @@ msgstr "" "follow=descriptor'\n" " -F hetzelfde als '--follow=name --retry'\n" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -11207,7 +11555,7 @@ msgstr "" " (gebruikelijk bij roterende logbestanden);\n" " met 'inotify' is deze optie zelden nuttig\n" -#: src/tail.c:293 +#: src/tail.c:288 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -11221,7 +11569,7 @@ msgstr "" "op\n" " naam gevolgd wordt (bij '--follow=name' dus)\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -11235,7 +11583,7 @@ msgstr "" " minstens eens per N seconden controleren\n" " -v, --verbose altijd bestandsnaamkopjes tonen\n" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -11254,7 +11602,7 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024, en zo verder voor T, P, E, Z, Y.\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -11274,22 +11622,22 @@ msgstr "" "houdt\n" "met hernoemen, verwijderen en opnieuw aanmaken.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "sluiten van %s (bestandsdescriptor=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: kan niet naar eind-relatieve positie %s springen" -#: src/tail.c:898 +#: src/tail.c:893 #, 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:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -11299,159 +11647,159 @@ msgstr "" "rapporteer dit a.u.b. aan %s;\n" "teruggevallen op polsen" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" "%s is vervangen door een symbolische koppeling;\n" "gestopt met volgen van deze naam" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s is ontoegankelijk geworden" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s is toegankelijk geworden" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s is verschenen; het einde van het nieuwe bestand wordt gevolgd" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s is vervangen; het einde van het nieuwe bestand wordt gevolgd" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: kan niet-blokkerende modus niet wijzigen" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: bestand is ingekort" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "geen bestanden meer over" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "kan de bovenliggende map van %s niet monitoren" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "onvoldoende hulpbronnen beschikbaar voor 'inotify'" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "kan %s niet monitoren" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: %s vervangen? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "fout bij monitoren van 'inotify'-gebeurtenis" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "fout bij lezen van 'inotify'-gebeurtenis" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: kan het einde van dit type bestand niet volgen;\n" "gestopt met volgen van deze naam" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "getal in %s is te groot" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "ongeldig maximum aantal onveranderde statusopvragingen: %s" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "ongeldig procesnummer: %s" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "ongeldig aantal seconden: %s" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "ongeldige afbreekbreedte: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "optie is gebruikt in een ongeldige context -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" "waarschuwing: '--retry' wordt genegeerd;\n" "optie '--retry' is alleen zinvol bij volgen" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "waarschuwing: '--retry' is alleen effectief bij de initiële opening" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" "waarschuwing: procesnummer is genegeerd;\n" "'--pid=PID' is alleen zinvol bij volgen" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "waarschuwing: '--pid=PID' wordt niet ondersteund op dit systeem" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "kan %s niet op naam volgen" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "waarschuwing: het onbeperkt volgen van standaardinvoer is ineffectief" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "'inotify' kan niet worden gebruikt; teruggevallen op polsen" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -11464,60 +11812,72 @@ msgstr "" " -a, --append aan BESTAND(en) toevoegen, niet overschrijven\n" " -i, --ignore-interrupts interruptsignalen negeren\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Als een BESTAND - is, dan nog eens naar standaarduitvoer kopiëren.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "ontbrekend argument na %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "ongeldig geheel getal: %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "')' werd verwacht" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "')' werd verwacht, %s gevonden" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "eenzijdige operator werd verwacht, %s gevonden" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "'-nt' accepteert geen '-l'" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "'-ef' accepteert geen '-l'" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "'-ot' accepteert geen '-l'" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "onbekende tweezijdige operator" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "tweezijdige operator werd verwacht, %s gevonden" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11532,7 +11892,7 @@ msgstr "" " of: [ OPTIE\n" "\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11540,7 +11900,7 @@ msgstr "" "Eindigt met de afsluitwaarde die bepaald wordt door de gegeven EXPRESSIE.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11550,7 +11910,7 @@ msgstr "" "Een ontbrekende EXPRESSIE evalueert tot onwaar. Voor het overige kan de\n" "EXPRESSIE waar of onwaar zijn, en mag één van de volgende zijn:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11564,7 +11924,7 @@ msgstr "" " EXPRESSIE1 -a EXPRESSIE2 waar als beide expressies waar zijn\n" " EXPRESSIE1 -o EXPRESSIE2 onwaar als beide expressies onwaar zijn\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11580,7 +11940,7 @@ msgstr "" " TEKST1 = TEKST2 waar als de twee teksten gelijk zijn\n" " TEKST1 != TEKST2 waar als de twee teksten verschillend zijn\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11598,7 +11958,7 @@ msgstr "" " GETAL1 -lt GETAL2 waar als GETAL1 kleiner is dan GETAL2\n" " GETAL1 -ne GETAL2 waar als GETAL1 en GETAL2 verschillend zijn\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11611,7 +11971,7 @@ msgstr "" " BESTAND1 -nt BESTAND2 waar als BESTAND1 nieuwer is dan BESTAND2\n" " BESTAND1 -ot BESTAND2 waar als BESTAND1 ouder is dan BESTAND2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11625,7 +11985,7 @@ msgstr "" " -d BESTAND waar als bestand een map is\n" " -e BESTAND waar als bestand bestaat\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11639,7 +11999,7 @@ msgstr "" " -h BESTAND waar als bestand een symbolische koppeling is (== '-L')\n" " -k BESTAND waar als bestand het \"sticky\"-bit aan heeft staan\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11653,7 +12013,7 @@ msgstr "" " -r BESTAND waar als bestand voor u leesbaar is\n" " -s BESTAND waar als bestand niet leeg is\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11667,7 +12027,7 @@ msgstr "" " -w BESTAND waar als bestand voor u schrijfbaar is\n" " -x BESTAND waar als bestand door u uitvoerbaar (of doorzoekbaar) is\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11681,7 +12041,7 @@ msgstr "" "haakjes aangehaald moeten worden (bijvoorbeeld met backslashes).\n" "GETAL mag ook '-l TEKST' zijn, wat evalueert tot de lengte van TEKST.\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11692,25 +12052,25 @@ msgstr "" "'test'\n" "behandelt deze opties zoals het elke andere niet-lege tekenreeks behandelt.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "'test'/'['" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "ontbrekende ']'" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "overtollig argument: %s" @@ -11730,7 +12090,7 @@ msgstr "Waarschuwing: kan timertijd niet instellen" msgid "warning: timer_create" msgstr "Waarschuwing: kan timer niet aanmaken" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11739,12 +12099,12 @@ msgstr "" "Gebruik: %s [OPTIE] DUUR COMMANDO [ARGUMENT...]\n" " of: %s [OPTIE]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" "Start het gegeven COMMANDO, en beëindigt het als het na DUUR nog actief is.\n" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11782,7 +12142,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:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11793,7 +12153,7 @@ msgstr "" "DUUR is een drijvendekommagetal met een optioneel achtervoegsel: 's' voor\n" "seconden (standaard), 'm' voor minuten, 'h' voor uren, 'd' voor dagen.\n" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -11817,7 +12177,7 @@ msgstr "" "128+9\n" "in plaats van 124.\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "waarschuwing: uitschakelen van geheugendumps is mislukt" @@ -11832,6 +12192,11 @@ msgstr "fout bij het wachten op commando" msgid "the monitored command dumped core" msgstr "het gemonitorde commando heeft een geheugendump gemaakt" +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "onbekende afsluitwaarde (0x%X) van commando" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -12211,12 +12576,12 @@ msgstr "Eindigt met de afsluitwaarde die succes aangeeft." msgid "Exit with a status code indicating failure." msgstr "Eindigt met de afsluitwaarde die mislukking aangeeft." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Gebruik: %s OPTIE... BESTAND...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -12234,18 +12599,18 @@ msgstr "" "gegevens verloren. Als een BESTAND kleiner is, dan wordt het uitgebreid en\n" "het \"toegevoegde\" deel (een gat) leest als nul-bytes.\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create geen bestanden aanmaken\n" -#: src/truncate.c:112 +#: src/truncate.c:85 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:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" @@ -12253,7 +12618,7 @@ msgstr "" " -r, --reference=BESTAND de grootte van dit BESTAND gebruiken\n" " -s, --size=GROOTTE deze GROOTTE gebruiken\n" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -12266,57 +12631,62 @@ msgstr "" "'/' naar beneden afronden op een veelvoud van,\n" "'%' naar boven afronden op een veelvoud van.\n" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "overloop in % * %-byte blokken voor bestand %s" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: bestand heeft een onbruikbare, kennelijk negatieve grootte" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "kan de grootte van %s niet achterhalen" -#: src/truncate.c:205 +#: src/truncate.c:178 #, 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:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "overloop bij het vergroten van de grootte van bestand %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "afkorten van %s op % bytes is mislukt" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "er is meer dan één relatieve wijziging opgegeven" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "ongeldig getal: %s" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "u moet ofwel %s ofwel %s opgeven" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "u moet een relatieve %s opgeven bij %s" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "%s is gespecificeerd maar %s niet" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "kan %s niet openen om te schrijven" @@ -12327,12 +12697,10 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Gebruik: %s [OPTIE] [BESTAND]\n" "\n" @@ -12342,12 +12710,17 @@ msgstr "" "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: invoer bevat een oneven aantal elementen" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: invoer bevat een lus:" @@ -12415,9 +12788,8 @@ msgid "cannot get system name" msgstr "kan de naam van het systeem niet verkrijgen" #: 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" +#, fuzzy +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "Stuurt elk BESTAND naar standaarduitvoer met witruimte geconverteerd naar " "tabs.\n" @@ -12478,9 +12850,10 @@ msgstr "" "voorkomen\n" #: src/uniq.c:187 +#, fuzzy msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" " -D, --all-repeated[=SCHEIDINGSMETHODE]\n" @@ -12495,9 +12868,10 @@ msgid " -f, --skip-fields=N avoid comparing the first N fields\n" msgstr " -f, --skip-fields=N de eerste N velden niet vergelijken\n" #: src/uniq.c:195 +#, fuzzy msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" " --group[=SCHEIDINGSMETHODE]\n" @@ -12664,11 +13038,6 @@ msgstr "" "een niet-onderbreekbare slaapstatus dragen ook bij aan het " "belastingsgemiddelde.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -12692,12 +13061,17 @@ msgstr "" "Gewoonlijk wordt %s als BESTAND meegegeven.\n" "\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -12721,12 +13095,13 @@ msgstr "" " -l, --lines het aantal regels tonen (in feite het aantal LF-" "tekens)\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=LST invoer lezen uit de bestanden die opgesomd staan " @@ -12902,10 +13277,10 @@ msgstr "" "(Hetzelfde als 'id -un'.)\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: kan geen gebruikersnaam vinden voor gebruikers-ID %lu\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "kan geen naam vinden bij gebruikers-ID %s" #: src/yes.c:41 #, c-format @@ -12925,6 +13300,246 @@ msgstr "" "Produceert voortdurend een regel met de gegeven TEKST (of anders 'y').\n" "\n" +#~ 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" + +# FIXME: don't use fill-in words +#~ msgid "failed to %s supplemental groups" +#~ msgstr "kan aanvullende groepen niet «%s»" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: ongeldig getal" + +#~ 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 "" +#~ "\n" +#~ "Het zenden van een %s-signaal naar een werkend 'dd'-proces zorgt ervoor " +#~ "dat\n" +#~ "I/O-statistieken naar standaardfoutuitvoer gaan, waarna het kopiëren " +#~ "doorgaat.\n" +#~ "\n" +#~ " $ dd if=/dev/zero of=/dev/null& pid=$!\n" +#~ " $ kill -%s $pid; sleep 1; kill $pid\n" +#~ " 18335302+0 records gelezen\n" +#~ " 18335302+0 records geschreven\n" +#~ " 9387674624 bytes (9.4 GB) gekopieerd, 34.6279 seconden, 271 MB/s\n" +#~ "\n" +#~ "Opties zijn:\n" +#~ "\n" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s is zo groot dat het niet weergegeven kan worden" + +#~ msgid "number of lines" +#~ msgstr "aantal regels" + +#~ msgid "number of bytes" +#~ msgstr "aantal bytes" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: ongeldig aantal om uit te sluiten" + +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "Optie '-t' is standaard als PAGINALENGTE kleiner of gelijk aan 10 is.\n" +#~ "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" + +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Zonder BESTAND, of wanneer BESTAND - is, wordt standaardinvoer gelezen.\n" +#~ "Optie '-F /' is standaard.\n" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "ongeldig aantal bytes: %s" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "ongeldig aantal regels: %s" + +#~ 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 TEKEN TEKEN voert het volgende TEKEN aangehaald in\n" +#~ " quit TEKEN TEKEN zendt een afsluitingssignaal\n" +#~ " * rprnt TEKEN TEKEN herschrijft de huidige regel\n" +#~ " start TEKEN TEKEN herstart de uitvoer nadat deze is gestopt\n" + +#~ 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-\n" +#~ " * [-]cdtrdsr DTR/DSR-handshake inschakelen\n" +#~ " csN tekengrootte op N bits instellen; N in [5..8]\n" + +#~ 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 "" +#~ "\n" +#~ "Uitvoerinstellingen:\n" +#~ " * bsN backspace-vertragingsstijl; N in [0..1]\n" +#~ " * crN 'carriage return'-vertragingsstijl, N in [0..3]\n" +#~ " * ffN 'form feed'-vertragingsstijl; N in [0..1]\n" +#~ " * nlN nieuweregel-vertragingsstijl; N in [0..1]\n" + +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl CR-teken (naar regelbegin) omzetten in LF-teken " +#~ "(nieuweregel)\n" +#~ " * [-]ofdel als opvulling DEL-tekens gebruiken in plaats van NUL-" +#~ "tekens\n" +#~ " * [-]ofill voor vertragingen opvultekens gebruiken in plaats van " +#~ "pauzes\n" +#~ " * [-]olcuc kleine letters omzetten in hoofdletters\n" +#~ " * [-]onlcr LF-teken (nieuweregel) omzetten in CR-teken (naar " +#~ "regelbegin)\n" +#~ " * [-]onlret 'nieuweregel' voert ook een 'naar regelbegin' uit\n" + +#~ 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 "" +#~ " * [-]onocr geen 'naar regelbegin' uitvoeren wanneer in de eerste " +#~ "kolom\n" +#~ " [-]opost na-proces-uitvoer\n" +#~ " * tabN vertragingsstijl voor horizontale tab; N in [0..3]\n" +#~ " * tabs hetzelfde als 'tab0'\n" +#~ " * -tabs hetzelfde als 'tab3'\n" +#~ " * vtN vertragingsstijl voor verticale tab; N in [0..1]\n" + +#~ 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 "" +#~ " * [-]ctlecho stuurtekens in dakjesnotatie tonen (^c)\n" +#~ " [-]echo invoertekens echoën\n" +#~ " * [-]echoctl hetzelfde als '[-]ctlecho'\n" +#~ " [-]echoe hetzelfde als '[-]crterase'\n" +#~ " [-]echok een nieuweregel-teken echoën na een kill-teken\n" + +#~ 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 "" +#~ " * [-]echoke hetzelfde als '[-]crtkill'\n" +#~ " [-]echonl nieuweregel echoën zelfs als geen andere tekens worden " +#~ "geëchood\n" +#~ " * [-]echoprt verwijderde tekens achterwaarts echoën, tussen '\\' en " +#~ "'/'\n" +#~ " [-]icanon speciale tekens voor erase, kill, werase, en rprnt " +#~ "inschakelen\n" +#~ " [-]iexten niet-POSIX speciale tekens inschakelen\n" + +#~ 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 "" +#~ " dec hetzelfde als 'echoe echoctl echoke -ixany intr ^c\n" +#~ " erase 0177 kill ^u'\n" +#~ " * [-]decctlq hetzelfde als '[-]ixany'\n" +#~ " ek de erase- en kill-tekens op hun standaardwaarden zetten\n" +#~ " evenp hetzelfde als 'parenb -parodd cs7'\n" + +#~ 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 "" +#~ " -evenp hetzelfde als '-parenb cs8'\n" +#~ " * [-]lcase hetzelfde als 'xcase iuclc olcuc'\n" +#~ " litout hetzelfde als '-parenb -istrip -opost cs8'\n" +#~ " -litout hetzelfde als 'parenb istrip opost cs7'\n" +#~ " nl hetzelfde als '-icrnl -onlcr\n" +#~ " -nl hetzelfde als 'icrnl -inlcr -igncr onlcr -ocrnl -" +#~ "onlret'\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Schrijft veranderde blokken naar schijf, en werkt het superblok bij.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "alle argumenten worden genegeerd" + +#~ msgid "For complete documentation, run: info coreutils '%s invocation'\n" +#~ msgstr "" +#~ "Voor volledige documentatie, gebruik: info coreutils '%s invocation'\n" + +#~ msgid "number in %s is too large" +#~ msgstr "getal in %s is te groot" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "ongeldig aantal seconden: %s" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: kan geen gebruikersnaam vinden voor gebruikers-ID %lu\n" + #~ msgid "cannot create pipe" #~ msgstr "kan geen pijp aanmaken" @@ -13388,20 +14003,6 @@ msgstr "" #~ " -v, --verbose een melding geven voor elk gezien bestand\n" #~ "\n" -#~ msgid "" -#~ "Display the current time in the given FORMAT, or set the system date.\n" -#~ "\n" -#~ " -d, --date=STRING display time described by STRING, not `now'\n" -#~ " -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -#~ msgstr "" -#~ "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" - #~ msgid "" #~ "\n" #~ "SIZE may be (or may be an integer optionally followed by) one of " diff --git a/po/pl.gmo b/po/pl.gmo index 2bdd8746..ef5683b9 100644 Binary files a/po/pl.gmo and b/po/pl.gmo differ diff --git a/po/pl.po b/po/pl.po index 8c5fbd83..109a46b1 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,8 +1,8 @@ # Polish translation of GNU coreutils messages -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc. # This file is distributed under the same license as the coreutils package. # Contributions: -# Rafał Maszkowski 1996-2001, 2003-2014. +# Rafał Maszkowski 1996-2001, 2003-2015. # ptx: Paweł Krawczyk , 1996. # sh-utils: Paweł Krawczyk , 1997, 1998, 1999. # fileutils: Thanks for help to Marta Bartnicka, 1999. @@ -12,12 +12,13 @@ # 3 corrections: Andrzej Krzysztofowicz , 2006. # 1 correction: Daniel Janus , 2007. # 2 format strings: Jakub Bogusz , 2007. +#: src/stty.c:941 msgid "" msgstr "" -"Project-Id-Version: coreutils 8.23-pre1\n" +"Project-Id-Version: coreutils 8.24-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" -"PO-Revision-Date: 2014-07-15 00:15+0200\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" +"PO-Revision-Date: 2015-06-29 17:05+0200\n" "Last-Translator: Rafał Maszkowski \n" "Language-Team: Polish \n" "Language: pl\n" @@ -45,18 +46,18 @@ msgstr "Prawidłowe argumenty to:" msgid "error closing file" msgstr "błąd zamknięcia pliku" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "błąd zapisu" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "zachowanie uprawnień %s" @@ -237,57 +238,62 @@ msgstr "Źle zakodowana specyfikacja parametrów" msgid "Unknown error" msgstr "Nieznany błąd" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: opcja „%s” jest niejednoznaczna; możliwości:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: opcja „%s” jest niejednoznaczna\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: opcja „--%s” nie może mieć argumentu\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: opcja „%c%s” nie może mieć argumentu\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: opcja „--%s” wymaga argumentu\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: nierozpoznana opcja „--%s”\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: nierozpoznana opcja „--%c%s”\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%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 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opcja wymaga argumentu -- „%c”\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: opcja „-W %s” jest niejednoznaczna\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: opcja „-W %s” nie może mieć argumentu\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: opcja „-W %s” wymaga argumentu\n" @@ -297,13 +303,13 @@ msgstr "%s: opcja „-W %s” wymaga argumentu\n" msgid "cannot change permissions of %s" msgstr "nie można zmienić uprawnień do %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "nie można utworzyć katalogu %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "brak pamięci" @@ -352,6 +358,12 @@ msgstr "”" msgid "%s: end of file" msgstr "%s: koniec pliku" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: błąd odczytu" + #: lib/regcomp.c:131 msgid "Success" msgstr "Sukces" @@ -460,7 +472,7 @@ msgstr "^[yYtT]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "nie można ustawić uprawnień do %s" @@ -895,7 +907,7 @@ msgstr "" "Zakodowane lub zdekodowanie kodem 64-znakowym (base64) PLIKU albo danych\n" "między standardowym wejściem i wyjściem.\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -912,16 +924,7 @@ msgstr "" " 76), 0 wyłącza zawijanie\n" "\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Jeżeli nie został podany PLIK albo podany jest jako -, czytane jest\n" -"standardowe wejście.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -936,51 +939,51 @@ msgstr "" "będzie\n" "próbował opuścić jakiekolwiek inne znaki nie z alfabetu base64.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "błąd czytania" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "błędne dane wejściowe" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "błędny rozmiar zawijania: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "nadmiarowy argument %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "zamknięcie standardowego wejścia" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1031,38 +1034,41 @@ msgstr "" " %s -a any/str1 any/str2 -> \"str1\", a po nim \"str2\"\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "brakujący argument" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Składnia: %s [OPCJA]... [PLIK]...\n" #: src/cat.c:92 +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "PLIK lub połączenie PLIKÓW wysyłane na standardowe wyjście.\n" + +#: src/cat.c:98 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" @@ -1071,7 +1077,6 @@ msgid "" " -n, --number number all output lines\n" " -s, --squeeze-blank suppress repeated empty output lines\n" msgstr "" -"Połączenie PLIKU(ÓW) albo standardowego wejścia i przekazanie na wyjście.\n" "\n" " -A, --show-all równoważne -vET\n" " -b, --number-nonblank numerowanie niepustych linii na wyjściu,\n" @@ -1081,7 +1086,7 @@ msgstr "" " -n, --number numerowanie wszystkich linii na wyjściu\n" " -s, --squeeze-blank nigdy więcej niż jedna pusta linia\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1093,7 +1098,7 @@ msgstr "" " -u (ignorowane)\n" " -v, --show-nonprinting użycie zapisu ^ i M-, oprócz LFD i TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1107,17 +1112,18 @@ msgstr "" " zawartości g.\n" " %s Skopiowanie standardowego wejścia na standardowe wyjście.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "nie można wykonać ioctl na %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "standardowe wyjście" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: plik wejściowy jest plikiem wyjściowym" @@ -1129,10 +1135,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1146,8 +1152,8 @@ msgstr "błąd tworzenia kontekstu bezpieczeństwa: %s" msgid "failed to set %s security context component to %s" msgstr "błąd przy ustawiania kontekstu bezpieczeństwa %s jako %s" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "nie udało się odczytać kontekstu bezpieczeństwa %s" @@ -1162,13 +1168,13 @@ msgstr "nie można zastosować częściowego kontekstu do pliku %s bez etykiety" 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:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "nie ma dostępu do %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "nie można przeczytać katalogu %s" @@ -1184,7 +1190,7 @@ msgstr "zmiana kontekstu bezpieczeństwa %s\n" msgid "fts_read failed" msgstr "błąd fts_read" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1307,7 +1313,7 @@ msgid "-R -h requires -P" msgstr "-R -h wymagają podania -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1324,9 +1330,8 @@ msgid "conflicting security context specifiers given" msgstr "podano sprzeczne specyfikacje kontekstów bezpieczeństwa" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "nie udało się odczytać atrybutów %s" @@ -1641,17 +1646,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "błędna grupa %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "błędna lista grup %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1660,7 +1665,7 @@ msgstr "" "Składnia: %s [OPCJA] NOWY_ROOT [POLECENIE [ARGUMENT]...]\n" " albo: %s OPCJA\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1668,16 +1673,23 @@ msgstr "" "Uruchomienie polecenia w katalogiem root ustawionym na NOWY_ROOT.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" msgstr "" -" --userspec=UŻYTK:GRUPA podanie użytkownika i grupy (liczbowo lub przez\n" -" nazwę)\n" " --groups=LISTA_GRUP podanie grup dodatkowych w postaci g1,g2,..,gN\n" -#: src/chroot.c:203 +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" +" --userspec=UŻYTK:GRUPA podanie UŻYTKOWNIKA i GRUPY (liczbowo lub przez\n" +" nazwę)\n" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr " --skip-chdir bez zmiany bieżącego katalogu na %s\n" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" @@ -1686,42 +1698,48 @@ msgstr "" "Jeżeli nie jest podane żadne polecenie, uruchamiany jest „${SHELL} -i”\n" "(domyślnie: „/bin/sh -i”).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" +"opcja --skip-chdir jest dozwolona tylko jeżeli NOWY_ROOT jest starym %s" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "nie można zmienić katalogu root na %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "nie można przejść do katalogu root" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "brak podanej grupy dla nieznanego uid: %d" -#: src/chroot.c:383 +#: src/chroot.c:400 #, c-format msgid "failed to get supplemental groups" msgstr "nie udało się pobrać informacji o grupach dodatkowych" -#: src/chroot.c:395 +#: src/chroot.c:412 #, c-format -msgid "failed to %s supplemental groups" -msgstr "nie udało się %s grup dodatkowych" +msgid "failed to set supplemental groups" +msgstr "nie udało się ustawić informacji o grupach dodatkowych" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "nie udało się ustawić identyfikatora grupy" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "nie udało się ustawić identyfikatora użytkownika" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "nie udało się uruchomić polecenia %s" @@ -1760,7 +1778,16 @@ msgstr "Składnia: %s [OPCJA]... PLIK1 PLIK2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Porównanie posortowanych plików PLIK1 i PLIK2 linia po linii.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Jeżeli PLIK1 albo PLIK2 (nie oba) został podany jako -, czytane jest\n" +"standardowe wejście.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1772,7 +1799,7 @@ msgstr "" "występujące tylko w PLIKU1, druga - tylko w PLIKU2, trzecia - występujące w\n" "obu plikach.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1784,7 +1811,7 @@ msgstr "" " -2 bez kolumny 2 (linii, które są tylko w PLIKU2\n" " -3 bez kolumny 3 (linii, które są w obu plikach\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1798,11 +1825,11 @@ msgstr "" " --nocheck-order bez sprawdzenia czy dane wejściowe są prawidłowo\n" " posortowane\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=NAPIS oddzielenie kolumn przez NAPIS\n" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" @@ -1811,7 +1838,7 @@ msgstr "" "Zauważ, że porównania odbywają się zgodnie z regułami podanymi\n" "przez „LC_COLLATE”.\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1827,320 +1854,334 @@ msgstr "" " %s -3 plik1 plik2 Wypisanie linii, które są w pliku1, a nie ma ich w\n" " pliku2 i odwrotnie\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "plik %d nie jest posortowany" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "podano wiele ograniczników" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "pusty %s nie jest dozwolony" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 -#, c-format -msgid "error reading %s" -msgstr "błąd czytania %s" - -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:181 src/copy.c:452 #, c-format msgid "cannot lseek %s" msgstr "nie można wykonać lseek na %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:191 src/copy.c:554 +#, c-format +msgid "error deallocating %s" +msgstr "błąd zwalaniania %s" + +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 +#, c-format +msgid "error reading %s" +msgstr "błąd czytania %s" + +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "błąd zapisu %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, c-format +msgid "overflow reading %s" +msgstr "przepełnienie przy czytaniu %s" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s: nie udało się odczytać informacji o rozszerzeniach" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: błąd zapisu" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "nie udało się rozszerzyć %s" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "kasowanie uprawnień dla %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "nie udało się zachować własności %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "nie udało się znaleźć pliku %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "nie udało się zachować autorstwa %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "nie udało się ustawić domyślnego kontekstu tworzenia pliku %s" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "nie udało się ustawić domyślnego kontekstu tworzenia pliku %s" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "nie udało się ustawić kontekstu bezpieczeństwa %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "nie można otworzyć %s do czytania" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "nie można wykonać fstat na %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "plik %s został ominięty, bo został zmieniony w trakcie kopiowania" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "nie można usunąć %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "usunięty %s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "" "bez zapisu przez dowiązanie symboliczne %s, które nie wskazuje na istniejący " "plik" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "nie można utworzyć zwykłego pliku %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "nie udało się sklonować %s z %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "zachowanie czasu %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "nie udało się zamknąć %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: zastępowanie %s, obejść uprawnienia %04lo (%s)? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "%s: niezapisywalny %s (uprawnienia %04lo, %s); jednak spróbować? " -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: zamazać %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (kopia zapasowa: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, 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:1706 +#: src/copy.c:1795 #, 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:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "nie można wykonać stat na %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "katalog %s został pominięty" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" -msgstr "uwaga: plik źródłowy %s pojawił się więcej niż raz" +msgstr "uwaga: plik źródłowy %s podany więcej niż raz" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s i %s to ten sam plik" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "nie można zamazać nie-katalogu %s katalogiem %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "nie można zamazać właśnie utworzonego %s plikiem %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "nie można zamazać katalogu %s nie-katalogiem" -#: src/copy.c:1989 +#: src/copy.c:2069 #, 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:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "nie można utworzyć kopii zapasowej %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, 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:2201 +#: src/copy.c:2272 +#, c-format +msgid "warning: source directory %s specified more than once" +msgstr "uwaga: katalog źródłowy %s podany więcej niż raz" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "nie można przenieść %s do %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "nie można skopiować cyklicznego dowiązania symbolicznego %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "nie można utworzyć dowiązania symbolicznego %s do %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "nie można utworzyć potoku %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "nie można utworzyć pliku specjalnego %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "nie można przeczytać dowiązania symbolicznego %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "nie można utworzyć dowiązania symbolicznego %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s to nieznany typ pliku" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "nie można przywrócić kopii zapasowej %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (przywrócenie kopii zapasowej)\n" @@ -2150,12 +2191,12 @@ msgstr "%s -> %s (przywrócenie kopii zapasowej)\n" msgid "Alex Deymo" msgstr "Alex Deymo" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "Składnia: %s --coreutils-prog=NAZWA_PROGRAMU [PARAMETRY]... \n" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" @@ -2163,7 +2204,7 @@ msgstr "" "Uruchomienie wbudowanego programu NAZWA_PROGRAMU z podanymi PAREMATERAMI.\n" "\n" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" @@ -2173,7 +2214,7 @@ msgstr "" "Wywołaj „%s --coreutils-prog=NAZWA_PROGRAMU --help” żeby przeczytać\n" "informacje o podanym programie.\n" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, c-format msgid "unknown program %s" msgstr "nieznany program %s" @@ -2461,8 +2502,8 @@ msgstr "%s istnieje, ale nie jest katalogiem" msgid "failed to access %s" msgstr "nie udało się uzyskać dostępu do %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "brakujący argument plikowy" @@ -2540,131 +2581,130 @@ msgstr "" "xattr" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "dane wejściowe zniknęły" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: numer linii spoza zakresu" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: numer linii spoza zakresu" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " przy powtórzeniu %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: nie pasuje" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "błąd szukania wyrażenia regularnego" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "błąd pisania dla %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: po ograniczniku powinna być liczba całkowita" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: „}” jest wymagany w liczniku powtórzeń" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: między „{” a „}” musi być liczba całkowita" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: brak zamykającego ogranicznika „%c”" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: błędne wyrażenie regularne: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: błędny wzorzec" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: numer linii musi być większy od zera" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "brak określenia konwersji w rozszerzeniu" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "błędne określenie konwersji w rozszerzeniu: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "błędne określenie konwersji w rozszerzeniu: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "błędne flagi w specyfikacji przekształcenia: %%%c%c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "za dużo określeń konwersji %% w rozszerzeniu" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "brak określenia konwersji %% w rozszerzeniu" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: błędna liczba" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +msgid "invalid number" +msgstr "błędna liczba" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Składnia: %s [OPCJA]... PLIK WZORZEC...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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" @@ -2673,7 +2713,15 @@ msgstr "" "„xx02,”\n" "..., i podanie na standardowym wyjściu liczby bajtów w każdym kawałku.\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Jeżeli PLIK jest podany jako -, czytane jest standardowe wejście.\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2685,11 +2733,11 @@ msgstr "" " -k, --keep-files bez kasowania plików wyjściowych w razie " "błędów\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr " -m, --suppress-matched pominięcie linii pasujących do WZORCA\n" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2700,18 +2748,10 @@ msgstr "" "wyjściowych\n" " -z, --elide-empty-files usunięcie pustych plików wyjściowych\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Jeżeli PLIK jest podany jako -, czytane jest standardowe wejście.\n" -"Możliwe WZORCE:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 msgid "" "\n" +"Each PATTERN may be:\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" @@ -2721,6 +2761,7 @@ msgid "" "A line OFFSET is a required '+' or '-' followed by a positive integer.\n" msgstr "" "\n" +"Możliwe WZORCE:\n" " LICZBA_CAŁKOWITA kopiowanie do podanej linii o numerze " "LICZBA_CAŁKOWITA,\n" " oprócz tej linii\n" @@ -2749,7 +2790,7 @@ msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" "Wypisywanie wybranych części linii z każdego PLIKU na standardowe wyjście.\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2760,7 +2801,7 @@ msgstr "" " -d, --delimiter=OGRANICZNIK użycie OGRANICZNIKA zamiast TABa jako " "separatora\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2773,7 +2814,7 @@ msgstr "" " opcja -s\n" " -n (ignorowane)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2782,7 +2823,7 @@ msgstr "" "znaków\n" " albo pól\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2794,7 +2835,7 @@ msgstr "" " wyjściowych, domyślnie używany jest separator\n" " danych wejściowych\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2807,7 +2848,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:210 +#: src/cut.c:211 msgid "" "Each range is one of:\n" "\n" @@ -2815,8 +2856,6 @@ msgid "" " 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 "" "Każdy zakres to:\n" "\n" @@ -2824,54 +2863,52 @@ msgstr "" " N- od N-tego bajtu, znaku lub pola do końca linii\n" " N-M od N-tego do M-tego (włącznie) bajtu, znaku lub pola\n" " -M od pierwszego do M-tego (włącznie) bajtu, znaku lub pola\n" -"\n" -"Jeżeli PLIK nie jest podany albo podany jako -, czytane jest\n" -"standardowe wejście.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "błędna lista bajtów, znaków lub pól" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "pola i pozycje są numerowane od 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "błędny zakres bez podania końca: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "błędny zakres od większego do mniejszego" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "przesunięcie bajtowe %s jest za duże" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "numer pola %s jest za duży" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "można podać tylko jeden typ listy" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "ogranicznik musi być pojedynczym znakiem" -#: src/cut.c:787 +#: src/cut.c:786 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:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2879,11 +2916,11 @@ msgstr "" "blokowanie wyświetlania linii bez ograniczników jest sensowne\n" "\ttylko dla operacji na polach" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "brakująca lista pól" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "brakująca lista pozycji" @@ -2904,55 +2941,68 @@ 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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" msgstr "" -" -d, --date=SPECYFIKACJA wypisanie czasu podanego przez SPECYFIKACJĘ, " -"nie\n" -" bieżącego (now)\n" +" -d, --date=SPECYFIKACJA wypisanie czasu podanego w SPECYFIKACJI,\n" +" nie 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" -" pożądaną dokładnością.\n" -#: src/date.c:142 +#: src/date.c:138 +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" +msgstr "" +" -I[FORMAT], --iso-8601[=FORMAT] wypisanie daty/czasu w formacie ISO " +"8601.\n" +" FORMAT=„date” dla podania samej daty (tryb\n" +" domyślny), „hours” (godziny), „minutes”,\n" +" „seconds” albo „ns” dla podania daty i czasu\n" +" z pożądaną dokładnością.\n" +" Przykład: 2006-08-14T02:34:56-0600\n" + +#: src/date.c:145 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" -" -r, --reference=PLIK wyświetla czas ostatniej modyfikacji PLIKU\n" " -R, --rfc-822 wypisuje datę i czas zgodnie z RFC 2822\n" +" Przykład: Mon, 14 Aug 2006 02:34:56 -0600\n" + +#: src/date.c:149 +msgid "" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" +msgstr "" +" --rfc-3339=FORMAT wypisuje datę i czas w formacie RFC 3339.\n" +" Dla osiągnięcia pożądanej dokładności należy\n" +" podać FORMAT=„date” (data), „seconds” albo\n" +" „ns”. Przykład: 2006-08-07 12:34:56-06:00\n" -#: 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 (UTC)\n" -msgstr "" -" --rfc-3339=CZAS wypisuje data i czas w formacie RFC 3339.\n" -" Dla osiągnięcia żądanej dokładności należy\n" -" 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 uniwersalny czas\n" -" koordynowany (UTC)\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" +" -r, --reference=PLIK wyświetla czas ostatniej modyfikacji PLIKU\n" #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" +" -s, --set=SPECYFIKACJA ustawia czas podany w SPECYFIKACJI\n" +" -u, --utc, --universal wyświetla lub ustawia uniwersalny czas\n" +" koordynowany (UTC)\n" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2965,7 +3015,7 @@ msgstr "" " %% znak procenta %\n" " %a lokalny skrót nazwy dnia tygodnia (np. pon)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2977,7 +3027,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:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2989,7 +3039,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:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -3001,7 +3051,7 @@ msgstr "" " %G rok odpowiadający numerowi tygodnia ISO (zob. %V); zwykle użyteczne\n" " tylko z %V\n" -#: src/date.c:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -3013,7 +3063,7 @@ msgstr "" " %I godzina (01...12)\n" " %j dzień roku (001...366)\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -3025,7 +3075,7 @@ msgstr "" " %m miesiąc (01...12)\n" " %M minuta (00...59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -3043,7 +3093,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:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3055,7 +3105,7 @@ msgstr "" " %T czas; to samo co %H:%M:%S\n" " %u dzień tygodnia (1..7); 1 to poniedziałek\n" -#: src/date.c:209 +#: src/date.c:215 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" @@ -3067,7 +3117,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:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3079,7 +3129,7 @@ msgstr "" " %y dwie ostatnie cyfry roku (00...99)\n" " %Y rok\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3100,7 +3150,7 @@ msgstr "" "\n" "Domyślnie numeryczne pola daty są dopełniane zerami.\n" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3118,7 +3168,7 @@ msgstr "" " ^ używanie wielkich liter jeżeli to możliwe\n" " # użycie małych liter zamiast wielkich i odwrotnie, jeżeli to możliwe\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3133,7 +3183,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:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3159,35 +3209,35 @@ msgstr "" "USA:\n" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "standardowe wejście" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "błędna data: %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "podano wiele formatów wyjściowych" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3198,23 +3248,23 @@ msgstr "" "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 „+”" -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "ustawienie daty niemożliwe" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3223,7 +3273,7 @@ msgstr "" "Składnia: %s [ARGUMENT]...\n" " albo: %s OPCJA\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3243,7 +3293,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:541 +#: src/dd.c:570 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3252,8 +3302,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=PLIK czytanie z PLIKU zamiast ze standardowego wejścia\n" " iflag=FLAGI czytanie zgodnie z podaną listą słów kluczowych\n" @@ -3264,11 +3316,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=JAKIE JAKIE informacje nie będą wysyłane na standardowe\n" -" wyjście błędu: „noxfer” - bez statystyki kopiowania,\n" -" „none” - żadnych informacji\n" +" status=POZIOM POZIOM informacji wypisywanych przez standardowe\n" +" wyjście błędu:\n" +" „none” - wyłącza informacje oprócz komunikatów o " +"błędach,\n" +" „noxfer” - wyłącza końcową statystykę kopiowania,\n" +" „progress” - włącza periodyczną statystykę kopiowania.\n" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3286,7 +3341,7 @@ msgstr "" "Każde SŁOWO_KL może być:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3316,7 +3371,7 @@ msgstr "" " jeżeli użyte z block albo unblock, dopełnienie spacjami zamiast\n" " NULami\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3332,7 +3387,7 @@ msgstr "" " fdatasync wymuszenie fizycznego zapisu danych przed zakończeniem\n" " fsync jak fdatasync, ale też dla metadanych\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3345,87 +3400,81 @@ msgstr "" "\n" " append tryb dopisywania (ma sens tylko dla wyjścia)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio użycie równoległego I/O dla danych\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct dane zapisywane przez bezpośrednie I/O\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory błąd jeżeli nie katalog\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync dane zapisywane przez synchronizowane I/O\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync podobnie, ale też dla metadanych\n" -#: src/dd.c:598 +#: src/dd.c:629 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:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock użycie nie blokującego I/O\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime bez aktualizacji czasu dostępu\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nocache skasowanie pamięci podręcznej\n" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty bez przyporządkowywania terminala sterującego - pliku\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow bez rozwijania dowiązań symbolicznych\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks błąd jeżeli wielokrotnie dołączony\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary użycie binarnego I/O dla danych\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text użycie tekstowego I/O dla danych\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr " count_bytes traktowanie „count=N” jak liczby najtów (tylko iflag)\n" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr " skip_bytes traktowanie „skip=N” jak liczby bajtów (tylko iflag)\n" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr " seek_bytes traktowanie „seek=N” jak liczby bajtów (tylko oflag)\n" -#: src/dd.c:631 +#: src/dd.c:661 #, 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 "" @@ -3434,41 +3483,22 @@ msgstr "" "statystyki wejścia i wyjścia na standardowym wyjściu błędów i kontynuację\n" "kopiowania.\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" +"Opcje:\n" "\n" -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "pamieć wyczerpana przez bufor wejściowy o rozmiarze %zu bajtów (%s)" - -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" -msgstr "pamieć wyczerpana przez bufor wyjściowy o rozmiarze %zu bajtów (%s)" - -#: src/dd.c:748 +#: src/dd.c:699 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -"%+% przeczytanych recordów\n" -"%+% zapisanych recordów\n" +"pamieć wyczerpana przez bufor wejściowy o rozmiarze % bajtów (%s)" -#: src/dd.c:754 +#: src/dd.c:721 #, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% obcięty rekord\n" -msgstr[1] "% obcięte rekordy\n" -msgstr[2] "% obciętych rekordów\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" +msgstr "" +"pamieć wyczerpana przez bufor wyjściowy o rozmiarze % bajtów (%s)" -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" @@ -3476,7 +3506,7 @@ msgstr[0] "skopiowany % bajt (%s)" msgstr[1] "skopiowane % bajty (%s)" msgstr[2] "skopiowane % bajtów (%s)" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "nieskończenie wiele B" @@ -3490,83 +3520,100 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, c-format +msgid ", %.6f s, %s/s" +msgstr ", %.6f s, %s/s" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% przeczytanych recordów\n" +"%+% zapisanych recordów\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% obcięty rekord\n" +msgstr[1] "% obcięte rekordy\n" +msgstr[2] "% obciętych rekordów\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "zamykanie pliku wejściowego %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "zamknięcie pliku wyjściowego %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "nie udało się wyłączyć O_DIRECT: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "zapis do %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "nierozpoznany argument %s" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "błędna konwersja" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "błędna flaga wejściowa" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "błędna flaga wyjściowa" -#: src/dd.c:1294 -msgid "invalid status flag" -msgstr "błędna flaga stanu" - -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "błędna liczba %s" +#: src/dd.c:1385 +msgid "invalid status level" +msgstr "błędny poziom argumentu status" -#: src/dd.c:1415 +#: src/dd.c:1518 #, 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:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "nie można użyć block i unblock równocześnie" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "nie można użyć razem lcase i ucase" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "nie można użyć razem excl i nocreat" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "nie można użyć razem direct i nocache" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3575,62 +3622,62 @@ msgstr "" "uwaga: ominięcie błędu działania lseek w jądrze dla pliku (%s)\n" " o mt_type=0x%0lx - zobacz listę typów w " -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: nie przeskoczyć na wejściu" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: nie można ustawić pozycji na wyjściu" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "przepełnienie licznika pozycji w czasie czytanie pliku %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "uwaga: błędna pozycja w pliku po nieudanym czytaniu" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "nie udało się obejść błędu jądra" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "ustawienie flag dla %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: nie można przeskoczyć do podanej pozycji na wejściu" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "nie udało się obciąć pliku do % bajtów w pliku wyjściowym %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "nieudany fdatasync dla %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "nieudany fsync dla %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "nie udało się otworzyć %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3639,19 +3686,19 @@ msgstr "" "za duża wartośc pozycji w pliku: nie można obciąć pliku do długości seek=" "% (%lu bajtowych) bloków" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "nie udało się obciąć pliku do % bajtów w pliku wyjściowym %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "nie udało się skasować pamięci podręcznej dla %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3732,12 +3779,12 @@ msgstr "pojemność" msgid "%s-%s" msgstr "%s-%s" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "nie ma dostępu do %s: nad-montowany przez inne urządzenie" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3748,25 +3795,25 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -" -a, --all pokazanie też specjalnych systemów plików\n" +" -a, --all pokazanie też pseudosystemów plików oraz systemów\n" +" plików widzianych podwójnie lub niedostępnych\n" " -B, --block-size=ROZMIAR skala rozmiarów; np. „-BM” powoduje wypisanie\n" " rozmiarów w jednostkach po 1048576 bajtów;\n" " zobacz infomacje o formacie ROZMIARÓW poniżej\n" -" --total wypisanie podsumowania całości\n" " -h, --human-readable rozmiary jako potęgi 1024 (np. 1023M)\n" " -H, --si rozmiary jako potęgi 1000 (np. 1.1G)\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3780,17 +3827,13 @@ msgstr "" " --no-sync bez wywołania sync przed pobraniem informacji o\n" " systemach plików (domyślnie)\n" -#: src/df.c:1409 +#: src/df.c:1429 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 "" " --output[=LISTA_PÓL] użycie formatu zdefiniowanego przez LISTĘ_PÓL\n" " albo wypisanie wszystkich pól, jeżeli " @@ -3798,12 +3841,29 @@ msgstr "" " została pominięta\n" " -P, --portability użycie formatu zgodnego z POSIX-em\n" " --sync wywołanie sync przed pobraniem informacji\n" + +#: src/df.c:1435 +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --total pominięcie danych nieistotnych dla obliczania " +"dostępenego\n" +" miejsca i wypisanie podsumowania całości\n" + +#: src/df.c:1439 +msgid "" +" -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 "" " -t, --type=TYP pokazanie tylko systemów plików tego TYPU\n" " -T, --print-type wypisanie typów systemów plików\n" " -x, --exclude-type=TYP pokazanie tylko systemów plików nie tego TYPU\n" " -v (ignorowane)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3816,25 +3876,25 @@ msgstr "" "„size”, „used”, „avail”, „pcent”, „file” i „target” (zobacz dokumentację " "info).\n" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "opcje %s i %s wzajemnie się wykluczają" -#: src/df.c:1610 +#: src/df.c:1636 #, 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:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Uwaga: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "nie można przeczytać tablicy zamontowanych systemów plików" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "nie zostały przetworzone żadne systemy plików" @@ -3949,7 +4009,7 @@ msgstr "" " %s dir1/str dir2/str -> \"dir1\", a po nim \"dir2\"\n" " %s stdio.h Wynik: \".\".\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3959,9 +4019,10 @@ msgstr "" " albo: %s [OPCJA]... --files0-from=P\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" -"Podsumowuje zajętość dysku przez każdy PLIK, rekursywnie dla katalogów.\n" +"Podsumowuje zajętość dysku przez zbiór PLIKÓW, rekursywnie dla katalogów.\n" #: src/du.c:291 msgid "" @@ -4104,64 +4165,58 @@ msgstr "" msgid "Infinity" msgstr "nieskończoność" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "błąd fts_read %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "błędny maksymalny poziom zagłębienia %s" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "błędny argument opcji --threshold: „-0”" -#: src/du.c:898 +#: src/du.c:919 #, 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:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, 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:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" "warning: opcje --apparent-size i -b nie działają jeżeli jest włączona opcja " "--inodes" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 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:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: błąd odczytu" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "błędna nazwa pliku o zerowej długości" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "razem" @@ -4308,14 +4363,10 @@ msgid "cannot specify --null (-0) with command" msgstr "nie można podać --null (-0) razem z poleceniem" #: 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\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" #: src/expand.c:114 msgid "" @@ -4359,7 +4410,7 @@ msgid "input line is too long" msgstr "za długa linia wejściowa" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4515,12 +4566,12 @@ msgstr "błąd procedury dopasowywania wyrażeń regularnych" msgid "non-integer argument" msgstr "argument niecałkowity" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "dzielenie przez zero" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Ustaw LC_ALL=C żeby obejść problem" @@ -4531,31 +4582,31 @@ msgid "the strings compared were %s and %s" msgstr "Porównywane napisy %s i %s." #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "Niels Moller" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, 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:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "przepełnienie kolejki squfof" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s nie jest poprawną dodatnią liczbą całkowitą" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s jest za duża" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4564,7 +4615,7 @@ msgstr "" "Składnia: %s [LICZBA]...\n" " albo: %s OPCJA\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -4607,7 +4658,7 @@ msgstr "" "Przeformatowanie akapitów w PLIKU(ACH), wynik na standardowym wyjściu.\n" "Opcja -SZEROKOŚĆ jest skróconą formą -width=SZEROKOŚĆ.\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4621,7 +4672,7 @@ msgstr "" "linii\n" " -s, --split-only podzielenie długich linii, ale bez wyrównania\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4637,7 +4688,7 @@ msgstr "" " -g, --goal=SZEROKOŚĆ docelowa SZEROKOŚĆ (domyślnie 93% of szerokości\n" " linii)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4647,20 +4698,16 @@ msgstr "" "użyj\n" "-w N zamiast" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" -msgstr "błędna szerokość: %s" +#: src/fmt.c:400 src/fmt.c:407 +msgid "invalid width" +msgstr "błędna szerokość" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" -"Łamanie linii w każdym PLIKU wejściowym (domyślnie standardowym wejściu),\n" -"wynik na standardowym wyjściu.\n" +"Łamanie linii w każdym PLIKU wejściowym, wynik na standardowym wyjściu.\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4670,10 +4717,9 @@ msgstr "" " -s, --spaces łamanie na spacjach\n" " -w, --width=SZER użycie SZER kolumn zamiast 80\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" -msgstr "błędna liczba kolumn: %s" +#: src/fold.c:283 src/pr.c:831 +msgid "invalid number of columns" +msgstr "błędna liczba kolumn" #. This is a proper name. See the gettext manual, section Names. #: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 @@ -4745,18 +4791,15 @@ msgstr "nie można ustalić prawdziwego identyfikatora grupy" msgid "%s: no such user" msgstr "%s: nie ma takiego użytkownika" -#: src/head.c:109 +#: src/head.c:110 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 "" "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" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4772,7 +4815,7 @@ msgstr "" " ILE z „-” na początku - wypisanie wszystkich\n" " oprócz ostatnich ILE linii każdego pliku\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4780,7 +4823,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:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4792,48 +4835,36 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: plik się za bardzo zmniejszył" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: ilość bajtów jest za duża" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: nie można ustawić pozycji %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: nie można ustawić pozycji względnej %s" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "liczba linii" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "liczba bajtów" +msgid "%s: number of bytes is too large" +msgstr "%s: ilość bajtów jest za duża" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "błędna liczba linii" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "błędna liczba bajtów" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "błędna opcja na końcu -- %c" @@ -5029,7 +5060,7 @@ msgstr "nie można zmienić właściciela na %s" msgid "cannot set time stamps for %s" msgstr "nie można ustawić czasów %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "nie powiodło się wywołanie systemowe fork" @@ -5195,7 +5226,7 @@ msgstr "opcja obcinania (strip) nie może być użyta przy instalowaniu katalogu msgid "target directory not allowed when installing a directory" msgstr "katalog docelowy nie może być podany przy instalowaniu katalogu" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "błędne uprawnienia %s" @@ -5234,24 +5265,28 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" +"Dla każdej pary linii z identycznymi polami łączącymi wypisywana jest linia\n" +"na standardowym wyjściu. Domyślnie pole łączące jest pierwsze i oddzielone\n" +"odstępem.\n" + +#: src/join.c:204 +msgid "" "\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 "" -"Dla każdej pary linii z identycznymi polami łączącymi wypisywana jest linia\n" -"na standardowym wyjściu. Domyślnie pole łączące jest pierwsze i oddzielone\n" -"odstępem. Gdy PLIK1 albo PLIK2 (nie oba) to -, czytane jest standardowe\n" -"wejście.\n" "\n" -" -a NUMER wypisanie również linii nie do pary z pliku NUMER,\n" -" gdzie numer to 1 albo 2, odpowiadający PLIKOWI1 albo\n" -" PLIKOWI2\n" +" -a NUMER wypisanie również linii nie do pary z pliku o numerze\n" +" NUMER, gdzie numer to 1 albo 2, odpowiadający " +"PLIKOWI1\n" +" albo PLIKOWI2\n" " -e PUSTE zamiana brakujących pól na wejściu na PUSTE\n" -#: src/join.c:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5265,7 +5300,7 @@ msgstr "" " -o FORMAT zachowanie FORMATU przy tworzeniu linii wyjściowej\n" " -t ZNAK użycie ZNAKU jako separatora pól linii wej. i wyj.\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5288,13 +5323,13 @@ msgstr "" " --header traktowanie pierwszych linii plików jako nagłówków, bez\n" " prób ich sparowania\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated separatorem linii jest znak NUL, nie znak nowej\n" " linii\n" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5330,47 +5365,47 @@ msgstr "" "Jeżeli dane wejściowe nie są posortowane i niektóre linie nie mogą być\n" "połączone, zostanie wypisane ostrzeżenie.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:%: nie jest posortowany: %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "błędny numer pola: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "błędna specyfikacja pola: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "błędny numer pliku w specyfikacji pola: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "niekompatybilne pola łączenia %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "konflikt napisów zastępujących puste pola" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "wieloznakowy TAB %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "niekompatybilne TABy" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "oba pliki nie mogą być standardowym wejściem" @@ -5445,18 +5480,18 @@ msgstr "nie można podać sygnału równocześnie z opcjami -l lub -t" msgid "no process ID specified" msgstr "brak identyfikatora procesu" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" "nie udało się zaalokować % bajtu bufora standardowego wejścia\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "błędny tryb buforowania %s dla %s\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "nie udało się przestawić buforowania %s do trybu %s\n" @@ -5654,7 +5689,7 @@ msgstr "nie można użyć --relative bez --symbolic" msgid "FIXME: unknown" msgstr "FIXME: nieznany" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Składnia: %s [OPCJA]\n" @@ -5667,7 +5702,7 @@ msgstr "" "Wypisuje nazwę aktualnego użytkownika.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "brak nazwy użytkownika" @@ -5679,7 +5714,7 @@ msgstr "brak nazwy użytkownika" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%Y-%m-%d " @@ -5690,94 +5725,92 @@ msgstr "%Y-%m-%d " #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%m-%d %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "ignoruję błędny rozmiar zmiennej środowiskowej QUOTING_STYLE: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "ignoruję błędną długość w zmiennej środowiskowej COLUMNS: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "ignoruję błędny rozmiar tab-a w zmiennej środowiska TABSIZE: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" -msgstr "błędna szerokość linii: %s" +#: src/ls.c:1747 +msgid "invalid line width" +msgstr "błędna szerokość linii" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" -msgstr "błędny rozmiar TAB-a: %s" +#: src/ls.c:1815 +msgid "invalid tab size" +msgstr "błędny rozmiar TAB-a" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "błędny format stylu czasu %s" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "Prawidłowe argumenty to:\n" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr " - +FORMAT (np., +%H:%M) żeby podać format w stylu „date”\n" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "błąd inicjalizacji nazw miesięcy" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "nierozpoznany prefiks: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "niezrozumiała wartość zmiennej środowiska LS_COLORS" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "ignoruję błędny rozmiar zmiennej środowiskowej QUOTING_STYLE: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "nie można otworzyć katalogu %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "nie można ustalić urządzenia i i-węzła %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: nie będzie wylistowany katalog już wylistowany poprzednio" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "czytanie katalogu %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "zamykanie katalogu %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "nie można porównać nazw plików %s i %s" -#: src/ls.c:4781 +#: src/ls.c:4775 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" @@ -5785,7 +5818,7 @@ msgstr "" "Wypisanie informacji o PLIKACH (domyślnie w katalogu bieżącym). Sortowane\n" "alfabetyczne, jeżeli nie jest podana żadna z opcji -cftuvSUX ani --sort.\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5800,7 +5833,7 @@ msgstr "" "stylu\n" " języka C, np. \\012)\n" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5825,24 +5858,26 @@ msgstr "" " w przeciwnym przypadku: sortowanie wg ctime,\n" " najnowsze pliki na początku\n" -#: src/ls.c:4804 +#: src/ls.c:4798 msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" " -C wypisanie plików w kolumnach\n" -" --color[=GDY] kolorowanie informacji. GDY może być „never”\n" -" (nigdy), „auto” (automatycznie) albo „always\n" -" (zawsze, domyślnie); więcej informacji poniżej\n" +" --color[=GDY] kolorowanie informacji. GDY może być „always\n" +" (zawsze, domyślnie), „auto” (automatycznie)\n" +" albo „never” (nigdy); więcej informacji " +"poniżej\n" " -d, --directory pokazanie katalogów zamiast ich zawartości\n" " -D, --dired dane wyjściowe dla trybu dired Emacsa\n" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5864,11 +5899,11 @@ msgstr "" " kolumnach) -C\n" " --full-time jak -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr " -g jak -l, ale nie pokazuje właściciela\n" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5881,7 +5916,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:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5893,7 +5928,7 @@ msgstr "" " czytelnym dla ludzi (np. 1K 234M 2G)\n" " --si podobnie, ale z użyciem potęg 1000, nie 1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5914,7 +5949,7 @@ msgstr "" " --hide=WZÓR bez wypisywania nazw pasujących do WZORU\n" " (wyłączane przez -a albo -A)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5935,7 +5970,7 @@ msgstr "" " -k, --kibibytes zużycie dysku w blokach o rozmiarze 1024 " "bajtów\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5951,7 +5986,7 @@ msgstr "" " -m pisanie do pełnej szerokości, oddzielanie " "przecinkami\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5967,7 +6002,7 @@ msgstr "" " -o jak -l, ale bez informacji o grupie\n" " -p, --indicator-style=slash dodanie / do nazw katalogów\n" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -5989,7 +6024,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -6001,35 +6036,37 @@ msgstr "" " -s, --size wypisanie liczby bloków zajętych przez każdy " "plik\n" -#: src/ls.c:4886 +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" -" -S sortowanie według rozmiaru\n" +" -S sortowanie według rozmiaru, największe " +"najpierw\n" " --sort=SŁOWO sortowanie wg SŁOWA zamiast wg nazw: none (-U,\n" " wcale), size (-S, rozmiaru), time (-t, " "czasu),\n" " version (-v, wersji), extension (-X,\n" " rozszerzenia)\n" -" --time=SŁOWO z opcją -l - zamiast domyslnego czasu " +" --time=SŁOWO z opcją -l - zamiast domyślnego czasu " "modyfikacji\n" " pokazanie czasu określonego SŁOWEM " "domyślnie:\n" " czas odczytu - atime, access, use (-u),\n" " czas zmiany informacji o pliku - ctime,\n" " status (-c); także użycie podanego czasu do\n" -" sortowania gdy podano --sort=time\n" +" sortowania gdy podano --sort=time (najnowsze\n" +" najpierw)\n" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -6053,7 +6090,7 @@ msgstr "" "„posix-”,\n" " STYL jest używany tylko dla locale nie POSIX\n" -#: src/ls.c:4908 +#: src/ls.c:4904 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -6062,30 +6099,32 @@ msgstr "" " na początku\n" " -T, --tabsize=KOLUMNA TAB co tyle KOLUMN zamiast co 8\n" -#: src/ls.c:4912 +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" " -u z -lt: sortowanie wg czasu i wypisanie czasu\n" " ostatniego dostępu; z -l: wypisanie czasu\n" " dostępu i sortowanie wg nazw; w przeciwnym\n" -" przypadku: sortowanie wg czasu dostępu\n" +" przypadku: sortowanie wg czasu dostępu,\n" +" najnowsze najpierw\n" " -U bez sortowania, wypisanie kolejności jak w\n" " katalogu\n" " -v sortowanie wg liczb (numerów wersji) zawartych\n" " w nazwach plików\n" -#: src/ls.c:4919 +#: src/ls.c:4915 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 security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=KOLUMNY przyjęcie takiej szerokości ekranu zamiast\n" " wartości bieżącej\n" @@ -6094,9 +6133,11 @@ msgstr "" " -X sortowanie alfabetyczne wg rozszerzeń\n" " -Z, --context wypisanie kontekstu bezpieczeństwa pliku/" "plików\n" -" -1 ypisywanie po jednym pliku w linii\n" +" -1 wypisywanie po jednym pliku w linii; używając\n" +" opcji -q albo -b można uniknąć dosłownego\n" +" wypisania znaku nowej linii w nazwie\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6111,7 +6152,7 @@ msgstr "" "środowiskowa LS_COLORS może zmienić te ustawienia. Można ją ustawić\n" "przy pomocy polecenia dircolors.\n" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6145,47 +6186,50 @@ msgstr "David Madore" 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 "" "Składnia: %s [OPCJA]... [PLIK]...\n" "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:174 +#: src/md5sum.c:175 msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" +"\n" " -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:178 -msgid " -b, --binary read in binary mode\n" -msgstr " -b, --binary czytanie w trybie binarnym.\n" +#: src/md5sum.c:180 +msgid "" +"\n" +" -b, --binary read in binary mode\n" +msgstr "" +"\n" +" -b, --binary czytanie w trybie binarnym.\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr " --tag wyliczenie sumy kontrolnej w stylu BSD\n" -#: src/md5sum.c:188 +#: src/md5sum.c:191 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:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr "" " -t, --text czytanie plików w trybie tekstowym (domyślnie)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -6209,50 +6253,51 @@ msgstr "" "sum\n" "\n" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" 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" -"spacja - tekstowy) i nazwy każdego PLIKU.\n" +"wypisanie linii z sumą kontrolną, spacji, znaku wskazującego typ („*” -\n" +"binarny, spacja - tekstowy) i nazwy każdego PLIKU.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: za dużo linii z sumami kontrolnymi" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: nieprawidłowo sformatowana linia sumy kontrolnej %s" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: NIEPOWODZENIE otwarcia lub odczytu\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "NIEPOWODZENIE" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "DOBRZE" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: brak poprawnie sformatowanych linii sumy kontrolnej %s" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" @@ -6260,7 +6305,7 @@ msgstr[0] "UWAGA: % linia jest nieprawidłowo sformatowana" msgstr[1] "UWAGA: % linie są nieprawidłowo sformatowane" msgstr[2] "UWAGA: % linii jest nieprawidłowo sformatowanych" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" @@ -6268,7 +6313,7 @@ msgstr[0] "UWAGA: % podany plik nie mógł być odczytany" msgstr[1] "UWAGA: % podane pliki nie mogły być odczytane" msgstr[2] "UWAGA: % podanych plików nie mogło być odczytane" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" @@ -6276,17 +6321,17 @@ msgstr[0] "UWAGA: % policzona suma się NIE zgadza" msgstr[1] "UWAGA: % policzone sumy się NIE zgadzają" msgstr[2] "UWAGA: % policzonych sum się NIE zgadza" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "--tag nie może być łączony z trybem --text" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "opcja --tag nie ma znaczenia przy weryfikacji sum kontrolnych" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6294,22 +6339,22 @@ msgstr "" "opcje --binary i --text nie mają znaczenia przy weryfikacji sum\n" "kontrolnych" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "opcja --strict ma znaczenie tylko przy weryfikacji sum kontrolnych" @@ -6348,22 +6393,22 @@ msgstr "" " ustawienie kontekstu bezpieczeństwa SELinux\n" " albo SMACK jako KONTEKSTU\n" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "nie udało się ustawić domyślnego kontekstu tworzenia dla %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" msgstr "nie udało się odtworzyć kontekstu dla %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "utworzony katalog %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6581,7 +6626,7 @@ msgstr "za dużo wzorców" 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:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "błędny przyrostek %s - zawiera separator nazw podkatalogów" @@ -6719,13 +6764,8 @@ msgid "Scott Bartram" msgstr "Scott Bartram" #: 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 "" -"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" +msgid "Write each FILE to standard output, with line numbers added.\n" +msgstr "Wypisanie każdego PLIKU na standardowe wyjście z numerami linii.\n" #: src/nl.c:186 msgid "" @@ -6831,27 +6871,23 @@ msgstr "błędny styl numerownaia treści: %s" msgid "invalid footer numbering style: %s" msgstr "błędny styl numerowania stopek: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" -msgstr "błędny początkowy numer linii: %s" +#: src/nl.c:501 +msgid "invalid starting line number" +msgstr "błędny początkowy numer linii" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" -msgstr "błędny przyrost numeru linii: %s" +#: src/nl.c:506 +msgid "invalid line number increment" +msgstr "błędny przyrost numeru linii" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" -msgstr "błędna liczba pustych linii: %s" +#: src/nl.c:513 +msgid "invalid line number of blank lines" +msgstr "błędny numer linii pustych linii" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" -msgstr "błędna szerokość pola numeru linii: %s" +#: src/nl.c:520 +msgid "invalid line number field width" +msgstr "błędna szerokość pola numeru linii" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "błędny przyrost numeru linii: %s" @@ -6875,15 +6911,15 @@ msgstr "Uruchomienie POLECENIA ignorującego sygnały HUP.\n" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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 "" "\n" -"Jeżeli standardowym wejściem jest terminal, przekierowany jest do niego\n" -"/dev/null .\n" +"Jeżeli standardowym wejściem jest terminal, przekierowany jest na nie\n" +"nieczytelny plik.\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" "Jeżeli standardowe wyjście błędów jest terminalem, zostanie przekierowane\n" @@ -6895,46 +6931,46 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "nie udało się uczynić standardowego wejścia bezużytecznym" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "zignorowane dane wejściowe" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "zignorowanie wejścia i dołączenie wyników do %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "dołączenie wyników do %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" "nie udało się zamknąć kopii standardowego wyjścia przy wykonywaniu exec" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" "zignorowanie wejścia i przekierowanie standardowego błędu do standardowego " "wyjścia" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "przekierowanie standardowego wyjścia błędów do standardowego wyjścia" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -6961,57 +6997,52 @@ msgstr "" " --all liczba zainstalowanych procesorów\n" " --ignore=N jeżeli to możliwe, wyłączenie N procesorów\n" -#: 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "Assaf Gordon" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, 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:663 +#: src/numfmt.c:694 #, c-format msgid "invalid number: %s" msgstr "błędna liczba: %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, 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:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" msgstr "błędny przyrostek na wejściu: %s" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, 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:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "błąd przygotowania wartości „%Lf” do drukowania" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, c-format msgid "invalid unit size: %s" msgstr "błędny rozmiar jednostki: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Składnia: %s [OPCJA]... [LICZBA]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" @@ -7019,23 +7050,26 @@ msgstr "" "Przeformatowanie LICZB/Y ze standardowego wejścia albo podanych jako " "argumenty.\n" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" " --debug wypisywanie ostrzeżeń o błędnych danych wejściowych\n" -#: src/numfmt.c:824 +#: src/numfmt.c:890 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:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -" --field=N zastępowanie liczby w wejściowym polu N (zamiast 1)\n" +" --field=POLA zastępowanie liczb w tych wejściowych POLACH\n" +" (domyślnie 1), zobacz POLA poniżej\n" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" @@ -7043,7 +7077,7 @@ msgstr "" " --format=FORMAT użycie FORMATU w stylu zmiennoprzecinkowego formatu\n" " funkcji printf. Szczegóły w opisie FORMATÓW niżej\n" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" @@ -7054,14 +7088,14 @@ msgstr "" "spis\n" " JEDNOSTEK poniżej.\n" -#: src/numfmt.c:838 +#: src/numfmt.c:905 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:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -7071,15 +7105,15 @@ 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:845 +#: src/numfmt.c:912 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" +" Jeżeli N nie jest podane, domyślnie jedna.\n" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" @@ -7088,7 +7122,7 @@ msgstr "" " abort (zakończ; domyślnie), fail (błąd),\n" " warn (ostrzeżenie), ignore (ignorowanie)\n" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -7105,7 +7139,7 @@ msgstr "" "automatyczne,\n" " jeżeli napotkane są odstępy\n" -#: src/numfmt.c:860 +#: src/numfmt.c:927 msgid "" " --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" " up, down, from-zero (default), towards-zero, " @@ -7117,7 +7151,7 @@ msgstr "" "zero\n" " (w kierunku zera), nearest (najbliższa)\n" -#: src/numfmt.c:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" @@ -7126,20 +7160,20 @@ msgstr "" " akceptowanie opcjonalnego PRZYROSTKA w liczbach\n" " wejściowych\n" -#: src/numfmt.c:868 +#: src/numfmt.c:935 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:871 +#: src/numfmt.c:938 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:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" @@ -7147,12 +7181,12 @@ msgstr "" "\n" "Inne opcje:\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 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:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -7166,7 +7200,7 @@ msgstr "" " 1M = 1000000,\n" " 1Mi = 1048576,\n" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -7178,7 +7212,7 @@ msgstr "" " 1M = 1000000,\n" " ...\n" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7190,19 +7224,39 @@ msgstr "" " 1M = 1048576,\n" " ...\n" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" " 1Mi = 1048576,\n" " ...\n" msgstr "" -" iec-i akcpetowanie opcjonalnego dwuliterowego przyrostka:\n" +" iec-i akceptowanie opcjonalnego dwuliterowego przyrostka:\n" " 1Ki = 1024,\n" " 1Mi = 1048576,\n" " ...\n" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"\n" +"Zakresy PÓL mogą być w formacie używanym przez cut(1):\n" +" N N-te pole, liczone od 1\n" +" N- od N-tego pola do końca linii\n" +" N-M od N-tego do M-tego pola (włącznie)\n" +" -M od pierwszego do M-tego pola (włącznie)\n" +" - wszystkie pola\n" +"Wielokrotne specyfikacje pól i ich zakresów należy oddzielać przecinkami\n" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -7211,6 +7265,7 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" "\n" "FORMAT musi umożliwiać wypisanie jednego argumentu zmiennoprzecinkowego\n" @@ -7219,8 +7274,10 @@ msgstr "" "dopełni dane wyjściowe spacjami. Opcjonalna szerokość zer (%010f) dopełni\n" "liczbę zerami. Opcjonalna ujemna szerokość (%-10f) dopełni spacjami od " "lewej.\n" +"Opcjonalna dokładność (%.1f) zastąpi dokładność wziętą z danych " +"wejściowych.\n" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7242,7 +7299,7 @@ msgstr "" "--invalid=ignore nie są podawane informacje diagnostyczne, stan wyjściowy\n" "wynosi 0.\n" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -7257,8 +7314,8 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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 "" @@ -7274,124 +7331,137 @@ msgstr "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "format %s nie ma dyrektywy %%" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "błędny format %s (przepełnienie szerokości)" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -"dopełnianie w opcji --format zastępuje ustawienia podane przez opcję --" +"dopełnianie w opcji --format zastępuje ustawienia podane poprzez opcję --" "padding" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "format %s kończy się %%" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, c-format +msgid "invalid precision in format %s" +msgstr "błąd specyfikacji precyzji w formacie %s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" -msgstr "błędny format %s, dyrektywa powinna być w postaci %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" +msgstr "" +"błędny format %s, dyrektywa powinna być w postaci %%[0]['][-][N][.][N]f" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "format %s ma za dużo dyrektyw %%" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, c-format msgid "invalid suffix in input %s: %s" msgstr "błędny przyrostek na wejściu %s: %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" +"wartość/dokładność zbyt duża żeby ją wypisać: „%Lg/%” (rozważ " +"użycie --to)" + +#: src/numfmt.c:1210 #, 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:1111 +#: src/numfmt.c:1219 #, 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:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "duża wartość wejściowa %s: możliwa utrata precyzji" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, 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" +msgid "invalid field value %s" +msgstr "błędna wartość pola: %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, c-format msgid "invalid padding value %s" msgstr "błędna wartość wypełniania %s" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, c-format -msgid "invalid field value %s" -msgstr "błędna wartość pola: %s" +msgid "multiple field specifications" +msgstr "wielokrotna specyfikacja pól" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, c-format msgid "invalid header value %s" msgstr "błędna zawartość nagłówka %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "opcja --grouping nie może być użyta razem z --format" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "nie podano opcji przekształcenia" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "opcja --grouping nie może być użyta razem z --to" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "grupowanie nie działa dla tych ustawień regionalnych" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, 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:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "błąd czytania danych wejściowych" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, 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:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7404,23 +7474,21 @@ msgstr "" " albo: %s --traditional [OPCJA]... [PLIK] [[+]PRZESUNIĘCIE[.][b]\n" " [[+]ETYKIETA]]\n" -#: src/od.c:326 +#: src/od.c:327 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" "Wypisanie jednoznacznej reprezentacji PLIKU, domyślnie bajty ósemkowo, na\n" -"standardowe wyjście. Jeżeli PLIK nie jest podany albo podany jako -,\n" -"czytane jest standardowe wejście.\n" -"\n" +"standardowe wyjście. Jeżeli argumentami jest więcej niż jeden PLIK, połącz\n" +"je w podanym porządku.\n" -#: src/od.c:333 +#: src/od.c:335 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" @@ -7428,6 +7496,7 @@ 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" "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ę, " @@ -7440,7 +7509,7 @@ msgstr "" "przyrostek\n" "b oznacza wielokrotność 512.\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7456,7 +7525,7 @@ msgstr "" " -j, --skip-bytes=BAJTY ominięcie tylu początkowych BAJTÓW każdego " "pliku\n" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -7482,7 +7551,7 @@ msgstr "" " --traditional akceptowanie argumentów w tradycyjnym " "formacie\n" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -7501,7 +7570,7 @@ msgstr "" " odwrotnym\n" " -d to samo co -t u2, dziesiętnie liczby 2-bajtowe bez znaku\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7517,7 +7586,7 @@ 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:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -7531,7 +7600,7 @@ msgstr "" " a nazwy znaków po zignorowaniu najstarszego bitu\n" " c znaki drukowalne lub kody znaków z ukośnikiem odwrotnym\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7545,7 +7614,7 @@ msgstr "" " u[ROZMIAR] dziesiętny bez znaku, liczba o takim ROZMIARZE w bajtach\n" " x[ROZMIAR] szesnastkowy, liczba o takim ROZMIARZE w bajtach\n" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -7559,7 +7628,7 @@ msgstr "" "sizeof(long). Jeżeli TYP to f, ROZMIAR może być też F dla sizeof(float), D\n" "dla sizeof(double) albo L dla sizeof(long double).\n" -#: src/od.c:401 +#: src/od.c:404 msgid "" "\n" "Adding a z suffix to any type displays printable characters at the end of\n" @@ -7569,7 +7638,7 @@ msgstr "" "Dodanie przyrostka do dowolnego typu powoduje pokazanie drukowalnych znaków\n" "na końcu każdej linii danych wyjściowych.\n" -#: src/od.c:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -7592,12 +7661,12 @@ msgstr "" " M 1024*1024\n" "i tak dalej dla G, T, P, E, Z, Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "błędna specyfikacja typu %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7606,7 +7675,7 @@ msgstr "" "błędna specyfikacja typu %s;\n" "ten system nie ma %lu-bajtowych liczb całkowitych" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7615,37 +7684,37 @@ msgstr "" "błędna specyfikacja typu %s;\n" "ten system nie ma %lu-bajtowych liczb zmiennoprzecinkowych" -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" msgstr "błędny znak „%c” w specyfikacji typu %s" -#: src/od.c:1094 +#: src/od.c:1105 #, 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:1650 +#: src/od.c:1658 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" "błędna baza danych wyjściowych „%c”; musi to być jeden ze znaków [doxn]" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "nie można podawać typu przy wypisywaniu napisów" -#: src/od.c:1863 +#: src/od.c:1871 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:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "za duże skip-bytes + read-bytes" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "uwaga: błędna szerokość %lu; używam %d zamiast" @@ -7664,11 +7733,9 @@ msgstr "standardowe wejście jest zamknięte" 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 "" "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" #: src/paste.c:447 msgid "" @@ -7808,12 +7875,12 @@ msgstr "Kiedy" msgid "Where" msgstr "Skąd" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Składnia: %s [OPCJA]... [UŻYTKOWNIK]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7830,7 +7897,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:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7846,7 +7913,7 @@ msgstr "" "bezczynności\n" " w formacie skróconym\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -7857,98 +7924,93 @@ msgstr "" "Uproszczona wersja programu „finger”. Wyświetla informacje o użytkownikach.\n" "Ścieżka do pliku utmp: %s .\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" "brak nazwy użytkownika - musi być podana chociaż jedna, jeżeli użyto opcji -l" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "„--pages=PIERWSZA_STRONA[:OSTATNIA_STRONA]” - brakujący argument" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "błędny zakres stron %s" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" -msgstr "„-l DŁ_STRONY” błędna liczba linii: %s" +#: src/pr.c:967 +msgid "'-l PAGE_LENGTH' invalid number of lines" +msgstr "„-l DŁ_STRONY” błędna liczba linii" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" -msgstr "„-N LICZBA” błędny numer linii początkowej: %s" +#: src/pr.c:982 +msgid "'-N NUMBER' invalid starting line number" +msgstr "„-N LICZBA” błędny numer linii początkowej" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" -msgstr "„-o MARGINES” błędne przesunięcie linii: %s" +#: src/pr.c:986 +msgid "'-o MARGIN' invalid line offset" +msgstr "„-o MARGINES” błędne przesunięcie linii" -#: 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" +#: src/pr.c:1023 +msgid "'-w PAGE_WIDTH' invalid number of characters" +msgstr "„-w SZEROKOŚĆ_STRONY” błędna liczba znaków" -#: 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" +#: src/pr.c:1032 +msgid "'-W PAGE_WIDTH' invalid number of characters" +msgstr "„-W SZEROKOŚĆ_STRONY” błędna liczba znaków" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, 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:1196 +#: src/pr.c:1166 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "„-%c” nadmiarowe znaki lub błędna liczba w argumencie: %s" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "szerokość strony za mała" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "początkowy numer strony % przekracza liczbę stron %" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "przepełnienie licznika stron" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Strona %" -#: src/pr.c:2757 +#: src/pr.c:2727 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:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7967,7 +8029,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:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7985,7 +8047,7 @@ msgstr "" " -d, --double-space\n" " podwójny odstęp na wyjściu\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -8007,7 +8069,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:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -8030,23 +8092,29 @@ msgstr "" " -W, bez wyrównania kolumn, -sep-string[-NAPIS] ustawia\n" " separatory\n" -#: src/pr.c:2798 +#: src/pr.c:2769 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" msgstr "" " -l, --length=DŁUGOŚĆ_STRONY\n" " ustawienie takiej DŁUGOŚCI_STRONY w liniach (66)\n" -" (domyślna liczba linii tekstu: 56; dla -F 63)\n" +" (domyślna liczba linii tekstu: 56; dla -F 63);\n" +" implikuje -t jeżeli DŁUGOŚĆ_STRONY <= 10\n" + +#: src/pr.c:2775 +msgid "" +" -m, --merge print all files in parallel, one in each column,\n" +" truncate lines, but join lines of full length with -J\n" +msgstr "" " -m, --merge wypisanie wszystkich plików równolegle, każdy w jednej\n" " kolumnie, linie są obcinane, ale linie o pełnej " "długości\n" " są łączone przez -J\n" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -8064,7 +8132,7 @@ msgstr "" "pierwszej\n" " drukowanej strony (zob. +PIERWSZA_STRONA)\n" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -8079,7 +8147,7 @@ msgstr "" " -r, --no-file-warnings\n" " bez ostrzeżeń kiedy plik nie może być otwarty\n" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -8097,14 +8165,13 @@ msgstr "" "układach\n" " kolumn (-COLUMN|-a -COLUMN|-m), chyba że użyto opcji -w\n" -#: src/pr.c:2828 +#: src/pr.c:2802 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -S[STRING], --sep-string[=STRING]\n" " oddzielenie kolumn przez NAPIS,\n" @@ -8112,9 +8179,16 @@ msgstr "" " spacja (to samo co -S\" \"), nie wpływa na opcje " "dotyczące\n" " kolumn\n" -" -t, --omit-header bez wypisywania nagłówków i stopek stron\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" +" -t, --omit-header bez wypisywania nagłówków i stopek stron;\n" +" domyślna opcja jeżeli DŁUGOŚĆ_STRONY <= 10\n" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -8139,7 +8213,7 @@ msgstr "" " wydruku wielokolumnowego, -s[ZNAK] wyłącza wartość\n" " domyślną (72)\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -8154,16 +8228,6 @@ msgstr "" "nie\n" " przeszkadza opcjom -S ani -s.\n" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"-t jest włączane jeżeli DŁUGOŚĆ_STRONY <= 10. Jeżeli PLIK nie jest podany\n" -"albo podany jako -, czytane jest standardowe wejście.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -8317,20 +8381,26 @@ msgid "" "files.\n" msgstr "Pokazanie indeksu słów z plików wejściowych razem z kontekstem.\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 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 wypisanie automatycznie wygenerowanych\n" " odnośników\n" " -G, --traditional zachowanie zgodności z wersją „ptx” z " "Systemu V\n" + +#: src/ptx.c:1835 +msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" " -F, --flag-truncation=NAPIS użycie NAPISU do zaznaczania wyciętych " "linii\n" +" Domyślnie „/”\n" -#: src/ptx.c:1835 +#: src/ptx.c:1839 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -8347,7 +8417,7 @@ msgstr "" " -T, --format=tex generowanie wyjścia w postaci dyrektyw TeX-" "a\n" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8366,7 +8436,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:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8379,20 +8449,16 @@ msgstr "" " -w, --width=NUMBER szerokość wyjścia w kolumnach, bez " "odnośników\n" -#: src/ptx.c:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Jeżeli nie został podany PLIK albo podany jest jako -, czytane jest\n" -"standardowe wejście. Domyślnie używana jest opcja „-F /”.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "błędna szerokość odstępu: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "błędna szerokość linii: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8423,7 +8489,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "nie udało się chdir do %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "nie udało się stat %s" @@ -8443,8 +8509,8 @@ msgstr "zignorowano argumenty nie będące opcjami" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Składnia: %s [OPCJA]... PLIK...\n" @@ -8669,7 +8735,7 @@ msgid "" " -v, --verbose explain what is being done\n" msgstr "" " --no-preserve-root bez traktowania katalogu „/” w specjalny sposób\n" -" --preserve-root odmowa usunięcia „/” (domyslnie)\n" +" --preserve-root odmowa usunięcia „/” (domyślnie)\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" @@ -8718,19 +8784,19 @@ msgstr "" #: src/rm.c:342 #, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " -msgstr[0] "%s: usunąć %zu argument rekursywnie? " -msgstr[1] "%s: usunąć %zu argumenty rekursywnie? " -msgstr[2] "%s: usunąć %zu argumentów rekursywnie? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " +msgstr[0] "%s: usunąć % argument rekursywnie? " +msgstr[1] "%s: usunąć % argumenty rekursywnie? " +msgstr[2] "%s: usunąć % argumentów rekursywnie? " #: src/rm.c:345 #, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " -msgstr[0] "%s: usunąć %zu argument? " -msgstr[1] "%s: usunąć %zu argumenty? " -msgstr[2] "%s: usunąć %zu argumentów? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " +msgstr[0] "%s: usunąć % argument? " +msgstr[1] "%s: usunąć % argumenty? " +msgstr[2] "%s: usunąć % argumentów? " #: src/rmdir.c:134 src/rmdir.c:233 #, c-format @@ -8951,13 +9017,13 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "błędny argument zmiennoprzecinkowy: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "format %s zawiera nieznaną dyrektywę %%%c" # ? - rzm -#: src/seq.c:557 +#: src/seq.c:603 #, 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" @@ -8975,7 +9041,15 @@ msgstr "" "Wielokrotne zamazanie podanego PLIKU w celu utrudnienia odzyskania jego\n" "zawartości nawet przy użyciu drogich urządzeń do odzyskiwania danych.\n" -#: src/shred.c:177 +#: src/shred.c:174 +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Jeżeli PLIK podany jest jako -, zamazanie standardowego wyjścia.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8989,7 +9063,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:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -9004,11 +9078,9 @@ msgstr "" " domyślnie dla plików innych niż zwykłe\n" " -z, --zero dodatkowe zamazanie zerami, aby ukryć zamazywanie\n" -#: src/shred.c:192 +#: src/shred.c:196 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.\n" @@ -9020,8 +9092,6 @@ msgid "" "\n" msgstr "" "\n" -"Jeżeli PLIK jest podany jako -, zamazywane jest standardowe wyjście.\n" -"\n" "Jeżeli podana jest opcja --remove (-u) PLIK jest kasowany. Domyślnie PLIK\n" "nie jest kasowany, ponieważ często operacje dotyczą plików urządzeń, jak\n" "/dev/hda, a takie pliki zwykle nie powinny być usuwane.\n" @@ -9031,7 +9101,7 @@ msgstr "" "„wipesync” => dodatkowo z użyciem sync po zamazaniu każdego bajtu.\n" "Domyślny sposób to „wipesync”, ale może być kosztowny.\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -9049,7 +9119,7 @@ msgstr "" "gwarancji, że działa efektywnie we wszystkich trybach pracy systemu plików:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -9070,7 +9140,7 @@ msgstr "" "* które zapisują stan chwilowy, jak serwer NFS Network Appliance\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -9083,7 +9153,7 @@ msgstr "" "* kompresowanymi\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -9106,7 +9176,7 @@ msgstr "" "(man mount)\n" "\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -9117,127 +9187,125 @@ msgstr "" "które nie mogą zostać usunięte i plik zamazany schredem może zostać\n" "odtworzony.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: błąd fdatasync" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: błąd fsync" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: nie można przewinąć" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: przebieg %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: błąd zapisu na pozycji %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: nie udało się ustawienie pozycji lseek" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: plik jest za duży" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: przebieg %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: przebieg %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: błąd fstat" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: błędny typ pliku" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: plik ma ujemny rozmiar" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: błąd obcinania" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: błąd fcntl" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: nie można zamazywać pliku tylko do dopisywania" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: usuwanie" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: przemianowany na %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: błąd przy kasowaniu pliku" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: skasowany" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: błąd przy zamykaniu pliku" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: błąd przy otwieraniu do zapisu" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" -msgstr "%s: błędna liczba przebiegów" +msgid "invalid number of passes" +msgstr "błędna liczba przebiegów" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "podano wiele źródeł losowych bajtów" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" -msgstr "%s: błędny rozmiar pliku" +#: src/shred.c:1255 +msgid "invalid file size" +msgstr "błędny rozmiar pliku" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -9248,12 +9316,12 @@ msgstr "" " albo: %s -e [OPCJA]... [ARGUMENT]\n" " albo: %s -i LO-HI [OPCJA]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" "Wypisanie losowej permutacji linii wejściowych na standardowym wyjściu.\n" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -9275,37 +9343,36 @@ msgstr "" " --random-source=PLIK pobranie losowych bajtów z PLIKU\n" " -r, --repeat dozwolone powtórzenia linii wyjściowych\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "za wiele linii wejściowych" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "podano wiele opcji -i" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" -msgstr "błędny zakres wejściowy: %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +msgid "invalid input range" +msgstr "błędny zakres wejściowy" -#: src/shuf.c:465 +#: src/shuf.c:459 #, c-format -msgid "invalid line count %s" -msgstr "błędna liczba linii %s" +msgid "invalid line count: %s" +msgstr "błędna liczba linii: %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "podano wiele plików wyjściowych" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "nie można łączyć ustawiania opcji -e i -i" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "nie ma linii do powtórzenia" @@ -9334,12 +9401,12 @@ msgstr "" "więcej argumenty, przerwa trwa tyle ile suma ich wartości.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "błędny odstęp czasowy %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "nie można odczytać zegara systemowego" @@ -9350,7 +9417,7 @@ msgstr "" "Wypisanie posortowanego połączenia wszystkich PLIK(ÓW) na standardowym " "wyjściu\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -9358,7 +9425,7 @@ msgstr "" "Opcje porządkowania:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9370,7 +9437,7 @@ msgstr "" " alfanumerycznych\n" " -f, --ignore-case traktowanie małych liter jak wielkich\n" -#: src/sort.c:443 +#: src/sort.c:444 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -9380,13 +9447,13 @@ msgstr "" " -i, --ignore-nonprinting branie pod uwagę tylko znaków drukowalnych\n" " -M, --month-sort porządek: (nieznany) < „JAN” < ... < „DEC”\n" -#: src/sort.c:448 +#: src/sort.c:449 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:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9399,7 +9466,7 @@ msgstr "" " --random-source=PLIK losowe bajty z PLIKU\n" " -r, --reverse odwrotny porządek sortowania\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9418,7 +9485,7 @@ msgstr "" "zawartych\n" " w tekście\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -9426,7 +9493,7 @@ msgstr "" "Inne opcje:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9435,7 +9502,7 @@ msgstr "" " naraz; dla większej liczby użyte będą pliki\n" " tymczasowe\n" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -9451,7 +9518,7 @@ msgstr "" "PROG;\n" " dekompresowanie przez PROG -d\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9467,7 +9534,7 @@ msgstr "" " Jeżeli PLIK to -, nazwy czytane są ze\n" " standardowego wejścia\n" -#: src/sort.c:487 +#: src/sort.c:488 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -9476,7 +9543,7 @@ msgstr "" " -m, --merge połączenie już posortowanych plików, bez " "sortowania\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9490,7 +9557,7 @@ msgstr "" " porównania końcowego\n" " -S, --buffer-size=ROZM ROZMIAR głównego bufora pamięci\n" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9514,7 +9581,7 @@ msgstr "" " wypisanie tylko pierwszej z identycznych " "linii\n" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9547,12 +9614,10 @@ msgstr "" "\n" "ROZMIAR może być uzupełniony o następujące mnożniki:\n" -#: src/sort.c:524 +#: src/sort.c:525 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" @@ -9560,126 +9625,123 @@ msgid "" msgstr "" "% - 1% pamięci, b - 1, K - 1024 (domyślnie) itd. dla M, G, T, P, E, Z, Y.\n" "\n" -"Jeżeli PLIK nie jest podany albo podany jako -, czytane jest standardowe\n" -"wejście\n" -"\n" "*** UWAGA ***\n" "Locale ustawione przez zmienne środowiskowe wpływa na porządek sortowania.\n" "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:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "czekanie na %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] zakończone nieprawidłowo" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "nie można utworzyć pliku tymczasowego w %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "błąd otwierania pliku" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "błąd fflush" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "błąd zamykania pliku" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "nie udało się utworzyć pliku tymczasowego" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "nie udało się uruchomić procesu %s -d" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "uwaga: nie udało się usunąć %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "błędny argument opcji --%s: %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "minimalna wartość argumentu opcji --%s to %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "opcja --%s ma za duży argument %s" -#: src/sort.c:1359 +#: src/sort.c:1358 #, 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:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "liczba równoległych sortowań (parallel) musi byc niezerowy" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "błąd stat" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "błąd czytania" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "nie udało się przekształcenie napisu" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "nieprzekształconym napisem był %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "^ brak dopasowania klucza\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, 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:2428 +#: src/sort.c:2427 #, 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:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "początkowe odstępy są znaczące w kluczu %lu, rozważ podanie „b”" -#: src/sort.c:2452 +#: src/sort.c:2451 #, 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:2484 +#: src/sort.c:2483 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -9687,167 +9749,170 @@ msgstr[0] "opcja „-%s” została zignorowana" msgstr[1] "opcje „-%s” zostały zignorowane" msgstr[2] "opcji „-%s” zostało zignorowanych" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "opcja „-r” ma zastosowanie tylko do porównań ostatniej szansy" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "błąd zapisu" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: nieuporządkowanie: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "standardowe wyjście błędów" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "nie można przeczytać" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: błędna specyfikacja pola %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "opcje „-%s” nie pasują do siebie" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: błędna liczba na początku %s" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "błędna liczba po „-”" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "błędna liczba po „.”" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "nieprawidłowy znak w specyfikacji pola" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "podano wiele programów kompresujących" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "błędna liczba na początku pola" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "numer pola wynosi zero" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "numer znaku wynosi zero" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" msgstr "błędna liczba po „,”" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "pusty TAB" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "nie można wczytać nazw plików z %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, 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:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "brak danych z %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "użycie reguł sortowania %s" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "użycie prostego porównywania bajtów" -#: src/sort.c:4699 +#: src/sort.c:4698 #, 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:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" -msgstr "przystek musi mieć co najmniej %zu znaków" +msgid "the suffix length needs to be at least %" +msgstr "przyrostek musi mieć co najmniej % znaków" -#: src/split.c:203 +#: src/split.c:224 #, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Składnia: %s [OPCJA]... [PLIK [PRZEDROSTEK]]\n" -#: src/split.c:207 +#: src/split.c:228 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" "Zapisanie równych kawałków PLIKU do PRZEDROSTEKaa, PRZEDROSTEKab, ...;\n" -"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" +"domyślny rozmiar to 1000 linii, domyślny PRZEDROSTEK to „x”.\n" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" " -a, --suffix-length=N tworzenie przyrostków o długości N (domyślnie %d)\n" " --additional-suffix=PRZYROSTEK dodatkowy PRZYROSTEK nazm plików\n" " -b, --bytes=ROZMIAR zapisanie po ROZMIAR bajtów do plików wyjściowych\n" -" -C, --line-bytes=ROZMIAR zapisanie najwyżej ROZMIAR bajtów pełnych linii\n" +" -C, --line-bytes=ROZMIAR zapisanie najwyżej ROZMIAR bajtów rekordów\n" +" w każdym pliku\n" " -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" " --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" +" -l, --lines=ILE zapis po ILE linii/rekordów do każdego pliku\n" +" wyjściowego\n" " -n, --number=CZĘŚCI podzielenie na tyle CZĘŚCI; zobacz wyjaśnienie\n" " poniżej\n" +" -t, --separator=SEP użycie SEP jako separatora rekordów zamiast znaku\n" +" nowej linii; „\\0” (zero) oznacza znak NUL\n" " -u, --unbuffered natychmiastowe kopiowanie wejścia na wyjście po\n" " użyciu „-n r/...”\n" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9856,214 +9921,215 @@ msgstr "" "komunikatów\n" " diagnostycznych\n" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" "\n" "Sposób podziału na CZĘŚCI:\n" "N podział na N plików na podstawie rozmiaru danych\n" "K/N K-ta CZĘŚĆ z N wysłana na standardowe wyjście\n" -"l/N podział na N plików bez dzielenia linii\n" +"l/N podział na N plików bez dzielenia linii/rekordów\n" "l/K/N K-ta CZĘŚĆ z N wysłana na standardowe wyjście,\n" -" podział bez dzielenia linii\n" +" podział bez dzielenia linii/rekordó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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "zabrakło przyrostków plików wyjściowych" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "tworzenie pliku %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "%s nadpisałby dane wejściowe; zatrzymanie pracy" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "nie udało się ustawić zmiennej środowiskowej FILE" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "wykonywanie z FILE=%s\n" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "nie udało się utworzyć potoku" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "zamykanie potoku" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "zamknięcie potoku wyjściowego" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "zamykanie potoku wejściowego" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "zamykanie potoku wejściowego" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "nie udało się uruchomić polecenia \"%s -c %s\"" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "nie udało się zamknąć potoku wejściowego" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "czekanie na proces potomny" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "podczas gdy FILE=%s, sygnał %s z polecenia %s" -#: src/split.c:481 +#: src/split.c:535 #, 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:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "nieznany kod wyjściowe polecenia (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, 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:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" -msgstr "%s: błędna liczba części" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +msgid "invalid number of chunks" +msgstr "błędna liczba części" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" -msgstr "%s: błędny numer części" +#: src/split.c:1212 +msgid "invalid chunk number" +msgstr "błędny numer części" -#: src/split.c:1169 +#: src/split.c:1259 +msgid "invalid suffix length" +msgstr "błędna długość przyrostka" + +#: src/split.c:1333 #, c-format -msgid "%s: invalid suffix length" -msgstr "%s: błędna długość przyrostka" +msgid "empty record separator" +msgstr "pusty separator rekordów" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1344 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: błędna liczba bajtów" +msgid "multi-character separator %s" +msgstr "wieloznakowy separator %s" -#: src/split.c:1213 src/split.c:1360 +#: src/split.c:1352 #, c-format -msgid "%s: invalid number of lines" -msgstr "%s: błędna liczba linii" +msgid "multiple separator characters specified" +msgstr "podano wieloznakową specyfikację separatora" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "za duża ilość linii w opcji -%s%c..." -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: błędna początkowa wartość przyrostka liczbowego" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" -msgstr "%s: błędny rozmiar bloku IO" +#: src/split.c:1419 +msgid "invalid IO block size" +msgstr "błędny rozmiar bloku IO" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "--filter nie przekazał przetworzonego fragmentu do wyjścia" -#: src/split.c:1384 +#: src/split.c:1477 #, 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:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "nie udało się kanonizować %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "uwaga: nierozpoznana sekwencja „\\%c”" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: błędna dyrektywa" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "uwaga: ukośnik odwrotny na końcu formatu" -#: src/stat.c:1262 +#: src/stat.c:1265 #, 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:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "nie można przeczytać informacji systemowych o %s" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -10079,7 +10145,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -10089,30 +10155,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "Kontekst: %C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -10124,11 +10190,11 @@ msgstr "" "Zmiana: %z\n" "Utworzenie: %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "Wypisanie stanu pliku albo systemu plików\n" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" @@ -10137,7 +10203,7 @@ msgstr "" " -L, --dereference podążanie za dowiązaniami symbolicznymi\n" " -f, --file-system pokazanie danych systemu plików, a nie pliku\n" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -10156,7 +10222,7 @@ msgstr "" " linii; żeby go wypisać użyj \\n w FORMACIE.\n" " -t, --terse wypisywanie informacji w skróconej formie\n" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -10176,7 +10242,7 @@ msgstr "" " %B rozmiar w bajtach każdego bloku podanego przez %b\n" " %C kontekst bezpieczeństwa SELinuksa\n" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -10192,7 +10258,7 @@ msgstr "" " %g numer grupy właściciela pliku\n" " %G nazwa grupy właściciela pliku\n" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -10216,7 +10282,7 @@ msgstr "" " %T pliki specjalne urządzeń znakowych/blokowych - mniejszy numer\n" " urządzenia szesnastkowo\n" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -10242,7 +10308,7 @@ msgstr "" " %Z czas ostatniej zmiany stanu w sekundach od Epoki\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -10260,7 +10326,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:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -10337,16 +10403,18 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" "\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 na przykład „tee”), przestawi wtedy odpowiednie " +"ustawienia\n" +"zmienione przez „stdbuf”. Niektóre filtry (jak „dd”, „cat” itp.) nie " +"używają\n" +"strumieni dla operacji wejścia/wyjścia i ich parametry nie bedą zmienione\n" +"przez „stdbuf”.\n" #: src/stdbuf.c:241 #, c-format @@ -10368,7 +10436,7 @@ msgstr "buforowanie liniowe standardowego wejścia nie ma znaczenia" msgid "you must specify a buffering mode option" msgstr "musisz podać opcję trybu buforowania" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10379,11 +10447,11 @@ msgstr "" " albo: %s [-F URZĄDZENIE] [--file=URZĄDZENIE] [-a|--all]\n" " albo: %s [-F URZĄDZENIE] [--file=URZĄDZENIE] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "Wypisanie lub zmiana ustawień terminala.\n" -#: src/stty.c:528 +#: src/stty.c:536 msgid "" " -a, --all print all current settings in human-readable form\n" " -g, --save print all current settings in a stty-readable form\n" @@ -10396,7 +10464,7 @@ msgstr "" " -F, --file=URZĄDZENIE otwarcie i używanie podanego URZĄDZENIA zamiast\n" " standardowego wejścia\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10406,116 +10474,160 @@ 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:540 +#: src/stty.c:548 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 "" "\n" "Znaki specjalne:\n" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr " * discard ZNAK ZNAK będzie przełączał pomijanie danych wyjściowych\n" + +#: src/stty.c:557 +msgid "" +" * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" " * dsusp ZNAK ZNAK wysyła do terminala sygnał stopu po opróżnieniu " "wejścia\n" + +#: src/stty.c:561 +msgid "" +" eof CHAR CHAR will send an end of file (terminate the input)\n" +" eol CHAR CHAR will end the line\n" +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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr " * eol2 ZNAK alternatywny ZNAK końca linii\n" + +#: src/stty.c:570 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 ZNAK alternatywny ZNAK końca linii\n" " erase ZNAK ZNAK kasuje ostatni wprowadzony znak\n" " intr ZNAK ZNAK wysyła sygnał przerwania\n" " kill ZNAK ZNAK kasuje bieżącą linię\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" msgstr "" -" * lnext ZNAK ZNAK wprowadza następny znak w cudzysłowie\n" -" quit ZNAK ZNAK wysyła sygnał wyjścia\n" -" * rprnt ZNAK ZNAK powtarza bieżącą linię\n" -" start ZNAK ZNAK wznawia wyświetlanie\n" +" * lnext ZNAK ZNAK spowoduje, że następny znak będzie w cudzysłowie\n" -#: src/stty.c:559 +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr " * status ZNAK ZNAK wyśle sygnał info\n" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr " quit ZNAK ZNAK wyśle sygnał quit\n" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr " * rptnt ZNAK ZNAK spowoduje ponowne wypisanie bieżącej linii\n" + +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 "" +" start ZNAK ZNAK zrestartuje wyjście po jego zatrzymaniu\n" " stop ZNAK ZNAK wstrzymuje wyświetlanie\n" " susp ZNAK ZNAK wysyła do terminala sygnał stop\n" -" * swtch ZNAK ZNAK włącza inną warstwę powłoki\n" -" * werase ZNAK ZNAK kasuje ostatnie wprowadzone słowo\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr " * swtch ZNAK ZNAK przełącza na inną warstwę powłoki\n" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr " * werase ZNAK ZNAK kasuje ostatnie wprowadzone słowo\n" + +#: src/stty.c:608 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 "" "\n" "Ustawienia specjalne:\n" " N ustawienie prędkości wyjściowej i wejściowej na N bodów\n" + +#: src/stty.c:614 +msgid "" +" * cols N tell the kernel that the terminal has N columns\n" +" * columns N same as cols N\n" +msgstr "" " * cols N ustawienie szerokości terminala na N kolumn\n" " * columns N to samo co cols N\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr " ispeed N ustawienie prędkości wejściowej na N\n" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr " * line N użycie rygoru linii (line discipline) N\n" + +#: src/stty.c:627 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 "" -" ispeed N ustawienie prędkości wejściowej na N\n" -" * line N użycie rygoru linii (line discipline) N\n" " 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:578 +#: src/stty.c:632 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 "" " * rows N ustawienie długości terminala na N wierszy\n" " * size wyświetlenie liczby wierszy i kolumn według ustawień jądra\n" + +#: src/stty.c:637 +msgid "" +" speed print the terminal speed\n" +" time N with -icanon, set read timeout of N tenths of a second\n" +msgstr "" " speed wyświetlenie prędkości terminala\n" " time N z -icanon ustawienie timeout na N dziesiątych sekundy\n" -#: src/stty.c:584 +#: src/stty.c:641 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 sterowania przepływem przez RTS/CTS\n" -" * [-]cdtrdsr włączenie sterowania przepływem przez DTR/DSR\n" + +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr " * [-]crtscts włączenie sterowania przepływem przez RTS/CTS\n" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr " * [-]cdtrdsr włączenie sterowania przepływem przez DTR/DSR\n" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" " csN ustawienie wielkości znaku na N bitów, N w zakresie [5..8]\n" -#: src/stty.c:593 +#: src/stty.c:660 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -10523,7 +10635,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb użycie dwóch bitów stopu na znak (jeden z „-”)\n" " [-]hup wysłanie sygnału rozłączenia gdy ostatni proces zamknie\n" @@ -10531,9 +10642,12 @@ msgstr "" " [-]hupcl to samo co [-]hup\n" " [-]parenb włączenie ustawiania i sprawdzania bitu parzystości\n" " [-]parodd włączenie parzystości nieparzystej (parzystej z „-”)\n" -" * [-]cmspar użycie „przylepnej” parzystości (mark/space)\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr " * [-]cmspar użycie „przylepnej” parzystości (mark/space)\n" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -10541,6 +10655,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Ustawienia wejścia:\n" @@ -10548,210 +10663,304 @@ msgstr "" " [-]icrnl zamienianie znaków CR na NL\n" " [-]ignbrk ignorowanie znaku break\n" " [-]igncr ignorowanie znaku CR\n" +" [-]ignpar ignorowanie znaków z błędami parzystości\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" +" * [-]imaxbel piszczenie przy pełnym buforze (bez jego opróżniania) po\n" +" wprowadzeniu znaku\n" + +#: src/stty.c:686 +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -" [-]ignpar ignorowanie znaków z błędami parzystości\n" -" * [-]imaxbel piszczenie przy pełnym buforze (bez jego opróżniania) po\n" -" wprowadzeniu znaku\n" " [-]inlcr zamienianie znaków NL na CR\n" " [-]inpck włączenie kontroli parzystości na wejściu\n" " [-]istrip zerowanie najstarszego (ósmego) bitu znaków na wejściu\n" -#: src/stty.c:616 +#: src/stty.c:692 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:619 +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr " * [-]iuclc zamienianie wielkich liter na małe\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr " * [-]ixany każdy znak wznawia transmisję, nie tylko znak start\n" + +#: src/stty.c:706 +msgid "" " [-]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 "" -" * [-]iuclc zamienianie wielkich liter na małe\n" -" * [-]ixany każdy znak wznawia transmisję, nie tylko start\n" " [-]ixoff włączenie wysyłania znaków start/stop\n" " [-]ixon włączenie protokołu sterowania przepływem XON/XOF\n" " [-]parmrk zaznaczanie błędów parzystości sekwencją 255-0-znak\n" " [-]tandem to samo co [-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" "\n" "Ustawienia dla wyjścia:\n" -" * bsN styl opóźnienia po znaku BS, N w zakresie [0..1]\n" -" * crN styl opóźnienia po znaku CR, N w zakresie [0..3]\n" -" * 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:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr " * bsN styl opóźnienia po znaku BS, N w zakresie [0..1]\n" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr " * crN styl opóźnienia po znaku CR, N w zakresie [0..3]\n" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr " * ffN styl opóźnienia po znaku FF, N w zakresie [0..1]\n" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr " * nlN styl opóźnienia po znaku NL, N w zakresie [0..1]\n" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr " * [-]ocrnl zamienianie znaku CR na NL\n" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" -" * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" msgstr "" -" * [-]ocrnl zamienianie znaku CR na NL\n" " * [-]ofdel używanie znaku DEL zamiast NUL jako znaku wypełniającego\n" + +#: src/stty.c:747 +msgid "" +" * [-]ofill use fill (padding) characters instead of timing for delays\n" +msgstr "" " * [-]ofill używanie znaków wypełniających zamiast opóźnień transmisji\n" -" * [-]olcuc zamienianie małych liter na wielkie\n" -" * [-]onlcr zamienianie znaków NL na sekwencje CR-NL\n" -" * [-]onlret znak NL powoduje powrót karetki (carriage return)\n" -#: src/stty.c:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr " * [-]olcuc zamienianie małych liter na wielkie\n" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr " * [-]onlcr zamienianie znaków NL na sekwencje CR-NL\n" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr " * [-]onlret znak NL powoduje powrót karetki (carriage return)\n" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr " * [-]onocr bez wysyłania znaków CR w pierwszej kolumnie\n" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr " [-]opost przetwarzanie znaków wyjściowych\n" + +#: src/stty.c:775 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 "" -" * [-]onocr bez wysyłania znaków CR w pierwszej kolumnie\n" -" [-]opost przetwarzanie znaków wyjściowych\n" " * tabN styl opóźnienia po tabulatorze poziomym, N w zakresie " "[0..3]\n" " * tabs to samo co tab0\n" " * -tabs to samo co tab3\n" + +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" " * vtN styl opóźnienia po tabulatorze pionowym, N w zakresie " "[0..1]\n" -#: src/stty.c:651 +#: src/stty.c:786 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 "" "\n" "Ustawienia lokalne:\n" " [-]crterase wyświetlanie znaku erase jako BS-spacja-BS\n" + +#: src/stty.c:792 +msgid "" +" * 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 "" " * crtkill kasowanie całej linii zgodnie z ustawieniami echoprt i " "echoe\n" " * -crtkill kasowanie całej linii zgodnie z ustawieniami echoctl i " "echok\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr " * [-]ctlecho wyświetlanie znaków kontrolnych jako „^c” itp.\n" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr " [-]echo wyświetlanie każdego znaku z wejścia\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr " * [-]echoctl to samo co [-]ctlecho\n" + +#: src/stty.c:810 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 "" -" * [-]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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr " * [-]echoke to samo co [-]crtkill\n" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" +" [-]echonl wyświetlanie znaku NL nawet jeśli inne nie są wyświetlane\n" + +#: src/stty.c:823 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 "" -" * [-]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" -" [-]icanon wyświetlanie znaków erase, kill, werase i rprnt\n" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" +" * [-]extproc włączenie trybu liniowego, przydatne na łączach z " +"opóźnieniami\n" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" +" [-]iexten enable non-POSIX special characters\n" +msgstr "" +" [-]icanon wyświetlanie znaków specjalnych: %s\n" " [-]iexten wyświetlanie znaków spoza specyfikacji POSIX\n" -#: src/stty.c:672 +#: src/stty.c:843 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 "" " [-]isig wyświetlanie znaków intr, quit i susp\n" " [-]noflsh bez opróżniania bufora po znakach intr i quit\n" -" * [-]prterase to samo co [-]echoprt\n" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr " * [-]prterase to samo co [-]echoprt\n" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" " * [-]tostop zatrzymywanie procesów w tle, próbujących pisać na " "terminal\n" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" " * [-]xcase z icanon: wyświetlanie wielkich liter jako „\\mała-litera”\n" -#: src/stty.c:679 +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" +"\n" +"Zestawy ustawień:\n" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr " * [-]LCASE jak [-]lcase\n" + +#: src/stty.c:871 +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" -"\n" -"Kombinacje ustawień:\n" -" * [-]LCASE jak [-]lcase\n" " cbreak jak -icanon\n" " -cbreak jak icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 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 jak brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof i eol ustawione na wartości domyślne\n" " -cooked jak raw\n" -" crt jak echoe echoctl echoke\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr " crt jak %s\n" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" +" dec jak %s intr ^c erase 0177\n" +" kill ^u\n" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr " * [-]decctlq jak [-]ixany\n" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -" dec jak echoe echoctl echoke -ixany intr ^c erase 0177\n" -" kill ^u\n" -" * [-]decctlq jak [-]ixany\n" " ek ustawienie znaków erase i kill na wartości domyślne\n" " evenp jak parenb -parodd cs7\n" +" -evenp jak -parenb cs8\n" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr " * [-]lcase jak xcase iuclc olcuc\n" -#: src/stty.c:699 +#: src/stty.c:919 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 "" -" -evenp jak -parenb cs8\n" -" * [-]lcase jak xcase iuclc olcuc\n" " litout jak -parenb -istrip -opost cs8\n" " -litout jak parenb istrip opost cs7\n" -" nl jak -icrnl -onlcr\n" -" -nl jak icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +" nl jak %s\n" +" -nl jak %s\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10765,35 +10974,37 @@ msgstr "" " pass8 jak -parenb -istrip cs8\n" " -pass8 jak parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw jak -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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw jak cooked\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -" sane jak 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, wszystkie znaki\n" -" specjalne przybierają standardowe wartości\n" +" sane jak cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" wszystkie znaki specjalne przybierają domyślne wartości\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10808,58 +11019,62 @@ 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:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "może być podane tylko jedno urządzenie" -#: src/stty.c:830 +#: src/stty.c:1154 #, 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:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, 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:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "błędny argument %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "brakujący argument %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, c-format +msgid "%s: error setting %s" +msgstr "%s: błąd ustawiania %s" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "błędna dyscyplina linii: %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: wykonanie wszystkich żądanych operacji było niemożliwe" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: brak informacji o wielkości tego urządzenia" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" -msgstr "błędny argument całkowity %s" +#: src/stty.c:2279 +msgid "invalid integer argument" +msgstr "błędny argument całkowity" #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 @@ -10867,31 +11082,74 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +msgid "Print checksum and block counts for each FILE.\n" +msgstr "Wypisanie sumy CRC i liczby bajtów każdego PLIKU.\n" + +#: src/sum.c:68 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 "" -"Wypisanie sumy kontrolnej i liczby bloków dla każdego PLIKU.\n" "\n" " -r użycie algorytmu BSD i bloków po 1 KB\n" " -s, --sysv użycie algorytmu Systemu V i bloków po 512 bajtów\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Składnia: %s [OPCJA] [PLIK]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" +"\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" msgstr "" -"Wymuszenie zapisu zmienionych bloków na dysk, aktualizacja super-bloku.\n" +"Zsynchronizowane zapisów do pamięci podręcznej z pamięcią stałą\n" "\n" +"Jeżeli podany jest jeden lub więcej plików, zsynchronizuj tylko je\n" +"lub zawierające je systemy plików\n" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" +" -d, --data zsynchronizowanie tylko danych, bez metadanych\n" -#: src/sync.c:69 +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" +" -f, --file-system zsynchronizowanie systemu plików zawierającego\n" +" podane pliki\n" + +#: src/sync.c:114 #, c-format -msgid "ignoring all arguments" -msgstr "wszystkie argumenty zostały zignorowane" +msgid "error opening %s" +msgstr "błąd otwierania %s" -#: src/system.h:343 +#: src/sync.c:124 +#, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "zresetowanie trybu nie blokującego %s nie było możliwe" + +#: src/sync.c:154 +#, c-format +msgid "error syncing %s" +msgstr "błąd synchronizowania %s" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "nie można podać razem opcji --data i --file-system" + +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "opcja --data musi mieć co najmniej jeden argument" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10904,15 +11162,24 @@ msgstr "" "która zwykle zasłania wersję tu opisaną. Szczegóły opcji tego polecenia\n" "opisuje dokumentacja.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help wyświetlenie tego opisu i zakończenie\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version wyświetlenie informacji o wersji i zakończenie\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Jeżeli nie został podany PLIK albo podany jest jako -, czytane jest\n" +"standardowe wejście.\n" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -10920,7 +11187,7 @@ msgstr "" "\n" "Argumenty obowiązkowe dla opcji długich obowiązują również dla krótkich.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10933,7 +11200,7 @@ msgstr "" "1024)\n" "albo KB, MB, ... (potęgi 1000).\n" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10948,7 +11215,7 @@ msgstr "" "bajty\n" "albo 512 bajtów jeżeli ustawiona jest zmienna POSIXLY_CORRECT.\n" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -10961,26 +11228,29 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" "O błędach tłumaczenia %s poinformuj przez http://translationproject.org/" "team/\n" -#: src/system.h:584 +#: src/system.h:604 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" -msgstr "" -"Żeby przeczytać kompletną dokumentację uruchom: info coreutils „%s " -"invocation”\n" +msgid "Full documentation at: <%s%s>\n" +msgstr "Pełna dokumentacja w: %s%s\n" + +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "albo dostępna lokalnie przez: info '(coreutils) %s%s'\n" -#: src/system.h:591 +#: src/system.h:613 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Napisz „%s --help” dla uzyskania informacji.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -11001,13 +11271,10 @@ msgid "Jay Lepreau" msgstr "Jay Lepreau" #: 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" +msgid "Write each FILE to standard output, last line first.\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" +"ostatnia linia pierwsza.\n" #: src/tac.c:144 msgid "" @@ -11020,64 +11287,61 @@ msgstr "" " -s, --separator=NAPIS użycie NAPISU jako separatora zamiast nowej " "linii\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: nie udało się ustawienie pozycji" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "rekord jest za duży" -#: src/tac.c:450 +#: src/tac.c:459 #, c-format msgid "failed to create temporary file in %s" msgstr "nie udało się utworzyć pliku tymczasowego w %s" -#: src/tac.c:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" msgstr "błąd przy otwieraniu %s do zapisu" -#: src/tac.c:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" msgstr "nie udało się zmienić pozycji w strumieniu %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: błąd zapisu" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "nie udało się otworzyć %s do czytania" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "separator nie może być pusty" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 +#: src/tail.c:257 #, 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 "" "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" +"Dla większej liczby PLIKÓW każda porcja ma nagłówek z nazwą.\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" @@ -11086,7 +11350,7 @@ msgstr "" "aby\n" " wypisać od K-tego bajtu z każdego z plików\n" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -11098,7 +11362,7 @@ msgstr "" " brakujący argument oznacza „descriptor”\n" " -F to samo co --follow=name --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -11124,7 +11388,7 @@ msgstr "" " ta opcja jest rzadko przydatna jeżeli dostępne\n" " jest inotify\n" -#: src/tail.c:293 +#: src/tail.c:288 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -11137,7 +11401,7 @@ msgstr "" " --retry stałe ponawianie próby otwierania pliku, nawet\n" " jeżeli jest niedostępny\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -11151,7 +11415,7 @@ msgstr "" " najmniej co N sekund\n" " -v, --verbose wypisywanie zawsze nagłówków z nazwami plików\n" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -11169,7 +11433,7 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024 itd. dla T, P, E, Z, Y.\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -11188,22 +11452,22 @@ msgstr "" "jakiś czas ponownie, żeby sprawdzić, czy nie został przemianowany albo\n" "usunięty i ponownie utworzony przez jakiś inny program.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "zamykanie %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, 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:898 +#: src/tail.c:893 #, 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:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -11212,153 +11476,150 @@ msgstr "" "nierozpoznany system pliów typu 0x%08lx w %s; proszę wysłać raport do %s; " "powrót do cyklicznego sprawdzania" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "%s został zamieniony na łącze symboliczne; koniec śledzenia tej nazwy" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s stał się niedostępny" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s stał się dostępny" -#: src/tail.c:1035 +#: src/tail.c:1032 #, c-format -msgid "%s has appeared; following end of new file" -msgstr "%s pojawił się; śledzenie końca nowego pliku" +msgid "%s has appeared; following new file" +msgstr "pojawił się %s; śledzenie nowego pliku" -#: src/tail.c:1046 +#: src/tail.c:1042 #, c-format -msgid "%s has been replaced; following end of new file" -msgstr "%s został podmieniony; śledzenie końca nowego pliku" +msgid "%s has been replaced; following new file" +msgstr "został podmieniony %s; śledzenie nowego pliku" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: zresetowanie trybu nie blokującego nie było możliwe" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: plik obcięty" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "nie ma więcej plików" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "nie można śledzić katalogu nadrzędnego %s" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "zabrakło zasobów inotify" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "nie można śledzić %s" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, c-format +msgid "%s was replaced" +msgstr "%s został zastąpiony" + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "błąd monitorowanie zdarzenia inotify" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "błąd czytania zdarzenia inotify" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "%s: pliku tego typu nie można śledzić" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "liczba w %s jest za duża" +#: src/tail.c:2083 +msgid "invalid maximum number of unchanged stats between opens" +msgstr "błędna maksymalna liczba braków zmian stanów między otwarciami pliku" -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" -msgstr "" -"%s: błędna maksymalna liczba braków zmian stanów między otwarciami pliku" - -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" -msgstr "%s: błędny PID" +#: src/tail.c:2091 +msgid "invalid PID" +msgstr "błędny PID" -#: src/tail.c:2068 +#: src/tail.c:2107 #, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: błędna liczba sekund" +msgid "invalid number of seconds: %s" +msgstr "błędna liczba sekund: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "opcja użyta w błędnym kontekście -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" "uwaga: zignorowana opcja --retry; ta opcja jest przydatna tylko przy " "śledzeniu" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "warning: --retry działa tylko w momencie początkowego otwarcia" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" "uwaga: zignorowany PID; opcja --pid=PID jest przydatna tylko przy śledzeniu" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "uwaga: opcja --pid=PID nie działa w tym systemie" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "nie można pokazywać pliku %s wg nazwy" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "warning: stałe podążanie za standardowym wejściem może sie nie udać" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "nie można użyć inotify, powrót do cyklicznego sprawdzania" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -11370,60 +11631,89 @@ msgstr "" " -a, --append dopisywanie do PLIKU, nie nadpisywanie\n" " -i, --ignore-interrupts ignorowanie sygnałów przerwania\n" -#: src/tee.c:71 +#: src/tee.c:93 +msgid "" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" +msgstr "" +" -p, --output-error[=TRYB] zachowanie po napotkaniu błędu zapisu. Zob. " +"TRYB\n" + +#: src/tee.c:98 msgid "" "\n" -"If a FILE is -, copy again to standard output.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" msgstr "" "\n" -"Jeżeli PLIK podany jest jako -, dane są kopiowane na standardowe wyjście.\n" +"TRYB określa zachowanie po błędzie zapisu na wyjściach:\n" +" „warn” (ostrzeganie) diagnostyka błędów zapisu do dowolnego wyjścia\n" +" „warn-nopipe” (ostrzeganie bez potoków) diagnostyka błędów zapisu do\n" +" dowolnego wyjścia, które nie jest potokiem\n" +" „exit” (zakończenie) zakończenie programu po błędzie zapisu do " +"dowolnego\n" +" wyjścia\n" +" „exit-nopipe” (zakończenie bez potoków) zakończenie programu po błędzie\n" +" zapisu do dowolnego wyjścia, które nie jest\n" +" potokiem\n" +"Domyślnym TRYBEM przy użyciu opcji -p jest „warn-nopipe”.\n" +"Domyślne działanie gdy nie jest podana opcja --output-error to\n" +"natychmiastowe zakończenie po błędzie pisania do potoku i diagnostyka\n" +"błędów pisania do wyjść, które nie są potokami.\n" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "brakujący argument %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "błędna liczba całkowita %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "spodziewany „)”" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "spodziewany „)”, napotkany %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: spodziewany operator jednoargumentowy" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt nie dopuszcza -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef nie dopuszcza -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot nie dopuszcza -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "nieznany operator dwuargumentowy" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: spodziewany operator dwuargumentowy" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11437,7 +11727,7 @@ msgstr "" " albo: []\n" " albo: [ OPCJA\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11445,7 +11735,7 @@ msgstr "" "Zakończenie pracy z kodem wyjścia zależnym od WYRAŻENIA.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11455,7 +11745,7 @@ msgstr "" "Jeżeli brakuje WYRAŻENIA, domyślna wartość to fałsz. W przeciwnym przypadku\n" "WYRAŻENIE jest prawdziwe lub fałszywe i wynika z niego kod stanu - jeden z:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11469,7 +11759,7 @@ msgstr "" " WYRAŻENIE1 -a WYRAŻENIE2 WYRAŻENIE1 i WYRAŻENIE2 są prawdziwe\n" " WYRAŻENIE1 -o WYRAŻENIE2 WYRAŻENIE1 lub WYRAŻENIE2 jest prawdziwe\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11485,7 +11775,7 @@ msgstr "" " NAPIS1 = NAPIS2 napisy są równe\n" " NAPIS1 != NAPIS2 napisy są różne\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11503,7 +11793,7 @@ msgstr "" " LICZBA1 -lt LICZBA2 LICZBA1 mniejsza od LICZBY2\n" " LICZBA1 -ne LICZBA2 LICZBA1 jest różna od LICZBY2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11515,7 +11805,7 @@ msgstr "" " PLIK1 -nt PLIK2 PLIK1 jest nowszy niż PLIK2 (wg daty modyfikacji)\n" " PLIK1 -ot PLIK2 PLIK1 jest starszy niż PLIK2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11529,7 +11819,7 @@ msgstr "" " -d PLIK PLIK istnieje i jest katalogiem\n" " -e PLIK PLIK istnieje\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11544,7 +11834,7 @@ msgstr "" "L)\n" " -k PLIK PLIK istnieje i ma ustawiony bit ochrony (sticky bit)\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11558,7 +11848,7 @@ msgstr "" " -r PLIK PLIK istnieje i może być czytany\n" " -s PLIK PLIK istnieje i ma długość większą od zera\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11572,7 +11862,7 @@ msgstr "" " -w PLIK PLIK istnieje i może być zapisywany\n" " -x PLIK PLIK istnieje i jest wykonywalny albo przeszukiwalny\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11588,7 +11878,7 @@ msgstr "" "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 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11598,25 +11888,25 @@ msgstr "" "UWAGA: [ interpretuje opcje --help i --version, ale test tego nie robi.\n" "test traktuje je jak każdy inny niepusty NAPIS.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test i/lub [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "brak „]”" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "nadmiarowy argument: %s" @@ -11636,7 +11926,7 @@ msgstr "uwaga: timer_settime" msgid "warning: timer_create" msgstr "uwaga: timer_create" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11645,13 +11935,13 @@ msgstr "" "Składnia: %s [OPCJA] CZAS POLECENIE [ARGUMENT]...\n" " albo: %s [OPCJA]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" "Uruchomienie POLECENIA i zabicie go, jeżeli nadal działa po podanym\n" "okresie CZASU.\n" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11685,7 +11975,7 @@ msgstr "" " SYGNAŁ może być podany przez nazwę, jak „HUP”, albo\n" " przez numer; lista sygnałów: „kill -l”\n" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11696,7 +11986,7 @@ msgstr "" "CZAS jest liczbą rzeczywistą z opcjonalnym przyrostkiem:\n" "to „s” dla sekund (domyślnie), „m” dla minut, „h” dla godzin, „d” dla dni.\n" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -11716,7 +12006,7 @@ msgstr "" "być konieczne użycie sygnału KILL (9), który nie może być przechwycony. Po\n" "wysłaniu sygnału KILL (9), kod wyjścia to 128+9, a nie 124.\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "uwaga: nie udało się wyłączenie zrzutów pamięci" @@ -11731,6 +12021,11 @@ msgstr "błąd zapisu w czasie czekania na polecenie" msgid "the monitored command dumped core" msgstr "monitowane polecenie zrobiło zrzut pamięci" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "nieznany kod wyjściowy polecenia (%d)" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -12101,12 +12396,12 @@ msgstr "Wyjście z kodem oznaczającym powodzenie." msgid "Exit with a status code indicating failure." msgstr "Wyjście z kodem oznaczającym błąd." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Składnia: %s OPCJA... PLIK...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -12124,17 +12419,17 @@ msgstr "" "tracone. Jeżeli jest krótszy, dodana część (dziura) jest\n" "odczytywana jako bajty zerowe.\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create bez tworzenia nowych plików\n" -#: src/truncate.c:112 +#: src/truncate.c:85 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:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" @@ -12142,7 +12437,7 @@ msgstr "" " -r, --reference=PLIKODN użycie rozmiaru tego PLIKU ODNIESIENIA\n" " -s, --size=ROZMIAR użycie tego ROZMIARU w bajtach\n" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -12155,57 +12450,61 @@ msgstr "" "„/” zaokrągl w dół do wielokrotności, „%” zaokrągl w górę do " "wielokrotności.\n" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "przepełnienie przy % * % bajtach dla pliku %s" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "plik %s ma zły rozmiar, wyglądający na ujemny" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "nie można ustalić rozmiaru %s" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "przepełnienie przy zaokrąglaniu rozmiaru pliku %s" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "przepełnienie przy zwiększaniu rozmiaru pliku %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "nie udało się obciąć pliku %s do % bajtów" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "podano wiele modyfikatorów względnych" -#: src/truncate.c:333 +#: src/truncate.c:285 +msgid "Invalid number" +msgstr "błędna liczba" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "musisz podać albo %s albo %s" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "musisz podać względny %s z %s" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "został podany %s, ale nie %s" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "nie można otworzyć %s do pisania" @@ -12220,21 +12519,23 @@ msgstr "Mark Kettenis" 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 "" "Składnia: %s [OPCJA] [PLIK]\n" "Wypisanie całkowicie uporządkowanej listy zgodnie z częściowym porządkiem\n" -"w PLIKU. Gdy nie podano PLIKU albo podano jako -, czytane jest standardowe\n" -"wejście.\n" +"w PLIKU.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: dane wejściowe zawierają nieparzystą liczbę elementów" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: dane wejściowe zawierają pętlę:" @@ -12301,13 +12602,10 @@ msgid "cannot get system name" msgstr "nie można ustalić nazwy systemu" #: 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\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" +"W każdym PLIKU spacje zamieniane są na TAB-y, wynik jest wypisywany na\n" +"standardowe wyjście.\n" #: src/unexpand.c:124 msgid "" @@ -12362,8 +12660,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" " -D, --all-repeated[=METODA] wypisanie wszystkich powtarzających się " @@ -12379,12 +12677,12 @@ msgstr " -f, --skip-fields=N bez porównania pierwszych N pól\n" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" " --group[=METODA] wypisanie wszystkich elementów z odseparowaniem " "grup\n" -" pustą linią\n" +" pustą linią;\n" " METODA={separate(domyślna),prepend,append,both}\n" " (pomiędzy, przed, po, obie)\n" @@ -12549,11 +12847,6 @@ msgstr "" " Procesy w\n" "stanie nieprzrywalnego snu też wpływają na średnie obciążenie.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -12574,22 +12867,27 @@ msgstr "" "Jeśli brak PLIKU, używa %s. Często podaje się też %s.\n" "\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" +"Dla każdego PLIKU wypisywana jest liczba znaków nowej linii, słów i bajtów\n" +"oraz podsumowanie jeżeli podany jest więcej niż jeden PLIK. Jeżeli PLIK nie\n" +"jest podany albo podany jest jako -, czytane jest standardowe wejście.\n" +"Słowem jest niezerowej długości napis ograniczony przez znaki odstępu.\n" + +#: src/wc.c:126 +msgid "" +"\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 "" -"Dla każdego PLIKU wypisywana jest liczba znaków nowej linii, słów i bajtów\n" -"oraz podsumowanie jeżeli podany jest więcej niż jeden PLIK. Jeżeli PLIK nie\n" -"jest podany albo podany jest jako -, czytane jest standardowe wejście.\n" -"Słowo to niezerowej długości napis ograniczony przez znaki odstępu.\n" +"\n" "Poniższe opcje mogą być użyte do wybrania liczników, które zawsze są\n" "podawane w następującym porządku: znak nowej linii, liczba słów, znaków,\n" "bajtów, maksymalna długość linii.\n" @@ -12597,18 +12895,18 @@ msgstr "" " -m, --chars wypisanie liczby znaków\n" " -l, --lines wypisanie liczby znaków nowej linii\n" -#: src/wc.c:128 +#: src/wc.c:134 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=PLIK pliki wejściowe są PLIKU, oddzielone NUL-ami\n" " Jeżeli PLIK to -, nazwy czytane są ze\n" " standardowego wejścia\n" -" -L, --max-line-length wypisanie długości najdłuższej linii\n" +" -L, --max-line-length wypisanie maksymalnej szerokości ekranu\n" " -w, --words wypisanie liczby słów\n" #: src/who.c:210 @@ -12770,10 +13068,10 @@ msgstr "" "idetyfikatorem użytkownika. Działa jak id -un.\n" "\n" -#: src/whoami.c:91 +#: src/whoami.c:87 #, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: nie można znaleźć nazwy użytkownika o ID %lu\n" +msgid "cannot find name for user ID %lu" +msgstr "nie można znaleźć nazwy użytkownika o ID %lu" #: src/yes.c:41 #, c-format diff --git a/po/pt.gmo b/po/pt.gmo index c8b1f426..b831174c 100644 Binary files a/po/pt.gmo and b/po/pt.gmo differ diff --git a/po/pt.po b/po/pt.po index 8873edd9..6d85507f 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4,11 +4,12 @@ # António João Serras Rendas , 1996 # Helder Correia , 2007-2008 # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils 6.11\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2008-04-23 00:02+0100\n" "Last-Translator: Helder Correia \n" "Language-Team: Portuguese \n" @@ -36,18 +37,18 @@ msgstr "Argumentos válidos:" msgid "error closing file" msgstr "erro ao fechar o ficheiro" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "erro de escrita" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "a preservar as permissões de %s" @@ -233,57 +234,62 @@ msgstr "Expressão de parâmetros codificada incorrectamente" msgid "Unknown error" msgstr "Erro desconhecido" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: a opção '%s' é ambígua\n" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: a opção '-W %s' é ambígua\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: a opção '--%s' não permite um argumento\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: a opção '%c%s' não permite um argumento\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, fuzzy, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: a opção '%s' requere um argumento\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: opção '--%s' desconhecida\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: opção '%c%s' desconhecida\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, fuzzy, c-format msgid "%s: invalid option -- '%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 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a opção requere um argumento -- %c\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: a opção '-W %s' é ambígua\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: a opção '-W %s' não permite um argumento\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, fuzzy, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: a opção '%s' requere um argumento\n" @@ -293,13 +299,13 @@ msgstr "%s: a opção '%s' requere um argumento\n" msgid "cannot change permissions of %s" msgstr "impossível alterar as permissões de %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "impossível criar a pasta %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "memória esgotada" @@ -348,6 +354,12 @@ msgstr "»" msgid "%s: end of file" msgstr "%s: fim de ficheiro" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: erro de leitura" + #: lib/regcomp.c:131 msgid "Success" msgstr "Sucesso" @@ -455,7 +467,7 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "a definir as permissões de %s" @@ -900,7 +912,7 @@ msgstr "" "saída padrão.\n" "\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -910,15 +922,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Sem FICHEIRO, ou quando FICHEIRO é -, ler entrada padrão.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -933,51 +937,51 @@ 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:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "erro de leitura" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "dados de entrada inválidos" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "comprimento de partição inválido: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "operando extra %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "a fechar a entrada padrão" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "" @@ -1020,39 +1024,45 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "operando em falta" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Utilização: %s [OPÇÃO]... [FICHEIRO]...\n" #: src/cat.c:92 #, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"Escrever concatenação ordenada de todos os FICHEIROs na saída padrão.\n" +"\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1070,7 +1080,7 @@ msgstr "" " -n, --number numerar todas as linhas de saída\n" " -s, --squeeze-blank eliminar linhas vazias de saída repetidas\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1082,7 +1092,7 @@ msgstr "" " -u (ignorado)\n" " -v, --show-nonprinting usar a notação ^ e M-, excepto para LFD e TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1096,17 +1106,18 @@ msgstr "" "de g.\n" " %s Copiar a entrada padrão para a saída padrão.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "erro ao executar ioctl em %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "canal de saída padrão (stdout)" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: o ficheiro de entrada é o ficheiro de saída" @@ -1118,10 +1129,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "" @@ -1135,8 +1146,8 @@ msgstr "erro ao criar contexto de segurança: %s" msgid "failed to set %s security context component to %s" msgstr "erro ao definir o contexto de segurança de %s para %s" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "erro ao obter contexto de segurança de %s" @@ -1151,13 +1162,13 @@ msgstr "impossível aplicar contexto parcial ao ficheiro não etiquetado %s" 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:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "impossível aceder a %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "impossível ler a pasta %s" @@ -1173,7 +1184,7 @@ msgstr "a alterar contexto de segurança de %s" msgid "fts_read failed" msgstr "fts_read falhou" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, fuzzy, c-format msgid "fts_close failed" @@ -1305,7 +1316,7 @@ msgid "-R -h requires -P" msgstr "-R -h requere -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1322,9 +1333,8 @@ msgid "conflicting security context specifiers given" msgstr "especificadores de contexto de segurança em conflito" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "erro ao obter os atributos de %s" @@ -1616,17 +1626,17 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "grupo %s inválido" -#: src/chroot.c:150 +#: src/chroot.c:152 #, fuzzy, c-format msgid "invalid group list %s" msgstr "grupo %s inválido" -#: src/chroot.c:186 +#: src/chroot.c:185 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1635,7 +1645,7 @@ msgstr "" "Utilização: %s OPÇÃO UTILIZADOR COMANDO [ARGUMENTO]...\n" " ou: %s OPÇÃO\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1643,13 +1653,20 @@ msgstr "" "Executar COMANDO como pasta raiz definida como NOVARAIZ.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:207 #, fuzzy msgid "" "\n" @@ -1659,42 +1676,47 @@ msgstr "" "Se nenhum comando for dado, executar ``${SHELL} -i'' (predefinido: /bin/" "sh).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "impossível alterar a pasta raiz para %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "impossível mudar para a pasta raiz" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "erro ao definir grupo(s) adicional(is)" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" +msgid "failed to set supplemental groups" msgstr "erro ao definir grupo(s) adicional(is)" -#: src/chroot.c:402 +#: src/chroot.c:418 #, fuzzy, c-format msgid "failed to set group-ID" msgstr "erro ao definir o novo papel %s" -#: src/chroot.c:405 +#: src/chroot.c:421 #, fuzzy, c-format msgid "failed to set user-ID" msgstr "erro ao definir o novo utilizador %s" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, fuzzy, c-format msgid "failed to run command %s" msgstr "impossível executar o comando %s" @@ -1735,7 +1757,16 @@ msgstr "Utilização: %s [OPÇÃO]... FICHEIRO1 FICHEIRO2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Comparar os ficheiros ordenados FICHEIRO1 e FICHEIRO2 linha a linha.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Sem FICHEIRO, ou quando FICHEIRO é -, ler entrada padrão.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1747,7 +1778,7 @@ msgstr "" "linhas exclusivas do FICHEIRO1, a segunda linhas exclusivas do FICHEIRO2\n" "e a terceira linhas comuns a ambos os ficheiros.\n" -#: src/comm.c:116 +#: src/comm.c:120 #, fuzzy msgid "" "\n" @@ -1760,7 +1791,7 @@ msgstr "" " -2 suprimir linhas exclusivas ao FICHEIRO2\n" " -3 suprimir linhas comuns aos dois ficheiros\n" -#: src/comm.c:122 +#: src/comm.c:126 #, fuzzy msgid "" "\n" @@ -1776,17 +1807,17 @@ msgstr "" " entrada estejam em pares\n" " --nocheck-order não verificar ordenação da entrada\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1795,309 +1826,323 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, fuzzy, c-format msgid "file %d is not in sorted order" msgstr "Ficheiro %d não está ordenado" -#: src/comm.c:407 +#: src/comm.c:411 #, fuzzy, c-format msgid "multiple delimiters specified" msgstr "múltiplas opções -i especificadas" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "impossível alterar o posicionamento dentro do ficheiro %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "erro ao ler %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "impossível alterar o posicionamento dentro do ficheiro %s" +msgid "error reading %s" +msgstr "erro ao ler %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "erro ao escrever %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "erro ao ler %s" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "erro ao obter o contexto actual" -#: src/copy.c:383 +#: src/copy.c:478 #, fuzzy, c-format msgid "%s: write failed" msgstr "erro de escrita" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "erro ao abrir %s" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "a limpar as permissões de %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "erro ao preservar o dono de %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "ficheiro %s não encontrado" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "erro ao preservar o criador de %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "erro ao alterar contexto padrão de criação de ficheiros %s" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "erro ao alterar contexto padrão de criação de ficheiros %s" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "erro ao alterar o contexto de segurança de %s para %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "impossível abrir %s para leitura" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "impossível obter o estado de %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "a saltar o ficheiro %s, uma vez que foi substituído ao ser copiado" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "impossível remover %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "%s removido\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "a não escrever através da ligação simbólica %s" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "impossível criar o ficheiro regular %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" msgstr "erro ao fechar a pasta %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "a preservar os dados de tempo de %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "erro ao abrir %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, fuzzy, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: tentar sobrescrever %s, cancelando o modo %04lo (%s)? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: sobrescrever %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (salvaguarda: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, 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:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "impossível criar a ligação persistente %s para %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "impossível analisar %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "a omitir a pasta %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, 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:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s e %s são o mesmo ficheiro" -#: src/copy.c:1939 +#: src/copy.c:2019 #, 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:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "recém-criado %s não será sobrescrito com %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "impossível sobrescrever a pasta %s com não-pasta" -#: src/copy.c:1989 +#: src/copy.c:2069 #, 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:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "impossível salvaguardar %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, 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:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "aviso: ficheiro de origem %s especificado mais de uma vez" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "impossível mover %s para %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "impossível copiar a ligação simbólica cíclica %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, 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:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "impossível criar fifo %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "impossível criar o ficheiro especial %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "impossível ler a ligação simbólica %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "impossível criar a ligação simbólica %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s é um tipo de ficheiro desconhecido" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "impossível recuperar %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (recuperação)\n" @@ -2107,25 +2152,25 @@ msgstr "%s -> %s (recuperação)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, fuzzy, c-format msgid "unknown program %s" msgstr "ID de utilizador desconhecido: %s" @@ -2397,8 +2442,8 @@ msgstr "%s existe mas não é uma pasta" msgid "failed to access %s" msgstr "erro ao abrir %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "operando de ficheiro em falta" @@ -2474,131 +2519,131 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "a entrada desapareceu" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: número de linha fora de alcance" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: número de linha fora de alcance" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr "em repetição %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: correspondência não encontrada" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "erro na pesquisa de expressão regular" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "erro de escrita para %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: inteiro esperado após delimitador" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: '}' é requerido na contagem de repetição" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: inteiro requerido entre '{' e '}'" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: delimitador de fecho '%c' em falta" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: expressão regular inválida: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: padrão inválido" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, 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:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "especificador de conversão em falta no sufixo" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "especificação de conversão inválida no sufixo: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "especificação de conversão inválida no sufixo: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "%.*s: especificação de conversão inválida" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "demasiadas especificações de conversão %% no sufixo" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "especificação de conversão %% inválida no sufixo" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: número inválido" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "número inválido %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Utilização: %s [OPÇÃO]... FICHEIRO PADRÃO...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 #, fuzzy msgid "" "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n" @@ -2608,7 +2653,16 @@ msgstr "" "'xx00',\n" "'xx01', ..., e exibir contagem de bytes de cada parte.\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Ler a entrada padrão se FICHEIRO for -. Cada PADRÃO pode ser:\n" + +#: src/csplit.c:1492 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2619,11 +2673,11 @@ msgstr "" " -f, --prefix=PREFIXO usar PREFIXO em vez de `xx'\n" " -k, --keep-files preservar ficheiros de saída após erro\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2633,18 +2687,11 @@ 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:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Ler a entrada padrão se FICHEIRO for -. Cada PADRÃO pode ser:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 #, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2680,7 +2727,7 @@ msgstr "" "Mostrar partes seleccionadas de linhas de cada FICHEIRO.\n" "\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2690,7 +2737,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:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2704,7 +2751,7 @@ msgstr "" " seja especificada\n" " -n (ignorado)\n" -#: src/cut.c:193 +#: src/cut.c:194 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" @@ -2713,7 +2760,7 @@ msgstr "" " --complement complementar o conjunto de bytes escolhidos,\n" " caracteres ou campos.\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2724,7 +2771,7 @@ msgstr "" " o modo predefinido é usar o delimitador de " "entrada\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2736,7 +2783,8 @@ 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:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2744,8 +2792,6 @@ msgid "" " 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 "" "Cada alcance é um de:\n" "\n" @@ -2756,51 +2802,52 @@ msgstr "" "\n" "Sem FICHEIRO, ou quando FICHEIRO é -, ler a entrada padrão.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "byte ou lista de campo inválido" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "campos e posições são numerados a partir de 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "intervalo inválido sem fim: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "intervalo decrescente inválido" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "posição de byte %s demasiado grande" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "número de campo %s demasiado grande" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "apenas um tipo de lista pode ser especificado" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "o delimitador deve ser um único carácter" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "deve especificar uma lista de bytes, caracteres ou campos" -#: src/cut.c:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2808,11 +2855,11 @@ msgstr "" "suprimir linhas não delimitadas faz sentido\n" "\tapenas para campos" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "lista de campos ausente" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "lista de posições ausente" @@ -2830,36 +2877,46 @@ msgid "Display the current time in the given FORMAT, or set the system date.\n" msgstr "" #: src/date.c:134 +#, fuzzy msgid "" -" -d, --date=STRING display time described by STRING, not 'now'\n" -" -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -" -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" +" -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" + +#: src/date.c:138 +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=FICHEIRO mostrar o último tempo de modificação de " "FICHEIRO\n" " -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:147 +#: src/date.c:149 #, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=ESPECTEMPO exibir data e hora no formato RFC 3339.\n" " ESPECTEMPO='date', 'seconds' ou 'ns' para\n" @@ -2870,7 +2927,18 @@ msgstr "" " -u, --utc, --universal exibir ou alterar Hora Universal Coordenada " "(UTC)\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 +msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 #, fuzzy msgid "" "\n" @@ -2886,7 +2954,7 @@ msgstr "" " %% um literal %\n" " %a nome de semana local abreviado (ex.: Dom)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2898,7 +2966,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:171 +#: src/date.c:177 #, fuzzy msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" @@ -2911,7 +2979,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:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2921,7 +2989,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:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2933,7 +3001,7 @@ msgstr "" " %I hora (01..12)\n" " %j dia do ano (001..366)\n" -#: src/date.c:188 +#: src/date.c:194 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2946,7 +3014,7 @@ msgstr "" " %m mês (01..12)\n" " %M minuto (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2964,7 +3032,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:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2976,7 +3044,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:209 +#: src/date.c:215 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" @@ -2990,7 +3058,7 @@ msgstr "" " %W número de semana do ano, Segunda-feira primeiro dia da semana " "(00..53)\n" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3002,7 +3070,7 @@ msgstr "" " %y últimos dois dígitos do ano (00..99)\n" " %Y ano\n" -#: src/date.c:221 +#: src/date.c:227 #, fuzzy msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" @@ -3023,7 +3091,7 @@ msgstr "" "\n" "Por omissão, date preenche campos numéricos com zeros.\n" -#: src/date.c:230 +#: src/date.c:236 #, fuzzy msgid "" "The following optional flags may follow '%':\n" @@ -3042,7 +3110,7 @@ msgstr "" " ^ usar maiúsculas se possível\n" " # usar capitalização oposta se possível\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3056,7 +3124,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:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3070,36 +3138,36 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "canal de entrada por omissão (stdin)" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "data inválida %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "múltiplos formatos de saída especificados" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3110,23 +3178,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:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "impossível alterar a data" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3135,7 +3203,7 @@ msgstr "" "Utilização: %s [OPERANDO]...\n" " ou: %s OPÇÃO\n" -#: src/dd.c:532 +#: src/dd.c:561 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3154,7 +3222,7 @@ msgstr "" " count=BLOCOS copiar apenas BLOCOS blocos de entrada\n" " ibs=BYTES ler BYTES bytes de cada vez\n" -#: src/dd.c:541 +#: src/dd.c:570 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3164,8 +3232,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\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" @@ -3176,7 +3246,7 @@ msgstr "" " skip=BLOCOS saltar BLOCOS blocos de tamanho ibs no início da entrada\n" " status=noxfer suprimir estatísticas de transferência\n" -#: src/dd.c:552 +#: src/dd.c:583 #, fuzzy msgid "" "\n" @@ -3195,7 +3265,7 @@ msgstr "" "Cadda símbolo CONV pode ser:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3223,7 +3293,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:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3240,7 +3310,7 @@ msgstr "" "terminar\n" " fsync da mesma forma, mas escrever igualmente os meta-dados\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3253,139 +3323,105 @@ msgstr "" "\n" " append modo acrescentar (sentido só para saída; conv=notrunc sugerido)\n" -#: src/dd.c:589 +#: src/dd.c:620 #, fuzzy msgid " cio use concurrent I/O for data\n" msgstr " text usar E/S de texto para dados\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct usar E/S directas para dados\n" -#: src/dd.c:593 +#: src/dd.c:624 #, fuzzy msgid " directory fail unless a directory\n" msgstr " erro de pasta a menos que seja uma pasta\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync usar E/S sincronizadas para dados\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync da mesma forma, mas também para meta-dados\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock usar E/S não-bloquantes\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime não actualizar o tempo de acesso\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty não atribuir terminal de controlo do ficheiro\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow não seguir ligações simbólicas\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks falhar se multiplamente ligado\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary usar E/S binárias para dados\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text usar E/S de texto para dados\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 -#, fuzzy, c-format +#: src/dd.c:661 +#, 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 "" -"\n" -"Enviar um sinal %s a um processo 'dd' em execução faz com que\n" -"exiba estatísticas E/S no erro padrão e depois resuma a cópia.\n" -"\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ kill -%s $pid; sleep 1; kill $pid\n" -" 18335302+0 registos dentro\n" -" 18335302+0 registos fora\n" -" 9387674624 bytes (9.4 GB) copiado, 34.6279 segundos, 271 MB/s\n" -"\n" -"Opções são:\n" -"\n" - -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -"%+% registos dentro\n" -"%+% registos fora\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% registo truncado\n" -msgstr[1] "% registos truncados\n" -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "% byte (%s) copiado" msgstr[1] "% bytes (%s) copiados" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "Infinitivo B" @@ -3399,83 +3435,100 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% registos dentro\n" +"%+% registos fora\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% registo truncado\n" +msgstr[1] "% registos truncados\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "a fechar o ficheiro de entrada %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "a apagar o ficheiro de saída %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, fuzzy, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "erro ao entrar na pasta %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "a escrever em %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "operando desconhecido %s" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "conversão inválida" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "opção de entrada inválida" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "opção de saída inválida" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "opção de estado inválida" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "número inválido %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "impossível combinar quaisquer dois de {ascii,ebcdic,ibm}" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "impossível combinar bloquear e desbloquear" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "impossível combinar letras minúsculas e maiúsculas" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "impossível combinar excl e nocreat" -#: src/dd.c:1424 +#: src/dd.c:1527 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "impossível combinar excl e nocreat" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3484,62 +3537,62 @@ msgstr "" "aviso: a contornar erro de lseek do kernel para o ficheiro (%s)\n" " de mt_type=0x%0lx -- ver para a lista de tipos" -#: src/dd.c:1670 +#: src/dd.c:1773 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: impossível indexar" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: impossível indexar" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "erro de excesso de índice ao ler o ficheiro %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, 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:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "impossível contornar erro do kernel" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "a definir opções para %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: impossível mover para a posição relativa %s" -#: src/dd.c:2172 +#: src/dd.c:2288 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "a truncar aos % bytes no ficheiro de saída %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "erro de fdatasync para %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "erro de fsync para %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "erro ao abrir %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3547,19 +3600,19 @@ msgid "" msgstr "" "índice muito alto: erro ao truncar para seek=% blocos (de %lu bytes)" -#: src/dd.c:2306 +#: src/dd.c:2422 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "a truncar aos % bytes no ficheiro de saída %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, fuzzy, c-format msgid "failed to discard cache for: %s" msgstr "erro ao entrar na pasta %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "" @@ -3640,12 +3693,12 @@ msgstr "Capacida" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 #, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" @@ -3658,18 +3711,18 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3683,7 +3736,7 @@ msgstr "" " --no-sync não invocar sync antes de obter informação " "(predef.)\n" -#: src/df.c:1409 +#: src/df.c:1429 #, fuzzy msgid "" " --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" @@ -3691,6 +3744,28 @@ msgid "" "omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" +msgstr "" +" -P, --portability usar o formato de saída POSIX\n" +" --sync invocar sync antes de obter a informação\n" +" -t, --type=TIPO limitar listagem a sist. de ficheiros de tipo TIPO\n" +" -T, --print-type exibir o tipo do sistema de ficheiros\n" +" -x, --exclude-type=TIPO limitar listagem a sist. ficheiros não de tipo " +"TIPO\n" +" -v (ignorado)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose mostrar um diagnóstico imediatamente antes de " +"cada\n" +" ficheiro ser aberto\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3704,7 +3779,7 @@ msgstr "" "TIPO\n" " -v (ignorado)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3712,26 +3787,26 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, 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:1610 +#: src/df.c:1636 #, 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:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Aviso: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "impossível ler a tabela de sistemas de ficheiros montados" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "nenhum sistema de ficheiros processado" @@ -3847,7 +3922,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3858,7 +3933,8 @@ msgstr "" #: src/du.c:285 #, fuzzy -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Resumir utilização de disco de cada FICHEIRO, recursivamente para pastas.\n" "\n" @@ -3996,62 +4072,56 @@ msgstr "" msgid "Infinity" msgstr "Infinitivo B" -#: src/du.c:636 +#: src/du.c:657 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fts_read falhou" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "profundidade máxima %s inválida" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "argumento %s%s inválido '%s'" -#: src/du.c:898 +#: src/du.c:919 #, 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:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "aviso: resumo conflicte com --max-depth=%lu" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 #, fuzzy msgid "file operands cannot be combined with --files0-from" msgstr "Operandos ficheiros não podem ser combinados com --files0-from." -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: erro de leitura" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "nome de ficheiro vazio inválido'" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "total" @@ -4188,9 +4258,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\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" @@ -4236,7 +4304,7 @@ msgid "input line is too long" msgstr "linha de entrada demasiado grande" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "" @@ -4390,12 +4458,12 @@ msgstr "erro no analisador de expressões regulares" msgid "non-integer argument" msgstr "argumento não numérico" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "divisão por zero" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Defina LC_ALL='C' para contornar o problema." @@ -4406,31 +4474,31 @@ msgid "the strings compared were %s and %s" msgstr "As expressões comparadas foram %s e %s." #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s não é um inteiro positivo válido" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s é muito grande" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4439,7 +4507,7 @@ msgstr "" "Utilização: %s [NÚMERO]...\n" " ou: %s OPÇÃO\n" -#: src/factor.c:2443 +#: src/factor.c:2533 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4486,7 +4554,7 @@ msgstr "" "Sem FICHEIRO ou se FICHEIRO for '-', ler a entrada padrão.\n" "\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4499,7 +4567,7 @@ msgstr "" " inserindo o prefixo nas linhas reformatadas\n" " -s, --split-only separar linhas longas, mas não reencher\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, fuzzy, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4513,7 +4581,7 @@ msgstr "" " -w, --width=LARGURA largura máxima de linha (predefinida 75 " "colunas)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4522,23 +4590,21 @@ msgstr "" "opção inválida -- %c; -LARGURA é reconhecida apenas quando é a primeira\n" "opção; use -w N ao invés" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "largura inválida: %s" -#: src/fold.c:70 +#: src/fold.c:69 #, fuzzy -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +msgid "Wrap input lines in each FILE, writing to standard output.\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:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4548,9 +4614,9 @@ msgstr "" " -s, --spaces separar nos espaços\n" " -w, --width=LARGURA usar LARGURA colunas em vez de 80\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "número inválido de colunas: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4620,18 +4686,17 @@ msgstr "impossível alterar o ID do utilizador" msgid "%s: no such user" msgstr "%s: Utilizador inexistente" -#: src/head.c:109 +#: src/head.c:110 #, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "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:117 +#: src/head.c:118 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4650,7 +4715,7 @@ msgstr "" "últimas\n" " N linhas de cada ficheiro\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4658,7 +4723,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:131 +#: src/head.c:132 #, fuzzy msgid "" "\n" @@ -4671,48 +4736,36 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: o ficheiro encolheu demasiado" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: número de bytes muito grande" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: impossível deslocar para a posição %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: impossível mover para a posição relativa %s" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "número de linhas" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "número de bytes" +msgid "%s: number of bytes is too large" +msgstr "%s: número de bytes muito grande" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "número de linhas inválido" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "número de bytes inválido" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "opção final inválida -- %c" @@ -4901,7 +4954,7 @@ msgstr "impossível alterar o dono de %s" msgid "cannot set time stamps for %s" msgstr "impossível alterar marcas de tempo de %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "erro na chamada de sistema fork" @@ -5051,7 +5104,7 @@ msgstr "a opção strip não pode ser usada ao instalar uma pasta" msgid "target directory not allowed when installing a directory" msgstr "pasta de destino não permitida ao instalar uma pasta" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "modo inválido %s" @@ -5087,11 +5140,15 @@ msgid "Mike Haertel" msgstr "" #: src/join.c:195 -#, 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" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5105,7 +5162,7 @@ msgstr "" " NUMFICH é 1 ou 2, correspondente a FICH1 ou FICH2\n" " -e VAZIO substituir campos de entrada em falta com VAZIO\n" -#: src/join.c:204 +#: src/join.c:210 #, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" @@ -5118,7 +5175,7 @@ msgstr "" " -o FORMATO obedecer FORMATO ao construir linha de saída\n" " -t CAR usar CAR como separador de campo de entrada e saída\n" -#: src/join.c:210 +#: src/join.c:216 #, fuzzy msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" @@ -5138,13 +5195,13 @@ msgstr "" " entrada estejam em pares\n" " --nocheck-order não verificar ordenação da entrada\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 #, fuzzy msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated terminar linhas com byte 0, não nova linha\n" -#: src/join.c:225 +#: src/join.c:231 #, fuzzy msgid "" "\n" @@ -5180,47 +5237,47 @@ msgstr "" "uma\n" "mensagem de aviso será mostrada.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "número de campo inválido: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "especificador de campo inválido: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "número de ficheiro inválido no especificador de campo: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "campos de junção inválidos %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "expressões de substituição de campo vazio em conflicto" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "tabulador multi-carácter %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "tabuladores incompatíveis" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "ambos os ficheiros não podem ser a entrada padrão" @@ -5299,17 +5356,17 @@ msgstr "impossível combinar sinal com -l ou -t" msgid "no process ID specified" msgstr "número de processo não especificado" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, fuzzy, c-format msgid "invalid buffering mode %s for %s\n" msgstr "argumento %s inválido para %s" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -5488,7 +5545,7 @@ msgstr "impossível criar a ligação simbólica %s" msgid "FIXME: unknown" msgstr "" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Utilização: %s [OPÇÃO]\n" @@ -5501,7 +5558,7 @@ msgstr "" "Exibir o nome do utilizador actual.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "sem nome de utilizador" @@ -5511,7 +5568,7 @@ msgstr "sem nome de utilizador" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -5520,95 +5577,95 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "a ignorar valor inválido da variável de ambiente QUOTING_STYLE: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "a ignorar largura inválida na variável de ambiente COLUMNS: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "a ignorar tamanho de tab inválido na variável de ambiente TABSIZE: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "largura de linha inválida: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "tamanho de tabulação inválido: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "formato de estilo de tempo inválido %s" -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "Argumentos válidos:" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "prefixo desconhecido: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "a variável de ambiente LS_COLORS tem um valor ilegível" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "a ignorar valor inválido da variável de ambiente QUOTING_STYLE: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "impossível abrir a pasta %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "impossível obter o dispositivo e inode de %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: a não listar pasta já listada" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "a ler a pasta %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "a fechar a pasta %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "impossível comparar os nomes de ficheiro %s e %s" -#: src/ls.c:4781 +#: src/ls.c:4775 #, fuzzy msgid "" "List information about the FILEs (the current directory by default).\n" @@ -5618,7 +5675,7 @@ msgstr "" "Ordenar entradas alfabeticamente se nenhuma de -cftuvSUX e --sort.\n" "\n" -#: src/ls.c:4788 +#: src/ls.c:4782 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5633,7 +5690,7 @@ msgstr "" " -b, --escape mostrar sinal. octais para caract. não " "gráficos\n" -#: src/ls.c:4794 +#: src/ls.c:4788 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." @@ -5654,13 +5711,14 @@ msgstr "" " com -l: mostrar ctime e ordenar por nome\n" " senão: ordenar por ctime\n" -#: src/ls.c:4804 +#: src/ls.c:4798 #, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5676,7 +5734,7 @@ msgstr "" " -D, --dired gerar saída desenhada para o modo de pastas " "Emacs\n" -#: src/ls.c:4812 +#: src/ls.c:4807 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5696,11 +5754,11 @@ msgstr "" " uma coluna -1, verboso -l, vertical -C\n" " --full-time como -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr " -g como -l, mas não listar o dono\n" -#: src/ls.c:4823 +#: src/ls.c:4818 #, fuzzy msgid "" " --group-directories-first\n" @@ -5715,7 +5773,7 @@ msgstr "" " uso de --sort=none (-U) desactiva " "agrupamento\n" -#: src/ls.c:4829 +#: src/ls.c:4824 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5729,7 +5787,7 @@ msgstr "" " (ex., 1K 234M 2G)\n" " --si igual, mas usar potências de 1000, não 1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 #, fuzzy msgid "" " -H, --dereference-command-line\n" @@ -5750,7 +5808,7 @@ msgstr "" " --hide=PADRÃO não listar entradas que correspondam ao PADRÃO\n" " (redefinido por -a ou -A)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5770,7 +5828,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:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5787,7 +5845,7 @@ msgstr "" " vez da própria ligação\n" " -m encher largura com entradas separadas por ,\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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 +5864,7 @@ msgstr "" " -p, --indicator-style=slash\n" " acrescentar indicador / a pastas\n" -#: src/ls.c:4871 +#: src/ls.c:4866 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" @@ -5826,7 +5884,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 #, fuzzy msgid "" " -r, --reverse reverse order while sorting\n" @@ -5838,19 +5896,19 @@ msgstr "" " -R, --recursive listar subpastas recursivamente\n" " -s, --size mostrar o tamanho de cada ficheiro, em blocos\n" -#: src/ls.c:4886 +#: src/ls.c:4881 #, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S ordenar por tamanho de ficheiro\n" " --sort=PAL ordenar por PAL em vez de nome: none -U,\n" @@ -5862,7 +5920,7 @@ msgstr "" "chave\n" " de ordenação se --sort=time\n" -#: src/ls.c:4896 +#: src/ls.c:4892 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5888,7 +5946,7 @@ msgstr "" "toma\n" " efeito apenas fora da localização POSIX\n" -#: src/ls.c:4908 +#: src/ls.c:4904 #, fuzzy msgid "" " -t sort by modification time, newest first\n" @@ -5897,12 +5955,12 @@ 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:4912 +#: src/ls.c:4908 #, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -5914,14 +5972,15 @@ msgstr "" " -U não ordenar; listar entradas na ordem da pasta\n" " -v ordenar por versão\n" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=COLS assumir largura de ecrã em vez do valor actual\n" " -x listar entradas por linhas, não por colunas\n" @@ -5929,7 +5988,7 @@ msgstr "" " -Z, --context mostrar contextos de segurança SELinux\n" " -1 listar um ficheiro por linha\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5938,7 +5997,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5967,51 +6026,52 @@ msgstr "" 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 "" "Utilização: %s [OPÇÃO] [FICHEIRO]...\n" "Mostrar ou verificar %s somas de controlo (de %d bits).\n" "Sem FICHEIRO, ou quando FICHEIRO é -, ler a entrada padrão.\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 #, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" " -b, --binary ler em modo binário (predefinido excepto ao ler " "stdin)\n" -#: src/md5sum.c:178 +#: src/md5sum.c:180 #, fuzzy -msgid " -b, --binary read in binary mode\n" +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary ler em modo binário\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 #, 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:192 +#: src/md5sum.c:195 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text ler em modo de texto (predefinido)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 #, fuzzy msgid "" "\n" @@ -6029,14 +6089,15 @@ msgstr "" " -w, --warn avisar linhas de somas de controlo mal formatadas\n" "\n" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "As somas são calculadas como descrito em %s. Ao verificar, a entrada deve " @@ -6046,88 +6107,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:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: demasiadas linhas de somas de controlo" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: linha de soma de controlo %s mal formatada" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: ERRO de abertura ou leitura\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "ERRO" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "OK" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, 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:629 +#: src/md5sum.c:632 #, fuzzy, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "%s: %: linha de soma de controlo %s mal formatada" msgstr[1] "%s: %: linha de soma de controlo %s mal formatada" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, fuzzy, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "AVISO: % de % ficheiro listado não lido" msgstr[1] "AVISO: % de % ficheiros listados não lidos" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, fuzzy, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "AVISO: % de % soma de controlo não corresponde" msgstr[1] "AVISO: % de % somas de controlo não correspondem" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, 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:777 +#: src/md5sum.c:780 #, 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:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, 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" @@ -6168,22 +6229,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "erro ao alterar contexto padrão de criação de ficheiros %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "erro ao preservar os tempos de %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "pasta %s criada" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, fuzzy, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6385,7 +6446,7 @@ msgstr "demasiados moldes (templates)" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, fuzzy, c-format msgid "invalid suffix %s, contains directory separator" msgstr "molde (template) inválido, %s, contém separador de pastas" @@ -6522,9 +6583,7 @@ 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" +msgid "Write each FILE to standard output, with line numbers added.\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" @@ -6636,27 +6695,27 @@ msgstr "estilo de numeração de corpo inválido: %s" msgid "invalid footer numbering style: %s" msgstr "estilo de numeração de roda-pé inválido: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "número de linha inicial inválido: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "incremento de número de linha inválido: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "número inválido de linhas em branco: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "largura de campo de número de linha inválida: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "formato de numeração de linha inválido: %s" @@ -6682,7 +6741,7 @@ msgstr "" #, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6701,43 +6760,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "erro ao redireccionar o canal de erro padrão" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "a ignorar a entrada" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "a ignorar a entrada e a acrescentar a saída a %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, fuzzy, c-format msgid "appending output to %s" msgstr "a ignorar a entrada e a acrescentar a saída a %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "erro ao configurar a cópia de stderr para fechar em exec" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "a ignorar entrada e a redireccionar stderr para stdout" -#: src/nohup.c:199 +#: src/nohup.c:197 #, fuzzy, c-format msgid "redirecting stderr to stdout" msgstr "a ignorar entrada e a redireccionar stderr para stdout" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "" @@ -6759,96 +6818,93 @@ msgid "" " --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: número de linhas inválido" - #. This is a proper name. See the gettext manual, section Names. -#: src/numfmt.c:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, fuzzy, c-format msgid "value too large to be converted: %s" msgstr "%s: valor não convertido na totalidade" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "número inválido %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "sufixo inválido no argumento %s%s '%s'" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "%s: erro ao abrir para escrita" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "tamanho de tabulação inválido: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Utilização: %s [OPÇÃO]... [UTILIZADOR]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6856,19 +6912,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -6878,40 +6934,40 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" msgstr "" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6920,7 +6976,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -6928,7 +6984,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -6936,7 +6992,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -6944,20 +7000,42 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 -#, c-format +#: src/numfmt.c:973 +#, fuzzy 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 zero (%010f) width\n" -"will zero pad the number. Optional negative values (%-10f) will left align.\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" msgstr "" - -#: src/numfmt.c:913 -#, c-format -msgid "" +"Cada alcance é um de:\n" +"\n" +" N N-ésimo byte, carácter ou campo, countado a partir de 1\n" +" N- do N-ésimo byte, carácter ou campo, até fim da linha\n" +" N-M do N-ésimo ao do M-ésimo (inclusive) byte, carácter ou campo\n" +" -M do primeiro ao M-ésimo (inclusive) byte, carácter ou campo\n" +"\n" +"Sem FICHEIRO, ou quando FICHEIRO é -, ler a entrada padrão.\n" + +#: src/numfmt.c:983 +#, 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 zero (%010f) width\n" +"will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" +msgstr "" + +#: src/numfmt.c:991 +#, 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" @@ -6967,7 +7045,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -6982,118 +7060,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, fuzzy, c-format msgid "format %s has no %% directive" msgstr "o destino %s não é uma pasta" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "formato de largura inválido" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "precisão inválida: %s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "sufixo inválido no argumento %s%s '%s'" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "número de campo inválido: %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "data inválida %s" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "número de campo inválido: %s" +msgid "multiple field specifications" +msgstr "%s: especificação de campo inválida %s" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "data inválida %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, fuzzy, c-format msgid "--grouping cannot be combined with --format" msgstr "Operandos ficheiros não podem ser combinados com --files0-from." -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "múltiplas opções -i especificadas" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, fuzzy, c-format msgid "grouping cannot be combined with --to" msgstr "Operandos ficheiros não podem ser combinados com --files0-from." -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "erro ao ler %s" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, fuzzy, c-format msgid "failed to convert some of the input numbers" msgstr "erro ao alterar contexto de %s para %s" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7106,14 +7196,13 @@ msgstr "" " ou: %s --traditional [OPÇÃO]... [FICHEIRO] [[+]POSIÇÃO[.][b] [+]" "[ETIQUETA][.][b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Escrever uma representação não ambígua, predefinidamente bytes octais,\n" @@ -7122,9 +7211,10 @@ msgstr "" "Sem FICHEIRO ou quando FILE é -, ler a entrada padrão.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 #, 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" @@ -7141,7 +7231,7 @@ msgstr "" "Para ÍNDICE e ETIQUETA, um prefixo 0x ou 0X indica hexadecimal;\n" "sufixos podem ser . para octal e b para multiplicar por 512.\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7150,7 +7240,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 #, fuzzy msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" @@ -7171,7 +7261,7 @@ msgstr "" " -w, --width[=BYTES] despejar BYTES bytes por linha de saída\n" " --traditional aceitar argumentos na forma tradicional\n" -#: src/od.c:363 +#: src/od.c:366 #, fuzzy msgid "" "\n" @@ -7190,7 +7280,7 @@ msgstr "" "sinalizadas\n" " -d como -t u2, seleccionar unidades de 2 bytes decimais positivas\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7206,7 +7296,7 @@ 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:380 +#: src/od.c:383 #, fuzzy msgid "" "\n" @@ -7221,7 +7311,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:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7235,7 +7325,7 @@ msgstr "" " u[TAMANHO] decimal sem sinal, TAMANHO bytes por inteiro\n" " x[TAMANHO] hexadecimal, TAMANHO bytes por inteiro\n" -#: src/od.c:394 +#: src/od.c:397 #, fuzzy msgid "" "\n" @@ -7250,14 +7340,14 @@ msgstr "" "sizeof(long). Se TIPO é f, TAMANHO pode também ser F para sizeof(float), D\n" "para sizeof(double) ou L para sizeof(long double).\n" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 #, fuzzy msgid "" "\n" @@ -7275,12 +7365,12 @@ msgstr "" "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n" "GB 1000*1000*1000, G 1024*1024*1024 e assim por diante para T, P, E, Z, Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "expressão inválida %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7289,7 +7379,7 @@ msgstr "" "expressão de tipo inválida %s;\n" "este sistema não providencia um tipo integral de %lu bytes" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7298,38 +7388,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:869 +#: src/od.c:872 #, 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:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "impossível slatar depois do fim da entrada combinada" -#: src/od.c:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "nenhum tipo pode ser especificado ao despejar expressões" -#: src/od.c:1863 +#: src/od.c:1871 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "Modo de compatibilidade suporta no máximo um ficheiro." -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "skip-bytes + read-bytes é demasiado grande" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "aviso: largura inválida %lu; a usar %d ao invés" @@ -7349,7 +7439,6 @@ msgstr "o canal de entrada padrão está fechado" 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 "" "Escrever linhas consistindo das linhas correspondentes sequencialmente de\n" "cada FICHEIRO, separadas por TABs, para a saída padrão.\n" @@ -7496,12 +7585,12 @@ msgstr "Quando" msgid "Where" msgstr "Onde" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Utilização: %s [OPÇÃO]... [UTILIZADOR]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7519,7 +7608,7 @@ msgstr "" " -p omitir o ficheiro de plano do utilizador em formato longo\n" " -s produzir saída curta (predefinido)\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7535,7 +7624,7 @@ msgstr "" "tempo\n" " de inactividade em formato curto\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, fuzzy, c-format msgid "" "\n" @@ -7546,101 +7635,101 @@ msgstr "" "Um programa 'finger' leve; exibir informação de utilizador.\n" "O ficheiro utmp será %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, 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" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "" -#: src/pr.c:908 +#: src/pr.c:905 #, 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:910 +#: src/pr.c:907 #, fuzzy, c-format msgid "invalid page range %s" msgstr "Alcance de página inválido %s" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "'-l COMP_PÁG' número inválido de linhas: %s" -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "'-N NÚMERO' número de linha inicial inválido: %s" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "'-o MARGEM' índice de linha inválido: %s" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "'-w COMP_PÁG' número de caracteres inválido: %s" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "'-W COMP_PÁG' número inválido de caracteres: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, 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:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "largura de página muito estreita" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" "número de página inicial % excede contagem de páginas %" -#: src/pr.c:2380 +#: src/pr.c:2350 #, fuzzy, c-format msgid "page number overflow" msgstr "Excesso de número de página" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Página %" -#: src/pr.c:2757 +#: src/pr.c:2727 #, fuzzy msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "Paginar ou colunizar FICHEIRO(s) para impressão.\n" "\n" -#: src/pr.c:2763 +#: src/pr.c:2734 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -7659,7 +7748,7 @@ msgstr "" "nas\n" " colunas de cada página.\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7676,7 +7765,7 @@ msgstr "" " -d, --double-space\n" " duplicar o espaço da saída\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7697,7 +7786,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:2789 +#: src/pr.c:2760 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -7719,12 +7808,25 @@ msgstr "" " alinhamento de cols., --sep-string[=EXP] define " "separadores\n" -#: src/pr.c:2798 +#: src/pr.c:2769 #, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l ALT_PÁG, --length=ALT_PÁG\n" +" altera a altura de página para ALT_PÁG (66) linhas\n" +" (predefinido 56 linhas de texto, 63 com -F)\n" +" -m, --merge imprimir todos os ficheiros em paralelo, um em cada " +"coluna,\n" +" truncar linhas, mas juntar linhas de altura completa com " +"-J\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -7736,7 +7838,7 @@ msgstr "" " truncar linhas, mas juntar linhas de altura completa com " "-J\n" -#: src/pr.c:2805 +#: src/pr.c:2779 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -7755,7 +7857,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:2813 +#: src/pr.c:2787 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -7770,7 +7872,7 @@ msgstr "" " -r, --no-file-warnings\n" " omitir aviso quando um ficheiro não puder ser aberto\n" -#: src/pr.c:2820 +#: src/pr.c:2794 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -7789,7 +7891,7 @@ msgstr "" "opções\n" " de colunas (-COLUNAS|-a -COLUNAS|-m), excepto com -w\n" -#: src/pr.c:2828 +#: src/pr.c:2802 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7797,7 +7899,6 @@ msgid "" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " separar colunas por EXPR,\n" " sem -S: Separador predefinido com -J, senão " @@ -7805,7 +7906,13 @@ 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:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -7831,7 +7938,7 @@ msgstr "" " para saída de múlt. cols. de texto, -s[char] desactiva " "(72)\n" -#: src/pr.c:2845 +#: src/pr.c:2822 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -7846,17 +7953,6 @@ msgstr "" "interferência\n" " com -S ou -s\n" -#: src/pr.c:2853 -#, fuzzy -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"-t é implícito se COMP_PÁG <= 10. Sem FICHEIRO, ou quando\n" -"FICHIERO é -, ler a entrada padrão.\n" - #: src/printenv.c:62 #, fuzzy, c-format msgid "" @@ -8018,12 +8114,11 @@ msgstr "" "de entrada.\n" "\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 #, fuzzy 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 despejar referências geradas " "automaticamente\n" @@ -8031,6 +8126,12 @@ msgstr "" " -F, --flag-truncation=EXPR usar EXPR para marcar truncagens de linhas\n" #: src/ptx.c:1835 +msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -8045,7 +8146,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:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8063,7 +8164,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:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8076,20 +8177,16 @@ msgstr "" " -w, --width=NÚMERO largura saída em colunas, referência " "excluída\n" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Sem FICHEIRO, ou quando FICHEIRO é -, ler entrada padrão.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "largura de espaço inválida: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "largura de linha inválida: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8115,7 +8212,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "erro ao entrar na pasta %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "erro ao analisar %s" @@ -8135,8 +8232,8 @@ msgstr "a ignorar argumentos não-opção" msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Utilização: %s [OPÇÃO]... FICHEIRO...\n" @@ -8389,15 +8486,15 @@ msgstr "" #: src/rm.c:342 #, fuzzy, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: remover todos os argumentos recursivamente? " msgstr[1] "%s: remover todos os argumentos recursivamente? " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: remover todos os argumentos? " msgstr[1] "%s: remover todos os argumentos? " @@ -8621,12 +8718,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "argumento em vírgula flutuante inválido: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s é um tipo de ficheiro desconhecido" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8648,7 +8745,16 @@ msgstr "" "ainda mais difícil recuperar os dados mesmo para equipamento muito caro.\n" "\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Se um FICHEIRO é -, copiar novamente para a saída padrão.\n" + +#: src/shred.c:181 #, fuzzy, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8661,7 +8767,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:183 +#: src/shred.c:187 #, fuzzy msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" @@ -8677,12 +8783,10 @@ msgstr "" " -z, --zero adicionar zeros no final da escrita para esconder " "destruição\n" -#: src/shred.c:192 +#: src/shred.c:196 #, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -8703,7 +8807,7 @@ msgstr "" "regulares, a opção mais comum é --remove option.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8721,7 +8825,7 @@ msgstr "" "não é garantido que seja eficaz em todos os modos do sistema de ficheiros:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8743,7 +8847,7 @@ msgstr "" "* sistemas com imagens instantâneas, como Network Appliance's NFS server\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8757,7 +8861,7 @@ msgstr "" "* sistemas de ficheiros com compressão\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -8780,7 +8884,7 @@ msgstr "" "como documentado na página de manual mount (man mount).\n" "\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -8792,127 +8896,127 @@ msgstr "" "um\n" "ficheiro destruído seja recuperado mais tarde.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: error de fdatasync" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: error de fsync" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: impossível retroceder" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: pass %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: erro ao escrever na posição %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: erro de lseek" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: ficheiro demasiado grande" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: pass %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: pass %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: erro de fstat" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: tipo de ficheiro inválido" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: ficheiro tem tamanho negativo" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: erro de truncagem" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: erro de fcntl" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: impossível destruir ficheiro (apenas se pode acrescentar)" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: a remover" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: renomeado para %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: impossível remover" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: removido" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: erro ao fechar" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: erro ao abrir para escrita" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: número de passagens inválido" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "múltiplas origens aleatórias especificadas" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: tamanho de ficheiro inválido" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -8923,14 +9027,14 @@ msgstr "" " ou: %s -e [OPÇÃO]... [ARG]...\n" " ou: %s -i BAIXO-ALTO [OPÇÃO]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 #, 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:73 +#: src/shuf.c:75 #, fuzzy msgid "" " -e, --echo treat each ARG as an input line\n" @@ -8949,37 +9053,37 @@ 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:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "demasiados linhas repetidas" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "múltiplas opções -i especificadas" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "intervalo de entrada inválido %s" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "contagem de linhas inválida %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "múltiplos ficheiros de saída especificados" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "impossível combinar as opções -e e -i" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -9007,12 +9111,12 @@ msgstr "" "pela soma dos seus valores.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "intervalo de tempo inválido %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "impossível consultar relógio de tempo real" @@ -9024,7 +9128,7 @@ msgstr "" "Escrever concatenação ordenada de todos os FICHEIROs na saída padrão.\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -9032,7 +9136,7 @@ msgstr "" "Opções de ordenação:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9044,19 +9148,19 @@ msgstr "" "alfanuméricos\n" " -f, --ignore-case ignorar capitalização de letras\n" -#: src/sort.c:443 +#: src/sort.c:444 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:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9064,7 +9168,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9074,7 +9178,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 #, fuzzy msgid "" "Other options:\n" @@ -9083,13 +9187,13 @@ msgstr "" "Opções de ordenação:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 #, fuzzy msgid "" " -c, --check, --check=diagnose-first check for sorted input; do not sort\n" @@ -9110,7 +9214,7 @@ msgstr "" "1)\n" " -m, --merge combinar ficheiros já ordenados; não ordenar\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9119,13 +9223,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9136,7 +9240,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:497 +#: src/sort.c:498 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9157,7 +9261,7 @@ msgstr "" " -u, --unique com -c, verificar ordenação estricta;\n" " sem -c, mostrar só primeiro de iguais\n" -#: src/sort.c:511 +#: src/sort.c:512 #, fuzzy msgid "" "\n" @@ -9187,12 +9291,11 @@ msgstr "" "\n" "TAMANHO pode ser seguido pelos seguintes sufixos multiplicativos:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -9208,274 +9311,275 @@ msgstr "" "Defina LC_ALL=C para obter a ordenação tradicional que utiliza valores\n" "de byte nativos.\n" -#: src/sort.c:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "a aguardar por %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] terminou de forma anormal" -#: src/sort.c:884 +#: src/sort.c:883 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "impossível criar a pasta temporária %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "erro de open" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "erro de fflush" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "erro de close" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "impossível criar o ficheiro temporário" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "impossível criar o processo para %s -d" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "aviso: impossível remover: %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "argumento inválido %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "argumento %s%s inválido '%s'" -#: src/sort.c:1356 +#: src/sort.c:1355 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "argumento %s%s '%s' demasiado grande" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "error de stat" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "erro de read" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "erro na transformação de expressões" -#: src/sort.c:2079 +#: src/sort.c:2078 #, fuzzy, c-format msgid "the untransformed string was %s" msgstr "a expressão não transformada era %s." -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "%s: a opção '-W %s' é ambígua\n" msgstr[1] "%s: a opção '-W %s' é ambígua\n" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "erro de escrita" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: desordem: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "erro padrão" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "%s: impossível retroceder" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: especificação de campo inválida %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "as opções '-%s' são incompatíveis" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: contagem inválida no início de %s" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "número inválido após '-'" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "número inválido após '.'" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "carácter solto na especificação de campo" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "múltiplos programas de compressão especificados" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "número inválido no início do campo" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "número de campo é zero" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "índice de carácter é zero" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "número inválido após ','" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "TAB vazio" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "impossível ler os nomes de ficheiros a partir %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "nome de ficheiro vazio inválido'" -#: src/sort.c:4619 +#: src/sort.c:4618 #, fuzzy, c-format msgid "no input from %s" msgstr "a fechar o ficheiro de entrada %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "operando extra %s não permitido com -%c" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 +#: src/split.c:224 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Utilização: %s [OPÇÃO] [ENTRADA [PREFIXO]]\n" -#: src/split.c:207 +#: src/split.c:228 #, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\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:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9484,201 +9588,206 @@ msgstr "" "cada\n" " ficheiro ser aberto\n" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "Sufixos de ficheiro de saída esgotados" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "a criar o ficheiro %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "erro ao definir o novo papel %s" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "erro ao remover %s" -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" msgstr "a fechar a pasta %s" -#: src/split.c:410 +#: src/split.c:464 #, fuzzy, c-format msgid "closing output pipe" msgstr "a apagar o ficheiro de saída %s" -#: src/split.c:414 +#: src/split.c:468 #, fuzzy, c-format msgid "moving input pipe" msgstr "a fechar o ficheiro de entrada %s" -#: src/split.c:416 +#: src/split.c:470 #, fuzzy, c-format msgid "closing input pipe" msgstr "a fechar o ficheiro de entrada %s" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "erro ao alterar contexto de %s para %s" -#: src/split.c:427 +#: src/split.c:481 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "erro ao fechar a pasta %s" -#: src/split.c:463 +#: src/split.c:517 #, fuzzy, c-format msgid "waiting for child process" msgstr "a aguardar por strip" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "impossível dividir em mais do que uma forma" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: número de segundos inválido" -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: número inválido" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: comprimento de sufixo inválido" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: número de bytes inválido" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: número de linhas inválido" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "tabulador multi-carácter %s" -#: src/split.c:1286 +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "ficheiro especial de caracteres" + +#: src/split.c:1383 #, 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:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "número de linha inicial inválido: %s" -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: tamanho de ficheiro inválido" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "" -#: src/stat.c:887 +#: src/stat.c:890 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "erro ao abrir %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "aviso: código de escape '\\%c' desconhecido" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: directiva inválida" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "aviso: barra invertida no final do formato" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, 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:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9689,7 +9798,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9697,30 +9806,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9728,11 +9837,11 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 #, fuzzy msgid "" " -L, --dereference follow links\n" @@ -9743,7 +9852,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:1422 +#: src/stat.c:1425 #, fuzzy msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" @@ -9761,7 +9870,7 @@ msgstr "" " Se quiser um, inclua \\n em FORMATO.\n" " -t, --terse mostrar a informação em forma resumida\n" -#: src/stat.c:1433 +#: src/stat.c:1436 #, fuzzy msgid "" "\n" @@ -9782,7 +9891,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:1442 +#: src/stat.c:1445 #, fuzzy msgid "" " %d device number in decimal\n" @@ -9799,7 +9908,7 @@ msgstr "" " %g ID de grupo do dono\n" " %G Nome de grupo do dono\n" -#: src/stat.c:1450 +#: src/stat.c:1453 #, fuzzy msgid "" " %h number of hard links\n" @@ -9821,7 +9930,7 @@ msgstr "" " %t Tipo de dispositivo maior, em hexadecimal\n" " %T Tipo de dispositivo menor, em hexadecimal\n" -#: src/stat.c:1461 +#: src/stat.c:1464 #, fuzzy msgid "" " %u user ID of owner\n" @@ -9846,7 +9955,7 @@ msgstr "" " %Z Tempo da última alteração em segundos desde Epoch\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -9866,7 +9975,7 @@ msgstr "" " %f Blocos livres no sistema de ficheiros\n" " %C Expressão de contexto de segurança SELinux\n" -#: src/stat.c:1484 +#: src/stat.c:1487 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -9929,8 +10038,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -9955,7 +10063,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "" -#: src/stty.c:516 +#: src/stty.c:524 #, fuzzy, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9966,11 +10074,11 @@ msgstr "" " or: %s [-F DISPOSITIVO] [--file=DISPOSITIVO] [-a|--all]\n" " or: %s [-F DISPOSITIVO] [--file=DISPOSITIVO] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 #, fuzzy msgid "" " -a, --all print all current settings in human-readable form\n" @@ -9983,7 +10091,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:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9993,11 +10101,24 @@ 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:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -10007,9 +10128,13 @@ msgstr "" " eof CAR CAR enviará um fim de ficheiro (terminar a entrada)\n" " eol CAR CAR terminará a linha\n" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -10019,36 +10144,58 @@ msgstr "" " intr CAR CAR enviará um sinal de interrupção\n" " kill CAR CAR apagará a linha actual\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" msgstr "" -" * lnext CAR CAR inserirá o último carácter entre aspas\n" -" quit CAR CAR enviará um sinal de saída\n" -" * rprnt CAR CAR redesenhará a linha actual\n" -" start CAR CAR reiniciará a saída após pará-la\n" -#: src/stty.c:559 +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 parará a saída\n" " susp CHAR CHAR enviará um sinal de término\n" " * swtch CHAR CHAR mudará para uma camada de shell diferente\n" " * werase CHAR CHAR apagará a última palavra inserida\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 #, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Preferências especiais:\n" +" N alterar as taxas de entrada e saída para N bauds\n" +" * cols N dizer ao sistema operativo que o terminal tem N colunas\n" +" * columns N o mesmo que cols N\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -10058,10 +10205,17 @@ 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:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -10072,11 +10226,23 @@ msgstr "" "completa\n" " ospeed N alterar a taxa de saída para N\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N dizer ao sistema operativo que o terminal tem N linhas\n" +" * size mostrar o número de linhas e colunas de acordo com o " +"kernel\n" +" speed mostrar a velocidade do terminal\n" +" time N com -icanon, definir limite de leitura N décimos de " +"segundo\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -10087,25 +10253,27 @@ msgstr "" " time N com -icanon, definir limite de leitura N décimos de " "segundo\n" -#: src/stty.c:584 -#, fuzzy +#: src/stty.c:641 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" -"Preferências de controlo:\n" -" [-]clocal desactivar sinais de controlo de modem\n" -" [-]cread permitir recepção de entrada\n" -" * [-]crtscts activar cumprimento RTS/CTS\n" -" csN definir tamanho de carácter N bits, N em [5..8]\n" -#: src/stty.c:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -10114,7 +10282,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb usar dois bits de paragem por carácter (um com '-')\n" " [-]hup enviar sinal de espera quando o último processo fechar a " @@ -10123,7 +10290,12 @@ 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:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -10131,6 +10303,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Preferências de entrada:\n" @@ -10139,10 +10312,14 @@ msgstr "" " [-]ignbrk ignorar caracteres de paragem\n" " [-]igncr ignorar carriage return\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -10154,14 +10331,23 @@ msgstr "" " [-]inpck activar verificação de paridade da entrada\n" " [-]istrip limpar o bit alto (8) de caracteres de entrada\n" -#: src/stty.c:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 assumir caracteres de entrada em UTF-8\n" -#: src/stty.c:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr " * [-]iutf8 assumir caracteres de entrada em UTF-8\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -10176,60 +10362,83 @@ msgstr "" "0)\n" " [-]tandem o mesmo que [-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Preferências de saída:\n" -" * bsN estilo de atraso de backspace, N em [0..1]\n" -" * crN estilo de atraso de carriage return, N em [0..3]\n" -" * 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:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" msgstr "" -" * [-]ocrnl traduzir carriage return para nova linha\n" -" * [-]ofdel usar caracteres de delete em vez de null para preencher.\n" -" * [-]ofill preencher caracteres em vez de esperar por temporizador\n" -" * [-]olcuc traduzir minúsculas para maiúsculas\n" -" * [-]onlcr traduzir nova linha para carriage return-nova linha\n" -" * [-]onlret nova linha executa um carriage return\n" -#: src/stty.c:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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 "" -" * [-]onocr não mosrtar carriage returns na primeira coluna\n" -" [-]opost pós-processar saída\n" -" * tabN estilo de atraso de tab horizontal, N em [0..3]\n" -" * tabs o mesmo que tab0\n" -" * -tabs o mesmo que tab3\n" -" * vtN estilo de atraso de tab vertical, N em [0..1]\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10240,46 +10449,61 @@ 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 #, fuzzy +msgid " [-]echo echo input characters\n" +msgstr " * [-]iutf8 assumir caracteres de entrada em UTF-8\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]ctlecho ecoar caracteres de controlo em notação de chapéu (`^c')\n" -" [-]echo ecoar caracteres de entrada\n" -" * [-]echoctl o mesmo que [-]ctlecho\n" -" [-]echoe o mesmo que [-]crterase\n" -" [-]echok ecoar uma nova linha após um carácter de término\n" -#: src/stty.c:665 -#, fuzzy +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]echoke o mesmo que [-]crtkill\n" -" [-]echonl ecoar nova linha mesmo sem ecoar outros caracteres\n" -" * [-]echoprt ecoar caracteres apagados invertidamente, entre '\\' and " -"'/'\n" -" [-]icanon activar caracteres especiais erase, kill, werase e rprnt\n" -" [-]iexten activar caracteres especiais não-POSIX\n" +" [-]isig activar caracteres especiais interrupt, quit e suspend\n" +" [-]noflsh desactivar despejo após caracteres especiais interrupt e " +"quit\n" +" * [-]prterase o mesmo que [-]echoprt\n" +" * [-]tostop parar processos em fundo que tentem escrever no terminal\n" +" * [-]xcase com icanon, escape com '\\' para maiúsculas\n" -#: src/stty.c:672 +#: src/stty.c:843 #, fuzzy 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 "" " [-]isig activar caracteres especiais interrupt, quit e suspend\n" " [-]noflsh desactivar despejo após caracteres especiais interrupt e " @@ -10288,11 +10512,33 @@ msgstr "" " * [-]tostop parar processos em fundo que tentem escrever no terminal\n" " * [-]xcase com icanon, escape com '\\' para maiúsculas\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -10302,40 +10548,50 @@ msgstr "" " cbreak o mesmo que -icanon\n" " -cbreak o mesmo que icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 o mesmo que brkint ignpar istrip icrnl ixon opost isig\n" " icanon, eof e eol nos seus valores predefinidos\n" " -cooked o mesmo que raw\n" " crt o mesmo que echoe echoctl echoke\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -" dec o mesmo que echoe echoctl echoke -ixany intr ^c erase 0177\n" -" kill ^u\n" -" * [-]decctlq o mesmo que [-]ixany\n" -" ek erase e kill nos seus valores predefinidos\n" -" evenp o mesmo que parenb -parodd cs7\n" -#: src/stty.c:699 +#: src/stty.c:919 +#, fuzzy 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 "" " -evenp o mesmo que -parenb cs8\n" " * [-]lcase o mesmo que xcase iuclc olcuc\n" @@ -10344,7 +10600,19 @@ msgstr "" " nl o mesmo que -icrnl -onlcr\n" " -nl o mesmo que icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"Preferências de combinação:\n" +" * [-]LCASE o mesmo que [-]lcase\n" +" cbreak o mesmo que -icanon\n" +" -cbreak o mesmo que icanon\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10358,11 +10626,12 @@ msgstr "" " pass8 o memso que -parenb -istrip cs8\n" " -pass8 o memso que parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw o mesmo que -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" @@ -10370,15 +10639,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw o mesmo que cooked\n" -#: src/stty.c:720 -#, fuzzy +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane o mesmo que cread -ignbrk brkint -inlcr -igncr icrnl -" "iutf8\n" @@ -10388,7 +10657,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, todos caracteres\n" " especiais nos seus valores predefinidos.\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10404,12 +10673,12 @@ msgstr "" "0x37, 0177 ou 127; valores especiais ^- ou undef são utilizados para anular\n" "caracteres especiais.\n" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "apenas um dispositivo deve ser especificado" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10418,45 +10687,50 @@ 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:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: impossível desactivar modo não-bloqueante" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "argumento inválido %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "argumento em falta para %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: erro de truncagem" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "disciplina de linha inválida %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: impossível realizar todas as operações pedidas" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: nenhuma informação de tamanho para este dispositivo" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "argumento inteiro inválido %s" #. This is a proper name. See the gettext manual, section Names. @@ -10466,8 +10740,14 @@ msgstr "" #: src/sum.c:62 #, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Exibir o CRC e contagem de bytes de cada FICHEIRO.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -10477,20 +10757,54 @@ msgstr "" " -r ignorar -s, usar algoritmo de soma BSD, usar blocos de 1K\n" " -s, --sysv usar algoritmo de soma System V, usar blocos de 512 bytes\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Utilização: %s [OPÇÃO] [FICHEIRO]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Forçar blocos alterados para disco, actualizar o superbloco.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "erro ao ler %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: impossível desactivar modo não-bloqueante" -#: src/sync.c:69 +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "erro ao ler %s" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "" + +#: src/sync.c:216 #, c-format -msgid "ignoring all arguments" -msgstr "a ignorar todos os argumentos" +msgid "--data needs at least one argument" +msgstr "" -#: src/system.h:343 +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10503,15 +10817,23 @@ 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:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help exibir esta ajuda e sair\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version mostrar a informação de versão e sair\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Sem FICHEIRO, ou quando FICHEIRO é -, ler entrada padrão.\n" + +#: src/system.h:544 #, fuzzy msgid "" "\n" @@ -10520,7 +10842,7 @@ msgstr "" "Argumentos mandatórios para opções longas são mandatórios para opções curtas " "também.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10528,7 +10850,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10537,7 +10859,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -10548,22 +10870,27 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "Full documentation at: <%s%s>\n" msgstr "" -#: src/system.h:591 +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "" + +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Tente '%s --help' para mais informações.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10585,9 +10912,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\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" @@ -10604,70 +10929,69 @@ msgstr "" "regular\n" " -s, --separator=EXPR usar EXPR como o separador em vez de nova linha\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: erro de seek" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "campo demasiado grande" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "impossível criar a pasta temporária %s" -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: erro ao abrir para escrita" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "erro ao preservar os tempos de %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: erro de escrita" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "impossível abrir %s para leitura" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "o separador não pode ser vazio" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "" -#: src/tail.c:262 +#: src/tail.c:257 #, 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" 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:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 #, fuzzy msgid "" " -f, --follow[={name|descriptor}]\n" @@ -10682,7 +11006,7 @@ msgstr "" " equivalentes\n" " -F o mesmo que --follow=name --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10704,7 +11028,7 @@ msgstr "" " para ver se se foi removido ou renomeado\n" " (este é o caso habitual de logs rotativos)\n" -#: src/tail.c:293 +#: src/tail.c:288 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -10718,7 +11042,7 @@ msgstr "" " -v, --verbose despejar sempre cabeçalhos com nomes de " "ficheiros\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -10727,7 +11051,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 +#: src/tail.c:302 #, fuzzy msgid "" "\n" @@ -10747,7 +11071,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:316 +#: src/tail.c:311 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -10766,169 +11090,169 @@ msgstr "" "recriado\n" "por qualquer outro programa.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "a fechar %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, 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:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, fuzzy, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "%s foi substituído por um ficheiro não analisável; a desistir do nome" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s tornou-se inacessível" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s tornou-se acessível" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s apareceu; a seguir fim do novo ficheiro" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s foi substituído; a seguir fim do novo ficheiro" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: impossível alterar modo de desbloqueamento" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: ficheiro truncado" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "nenhum ficheiro em falta" -#: src/tail.c:1424 +#: src/tail.c:1440 #, fuzzy, c-format msgid "cannot watch parent directory of %s" msgstr "impossível obter a pasta actual (agora %s)" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, fuzzy, c-format msgid "inotify resources exhausted" msgstr "memória esgotada" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, fuzzy, c-format msgid "cannot watch %s" msgstr "impossível executar sobre %s" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: substituir %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1597 #, fuzzy, c-format msgid "error reading inotify event" msgstr "erro ao ler %s" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "%s: impossível seguir fim de ficheiro deste tipo; a desistir" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "número em %s é demasiado grande" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "%s: número máximo de estados inalterados entre aberturas inválido" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: número de processo inválido (PID)" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: número de segundos inválido" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "número inválido de colunas: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "opção usada em contexto inválido -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, fuzzy, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "aviso: PID ignorado; --pid=PID é útil quando se persegue" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "aviso: PID ignorado; --pid=PID é útil quando se persegue" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "aviso: --pid=PID não é suportado neste sistema" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "impossível perseguir %s pelo nome" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "aviso: perseguir a entrada padrão indefinidamente não tem efeito" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -10940,60 +11264,72 @@ msgstr "" " -a, --append acrescentar aos FICHEIROs, não sobrescrever\n" " -i, --ignore-interrupts ignorar os sinais de interrupção\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Se um FICHEIRO é -, copiar novamente para a saída padrão.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "argumento em falta após %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "inteiro inválido %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "')' esperado" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "')' esperado, %s encontrado" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: operador unário esperado" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt não aceita -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef não aceita -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot não aceita -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "operador binário desconhecido" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: operador binário esperado" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11007,7 +11343,7 @@ msgstr "" " or: [ ]\n" " or: [ OPÇÃO\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11015,7 +11351,7 @@ msgstr "" "Sair com o estado determinado por EXPRESSÃO.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11025,7 +11361,7 @@ msgstr "" "Uma EXPRESSÃO omitida toma o valor falso. Caso contrário,\n" "EXPRESSÃO é verdadeiro ou falso e define estado de saída. É um de:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11039,7 +11375,7 @@ msgstr "" " EXPRESSÃO1 -a EXPRESSÃO2 EXPRESSÃO1 e EXPRESSÃO2 são verdadeiras\n" " EXPRESSÃO1 -o EXPRESSÃO2 uma de EXPRESSÃO1 e EXPRESSÃO2 é verdadeira\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11055,7 +11391,7 @@ msgstr "" " EXPR1 = EXPR2 as espressões são iguais\n" " EXPR1 != EXPR2 as espressões são diferentes\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11073,7 +11409,7 @@ msgstr "" " INTEIRO1 -lt INTEIRO2 INTEIRO1 é menor que INTEIRO2\n" " INTEIRO1 -ne INTEIRO2 INTEIRO1 é diferente de INTEIRO2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11086,7 +11422,7 @@ msgstr "" " FICH1 -nt FICH2 FICH1 é mais recente (data de modificação) que FICH2\n" " FICH1 -ot FICH2 FICH1 é mais antigo que FICH2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11100,7 +11436,7 @@ msgstr "" " -d FICH FICH existe e é uma pasta\n" " -e FICH FICH existe\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11114,7 +11450,7 @@ msgstr "" " -h FICH FICH existe e é uma ligação simbólica (o mesmo que -L)\n" " -k FICH FICH existe e tem o seu bit sticky (pegajoso) activado\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11128,7 +11464,7 @@ msgstr "" " -r FICH FICH existe e permissão de leitura é garantida\n" " -s FICH FICH existe e tem um tamanho maior que zero\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11142,7 +11478,7 @@ msgstr "" " -w FICH FICH existe e permissão de escrita é garantida\n" " -x FICH FICH existe e permissão de execução (ou pesquisa) é garantida\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11156,7 +11492,7 @@ msgstr "" "para shells. INTEIRO pode também ser -l EXPR, que resulta no tamanho de " "EXPR.\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11166,26 +11502,26 @@ msgstr "" "NOTA: [ honra as opções --help e --version, mas test não o faz.\n" "test trata cada uma delas como trata qualquer outra EXPR não vazia.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test e/ou [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "" -#: src/test.c:858 +#: src/test.c:860 #, fuzzy msgid "missing ']'" msgstr "']' em falta" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "argumento extra %s" @@ -11205,7 +11541,7 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11214,11 +11550,11 @@ msgstr "" "Utilização: %s OPÇÃO UTILIZADOR COMANDO [ARGUMENTO]...\n" " ou: %s OPÇÃO\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11236,7 +11572,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11244,7 +11580,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -11255,7 +11591,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -11270,6 +11606,11 @@ msgstr "erro ao escrever %s" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -11628,12 +11969,12 @@ msgstr "Sair com um código de estado indicando sucesso" msgid "Exit with a status code indicating failure." msgstr "Sair com um código de estado indicando sucesso" -#: src/truncate.c:96 +#: src/truncate.c:69 #, fuzzy, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Utilização: %s OPÇÃO... [FICHEIRO]...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -11644,23 +11985,23 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 #, 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:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11668,57 +12009,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: ficheiro tem tamanho negativo" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "impossível alterar o dono de %s" -#: src/truncate.c:205 +#: src/truncate.c:178 #, 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:215 +#: src/truncate.c:188 #, fuzzy, c-format msgid "overflow extending size of file %s" msgstr "erro de excesso de índice ao ler o ficheiro %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "" -#: src/truncate.c:303 +#: src/truncate.c:276 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "múltiplas pastas de destino especificadas" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "número inválido %s" + +#: src/truncate.c:307 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "deve especificar uma lista de bytes, caracteres ou campos" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "impossível abrir %s para escrita" @@ -11729,12 +12075,10 @@ msgid "Mark Kettenis" msgstr "" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Utilização: %s [OPÇÃO] [FICHEIRO]\n" "Escrever lista totalmente ordenada consistente com ord. parcial em " @@ -11742,12 +12086,17 @@ msgstr "" "Sem FICHEIRO, ou quando FICHEIRO é -, ler a entrada padrão.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: entrada contém um número mpar de símbolos" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: entrada contém um ciclo:" @@ -11814,9 +12163,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\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" @@ -11869,8 +12216,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -11881,7 +12228,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -12034,11 +12381,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "" - #: src/uptime.c:214 #, fuzzy, c-format msgid "" @@ -12060,13 +12402,17 @@ msgstr "" "Se FICHEIRO não for especificado, usar %s. %s como FICHEIRO é comum.\n" "\n" -#: src/wc.c:117 -#, fuzzy +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -12082,13 +12428,13 @@ msgstr "" " -m, --chars mostrar as contagens de caracteres\n" " -l, --lines mostrar as contagens de novas linhas\n" -#: src/wc.c:128 +#: src/wc.c:134 #, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=F ler entrada dos ficheiros especificados por nomes\n" @@ -12256,10 +12602,10 @@ msgstr "" "O mesmo que id -un.\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: impossível encontrar um nome para o ID de utilizador %lu\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "impossível encontrar o nome do utilizador com ID %lu" #: src/yes.c:41 #, c-format @@ -12280,6 +12626,222 @@ msgstr "" "'y'.\n" "\n" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "-t é implícito se COMP_PÁG <= 10. Sem FICHEIRO, ou quando\n" +#~ "FICHIERO é -, ler a entrada padrão.\n" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Sem FICHEIRO, ou quando FICHEIRO é -, ler entrada padrão.\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Forçar blocos alterados para disco, actualizar o superbloco.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "a ignorar todos os argumentos" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: número inválido" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s é tão grande que não é representável" + +#~ msgid "number of lines" +#~ msgstr "número de linhas" + +#~ msgid "number of bytes" +#~ msgstr "número de bytes" + +#, fuzzy +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: número de linhas inválido" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: número de bytes inválido" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: número de linhas inválido" + +#~ msgid "number in %s is too large" +#~ msgstr "número em %s é demasiado grande" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: número de segundos inválido" + +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "erro ao definir grupo(s) adicional(is)" + +#, fuzzy +#~ 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 "" +#~ "\n" +#~ "Enviar um sinal %s a um processo 'dd' em execução faz com que\n" +#~ "exiba estatísticas E/S no erro padrão e depois resuma a cópia.\n" +#~ "\n" +#~ " $ dd if=/dev/zero of=/dev/null& pid=$!\n" +#~ " $ kill -%s $pid; sleep 1; kill $pid\n" +#~ " 18335302+0 registos dentro\n" +#~ " 18335302+0 registos fora\n" +#~ " 9387674624 bytes (9.4 GB) copiado, 34.6279 segundos, 271 MB/s\n" +#~ "\n" +#~ "Opções são:\n" +#~ "\n" + +#~ 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 CAR CAR inserirá o último carácter entre aspas\n" +#~ " quit CAR CAR enviará um sinal de saída\n" +#~ " * rprnt CAR CAR redesenhará a linha actual\n" +#~ " start CAR CAR reiniciará a saída após pará-la\n" + +#, 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" +#~ "Preferências de controlo:\n" +#~ " [-]clocal desactivar sinais de controlo de modem\n" +#~ " [-]cread permitir recepção de entrada\n" +#~ " * [-]crtscts activar cumprimento RTS/CTS\n" +#~ " csN definir tamanho de carácter N bits, N em [5..8]\n" + +#~ 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 "" +#~ "\n" +#~ "Preferências de saída:\n" +#~ " * bsN estilo de atraso de backspace, N em [0..1]\n" +#~ " * crN estilo de atraso de carriage return, N em [0..3]\n" +#~ " * ffN estilo de atraso de form feed, N em [0..1]\n" +#~ " * nlN estilo de atraso de nova linha, N em [0..1]\n" + +#, fuzzy +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl traduzir carriage return para nova linha\n" +#~ " * [-]ofdel usar caracteres de delete em vez de null para " +#~ "preencher.\n" +#~ " * [-]ofill preencher caracteres em vez de esperar por temporizador\n" +#~ " * [-]olcuc traduzir minúsculas para maiúsculas\n" +#~ " * [-]onlcr traduzir nova linha para carriage return-nova linha\n" +#~ " * [-]onlret nova linha executa um carriage return\n" + +#~ 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 "" +#~ " * [-]onocr não mosrtar carriage returns na primeira coluna\n" +#~ " [-]opost pós-processar saída\n" +#~ " * tabN estilo de atraso de tab horizontal, N em [0..3]\n" +#~ " * tabs o mesmo que tab0\n" +#~ " * -tabs o mesmo que tab3\n" +#~ " * vtN estilo de atraso de tab vertical, N em [0..1]\n" + +#, fuzzy +#~ 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 "" +#~ " * [-]ctlecho ecoar caracteres de controlo em notação de chapéu " +#~ "(`^c')\n" +#~ " [-]echo ecoar caracteres de entrada\n" +#~ " * [-]echoctl o mesmo que [-]ctlecho\n" +#~ " [-]echoe o mesmo que [-]crterase\n" +#~ " [-]echok ecoar uma nova linha após um carácter de término\n" + +#, fuzzy +#~ 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 "" +#~ " * [-]echoke o mesmo que [-]crtkill\n" +#~ " [-]echonl ecoar nova linha mesmo sem ecoar outros caracteres\n" +#~ " * [-]echoprt ecoar caracteres apagados invertidamente, entre '\\' and " +#~ "'/'\n" +#~ " [-]icanon activar caracteres especiais erase, kill, werase e " +#~ "rprnt\n" +#~ " [-]iexten activar caracteres especiais não-POSIX\n" + +#~ 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 "" +#~ " dec o mesmo que echoe echoctl echoke -ixany intr ^c erase " +#~ "0177\n" +#~ " kill ^u\n" +#~ " * [-]decctlq o mesmo que [-]ixany\n" +#~ " ek erase e kill nos seus valores predefinidos\n" +#~ " evenp o mesmo que parenb -parodd cs7\n" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: impossível encontrar um nome para o ID de utilizador %lu\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: opção ilegal -- %c\n" @@ -12322,9 +12884,6 @@ 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 "%s" #~ msgstr "%s" @@ -12485,19 +13044,6 @@ msgstr "" #~ msgid "invalid format precision" #~ msgstr "formato de precisão inválido" -#~ msgid "" -#~ "Display the current time in the given FORMAT, or set the system date.\n" -#~ "\n" -#~ " -d, --date=STRING display time described by STRING, not `now'\n" -#~ " -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -#~ msgstr "" -#~ "Exibir o tempo actual no FORMATO dado, ou alterar a data do sistema.\n" -#~ "\n" -#~ " -d, --date=EXPR mostrar o tempo descrito por EXPR, não o " -#~ "actual\n" -#~ " -f, --file=FICHEIRO como --date mas uma vez para cada linha de " -#~ "FICHEIRO\n" - #~ msgid "opening %s" #~ msgstr "a abrir %s" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index a530103f..3b047261 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 7b80b069..44fd7c4b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,11 +7,12 @@ # Juan Carlos Castro y Castro , 2003. # Rodolfo Ribeiro Gomes , 2008, 2010, 2012. # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils-8.18-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2012-06-24 16:47-0300\n" "Last-Translator: Rodolfo Ribeiro Gomes \n" "Language-Team: Brazilian Portuguese \"txt1\" seguido de \"txt2\"\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "falta operando" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 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) to standard output.\n" +msgstr "" +"Escreve de forma ordenada a concatenação do(s) ARQUIVO(s) na saída padrão.\n" +"\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1083,7 +1094,7 @@ msgstr "" " -n, --number numera todas as linhas de saída\n" " -s, --squeeze-blank suprime linhas em branco repetidas\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1095,7 +1106,7 @@ msgstr "" " -u (sem efeito)\n" " -v, --show-nonprinting utiliza a notação ^ e M-, exceto para LFD e TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1110,17 +1121,18 @@ msgstr "" " por fim.\n" " %s Copia a entrada padrão para a saída padrão.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, 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:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "saída padrão" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: os arquivos de entrada e de saída são os mesmos" @@ -1132,10 +1144,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1149,8 +1161,8 @@ msgstr "falhou em criar contexto de segurança: %s" msgid "failed to set %s security context component to %s" msgstr "falhou em definir o componente %s do contexto de segurança para %s" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "falhou em obter o contexto de segurança de %s" @@ -1165,13 +1177,13 @@ msgstr "não pode aplicar o contexto parcial para o arquivo não-rotulado %s" 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:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "não é possível acessar %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "não é possível ler diretório %s" @@ -1187,7 +1199,7 @@ msgstr "alterando o contexto de segurança de %s\n" msgid "fts_read failed" msgstr "fts_read falhou" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1307,7 +1319,7 @@ msgid "-R -h requires -P" msgstr "-R -h exige -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1324,9 +1336,8 @@ msgid "conflicting security context specifiers given" msgstr "foram fornecidos especificadores de contexto de segurança conflitantes" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "falhou em obter os atributos de %s" @@ -1631,17 +1642,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "grupo inválido %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "lista de grupo inválido %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1650,7 +1661,7 @@ msgstr "" "Uso: %s [OPÇÃO] NOVORAIZ [COMANDO [ARGUMENTO]...]\n" " ou: %s OPÇÃO\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1658,13 +1669,20 @@ msgstr "" "Executa COMANDO com o diretório raiz modificado para NOVORAIZ.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" @@ -1673,42 +1691,47 @@ msgstr "" "Se nenhum COMANDO for dado, executa \"`${SHELL} -i'\" (padrão: \"/bin/sh -i" "\").\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "não foi possível mudar o diretório raiz para %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "não foi possível ir para o diretório raiz" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "falhou em estabelecer grupo(s) suplementar(es)" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" +msgid "failed to set supplemental groups" msgstr "falhou em estabelecer grupo(s) suplementar(es)" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "falhou em definir o ID de grupo" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "falhou em definir o ID de usuário" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "falhou em executar o comando %s" @@ -1749,7 +1772,16 @@ msgstr "Uso: %s [OPÇÃO]... ARQUIVO1 ARQUIVO2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Compara os arquivos ordenados ARQUIVO1 e ARQUIVO2 linha por linha.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1761,7 +1793,7 @@ msgstr "" "linhas únicas para ARQUIVO1, a coluna dois contém as linhas únicas para\n" "ARQUIVO2; a terceira coluna contém as linhas comuns a ambos os arquivos.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1773,7 +1805,7 @@ msgstr "" " -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 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1785,17 +1817,17 @@ msgstr "" " 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 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1804,313 +1836,327 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "o arquivo %d não está ordenado" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "foram especificados múltiplos delimitadores" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "impossível fazer \"lseek\" em %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "erro lendo %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "impossível fazer \"lseek\" em %s" +msgid "error reading %s" +msgstr "erro lendo %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "erro escrevendo %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "erro lendo %s" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "falhou em obter o contexto atual" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: falhou em escrever" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "falhou em abrir %s" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "apagando as permissões para %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "falhou em preservar o dono para %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "falhou em localizar o arquivo %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "falhou em preservar a autoria para %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "falhou em definir o contexto padrão de criação de arquivo para %s" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "falhou em definir o contexto padrão de criação de arquivo para %s" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "falhou em definir o contexto de segurança de %s para %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "não foi possível abrir %s para leitura" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "não foi possível obter o estado de %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "ignorando o arquivo %s; ele foi substituído durante a cópia" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "não foi possível remover %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "removido %s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "não se escreve através de uma ligação simbólica quebrada: %s" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "não foi possível criar arquivo comum %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "falhou em clonar %s a partir de %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "preservando horário para %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "falhou em abrir %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, fuzzy, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: tentar sobrescrever %s, desobedecendo o modo %04lo (%s)? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: sobrescrever %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (cópia de segurança: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "falhou em restaurar o contexto padrão de criação de arquivo" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "não foi possível criar ligação absoluta %s para %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "impossível obter estado de %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "omitindo o diretório %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, 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:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s e %s são o mesmo arquivo" -#: src/copy.c:1939 +#: src/copy.c:2019 #, 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:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "não sobrescreverá o recém-criado %s com %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "é impossível sobrescrever diretório %s com um não-diretório" -#: src/copy.c:1989 +#: src/copy.c:2069 #, 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:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "não foi possível fazer cópia de segurança de %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "não copiará %s através da ligação simbólica recém-criada %s" -#: src/copy.c:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "é impossível copiar um diretório, %s, para si próprio, %s" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "aviso: o arquivo de origem %s foi especificado mais de uma vez" + +#: src/copy.c:2294 #, c-format msgid "will not create hard link %s to directory %s" msgstr "não criará ligação absoluta %s para o diretório %s" -#: src/copy.c:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "é impossível mover %s para um subdiretório de si mesmo, %s" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "não foi possível mover %s para %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "é impossível copiar ligação simbólica cíclica %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: só é possível fazer ligações simbólicas relativas no diretório atual" -#: src/copy.c:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "não foi possível criar ligação simbólica %s para %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "não foi possível criar fifo %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "não foi possível criar arquivo especial %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "não foi possível ler ligação simbólica %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "não foi possível criar ligação simbólica %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s tem um tipo desconhecido de arquivo" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "não foi possível restaurar a cópia de segurança %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (cópia de segurança restaurada)\n" @@ -2120,25 +2166,25 @@ msgstr "%s -> %s (cópia de segurança restaurada)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, fuzzy, c-format msgid "unknown program %s" msgstr "fluxo desconhecido" @@ -2420,8 +2466,8 @@ msgstr "%s existe, mas não é um diretório" msgid "failed to access %s" msgstr "falhou em abrir %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "falta o operando arquivo" @@ -2498,131 +2544,131 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "a entrada desapareceu" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: número de linha fora dos limites" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: número de linha fora dos limites" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " na repetição %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: ocorrência não encontrada" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "erro na busca da expressão regular" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "erro ao escrever em %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: espera-se um número inteiro depois do delimitador" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: exige-se uma \"}\" depois do número de repetições" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: deve se especificar um número inteiro entre \"{\" e \"}\"" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: falta o delimitador de fechamento \"%c\"" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: expressão regular inválida: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: padrão inválido" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, 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:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "falta especificador de conversão no sufixo" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "especificador de conversão no sufixo é inválido: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "especificador de conversão no sufixo é inválido: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "sinalizadores inválidos na especificação de conversão: %%%c%c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "muitos especificadores %% de conversão no sufixo" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "falta especificador %% de conversão no sufixo" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: número inválido" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "número inválido %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Uso: %s [OPÇÃO]... ARQUIVO PADRÃO...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 #, fuzzy msgid "" "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n" @@ -2633,7 +2679,16 @@ msgstr "" "\"xx01\", ..., e emite o total de bytes de cada pedaço na saída padrão.\n" "\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Lê a entrada padrão se ARQUIVO for -. Cada PADRÃO pode ser:\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2647,11 +2702,11 @@ msgstr "" " -k, --keep-files não remove arquivo de saída mesmo caso haja " "erros\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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,17 +2717,11 @@ 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:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Lê a entrada padrão se ARQUIVO for -. Cada PADRÃO pode ser:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 +#, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2711,7 +2760,7 @@ msgstr "" "Emite as partes selecionadas das linhas de cada ARQUIVO na saída padrão.\n" "\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2721,7 +2770,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:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2735,7 +2784,7 @@ msgstr "" " menos que a opção -s esteja especificada\n" " -n (sem efeito)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2743,7 +2792,7 @@ msgstr "" " --complement complementa o conjunto dos bytes, caracteres ou\n" " campos selecionados\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2753,7 +2802,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:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2766,7 +2815,8 @@ msgstr "" "selecionada\n" "é escrita na mesma ordem que é lida, e é escrita uma única vez.\n" -#: src/cut.c:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2774,8 +2824,6 @@ msgid "" " 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 "" "Cada intervalo é uma das alternativas abaixo:\n" "\n" @@ -2787,52 +2835,53 @@ msgstr "" "\n" "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "lista inválida de bytes ou campos" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "campos e posições são numerados a partir do número 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "não é valido um intervalo sem especificar limite: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "não é válido um intervalo decrescente" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "deslocamento de byte %s é muito grande" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "o número de campo %s é muito grande" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "somente um tipo de lista pode ser especificado" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "o delimitador deve ser um único caractere" -#: src/cut.c:787 +#: src/cut.c:786 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:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2840,11 +2889,11 @@ msgstr "" "suprimir as linhas não delimitadas só tem sentido\n" "\tquando se processa campos" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "falta lista de campos" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "falta lista de posições" @@ -2862,35 +2911,45 @@ msgid "Display the current time in the given FORMAT, or set the system date.\n" msgstr "" #: src/date.c:134 +#, fuzzy +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" +"Mostra a hora atual no FORMATO fornecido, ou ajusta a data do sistema.\n" +"\n" +" -d, --date=TEXTO mostra a hora descrita no TEXTO, não a de \"agora" +"\"\n" +" -f, --file=ARQDATA como --date uma vez para cada linha de ARQDATA\n" + +#: src/date.c:138 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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=ARQUIVO mostra a hora da última modificação de ARQUIVO\n" " -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:147 +#: src/date.c:149 #, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=TIMESPEC emite a data e hora no formato da RFC 3339.\n" " TIMESPEC=\"date\", \"seconds\" ou \"ns\" para\n" @@ -2900,8 +2959,19 @@ 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:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2914,7 +2984,7 @@ msgstr "" " %% um % literal\n" " %a nome abreviado do dia de semana da localidade (por exemplo, Sáb)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2927,7 +2997,7 @@ msgstr "" " %c data e hora na localidade (por exemplo, Sáb 08 Mar 2008 18:34:17 " "BRT)\n" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2939,7 +3009,7 @@ msgstr "" " %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:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2950,7 +3020,7 @@ msgstr "" " %G ano do número ISO da semana ISO (veja %V); normalmente útil só com " "%V\n" -#: src/date.c:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2962,7 +3032,7 @@ msgstr "" " %I hora (01..12)\n" " %j dia do ano (001..366)\n" -#: src/date.c:188 +#: src/date.c:194 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2975,7 +3045,7 @@ msgstr "" " %m mês (01..12)\n" " %M minuto (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2994,7 +3064,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:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3006,7 +3076,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:209 +#: src/date.c:215 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 +3090,7 @@ msgstr "" " %W número da semana no ano, sendo segunda-feira o início da semana " "(00..53)\n" -#: src/date.c:215 +#: src/date.c:221 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 +3102,7 @@ msgstr "" " %y os últimos dois dígitos do ano (00..99)\n" " %Y ano\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3052,7 +3122,7 @@ msgstr "" "\n" "Por padrão, campos numéricos de data são preenchidos com zeros.\n" -#: src/date.c:230 +#: src/date.c:236 #, fuzzy msgid "" "The following optional flags may follow '%':\n" @@ -3071,7 +3141,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:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3087,7 +3157,7 @@ msgstr "" " O para usar os símbolos númericos alternativos da localidade, se " "disponível.\n" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3101,36 +3171,36 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "entrada padrão" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "data inválida %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "foram especificados múltiplos formatos de saída" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3141,23 +3211,23 @@ msgstr "" "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:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "não foi possível ajustar data" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3166,7 +3236,7 @@ msgstr "" "Uso: %s [OPERANDO]...\n" " ou: %s OPÇÃO\n" -#: src/dd.c:532 +#: src/dd.c:561 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3187,7 +3257,7 @@ msgstr "" " count=BLOCOS copia somente BLOCOS blocos de entrada\n" " ibs=BYTES lê BYTES bytes de uma vez\n" -#: src/dd.c:541 +#: src/dd.c:570 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3197,8 +3267,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\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" @@ -3214,7 +3286,7 @@ msgstr "" " da entrada\n" " status=noxfer suprime as estatísticas da transferência\n" -#: src/dd.c:552 +#: src/dd.c:583 #, fuzzy msgid "" "\n" @@ -3234,7 +3306,7 @@ msgstr "" "Cada símbolo CONV pode ser:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3258,7 +3330,7 @@ msgstr "" " por caractere de nova-linha\n" " lcase altera as maiúsculas para minúsculas\n" -#: src/dd.c:574 +#: src/dd.c:605 #, fuzzy msgid "" " excl fail if the output file already exists\n" @@ -3276,7 +3348,7 @@ msgstr "" "concluir\n" " fsync similar, mas também escreve metadados\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3289,137 +3361,103 @@ msgstr "" "\n" " append modo anexar (só faz sentido para saída; sugere-se conv=notrunc)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio usa E/S concorrente para dados\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct usa E/S direta para dados\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory falha a menos que seja um diretório\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync usa E/S sincronizada para dados\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync similar, mas também para metadados\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock usa E/S não-bloqueante\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime não atualiza o horário de acesso\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 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:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow não segue ligações simbólicas\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks falha se ligado múltiplas vezes\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary usa E/S binária para dados\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text usa E/S textual para dados\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 +#: src/dd.c:661 #, 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 "" -"\n" -"Enviar um sinal %s para o processo \"dd\" em execução faz ele emitir as\n" -"estatísticas de E/S para a saída de erro padrão e depois retomar a cópia.\n" -"\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ 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" -"\n" -"As opções são:\n" -"\n" - -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -"%+% registros de entrada\n" -"%+% registros de saída\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% registro truncado\n" -msgstr[1] "% registros truncados\n" -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "% byte (%s) copiado" msgstr[1] "% bytes (%s) copiados" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "Banda infinita" @@ -3433,83 +3471,100 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% registros de entrada\n" +"%+% registros de saída\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% registro truncado\n" +msgstr[1] "% registros truncados\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "fechando arquivo de entrada %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "fechando arquivo de saída %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "falhou em desativar O_DIRECT: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "escrevendo em %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "operando desconhecido %s" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "conversão inválida" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "sinalizador inválido de entrada" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "sinalizador inválido de saída" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "sinalizador inválido de estado" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "número inválido %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "é impossível qualquer combinação entre {ascii,ebcdic,ibm}" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "é impossível combinar \"block\" com \"unblock\"" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "é impossível combinar \"lcase\" com \"ucase\"" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "é impossível combinar \"excl\" com \"nocreat\"" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "é impossível combinar \"direct\" com \"nocache\"" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3518,62 +3573,62 @@ msgstr "" "aviso: contornando o bug no kernel de \"lseek\" para arquivo (%s)\n" " de mt_type=0x%0lx -- veja para a lista de tipos" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: não foi possível ignorar" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: não foi possível buscar (\"seek\")" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "estouro de deslocamento enquanto lia o arquivo %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, 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:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "não foi possível contornar o bug no kernel" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "ajustando sinalizadores para %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: não foi possível ignorar até o deslocamento especificado" -#: src/dd.c:2172 +#: src/dd.c:2288 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "falhou em truncar aos % bytes no arquivo de saída %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "\"fdatasync\" falhou para %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "\"fsync\" falhou para %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "falhou em abrir %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3582,19 +3637,19 @@ msgstr "" "deslocamento muito grande: é impossível truncar para um comprimento de busca=" "% (%lu-byte) blocos" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "falhou em truncar aos % bytes no arquivo de saída %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "falhou em descartar o cache para: %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3675,12 +3730,12 @@ msgstr "Capacid." msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 #, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" @@ -3692,14 +3747,14 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 #, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3714,7 +3769,7 @@ msgstr "" " (por exemplo, 1K 234M 2G)\n" " -H, --si similar, mas usa potências de 1000, e não de 1024\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3728,7 +3783,7 @@ msgstr "" " --no-sync não invocar \"sync\" ao obter informações de uso " "(padrão)\n" -#: src/df.c:1409 +#: src/df.c:1429 #, fuzzy msgid "" " --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" @@ -3736,6 +3791,28 @@ msgid "" "omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" +msgstr "" +" -P, --portability usa o formato de saída POSIX\n" +" --sync invoca \"sync\" antes de obter informações de uso\n" +" -t, --type=TIPO limita a listagem a sistemas de arquivo de tipo " +"TIPO\n" +" -T, --print-type emite o tipo de sistema de arquivo\n" +" -x, --exclude-type=TIPO limita a listagem a sistemas de arquivo que não\n" +" sejam do tipo TIPO\n" +" -v (sem efeito)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose mostra um diagnóstico logo antes de abrir cada\n" +" arquivo de saída\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3750,7 +3827,7 @@ msgstr "" " sejam do tipo TIPO\n" " -v (sem efeito)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3758,26 +3835,26 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, 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:1610 +#: src/df.c:1636 #, 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:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Aviso: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 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:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "nenhum sistema de arquivo foi processado" @@ -3900,7 +3977,7 @@ msgstr "" " %s dir1/str dir2/str -> \"dir1\" seguido de \"dir2\"\n" " %s stdio.h -> \".\"\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3911,7 +3988,8 @@ msgstr "" #: src/du.c:285 #, fuzzy -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Resume o uso do disco de cada ARQUIVO, recursivamente para diretórios.\n" "\n" @@ -4048,64 +4126,58 @@ msgstr "" msgid "Infinity" msgstr "Banda infinita" -#: src/du.c:636 +#: src/du.c:657 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fts_read falhou" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "profundidade máxima inválida %s" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "argumento inválido %s" -#: src/du.c:898 +#: src/du.c:919 #, 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:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "aviso: resumir conflita com --max-depth=%lu" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 #, fuzzy msgid "file operands cannot be combined with --files0-from" msgstr "Operandos tipo arquivo não podem ser combinados com --files0-from." -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: erro de leitura" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "é inválido um nome de arquivo de comprimento nulo" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "total" @@ -4243,9 +4315,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\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 " @@ -4294,7 +4364,7 @@ msgid "input line is too long" msgstr "linha de entrada é muito longa" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4453,12 +4523,12 @@ msgstr "erro na busca da expressão regular" msgid "non-integer argument" msgstr "argumento não-numérico" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "divisão por zero" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Defina LC_ALL='C' para contornar o problema." @@ -4469,31 +4539,31 @@ msgid "the strings compared were %s and %s" msgstr "Os textos comparados foram %s e %s." #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s não é um inteiro positivo válido" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s é muito grande" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4502,7 +4572,7 @@ msgstr "" "Uso: %s [NÚMERO]...\n" " ou: %s OPÇÃO\n" -#: src/factor.c:2443 +#: src/factor.c:2533 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4551,7 +4621,7 @@ msgstr "" "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" "\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4564,7 +4634,7 @@ 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:287 +#: src/fmt.c:288 #, fuzzy, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4577,7 +4647,7 @@ msgstr "" " -w, --width=LARGURA a largura máxima da linha (o padrão é 75 " "colunas)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4586,23 +4656,21 @@ msgstr "" "opção inválida -- %c; -LARGURA é reconhecida somente quando é a primeira\n" "opção; use -w N no lugar" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "largura inválida: %s" -#: src/fold.c:70 +#: src/fold.c:69 #, fuzzy -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +msgid "Wrap input lines in each FILE, writing to standard output.\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:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4612,9 +4680,9 @@ msgstr "" " -s, --spaces quebra com espaços\n" " -w, --width=LARGURA usa LARGURA colunas em vez de 80\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "o número de colunas não é válido: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4685,12 +4753,11 @@ msgstr "não foi possível definir id de usuário" msgid "%s: no such user" msgstr "%s: Usuário inexistente" -#: src/head.c:109 +#: src/head.c:110 #, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "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 " @@ -4698,7 +4765,7 @@ msgstr "" "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" "\n" -#: src/head.c:117 +#: src/head.c:118 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4718,7 +4785,7 @@ msgstr "" "cada\n" " arquivo, exceto as 10 últimas\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4727,7 +4794,7 @@ msgstr "" "arquivos\n" " -v, --verbose sempre emitir cabeçalhos com nomes dos arquivos\n" -#: src/head.c:131 +#: src/head.c:132 #, fuzzy msgid "" "\n" @@ -4740,48 +4807,36 @@ msgstr "" "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n" "GB 1000*1000*1000, G 1024*1024*1024, e assim por diante com T, P, E, Z, Y.\n" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: arquivo pequeno demais" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: número de bytes é muito grande" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: não foi possível ir à posição %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, 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/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "número de linhas" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "número de bytes" +msgid "%s: number of bytes is too large" +msgstr "%s: número de bytes é muito grande" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "número inválido de linhas" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "número inválido de bytes" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "opção inválida -- %c" @@ -4971,7 +5026,7 @@ msgstr "não foi possível mudar a posse de %s" msgid "cannot set time stamps for %s" msgstr "não foi possível alterar o horário de %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "a chamada de sistema \"fork\" falhou" @@ -5125,7 +5180,7 @@ msgstr "a opção --strip não pode ser usada em instalação de diretório" msgid "target directory not allowed when installing a directory" msgstr "não é permitido --target-directory em instalação de diretório" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "modo inválido %s" @@ -5161,11 +5216,15 @@ msgid "Mike Haertel" msgstr "Mike Haertel" #: src/join.c:195 -#, 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" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5184,7 +5243,7 @@ msgstr "" " ARQUIVO2)\n" " -e VAZIO substitui os campos de entrada ausentes com VAZIO\n" -#: src/join.c:204 +#: src/join.c:210 #, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" @@ -5198,7 +5257,7 @@ msgstr "" " -t CARACTERE usa CARACTERE como separador de campo de entrada e " "saída\n" -#: src/join.c:210 +#: src/join.c:216 #, fuzzy msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" @@ -5219,14 +5278,14 @@ msgstr "" " todas as linhas de entrada forem pareáveis\n" " --nocheck-order não verifica se a entrada está ordenada corretamente\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 #, fuzzy msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated termina linhas com byte 0, e não com \"nova-linha" "\"\n" -#: src/join.c:225 +#: src/join.c:231 #, fuzzy msgid "" "\n" @@ -5260,47 +5319,47 @@ msgstr "" "é\n" "emitida um mensagem de aviso.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "número inválido de campo: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "especificação inválida do campo: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "número inválido de arquivo na especificação do campo: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "campos de junção incompatíveis %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "conflito entre textos de substituição de campos vazios" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "tabulação multicaractere %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "tabulações incompatíveis" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "ambos os arquivos não podem ser a entrada padrão" @@ -5382,17 +5441,17 @@ msgstr "é impossível combinar sinal com -l ou -t" msgid "no process ID specified" msgstr "nenhuma ID de processo foi especificada" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, fuzzy, c-format msgid "invalid buffering mode %s for %s\n" msgstr "%s é um argumento inválido para %s" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -5581,7 +5640,7 @@ msgstr "não foi possível criar ligação simbólica %s" msgid "FIXME: unknown" msgstr "FIXME: desconhecido" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Uso: %s [OPÇÃO]\n" @@ -5594,7 +5653,7 @@ msgstr "" "Emite o nome do usuário atual.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "nenhum nome de usuário" @@ -5604,7 +5663,7 @@ msgstr "nenhum nome de usuário" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -5613,96 +5672,96 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "ignorando valor inválido da variável de ambiente QUOTING_STYLE: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "ignorando largura inválida na variável de ambiente COLUMNS: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "ignorando tamanho inválido de tabulação na variável de ambiente TABSIZE: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "largura inválida de linha: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "tamanho inválido de tabulação: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "formato inválido de estilo de hora %s" -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "Os argumentos válidos são:" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "prefixo desconhecido: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "o valor da variável de ambiente LS_COLORS não pode ser analisado" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "ignorando valor inválido da variável de ambiente QUOTING_STYLE: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "não foi possível abrir o diretório %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "não foi possível determinar o dispositivo e o inode de %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: não listando o diretório já listado" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "lendo o diretório %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "fechando o diretório %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "não foi possível comparar os nomes de arquivo %s e %s" -#: src/ls.c:4781 +#: src/ls.c:4775 #, fuzzy msgid "" "List information about the FILEs (the current directory by default).\n" @@ -5714,7 +5773,7 @@ msgstr "" "nem --sort.\n" "\n" -#: src/ls.c:4788 +#: src/ls.c:4782 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5729,7 +5788,7 @@ msgstr "" " -b, --escape emite escapes em octal para caracteres não-\n" " gráficos\n" -#: src/ls.c:4794 +#: src/ls.c:4788 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." @@ -5753,13 +5812,14 @@ msgstr "" " com -l: mostra o ctime e ordena por nome\n" " demais casos: ordena por ctime\n" -#: src/ls.c:4804 +#: src/ls.c:4798 #, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5776,7 +5836,7 @@ msgstr "" " -D, --dired gera a saída projetada para modo \"dired\" do " "Emacs\n" -#: src/ls.c:4812 +#: src/ls.c:4807 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5796,11 +5856,11 @@ msgstr "" " \"verbose\" (-l), \"vertical\" (-C)\n" " --full-time o mesmo que -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 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:4823 +#: src/ls.c:4818 #, fuzzy msgid "" " --group-directories-first\n" @@ -5816,7 +5876,7 @@ msgstr "" " --sort=none (-U) desabilita o agrupamento de\n" " diretórios\n" -#: src/ls.c:4829 +#: src/ls.c:4824 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5832,7 +5892,7 @@ msgstr "" " --si similar, mas usa potências de 1000, e não de " "1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 #, fuzzy msgid "" " -H, --dereference-command-line\n" @@ -5859,7 +5919,7 @@ msgstr "" "usa\n" " -a ou -A)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5883,7 +5943,7 @@ msgstr "" " com o PADRÃO (em sintaxe shell)\n" " -k o mesmo que --block-size=1K\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5901,7 +5961,7 @@ msgstr "" "entradas\n" " separadas por vírgula\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5922,7 +5982,7 @@ msgstr "" " -p, --indicator-style=slash\n" " anexa o indicador / aos diretórios\n" -#: src/ls.c:4871 +#: src/ls.c:4866 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" @@ -5946,7 +6006,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 #, fuzzy msgid "" " -r, --reverse reverse order while sorting\n" @@ -5958,19 +6018,19 @@ msgstr "" " -R, --recursive lista os subdiretórios recursivamente\n" " -s, --size emite o tamanho de cada arquivo, em blocos\n" -#: src/ls.c:4886 +#: src/ls.c:4881 #, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S ordena por tamanho de arquivo\n" " --sort=PALAVRA ordena por PALAVRA em vez de pelo nome: none -" @@ -5984,7 +6044,7 @@ msgstr "" " usa o horário especificado como chave de\n" " ordenação se --sort=time\n" -#: src/ls.c:4896 +#: src/ls.c:4892 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -6011,7 +6071,7 @@ msgstr "" "ESTILO\n" " só faz efeito fora da localidade POSIX\n" -#: src/ls.c:4908 +#: src/ls.c:4904 #, fuzzy msgid "" " -t sort by modification time, newest first\n" @@ -6021,12 +6081,12 @@ msgstr "" " -T, --tabsize=COLS assume paradas de tabulação a cada COLS em vez\n" " de 8\n" -#: src/ls.c:4912 +#: src/ls.c:4908 #, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -6038,14 +6098,15 @@ msgstr "" " -U não ordena; lista na ordem do diretório\n" " -v ordena por versão\n" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=COLS assume a largura da tela como COLS\n" " -x lista as entradas por linha em vez de por " @@ -6057,7 +6118,7 @@ msgstr "" " cada arquivo\n" " -1 lista um arquivo por linha\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6066,7 +6127,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6095,17 +6156,16 @@ msgstr "David Madore" 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 "" "Uso: %s [OPÇÃO] [ARQUIVO]...\n" "Emite ou confere somas de verificação (checksum) %s (%d-bit).\n" "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 #, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" @@ -6113,21 +6173,23 @@ msgstr "" "entrada\n" " padrão do tty)\n" -#: src/md5sum.c:178 +#: src/md5sum.c:180 #, fuzzy -msgid " -b, --binary read in binary mode\n" +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary lê em modo binário\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 #, fuzzy msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" @@ -6136,12 +6198,12 @@ msgstr "" "padrão\n" " do tty)\n" -#: src/md5sum.c:192 +#: src/md5sum.c:195 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text lê em modo texto (padrão)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 #, fuzzy msgid "" "\n" @@ -6162,14 +6224,15 @@ msgstr "" " de maneira imprópria\n" "\n" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "As somas são calculadas como descrito em %s. Ao conferir, recomenda-se que\n" @@ -6179,39 +6242,39 @@ msgstr "" "caractere\n" "indicando o tipo (\"*\" para binário, \" \"para texto) e o nome do arquivo.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: muitas linhas de soma de verificação" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "" "%s: %: linha de soma de verificação %s formatada de maneira " "imprópria" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: FALHOU na abertura ou na leitura\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "FALHOU" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "SUCESSO" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" "%s: foram encontradas linhas de soma de verificação %s com formatação " "imprópria" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, fuzzy, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" @@ -6222,7 +6285,7 @@ msgstr[1] "" "%s: %: linha de soma de verificação %s formatada de maneira " "imprópria" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, fuzzy, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" @@ -6231,7 +6294,7 @@ msgstr[1] "" "AVISO: % dos % arquivos listados não pôde(puderam) ser " "lido(s)" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, fuzzy, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" @@ -6241,17 +6304,17 @@ msgstr[1] "" "AVISO: % das % somas de verificação calculadas NÃO " "coincide(m)" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, 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:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" @@ -6259,22 +6322,22 @@ msgstr "" "as opções --binary e --text não fazem sentido ao conferir as somas de " "verificação" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, 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" @@ -6317,22 +6380,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "falhou em definir o contexto padrão de criação de arquivo para %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "falhou em preservar horário para %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "foi criado o diretório %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, fuzzy, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6544,7 +6607,7 @@ msgstr "muitos modelos" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, fuzzy, c-format msgid "invalid suffix %s, contains directory separator" msgstr "modelo inválido, %s; contém separador de diretório" @@ -6686,9 +6749,7 @@ msgstr "Scott Bartram" #: src/nl.c:179 #, fuzzy -msgid "" -"Write each FILE to standard output, with line numbers added.\n" -"With no FILE, or when FILE is -, read standard input.\n" +msgid "Write each FILE to standard output, with line numbers added.\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" @@ -6807,27 +6868,27 @@ msgstr "estilo inválido de numeração do corpo: %s" msgid "invalid footer numbering style: %s" msgstr "estilo inválido de numeração de rodapé: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "número inválido para linha inicial: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "incremento inválido de número de linha: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "número inválido de linhas vazias: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "largura inválida de campo de numeração de linha: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "formato inválido de numeração de linha: %s" @@ -6853,7 +6914,7 @@ msgstr "" #, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6872,43 +6933,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "falhou em redirecionar o erro padrão" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "ignorando entrada" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "ignorando entrada e anexando saída a %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, fuzzy, c-format msgid "appending output to %s" msgstr "ignorando entrada e anexando saída a %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "falhou em ajustar a cópia de \"stderr\" para fechar no \"exec\"" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "ignorando entrada e redirecionando \"stderr\" para \"stdout\"" -#: src/nohup.c:199 +#: src/nohup.c:197 #, fuzzy, c-format msgid "redirecting stderr to stdout" msgstr "ignorando entrada e redirecionando \"stderr\" para \"stdout\"" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -6930,96 +6991,93 @@ msgid "" " --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: número inválido de linhas" - #. This is a proper name. See the gettext manual, section Names. -#: src/numfmt.c:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, fuzzy, c-format msgid "value too large to be converted: %s" msgstr "%s: valor não foi convertido totalmente" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "número inválido %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "sufixo inválido no argumento para %s%s: \"%s\"" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "%s: falhou em abrir para escrita" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "tamanho inválido de tabulação: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Uso: %s [OPÇÃO]... [USUÁRIO]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -7027,19 +7085,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -7049,30 +7107,30 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 #, fuzzy msgid "" "\n" @@ -7081,11 +7139,11 @@ msgstr "" "Opções de ordenação:\n" "\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -7094,7 +7152,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -7102,7 +7160,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7110,7 +7168,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7118,20 +7176,43 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 -#, c-format +#: src/numfmt.c:973 +#, fuzzy 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 zero (%010f) width\n" -"will zero pad the number. Optional negative values (%-10f) will left align.\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" msgstr "" - -#: src/numfmt.c:913 -#, c-format -msgid "" +"Cada intervalo é uma das alternativas abaixo:\n" +"\n" +" N o eNésimo byte, caractere ou campo numerado a partir de 1\n" +" N- a partir do eNésimo byte, caractere ou campo até o final da linha\n" +" N-M a partir do eNésimo ao eMésimo (inclusive) byte, caractere ou campo\n" +" -M a partir do primeiro ao eMésimo (inclusive) byte, caractere ou " +"campo\n" +"\n" +"Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" + +#: src/numfmt.c:983 +#, 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 zero (%010f) width\n" +"will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" +msgstr "" + +#: src/numfmt.c:991 +#, 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" @@ -7141,7 +7222,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -7156,118 +7237,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, fuzzy, c-format msgid "format %s has no %% directive" msgstr "o alvo %s não é um diretório" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "largura inválida do formato" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "precisão inválida: %s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "sufixo inválido no argumento para %s%s: \"%s\"" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "número inválido de campo: %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "intervalo inválido de página %s" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "número inválido de campo: %s" +msgid "multiple field specifications" +msgstr "%s: especificação inválida de campo %s" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "data inválida %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, 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:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "foram especificadas múltiplas opções -i" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, 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:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "erro lendo %s" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, fuzzy, c-format msgid "failed to convert some of the input numbers" msgstr "falhou em redirecionar o erro padrão" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7280,14 +7373,13 @@ msgstr "" " ou: %s --traditional [OPÇÃO]... [ARQUIVO] [[+]DESLOCAMENTO[.][b] [+][RÓTULO]" "[.][b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Escreve uma representação sem ambigüidade, em bytes octal por padrão,\n" @@ -7296,9 +7388,10 @@ msgstr "" "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 #, 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" @@ -7320,7 +7413,7 @@ msgstr "" "hexadecimal;\n" "sufixos possíveis são . para octal e b para multiplicação por 512.\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7329,7 +7422,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 #, fuzzy msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" @@ -7350,7 +7443,7 @@ msgstr "" " -w, --width[=QTD] emite QTD bytes por linha de saída\n" " --traditional aceita argumentos na forma tradicional\n" -#: src/od.c:363 +#: src/od.c:366 #, fuzzy msgid "" "\n" @@ -7372,7 +7465,7 @@ msgstr "" " invertida\n" " -d o mesmo que -t u2, seleciona decimais sem sinal de 2-bytes\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7388,7 +7481,7 @@ 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:380 +#: src/od.c:383 #, fuzzy msgid "" "\n" @@ -7403,7 +7496,7 @@ msgstr "" " a caractere com nome, ignorando o bit mais significativo\n" " c caractere ASCII ou escape por barra invertida\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7417,7 +7510,7 @@ msgstr "" " u[TAM] decimal sem sinal (natural), TAM bytes por número\n" " x[TAM] hexadecimal, TAM bytes por número\n" -#: src/od.c:394 +#: src/od.c:397 #, fuzzy msgid "" "\n" @@ -7437,14 +7530,14 @@ msgstr "" "de\n" "programação C que indica o número de bytes para o tipo de variável.\n" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 #, fuzzy msgid "" "\n" @@ -7462,12 +7555,12 @@ msgstr "" "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n" "GB 1000*1000*1000, G 1024*1024*1024, e assim por diante com T, P, E, Z, Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "texto de tipo inválido %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7476,7 +7569,7 @@ msgstr "" "texto de tipo inválido %s;\n" "este sistema não provê um tipo de inteiro com %lu-bytes" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7485,39 +7578,39 @@ msgstr "" "texto de tipo inválido %s;\n" "este sistema não provê um tipo de ponto-flutuante com %lu-bytes" -#: src/od.c:869 +#: src/od.c:872 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "caractere inválido \"%c\" no texto de tipo %s" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "é impossível acessar além da entrada combinada" -#: src/od.c:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, 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:1863 +#: src/od.c:1871 #, 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:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "bytes-a-pular + bytes-a-ler é um valor muito grande" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "aviso: largura %lu inválida; será usada %d em seu lugar" @@ -7537,7 +7630,6 @@ msgstr "a entrada padrão está fechada" 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 "" "Escreve linhas constituídas das linhas seqüencialmente correspondentes de\n" "cada ARQUIVO, separaradas por tabulações, para a saída padrão.\n" @@ -7686,12 +7778,12 @@ msgstr "Quando" msgid "Where" msgstr "Onde" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Uso: %s [OPÇÃO]... [USUÁRIO]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7710,7 +7802,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:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7727,7 +7819,7 @@ msgstr "" "tempo\n" " ocioso em formatação curta\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, fuzzy, c-format msgid "" "\n" @@ -7738,103 +7830,103 @@ msgstr "" "Um programa \"finger\" mais leve; emite as informações do usuário.\n" "O arquivo utmp será %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" "nenhum usuário especificado; pelo menos um deve ser fornecido ao usar -l" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "\"--pages=PRIMEIRA_PÁG[:ÚLTIMA_PÁG]\" está com argumentos faltando" -#: src/pr.c:910 +#: src/pr.c:907 #, fuzzy, c-format msgid "invalid page range %s" msgstr "intervalo inválido de página %s" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "\"-l TAMANHO_PÁG\" número inválido de linhas: %s" -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "\"-N NÚMERO\" número inválido de linha inicial: %s" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "\"-o MARGEM\" deslocamento (offset) inválido de linha: %s" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "\"-w TAMANHO_PÁG\" número inválido de caracteres: %s" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "\"-W TAMANHO_PÁG\" número inválido de caracteres: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, 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." -#: src/pr.c:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "largura de página muito estreita" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "número da página inicial % ultrapassa o total de %" -#: src/pr.c:2380 +#: src/pr.c:2350 #, fuzzy, c-format msgid "page number overflow" msgstr "Estouro do número de página" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Página %" -#: src/pr.c:2757 +#: src/pr.c:2727 #, 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:2763 +#: src/pr.c:2734 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -7852,7 +7944,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:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7869,7 +7961,7 @@ msgstr "" " -d, --double-space\n" " espaço duplo na saída\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7894,7 +7986,7 @@ msgstr "" "sem\n" " -F)\n" -#: src/pr.c:2789 +#: src/pr.c:2760 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -7919,12 +8011,25 @@ msgstr "" " nenhum alinhamento de colunas, --sep-string[=TEXTO]\n" " define os separadores\n" -#: src/pr.c:2798 +#: src/pr.c:2769 #, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l TAMANHO_PÁG, --length=TAMANHO_PÁG\n" +" define o tamanho da página para TAMANHO_PÁG (66) linhas\n" +" (o número padrão de linhas de texto é 56, ou 63 com -" +"F)\n" +" -m, --merge emite todos os arquivos em paralelo, um por coluna, " +"trunca\n" +" linhas, mas junta as de comprimento completo com -J\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -7936,7 +8041,7 @@ msgstr "" "trunca\n" " linhas, mas junta as de comprimento completo com -J\n" -#: src/pr.c:2805 +#: src/pr.c:2779 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -7955,7 +8060,7 @@ msgstr "" "da\n" " página impressa (veja +PRIMEIRA_PÁG)\n" -#: src/pr.c:2813 +#: src/pr.c:2787 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -7971,7 +8076,7 @@ msgstr "" " -r, --no-file-warnings\n" " omite avisos quando um arquivo não puder ser aberto\n" -#: src/pr.c:2820 +#: src/pr.c:2794 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -7991,7 +8096,7 @@ msgstr "" " as 3 opções de colunas (-COLUNA|-a COLUNA|-m), exceto\n" " quando -w estiver definida\n" -#: src/pr.c:2828 +#: src/pr.c:2802 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7999,7 +8104,6 @@ msgid "" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " separa as colunas com TEXTO,\n" " sem -S: Separador padrão é com -J e \n" @@ -8008,7 +8112,13 @@ msgstr "" " nas opções de coluna\n" " -t, --omit-header omite os cabeçalho e rodapés de páginas\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -8036,7 +8146,7 @@ msgstr "" "s[CARACTERE]\n" " desativa (72)\n" -#: src/pr.c:2845 +#: src/pr.c:2822 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -8051,17 +8161,6 @@ msgstr "" " sempre, trunca linhas, exceto se a opção -J estiver\n" " definida; nenhuma interferência com -S ou -s\n" -#: src/pr.c:2853 -#, fuzzy -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"Subentende-se -t se TAMANHO_PÁG <= 10.\n" -"Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" - #: src/printenv.c:62 #, fuzzy, c-format msgid "" @@ -8228,12 +8327,11 @@ msgstr "" "entrada.\n" "\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 #, fuzzy 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 emite as referências geradas " "automaticamente\n" @@ -8243,6 +8341,12 @@ msgstr "" "linha\n" #: src/ptx.c:1835 +msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -8258,7 +8362,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:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8279,7 +8383,7 @@ msgstr "" " -o, --only-file=ARQUIVO lê somente a lista de palavras deste " "ARQUIVO\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8292,20 +8396,16 @@ msgstr "" " -w, --width=NÚMERO a largura de saída em colunas, referências\n" " excluídas\n" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "largura inválida de espaçamento: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "largura inválida de linha: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8331,7 +8431,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "falhou em mudar para o diretório %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "falhou em obter o estado de %s" @@ -8352,8 +8452,8 @@ msgstr "ignorando argumentos que não são opções" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Uso: %s [OPÇÃO]... ARQUIVO...\n" @@ -8604,15 +8704,15 @@ msgstr "" #: src/rm.c:342 #, fuzzy, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: remover todos os argumentos recursivamente? " msgstr[1] "%s: remover todos os argumentos recursivamente? " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: remover todos os argumentos? " msgstr[1] "%s: remover todos os argumentos? " @@ -8838,12 +8938,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "argumento inválido de ponto flutuante: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s tem um tipo desconhecido de arquivo" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8867,7 +8967,16 @@ msgstr "" "Esse procedimento também é chamado de formatação física.\n" "\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Se ARQUIVO for -, copia novamente para a saída padrão.\n" + +#: src/shred.c:181 #, fuzzy, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8883,7 +8992,7 @@ msgstr "" "K,\n" " M e G)\n" -#: src/shred.c:183 +#: src/shred.c:187 #, fuzzy msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" @@ -8900,12 +9009,10 @@ msgstr "" "formatação\n" " física\n" -#: src/shred.c:192 +#: src/shred.c:196 #, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -8927,7 +9034,7 @@ msgstr "" "a maioria das pessoas usam a opção --remove.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8946,7 +9053,7 @@ msgstr "" "do sistema de arquivos:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8967,7 +9074,7 @@ msgstr "" " Appliance's NFS\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8982,7 +9089,7 @@ msgstr "" "* sistemas de arquivos comprimidos\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -9004,7 +9111,7 @@ msgstr "" "arquivo /etc/fstab como documentado no manual de mount (man mount).\n" "\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -9015,129 +9122,129 @@ msgstr "" "conter cópias do arquivo que não são possíveis de serem removidos e que\n" "permitirá um arquivo formatado fisicamente ser recuperado mais tarde.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: \"fdatasync\" falhou" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: \"fsync\" falhou" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: não foi possível voltar ao início" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: passagem %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: erro escrevendo na posição %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: \"lseek\" falhou" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: arquivo muito grande" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: passagem %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: passagem %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: \"fstat\" falhou" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: tipo inválido de arquivo" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: arquivo tem tamanho negativo" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: erro ao truncar" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: \"fcntl\" falhou" -#: src/shred.c:994 +#: src/shred.c:996 #, 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:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: removendo" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: renomeado como %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: falhou em remover" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: removido" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: falhou em fechar" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: falhou em abrir para escrita" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: número inválido de passagens" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "foram especificadas múltiplas fontes de aleatoriedade" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: tamanho inválido de arquivo" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -9148,14 +9255,14 @@ msgstr "" " ou: %s -e [OPÇÃO]... [ARGUMENTO]...\n" " ou: %s -i MENOR-MAIOR [OPÇÃO]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 #, 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:73 +#: src/shuf.c:75 #, fuzzy msgid "" " -e, --echo treat each ARG as an input line\n" @@ -9178,37 +9285,37 @@ msgstr "" " -z, --zero-terminated termina as linhas com byte 0, e não com nova-" "linha\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "muitas linhas repetidas" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "foram especificadas múltiplas opções -i" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "intervalo inválido de entrada %s" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "quantidade inválida de linhas %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "foram especificados múltiplos arquivos de saída" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "é impossível combinar as opções -e e -i" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -9237,12 +9344,12 @@ msgstr "" "obtida pela soma de seus valores.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "intervalo inválido de tempo %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "não foi possível ler relógio de tempo real" @@ -9254,7 +9361,7 @@ msgstr "" "Escreve de forma ordenada a concatenação do(s) ARQUIVO(s) na saída padrão.\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -9262,7 +9369,7 @@ msgstr "" "Opções de ordenação:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9275,19 +9382,19 @@ msgstr "" " -f, --ignore-case ignora diferença entre maiúsculas e " "minúsculas\n" -#: src/sort.c:443 +#: src/sort.c:444 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:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9295,7 +9402,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9305,7 +9412,7 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 #, fuzzy msgid "" "Other options:\n" @@ -9314,13 +9421,13 @@ msgstr "" "Opções de ordenação:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 #, fuzzy msgid "" " -c, --check, --check=diagnose-first check for sorted input; do not sort\n" @@ -9342,7 +9449,7 @@ msgstr "" " (origem é 1)\n" " -m, --merge mescla os arquivos já ordenados; não ordena\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9351,13 +9458,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9372,7 +9479,7 @@ msgstr "" " -S, --buffer-size=TAM usa TAManho para o \"buffer\" de memória " "principal\n" -#: src/sort.c:497 +#: src/sort.c:498 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9396,7 +9503,7 @@ msgstr "" " sem -c, emite apenas a primeira linha de uma\n" " seqüência repetida\n" -#: src/sort.c:511 +#: src/sort.c:512 #, fuzzy msgid "" "\n" @@ -9428,12 +9535,11 @@ msgstr "" "\n" "TAMANHO pode ser seguido pelos seguintes sufixos multiplicadores:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -9451,249 +9557,247 @@ msgstr "" "de\n" "bytes.\n" -#: src/sort.c:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "escrevendo em %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] terminado anormalmente" -#: src/sort.c:884 +#: src/sort.c:883 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "não foi possível criar arquivo temporário %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "erro abrindo arquivo" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "erro liberando dados no arquivo (\"fflush\")" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "erro fechando arquivo" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "não pôde criar arquivo temporário" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "não pôde criar processo para %s -d" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "aviso: não foi possível remover: %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "argumento inválido %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "argumento inválido para %s%s: \"%s\"" -#: src/sort.c:1356 +#: src/sort.c:1355 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s%s: argumento \"%s\" muito grande" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "falhou no \"stat\"" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "falhou na leitura" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "a transformação do texto falhou" -#: src/sort.c:2079 +#: src/sort.c:2078 #, fuzzy, c-format msgid "the untransformed string was %s" msgstr "O texto não transformado era %s." -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, 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:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "erro de escrita" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: desordenado: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "erro padrão" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "%s: não foi possível voltar ao início" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: especificação inválida de campo %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "as opções \"-%s\" são incompatíveis" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: contagem inválida no início de %s" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "número inválido após \"-\"" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "número inválido após \".\"" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "caractere no lugar errado no campo spec" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "foram especificados múltiplos programas de compressão" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "número inválido no início do campo" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "o número do campo é zero" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "o deslocamento de caracteres é zero" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "número inválido após \",\"" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "tabulação vazia" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "não foi possível ler nomes de arquivos de %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "é inválido um nome de arquivo de comprimento nulo" -#: src/sort.c:4619 +#: src/sort.c:4618 #, fuzzy, c-format msgid "no input from %s" msgstr "fechando arquivo de entrada %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "operando extra %s não é permitido com -%c" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 +#: src/split.c:224 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Uso: %s [OPÇÃO] [ENTRADA [PREFIXO]]\n" -#: src/split.c:207 +#: src/split.c:228 #, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\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 " @@ -9701,25 +9805,28 @@ msgstr "" "for especificada ou for -, lê a entrada padrão.\n" "\n" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9727,201 +9834,206 @@ msgstr "" " --verbose mostra um diagnóstico logo antes de abrir cada\n" " arquivo de saída\n" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "Esgotaram-se os sufixos de arquivos de saída" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "criando arquivo %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, 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:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "não foi possível criar ligação absoluta %s para %s" -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" msgstr "fechando o diretório %s" -#: src/split.c:410 +#: src/split.c:464 #, fuzzy, c-format msgid "closing output pipe" msgstr "fechando arquivo de saída %s" -#: src/split.c:414 +#: src/split.c:468 #, fuzzy, c-format msgid "moving input pipe" msgstr "fechando arquivo de entrada %s" -#: src/split.c:416 +#: src/split.c:470 #, fuzzy, c-format msgid "closing input pipe" msgstr "fechando arquivo de entrada %s" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "falhou em executar o comando %s" -#: src/split.c:427 +#: src/split.c:481 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "falhou em fechar o diretório %s" -#: src/split.c:463 +#: src/split.c:517 #, fuzzy, c-format msgid "waiting for child process" msgstr "esperando por \"strip\"" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "é impossível subdividir em mais de uma forma" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: número inválido de segundos" -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: número inválido" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: comprimento inválido de sufixo" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: número inválido de bytes" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: número inválido de linhas" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "tabulação multicaractere %s" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "arquivo especial de caractere" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "a opção de contagem de linha -%s%c... está muito grande" -#: src/split.c:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "número inválido para linha inicial: %s" -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: tamanho inválido de arquivo" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "falhou em abrir %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "aviso: escape desconhecido \"\\%c\"" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: diretiva inválida" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "aviso: barra invertida no final da formatação" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, 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:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9932,7 +10044,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9940,30 +10052,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9971,11 +10083,11 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 #, fuzzy msgid "" " -L, --dereference follow links\n" @@ -9987,7 +10099,7 @@ msgstr "" " -f, --file-system mostra o estado do sistema de arquivos, em vez de o\n" " estado do arquivo\n" -#: src/stat.c:1422 +#: src/stat.c:1425 #, fuzzy msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" @@ -10005,7 +10117,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:1433 +#: src/stat.c:1436 #, fuzzy msgid "" "\n" @@ -10026,7 +10138,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:1442 +#: src/stat.c:1445 #, fuzzy msgid "" " %d device number in decimal\n" @@ -10043,7 +10155,7 @@ msgstr "" " %g ID de grupo do dono\n" " %G Nome de grupo do dono\n" -#: src/stat.c:1450 +#: src/stat.c:1453 #, fuzzy msgid "" " %h number of hard links\n" @@ -10065,7 +10177,7 @@ msgstr "" " %t Tipo maior de dispositivo em hexadecimal\n" " %T Tipo menor de dispositivo em hexadecimal\n" -#: src/stat.c:1461 +#: src/stat.c:1464 #, fuzzy msgid "" " %u user ID of owner\n" @@ -10090,7 +10202,7 @@ msgstr "" " %Z Horário da última alteração do estado em segundos desde Epoch\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -10110,7 +10222,7 @@ msgstr "" " %f Blocos livres no sistema de arquivos\n" " %C Texto de contexto de segurança SELinux\n" -#: src/stat.c:1484 +#: src/stat.c:1487 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -10173,8 +10285,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -10199,7 +10310,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "deve-se especificar uma lista de bytes, caracteres ou campos" -#: src/stty.c:516 +#: src/stty.c:524 #, fuzzy, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10210,11 +10321,11 @@ msgstr "" " ou: %s [-F DISPOSITIVO] [--file=DISPOSITIVO] [-a|--all]\n" " ou: %s [-F DISPOSITIVO] [--file=DISPOSITIVO] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 #, fuzzy msgid "" " -a, --all print all current settings in human-readable form\n" @@ -10230,7 +10341,7 @@ msgstr "" " -F, --file=DISPOSIVO abre e usa o DISPOSItivo especificado em vez da\n" " entrada padrão\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10242,11 +10353,24 @@ msgstr "" "determina\n" "quais são as características disponíveis.\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -10257,9 +10381,13 @@ msgstr "" " eof CARAC CARAC enviará um fim-de-arquivo (termina a entrada)\n" " eol CARAC CARAC terminará a linha\n" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -10269,36 +10397,58 @@ msgstr "" " intr CARAC CARAC enviará um sinal de interrupção\n" " kill CARAC CARAC apagará a linha atual\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" msgstr "" -" * lnext CARAC CARAC deixará o próximo caractere entre aspas\n" -" quit CARAC CARAC enviará um sinal de sair (\"quit\")\n" -" * rprnt CARAC CARAC redesenhará a linha atual\n" -" start CARAC CARAC reiniciará a saída depois de pará-la\n" -#: src/stty.c:559 +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 CARAC CARAC irá parar a saída\n" " susp CARAC CARAC enviará um sinal de parada de terminal\n" " * swtch CARAC CARAC trocará para uma camada diferente de shell\n" " * werase CARAC CARAC apagará a última palavra digitada\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 #, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Configurações especiais:\n" +" N configura as velocidades de entrada e saída para N bauds\n" +" * cols N informa ao Kernel que o terminal tem N colunas\n" +" * columns N o mesmo que cols N\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -10308,10 +10458,17 @@ msgstr "" " * cols N informa ao Kernel que o terminal tem N colunas\n" " * columns N o mesmo que cols N\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -10323,11 +10480,23 @@ msgstr "" " completa\n" " ospeed N configura a velocidade de saída para N bauds\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N informa ao Kernel que o terminal tem N linhas\n" +" * size emite o número de linhas e colunas conforme o Kernel\n" +" speed emite a velocidade do terminal\n" +" time N com -icanon, define o tempo limite de leitura para N " +"décimos\n" +" de segundo\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -10338,25 +10507,27 @@ msgstr "" "décimos\n" " de segundo\n" -#: src/stty.c:584 -#, fuzzy +#: src/stty.c:641 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" -"Configurações de controle:\n" -" [-]clocal desativa os sinais de controle do modem\n" -" [-]cread permite os dados de entrada serem recebidos\n" -" * [-]crtscts permite negociação RTS/CTS\n" -" csN define o tamanho do caractere para N bits, N em [5..8]\n" -#: src/stty.c:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -10365,7 +10536,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb usa dois bits de parada por caractere (um com \"-\")\n" " [-]hup envia um sinal de desligar quando o último processo fechar\n" @@ -10376,7 +10546,12 @@ msgstr "" " na entrada\n" " [-]parodd define a paridade como ímpar (par com \"-\")\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -10384,6 +10559,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Configurações da entrada:\n" @@ -10392,10 +10568,14 @@ msgstr "" " [-]ignbrk ignora caracteres \"break\"\n" " [-]igncr ignora retorno de carro\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -10408,16 +10588,27 @@ msgstr "" " [-]istrip zera o bit mais significativo (8) dos caracteres de " "entrada\n" -#: src/stty.c:616 +#: src/stty.c:692 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:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" +" * [-]iutf8 assume que os caracteres de entrada estão na codificação " +"UTF-8\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -10432,61 +10623,83 @@ msgstr "" "caractere)\n" " [-]tandem o mesmo que [-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Configurações de saída:\n" -" * bsN estilo do atraso do backspace, N em [0..1]\n" -" * crN estilo do atraso do retorno de carro, N em [0..3]\n" -" * 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:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" -msgstr "" -" * [-]ocrnl traduz retorno de carro para nova-linha\n" -" * [-]ofdel usa caracteres de \"delete\" para preencher em vez de nulo\n" -" * [-]ofill usa caractere de preenchimento em vez de esperar por " -"atrasos\n" -" * [-]olcuc traduz minúsculas para maiúsculas\n" -" * [-]onlcr traduz nova-linha para retorno de carro-nova-linha\n" -" * [-]onlret nova-linha provoca um retorno de carro\n" - -#: src/stty.c:643 -msgid "" -" * [-]onocr do not print carriage returns in the first column\n" -" [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 +msgid "" " * 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 "" -" * [-]onocr não emite retorno de carro na primeira coluna\n" -" [-]opost realiza pós-processamento da saída\n" -" * tabN estilo do atraso da tabulação horizontal, N em [0..3]\n" -" * tabs o mesmo que tab0\n" -" * -tabs o mesmo que tab3\n" -" * vtN estilo do atraso da tabulação vertical, N em [0..1]\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10500,48 +10713,66 @@ msgstr "" "e\n" " echok\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 #, fuzzy +msgid " [-]echo echo input characters\n" +msgstr "" +" * [-]iutf8 assume que os caracteres de entrada estão na codificação " +"UTF-8\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]ctlecho ecoa os caracteres de controle em notação de circunflexo\n" -" (\"^c\")\n" -" [-]echo ecoa caracteres de entrada\n" -" * [-]echoctl o mesmo que [-]ctlecho\n" -" [-]echoe o mesmo que [-]crterase\n" -" [-]echok ecoa uma nova-linha depois de um caractere de \"kill\"\n" -#: src/stty.c:665 -#, fuzzy +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]echoke o mesmo que [-]crtkill\n" -" [-]echonl ecoa uma nova-linha mesmo se não estiver ecoando os demais\n" -" caracteres\n" -" * [-]echoprt ecoa os caracteres apagados pra trás entre \"\\\" e \"/\"\n" -" [-]icanon habilita os caracteres especiais de erase (apagar), kill\n" -" (matar), werase (apagar palavra) e rprnt\n" -" [-]iexten habilita caracteres especiais não-POSIX\n" +" [-]isig habilita os caracteres especiais de interrupção, saída\n" +" (\"quit\") e suspensão\n" +" [-]noflsh desabilita descarga (\"flush\") após caracteres de " +"interrupção\n" +" e saída (\"quit\")\n" +" * [-]prterase o mesmo que [-]echoprt\n" +" * [-]tostop cessa trabalhos em plano de fundo que tentam escrever no\n" +" terminal\n" +" * [-]xcase com icanon, escapa com \"\\\" caracteres em maiúsculas\n" -#: src/stty.c:672 +#: src/stty.c:843 #, fuzzy 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 "" " [-]isig habilita os caracteres especiais de interrupção, saída\n" " (\"quit\") e suspensão\n" @@ -10553,11 +10784,33 @@ msgstr "" " terminal\n" " * [-]xcase com icanon, escapa com \"\\\" caracteres em maiúsculas\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -10567,40 +10820,50 @@ msgstr "" " cbreak o mesmo que -icanon\n" " -cbreak o mesmo que icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 o mesmo que os caracteres brkint ignpar istrip icrnl ixon\n" " opost isig icanon, eof e eol para seus valores padrão\n" " -cooked o mesmo que raw\n" " crt o mesmo que echoe echoctl echoke\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -" dec o mesmo que echoe echoctl echoke -ixany intr ^c erase 0177\n" -" kill ^u\n" -" * [-]decctlq o mesmo que [-]ixany\n" -" ek caracteres \"erase\" e \"kill\" nos seus valores padrão\n" -" evenp o mesmo que parenb -parodd cs7\n" -#: src/stty.c:699 +#: src/stty.c:919 +#, fuzzy 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 "" " -evenp o mesmo que -parenb cs8\n" " * [-]lcase o mesmo que xcase iuclc olcuc\n" @@ -10609,7 +10872,19 @@ msgstr "" " nl o mesmo que -icrnl -onlcr\n" " -nl o mesmo que icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"Configurações de combinação:\n" +" * [-]LCASE o mesmo que [-]lcase\n" +" cbreak o mesmo que -icanon\n" +" -cbreak o mesmo que icanon\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10623,11 +10898,12 @@ msgstr "" " pass8 o mesmo que -parenb -istrip cs8\n" " -pass8 o mesmo que parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw o mesmo que -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" @@ -10635,15 +10911,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw o mesmo que \"cooked\"\n" -#: src/stty.c:720 -#, fuzzy +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane o mesmo que cread -ignbrk brkint -inlcr -igncr icrnl -" "iutf8\n" @@ -10654,7 +10930,7 @@ msgstr "" "caracteres\n" " especiais com seus valores padrão.\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10672,12 +10948,12 @@ msgstr "" "\"\n" " (indefinido) são utilizados para desabilitar caracteres especiais.\n" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "somente um dispositivo pode ser especificado" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10686,45 +10962,50 @@ msgstr "" "as opções para estilo de saída detalhado e inteligível ao stty\n" "são mutuamente exclusivas" -#: src/stty.c:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: não foi possível reiniciar modo não-bloqueante" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "argumento inválido %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "faltando argumento para %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: erro ao truncar" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "disciplina inválida de linha %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: incapaz de realizar todas as operações solicitadas" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: sem informação de tamanho para este dispositivo" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "argumento inválido para inteiro %s" #. This is a proper name. See the gettext manual, section Names. @@ -10734,8 +11015,14 @@ msgstr "Kayvan Aghaiepour" #: src/sum.c:62 #, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Exibe a soma de verificação CRC e o total de bytes de cada ARQUIVO.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -10748,20 +11035,54 @@ msgstr "" " -s, --sysv usa o algoritmo de soma do System V, com blocos de 512 " "bytes\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Uso: %s [OPÇÃO] [ARQUIVO]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Força os blocos alterados para o disco, atualiza o super-bloco.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "erro lendo %s" -#: src/sync.c:69 +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: não foi possível reiniciar modo não-bloqueante" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "erro lendo %s" + +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "ignorando todos os argumentos" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10775,15 +11096,23 @@ msgstr "" "seu\n" "shell sobre a que opções ele oferece suporte.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help mostra esta ajuda e finaliza\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version informa a versão e finaliza\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" + +#: src/system.h:544 #, fuzzy msgid "" "\n" @@ -10791,7 +11120,7 @@ msgid "" msgstr "" "Argumentos obrigatórios para opções longas também o são para opções curtas.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10799,7 +11128,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10808,7 +11137,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, fuzzy, c-format msgid "" "\n" @@ -10819,22 +11148,27 @@ msgstr "página de %s: <%s>\n" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -#: src/system.h:591 +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Experimente \"%s --help\" para mais informações.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10856,9 +11190,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\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" @@ -10878,57 +11210,56 @@ msgstr "" " -s, --separator=TEXTO usa TEXTO como separador, em vez do caractere de\n" " \"nova-linha\"\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: busca (\"seek\") falhou" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "registro muito grande" -#: src/tac.c:450 +#: src/tac.c:459 #, 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:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: falhou em abrir para escrita" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "falhou em preservar horário para %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: erro de escrita" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "não foi possível abrir %s para leitura" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "o separador não pode ser nulo" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 +#: src/tail.c:257 #, 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" 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" @@ -10936,13 +11267,13 @@ msgstr "" "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" "\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 #, fuzzy msgid "" " -f, --follow[={name|descriptor}]\n" @@ -10958,7 +11289,7 @@ msgstr "" " equivalentes\n" " -F o mesmo que --follow=name --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10982,7 +11313,7 @@ msgstr "" " (uma situação comum para arquivos de log " "rotativo)\n" -#: src/tail.c:293 +#: src/tail.c:288 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -10996,7 +11327,7 @@ msgstr "" " -v, --verbose sempre emite cabeçalhos com os nomes dos " "ARQUIVOs\n" -#: src/tail.c:298 +#: src/tail.c:293 #, fuzzy msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" @@ -11012,7 +11343,7 @@ msgstr "" " -v, --verbose sempre emite cabeçalhos com os nomes dos " "ARQUIVOs\n" -#: src/tail.c:307 +#: src/tail.c:302 #, fuzzy msgid "" "\n" @@ -11032,7 +11363,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:316 +#: src/tail.c:311 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -11051,178 +11382,178 @@ msgstr "" "algum\n" "outro programa.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "fechando %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, 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:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, fuzzy, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" "%s foi substituido por um arquivo que não pode ter seu fim monitorado; " "desistindo desse nome" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s se tornou inacessível" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s se tornou acessível" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s apareceu; monitorando o fim do novo arquivo" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s foi substituido; monitorando o fim do novo arquivo" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: não foi possível alterar o modo não-bloqueante" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: arquivo truncado" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "nenhum aquivo restante" -#: src/tail.c:1424 +#: src/tail.c:1440 #, fuzzy, c-format msgid "cannot watch parent directory of %s" msgstr "não foi possível realizar \"stat\" no diretório atual (agora %s)" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, fuzzy, c-format msgid "inotify resources exhausted" msgstr "memória esgotada" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, fuzzy, c-format msgid "cannot watch %s" msgstr "não foi possível tocar %s" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: substituir %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1597 #, fuzzy, c-format msgid "error reading inotify event" msgstr "erro lendo %s" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: é impossivel monitorar o final deste arquivo; desistindo desse nome" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "o número em %s é muito grande" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "" "%s: número inválido para máximo de estados inalterados entre aberturas do " "arquivo" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: PID inválido" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: número inválido de segundos" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "o número de colunas não é válido: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "opção usada em um contexto inválido -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, fuzzy, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "aviso: PID ignorado; --pid=PID é útil somente quando monitorando" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "aviso: PID ignorado; --pid=PID é útil somente quando monitorando" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "aviso: não há suporte para--pid=PID neste sistema" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "é impossível monitorar %s pelo nome" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "aviso: monitorar indefinidamente a entrada padrão não funciona" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -11235,60 +11566,72 @@ msgstr "" " sobrescrever\n" " -i, --ignore-interrupts ignora os sinais de interrupção\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Se ARQUIVO for -, copia novamente para a saída padrão.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "faltam argumentos depois de %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "número inteiro inválido %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "era esperado \")\"" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "era esperado \")\", foi encontrado %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: era esperado um operador unário" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt não aceita -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef não aceita -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot não aceita -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "operador binário desconhecido" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: era esperado um operador binário" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11302,7 +11645,7 @@ msgstr "" " ou: [ ]\n" " ou: [ OPÇÃO\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11310,7 +11653,7 @@ msgstr "" "Sai com o estado determinado por EXPRESSÃO.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11321,7 +11664,7 @@ msgstr "" "EXPRESSÃO é verdadeira ou falsa e configura o estado de saída.\n" "Assume uma das formas a seguir:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11336,7 +11679,7 @@ msgstr "" "verdadeiras\n" " EXPRESSÃO1 -o EXPRESSÃO2 EXPRESSÃO1 ou EXPRESSÃO2 é(são) verdadeira(s)\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11352,7 +11695,7 @@ msgstr "" " TEXTO1 = TEXTO2 os textos são iguais\n" " TEXTO1 != TEXTO2 os textos não são iguais\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11370,7 +11713,7 @@ msgstr "" " INTEIRO1 -lt INTEIRO2 INTEIRO1 é menor que INTEIRO2\n" " INTEIRO1 -ne INTEIRO2 INTEIRO1 é diferente de INTEIRO2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11386,7 +11729,7 @@ msgstr "" " ARQUIVO2\n" " ARQUIVO1 -ot ARQUIVO2 ARQUIVO1 é mais antigo que ARQUIVO2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11400,7 +11743,7 @@ msgstr "" " -d ARQUIVO ARQUIVO existe e é um diretório\n" " -e ARQUIVO ARQUIVO existe\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11416,7 +11759,7 @@ msgstr "" " -k ARQUIVO ARQUIVO existe e tem definido o bit de aderência (\"sticky" "\")\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11430,7 +11773,7 @@ msgstr "" " -r ARQUIVO ARQUIVO existe e tem permissão de leitura\n" " -s ARQUIVO ARQUIVO existe e seu tamanho é maior que zero\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11444,7 +11787,7 @@ msgstr "" " -w ARQUIVO ARQUIVO existe e tem permissão de escrita\n" " -x ARQUIVO ARQUIVO existe e tem permissão de execução (ou busca)\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11459,7 +11802,7 @@ msgstr "" "barras invertidas) antes, para serem passados para shells.\n" "INTEIRO pode também ser -l TEXTO, que avalia o comprimento de TEXTO.\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11469,26 +11812,26 @@ msgstr "" "NOTA: [ honra as opções --help e --version, mas \"test\" não.\n" "\"test\" trata cada uma delas como trataria qualquer outro TEXTO não nulo.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test e/ou [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 #, fuzzy msgid "missing ']'" msgstr "falta \"]\"" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "argumento extra %s" @@ -11508,7 +11851,7 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11517,13 +11860,13 @@ msgstr "" "Uso: %s OPÇÃO USUÁRIO COMANDO [ARGUMENTO]...\n" " ou: %s OPÇÃO\n" -#: src/timeout.c:232 +#: src/timeout.c:234 #, fuzzy msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" "Argumentos obrigatórios para opções longas também o são para opções curtas.\n" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11541,7 +11884,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11549,7 +11892,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -11560,7 +11903,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -11575,6 +11918,11 @@ msgstr "erro escrevendo %s" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -11947,12 +12295,12 @@ 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." -#: src/truncate.c:96 +#: src/truncate.c:69 #, fuzzy, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Uso: %s OPÇÃO... [ARQUIVO]...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -11963,23 +12311,23 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 #, 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:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11987,57 +12335,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: arquivo tem tamanho negativo" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "não foi possível mudar a posse de %s" -#: src/truncate.c:205 +#: src/truncate.c:178 #, fuzzy, c-format msgid "overflow rounding up size of file %s" msgstr "estouro de deslocamento enquanto lia o arquivo %s" -#: src/truncate.c:215 +#: src/truncate.c:188 #, fuzzy, c-format msgid "overflow extending size of file %s" msgstr "estouro de deslocamento enquanto lia o arquivo %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "" -#: src/truncate.c:303 +#: src/truncate.c:276 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "foram especificados múltiplos diretórios-alvo" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "número inválido %s" + +#: src/truncate.c:307 #, 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:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "não foi possível abrir %s para escrita" @@ -12048,12 +12401,10 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Uso: %s [OPÇÃO] [ARQUIVO]\n" "Escreve uma lista totalmente ordenada coerente com uma ordenação parcial no\n" @@ -12061,12 +12412,17 @@ msgstr "" "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: a entrada contém um número ímpar de termos" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: a entrada contém um ciclo:" @@ -12137,9 +12493,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "Converte os espaços de cada ARQUIVO em tabulações, escrevendo na saída " "padrão.\n" @@ -12196,8 +12550,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -12208,7 +12562,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -12365,11 +12719,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, fuzzy, c-format msgid "" @@ -12393,13 +12742,17 @@ msgstr "" "É costume usar %s como ARQUIVO.\n" "\n" -#: src/wc.c:117 -#, fuzzy +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -12413,13 +12766,13 @@ msgstr "" " -m, --chars mostra a quantidade de caracteres\n" " -l, --lines mostra a quantidade de linhas\n" -#: src/wc.c:128 +#: src/wc.c:134 #, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=A lê a entrada dos arquivos especificados pelos " @@ -12588,10 +12941,10 @@ msgstr "" "atual.O mesmo que id -un.\n" "\n" -#: src/whoami.c:91 -#, c-format -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" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "não foi possível encontrar o nome para a ID de usuário %lu" #: src/yes.c:41 #, c-format @@ -12610,6 +12963,229 @@ msgstr "" "Emite repetidamente uma linha com todos os TEXTOs especificados ou \"y\".\n" "\n" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "Subentende-se -t se TAMANHO_PÁG <= 10.\n" +#~ "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Se ARQUIVO não for especificado ou for -, lê a entrada padrão.\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Força os blocos alterados para o disco, atualiza o super-bloco.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "ignorando todos os argumentos" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: número inválido" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s é tão grande que não pode ser representado" + +#~ msgid "number of lines" +#~ msgstr "número de linhas" + +#~ msgid "number of bytes" +#~ msgstr "número de bytes" + +#, fuzzy +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: número inválido de linhas" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: número inválido de bytes" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: número inválido de linhas" + +#~ msgid "number in %s is too large" +#~ msgstr "o número em %s é muito grande" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: número inválido de segundos" + +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "falhou em estabelecer grupo(s) suplementar(es)" + +#~ 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 "" +#~ "\n" +#~ "Enviar um sinal %s para o processo \"dd\" em execução faz ele emitir as\n" +#~ "estatísticas de E/S para a saída de erro padrão e depois retomar a " +#~ "cópia.\n" +#~ "\n" +#~ " $ dd if=/dev/zero of=/dev/null& pid=$!\n" +#~ " $ 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" +#~ "\n" +#~ "As opções são:\n" +#~ "\n" + +#~ 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 CARAC CARAC deixará o próximo caractere entre aspas\n" +#~ " quit CARAC CARAC enviará um sinal de sair (\"quit\")\n" +#~ " * rprnt CARAC CARAC redesenhará a linha atual\n" +#~ " start CARAC CARAC reiniciará a saída depois de pará-la\n" + +#, 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" +#~ "Configurações de controle:\n" +#~ " [-]clocal desativa os sinais de controle do modem\n" +#~ " [-]cread permite os dados de entrada serem recebidos\n" +#~ " * [-]crtscts permite negociação RTS/CTS\n" +#~ " csN define o tamanho do caractere para N bits, N em [5..8]\n" + +#~ 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 "" +#~ "\n" +#~ "Configurações de saída:\n" +#~ " * bsN estilo do atraso do backspace, N em [0..1]\n" +#~ " * crN estilo do atraso do retorno de carro, N em [0..3]\n" +#~ " * 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" + +#, fuzzy +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl traduz retorno de carro para nova-linha\n" +#~ " * [-]ofdel usa caracteres de \"delete\" para preencher em vez de " +#~ "nulo\n" +#~ " * [-]ofill usa caractere de preenchimento em vez de esperar por " +#~ "atrasos\n" +#~ " * [-]olcuc traduz minúsculas para maiúsculas\n" +#~ " * [-]onlcr traduz nova-linha para retorno de carro-nova-linha\n" +#~ " * [-]onlret nova-linha provoca um retorno de carro\n" + +#~ 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 "" +#~ " * [-]onocr não emite retorno de carro na primeira coluna\n" +#~ " [-]opost realiza pós-processamento da saída\n" +#~ " * tabN estilo do atraso da tabulação horizontal, N em [0..3]\n" +#~ " * tabs o mesmo que tab0\n" +#~ " * -tabs o mesmo que tab3\n" +#~ " * vtN estilo do atraso da tabulação vertical, N em [0..1]\n" + +#, fuzzy +#~ 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 "" +#~ " * [-]ctlecho ecoa os caracteres de controle em notação de " +#~ "circunflexo\n" +#~ " (\"^c\")\n" +#~ " [-]echo ecoa caracteres de entrada\n" +#~ " * [-]echoctl o mesmo que [-]ctlecho\n" +#~ " [-]echoe o mesmo que [-]crterase\n" +#~ " [-]echok ecoa uma nova-linha depois de um caractere de \"kill\"\n" + +#, fuzzy +#~ 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 "" +#~ " * [-]echoke o mesmo que [-]crtkill\n" +#~ " [-]echonl ecoa uma nova-linha mesmo se não estiver ecoando os " +#~ "demais\n" +#~ " caracteres\n" +#~ " * [-]echoprt ecoa os caracteres apagados pra trás entre \"\\\" e \"/" +#~ "\"\n" +#~ " [-]icanon habilita os caracteres especiais de erase (apagar), " +#~ "kill\n" +#~ " (matar), werase (apagar palavra) e rprnt\n" +#~ " [-]iexten habilita caracteres especiais não-POSIX\n" + +#~ 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 "" +#~ " dec o mesmo que echoe echoctl echoke -ixany intr ^c erase " +#~ "0177\n" +#~ " kill ^u\n" +#~ " * [-]decctlq o mesmo que [-]ixany\n" +#~ " ek caracteres \"erase\" e \"kill\" nos seus valores padrão\n" +#~ " evenp o mesmo que parenb -parodd cs7\n" + +#~ 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" + #~ msgid "cannot create pipe" #~ msgstr "não foi possível criar duto" @@ -13077,19 +13653,6 @@ msgstr "" #~ msgid "truncating %s" #~ msgstr "truncando %s" -#~ msgid "" -#~ "Display the current time in the given FORMAT, or set the system date.\n" -#~ "\n" -#~ " -d, --date=STRING display time described by STRING, not `now'\n" -#~ " -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -#~ msgstr "" -#~ "Mostra a hora atual no FORMATO fornecido, ou ajusta a data do sistema.\n" -#~ "\n" -#~ " -d, --date=TEXTO mostra a hora descrita no TEXTO, não a de " -#~ "\"agora\"\n" -#~ " -f, --file=ARQDATA como --date uma vez para cada linha de " -#~ "ARQDATA\n" - #~ msgid "" #~ " nocreat do not create the output file\n" #~ " excl fail if the output file already exists\n" @@ -13197,9 +13760,6 @@ msgstr "" #~ msgid "FIXME unknown" #~ msgstr "FIXME desconhecido" -#~ msgid "Usage: %s [OPTION] [FILE]...\n" -#~ msgstr "Uso: %s [OPÇÃO] [ARQUIVO]...\n" - #~ msgid "%s" #~ msgstr "%s" diff --git a/po/ro.gmo b/po/ro.gmo index 6cf0c701..97d0ddcf 100644 Binary files a/po/ro.gmo and b/po/ro.gmo differ diff --git a/po/ro.po b/po/ro.po index 769a89fd..57d7f333 100644 --- a/po/ro.po +++ b/po/ro.po @@ -2,11 +2,12 @@ # Copyright (C) 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the coreutils package. # Sergiu Bivol , 2010. +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: GNU coreutils 8.4\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2010-01-24 17:20+0200\n" "Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" @@ -36,18 +37,18 @@ msgstr "Argumente valide sînt:" msgid "error closing file" msgstr "eroare la închiderea fișierului" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "eroare de scriere" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "se păstrează permisiunile pentru %s" @@ -232,57 +233,62 @@ msgstr "Șirul parametrului e codificat greșit" msgid "Unknown error" msgstr "Eroare necunoscută" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: opțiunea „%s” e ambiguă\n" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: opțiunea „-W %s” e ambiguă\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: opțiunea „--%s” nu permite un argument\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: opțiunea „%c%s” nu permite un argument\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, fuzzy, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: opțiunea „%s” cere un argument\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: opțiune necunoscută „--%s”\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: opțiune necunoscută „%c%s”\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opțiune nevalidă -- „%c”\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opțiunea cere un argument -- „%c”\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: opțiunea „-W %s” e ambiguă\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: opțiunea „-W %s” nu permite un argument\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, fuzzy, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: opțiunea „%s” cere un argument\n" @@ -292,13 +298,13 @@ msgstr "%s: opțiunea „%s” cere un argument\n" msgid "cannot change permissions of %s" msgstr "permisiunile %s nu se pot modifica" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "dosarul %s nu poate fi creat" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "memorie epuizată" @@ -347,6 +353,12 @@ msgstr "”" msgid "%s: end of file" msgstr "%s: sfîrșit de fișier" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: eroare de citire" + #: lib/regcomp.c:131 msgid "Success" msgstr "Succes" @@ -455,7 +467,7 @@ msgstr "^[dDyY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "se stabilesc permisiunile pentru %s" @@ -892,7 +904,7 @@ msgstr "" "standard.\n" "\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -902,15 +914,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -919,51 +923,51 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "eroare de citire" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "intrare nevalidă" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "operand %s în plus" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "se închide intrarea standard" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1002,39 +1006,44 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "operand lipsă" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Utilizare: %s [OPȚIUNE]... [FIȘIER]...\n" #: src/cat.c:92 #, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"Tipărește fragmente alese de linie din fiecare FIȘIER pe ieșirea standard.\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1052,7 +1061,7 @@ msgstr "" " -n, --number numerotează toate liniile rezultante\n" " -s, --squeeze-blank suprimă liniile rezultante vide repetate\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1065,7 +1074,7 @@ msgstr "" " -v, --show-nonprinting utilizează notația ^ și M-, în afară de LFD și " "TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1079,17 +1088,18 @@ msgstr "" "lui g.\n" " %s Copiază intrarea standard spre ieșirea standard.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "nu se poate face ioctl asupra %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "ieșirea standard" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: fișierul de intrare este fișier de ieșire" @@ -1101,10 +1111,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1118,8 +1128,8 @@ msgstr "eșec la crearea contextului de securitate: %s" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "eșec la obținerea contextului de securitate al %s" @@ -1134,13 +1144,13 @@ msgstr "nu se poate aplica context parțial asupra fișierului ne-etichetat %s" 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:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "%s nu poate fi accesat" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "dosarul %s nu poate fi citit" @@ -1156,7 +1166,7 @@ msgstr "se schimbă contextul de securitate al %s\n" msgid "fts_read failed" msgstr "fts_read a eșuat" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1256,7 +1266,7 @@ msgid "-R -h requires -P" msgstr "-R -h cere -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1273,9 +1283,8 @@ msgid "conflicting security context specifiers given" msgstr "" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "eșec la obținerea atributelor %s" @@ -1551,17 +1560,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "grup %s nevalid" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "listă de grupuri %s nevalidă" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1570,7 +1579,7 @@ msgstr "" "Utilizare: %s [OPȚIUNE] RĂDĂCINĂNOUĂ [COMANDĂ [ARG]...]\n" " sau: %s OPȚIUNE\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1578,16 +1587,28 @@ msgstr "" "Rulează COMANDĂ cu dosarul rădăcină stabilit la RĂDĂCINĂNOUĂ.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" +" --userspec=UTILIZATOR:GRUP specifică utilizatorul și grupul (ID sau nume) " +"de utilizat\n" +" --groups=LISTĂ_G specifică grupuri suplimentare ca g1,g2,..,gN\n" + +#: src/chroot.c:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" " --userspec=UTILIZATOR:GRUP specifică utilizatorul și grupul (ID sau nume) " "de utilizat\n" " --groups=LISTĂ_G specifică grupuri suplimentare ca g1,g2,..,gN\n" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 #, fuzzy msgid "" "\n" @@ -1596,42 +1617,47 @@ msgstr "" "\n" "Dacă nu este dată nicio comandă, execută „${SHELL} -i” (implicit: /bin/sh).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "dosarul rădăcină nu poate fi schimbat la %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "nu se poate schimba la dosarul rădăcină" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "eșec la stabilirea grupurilor suplimentare" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" -msgstr "eșec la stabilirea ID-grup" +msgid "failed to set supplemental groups" +msgstr "eșec la stabilirea grupurilor suplimentare" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "eșec la stabilirea ID-grup" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "eșec la stabilirea ID-utilizator" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "eșec la rularea comenzii %s" @@ -1672,7 +1698,16 @@ msgstr "Utilizare: %s [OPȚIUNE]... FIȘIER1 FIȘIER2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Compară fișierele sortate FIȘIER1 și FIȘIER2 linie cu linie.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1680,7 +1715,7 @@ msgid "" "and column three contains lines common to both files.\n" msgstr "" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1688,7 +1723,7 @@ msgid "" " -3 suppress column 3 (lines that appear in both files)\n" msgstr "" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1696,11 +1731,11 @@ msgid "" " --nocheck-order do not check that the input is correctly sorted\n" msgstr "" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=ȘIR separă coloanele cu ȘIR\n" -#: src/comm.c:133 +#: src/comm.c:137 #, fuzzy msgid "" "\n" @@ -1709,7 +1744,7 @@ msgstr "" "\n" "Rețineți, comparările respectă regulile specificate de „LC_COLLATE”.\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1718,309 +1753,323 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "fișierul %d nu este în ordine sortată" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "delimitatori multipli specificați" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "%s gol interzis" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "nu se poate face lseek %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "eroare la citirea %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "nu se poate face lseek %s" +msgid "error reading %s" +msgstr "eroare la citirea %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "eroare la scrierea %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "eroare la citirea %s" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "%s: eșec la eliminare" -#: src/copy.c:383 +#: src/copy.c:478 #, fuzzy, c-format msgid "%s: write failed" msgstr "scriere eșuată" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "eșec la deschiderea %s" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "se curăță permisiunile pentru %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "păstrarea apartenenței pentru %s a eșuat" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "găsirea fișierului %s a eșuat" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "eșec la stabilirea contextului implicit de creare a fișierelor la %s" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "eșec la stabilirea contextului implicit de creare a fișierelor la %s" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "eșec la obținerea contextului de securitate al %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "%s nu poate fi deschis pentru citire" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "nu se poate face fstat %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "se sare fișierul %s, întrucît a fost înlocuit în timpul copierii" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "%s nu poate fi eliminat" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "eliminat %s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "fișierul obișnuit %s nu poate fi creat" -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" msgstr "eșec la clonarea %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "se păstrează timpii pentru %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "eșec la clonarea %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "" -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: suprascrieți %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (rezervă: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "nu se poate face stat %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "se omite dosarul %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, 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:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s și %s sînt unul și același fișier" -#: src/copy.c:1939 +#: src/copy.c:2019 #, 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:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "nu se poate suprascrie dosarul %s cu non-dosar" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "" -#: src/copy.c:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "%s nu poate fi copiat de rezervă" -#: src/copy.c:2107 +#: src/copy.c:2187 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "" -#: src/copy.c:2184 +#: src/copy.c:2264 #, 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:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "atenție: fișierul-sursă %s specificat mai mult decît o dată" + +#: src/copy.c:2294 #, c-format msgid "will not create hard link %s to directory %s" msgstr "" -#: src/copy.c:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "nu se poate muta %s la %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" -#: src/copy.c:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "nu se poate copia legătura simbolică ciclică %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" -#: src/copy.c:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "nu se poate crea legătura simbolică %s la %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "fișierul special %s nu poate fi creat" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "legătura simbolică %s nu poate fi citită" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "legătura simbolică %s nu poate fi creată" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s are un tip de fișier necunoscut" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "" @@ -2030,25 +2079,25 @@ msgstr "" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, fuzzy, c-format msgid "unknown program %s" msgstr "flux necunoscut" @@ -2238,8 +2287,8 @@ msgstr "%s există dar nu este un dosar" msgid "failed to access %s" msgstr "eșec la clonarea %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "lipsă operand fișier" @@ -2312,137 +2361,144 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "intrarea a dispărut" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: număr linie în afara intervalului" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: număr linie în afara intervalului" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr "" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: nicio potrivire găsită" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "eroare de scriere pentru %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: se așteaptă întreg după delimitator" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: expresie regulată nevalidă: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: model nevalid" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, 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:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "%.*s: specificare de conversie nevalidă" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: număr nevalid" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "număr nevalid %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Utilizare: %s [OPȚIUNE]... FIȘIER MODEL...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "intrarea standard este închisă" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2450,26 +2506,21 @@ msgid "" " -k, --keep-files do not remove output files on errors\n" msgstr "" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 msgid "" "\n" +"Each PATTERN may be:\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" @@ -2495,14 +2546,14 @@ 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:182 +#: src/cut.c:183 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:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2510,20 +2561,20 @@ msgid "" " -n (ignored)\n" msgstr "" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" -#: src/cut.c:197 +#: src/cut.c:198 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:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2531,7 +2582,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:210 +#: src/cut.c:211 msgid "" "Each range is one of:\n" "\n" @@ -2539,65 +2590,64 @@ msgid "" " 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:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, 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:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "cîmpurile și pozițiile sînt numerotate începînd cu 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "numărul de cîmp %s e prea mare" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "poate fi specificat numai un tip de listă" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "delimitatorul trebuie să fie un singur caracter" -#: src/cut.c:787 +#: src/cut.c:786 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:790 +#: src/cut.c:789 msgid "an input delimiter may be specified only when operating on fields" msgstr "" -#: src/cut.c:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" msgstr "" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "lipsește lista de cîmpuri" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "lipsește lista de poziții" @@ -2616,34 +2666,48 @@ 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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" msgstr "" -#: src/date.c:142 +#: src/date.c:138 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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" -#: src/date.c:147 +#: src/date.c:145 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 (UTC)\n" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" +msgstr "" + +#: src/date.c:149 +msgid "" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" +msgstr "" + +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" msgstr "" #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2651,7 +2715,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2659,7 +2723,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2667,14 +2731,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:177 +#: src/date.c:183 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 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2682,7 +2746,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:188 +#: src/date.c:194 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2695,7 +2759,7 @@ msgstr "" " %m lună (01..12)\n" " %M minut (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2706,7 +2770,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2718,7 +2782,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:209 +#: src/date.c:215 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" @@ -2726,7 +2790,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2734,7 +2798,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2746,7 +2810,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2757,7 +2821,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2766,7 +2830,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -2780,35 +2844,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "intrarea standard" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "dată nevalidă %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "multiple formate de ieșire specificate" -#: src/date.c:430 +#: src/date.c:436 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "" -#: src/date.c:437 +#: src/date.c:443 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" -#: src/date.c:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2816,23 +2880,23 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "nu se poate stabili data" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2841,7 +2905,7 @@ msgstr "" "Utilizare: %s [OPERAND]...\n" " sau: %s OPȚIUNE\n" -#: src/dd.c:532 +#: src/dd.c:561 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -2861,7 +2925,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:541 +#: src/dd.c:570 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -2870,11 +2934,13 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" -#: src/dd.c:552 +#: src/dd.c:583 #, fuzzy msgid "" "\n" @@ -2894,7 +2960,7 @@ msgstr "" "Fiecare simbol CONV poate fi:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -2920,7 +2986,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:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -2936,7 +3002,7 @@ msgstr "" " fdatasync physically write output file data before finishing\n" " fsync likewise, but also write metadata\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -2945,119 +3011,96 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio utilizează I/E concurentă pentru date\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct utilizează I/E directă pentru date\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr "" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow nu urma legăturile simbolice\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary utilizează I/E binară pentru date\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text utilizează I/E textuală pentru date\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 +#: src/dd.c:661 #, 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:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" - -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -"%+% înregistrări citite\n" -"%+% înregistrări scrise\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% înregistrare trunchiată\n" -msgstr[1] "% înregistrări trunchiate\n" -msgstr[2] "% de înregistrări trunchiate\n" -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" @@ -3065,7 +3108,7 @@ msgstr[0] "% octet (%s) copiat" msgstr[1] "% octeți (%s) copiați" msgstr[2] "% de octeți (%s) copiați" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "" @@ -3079,164 +3122,182 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% înregistrări citite\n" +"%+% înregistrări scrise\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% înregistrare trunchiată\n" +msgstr[1] "% înregistrări trunchiate\n" +msgstr[2] "% de înregistrări trunchiate\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "se închide fișierul de intrare %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "se închide fișierul de ieșire %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "se scrie în %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "operand %s necunoscut" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "conversie nevalidă" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "fanion de intrare nevalid" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "fanion de ieșire nevalid" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "fanion de stare nevalid" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "număr nevalid %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "block și unblock nu se pot combina" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "lcase și ucase nu se pot combina" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "excl și nocreat nu se pot combina" -#: src/dd.c:1424 +#: src/dd.c:1527 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "excl și nocreat nu se pot combina" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" " of mt_type=0x%0lx -- see for the list of types" msgstr "" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: nu se poate sări" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: nu se poate căuta" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "se stabilesc fanioane pentru %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: nu se poate sări la decalajul specificat" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync eșuat pentru %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "fsync eșuat pentru %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "eșec la deschiderea %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, fuzzy, c-format msgid "failed to discard cache for: %s" msgstr "nu s-a putut face chdir în %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3317,12 +3378,12 @@ msgstr "Capacitate" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 #, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" @@ -3334,18 +3395,18 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3354,20 +3415,30 @@ msgid "" "(default)\n" msgstr "" -#: src/df.c:1409 +#: src/df.c:1429 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" +msgstr "" + +#: src/df.c:1435 +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" + +#: src/df.c:1439 +msgid "" " -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:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3375,25 +3446,25 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, fuzzy, c-format msgid "options %s and %s are mutually exclusive" msgstr "opțiunile --backup și --no-clobber se exclud reciproc" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Atenție: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "tabelul sistemelor de fișiere montate nu poate fi citit" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "niciun sistem de fișiere prelucrat" @@ -3483,7 +3554,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3494,7 +3565,8 @@ msgstr "" #: src/du.c:285 #, fuzzy -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Sumarizează utilizarea discului de către fiecare FIȘIER, recursiv pentru " "dosare.\n" @@ -3581,62 +3653,56 @@ msgstr "" msgid "Infinity" msgstr "" -#: src/du.c:636 +#: src/du.c:657 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fts_read a eșuat" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "argument %s%s nevalid „%s”" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "" -#: src/du.c:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: eroare de citire" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "denumire fișier de lungime zero nevalidă" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "total" @@ -3759,9 +3825,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "\n" "Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n" @@ -3803,7 +3867,7 @@ msgid "input line is too long" msgstr "linie de intrare prea lungă" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -3911,12 +3975,12 @@ msgstr "" msgid "non-integer argument" msgstr "argument non-numeric" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "împărțire la zero" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "stabiliți LC_ALL='C' pentru a evita problema" @@ -3927,31 +3991,31 @@ msgid "the strings compared were %s and %s" msgstr "șirurile comparate au fost %s și %s" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s nu este un întreg pozitiv valid" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s este prea mare" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -3960,7 +4024,7 @@ msgstr "" "Utilizare: %s [NUMĂR]...\n" " sau: %s OPȚIUNE\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -3999,7 +4063,7 @@ msgid "" "The option -WIDTH is an abbreviated form of --width=DIGITS.\n" msgstr "" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4007,7 +4071,7 @@ msgid "" " -s, --split-only split long lines, but do not refill\n" msgstr "" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4016,34 +4080,34 @@ msgid "" " -g, --goal=WIDTH goal width (default of 93% of width)\n" msgstr "" -#: src/fmt.c:359 +#: src/fmt.c:356 #, 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" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "lățime nevalidă: %s" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +#, fuzzy +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" +"Tipărește fragmente alese de linie din fiecare FIȘIER pe ieșirea standard.\n" -#: src/fold.c:77 +#: src/fold.c:76 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" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "număr nevalid de coloane: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4110,14 +4174,13 @@ msgstr "nu se poate stabili data" msgid "%s: no such user" msgstr "%s: Nu există un asemenea utilizator" -#: src/head.c:109 +#: src/head.c:110 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 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4127,13 +4190,13 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:125 +#: src/head.c:126 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 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4141,48 +4204,36 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" msgstr "" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: numărul de octeți e prea mare" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: nu se poate căuta la decalajul %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "număr de linii" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "număr de octeți" +msgid "%s: number of bytes is too large" +msgstr "%s: numărul de octeți e prea mare" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "număr de linii nevalid" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "număr de octeți nevalid" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "opțiune finală nevalidă -- %c" @@ -4356,7 +4407,7 @@ msgstr "apartenența %s nu poate fi schimbată" msgid "cannot set time stamps for %s" msgstr "" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "" @@ -4472,7 +4523,7 @@ msgstr "" msgid "target directory not allowed when installing a directory" msgstr "" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "regim nevalid %s" @@ -4507,15 +4558,19 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +msgid "" "\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:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -4523,7 +4578,7 @@ msgid "" " -t CHAR use CHAR as input and output field separator\n" msgstr "" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -4535,11 +4590,11 @@ msgid "" " print them without trying to pair them\n" msgstr "" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -4558,47 +4613,47 @@ msgid "" "warning message will be given.\n" msgstr "" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "număr de cîmp nevalid: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "specificator de cîmp nevalid: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "ambele fișiere nu pot fi intrarea standard" @@ -4668,17 +4723,17 @@ msgstr "semnalul nu se poate combina cu -l sau -t" msgid "no process ID specified" msgstr "niciun identificator de proces specificat" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -4827,7 +4882,7 @@ msgstr "legătura simbolică %s nu poate fi creată" msgid "FIXME: unknown" msgstr "" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Utilizare: %s [OPȚIUNE]\n" @@ -4840,7 +4895,7 @@ msgstr "" "Tipărește numele utilizatorului curent.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "" @@ -4850,7 +4905,7 @@ msgstr "" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -4859,101 +4914,101 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "lățime linie nevalidă: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" -msgstr "" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" +msgstr "utilizator nevalid %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "" -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "Argumente valide sînt:" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "eroare la inițializarea șirurilor lunii" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "prefix necunoscut: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "valoarea pentru variabila de mediu LS_COLORS nu poate fi parcursă" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "dosarul %s nu poate fi deschis" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "dispozitivul și inodul pentru %s nu pot fi determinate" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: nu se face lista dosarului deja făcută" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "se citește dosarul %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "se închide dosarul %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "denumirile de fișier %s și %s nu se pot compara" -#: src/ls.c:4781 +#: src/ls.c:4775 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:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -4962,7 +5017,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -4976,18 +5031,19 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4798 msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -4997,11 +5053,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5010,7 +5066,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5018,7 +5074,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5031,7 +5087,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5043,7 +5099,7 @@ msgid "" " -k, --kibibytes default to 1024-byte blocks for disk usage\n" msgstr "" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5053,7 +5109,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5064,7 +5120,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -5076,7 +5132,7 @@ msgid "" "escape\n" msgstr "" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5084,21 +5140,21 @@ msgid "" "blocks\n" msgstr "" -#: src/ls.c:4886 +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -5112,31 +5168,32 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4908 +#: src/ls.c:4904 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:4912 +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4919 +#: src/ls.c:4915 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 security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5145,7 +5202,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5170,47 +5227,50 @@ msgid "David Madore" msgstr "David Madore" #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" +"Utilizare: %s [OPȚIUNE]... [FIȘIER]...\n" +" sau: %s [OPȚIUNE]... --files0-from=F\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 #, fuzzy msgid "" +"\n" " -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:178 +#: src/md5sum.c:180 #, fuzzy -msgid " -b, --binary read in binary mode\n" +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -t, --text citește în regim textual (implicit)\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 #, 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:192 +#: src/md5sum.c:195 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text citește în regim textual (implicit)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -5222,45 +5282,46 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "EȘUAT" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "OK" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" @@ -5268,7 +5329,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" @@ -5276,7 +5337,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" @@ -5284,38 +5345,38 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "" @@ -5348,22 +5409,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "eșec la stabilirea contextului implicit de creare a fișierelor la %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "păstrarea timpilor pentru %s a eșuat" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "creat dosarul %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -5535,7 +5596,7 @@ msgstr "prea multe șabloane" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, fuzzy, c-format msgid "invalid suffix %s, contains directory separator" msgstr "șablonul nevalid, %s, conține separator de dosare" @@ -5650,9 +5711,7 @@ msgstr "Scott Bartram" #: src/nl.c:179 #, fuzzy -msgid "" -"Write each FILE to standard output, with line numbers added.\n" -"With no FILE, or when FILE is -, read standard input.\n" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "\n" "Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n" @@ -5727,27 +5786,27 @@ msgstr "stil nevalid de numerotare corp: %s" msgid "invalid footer numbering style: %s" msgstr "stil nevalid de numerotare coloncifru: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "număr nevalid de linie inițială: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" -msgstr "" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" +msgstr "format nevalid de numerotare linii: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "număr nevalid de linii goale: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" -msgstr "" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" +msgstr "lățime de cîmp nevalidă: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "format nevalid de numerotare linii: %s" @@ -5771,7 +5830,7 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -5783,43 +5842,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "redirijarea ieșirii standard a eșuat" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "se ignoră intrarea" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "se ignoră intrarea și ieșirea se adaugă la %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "ieșirea se adaugă la %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "se ignoră intrarea și se redirecționează stderr spre stdout" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "stderr se redirijează spre stdout" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "" @@ -5841,96 +5900,93 @@ msgid "" " --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: număr de linii nevalid" - #. This is a proper name. See the gettext manual, section Names. -#: src/numfmt.c:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, fuzzy, c-format msgid "value too large to be converted: %s" msgstr "eșec la crearea contextului de securitate: %s" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "număr nevalid %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "lățime linie nevalidă: %s" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "%s: eșec la deschiderea pentru scriere" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "utilizator nevalid %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Utilizare: %s [OPȚIUNE]... [UTILIZATOR]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -5938,19 +5994,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -5960,40 +6016,40 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" msgstr "" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6002,7 +6058,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -6010,7 +6066,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -6018,7 +6074,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -6026,7 +6082,19 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -6035,9 +6103,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -6049,7 +6118,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -6064,118 +6133,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "lățime nevalidă a formatului" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "precizie nevalidă: %s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "lățime linie nevalidă: %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "număr de cîmp nevalid: %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "interval de pagini nevalid %s" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "număr de cîmp nevalid: %s" +msgid "multiple field specifications" +msgstr "multiple fișiere de ieșire specificate" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "dată nevalidă %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, fuzzy, c-format msgid "--grouping cannot be combined with --format" msgstr "semnalul nu se poate combina cu -l sau -t" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "niciun identificator de proces specificat" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, fuzzy, c-format msgid "grouping cannot be combined with --to" msgstr "semnalul nu se poate combina cu -l sau -t" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "eroare la citirea %s" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, fuzzy, c-format msgid "failed to convert some of the input numbers" msgstr "redirijarea ieșirii standard a eșuat" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6188,18 +6269,17 @@ msgstr "" " sau: %s --traditional [OPȚIUNE]... [FIȘIER] [[+]DECALAJ[.][b] [+]" "[ETICHETĂ][.][b]]\n" -#: src/od.c:326 +#: src/od.c:327 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:333 +#: src/od.c:335 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" @@ -6208,7 +6288,7 @@ msgid "" "suffixes may be . for octal and b for multiply by 512.\n" msgstr "" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -6217,7 +6297,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -6230,7 +6310,7 @@ msgid "" " --traditional accept arguments in third form above\n" msgstr "" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -6241,7 +6321,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6251,7 +6331,7 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -6260,7 +6340,7 @@ msgid "" " c printable character or backslash escape\n" msgstr "" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6269,7 +6349,7 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -6278,14 +6358,14 @@ msgid "" "for sizeof(double) or L for sizeof(long double).\n" msgstr "" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -6298,55 +6378,55 @@ msgid "" "and so on for G, T, P, E, Z, Y.\n" msgstr "" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte integral type" msgstr "" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte floating point type" msgstr "" -#: src/od.c:869 +#: src/od.c:872 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "caracter neportabil %s în denumirea de fișier %s" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "" -#: src/od.c:1650 +#: src/od.c:1658 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "regimul de compatibilitate susține cel mult un fișier" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "skip-bytes + read-bytes este prea mare" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "atenție: lățime nevalidă %lu; se utilizează %d în loc" @@ -6362,11 +6442,12 @@ msgid "standard input is closed" msgstr "intrarea standard este închisă" #: src/paste.c:439 +#, fuzzy msgid "" "Write lines consisting of the sequentially corresponding lines from\n" "each FILE, separated by TABs, to standard output.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" +"Tipărește fragmente alese de linie din fiecare FIȘIER pe ieșirea standard.\n" #: src/paste.c:447 msgid "" @@ -6497,12 +6578,12 @@ msgstr "Cînd" msgid "Where" msgstr "Unde" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Utilizare: %s [OPȚIUNE]... [UTILIZATOR]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -6512,7 +6593,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -6521,7 +6602,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -6529,96 +6610,96 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:597 +#: src/pinky.c:596 #, 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 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "interval de pagini nevalid %s" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "număr de linii nevalid: 0" -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "număr nevalid de linie inițială: %s" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "lățime linie nevalidă: %s" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "număr nevalid de coloane: %s" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "număr nevalid de coloane: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "" -#: src/pr.c:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "" -#: src/pr.c:1196 +#: src/pr.c:1166 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Pagina %" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -6628,7 +6709,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -6638,7 +6719,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -6650,7 +6731,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -6663,16 +6744,21 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2798 +#: src/pr.c:2769 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2775 +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -6682,7 +6768,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -6691,7 +6777,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -6702,17 +6788,22 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2828 +#: src/pr.c:2802 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -6726,7 +6817,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -6735,16 +6826,6 @@ msgid "" " with -S or -s\n" msgstr "" -#: src/pr.c:2853 -#, fuzzy -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -6873,15 +6954,20 @@ msgid "" "files.\n" msgstr "" -#: src/ptx.c:1830 +#: src/ptx.c:1831 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:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -6889,7 +6975,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -6899,7 +6985,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -6907,20 +6993,16 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "lățime linie nevalidă: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -6946,7 +7028,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "nu s-a putut face chdir în %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "nu s-a putut face stat %s" @@ -6966,8 +7048,8 @@ msgstr "se ignoră argumentele non-opțiune" msgid "Dmitry V. Levin" msgstr "Dmitrii V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Utilizare: %s [OPȚIUNE]... FIȘIER...\n" @@ -7159,16 +7241,16 @@ msgstr "" #: src/rm.c:342 #, fuzzy, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: eliminați toate argumentele recursiv? " msgstr[1] "%s: eliminați toate argumentele recursiv? " msgstr[2] "%s: eliminați toate argumentele recursiv? " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: eliminați toate argumentele? " msgstr[1] "%s: eliminați toate argumentele? " msgstr[2] "%s: eliminați toate argumentele? " @@ -7347,12 +7429,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -7368,7 +7450,16 @@ msgid "" "for even very expensive hardware probing to recover the data.\n" msgstr "" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7377,7 +7468,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -7386,11 +7477,9 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:192 +#: src/shred.c:196 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.\n" @@ -7402,7 +7491,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -7413,7 +7502,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7425,7 +7514,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7434,7 +7523,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -7446,134 +7535,134 @@ msgid "" "\n" msgstr "" -#: src/shred.c:241 +#: src/shred.c:243 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:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "" -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: fișier prea mare" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat eșuat" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: tip de fișier nevalid" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: fișierul are dimensiune nevalidă" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: eroare la trunchiere" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl eșuat" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: eliminare" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: redenumit în %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: eșec la eliminare" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: eliminat" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: eșec la închidere" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: eșec la deschiderea pentru scriere" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" -msgstr "" +#, fuzzy +msgid "invalid number of passes" +msgstr "număr de linii nevalid" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: dimensiune de fișier nevalidă" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -7581,11 +7670,11 @@ msgid "" " or: %s -i LO-HI [OPTION]...\n" msgstr "" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -7596,37 +7685,37 @@ msgid "" " -r, --repeat output lines can be repeated\n" msgstr "" -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "prea multe linii repetate" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" -msgstr "" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" +msgstr "fanion de intrare nevalid" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" -msgstr "" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" +msgstr "lățime linie nevalidă: %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "multiple fișiere de ieșire specificate" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -7645,12 +7734,12 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "" @@ -7661,7 +7750,7 @@ 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:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -7669,7 +7758,7 @@ msgstr "" "Opțiuni de ordonare:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -7677,19 +7766,19 @@ msgid "" " -f, --ignore-case fold lower case to upper case characters\n" msgstr "" -#: src/sort.c:443 +#: src/sort.c:444 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:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -7697,7 +7786,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -7707,19 +7796,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -7728,7 +7817,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -7737,13 +7826,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -7751,7 +7840,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -7766,7 +7855,7 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -7785,129 +7874,127 @@ msgid "" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -#: src/sort.c:524 +#: src/sort.c:525 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:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "deschidere eșuată" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "fflush eșuat" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "închidere eșuată" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "fișierul temporar nu a putut fi creat" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "stat eșuat" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "citire eșuată" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "transformarea șirului a eșuat" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "șirul transformat a fost %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -7915,352 +8002,358 @@ msgstr[0] "%s: opțiunea „%s” e ambiguă\n" msgstr[1] "%s: opțiunea „%s” e ambiguă\n" msgstr[2] "%s: opțiunea „%s” e ambiguă\n" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "scriere eșuată" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "" -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "eroarea standard" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "nu se poate stabili data" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "" -#: src/sort.c:4028 +#: src/sort.c:4027 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "opțiunile „-%s” sînt incompatibile" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "număr nevalid după „-”" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "număr nevalid după „.”" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "numărul cîmpului e zero" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "număr nevalid după „,”" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Utilizare: %s [OPȚIUNE]... [INTRARE [PREFIX]]\n" -#: src/split.c:207 +#: src/split.c:228 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "se creează fișierul %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, 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:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "eșec la eliminarea %s" -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" msgstr "se închide dosarul %s" -#: src/split.c:410 +#: src/split.c:464 #, fuzzy, c-format msgid "closing output pipe" msgstr "se închide fișierul de ieșire %s" -#: src/split.c:414 +#: src/split.c:468 #, fuzzy, c-format msgid "moving input pipe" msgstr "se închide fișierul de intrare %s" -#: src/split.c:416 +#: src/split.c:470 #, fuzzy, c-format msgid "closing input pipe" msgstr "se închide fișierul de intrare %s" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "eșec la rularea comenzii %s" -#: src/split.c:427 +#: src/split.c:481 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "eșec la închiderea dosarului %s" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: număr de secunde nevalid" -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: număr nevalid" -#: src/split.c:1169 +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" +msgstr "lățime linie nevalidă: %s" + +#: src/split.c:1333 #, c-format -msgid "%s: invalid suffix length" +msgid "empty record separator" msgstr "" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 -#, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: număr de octeți nevalid" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "fișier caracterial special" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: număr de linii nevalid" +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "fișier caracterial special" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "" -#: src/split.c:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "număr nevalid de linie inițială: %s" -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: dimensiune de fișier nevalidă" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "eșec la clonarea %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "%s: opțiune necunoscută „%c%s”\n" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: directivă nevalidă" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8271,7 +8364,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8279,30 +8372,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, fuzzy, c-format msgid "Context: %C\n" msgstr " context=%s" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8310,17 +8403,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8330,7 +8423,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -8342,7 +8435,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8352,7 +8445,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8365,7 +8458,7 @@ msgid "" " %T minor device type in hex, for character/block device special files\n" msgstr "" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8380,7 +8473,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8391,7 +8484,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -8446,8 +8539,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -8472,7 +8564,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -8480,96 +8572,149 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 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:535 +#: src/stty.c:543 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:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +msgid "" " 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 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:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" msgstr "" -#: src/stty.c:559 +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" + +#: src/stty.c:614 +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 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:578 +#: src/stty.c:632 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" +msgstr "" + +#: src/stty.c:637 +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:584 +#: src/stty.c:641 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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -8577,10 +8722,13 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -8588,135 +8736,249 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +msgid "" " [-]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:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:619 +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +msgid "" " [-]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:627 +#: src/stty.c:712 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:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]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:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +msgid "" " * 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr "" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:672 +#: src/stty.c:843 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" +msgstr "" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:875 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:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 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:707 +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -8725,25 +8987,27 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -8752,58 +9016,63 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: eroare la trunchiere" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" -msgstr "" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" +msgstr "argument non-numeric" #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 @@ -8811,25 +9080,67 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Tipărește suma de verificare CRC și numărul de octeți al fiecărui FIȘIER.\n" +"\n" + +#: src/sum.c:68 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 +#: src/sync.c:64 +#, fuzzy, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Utilizare: %s [OPȚIUNE]... [FIȘIER]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" +"\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" msgstr "" -#: src/sync.c:69 +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "eroare la citirea %s" + +#: src/sync.c:124 #, c-format -msgid "ignoring all arguments" -msgstr "se ignoră toate argumentele" +msgid "couldn't reset non-blocking mode %s" +msgstr "" -#: src/system.h:343 +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "eroare la citirea %s" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "" + +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -8838,15 +9149,23 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr "" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr "" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n" + +#: src/system.h:544 #, fuzzy msgid "" "\n" @@ -8855,7 +9174,7 @@ msgstr "" "Argumentele obligatorii pentru opțiuni lungi sînt obligatorii și pentru " "opțiunile scurte.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -8863,7 +9182,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -8872,7 +9191,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, fuzzy, c-format msgid "" "\n" @@ -8883,22 +9202,27 @@ msgstr "Pagina oficială %s: <%s>\n" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -#: src/system.h:591 +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "Încercați „%s --help” pentru informații suplimentare.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -8915,9 +9239,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "\n" "Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n" @@ -8929,66 +9251,65 @@ msgid "" " -s, --separator=STRING use STRING as the separator instead of newline\n" msgstr "" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "înregistrare prea mare" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "fișierul temporar nu a putut fi creat" -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: eșec la deschiderea pentru scriere" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "păstrarea timpilor pentru %s a eșuat" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: eroare de scriere" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "%s nu poate fi deschis pentru citire" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "separatorul nu poate fi gol" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 +#: src/tail.c:257 #, 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 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -8996,7 +9317,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -9009,14 +9330,14 @@ msgid "" " with inotify, this option is rarely useful\n" msgstr "" -#: src/tail.c:293 +#: src/tail.c:288 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 if it is inaccessible\n" msgstr "" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -9025,7 +9346,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -9036,7 +9357,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -9046,169 +9367,168 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "se închide %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s a devenit inaccesibil" -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" -#: src/tail.c:1006 +#: src/tail.c:999 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "" -#: src/tail.c:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s a devenit accesibil" -#: src/tail.c:1035 +#: src/tail.c:1032 #, c-format -msgid "%s has appeared; following end of new file" +msgid "%s has appeared; following new file" msgstr "" -#: src/tail.c:1046 +#: src/tail.c:1042 #, c-format -msgid "%s has been replaced; following end of new file" +msgid "%s has been replaced; following new file" msgstr "" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: fișier trunchiat" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "niciun fișier rămas" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, fuzzy, c-format msgid "inotify resources exhausted" msgstr "memorie epuizată" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "%s nu se poate urmări" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: înlocuiți %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "numărul din %s e prea mare" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +msgid "invalid maximum number of unchanged stats between opens" msgstr "" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: PID nevalid" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: număr de secunde nevalid" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "număr nevalid de coloane: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -9216,58 +9536,72 @@ msgid "" " -i, --ignore-interrupts ignore interrupt signals\n" msgstr "" -#: src/tee.c:71 +#: src/tee.c:93 +msgid "" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" +msgstr "" + +#: src/tee.c:98 msgid "" "\n" -"If a FILE is -, copy again to standard output.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "argument lipsă după %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "„)” așteptat" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "„)” așteptat, %s găsit" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: operator unar așteptat" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt nu acceptă -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef nu acceptă -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot nu acceptă -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "operator binar necunoscut" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: operator binar așteptat" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -9276,20 +9610,20 @@ msgid "" " or: [ OPTION\n" msgstr "" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" msgstr "" -#: src/test.c:717 +#: src/test.c:719 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 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -9298,7 +9632,7 @@ msgid "" " EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n" msgstr "" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -9308,7 +9642,7 @@ msgid "" " STRING1 != STRING2 the strings are not equal\n" msgstr "" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -9319,7 +9653,7 @@ msgid "" " INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n" msgstr "" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -9327,7 +9661,7 @@ msgid "" " FILE1 -ot FILE2 FILE1 is older than FILE2\n" msgstr "" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -9336,7 +9670,7 @@ msgid "" " -e FILE FILE exists\n" msgstr "" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -9345,7 +9679,7 @@ msgid "" " -k FILE FILE exists and has its sticky bit set\n" msgstr "" -#: src/test.c:766 +#: src/test.c:768 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" @@ -9354,7 +9688,7 @@ msgid "" " -s FILE FILE exists and has a size greater than zero\n" msgstr "" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -9363,7 +9697,7 @@ msgid "" " -x FILE FILE exists and execute (or search) permission is granted\n" msgstr "" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -9372,33 +9706,33 @@ msgid "" "INTEGER may also be -l STRING, which evaluates to the length of STRING.\n" msgstr "" -#: src/test.c:786 +#: src/test.c:788 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 +#: src/test.c:793 msgid "test and/or [" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 #, fuzzy msgid "missing ']'" msgstr "lipsește „]”" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "argument în plus %s" @@ -9418,7 +9752,7 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -9427,11 +9761,11 @@ msgstr "" "Utilizare: %s [OPȚIUNE] RĂDĂCINĂNOUĂ [COMANDĂ [ARG]...]\n" " sau: %s OPȚIUNE\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -9449,7 +9783,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -9457,7 +9791,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -9468,7 +9802,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -9483,6 +9817,11 @@ msgstr "" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -9760,12 +10099,12 @@ msgstr "" msgid "Exit with a status code indicating failure." msgstr "" -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Utilizare: %s OPȚIUNE... FIȘIER...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -9776,22 +10115,22 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create nu crea niciun fișier\n" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -9799,57 +10138,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "apartenența %s nu poate fi schimbată" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "număr nevalid %s" + +#: src/truncate.c:307 #, 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:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "%s nu se poate deschide pentru scriere" @@ -9864,16 +10208,19 @@ msgstr "Mark Kettenis" 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:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "" @@ -9924,9 +10271,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "\n" "Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n" @@ -9970,8 +10315,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -9982,7 +10327,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -10120,11 +10465,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -10140,12 +10480,16 @@ msgid "" "\n" msgstr "" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +msgid "" +"\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" @@ -10153,12 +10497,12 @@ msgid "" " -l, --lines print the newline counts\n" msgstr "" -#: src/wc.c:128 +#: src/wc.c:134 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" @@ -10293,10 +10637,10 @@ msgid "" "\n" msgstr "" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "numele nu poate fi stabilit la %s" #: src/yes.c:41 #, c-format @@ -10311,6 +10655,60 @@ msgid "" "\n" msgstr "" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Fără FIȘIER, sau cînd FIȘIER e -, citește intrarea standard.\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "se ignoră toate argumentele" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: număr nevalid" + +#~ 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" + +#~ msgid "number of lines" +#~ msgstr "număr de linii" + +#~ msgid "number of bytes" +#~ msgstr "număr de octeți" + +#, fuzzy +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: număr de linii nevalid" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: număr de octeți nevalid" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: număr de linii nevalid" + +#~ msgid "number in %s is too large" +#~ msgstr "numărul din %s e prea mare" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: număr de secunde nevalid" + +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "eșec la stabilirea ID-grup" + #~ msgid "%s" #~ msgstr "%s" diff --git a/po/ru.gmo b/po/ru.gmo index fb8a9ac6..8adc3329 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index e997e245..02db49c7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,11 +7,12 @@ # Oleg Tihonov , 1999-2007. # Yuri Kozlov , 2009, 2010, 2011, 2012, 2013, 2014. # Pavel Maryanov , 2011. +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils 8.23-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2014-07-18 20:18+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -41,18 +42,18 @@ msgstr "Допустимые аргументы:" msgid "error closing file" msgstr "ошибка закрытия файла" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "ошибка записи" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "сохранение прав доступа для %s" @@ -233,57 +234,62 @@ msgstr "Неправильно закодирована строка парам msgid "Unknown error" msgstr "Неизвестная ошибка" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: двусмысленный параметр «%s»; возможные варианты:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: двусмысленный ключ -W %s\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: ключ --%s должен использоваться без аргумента\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: ключ %c%s должен использоваться без аргумента\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: ключ --%s должен использоваться с аргументом\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: ключ --%s не распознан\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: ключ %c%s не распознан\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: неверный ключ -- %c\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: ключ должен использоваться с аргументом -- %c\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: двусмысленный ключ -W %s\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: ключ -W %s должен использоваться без аргумента\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: ключ -W %s должен использоваться с аргументом\n" @@ -293,13 +299,13 @@ msgstr "%s: ключ -W %s должен использоваться с аргу msgid "cannot change permissions of %s" msgstr "невозможно изменить права доступа %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "невозможно создать каталог %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "память исчерпана" @@ -348,6 +354,12 @@ msgstr "»" msgid "%s: end of file" msgstr "%s: конец файла" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: ошибка чтения" + #: lib/regcomp.c:131 msgid "Success" msgstr "Успех" @@ -456,7 +468,7 @@ msgstr "^[ДдYy]" msgid "^[nN]" msgstr "^[НнNn]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "установка прав доступа для %s" @@ -891,7 +903,7 @@ msgstr "" "Кодирует или декодирует ФАЙЛ или стандартный ввод на стандартный\n" "вывод в/из base64.\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -908,15 +920,7 @@ msgstr "" " выключить перенос.\n" "\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -930,51 +934,51 @@ msgstr "" "формального алфавита base64. Используйте ключ --ignore-garbage, чтобы\n" "попытаться проигнорировать неалфавитные символы в закодированном потоке.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "ошибка чтения" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "неверный ввод" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "неверный размер переноса: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "лишний операнд %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, 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:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "Дэвид Маккензи (David MacKenzie)" @@ -1025,38 +1029,43 @@ msgstr "" " %s -a any/str1 any/str2 -> за «str1» выведется «str2»\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "пропущен операнд" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Торбьёрн Гронлунд (Torbjorn Granlund)" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Ричард М. Столлман (Richard M. Stallman)" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Использование: %s [КЛЮЧ]… [ФАЙЛ]…\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "Печатает сортированное слияние всех ФАЙЛ(ов) на стандартный вывод.\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1075,7 +1084,7 @@ msgstr "" " -s, --squeeze-blank выводить не более одной пустой строки при " "повторе\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1088,7 +1097,7 @@ msgstr "" " -v, --show-nonprinting использовать запись с ^ и M-, за исключением\n" " символов перевода строки и табуляции\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1101,17 +1110,18 @@ msgstr "" " %s f - g Выводит содержимое f, потом стандартный ввод, потом g.\n" " %s Копирует стандартный ввод на стандартный вывод.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "невозможно выполнить ioctl для %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "стандартный вывод" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: ввод и вывод в один файл" @@ -1123,10 +1133,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Джим Мейеринг (Jim Meyering)" @@ -1140,8 +1150,8 @@ msgstr "не удалось создать контекст безопаснос msgid "failed to set %s security context component to %s" msgstr "не удалось установить компонент контекста безопасности %s равным %s" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "не удалось получить контекст безопасности %s" @@ -1156,13 +1166,13 @@ msgstr "не удалось применить частичный контекс msgid "failed to change context of %s to %s" msgstr "не удалось изменить контекст безопасности %s на %s" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "невозможно получить доступ к %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "невозможно прочитать каталог %s" @@ -1178,7 +1188,7 @@ msgstr "изменение контекста безопасности для %s msgid "fts_read failed" msgstr "операция fts_read завершилась неудачно" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1296,7 +1306,7 @@ msgid "-R -h requires -P" msgstr "-R -h требуют -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1313,9 +1323,8 @@ msgid "conflicting security context specifiers given" msgstr "конфликт указанных параметров контекста безопасности" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "ошибка получения атрибутов %s" @@ -1628,17 +1637,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Роланд МакГрат (Roland McGrath)" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "неверная группа %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "неверный список групп %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1647,7 +1656,7 @@ msgstr "" "Использование: %s [КЛЮЧ] НОВЫЙКОРЕНЬ [КОМАНДА [АРГ]…]\n" " или: %s КЛЮЧ\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1655,16 +1664,28 @@ msgstr "" "Выполняет КОМАНДУ с указанным корневым каталогом.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" msgstr "" " --userspec=ПОЛЬЗ:ГРУППА задать пользователя и группу (ID или именем)\n" " --groups=G_LIST задать вспомогательные группы как гр1, гр2, .., " "грN\n" -#: src/chroot.c:203 +#: src/chroot.c:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" +" --userspec=ПОЛЬЗ:ГРУППА задать пользователя и группу (ID или именем)\n" +" --groups=G_LIST задать вспомогательные группы как гр1, гр2, .., " +"грN\n" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" @@ -1673,42 +1694,47 @@ msgstr "" "Если команда не задана, выполняет «${SHELL} -i» (по умолчанию: «/bin/sh -" "i»).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "не удалось сменить корневой каталог на %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "не удалось перейти в корневой каталог" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "для неизвестного uid не указана группа: %d" -#: src/chroot.c:383 +#: src/chroot.c:400 #, c-format msgid "failed to get supplemental groups" msgstr "не удалось получить дополнительную группу(ы)" -#: src/chroot.c:395 -#, c-format -msgid "failed to %s supplemental groups" -msgstr "не удалось %s дополнительную группу(ы)" +#: src/chroot.c:412 +#, fuzzy, c-format +msgid "failed to set supplemental groups" +msgstr "не удалось получить дополнительную группу(ы)" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "не удалось установить group-ID" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "не удалось установить user-ID" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "не удалось выполнить команду %s" @@ -1749,7 +1775,16 @@ msgstr "Использование: %s [КЛЮЧ]… ФАЙЛ1 ФАЙЛ2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Сравнивает сортированные файлы ФАЙЛ1 и ФАЙЛ2 построчно.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1761,7 +1796,7 @@ msgstr "" "содержит строки, уникальные для ФАЙЛА1, второй -- уникальные для\n" "ФАЙЛА2, а третий -- общие для обоих файлов строки.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1776,7 +1811,7 @@ msgstr "" " -3 не показывать столбец 3 (строки, встреченные\n" " в обоих файлах)\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1788,11 +1823,11 @@ msgstr "" " если все входные строки имеют пару\n" " --nocheck-order не проверять правильность сортировки ввода\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=РАЗ отделять столбцы с помощью РАЗделителя\n" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" @@ -1800,7 +1835,7 @@ msgstr "" "\n" "Заметим, что при сравнении действуют правила, задаваемые «LC_COLLATE».\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1814,315 +1849,329 @@ msgstr "" " %s -3 файл1 файл2 вывести строки файла1, которых нет в файле2 и " "наоборот.\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "данные файла %d не отсортированы" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "указано несколько разделителей" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "пустое значение %s не разрешено" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "невозможно выполнить lseek для %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "ошибка чтения %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "невозможно выполнить lseek для %s" +msgid "error reading %s" +msgstr "ошибка чтения %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "ошибка записи %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "ошибка чтения %s" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s: не удалось получить информацию об экстентах" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: запись завершилась неудачно" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "не удалось расширить %s" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "очистка прав доступа для %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "не удалось сохранить владельца %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "не удалось найти файл %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "не удалось сохранить автора %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "не удалось установить контекст создания файла по умолчанию в %s" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "не удалось установить контекст создания файла по умолчанию для %s" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "не удалось установить контекст безопасности у %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "невозможно открыть %s для чтения" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "невозможно выполнить fstat для %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "пропускается файл %s, так как он был заменён во время копирования" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "невозможно удалить %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "удалён %s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "запись через повисшую ссылку %s не выполняется" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "невозможно создать обычный файл %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "не удалось выполнить клонирование %s из %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "сохранение временной отметки %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "не удалось закрыть %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: заместить %s, несмотря на права доступа %04lo (%s)? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" "%s: недоступен для записи %s (права %04lo, %s); попробовать всё равно? " -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: переписать %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (резервная копия: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "не удалось восстановить контекст создания файла по умолчанию" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "невозможно создать жёсткую ссылку %s на %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "не удалось выполнить stat для %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "пропускается каталог %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "предупреждение: файл-источник %s указан более одного раза" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s и %s - один и тот же файл" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "" "невозможно перезаписать поверх файла %s, не являющегося каталогом, каталог %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "только что созданный файл %s не будет переписан в %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "невозможно перезаписать каталог %s файлом, не являющимся каталогом" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "" "невозможно переименовать каталог в файл, не являющийся каталогом: %s -> %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "сохранение запасной копии %s уничтожит оригинал; %s не перенесён" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "сохранение запасной копии %s уничтожит оригинал; %s не скопирован" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "невозможно создать резервную копию для %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "копирование %s через только что созданную %s не выполняется" -#: src/copy.c:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "невозможно скопировать каталог %s в самого себя, %s" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "предупреждение: файл-источник %s указан более одного раза" + +#: src/copy.c:2294 #, c-format msgid "will not create hard link %s to directory %s" msgstr "жёсткая ссылка %s на каталог %s не будет создана" -#: src/copy.c:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "невозможно перенести %s в свой собственный подкаталог, %s" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "невозможно переместить %s в %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "не удалось перемещение с устройства %s на устройство %s: невозможно удалить " "назначение" -#: src/copy.c:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "невозможно скопировать циклическую символьную ссылку %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: относительные символьные ссылки можно создавать только в текущем каталоге" -#: src/copy.c:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "невозможно создать символьную ссылку %s на %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "невозможно создать очередь %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "невозможно создать специальный файл %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "невозможно считать символьную ссылку %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "невозможно создать символьную ссылку %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "неизвестный тип файла %s" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "невозможно восстановить %s из резервной копии" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (восстановление)\n" @@ -2132,12 +2181,12 @@ msgstr "%s -> %s (восстановление)\n" msgid "Alex Deymo" msgstr "Alex Deymo" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "Использование: %s --coreutils-prog=ИМЯ_ПРОГРАММЫ [ПАРАМЕТРЫ]… \n" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" @@ -2145,7 +2194,7 @@ msgstr "" "Выполняет встроенную программу ИМЯ_ПРОГРАММЫ с заданными ПАРАМЕТРАМИ.\n" "\n" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" @@ -2155,7 +2204,7 @@ msgstr "" "Использование: «%s --coreutils-prog=ИМЯ_ПРОГРАММЫ --help» для показа справки " "по нужной программе.\n" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, c-format msgid "unknown program %s" msgstr "неизвестная программа %s" @@ -2432,8 +2481,8 @@ msgstr "%s существует, но не является каталогом" msgid "failed to access %s" msgstr "не удалось получить доступ к %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "пропущен операнд, задающий файл" @@ -2509,131 +2558,131 @@ msgstr "" "невозможно сохранить расширенные атрибуты; cp собрана без поддержки xattr" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Стюарт Кемп (Stuart Kemp)" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "ввод стал недоступен" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: номер строки вне допустимых пределов" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: номер строки вне допустимых пределов" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " при повторе %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: совпадение не найдено" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "ошибка поиска регулярного выражения" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "ошибка записи для %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: после разделителя ожидается целое число" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: при задании числа повторов необходима «}»" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: между «{» и «}» должно быть целое число" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: пропущен закрывающий разделитель «%c»" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: недопустимое регулярное выражение: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: недопустимый образец" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: номер строки должен быть больше нуля" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "номер строки %s меньше номера предыдущей строки, %s" -#: src/csplit.c:1200 +#: src/csplit.c:1201 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "предупреждение: номер строки %s равен предыдущему номеру строки" -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "пропущен описатель преобразования в суффиксе" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "неверный описатель преобразования в суффиксе: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "неверный описатель преобразования в суффиксе: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "некорректные флаги в спецификации преобразования: %%%c%c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "слишком много описаний преобразования (%%) в суффиксе" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "пропущено описание преобразования (%%) в суффиксе" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: недопустимое число" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "неверный номер %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Использование: %s [КЛЮЧ]… ФАЙЛ ОБРАЗЕЦ…\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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" @@ -2641,7 +2690,17 @@ msgstr "" "Выводит части ФАЙЛА, разделённые ОБРАЗЦОМ (ОБРАЗЦАМИ), в файлы «xx00»,\n" "«xx01», … и печатает число байт в каждой части на стандартный вывод.\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Если ФАЙЛ задан как -, читает стандартный ввод. ОБРАЗЕЦ задается следующим\n" +"образом:\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2652,12 +2711,12 @@ msgstr "" " -f, --prefix=ПРЕФИКС использовать ПРЕФИКС вместо «xx»\n" " -k, --keep-files не удалять выходные файлы при ошибке\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" " -m, --suppress-matched не обрабатывать строки, совпадающие с ШАБЛОНОМ\n" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2667,18 +2726,11 @@ msgstr "" " -s, --quiet, --silent не печатать размеры выходных файлов\n" " -z, --elide-empty-files удалять пустые выходные файлы\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Если ФАЙЛ задан как -, читает стандартный ввод. ОБРАЗЕЦ задается следующим\n" -"образом:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 +#, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2715,7 +2767,7 @@ msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" "Печатает выбранные части строк из каждого ФАЙЛА на стандартный вывод.\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2727,7 +2779,7 @@ msgstr "" "РАЗДЕЛИТЕЛЬ\n" " вместо табуляции\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2741,7 +2793,7 @@ msgstr "" " только не задан ключ -s\n" " -n (игнорируется)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2750,7 +2802,7 @@ msgstr "" "символов\n" " или полей\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2764,7 +2816,7 @@ msgstr "" "разделитель\n" " для ввода\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2777,7 +2829,8 @@ msgstr "" "Выбранные части входного файла печатаются в том порядке, в котором они\n" "появляются на входе, и печатаются ровно один раз.\n" -#: src/cut.c:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2785,8 +2838,6 @@ msgid "" " 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 "" "Диапазоны задаются следующим образом:\n" "\n" @@ -2797,51 +2848,52 @@ msgstr "" "\n" "Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "неправильный байт, символ или список полей" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "поля и позиции нумеруются с 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "неверный диапазон без окончания: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "неверный уменьшающийся диапазон" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "байтовое смещение %s слишком велико" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "номер поля %s слишком велик" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "можно задать только один тип списка" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "разделитель должен быть одним символом" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "вы должны задать список байт, символов или полей" -#: src/cut.c:790 +#: src/cut.c:789 msgid "an input delimiter may be specified only when operating on fields" msgstr "" "разделитель для входных данных можно задавать только при обработке полей" -#: src/cut.c:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2849,11 +2901,11 @@ msgstr "" "запрещение вывода строк, не содержащих разделителей,\n" "имеет смысл только при работе с полями" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "отсутствует список полей" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "отсутствует список позиций" @@ -2872,13 +2924,28 @@ msgstr "" "Выводит текущее время в заданном ФОРМАТЕ, или изменяет время в системе.\n" #: src/date.c:134 +#, fuzzy +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" +"Выводит текущее время в заданном ФОРМАТЕ, или устанавливает системное " +"время.\n" +"\n" +" -d, --date=СТРОКА показать не текущее время, а время, описанное\n" +" заданной СТРОКОЙ\n" +" -f, --file=ФАЙЛ соответствует применению --date для каждой\n" +" строки ФАЙЛА\n" + +#: src/date.c:138 +#, fuzzy msgid "" -" -d, --date=STRING display time described by STRING, not 'now'\n" -" -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -" -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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" " -d, --date=СТРОКА показать не текущее время, а время, описанное\n" " заданной СТРОКОЙ\n" @@ -2891,25 +2958,24 @@ msgstr "" " или «ns» для получения даты и времени\n" " с нужной точностью.\n" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=ФАЙЛ показать время последнего изменения ФАЙЛА\n" " -R, --rfc-2822 выводить время в соответствии с RFC-2822\n" " Пример: Mon, 07 Aug 2006 12:34:56 -0600\n" -#: src/date.c:147 +#: src/date.c:149 +#, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=СПЕЦ вывести дату/время в формате RFC 3339\n" " СПЕЦ=«date», «seconds» или «ns» для получения\n" @@ -2920,8 +2986,19 @@ msgstr "" " -u, --utc, --universal показать или установить универсальное\n" " координированное время (UTC)\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2934,7 +3011,7 @@ msgstr "" " %% знак %\n" " %a сокращённое название дня недели (напр., вск) согласно локали\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2946,7 +3023,7 @@ msgstr "" " %B полное название месяца (напр., январь) согласно локали\n" " %c время и дата (напр., Чтв 3 Мар 23:05:25 2005) согласно локали\n" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2958,7 +3035,7 @@ msgstr "" " %D дата; аналогично %m/%d/%y\n" " %e день месяца, дополненный пробелами; аналогично %_d\n" -#: src/date.c:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2969,7 +3046,7 @@ msgstr "" " %G год для номера недели ISO (см. %V); обычно бывает полезно только с " "%V\n" -#: src/date.c:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2981,7 +3058,7 @@ msgstr "" " %I час (01..12)\n" " %j номер дня в году (001..366)\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2993,7 +3070,7 @@ msgstr "" " %m месяц (01..12)\n" " %M минуты (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -3011,7 +3088,7 @@ msgstr "" " %R часы и минуты согласно локали, 24-часовой формат; аналог %H:%M\n" " %s число секунд, истёкших с 1970-01-01 00:00:00 UTC\n" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3023,7 +3100,7 @@ msgstr "" " %T время, аналог %H:%M:%S\n" " %u день недели (1..7); 1 обозначает понедельник\n" -#: src/date.c:209 +#: src/date.c:215 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" @@ -3035,7 +3112,7 @@ msgstr "" " %w день недели (0..6), 0 означает воскресенье\n" " %W номер недели в году, если первый день недели -- понедельник (00..53)\n" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3047,7 +3124,7 @@ msgstr "" " %y последние две цифры года (00..99)\n" " %Y год\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3067,7 +3144,7 @@ msgstr "" "\n" "По умолчанию date дополняет числовые поля нулями.\n" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3085,7 +3162,7 @@ msgstr "" " ^ использовать верхний регистр, если возможно\n" " # использовать противоположный регистр, если возможно\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3101,7 +3178,7 @@ msgstr "" "локали\n" "O -- если возможно, использовать альтернативные числовые символы локали.\n" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3125,36 +3202,36 @@ msgstr "" "Показать местное время 09:00 следующей пятницы на западном побережье США\n" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "стандартный ввод" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "неверная дата %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "задано несколько выходных форматов" -#: src/date.c:430 +#: src/date.c:436 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "ключи для вывода даты взаимно исключают друг друга" -#: src/date.c:437 +#: src/date.c:443 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" "ключи для установки и для отображения времени не могут применяться вместе" -#: src/date.c:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3166,23 +3243,23 @@ msgstr "" "строкой\n" "формата, начинающейся знаком «+»" -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "невозможно установить дату" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Поль Рубин (Paul Rubin)" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3191,7 +3268,7 @@ msgstr "" "Использование: %s [ОПЕРАНД]…\n" " или: %s ПАРАМЕТР\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3210,7 +3287,8 @@ msgstr "" " count=ЧИСЛО копировать только заданное ЧИСЛО входных блоков\n" " ibs=ЧИСЛО считывать до ЧИСЛА байт за раз (по умолчанию 512)\n" -#: src/dd.c:541 +#: src/dd.c:570 +#, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3219,8 +3297,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=ФАЙЛ читать ФАЙЛ, а не стандартный ввод\n" " iflag=ФЛАГИ читать в соответствии со списком символов,\n" @@ -3237,7 +3317,7 @@ msgstr "" " «noxfer» — не выводить статистику передачи\n" " «none» — не выводить ничего\n" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3255,7 +3335,7 @@ msgstr "" "Каждый символ СПИСКА может быть:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3285,7 +3365,7 @@ msgstr "" " sync дополнять каждый входной блок NUL-ми до размера ibs; при\n" " использовании с block или unblock, дополнять пробелам, а не NUL\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3301,7 +3381,7 @@ msgstr "" " fdatasync физически записать выходной файл перед завершением\n" " fsync аналогично, но записать также метаданные\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3315,132 +3395,96 @@ msgstr "" " append режим добавления (имеет смысл для вывода; рекомендуется " "conv=notrunc)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio использовать конкурентный ввод/вывод для данных\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct использовать прямой ввод/вывод для данных\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory выдавать ошибку, если это не каталог\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync использовать синхронизированный ввод/вывод для данных\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync то же, но так же и для метаданных\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock накапливать полные блоки входных данных (только iflag)\n" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock использовать неблокирующий ввод/вывод\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime не обновлять время последнего доступа\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nocache отвергать кэшированные данные\n" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty не назначать управляющий терминал из файла\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow не следовать по символьным ссылкам\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks выдавать ошибку, если найдено несколько ссылок\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary использовать бинарный ввод/вывод для данных\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text использовать текстовый ввод/вывод для данных\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr " count_bytes считать «count=N» как счётчик байт (только с iflag)\n" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr " skip_bytes считать «skip=N» как счётчик байт (только с iflag)\n" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr " seek_bytes считать «seek=N» как счётчик байт (только с oflag)\n" -#: src/dd.c:631 +#: src/dd.c:661 #, 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 "" -"\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" -" 9387674624 байта (9.4 GB) скопировано, 34.6279 секунды, 271 MB/s\n" -"\n" -"Ключи:\n" -"\n" -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +#: src/dd.c:699 +#, fuzzy, c-format +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "исчерпана память буфером ввода размера %zu байт (%s)" -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +#: src/dd.c:721 +#, fuzzy, c-format +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "исчерпана память буфером вывода размера %zu байт (%s)" -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" -"%+% записей получено\n" -"%+% записей отправлено\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% усечённая запись\n" -msgstr[1] "% усечённые записи\n" -msgstr[2] "% усечённых записей\n" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" @@ -3448,7 +3492,7 @@ msgstr[0] " скопирован % байт (%s)" msgstr[1] " скопировано % байта (%s)" msgstr[2] " скопировано % байт (%s)" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "Бесконечность" @@ -3462,83 +3506,101 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g c, %s/c\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g c, %s/c\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% записей получено\n" +"%+% записей отправлено\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% усечённая запись\n" +msgstr[1] "% усечённые записи\n" +msgstr[2] "% усечённых записей\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "закрытие входного файла %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "закрытие выходного файла %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "не удалось выключить O_DIRECT: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "запись в %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "операнд %s не распознан" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "недопустимое преобразование" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "недопустимый флаг ввода" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "недопустимый флаг вывода" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "недопустимый флаг состояния" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "неверный номер %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "нельзя сочетать любые два из {ascii,ebcdic,ibm}" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "нельзя совмещать block и unblock" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "нельзя совмещать lcase и ucase" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "нельзя совмещать excl и nocreat" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "нельзя совмещать direct и nocache" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3547,62 +3609,62 @@ msgstr "" "предупреждение: обходим ошибку lseek в ядре для файла (%s)\n" " mt_type=0x%0lx -- см. для списка типов" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: невозможно пропустить" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: невозможно сместиться" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "переполнение сдвига при чтении файла %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "предупреждение: смещение файла стало неверным после ошибки чтения" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "невозможно обойти ошибку ядра" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "установка флагов для %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: невозможно пропустить до заданного смещения" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "не удалось выполнить отсечение на % байт в выходном файле %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "операция fdatasync для %s завершилась неудачно" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "операция fsync для %s завершилась неудачно" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "не удалось открыть %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3611,19 +3673,19 @@ msgstr "" "смещение слишком велико: невозможно обрезать до величины seek=% " "(%lu-байтных) блоков" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "не удалось выполнить отсечение на % байт в выходном файле %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "сбой при отбрасывании данных кэша для: %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Поль Эггерт (Paul Eggert)" @@ -3704,12 +3766,12 @@ msgstr "Вместимость" msgid "%s-%s" msgstr "%s-%s" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "невозможно получить доступ к %s: перемонтировано другим устройством" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3719,13 +3781,14 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 +#, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3739,7 +3802,7 @@ msgstr "" " -H, --si то же, но использовать степень 1000 (например, " "1.1Г)\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3755,13 +3818,40 @@ msgstr "" " --no-sync не вызывать sync перед получением информации об\n" " использовании блоков (по умолчанию)\n" -#: src/df.c:1409 +#: src/df.c:1429 +#, 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" +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" +" -x, --exclude-type=ТИП исключить файловые системы указанного ТИПА\n" +" -v (игнорируется)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose печатать диагностику перед открытием\n" +" очередного выходного файла\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3780,7 +3870,7 @@ msgstr "" " -x, --exclude-type=ТИП исключить файловые системы указанного ТИПА\n" " -v (игнорируется)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3794,25 +3884,25 @@ msgstr "" "«size», «used», «avail», «pcent», «file» и «target» (см. также страницу " "info).\n" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "ключи %s и %s взаимно исключают друг друга" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "файловая система типа %s и выбрана, и исключена" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Предупреждение: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "не удалось прочитать таблицу смонтированных файловых систем" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "не обработано ни одной файловой системы" @@ -3928,7 +4018,7 @@ msgstr "" " %s dir1/str dir2/str -> за «dir1» выводится «dir2»\n" " %s stdio.h -> «.»\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3938,7 +4028,9 @@ msgstr "" " или: %s [КЛЮЧ]… --files0-from=Ф\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +#, fuzzy +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Суммирует использование дискового пространства каждого ФАЙЛА, с каталогами.\n" @@ -4080,63 +4172,57 @@ msgstr "" msgid "Infinity" msgstr "Бесконечность" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "операция fts_read завершилась с ошибкой: %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "недопустимая максимальная глубина %s" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "недопустимый для --threshold аргумент «-0»" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "невозможно одновременно подводить итог и показывать все элементы" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "предупреждение: подведение итога это то же самое, что и --max-depth=0" -#: src/du.c:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "предупреждение: подведение итога конфликтует с --max-depth=%lu" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" "предупреждение: ключи --apparent-size и -b не работают вместе с --inodes" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "операнды-файлы нельзя сочетать с --files0-from" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: ошибка чтения" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" "при чтении имён файлов со стандартного ввода, имя файла %s не допускается" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "неверное имя файла нулевой длины" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "итого" @@ -4282,9 +4368,8 @@ msgid "cannot specify --null (-0) with command" msgstr "невозможно указание --null (-0) с командой" #: 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" +#, fuzzy +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "Преобразует символы табуляции в каждом ФАЙЛЕ в пробелы и печатает на " "стандартный\n" @@ -4333,7 +4418,7 @@ msgid "input line is too long" msgstr "входная строка слишком велика" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Майк Паркер (Mike Parker)" @@ -4487,12 +4572,12 @@ msgstr "ошибка в сопоставителе регулярных выра msgid "non-integer argument" msgstr "нецелочисленный аргумент" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "деление на ноль" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "чтобы обойти эту проблему, установите LC_ALL='C'" @@ -4503,31 +4588,31 @@ msgid "the strings compared were %s and %s" msgstr "сравнивались строки %s %s" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "Нильс Меллер (Niels Moller)" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "Не пройден основной тест Лукаса. Этого не должно случиться" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "переполнение очереди squfof" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s не является допустимым целым положительным числом" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s слишком велик" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4536,7 +4621,7 @@ msgstr "" "Использование: %s [ЧИСЛО]…\n" " или: %s КЛЮЧ\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -4580,7 +4665,7 @@ msgstr "" "Переформатирует каждый абзац в ФАЙЛЕ(ах) и печатает на стандартный вывод.\n" "Ключ -ЦИФРЫ -- сокращённая форма --width=ЦИФРЫ.\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4592,7 +4677,7 @@ msgstr "" " СТРОКИ, сохраняя при этом префикс строк\n" " -s, --split-only разбивать длинные строки, но не заполнять\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4607,7 +4692,7 @@ msgstr "" " -g, --goal=ЧИСЛО ширина задаваемого показателя (goal,\n" " по умолчанию 93% ширины)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4616,21 +4701,20 @@ msgstr "" "неверный ключ -- %c; -ЦИФРЫ распознается, только если это первый\n" "аргумент, в противном случае пишите -w N" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "недопустимая ширина: %s" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +#, fuzzy +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "Разбивает строки в ФАЙЛЕ(ах) (по умолчанию читает стандартный ввод) и " "печатает\n" "на стандартный вывод.\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4640,9 +4724,9 @@ msgstr "" " -s, --spaces разбивать только на пробелах\n" " -w, --width=ЧИСЛО использовать указанное ЧИСЛО столбцов, а не 80\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "неверное число столбцов: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4715,17 +4799,17 @@ msgstr "невозможно получить реальный GID" msgid "%s: no such user" msgstr "%s: такого пользователя нет" -#: src/head.c:109 +#: src/head.c:110 +#, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Печатает первые 10 строк каждого ФАЙЛА на стандартный вывод.\n" "Если задано несколько ФАЙЛОВ, сначала печатает заголовок с именем файла.\n" "Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4742,7 +4826,7 @@ msgstr "" " если перед K стоит «-», напечатать все, кроме K\n" " последних строк каждого файла\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4750,7 +4834,7 @@ msgstr "" " -q, --quiet, --silent не печатать заголовки с именами файлов\n" " -v, --verbose всегда печатать заголовки с именами файлов\n" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4762,48 +4846,36 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: файл слишком сократился" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: число байт слишком велико" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: невозможно сместиться к позиции %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: невозможно переместить указатель позиции на %s" -#: src/head.c:886 +#: src/head.c:267 #, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "%s: %s настолько велико, что его невозможно машинно представить" - -#: src/head.c:887 -msgid "number of lines" -msgstr "число строк" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "число байт" +msgid "%s: number of bytes is too large" +msgstr "%s: число байт слишком велико" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "неверное число строк" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "неверный число байт" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "неверный завершающий ключ -- %c" @@ -4996,7 +5068,7 @@ msgstr "невозможно изменить владельца %s" msgid "cannot set time stamps for %s" msgstr "невозможно установить временные отметки для %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "системный вызов fork завершился неудачно" @@ -5163,7 +5235,7 @@ msgstr "при установке каталога нельзя применят msgid "target directory not allowed when installing a directory" msgstr "при установке каталога нельзя задавать целевой каталог" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "неверный режим %s" @@ -5202,8 +5274,13 @@ msgstr "Майк Гертель (Mike Haertel)" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5220,7 +5297,7 @@ msgstr "" " ФАЙЛУ1 и ФАЙЛУ2\n" " -e СТРОКА замещать при выводе пустые строки указанной СТРОКОЙ\n" -#: src/join.c:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5233,7 +5310,7 @@ msgstr "" " -t СИМ использовать СИМВОЛ как разделитель полей ввода и " "вывода\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5254,13 +5331,13 @@ msgstr "" " --header считать первую строку каждого файла названиями полей,\n" " выводить их без выполнения поиска пары\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated разделитель строк NUL, а не символ\n" " новой строки\n" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5295,47 +5372,47 @@ msgstr "" "правила, задаваемые «LC_COLLATE». Если ввод не отсортирован и одинаковые\n" "строки не объединены, то будет выдано предупреждающее сообщение.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:%: без сортировки: %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "неверный номер поля: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "неверная спецификация поля: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "неверный номер файла в спецификации поля: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "поля объединения %lu, %lu несовместимы" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "конфликтующие строки замены для пустого поля" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "многознаковая табуляция %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "несовместимая табуляция" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "оба файла не могут быть стандартным вводом" @@ -5412,17 +5489,17 @@ msgstr "нельзя объединять сигнал с -l или -t" msgid "no process ID specified" msgstr "не задан идентификатор процесса" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "не удалось выделить % байт для буфера stdio\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "неверный режим буферизации %s для %s\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "невозможно установить буферизацию %s в режим %s\n" @@ -5615,7 +5692,7 @@ msgstr "нельзя указывать --relative без --symbolic" msgid "FIXME: unknown" msgstr "FIXME: неизвестен" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Использование: %s [КЛЮЧ]\n" @@ -5628,7 +5705,7 @@ msgstr "" "Печатает имя текущего пользователя.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "регистрационное имя отсутствует" @@ -5638,7 +5715,7 @@ msgstr "регистрационное имя отсутствует" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -5647,96 +5724,96 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" -"проигнорировано неверное значение переменной окружения QUOTING_STYLE: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "проигнорирована неверная ширина в переменной окружения COLUMNS: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "проигнорирован неверный размер табуляции в переменной окружения TABSIZE: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "неверная ширина строки: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "неверный размер табуляции: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "неверный формат времени %s" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "Допустимые аргументы:\n" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr " - +ФОРМАТ (например, +%H:%M) для формата в стиле «date»\n" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "ошибка при инициализации строк, задающих месяцы" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "не распознан префикс: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "не анализируемое значение в переменной окружения LS_COLORS" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" +"проигнорировано неверное значение переменной окружения QUOTING_STYLE: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "невозможно открыть каталог %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "невозможно определить устройство и inode для %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: пропуск уже перечисленного каталога" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "чтение каталога %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "закрытие каталога %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "невозможно сравнить имена файлов %s и %s" -#: src/ls.c:4781 +#: src/ls.c:4775 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" @@ -5745,7 +5822,7 @@ msgstr "" "Сортирует в алфавитном порядке, если не задан ни --sort, ни один из\n" "ключей -cftuvSUX.\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5759,7 +5836,7 @@ msgstr "" " -b, --escape печатать экранирующие последовательности\n" " в стиле С для не графических символов\n" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5785,12 +5862,14 @@ msgstr "" " иначе: сортировать по ctime, сначала самые " "новые\n" -#: src/ls.c:4804 +#: src/ls.c:4798 +#, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5802,7 +5881,7 @@ msgstr "" " -d, --directory выдавать имена каталогов, а не их содержимое\n" " -D, --dired генерировать вывод для режима Emacs dired\n" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5820,11 +5899,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time синоним -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr " -g как -l, но не выводить владельца\n" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5838,7 +5917,7 @@ msgstr "" " но любое использование\n" " --sort=none (-U) выключает группировку\n" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5850,7 +5929,7 @@ msgstr "" " человека виде (например, 1K 234M 2G)\n" " --si то же, но использовать степень 1000, а не 1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5872,7 +5951,7 @@ msgstr "" " --hide=ШАБЛОН не показывать записи, соответствующие ШАБЛОНУ\n" " оболочки (отменяется ключами -a или -A)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5893,7 +5972,7 @@ msgstr "" " -k, --kibibytes по умолчанию использовать блоки по 1024 байта\n" " при показе использования диска\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5909,7 +5988,7 @@ msgstr "" " ссылается\n" " -m выдавать список на всю ширину через запятую\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5925,7 +6004,7 @@ msgstr "" " -o как -l, но не выводить информацию о группе\n" " -p, --indicator-style=slash добавлять индикатор / к каталогам\n" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -5945,7 +6024,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5956,18 +6035,19 @@ msgstr "" " -R, --recursive рекурсивно показывать каталоги\n" " -s, --size печатать размер каждого файла в блоках\n" -#: src/ls.c:4886 +#: src/ls.c:4881 +#, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S сортировать по размеру файла\n" " --sort=СЛОВО сортировать по СЛОВУ, а не по имени: \n" @@ -5982,7 +6062,7 @@ msgstr "" " если --sort=time, использовать указанное\n" " время в качестве ключа сортировки\n" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -6005,7 +6085,7 @@ msgstr "" " префикс «posix-», то он действует только\n" " в локали, отличной от POSIX\n" -#: src/ls.c:4908 +#: src/ls.c:4904 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -6015,11 +6095,12 @@ msgstr "" " -T, --tabsize=РАЗМЕР использовать табуляцию указанного РАЗМЕРА, а не " "8\n" -#: src/ls.c:4912 +#: src/ls.c:4908 +#, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -6031,13 +6112,15 @@ msgstr "" " -v сортировать по номерам (версии) в текстовом\n" " представлении\n" -#: src/ls.c:4919 +#: src/ls.c:4915 +#, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=ЧИСЛО задает ширину экрана вместо текущего значения\n" " -x перечислять по строкам, а не по столбцам\n" @@ -6046,7 +6129,7 @@ msgstr "" " файла\n" " -1 перечислять по одному файлу на строке\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6062,7 +6145,7 @@ msgstr "" "служит для изменения значений. Для её установки используйте команду " "dircolors.\n" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6092,40 +6175,43 @@ msgid "David Madore" msgstr "Дэвид Мэдор (David Madore)" #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" "Использование: %s [КЛЮЧ]… [ФАЙЛ]…\n" "Печатает или проверяет контрольные суммы %s (%d-битные).\n" "Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" " -b, --binary читать в двоичном режиме (по умолчанию, если\n" " читается не терминальный ввод)\n" -#: src/md5sum.c:178 -msgid " -b, --binary read in binary mode\n" +#: src/md5sum.c:180 +#, fuzzy +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary читать в двоичном режиме\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check читать суммы %s из ФАЙЛОВ и сверять их\n" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr " --tag создать контрольную сумму в стиле BSD\n" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" @@ -6133,11 +6219,11 @@ msgstr "" "читается\n" " терминальный ввод)\n" -#: src/md5sum.c:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text читать в текстовом режиме (по умолчанию)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -6161,14 +6247,15 @@ msgstr "" " контрольных сумм\n" "\n" -#: src/md5sum.c:206 -#, c-format +#: src/md5sum.c:209 +#, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "Метод вычисления контрольных сумм описан в %s. Входными данными при\n" @@ -6176,35 +6263,35 @@ msgstr "" "По умолчанию печатает строку с контрольной суммой, знак, показывающий\n" "режим ввода («*» для двоичных, пробел для текстовых) и имя каждого ФАЙЛА.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: слишком много строк контрольных сумм" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: неправильно составленная строка контрольной суммы %s" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: невозможно открыть или прочитать\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "ПОВРЕЖДЁН" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "ЦЕЛ" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: не найдено верно составленных строк контрольных сумм %s" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" @@ -6212,7 +6299,7 @@ msgstr[0] "ПРЕДУПРЕЖДЕНИЕ: неправильный формат msgstr[1] "ПРЕДУПРЕЖДЕНИЕ: неправильный формат строк %" msgstr[2] "ПРЕДУПРЕЖДЕНИЕ: неправильный формат строк %" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" @@ -6220,7 +6307,7 @@ msgstr[0] "ПРЕДУПРЕЖДЕНИЕ: не удалось прочитать msgstr[1] "ПРЕДУПРЕЖДЕНИЕ: не удалось прочитать % файла из списка" msgstr[2] "ПРЕДУПРЕЖДЕНИЕ: не удалось прочитать % файлов из списка" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" @@ -6228,38 +6315,38 @@ msgstr[0] "ПРЕДУПРЕЖДЕНИЕ: НЕ совпала % вычи msgstr[1] "ПРЕДУПРЕЖДЕНИЕ: НЕ совпали % вычисленные контрольные суммы" msgstr[2] "ПРЕДУПРЕЖДЕНИЕ: НЕ совпали % вычисленных контрольных сумм" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "--tag не поддерживает режим --text" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "ключ --tag имеет смысл только при проверке контрольных сумм" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "ключи --binary и --text бессмысленны при проверке контрольных сумм" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "ключ --status имеет смысл только при проверке контрольных сумм" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "ключ --warn имеет смысл только при проверке контрольных сумм" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "ключ --quiet имеет смысл только при проверке контрольных сумм" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "ключ --strict имеет смысл только при проверке контрольных сумм" @@ -6300,22 +6387,22 @@ msgstr "" " контекст безопасности SELinux\n" " или SMACK равным CTX\n" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "не удалось установить контекст создания по умолчанию для %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" msgstr "не удалось восстановить контекст для %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "создан каталог %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6530,7 +6617,7 @@ msgstr "слишком много шаблонов" msgid "with --suffix, template %s must end in X" msgstr "При задании --suffix, шаблон %s должен оканчиваться на X" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "неверный суффикс %s, содержит разделитель каталогов" @@ -6666,9 +6753,8 @@ msgid "Scott Bartram" msgstr "Скотт Бертрам (Scott Bartram)" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "Печатает каждый ФАЙЛ на стандартный вывод, добавляя номера строк.\n" "Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" @@ -6782,27 +6868,27 @@ msgstr "неверный стиль нумерования тела: %s" msgid "invalid footer numbering style: %s" msgstr "неверный стиль нумерования нижнего колонтитула: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "неверный номер начальной строки: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "неверное приращение номера строки: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "неверное число пустых строк: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "неверная ширина поля для номера строки: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "неверный формат нумерации строк: %s" @@ -6825,10 +6911,10 @@ msgstr "" "\n" #: src/nohup.c:65 -#, c-format +#, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6848,45 +6934,45 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "не удалось отобразить, стандартный ввод не работает" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "ввод игнорируется" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "ввод игнорируется, вывод добавляется в %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "вывод добавляется в %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" "не удалось сделать так, чтобы копия стандартного потока ошибок закрылась при " "начале выполнения" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "ввод игнорируется, поток ошибок перенаправляются на стандартный вывод" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "поток ошибок перенаправляются на стандартный вывод" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" msgstr "не удалось перенаправить стандартный поток ошибок" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Джузеппе Скривано (Giuseppe Scrivano)" @@ -6913,57 +6999,52 @@ msgstr "" " --all вывести число установленных процессоров\n" " --ignore=N если возможно, исключить N обрабатывающих элементов\n" -#: 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "Ассаф Гордон (Assaf Gordon)" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "значение слишком велико для преобразования: %s" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, c-format msgid "invalid number: %s" msgstr "неверный номер: %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "отбрасывается суффикс в входных данных: %s (попробуйте указать --from)" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" msgstr "неверный суффикс в входных данных: %s" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "отсутствующий суффикс «i» в входных данных: %s (например Ki/Mi/Gi)" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "не удалось подготовить значение «%Lf» для вывода" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, c-format msgid "invalid unit size: %s" msgstr "неверный размер единицы счёта: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Использование: %s [КЛЮЧ]… [ЧИСЛО]…\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" @@ -6971,25 +7052,28 @@ msgstr "" "Переформатирует ЧИСЛО(а), читаемое из стандартного ввода, если оно не " "указано в командной строке.\n" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" " --debug показывать предупреждения при некорректных входных\n" " данных\n" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" " -d, --delimiter=X использовать X вместо пробела как разделитель полей\n" -#: src/numfmt.c:827 +#: src/numfmt.c:893 +#, fuzzy msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" " --field=N заменять число в входном поле N (по умолчанию 1)\n" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" @@ -6997,7 +7081,7 @@ msgstr "" " --format=ФОРМАТ использовать ФОРМАТ плавающей точки в стиле printf;\n" " подробности смотрите в разделе ФОРМАТ далее\n" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" @@ -7008,7 +7092,7 @@ msgstr "" " изменения; по умолчанию «none»; смотрите ЕДИНИЦЫ " "далее\n" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" @@ -7016,7 +7100,7 @@ msgstr "" " --from-unit=N задать размер единицы измерения входных данных\n" " (вместо значения по умолчанию 1).\n" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -7027,7 +7111,7 @@ msgstr "" "1,000,000)\n" " (ничего не делается в локалях C/POSIX)\n" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" @@ -7035,7 +7119,7 @@ msgstr "" " --header[=N] выводить (без преобразования) первые N строк;\n" " если N не задано, то значение равно 1\n" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" @@ -7044,7 +7128,7 @@ msgstr "" "РЕЖИМА:\n" " abort (по умолчанию), fail, warn, ignore\n" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -7061,7 +7145,7 @@ msgstr "" " по умолчанию дополнение выполняется, если\n" " обнаруживается пробельный символ\n" -#: src/numfmt.c:860 +#: src/numfmt.c:927 msgid "" " --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" " up, down, from-zero (default), towards-zero, " @@ -7071,7 +7155,7 @@ msgstr "" " значение МЕТОДА: up, down, from-zero (по умолчанию),\n" " towards-zero, nearest\n" -#: src/numfmt.c:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" @@ -7079,21 +7163,21 @@ msgstr "" " --suffix=СУФФИКС добавлять СУФФИКС к выходным значениям и учитывать\n" " необязательный СУФФИКС у входных значений\n" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" " --to=ЕДИНИЦА автомасштабирование выходные значения к ЕДИНИЦЕ\n" " изменения; смотрите ЕДИНИЦА далее\n" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" " --to-unit=N размер единицы измерения выходных данных\n" " (вместо значения по умолчанию 1)\n" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" @@ -7101,11 +7185,11 @@ msgstr "" "\n" "ЕДИНИЦЫ:\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr " none отключить масштабирование; суффиксы приводят к ошибке\n" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -7119,7 +7203,7 @@ msgstr "" " 1M = 1000000,\n" " 1Mi = 1048576,\n" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -7131,7 +7215,7 @@ msgstr "" " 1M = 1000000,\n" " ...\n" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7143,7 +7227,7 @@ msgstr "" " 1M = 1048576,\n" " ...\n" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7155,8 +7239,29 @@ msgstr "" " 1Mi = 1048576,\n" " ...\n" -#: src/numfmt.c:906 -#, c-format +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Диапазоны задаются следующим образом:\n" +"\n" +" Н Н-ный байт, символ или поле; отсчитывается от 1\n" +" Н- от Н-ного байта, символа или поля до конца строки\n" +" Н-М от Н-ного до М-ного (включительно) байта, символа или поля\n" +" -М от первого до М-ного (включительно) байта, символа или поля\n" +"\n" +"Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" + +#: src/numfmt.c:983 +#, fuzzy, c-format msgid "" "\n" "FORMAT must be suitable for printing one floating-point argument '%f'.\n" @@ -7164,6 +7269,7 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" "\n" "Значение ФОРМАТА должно позволять вывод одного аргумента с плавающей точкой\n" @@ -7174,7 +7280,7 @@ msgstr "" "отрицательного\n" "значения ширины (%-10f) производится выравнивание слева.\n" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7194,8 +7300,8 @@ msgstr "" "но код завершения равен 0. Если указано --invalid=«ignore», то про ошибки\n" "преобразования не сообщается и код завершения равен 0.\n" -#: src/numfmt.c:922 -#, c-format +#: src/numfmt.c:1000 +#, fuzzy, c-format msgid "" "\n" "Examples:\n" @@ -7209,8 +7315,8 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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 "" @@ -7231,115 +7337,126 @@ msgstr "" " $ ls -lh | %s --header --field 5 --from=iec --padding=10\n" " $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n" -#: src/numfmt.c:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "в формате %s не указана директива %%" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "неверный формат %s (переполнение по ширине)" -#: src/numfmt.c:1008 -#, c-format -msgid "--format padding overridding --padding" +#: src/numfmt.c:1085 +#, fuzzy, c-format +msgid "--format padding overriding --padding" msgstr "дополнение из --format заменяет значение --padding" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "формат %s заканчивается на %%" -#: src/numfmt.c:1030 -#, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" -msgstr "неверный формат %s, директива должна быть %%[0]['][-][N]f" +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "неверная точность: %s" + +#: src/numfmt.c:1126 +#, fuzzy, c-format +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" +msgstr "неверный формат %s, директива должна быть %%[0]['][-][N]f" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "в формате %s содержится слишком много директив %%" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, c-format msgid "invalid suffix in input %s: %s" msgstr "неверный суффикс в входных данных %s: %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, fuzzy, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "значение слишком велико для вывода: «%Lg» (попробуйте указать --to)" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "значение слишком велико для вывода: «%Lg» (попробуйте указать --to)" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" "значение слишком велико для вывода: «%Lg» (обработка значений > 999Y " "невозможна)" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "большое входное значение %s: возможна потеря точности" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" -"входная строка слишком коротка, нет чисел для преобразования в поле %ld" +msgid "invalid field value %s" +msgstr "неверное значение поля %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, c-format msgid "invalid padding value %s" msgstr "неверное значение дополнения %s" -#: src/numfmt.c:1417 -#, c-format -msgid "invalid field value %s" -msgstr "неверное значение поля %s" +#: src/numfmt.c:1646 +#, fuzzy, c-format +msgid "multiple field specifications" +msgstr "%s: неверная спецификация поля %s" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, c-format msgid "invalid header value %s" msgstr "неверное значение заголовка %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "--grouping нельзя сочетать с --format" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "ключи преобразования не заданы" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "группировку нельзя сочетать с --to" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "группировка не имеет смысла с этой локалью" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "при указании в командной строке --header игнорируется" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "ошибка чтения входных данных" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "не удалось преобразовать некоторые из входных чисел" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7352,14 +7469,13 @@ msgstr "" " или: %s --traditional [КЛЮЧ]… [ФАЙЛ] [[+]СМЕЩЕНИЕ[.][b] [+][МЕТКА]" "[.][b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Печатает однозначное (по умолчанию байтовое восьмеричное) представление " @@ -7369,8 +7485,10 @@ msgstr "" "ввод.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 +#, 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" @@ -7386,7 +7504,7 @@ msgstr "" "шестнадцатеричные числа, суффикс . — как восьмеричные, а суффикс b\n" "умножает на 512.\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7402,7 +7520,7 @@ msgstr "" " указанного порядку\n" " -j, --skip-bytes=Н пропустить первые Н байт\n" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -7425,7 +7543,7 @@ msgstr "" " --traditional принимать аргументы как в третьей форме " "выше\n" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -7445,7 +7563,7 @@ msgstr "" " с обратной косой чертой\n" " -d синоним -t u2, беззнаковые десятичные двухбайтовые единицы\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7461,7 +7579,7 @@ msgstr "" " -s синоним -t d2, десятичные двухбайтовые единицы\n" " -x синоним -t x2, шестнадцатеричные двухбайтовые единицы\n" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -7475,7 +7593,7 @@ msgstr "" " a именованный символ, старший бит игнорируется\n" " c печатный символ или управляющая последовательность\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7489,7 +7607,7 @@ msgstr "" " u[ЧИСЛО] беззнаковое десятичное целое размером заданное ЧИСЛО байт\n" " x[ЧИСЛО] шестнадцатеричное целое размером заданное ЧИСЛО байт\n" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -7503,7 +7621,7 @@ msgstr "" "ЧИСЛО также может быть F sizeof(float), D sizeof(double) или\n" "L sizeof(long double).\n" -#: src/od.c:401 +#: src/od.c:404 msgid "" "\n" "Adding a z suffix to any type displays printable characters at the end of\n" @@ -7513,7 +7631,7 @@ msgstr "" "Добавляет суффикс z к любым показываемым печатным символам\n" "в конце каждой выходной строки.\n" -#: src/od.c:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -7537,12 +7655,12 @@ msgstr "" " M 1024*1024\n" "и так далее для G, T, P, E, Z, Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "неверная строка типа %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7551,7 +7669,7 @@ msgstr "" "неверно задана строка типа %s;\n" "данная система не предоставляет %lu-байтного целого типа" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7560,38 +7678,38 @@ msgstr "" "неверно задан тип %s;\n" "данная система не предоставляет %lu-байтного типа с плавающей точкой" -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" msgstr "неверный символ «%c» в строке типа %s" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "невозможно сместиться за предел последнего входного файла" -#: src/od.c:1650 +#: src/od.c:1658 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" "неверно задано основание системы счисления «%c»,\n" "должно быть одним из символов [doxn]" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "при дампе строк нельзя задавать тип" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "режим совместимости поддерживается только для одного файла" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "значение skip-bytes + read-bytes слишком велико" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "предупреждение: неверная ширина %lu; будет использована %d" @@ -7607,10 +7725,10 @@ 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" msgstr "" "Печатает на стандартный вывод строки, составленные из соответствующих строк\n" "входных ФАЙЛОВ, разделённых табуляцией.\n" @@ -7754,12 +7872,12 @@ msgstr "Когда" msgid "Where" msgstr "Где" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Использование: %s [КЛЮЧ]… [ПОЛЬЗОВАТЕЛЬ]…\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7779,7 +7897,7 @@ msgstr "" " -s использовать краткий формат вывода, принимается по " "умолчанию\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7794,7 +7912,7 @@ msgstr "" " -q опустить в кратком формате полное имя пользователя, имя\n" " удаленной машины и время неактивности\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -7805,7 +7923,7 @@ msgstr "" "Упрощённая программа «finger»; печатает сведения о пользователе.\n" "В качестве файла utmp будет использоваться %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7813,92 +7931,92 @@ msgstr "" "одно" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Пит ТерМаат (Pete TerMaat)" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Роланд Хьюбнер (Roland Huebner)" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "в «--pages=ПЕРВАЯ_СТР[:ПОСЛЕДНЯЯ_СТР]» пропущен аргумент" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "неверный диапазон страниц %s" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "в «-l ДЛИНА_СТРАНИЦЫ» неверное число строк: %s" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "в «-N НОМЕР» неверный номер начальной строки: %s" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "в «-o ПОЛЕ» неверное смещение: %s" -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "в «-w ШИРИНА_СТРАНИЦЫ» неверное число символов: %s" -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "в «-W ШИРИНА_СТРАНИЦЫ» неверное число символов: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "невозможно задать число столбцов при параллельной печати" -#: src/pr.c:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "невозможно одновременно печатать вдоль и параллельно" -#: src/pr.c:1196 +#: src/pr.c:1166 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "в «-%c» лишние символы или неверное число в аргументе: %s" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "страница слишком узкая" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" "номер начальной страницы % превосходит общее число страниц " "%" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "переполнение номера страницы" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Страница %" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "Разбивает ФАЙЛ(ы) на страницы или колонки для печати.\n" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7917,7 +8035,7 @@ msgstr "" " только не указан ключ -a. Балансировать число строк в\n" " колонке на каждой странице.\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7935,7 +8053,7 @@ msgstr "" " -d, --double-space\n" " вставлять пустую строку после каждой выходной строки\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7957,7 +8075,7 @@ msgstr "" " если есть ключ -F, и пятистрочным заголовком и\n" " завершителем, если ключ -F не задан)\n" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7981,11 +8099,24 @@ msgstr "" " не выравнивать колонки, --sep-string[=СТРОКА] задает\n" " разделители\n" -#: src/pr.c:2798 +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l, --length=ДЛИНА_СТРАНИЦЫ\n" +" установить ДЛИНУ_СТРАНИЦЫ (66)\n" +" (по умолчанию число строк текста равно 56, а с -F -- " +"63)\n" +" -m, --merge печатать все файлы параллельно, по одному в колонке,\n" +" усекать строки, но соединять полные строки при -J\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -7996,7 +8127,7 @@ msgstr "" " -m, --merge печатать все файлы параллельно, по одному в колонке,\n" " усекать строки, но соединять полные строки при -J\n" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -8015,7 +8146,7 @@ msgstr "" "выводимой\n" " страницы (смотри +ПЕРВАЯ_СТРАНИЦА)\n" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -8030,7 +8161,7 @@ msgstr "" " -r, --no-file-warnings\n" " не предупреждать о невозможности открытия файла\n" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -8048,14 +8179,14 @@ msgstr "" " колонок ключей (-КОЛОНКА|-a -КОЛОНКА|-m), если только\n" " нет ключа -w\n" -#: src/pr.c:2828 +#: src/pr.c:2802 +#, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -S[СТРОКА], --sep-string[=СТРОКА]\n" " разделять колонки СТРОКОЙ,\n" @@ -8064,7 +8195,13 @@ msgstr "" " что -S\" \"); не влияет на ключи для колонок\n" " -t, --omit-header не выводить заголовки страниц\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -8087,7 +8224,7 @@ msgstr "" " установить ШИРИНУ_СТРАНИЦЫ (72) для\n" " вывода в несколько колонок, -s[символ] выключает (72)\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -8099,16 +8236,6 @@ msgstr "" " установить ШИРИНУ_СТРАНИЦЫ (72), усекать строки,\n" " если нет ключа -J; не затрагивается ключами -S или -s\n" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"-t подразумевается, если ДЛИНА_СТРАНИЦЫ <= 10. Если ФАЙЛ не задан или\n" -"задан как -, то читает стандартный ввод.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -8269,11 +8396,11 @@ msgstr "" "Печатает перемешанный алфавитный указатель слов входных файлов, включая " "контекст.\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 +#, fuzzy 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 выводить автоматически сгенерированные " "ссылки\n" @@ -8284,6 +8411,12 @@ msgstr "" #: src/ptx.c:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -8298,7 +8431,7 @@ msgstr "" " -S, --sentence-regexp=РЕГВЫР для конца строк или конца предложений\n" " -T, --format=tex генерировать вывод в виде директив TeX\n" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8318,7 +8451,7 @@ msgstr "" " -o, --only-file=ФАЙЛ только считать список слов из заданного " "ФАЙЛА\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8330,20 +8463,16 @@ msgstr "" " -t, --typeset-mode - не реализовано -\n" " -w, --width=ЧИСЛО ширина вывода в столбцах, не считая ссылки\n" -#: src/ptx.c:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" -"По умолчанию — «-F /».\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "неверная ширина дырки: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "неверная ширина строки: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8374,7 +8503,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "ошибка изменения каталога на %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "ошибка получения атрибутов %s" @@ -8394,8 +8523,8 @@ msgstr "не являющиеся ключами аргументы проигн msgid "Dmitry V. Levin" msgstr "Дмитрий В. Левин (Dmitry V. Levin)" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Использование: %s [КЛЮЧ]… ФАЙЛ…\n" @@ -8662,17 +8791,17 @@ msgstr "" "уверенность в невозможности восстановления содержимого.\n" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: удалить %zu аргумент рекурсивно? " msgstr[1] "%s: удалить %zu аргумента рекурсивно? " msgstr[2] "%s: удалить %zu аргументов рекурсивно? " #: src/rm.c:345 -#, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +#, fuzzy, c-format +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: удалить %zu аргумент? " msgstr[1] "%s: удалить %zu аргумента? " msgstr[2] "%s: удалить %zu аргументов? " @@ -8894,12 +9023,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "неверный аргумент с плавающей точкой: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "формат %s содержит неизвестную директиву %%%c" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "при выводе строк одинаковой ширины формат можно не указывать" @@ -8917,7 +9046,16 @@ msgstr "" "Переписывает несколько раз указанные файлы для того, чтобы сделать более\n" "сложным восстановление даже с использованием очень дорогого оборудования.\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Если ФАЙЛ задан как -, копирует обратно на стандартный вывод.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8931,7 +9069,7 @@ msgstr "" " (по умолчанию /dev/urandom)\n" " -s, --size=N очистить N байт (возможны суффиксы вида K, M, G)\n" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -8946,11 +9084,10 @@ msgstr "" " блока; по умолчанию для не простых файлов\n" " -z, --zero перезаписать в конце нулями, чтобы скрыть измельчение\n" -#: src/shred.c:192 +#: src/shred.c:196 +#, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -8974,7 +9111,7 @@ msgstr "" "Режим по умолчанию — «wipesync», но заметим, что это долго.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8993,7 +9130,7 @@ msgstr "" "\n" # log-structured??? -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -9015,7 +9152,7 @@ msgstr "" " NFS-сервер от Network Appliance\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -9029,7 +9166,7 @@ msgstr "" "* сжатые файловые системы\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -9050,7 +9187,7 @@ msgstr "" "странице man для mount (man mount).\n" "\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -9060,128 +9197,128 @@ msgstr "" "содержать копии файла, которые нельзя удалить, и которые позволят\n" "впоследствии восстановить уничтоженный файл.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: операция fdatasync завершилась неуспехом" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: операция fsync завершилась неудачно" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: невозможно откатиться" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: проход %lu/%lu (%s)…" -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: ошибка записи по смещению %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: операция lseek завершилась неудачно" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: файл слишком велик" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: проход %lu/%lu (%s)…%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: проход %lu/%lu (%s)…%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: операция fstat завершилась неуспехом" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: неверный тип файла" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: у файла отрицательный размер" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: ошибка при усечении" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: операция fcntl завершилась неуспехом" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" "%s: невозможно нарезать файловый дескриптор с только с правом добавления" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: удаление" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: переименован в %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: не удалось удалить" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: удалён" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: не удалось закрыть" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: не удалось открыть для чтения" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: неверное число проходов" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "задано несколько источников случайных чисел" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: неверный размер файла" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -9192,11 +9329,11 @@ msgstr "" " или: %s -e [КЛЮЧ]… [АРГ]…\n" " или: %s -l ОТ-ДО [КЛЮЧ]…\n" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "Печатает случайную перестановку входных строк на стандартный вывод.\n" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -9214,37 +9351,37 @@ msgstr "" " --random-source=ФАЙЛ получать случайные байты из ФАЙЛА\n" " -r, --repeat допускать повторение выходных строк\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "слишком много входных строк" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "задано несколько ключей -i" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "недопустимый входной диапазон %s" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "неверное число строк: %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "задано несколько выходных файлов" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "нельзя сочетать ключи -e и -i" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "нет строк для повторения" @@ -9272,12 +9409,12 @@ msgstr "" "аргументов, приостанавливает на период, равный сумме их значений.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "неверный временной интервал %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "невозможно прочитать таймер реального времени" @@ -9286,7 +9423,7 @@ msgstr "невозможно прочитать таймер реального msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "Печатает сортированное слияние всех ФАЙЛ(ов) на стандартный вывод.\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -9294,7 +9431,7 @@ msgstr "" "Ключи, задающие порядок:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9305,7 +9442,7 @@ msgstr "" " -d, --dictionary-order рассматривать только пропуски, буквы и цифры\n" " -f, --ignore-case игнорировать регистр букв\n" -#: src/sort.c:443 +#: src/sort.c:444 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -9316,14 +9453,14 @@ msgstr "" " -i, --ignore-nonprinting рассматривать только печатные символы\n" " -M, --month-sort сравнивать (неизвестно) < «JAN» < … < «DEC»\n" -#: src/sort.c:448 +#: src/sort.c:449 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:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9335,7 +9472,7 @@ msgstr "" " --random-source=ФАЙЛ брать случайные числа из ФАЙЛА\n" " -r, --reverse обратить результаты сравнения\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9351,7 +9488,7 @@ msgstr "" " -V, --version-sort сортировать по номерам (версии) в текстовом\n" " представлении\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -9359,7 +9496,7 @@ msgstr "" "Другие ключи:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9367,7 +9504,7 @@ msgstr "" " --batch-size=NMERGE объединять не более чем NMERGE ввода за раз;\n" " для большего использовать временные файлы\n" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -9384,7 +9521,7 @@ msgstr "" " --compress-program=ПРОГ сжимать временные файлы командой ПРОГ;\n" " разжимать командой ПРОГ -d\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9401,7 +9538,7 @@ msgstr "" " Если Ф равно -, то читать имена файлов из\n" " стандартного ввода\n" -#: src/sort.c:487 +#: src/sort.c:488 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -9411,7 +9548,7 @@ msgstr "" " -m, --merge объединить уже сортированные файлы,\n" " не сортировать\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9427,7 +9564,7 @@ msgstr "" "указанного\n" " РАЗМЕРА\n" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9456,7 +9593,7 @@ msgstr "" "нескольких\n" " равных\n" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9487,12 +9624,11 @@ msgstr "" "\n" "После РАЗМЕРА можно писать следующие суффиксы-мультипликаторы:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -9508,117 +9644,117 @@ msgstr "" "Чтобы получить традиционный порядок, использующий системные значения байт,\n" "установите LC_ALL=C.\n" -#: src/sort.c:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "ожидание %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] завершился неудачно" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "невозможно создать временный файл в %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "операция открытия завершилась неудачно" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "операция fflush завершилась неудачно" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "закрытие завершилось неудачно" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "невозможно создать временный файл" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "невозможно создать процесс для %s -d" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "предупреждение, невозможно удалить: %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "--%s содержит неверный аргумент %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "минимальным аргументом --%s является %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "--%s имеет слишком большой аргумент %s" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "максимальным аргументом --%s с текущим rlimit является %s" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "количество параллельных сортировок должно быть ненулевым" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "операция stat завершилась неудачно" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "чтение завершилось неудачно" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "не удалось выполнить преобразование строки" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "исходная строка была %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "^ не найдено совпадений с ключом\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "указан устаревший ключ %s; вместо него используйте %s" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "ключ %lu нулевой ширины и будет проигнорирован" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "начальные пробелы в ключе %lu важны; укажите также «b»" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "ключ %lu является числовым и охватывает несколько полей" -#: src/sort.c:2484 +#: src/sort.c:2483 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -9626,148 +9762,150 @@ msgstr[0] "ключ «-%s» игнорируется" msgstr[1] "ключа «-%s» игнорируется" msgstr[2] "ключей «-%s» игнорируется" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "ключ «-r» применяется только если ничего не совпало" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "запись завершилась неудачно" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: неправильный порядок: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "стандартная ошибка" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "не удалось прочитать" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: неверная спецификация поля %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "ключи «-%s» несовместимы" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: неверный счетчик в начале %s" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "неверное число после «-»" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "неверное число после «.»" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "лишний символ в спецификации поля" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "заданы несколько программ сжатия" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "неверное число в начале поля" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "нулевой номер поля" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "нулевой знаковый сдвиг" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" msgstr "неверное число после «,»" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "пустая табуляция" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "невозможно прочитать имена файлов из %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: неверное имя файла нулевой длины" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "нет ввода из %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "правила, используемые для сортировки: %s" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "используется простое побайтовое сравнение" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "дополнительный операнд %s не допустим с -%c" -#: src/split.c:186 -#, c-format -msgid "the suffix length needs to be at least %zu" +#: src/split.c:207 +#, fuzzy, c-format +msgid "the suffix length needs to be at least %" msgstr "длина суффикса должна быть не менее %zu" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Использование: %s [КЛЮЧ]… [ВВОД [ПРЕФИКС]]\n" -#: src/split.c:207 +#: src/split.c:228 +#, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" "Выводит части ФАЙЛА фиксированного размера в файлы ПРЕФИКСaa,\n" "ПРЕФИКСab, …; по умолчанию размер части равен 1000 строк, а ПРЕФИКС\n" "равен «x». Если ФАЙЛ не задан или задан как -, читает стандартный\n" "ввод.\n" -#: src/split.c:215 -#, c-format +#: src/split.c:236 +#, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file names\n" " -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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" " -a, --suffix-length=Н использовать суффиксы длиной Н (по умолчанию %d)\n" @@ -9789,7 +9927,7 @@ msgstr "" " -u, --unbuffered сразу копировать ввод в вывод при указании «-n r/" "…»\n" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9797,16 +9935,17 @@ msgstr "" " --verbose печатать диагностику перед открытием\n" " очередного выходного файла\n" -#: src/split.c:235 +#: src/split.c:258 +#, fuzzy 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" "\n" "ПОРЦИИ могут задаваться в виде:\n" @@ -9817,193 +9956,198 @@ msgstr "" "r/N как «l», но использовать циклический перебор\n" "r/K/N аналогично, но вывести только K-ую порцию из N на стандартный вывод\n" -#: src/split.c:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "исчерпаны суффиксы для выходных файлов" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "создаётся файл %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "%s перезаписал был начальные данные; прекращение выполнения" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "не удалось задать переменную окружения FILE" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "выполняется с FILE=%s\n" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "не удалось создать канал" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "закрытие предыдущего канала" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "закрытие выходного канала" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "перемещение входного канала" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "закрытие входного канала" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "не удалось выполнить команду: «%s -c %s»" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "не удалось закрыть входной канал" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "ожидание дочернего процесса" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "при FILE=%s, сигнал %s от команды: %s" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "при FILE=%s, код возврата %d из команды: %s" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "неизвестный код возврата команды (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "невозможно разбивать несколькими методами сразу" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: неверное количество порций" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: неверный номер порции" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: неверная длина суффикса" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: неверное число байт" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: неверное число строк" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "многознаковая табуляция %s" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "мультиплексный символьный специальный файл" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "ключ числа строк -%s%c… слишком велик" -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: неверное начальное значение числового суффикса" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: неверный размер блока ввода-вывода" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "--filter не применяется к порциям, извлекаемым в stdout" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" "начальное значение числового суффикса слишком большое и превышает длину " "суффикса" -#: src/split.c:1419 +#: src/split.c:1528 #, c-format msgid "%s: cannot determine file size" msgstr "%s: невозможно определить размер файла" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Майкл Мескес (Michael Meskes)" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "не удалось выполнить канонизацию %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "предупреждение: управляющая последовательность «\\%c» не распознана" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: неверная директива" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "предупреждение: обратная косая черта в конце формата" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" "используемое значение %s для обозначения стандартного ввода не работает в " "режиме файловой системы" -#: src/stat.c:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "невозможно считать информацию файловой системы для %s" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -10019,7 +10163,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -10029,31 +10173,31 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "Контекст: %C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -10065,11 +10209,11 @@ msgstr "" "Изменён: %z\n" " Создан: %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "Отображает состояние файла или файловой системы.\n" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" @@ -10077,7 +10221,7 @@ msgstr "" " -L, --dereference следовать по ссылкам\n" " -f, --file-system показать состояние файловой системы, а не файла\n" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -10096,7 +10240,7 @@ msgstr "" " вставьте в ФОРМАТ \\n\n" " -t, --terse выводить информацию в компактной форме\n" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -10116,7 +10260,7 @@ msgstr "" " %B размер блока, сообщаемого %b, в байтах\n" " %C строка контекста безопасности SELinux\n" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -10132,7 +10276,7 @@ msgstr "" " %g ID группы-владельца\n" " %G имя группы-владельца\n" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -10156,7 +10300,7 @@ msgstr "" " %T второстепенный тип устройства, шестнадцатеричный формат,\n" " для специальных символьных/блочных устройств\n" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -10182,7 +10326,7 @@ msgstr "" " %Z время последнего изменения состояния в секундах с начала Эпохи\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -10200,7 +10344,7 @@ msgstr "" " %d количество свободных файловых нод в файловой системе\n" " %f количество свободных блоков в файловой системе\n" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -10278,11 +10422,11 @@ msgstr "" "размер буфера будет равен число байт в РЕЖИМЕ.\n" #: src/stdbuf.c:116 +#, fuzzy 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" +"for example) then that will override corresponding changes 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 "" @@ -10313,7 +10457,7 @@ msgstr "строковая буферизация stdin бессмысленна msgid "you must specify a buffering mode option" msgstr "вы должны задать ключ режима буферизации" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10324,11 +10468,11 @@ msgstr "" " или: %s [-F УСТРОЙСТВО] [--file=УСТРОЙСТВО] [-a|--all]\n" " или: %s [-F УСТРОЙСТВО] [--file=УСТРОЙСТВО] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "Печатает или изменяет настройки терминала.\n" -#: src/stty.c:528 +#: src/stty.c:536 msgid "" " -a, --all print all current settings in human-readable form\n" " -g, --save print all current settings in a stty-readable form\n" @@ -10343,7 +10487,7 @@ msgstr "" " открыть и использовать указанное устройство вместо\n" " стандартного ввода\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10355,11 +10499,24 @@ msgstr "" "иной\n" "настройки определяется используемой системой.\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -10371,9 +10528,13 @@ msgstr "" " eof СИМВОЛ СИМВОЛ будет означать конец файла (прекращать ввод)\n" " eol СИМВОЛ СИМВОЛ будет означать конец строки\n" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -10383,36 +10544,58 @@ msgstr "" " intr СИМВОЛ СИМВОЛ будет посылать сигнал прерывания\n" " kill СИМВОЛ СИМВОЛ будет стирать текущую строку\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" msgstr "" -"* lnext СИМВОЛ СИМВОЛ будет вводить следующий символ, отменяя его\n" -" специальное действие\n" -" quit СИМВОЛ СИМВОЛ будет посылать сигнал выхода\n" -"* rprnt СИМВОЛ СИМВОЛ будет перерисовывать текущую строку\n" -" start СИМВОЛ СИМВОЛ будет возобновлять ввод\n" -#: src/stty.c:559 +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 СИМВОЛ СИМВОЛ будет приостанавливать ввод\n" " susp СИМВОЛ СИМВОЛ будет посылать терминалу сигнал останова\n" "* swtch СИМВОЛ СИМВОЛ будет переключать уровень вложенности оболочки\n" "* werase СИМВОЛ СИМВОЛ стирать последние введенное слово\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 +#, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Специальные настройки:\n" +" Н установить скорости ввода и вывода равными Н бод\n" +"* cols Н сообщить ядру, что терминал имеет Н столбцов\n" +"* columns Н синоним cols\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -10422,10 +10605,17 @@ msgstr "" "* cols Н сообщить ядру, что терминал имеет Н столбцов\n" "* columns Н синоним cols\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -10436,11 +10626,22 @@ msgstr "" " символов для завершения операции чтения\n" " ospeed Н установить скорость вывода\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +"* rows Н сообщить ядру, что терминал имеет Н строк\n" +"* size напечатать числа столбцов и строк, известные ядру\n" +" speed напечатать скорость терминала\n" +" time Н используется с -icanon, установить временной предел для\n" +" операции чтения равным Н десятым секунды\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -10450,25 +10651,28 @@ msgstr "" " time Н используется с -icanon, установить временной предел для\n" " операции чтения равным Н десятым секунды\n" -#: src/stty.c:584 +#: src/stty.c:641 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 включить квитирование по RTS/CTS\n" -" * [-]cdtrdsr включить квитирование по DTR/DSR\n" -" csН установить размер символа равным Н бит, Н от 5 до 8\n" -#: src/stty.c:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 +#, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -10476,7 +10680,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb использовать два стоп бита на символ (один, если с «-»)\n" " [-]hup посылать сигнал обрыва терминальной линии, когда последний\n" @@ -10487,7 +10690,12 @@ msgstr "" " [-]parodd установить проверку на нечётность (или чётность с «-»)\n" " * [-]cmspar использовать чётность «stick» (mark/space)\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -10495,6 +10703,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Настройки ввода:\n" @@ -10503,10 +10712,14 @@ msgstr "" " [-]ignbrk игнорировать символы прерывания\n" " [-]igncr игнорировать символы возврата каретки\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -10519,14 +10732,23 @@ msgstr "" " [-]inpck использовать проверку четности ввода\n" " [-]istrip очищать старший (восьмой) бит вводимых символов\n" -#: src/stty.c:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 предполагать, что входные символы в кодировке UTF-8\n" -#: src/stty.c:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr " * [-]iutf8 предполагать, что входные символы в кодировке UTF-8\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -10539,62 +10761,83 @@ msgstr "" " [-]parmrk отмечать ошибки четности (последовательностью из 255 нулей)\n" " [-]tandem синоним [-]xioff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Настройки вывода:\n" -"* bsН значение паузы после забоя, допустимые Н [0..1]\n" -"* crН значение паузы после возврата каретки, допустимые Н [0..3]\n" -"* ffН значение паузы после перевода страницы, допустимые Н [0..1]\n" -"* nlН значение паузы после новой строки, допустимые Н [0..1]\n" -#: src/stty.c:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" -msgstr "" -"* [-]ocrnl преобразовывать возврат каретки в перевод строки\n" -"* [-]ofdel использовать символы стирания вместо NUL для заполнения\n" -"* [-]ofill использовать символы заполнения для задержек\n" -"* [-]olcuc преобразовывать строчные буквы в заглавные\n" -"* [-]onlcr преобразовывать перевод строки в возврат каретки и новую " -"строку\n" -"* [-]onlret перевод строки производит возврат каретки\n" - -#: src/stty.c:643 -msgid "" -" * [-]onocr do not print carriage returns in the first column\n" -" [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 +msgid "" " * 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 "" -"* [-]onocr не печатать возврат каретки в первом столбце\n" -" [-]opost форматировать вывод\n" -"* tabН значение паузы после горизонтальной табуляции,\n" -" допустимые Н [0..3]\n" -"* tabs синоним tab0\n" -"* -tabs синоним tab3\n" -"* vtН значение паузы после вертикальной табуляции, допустимые Н " -"[0..1]\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10604,46 +10847,62 @@ msgstr "" "* crtkill стирать всю строку, подчиняясь установкам echoprt и echoe\n" "* -crtkill стирать всю строку, подчиняясь установкам echoctl и echok\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +#, fuzzy +msgid " [-]echo echo input characters\n" +msgstr " * [-]iutf8 предполагать, что входные символы в кодировке UTF-8\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -"* [-]ctlecho отображать управляющие символы с крышкой («^c»)\n" -" [-]echo отображать вводимые символы\n" -"* [-]echoctl синоним [-]ctlecho\n" -" [-]echoe синоним [-]crterase\n" -" [-]echok отображать перевод строки после символа уничтожения\n" -#: src/stty.c:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -"* [-]echoke синоним [-]crtkill\n" -" [-]echonl отображать перевод строки, даже если другие символы не\n" -" отображаются\n" -"* [-]echoprt выводить стираемые символы в обратном порядке, между «\\» и " -"«/»\n" -" [-]icanon использовать специальные символы erase, kill, werase, и " -"rprnt\n" -" [-]iexten использовать специальные символы, не описанные в стандарте\n" -" POSIX\n" +" [-]isig использовать специальные символы interrupt, quit, и suspend\n" +" [-]noflsh запретить сброс буфера после приема специальных символов\n" +" interrupt и quit\n" +"* [-]prterase синоним [-]echoprt\n" +"* [-]tostop приостанавливать фоновые программе, пытающиеся произвести\n" +" запись на терминал\n" +"* [-]xcase отображать «\\» для заглавных букв, используется с icanon\n" -#: src/stty.c:672 +#: src/stty.c:843 +#, fuzzy 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 "" " [-]isig использовать специальные символы interrupt, quit, и suspend\n" " [-]noflsh запретить сброс буфера после приема специальных символов\n" @@ -10653,11 +10912,33 @@ msgstr "" " запись на терминал\n" "* [-]xcase отображать «\\» для заглавных букв, используется с icanon\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -10667,41 +10948,50 @@ msgstr "" " cbreak синоним -icanon\n" " -cbreak синоним icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 синоним brkint ignpar istrip icrnl ixon opost isig icanon,\n" " символы eof and eol имеют значения по умолчанию\n" " -cooked синоним raw\n" " crt синоним echoe echoctl echoke\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -" dec синоним echoe echoctl echoke -ixany intr ^c erase 0177 kill " -"^u\n" -"* [-]decctlq синоним [-]ixany\n" -" ek установить для символов erase and kill значения по " -"умолчанию\n" -" evenp синоним parenb -parodd cs7\n" -#: src/stty.c:699 +#: src/stty.c:919 +#, fuzzy 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 "" " -evenp синоним -parenb cs8\n" "* [-]lcase синоним xcase iuclc olcuc\n" @@ -10710,7 +11000,19 @@ msgstr "" " nl синоним -icrnl -onlcr\n" " -nl синоним icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"Комбинации настроек:\n" +"* [-]LCASE синоним [-]lcase\n" +" cbreak синоним -icanon\n" +" -cbreak синоним icanon\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10724,11 +11026,12 @@ msgstr "" " pass8 синоним -parenb -istrip cs8\n" " -pass8 синоним parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw синоним -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" @@ -10736,14 +11039,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw синоним cooked\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane синоним cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10752,7 +11056,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, все специальные\n" " символы установлены в их значения по умолчанию\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10768,12 +11072,12 @@ msgstr "" "или задаются в как ^c, 0x37, 0177 или 127; для отмены специальных символов\n" "служат значения ^- и undef.\n" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "можно задать только одно устройство" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10782,45 +11086,50 @@ msgstr "" "ключи для вывода в виде, читаемом человеком и читаемом программой stty,\n" "взаимоисключающие" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "при задании стиля вывода нельзя устанавливать режим" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: невозможно переинициализировать неблокирующий режим" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "неверный аргумент %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "пропущен аргумент для %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: ошибка при усечении" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "неверные настройки линии (line discipline) %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: невозможно произвести все запрошенные действия" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: для этого устройства нет сведений о размерах" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "неверный целый аргумент %s" #. This is a proper name. See the gettext manual, section Names. @@ -10829,8 +11138,15 @@ msgid "Kayvan Aghaiepour" msgstr "Кайван Агхаипур (Kayvan Aghaiepour)" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Печатает контрольную сумму (CRC) и число байт для каждого ФАЙЛА.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -10843,20 +11159,54 @@ msgstr "" " -s, --sysv использовать алгоритм вычисления контрольных сумм как в\n" " System V, размер блока 512 байт\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, fuzzy, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Использование: %s [КЛЮЧ]… [ФАЙЛ]…\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Записывает измененные блоки на диск, обновляет суперблок\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "ошибка чтения %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: невозможно переинициализировать неблокирующий режим" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "ошибка чтения %s" -#: src/sync.c:69 +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "все аргументы проигнорированы" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10870,17 +11220,25 @@ msgstr "" "документации по вашей оболочке, чтобы узнать, какие ключи она\n" "поддерживает.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help показать эту справку и выйти\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr "" " --version показать информацию о версии и выйти\n" "\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -10888,7 +11246,7 @@ msgstr "" "\n" "Аргументы, обязательные для длинных ключей, обязательны и для коротких.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10900,7 +11258,7 @@ msgstr "" "(пример: 10K это 10*1024). Единицы изменения:\n" "K, M, G, T, P, E, Z, Y (степень 1024) или KB, MB, … (степень 1000).\n" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10914,7 +11272,7 @@ msgstr "" "Иначе, единицей по умолчанию является 1024 байта (или 512, если\n" "установлена POSIXLY_CORRECT).\n" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -10927,23 +11285,27 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "Об ошибках в переводе сообщений «%s» сообщайте по адресу \n" -#: src/system.h:584 +#: src/system.h:604 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "Full documentation at: <%s%s>\n" msgstr "" -"Полная документация доступна по команде: info coreutils '%s invocation'\n" -#: src/system.h:591 +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "" + +#: src/system.h:613 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "По команде «%s --help» можно получить дополнительную информацию.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10964,9 +11326,8 @@ msgid "Jay Lepreau" msgstr "Джей Лепро (Jay Lepreau)" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "Печатает ФАЙЛЫ на стандартный вывод, начиная с последней строки.\n" "Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" @@ -10983,63 +11344,62 @@ msgstr "" " -s, --separator=СТРОКА использовать как разделитель СТРОКУ, а не символ\n" " новой строки\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: перемещение по файлу завершилось неудачно" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "запись слишком велика" -#: src/tac.c:450 +#: src/tac.c:459 #, c-format msgid "failed to create temporary file in %s" msgstr "не удалось создать временный файл в %s" -#: src/tac.c:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" msgstr "не удалось открыть %s на запись" -#: src/tac.c:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" msgstr "не удалось отмотать поток для %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: ошибка записи" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "не удалось открыть %s для чтения" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "разделитель не может быть пустым" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ян Ланс Тейлор (Ian Lance Taylor)" -#: src/tail.c:262 -#, c-format +#: src/tail.c:257 +#, 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" msgstr "" "Печатает последние %d строк каждого из ФАЙЛОВ на стандартный вывод.\n" "Если задано несколько ФАЙЛОВ, сначала печатает заголовок с именем файла.\n" "Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" @@ -11047,7 +11407,7 @@ msgstr "" " -c, --bytes=Н показать последние Н байт; или укажите -c +Н,\n" " чтобы начать вывод каждого файла с Н-го байта\n" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -11059,7 +11419,7 @@ msgstr "" " при отсутствии ключа используется «descriptor»\n" " -F эквивалент --follow=name --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -11084,7 +11444,7 @@ msgstr "" " файлов системных журналов); при использовании\n" " механизма inotify этот параметр не требуется\n" -#: src/tail.c:293 +#: src/tail.c:288 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -11096,7 +11456,7 @@ msgstr "" " --retry продолжать пытаться открыть файл даже когда он\n" " недоступен\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -11110,7 +11470,7 @@ msgstr "" " не менее чем раз в С секунд\n" " -v, --verbose всегда выводить заголовки с именами файлов\n" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -11128,7 +11488,7 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024 и так далее для T, P, E, Z, Y.\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -11149,22 +11509,22 @@ msgstr "" "создан\n" "какой-то другой программой.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "закрытие %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: невозможно переместить указатель позиции на %s относительно конца" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "невозможно определить расположение %s, возвращаемся к методу опросом" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -11173,157 +11533,157 @@ msgstr "" "неизвестный тип файловой системы 0x%08lx для %s. Сообщите об этом в %s. " "Возвращаемся к опросу." -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "%s был замещён символьной ссылкой, конец вывода для этого имени" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s стал недоступен" -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" "%s был замещён файлом, для которого tail неприменим; конец вывода для этого " "имени" -#: src/tail.c:1006 +#: src/tail.c:999 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "%s был замещён файлом удалённым файлом, конец вывода для этого имени" -#: src/tail.c:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s стал доступен" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s появился; начат вывод для нового файла" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s был замещен; вывод продолжается для нового файла" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: невозможно изменить неблокирующий режим" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: файл усечен" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "больше нет файлов" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "невозможно наблюдать за родительским каталогом %s" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "исчерпаны ресурсы inotify" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "не удалось провести наблюдение %s" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: заменить %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "ошибка отслеживания события inotify" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "ошибка чтения события inotify" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: невозможно следить за концом файла такого типа; вывод продолжается для " "нового файла" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "число в %s слишком велико" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "" "%s: неверное максимальное число не изменявшихся параметров между открытиями" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: неверный PID" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: неверное число секунд" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "неверное число столбцов: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "ключ использован в неверном контексте -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" "предупреждение: --retry игнорируется; ключ --retry полезен только при " "следовании" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "предупреждение: --retry полезен только при первом открытии" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" "предупреждение: PID игнорируется; ключ --pid=PID полезен только при " "следовании" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "предупреждение: --pid=PID не поддерживается на этой системе" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "невозможно следовать за %s по имени" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" "предупреждение: бесконечное слежение за стандартным вводом неэффективно" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "невозможно использовать inotify, возвращаемся к методу опроса" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -11335,60 +11695,72 @@ msgstr "" " -a, --append дописать в заданные ФАЙЛЫ\n" " -i, --ignore-interrupts игнорировать сигналы прерывания\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Если ФАЙЛ задан как -, копирует обратно на стандартный вывод.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "пропущен аргумент после %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "неверное целое число %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "ожидается «)»" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "ожидается «)», найдено %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: ожидается унарный оператор" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt не допускает -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef не допускает -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot не допускает -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "неизвестный бинарный оператор" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: ожидается бинарный оператор" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11402,13 +11774,13 @@ msgstr "" " или: [ ]\n" " или: [ КЛЮЧ\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" msgstr "Выходной статус определяется ВЫРАЖЕНИЕМ.\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11419,7 +11791,7 @@ msgstr "" "ВЫРАЖЕНИЕ может быть истинным либо ложным; оно устанавливает выходной\n" "статус программы. Выходное значение определяется следующим образом:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11433,7 +11805,7 @@ msgstr "" " ВЫРАЖЕНИЕ1 -a ВЫРАЖЕНИЕ2 ВЫРАЖЕНИЕ1 и ВЫРАЖЕНИЕ2 оба истинны\n" " ВЫРАЖЕНИЕ1 -o ВЫРАЖЕНИЕ2 ВЫРАЖЕНИЕ1 или ВЫРАЖЕНИЕ2 истинно\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11449,7 +11821,7 @@ msgstr "" " СТРОКА1 = СТРОКА2 строки равны\n" " СТРОКА1 != СТРОКА2 строки не равны\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11467,7 +11839,7 @@ msgstr "" " ЦЕЛОЕ1 -lt ЦЕЛОЕ2 ЦЕЛОЕ1 меньше ЦЕЛОГО2\n" " ЦЕЛОЕ1 -ne ЦЕЛОЕ2 ЦЕЛОЕ1 отлично от ЦЕЛОГО2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11480,7 +11852,7 @@ msgstr "" " ФАЙЛ1 -nt ФАЙЛ2 ФАЙЛ1 изменялся позже, чем ФАЙЛ2\n" " ФАЙЛ1 -ot ФАЙЛ2 ФАЙЛ1 был создан позже, чем ФАЙЛ2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11495,7 +11867,7 @@ msgstr "" " -d ФАЙЛ ФАЙЛ существует и является каталогом\n" " -e ФАЙЛ ФАЙЛ существует\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11509,7 +11881,7 @@ msgstr "" " -h ФАЙЛ ФАЙЛ существует и является символьной ссылкой (эквивалент -L)\n" " -k ФАЙЛ ФАЙЛ существует и имеет флаг sticky\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11524,7 +11896,7 @@ msgstr "" " -r ФАЙЛ ФАЙЛ существует доступен для чтения\n" " -s ФАЙЛ ФАЙЛ существует и имеет ненулевой размер\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11538,7 +11910,7 @@ msgstr "" " -w ФАЙЛ ФАЙЛ существует и доступен для записи\n" " -x ФАЙЛ ФАЙЛ существует и является исполняемым\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11553,7 +11925,7 @@ msgstr "" "символа «\\»). ЦЕЛОЕ может также быть задано как «-l СТРОКА», при этом\n" "оно принимает значение длины СТРОКИ.\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11563,25 +11935,25 @@ msgstr "" "ЗАМЕЧАНИЕ: [ все имеют ключи --help и --version, но test нет.\n" "test считает каждый из них обычной не пустой СТРОКОЙ.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test и/или [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Кевин Браунсдорф (Kevin Braunsdorf)" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Мэттью Бредберн (Matthew Bradburn)" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "пропущена «]»" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "лишний аргумент %s" @@ -11601,7 +11973,7 @@ msgstr "предупреждение: timer_settime" msgid "warning: timer_create" msgstr "предупреждение: timer_create" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11610,13 +11982,13 @@ msgstr "" "Использование: %s [КЛЮЧ] ПРОДОЛЖИТЕЛЬНОСТЬ КОМАНДА [АРГ]…\n" " или: %s [КЛЮЧ]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" "Запускает КОМАНДУ и завершает её по истечении времени, задаваемого\n" "ПРОДОЛЖИТЕЛЬНОСТЬЮ.\n" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11651,7 +12023,7 @@ msgstr "" " СИГНАЛ может задаваться именем, например «HUP» или\n" " номером; cписок сигналов см. по команде «kill -l»\n" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11663,7 +12035,7 @@ msgstr "" "суффиксом: «s» (по умолчанию) — секунды, «m» — минуты, «h» — часы\n" "или «d» — дни.\n" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -11683,7 +12055,7 @@ msgstr "" "(9),\n" "то код завершения равен 128+9, а не 124.\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "предупреждение: не удалось отключить создание core" @@ -11698,6 +12070,11 @@ msgstr "ошибка ожидания команды" msgid "the monitored command dumped core" msgstr "отслеживаемая команда завершилась созданием дампа" +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "неизвестный код возврата команды (0x%X)" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -12074,12 +12451,12 @@ msgstr "Выходит с успешным статусом." msgid "Exit with a status code indicating failure." msgstr "Выходит с кодом, указывающим на неудачное завершение." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Использование: %s КЛЮЧ… ФАЙЛ…\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -12097,18 +12474,18 @@ msgstr "" "Если ФАЙЛ короче, то он расширяется, и это место\n" "читается как нулевые байты.\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create не создавать файлов\n" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" " -o, --io-blocks считать РАЗМЕР числом блоков вв/вывода, а не " "байтов\n" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" @@ -12117,7 +12494,7 @@ msgstr "" " -s, --size=РАЗМЕР установить или подогнать размер файла\n" " под РАЗМЕР байт\n" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -12130,57 +12507,62 @@ msgstr "" "«>» — не менее, «/» — округлить с сторону уменьшения,\n" "«%» — округлить в сторону увеличения.\n" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "переполнение в % * % байтовых блоков для файла %s" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s имеет нерабочий, вероятно, отрицательный размер" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "невозможно получить размер %s" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "переполнение при округлении размера в сторону увеличения файла %s" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "переполнение при расширении размера файла %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "не удалось усечь %s на % байт" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "задано несколько относительных модификаторов" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "неверный номер %s" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "вы должны задать что-то одно: %s или %s" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "вы должны задать относительный %s с %s" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "указан %s, но без %s" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "невозможно открыть %s для записи" @@ -12191,12 +12573,10 @@ msgid "Mark Kettenis" msgstr "Марк Киттенис (Mark Kettenis)" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Использование: %s [КЛЮЧ] [ФАЙЛ]\n" "Печатает полностью сортированный список, соответствующий частичной " @@ -12205,12 +12585,17 @@ msgstr "" "ввод.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: на входе содержится нечётное число лексем" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: на входе содержится цикл:" @@ -12277,9 +12662,8 @@ 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" +#, fuzzy +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "Преобразует пробелы в ФАЙЛАХ в символы табуляции и печатает на\n" "стандартный вывод. Если ФАЙЛ не задан или задан как -, читает\n" @@ -12339,9 +12723,10 @@ msgstr "" " одну для каждой группы\n" #: src/uniq.c:187 +#, fuzzy msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" " -D, --all-repeated[=МЕТОД] вывести все повторяющиеся строки;\n" @@ -12353,9 +12738,10 @@ msgid " -f, --skip-fields=N avoid comparing the first N fields\n" msgstr " -f, --skip-fields=Н не сравнивать первые Н полей\n" #: src/uniq.c:195 +#, fuzzy msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" " --group[=МЕТОД] показать все элементы, разделяя группы пустой " @@ -12516,11 +12902,6 @@ msgstr "" " Процессы в\n" "состоянии непрерывного сна также влияют на среднюю загруженность.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -12543,12 +12924,17 @@ msgstr "" "задают %s.\n" "\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -12566,12 +12952,13 @@ msgstr "" " -m, --chars напечатать количество символов\n" " -l, --lines напечатать количество новых строк\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=Ф читать ввод из файлов, имена которых\n" @@ -12739,10 +13126,10 @@ msgstr "" "пользователя. Аналогично вызову id -un.\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: невозможно определить имя пользователя для ID %lu\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "невозможно определить имя пользователя для ID %s" #: src/yes.c:41 #, c-format @@ -12761,6 +13148,231 @@ msgstr "" "Непрерывно печатает заданную СТРОКУ(и) или, если СТРОКА не задана, то «y».\n" "\n" +#~ msgid "input line is too short, no numbers found to convert in field %ld" +#~ msgstr "" +#~ "входная строка слишком коротка, нет чисел для преобразования в поле %ld" + +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "-t подразумевается, если ДЛИНА_СТРАНИЦЫ <= 10. Если ФАЙЛ не задан или\n" +#~ "задан как -, то читает стандартный ввод.\n" + +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Если ФАЙЛ не задан или задан как -, читает стандартный ввод.\n" +#~ "По умолчанию — «-F /».\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Записывает измененные блоки на диск, обновляет суперблок\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "все аргументы проигнорированы" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: недопустимое число" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s настолько велико, что его невозможно машинно представить" + +#~ msgid "number of lines" +#~ msgstr "число строк" + +#~ msgid "number of bytes" +#~ msgstr "число байт" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: неверное число для исключения" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: неверное число байт" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: неверное число строк" + +#~ msgid "number in %s is too large" +#~ msgstr "число в %s слишком велико" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: неверное число секунд" + +#~ msgid "failed to %s supplemental groups" +#~ msgstr "не удалось %s дополнительную группу(ы)" + +#~ 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 "" +#~ "\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" +#~ " 9387674624 байта (9.4 GB) скопировано, 34.6279 секунды, 271 MB/s\n" +#~ "\n" +#~ "Ключи:\n" +#~ "\n" + +#~ 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 СИМВОЛ СИМВОЛ будет вводить следующий символ, отменяя его\n" +#~ " специальное действие\n" +#~ " quit СИМВОЛ СИМВОЛ будет посылать сигнал выхода\n" +#~ "* rprnt СИМВОЛ СИМВОЛ будет перерисовывать текущую строку\n" +#~ " start СИМВОЛ СИМВОЛ будет возобновлять ввод\n" + +#~ 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 включить квитирование по RTS/CTS\n" +#~ " * [-]cdtrdsr включить квитирование по DTR/DSR\n" +#~ " csН установить размер символа равным Н бит, Н от 5 до 8\n" + +#~ 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 "" +#~ "\n" +#~ "Настройки вывода:\n" +#~ "* bsН значение паузы после забоя, допустимые Н [0..1]\n" +#~ "* crН значение паузы после возврата каретки, допустимые Н " +#~ "[0..3]\n" +#~ "* ffН значение паузы после перевода страницы, допустимые Н " +#~ "[0..1]\n" +#~ "* nlН значение паузы после новой строки, допустимые Н [0..1]\n" + +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ "* [-]ocrnl преобразовывать возврат каретки в перевод строки\n" +#~ "* [-]ofdel использовать символы стирания вместо NUL для заполнения\n" +#~ "* [-]ofill использовать символы заполнения для задержек\n" +#~ "* [-]olcuc преобразовывать строчные буквы в заглавные\n" +#~ "* [-]onlcr преобразовывать перевод строки в возврат каретки и новую " +#~ "строку\n" +#~ "* [-]onlret перевод строки производит возврат каретки\n" + +#~ 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 "" +#~ "* [-]onocr не печатать возврат каретки в первом столбце\n" +#~ " [-]opost форматировать вывод\n" +#~ "* tabН значение паузы после горизонтальной табуляции,\n" +#~ " допустимые Н [0..3]\n" +#~ "* tabs синоним tab0\n" +#~ "* -tabs синоним tab3\n" +#~ "* vtН значение паузы после вертикальной табуляции, допустимые Н " +#~ "[0..1]\n" + +#~ 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 "" +#~ "* [-]ctlecho отображать управляющие символы с крышкой («^c»)\n" +#~ " [-]echo отображать вводимые символы\n" +#~ "* [-]echoctl синоним [-]ctlecho\n" +#~ " [-]echoe синоним [-]crterase\n" +#~ " [-]echok отображать перевод строки после символа уничтожения\n" + +#~ 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 "" +#~ "* [-]echoke синоним [-]crtkill\n" +#~ " [-]echonl отображать перевод строки, даже если другие символы не\n" +#~ " отображаются\n" +#~ "* [-]echoprt выводить стираемые символы в обратном порядке, между «\\» " +#~ "и «/»\n" +#~ " [-]icanon использовать специальные символы erase, kill, werase, и " +#~ "rprnt\n" +#~ " [-]iexten использовать специальные символы, не описанные в " +#~ "стандарте\n" +#~ " POSIX\n" + +#~ 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 "" +#~ " dec синоним echoe echoctl echoke -ixany intr ^c erase 0177 " +#~ "kill ^u\n" +#~ "* [-]decctlq синоним [-]ixany\n" +#~ " ek установить для символов erase and kill значения по " +#~ "умолчанию\n" +#~ " evenp синоним parenb -parodd cs7\n" + +#~ msgid "For complete documentation, run: info coreutils '%s invocation'\n" +#~ msgstr "" +#~ "Полная документация доступна по команде: info coreutils '%s invocation'\n" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: невозможно определить имя пользователя для ID %lu\n" + #~ msgid "cannot create pipe" #~ msgstr "не удалось создать канал" @@ -13442,21 +14054,6 @@ msgstr "" #~ " -v, --verbose выводить диагностические сообщения для каждого " #~ "файла\n" -#~ msgid "" -#~ "Display the current time in the given FORMAT, or set the system date.\n" -#~ "\n" -#~ " -d, --date=STRING display time described by STRING, not `now'\n" -#~ " -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -#~ msgstr "" -#~ "Выводит текущее время в заданном ФОРМАТЕ, или устанавливает системное " -#~ "время.\n" -#~ "\n" -#~ " -d, --date=СТРОКА показать не текущее время, а время, " -#~ "описанное\n" -#~ " заданной СТРОКОЙ\n" -#~ " -f, --file=ФАЙЛ соответствует применению --date для каждой\n" -#~ " строки ФАЙЛА\n" - #~ msgid "" #~ "\n" #~ "SIZE may be (or may be an integer optionally followed by) one of " diff --git a/po/sk.gmo b/po/sk.gmo index eae113a4..253c5144 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sk.po b/po/sk.po index 9e6ce2ea..08359dfd 100644 --- a/po/sk.po +++ b/po/sk.po @@ -5,11 +5,12 @@ # Ján Ondrej , 2008. # Ivan Masár , 2007, 2008, 2012. # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils 8.18-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2012-07-03 01:06+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" @@ -37,18 +38,18 @@ msgstr "Platné argumenty sú:" msgid "error closing file" msgstr "chyba pri zatváraní súboru" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "chyba pri zápise" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "zachovávajú sa práva %s" @@ -233,57 +234,62 @@ msgstr "Reťazec parametrov nebol korektne zakódovaný" msgid "Unknown error" msgstr "Neznáma chyba" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: voľba `%s' nie je jednoznačná\n" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: prepínač `-W %s' nie je jednoznačný\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: prepínač `--%s' nepovoľuje argument\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: prepínač `%c%s' nepovoľuje argument\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, fuzzy, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: prepínač `%s' vyžaduje argument\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: neznámy prepínač `--%s'\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: neznámy prepínač `%c%s'\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: chybný prepínač -- %c\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: prepínač vyžaduje argument -- %c\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: prepínač `-W %s' nie je jednoznačný\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: prepínač `-W %s' nepovoľuje argument\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, fuzzy, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: prepínač `%s' vyžaduje argument\n" @@ -293,13 +299,13 @@ msgstr "%s: prepínač `%s' vyžaduje argument\n" msgid "cannot change permissions of %s" msgstr "nie je možné zmeniť práva %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "nie je možné vytvoriť adresár %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "vyčerpaná pamäť" @@ -348,6 +354,12 @@ msgstr "'" msgid "%s: end of file" msgstr "%s: koniec súboru" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: chyba pri čítaní" + #: lib/regcomp.c:131 msgid "Success" msgstr "Úspešné" @@ -455,7 +467,7 @@ msgstr "^[yYaAáÁ]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "nastavujú sa práva %s" @@ -902,7 +914,7 @@ msgstr "" "výstup.\n" "\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -918,15 +930,7 @@ msgstr "" " Použite 0 na zamedzenie zalamovania riadkov\n" "\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Bez SÚBORu alebo keď SÚBOR je - číta zo štand. vstupu.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -941,51 +945,51 @@ msgstr "" "pokus o zotavenie v prípade výskytu iných nealfabetických znakov\n" "v kódovanom toku.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "chyba pri čítaní" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "neplatný vstup" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "neplatná veľkosť zalamovania: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "nadbytočný operand %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "zatvára sa štandardný vstup" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1039,39 +1043,43 @@ msgstr "" " %s -a any/str1 any/str2 -> „str1” a následne „str2”\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "chýba operand" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Použitie: %s [PREPÍNAČ]... [SÚBOR]...\n" #: src/cat.c:92 #, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "zatvára sa štandardný vstup" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1089,7 +1097,7 @@ msgstr "" " -n, --number čísluje všetky výstupné riadky\n" " -s, --squeeze-blank prázdne riadky idúce po sebe redukuje na jediný\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1101,7 +1109,7 @@ msgstr "" " -u (ignorované)\n" " -v, --show-nonprinting použije zápis ^ a M-, okrem znakov LF a TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1114,17 +1122,18 @@ msgstr "" " %s f - g Výstup obsah f, potom štand. vstup, potom obsah g.\n" " %s Kopírovať štand. vstup na štand. výstup.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "nie je možné vykonať ioctl na %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "štandardný výstup" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: vstupný súbor je zároveň výstupným" @@ -1136,10 +1145,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1153,8 +1162,8 @@ msgstr "nie je možné vytvoriť bezpečnostný kontext: %s" msgid "failed to set %s security context component to %s" msgstr "nepodarilo sa nastaviť %s zložku bezpečnostného kontextu na %s" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "nepodarilo sa získať bezpečnostný kontext %s" @@ -1169,13 +1178,13 @@ msgstr "nie je možné použiť čiastočný kontext na súbor bez označenia %s 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:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "nie je možné pristupovať k %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "nie je možné načítať adresár %s" @@ -1191,7 +1200,7 @@ msgstr "zmena bezpečnostného kontextu %s\n" msgid "fts_read failed" msgstr "fts_read zlyhalo" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, fuzzy, c-format msgid "fts_close failed" @@ -1321,7 +1330,7 @@ msgid "-R -h requires -P" msgstr "-R -h vyžaduje -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1338,9 +1347,8 @@ msgid "conflicting security context specifiers given" msgstr "boli zadané konflitné špecifikátory kontextu" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "nepodarilo sa zistiť atribúty %s" @@ -1630,17 +1638,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "neplatná skupina %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "neplatný zoznam skupín %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1649,60 +1657,72 @@ msgstr "" "Použitie: %s NOVÝKOREŇ [PRÍKAZ...]\n" " alebo: %s VOĽBA\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" msgstr "" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" msgstr "" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "nie je možné zmeniť koreňový adresár na %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "nie je možné vojsť do koreňového adresára" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "nie je možné nastaviť ďalšie skupiny" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" +msgid "failed to set supplemental groups" msgstr "nie je možné nastaviť ďalšie skupiny" -#: src/chroot.c:402 +#: src/chroot.c:418 #, fuzzy, c-format msgid "failed to set group-ID" msgstr "nepodarilo sa nastaviť novú rolu %s" -#: src/chroot.c:405 +#: src/chroot.c:421 #, fuzzy, c-format msgid "failed to set user-ID" msgstr "nepodarilo sa nastaviť nového používateľa %s" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, fuzzy, c-format msgid "failed to run command %s" msgstr "nie je možné vykonať príkaz %s" @@ -1743,7 +1763,16 @@ msgstr "Použitie: %s [PREPÍNAČ]... SÚBOR1 SÚBOR2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Porovnať po riadkoch zotriedené súbory SÚBOR1 a SÚBOR2.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Bez SÚBORu alebo keď SÚBOR je - číta zo štand. vstupu.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1755,7 +1784,7 @@ msgstr "" "jedinečné pre SÚBOR1, druhý stĺpec obsahuje riadky jedinečné pre SÚBOR2,\n" "a tretí stĺpec obsahuje riadky spoločné obom súborom.\n" -#: src/comm.c:116 +#: src/comm.c:120 #, fuzzy msgid "" "\n" @@ -1768,7 +1797,7 @@ msgstr "" " -2 neukazuje riadky obsiahnuté iba v súbore SÚBOR2\n" " -3 neukazuje riadky spoločné obom súborom\n" -#: src/comm.c:122 +#: src/comm.c:126 #, fuzzy msgid "" "\n" @@ -1788,17 +1817,17 @@ msgstr "" " --help vypíše tuto nápovedu a skončí\n" " --version vypíše označenie verzie a skončí\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1807,312 +1836,326 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "uvedených viacero oddeľovačov" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "nie je možné vykonať lseek %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "chyba pri čítaní %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "nie je možné vykonať lseek %s" +msgid "error reading %s" +msgstr "chyba pri čítaní %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "chyba pri zápise %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "chyba pri čítaní %s" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "nepodarilo sa zistiť aktuálny kontext" -#: src/copy.c:383 +#: src/copy.c:478 #, fuzzy, c-format msgid "%s: write failed" msgstr "chyba pri zápise" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "nepodarilo sa otvoriť %s" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "čistia sa oprávnenia %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "nepodarilo sa zachovať vlastníctvo %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "nepodarilo sa vyhľadať súbor %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "nepodarilo sa zachovať autorstvo %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, fuzzy, c-format msgid "failed to set default file creation context to %s" msgstr "zisťujem atribúty %s" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "zisťujem atribúty %s" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "nie je možné nastaviť bezpečnostný kontext %s na %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "nie je možné otvoriť %s pre čítanie" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "nie je možné vykonať fstat %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "preskakuje sa súbor %s, keďže bol nahradený počas kopírovania" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "nie je možné odstrániť %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "odstránené %s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "nezapisuje sa prostredníctvom visiaceho symbolického odkazu %s" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "nie je možné vytvoriť obyčajný súbor %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" msgstr "nie je možné zatvoriť adresár %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "zachovávam časy %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "nepodarilo sa otvoriť %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, fuzzy, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: prepísať %s bez ohľadu na práva %04lo? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: prepísať %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr "(záloha: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, 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:1706 +#: src/copy.c:1795 #, fuzzy, c-format msgid "cannot create hard link %s to %s" msgstr "nie je možné vytvoriť adresár %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "nie je možné stat() %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "vynecháva sa adresár %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, 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:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s a %s predstavujú ten istý súbor" -#: src/copy.c:1939 +#: src/copy.c:2019 #, 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:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "nie je možné prepísať práve vytvorený %s súborom %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, 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:1989 +#: src/copy.c:2069 #, 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:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "nie je možné zálohovať %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, fuzzy, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "nie je možné vytvoriť adresár %s" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "upozornenie: zdrojový súbor %s uvedený viac ako jedenkrát" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, fuzzy, c-format msgid "cannot move %s to %s" msgstr "ioctl na `%s' nie je možné vykonať" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "nie je možné skopírovať zacyklený symbolický odkaz %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, fuzzy, c-format msgid "cannot create symbolic link %s to %s" msgstr "nie je možné vytvoriť adresár %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, fuzzy, c-format msgid "cannot create fifo %s" msgstr "nie je možné vytvoriť adresár %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, fuzzy, c-format msgid "cannot create special file %s" msgstr "pozícia znaku je nula" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, fuzzy, c-format msgid "cannot read symbolic link %s" msgstr "ioctl na `%s' nie je možné vykonať" -#: src/copy.c:2583 +#: src/copy.c:2676 #, fuzzy, c-format msgid "cannot create symbolic link %s" msgstr "nie je možné vytvoriť adresár %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s je neznámy typ souboru" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, fuzzy, c-format msgid "cannot un-backup %s" msgstr "nie je možné spustiť %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (obnovenie zálohy)\n" @@ -2122,25 +2165,25 @@ msgstr "%s -> %s (obnovenie zálohy)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, fuzzy, c-format msgid "unknown program %s" msgstr "Neznáma systémová chyba" @@ -2453,8 +2496,8 @@ msgstr "%s existuje, ale nie je adresárom" msgid "failed to access %s" msgstr "nepodarilo sa otvoriť %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "chýba operand súboru" @@ -2526,138 +2569,145 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "vstup sa stratil" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: číslo riadku je mimo rozsah" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: číslo riadka je mimo rozsahu" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " v opakovaní %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: zhoda nenájdená" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "chyba pri vyhľadávaní pomocou regulárneho výrazu" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "chyba pri zápise do %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: po oddeľovači sa očakáva celé číslo" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: '}' je požadovaná v počítadle opakovaní" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: medzi `{' a `}' musí byť celé číslo" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: chýba koncový oddeľovač „%c“" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: chybný regulárny výraz: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: chybný vzor" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: číslo riadku musí byť väčšie ako nula" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "v parametri prepínača chýba určenie typu konverzie" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "chybne zadaný typ konverzie v parametri prepínača: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "chybne zadaný typ konverzie v parametri prepínača: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "%s: chybne zadaná položka `%s'" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "príliš mnoho typov konverzie %% v parametri prepínača" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "v parametri prepínača chýba zadanie typu konverzie pomocou %%" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: chybné číslo" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "neplatné číslo %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Použitie: %s [PREPÍNAČ]... SÚBOR VZOROV...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "štandardný vstup je uzavrený" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2665,26 +2715,21 @@ msgid "" " -k, --keep-files do not remove output files on errors\n" msgstr "" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 msgid "" "\n" +"Each PATTERN may be:\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" @@ -2708,14 +2753,14 @@ msgstr "Použitie: %s [VOĽBA]... [SÚBOR]...\n" msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" -#: src/cut.c:182 +#: src/cut.c:183 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:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2723,20 +2768,20 @@ msgid "" " -n (ignored)\n" msgstr "" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" -#: src/cut.c:197 +#: src/cut.c:198 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:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2744,7 +2789,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:210 +#: src/cut.c:211 msgid "" "Each range is one of:\n" "\n" @@ -2752,58 +2797,56 @@ msgid "" " 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:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "chybný zoznam bajtov alebo položiek" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "" -#: src/cut.c:320 +#: src/cut.c:319 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "chybný typ reťazca `%s'" -#: src/cut.c:334 -#, fuzzy +#: src/cut.c:333 src/numfmt.c:1417 +#, fuzzy, c-format msgid "invalid decreasing range" msgstr "neplatné číslo" -#: src/cut.c:383 +#: src/cut.c:382 #, fuzzy, c-format msgid "byte offset %s is too large" msgstr "%s je príliš veľa" -#: src/cut.c:386 +#: src/cut.c:385 #, fuzzy, c-format msgid "field number %s is too large" msgstr "číslo položky je nula" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "môže byť zadaný iba jeden typ zoznamu" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "oddeľovač musí byť jediný znak" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "musíte zadat zoznam bajtov, znakov alebo položiek" -#: src/cut.c:790 +#: src/cut.c:789 #, 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2811,11 +2854,11 @@ msgstr "" "potlačenie riadkov neobsahujúcich oddeľovač, má význam iba\n" "\tpri použití pracuje s poľami" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "chýba zoznam položiek" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "chýba zoznam pozícií" @@ -2833,35 +2876,64 @@ msgid "Display the current time in the given FORMAT, or set the system date.\n" msgstr "" #: src/date.c:134 +#, fuzzy +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" +"Vypísať aktuálny čas v zadanom FORMÁTE alebo nastaviť systémový čas.\n" +"\n" +" -d, --date=REŤAZEC zobraziť čas zadaný REŤAZCOM namiesto `teraz'\n" +" -f, --file=SÚBOR ako --date pre každý riadok SÚBORU\n" +" -I, --iso-8601[=ŠPEC] vypísať dátum/čas v ISO-8601 formáte.\n" +" ŠPEC=`date' (alebo nič) pre samotný dátum,\n" +" `hours', `minutes', alebo `seconds' pre dátum\n" +" a čas po zadanú presnosť.\n" +" -r, --reference=SÚBOR zobraziť čas poslednej zmeny SÚBORU\n" +" -R, --rfc-822 vypísať čas vo formáte vyhovujúcom RFC-822\n" +" -s, --set=REŤAZEC nastaviť čas zadaný REŤAZCOM\n" +" -u, --utc, --universal vypísať alebo nastaviť univerzálny svetový čas\n" +" --help vypísať túto pomoc a skončiť\n" +" --version vypísať informáciu o verzii a skončiť\n" + +#: src/date.c:138 +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" +msgstr "" + +#: src/date.c:145 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" -#: src/date.c:142 +#: src/date.c:149 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" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" -#: src/date.c:147 +#: src/date.c:155 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 (UTC)\n" +" -r, --reference=FILE display the last modification time of FILE\n" msgstr "" #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2869,7 +2941,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2877,7 +2949,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2885,14 +2957,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:177 +#: src/date.c:183 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 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2900,7 +2972,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2908,7 +2980,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2919,7 +2991,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2927,7 +2999,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:209 +#: src/date.c:215 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" @@ -2935,7 +3007,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2943,7 +3015,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2955,7 +3027,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2966,7 +3038,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2975,7 +3047,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -2989,35 +3061,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "štandardný vstup" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "neplatný dátum %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, fuzzy, c-format msgid "multiple output formats specified" msgstr "\\%c: neprípustná sekvencia" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3028,23 +3100,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:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "nie je možné nastaviť dátum" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3053,7 +3125,7 @@ msgstr "" "Použitie: %s [SÚBOR]...\n" " alebo: %s [VOĽBA]\n" -#: src/dd.c:532 +#: src/dd.c:561 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3073,7 +3145,7 @@ msgstr "" " count=BLOKOV skopírovať iba BLOKOV vstupných blokov\n" " ibs=BAJTOV čítať BAJTOV bajtov naraz\n" -#: src/dd.c:541 +#: src/dd.c:570 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3083,8 +3155,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\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" @@ -3096,7 +3170,7 @@ msgstr "" " skip=BLOKOV preskočiť BLOKOV s veľkosťou ibs na začiatku vstupu\n" " status=noxfer potlačiť výpis štatistiky prenosu\n" -#: src/dd.c:552 +#: src/dd.c:583 #, fuzzy msgid "" "\n" @@ -3115,7 +3189,7 @@ msgstr "" "Každý symbol KONV môže byť:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3143,7 +3217,7 @@ msgstr "" " keď sa použije s block alebo unblock, vyplniť medzerami namiesto " "NULL\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3159,7 +3233,7 @@ msgstr "" " fdatasync pred ukončením fyzicky zapísať údaje\n" " fsync podobne, ale zapísať aj metadáta\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3173,133 +3247,98 @@ msgstr "" " append režim pridávania (zmysluplné iba pre výstup; navrhuje sa " "conv=notrunc)\n" -#: src/dd.c:589 +#: src/dd.c:620 #, fuzzy msgid " cio use concurrent I/O for data\n" msgstr " text použiť pre dáta textový V/V\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct použiť pre dáta priamy V/V\n" -#: src/dd.c:593 +#: src/dd.c:624 #, fuzzy msgid " directory fail unless a directory\n" msgstr "%s existuje, ale nie je adresárom" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync použiť pre dáta synchronizovaný V/V\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync podobne, ale aj pre metadáta\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock použiť neblokoujúci V/V\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime neaktualizovať čas posledného prístupu\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty nepriraďovať zo súboru riadiaci terminál\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow nenasledovať symbolické odkazy\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks skončiť neúspešne pri viacnásobnom odkaze\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary použiť pre dáta binárny V/V\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text použiť pre dáta textový V/V\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 -#, fuzzy, c-format +#: src/dd.c:661 +#, 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 "" -"\n" -"Poslaním signálu %s bežiacemu procesu „dd“ spôsobíte, že\n" -"vypíše štatistiku V/V na štandardný chybový výstup a bude pokračovať v " -"kopírovaní.\n" -"\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ kill -%s $pid; sleep 1; kill $pid\n" -" 18335302+0 záznamov prečítaných\n" -" 18335302+0 záznamov zapísaných\n" -" 9387674624 skopírovaných bajtov (9.4 GB), 34.6279 sekúnd, 271 MB/s\n" -"\n" -"Voľby sú:\n" -"\n" - -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "" -#: src/dd.c:698 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:721 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -"%+% záznamov prečítaných\n" -"%+% záznamov zapísaných\n" - -#: src/dd.c:754 -#, fuzzy, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "skrátený záznam" -msgstr[1] "skrátený záznam" -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" @@ -3307,7 +3346,7 @@ msgstr[0] "% byte (%s) copied" msgstr[1] "% skopírované bajty (%s)" msgstr[2] "% skopírovaných bajtov (%s)" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "nekonečno B" @@ -3321,87 +3360,103 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% záznamov prečítaných\n" +"%+% záznamov zapísaných\n" + +#: src/dd.c:834 +#, fuzzy, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "skrátený záznam" +msgstr[1] "skrátený záznam" + +#: src/dd.c:920 #, fuzzy, c-format msgid "closing input file %s" msgstr "vytváram súbor `%s'\n" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "zatváram výstupný súbor %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, fuzzy, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "zmena skupiny %s na %s zlyhala\n" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "zápis do %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "neznámy operand %s" -#: src/dd.c:1285 +#: src/dd.c:1376 #, fuzzy msgid "invalid conversion" msgstr "neplatná konverzia: %s" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 #, fuzzy msgid "invalid input flag" msgstr "neplatný vstupný prepínač: %s" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 #, fuzzy msgid "invalid output flag" msgstr "neplatný výstupný prepínač: %sneplatná skupina" -#: src/dd.c:1294 +#: src/dd.c:1385 #, fuzzy -msgid "invalid status flag" +msgid "invalid status level" msgstr "neplatný stavový prepínač: %s" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "neplatné číslo %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, 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:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "nie je možné skombinovať block a unblock" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "nie je možné skombinovať lcase a ucase" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "nie je možné skombinovať excl a nocreat" -#: src/dd.c:1424 +#: src/dd.c:1527 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "nie je možné skombinovať excl a nocreat" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3410,62 +3465,62 @@ msgstr "" "upozornenie: obchádza sa chyba jadra vo funkcii lseek v súbore (%s)\n" " mt_type=0x%0lx -- pozri zoznam typov v " -#: src/dd.c:1670 +#: src/dd.c:1773 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s: nie je možné vyhľadať" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: nie je možné vyhľadať" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "pretečenie pozície pri čítaní súboru %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, 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:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "nakoniec nie je možné obísť chybu jadra" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "nastavujem príznaky %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "nie je možné vytvoriť adresár %s" -#: src/dd.c:2172 +#: src/dd.c:2288 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "presúvam sa za %s bajtov vo výstupnom súbore %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync zlyhalo na %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "fsync zlyhalo na %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "nepodarilo sa otvoriť %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3474,19 +3529,19 @@ msgstr "" "hodnota pozície je príliš veľká: nie je možné skrátiť na dĺžku seek=" "% (%lu-bajtových) blokov" -#: src/dd.c:2306 +#: src/dd.c:2422 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "presúvam sa za %s bajtov vo výstupnom súbore %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, fuzzy, c-format msgid "failed to discard cache for: %s" msgstr "zmena skupiny %s na %s zlyhala\n" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3567,12 +3622,12 @@ msgstr "Kapacita" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 #, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" @@ -3584,14 +3639,14 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 #, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3601,7 +3656,7 @@ msgstr "" "(napr., 1K 234M 2G)\n" " -H, --si podobne, ale používať násobky 1000, nie 1024\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3616,7 +3671,7 @@ msgstr "" " --no-sync nevyvolávať sync pred získaním informácií o využití " "(štandardne)\n" -#: src/df.c:1409 +#: src/df.c:1429 #, fuzzy msgid "" " --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" @@ -3624,6 +3679,24 @@ msgid "" "omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" +msgstr "" +" -P, --portability použiť výstup vo formáte POSIX\n" +" --sync vyvolať sync pred získaním informácií o využití\n" +" -t, --type=TYP obmedziť výpis iba na súborové systémy typu TYP\n" +" -T, --print-type vypísať typ súborového systému\n" +" -x, --exclude-type=TYP obmedziť výpis iba na súborové systémy, ktoré " +"nie sú typu TYP\n" +" -v (ignoruje sa)\n" + +#: src/df.c:1435 +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3637,7 +3710,7 @@ msgstr "" "nie sú typu TYP\n" " -v (ignoruje sa)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3645,26 +3718,26 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, 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:1610 +#: src/df.c:1636 #, 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:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Upozornenie: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 #, 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:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "neboli spracované žiadne súborové systémy" @@ -3781,7 +3854,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3792,7 +3865,8 @@ msgstr "" #: src/du.c:285 #, fuzzy -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Vypísať zhrnutie využitia disku každým SÚBORom, rekurzívne prechádzať " "adresáre.\n" @@ -3917,63 +3991,57 @@ msgstr "" msgid "Infinity" msgstr "nekonečno B" -#: src/du.c:636 +#: src/du.c:657 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fts_read zlyhalo" -#: src/du.c:787 +#: src/du.c:808 #, fuzzy, c-format msgid "invalid maximum depth %s" msgstr "chybné číslo položky: `%s'" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "chybný argument %s pre `%s'" -#: src/du.c:898 +#: src/du.c:919 #, 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:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "upozornenie: sumarizácia je v konflikte s --max-depth=%lu" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 #, 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:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: chyba pri čítaní" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 #, fuzzy msgid "invalid zero-length file name" msgstr "neplatná skupina" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "celkom" @@ -4091,9 +4159,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\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" @@ -4137,7 +4203,7 @@ msgid "input line is too long" msgstr "vstupný riadok je príliš dlhý" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4251,12 +4317,12 @@ msgstr "chyba pri vyhľadávaní pomocou regulárneho výrazu" msgid "non-integer argument" msgstr "nečíselný argument" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "delenie nulou" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "nastavením LC_ALL='C' obídete tento problém" @@ -4267,31 +4333,31 @@ msgid "the strings compared were %s and %s" msgstr "Porovnávané reťazce boli %s a %s." #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s nie je platné kladné celé číslo" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s je príliš veľa" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4300,7 +4366,7 @@ msgstr "" "Použitie: %s [ČÍSLO]...\n" " alebo: %s VOĽBA\n" -#: src/factor.c:2443 +#: src/factor.c:2533 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4344,7 +4410,7 @@ msgid "" "The option -WIDTH is an abbreviated form of --width=DIGITS.\n" msgstr "" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4357,7 +4423,7 @@ msgstr "" "formátom\n" " -s, --split-only iba rozdelí dlhé riadky\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, fuzzy, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4369,34 +4435,32 @@ 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:359 +#: src/fmt.c:356 #, 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" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "neplatná šírka: %s" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" -#: src/fold.c:77 +#: src/fold.c:76 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" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "neplatný počet stĺpcov: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4463,12 +4527,11 @@ msgstr "nie je možné nastaviť ID používateľa" msgid "%s: no such user" msgstr "%s: Používateľ neexistuje" -#: src/head.c:109 +#: src/head.c:110 #, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "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 " @@ -4476,7 +4539,7 @@ msgstr "" "súboru. Ak SÚBOR nebude zadaný alebo bude -, načíta sa štandardný vstup.\n" "\n" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4486,13 +4549,13 @@ msgid "" " K lines of each file\n" msgstr "" -#: src/head.c:125 +#: src/head.c:126 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 +#: src/head.c:132 #, fuzzy msgid "" "\n" @@ -4508,49 +4571,36 @@ msgstr "" "Každý symbol KONV môže byť:\n" "\n" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: počet bajtov je príliš veľký" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: nie je možné presunúť sa na pozíciu %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, fuzzy, c-format msgid "%s: cannot seek to relative offset %s" msgstr "nie je možné vytvoriť adresár %s" -# src/tail.c:968 -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "počet riadkov" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "počet bajtov" +msgid "%s: number of bytes is too large" +msgstr "%s: počet bajtov je príliš veľký" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "chybný počet riadkov" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "chybný počet bajtov" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "chybná posledná voľba -- %c" @@ -4741,7 +4791,7 @@ msgstr "nie je možné zmeniť práva %s" msgid "cannot set time stamps for %s" msgstr "nie je možné vytvoriť adresár %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, fuzzy, c-format msgid "fork system call failed" msgstr "veľkosť bloku" @@ -4862,7 +4912,7 @@ 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:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, fuzzy, c-format msgid "invalid mode %s" msgstr "chybné číslo položky: `%s'" @@ -4897,15 +4947,19 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +msgid "" "\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:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -4913,7 +4967,7 @@ msgid "" " -t CHAR use CHAR as input and output field separator\n" msgstr "" -#: src/join.c:210 +#: src/join.c:216 #, fuzzy msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" @@ -4937,11 +4991,11 @@ msgstr "" " --help vypíše tuto nápovedu a skončí\n" " --version vypíše označenie verzie a skončí\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -4960,47 +5014,47 @@ msgid "" "warning message will be given.\n" msgstr "" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, fuzzy, c-format msgid "invalid field number: %s" msgstr "chybné číslo položky: `%s'" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, fuzzy, c-format msgid "invalid field specifier: %s" msgstr "chybne zadaná položka: `%s'" -#: src/join.c:884 +#: src/join.c:890 #, fuzzy, c-format msgid "invalid file number in field spec: %s" msgstr "chybné číslo súboru v popise položky: `%s'" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, fuzzy, c-format msgid "multi-character tab %s" msgstr "viacznakový tabulátor `%s'" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "nekompatibilné tabulátory" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "obidva súbory nemôžu byť štandardným vstupom" @@ -5082,17 +5136,17 @@ msgstr "nie je možné kombinovať signál s voľbou -l alebo -t" msgid "no process ID specified" msgstr "nebol zadaný ID procesu" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, fuzzy, c-format msgid "invalid buffering mode %s for %s\n" msgstr "neplatný argument %s pre %s" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -5245,7 +5299,7 @@ msgstr "nie je možné vytvoriť adresár %s" msgid "FIXME: unknown" msgstr "FIXME: neznámy" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Použitie: %s [VOĽBA]\n" @@ -5256,7 +5310,7 @@ msgid "" "\n" msgstr "" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "žiadne prihlasovacie meno" @@ -5266,7 +5320,7 @@ msgstr "žiadne prihlasovacie meno" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -5275,102 +5329,102 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "ignoruje sa neplatná hodnota premennej prostredia QUOTING_STYLE: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "ignorujem chybnú šírku v premennej prostredia COLUMNS: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "ignorujem chybný rozostup tabulátorov v premennej prostredia TABSIZE: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "neplatná šírka riadka: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "neplatná veľkosť tabulátora: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "neplatný formát času: %s" -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "Platné argumenty sú:" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "neznáma predpona: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "nezrozumiteľná hodnota v premennej prostredia LS_COLORS" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "ignoruje sa neplatná hodnota premennej prostredia QUOTING_STYLE: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "nie je možné otvoriť adresár %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "nie je možné určiť zariadenie a inode pre %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: nevypisuje sa už vypísaný adresár" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "číta sa adresár %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "zatvíra sa adresár %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "nie je možné porovnať názvy súborov %s a %s" -#: src/ls.c:4781 +#: src/ls.c:4775 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:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5379,7 +5433,7 @@ msgid "" "characters\n" msgstr "" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5393,18 +5447,19 @@ msgid "" " otherwise: sort by ctime, newest first\n" msgstr "" -#: src/ls.c:4804 +#: src/ls.c:4798 msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5414,11 +5469,11 @@ msgid "" " --full-time like -l --time-style=full-iso\n" msgstr "" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5427,7 +5482,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5435,7 +5490,7 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5448,7 +5503,7 @@ msgid "" " (overridden by -a or -A)\n" msgstr "" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5460,7 +5515,7 @@ msgid "" " -k, --kibibytes default to 1024-byte blocks for disk usage\n" msgstr "" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5470,7 +5525,7 @@ msgid "" "entries\n" msgstr "" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5481,7 +5536,7 @@ msgid "" " append / indicator to directories\n" msgstr "" -#: src/ls.c:4871 +#: src/ls.c:4866 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" @@ -5526,7 +5581,7 @@ msgstr "" " -R, --recursive vypísať adresáre rekurzívne\n" " -s, --size vypísať veľkosť každého súboru v blokoch\n" -#: src/ls.c:4881 +#: src/ls.c:4876 #, fuzzy msgid "" " -r, --reverse reverse order while sorting\n" @@ -5535,21 +5590,21 @@ msgid "" "blocks\n" msgstr " -R, --recursive vypíše adresáre rekurzívne\n" -#: src/ls.c:4886 +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -5563,31 +5618,32 @@ msgid "" " takes effect only outside the POSIX locale\n" msgstr "" -#: src/ls.c:4908 +#: src/ls.c:4904 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:4912 +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" -#: src/ls.c:4919 +#: src/ls.c:4915 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 security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5596,7 +5652,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5625,46 +5681,47 @@ msgstr "David Madore" 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 "" "Použitie: %s [VOĽBA] [SÚBOR]...\n" "Vypíše alebo skontroluje kontrolné súčty %s (%d-bit).\n" " Pokiaľ nie je SÚBOR zadaný, načíta sa štandardný vstup.\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 #, fuzzy msgid "" +"\n" " -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:178 +#: src/md5sum.c:180 #, fuzzy -msgid " -b, --binary read in binary mode\n" +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary čítať v binárnom režime\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:192 +#: src/md5sum.c:195 #, fuzzy msgid " -t, --text read in text mode (default)\n" msgstr " -b, --binary čítať v binárnom režime\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -5676,45 +5733,46 @@ msgid "" "\n" msgstr "" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, 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:545 +#: src/md5sum.c:548 #, fuzzy, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %lu: nesprávne sformátovaný riadok %s kontrolného súčtu" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: ZLYHALO otvorenie alebo čítanie\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "CHYBNÝ" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "V PORIADKU" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, 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:629 +#: src/md5sum.c:632 #, fuzzy, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" @@ -5722,7 +5780,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:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" @@ -5730,7 +5788,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" @@ -5738,39 +5796,39 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, 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:777 +#: src/md5sum.c:780 #, 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:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, 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" @@ -5807,22 +5865,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "zisťujem atribúty %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "nie je možné zachovať časy %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "bol vytvorený adresár %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6000,7 +6058,7 @@ msgstr "príliš veľa šablón" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" @@ -6131,9 +6189,7 @@ msgstr "Scott Bartram" #: src/nl.c:179 #, fuzzy -msgid "" -"Write each FILE to standard output, with line numbers added.\n" -"With no FILE, or when FILE is -, read standard input.\n" +msgid "Write each FILE to standard output, with line numbers added.\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" @@ -6212,27 +6268,27 @@ msgstr "neplatný štýl číslovania tela: %s" msgid "invalid footer numbering style: %s" msgstr "neplatný štýl číslovania pätičky: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "neplatné počiatočné číslo riadka: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "neplatná hodnota prírastku čísla riadka: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "neplatný počet prázdnych riadkov: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "neplatná šírka poľa čísla riadku: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "neplatný formát číslovania riadkov: %s" @@ -6256,7 +6312,7 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6268,43 +6324,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "obidva súbory nemôžu byť štandardným vstupom" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "ignoruje sa vstup" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "pridáva sa výstup k %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "" @@ -6326,96 +6382,93 @@ msgid "" " --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: chybný počet riadkov" - #. This is a proper name. See the gettext manual, section Names. -#: src/numfmt.c:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, fuzzy, c-format msgid "value too large to be converted: %s" msgstr "%s: hodnota nebola úplne prevedená" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "neplatné číslo %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "naplatná prípona v argumente %s%s „%s“" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "%s: nepodarilo sa otvoriť na zápis" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "neplatná veľkosť tabulátora: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Použitie: %s [PREPÍNAČ]... [SÚBOR]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6423,19 +6476,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -6445,40 +6498,40 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" msgstr "" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6487,7 +6540,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -6495,7 +6548,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -6503,7 +6556,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -6511,7 +6564,19 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -6520,9 +6585,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -6534,7 +6600,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -6549,118 +6615,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, fuzzy, c-format msgid "format %s has no %% directive" msgstr "cieľ %s nie je adresárom" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "neplatná šírka vo formáte" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "chybný typ reťazca `%s'" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "naplatná prípona v argumente %s%s „%s“" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "chybné číslo položky: `%s'" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "chybný rozsah stránok %s" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "chybné číslo položky: `%s'" +msgid "multiple field specifications" +msgstr "%s: chybne zadaná položka `%s'" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "neplatný dátum %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, 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:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "uvedených viacero volieb -i" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, 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:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "chyba pri čítaní %s" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, 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:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6673,18 +6751,17 @@ msgstr "" " alebo: %s --traditional [VOĽBA]... [SÚBOR] [[+]POSUN[.][b] [+][NÁVESTIE]" "[.][b]]\n" -#: src/od.c:326 +#: src/od.c:327 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:333 +#: src/od.c:335 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" @@ -6693,7 +6770,7 @@ msgid "" "suffixes may be . for octal and b for multiply by 512.\n" msgstr "" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -6702,7 +6779,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -6715,7 +6792,7 @@ msgid "" " --traditional accept arguments in third form above\n" msgstr "" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -6726,7 +6803,7 @@ msgid "" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -6736,7 +6813,7 @@ msgid "" " -x same as -t x2, select hexadecimal 2-byte units\n" msgstr "" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -6745,7 +6822,7 @@ msgid "" " c printable character or backslash escape\n" msgstr "" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6754,7 +6831,7 @@ msgid "" " x[SIZE] hexadecimal, SIZE bytes per integer\n" msgstr "" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -6763,14 +6840,14 @@ msgid "" "for sizeof(double) or L for sizeof(long double).\n" msgstr "" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 #, fuzzy msgid "" "\n" @@ -6791,12 +6868,12 @@ msgstr "" "Každý symbol KONV môže byť:\n" "\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "neplatný reťazec typu %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -6805,7 +6882,7 @@ msgstr "" "neplatný reťazec typu %s;\n" "tento systém neposkytuje %lu-bajtové celé čísla" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -6815,38 +6892,38 @@ msgstr "" "tento systém neposkytuje %lu-bajtové čísla s plávajúcou desatinnou\n" "čiarkou" -#: src/od.c:869 +#: src/od.c:872 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "neplatný znak „%c“ v reťazci typu „%s“" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "nemožno preskočiť koniec kombinovaného vstupu" -#: src/od.c:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "pri vypisovaní reťazcov nemožno zadať typ" -#: src/od.c:1863 +#: src/od.c:1871 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "V kompatibilnom režime je podporovaný najviac jeden súbor." -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "upozornenie: chybná šírka %lu; namiesto nej sa použije %d" @@ -6866,7 +6943,6 @@ msgstr "štandardný vstup je uzavrený" 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 "" "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" @@ -7002,12 +7078,12 @@ msgstr "Kedy" msgid "Where" msgstr "Kde " -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Použitie: %s [PREPÍNAČ]... [SÚBOR]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7017,7 +7093,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7026,7 +7102,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -7034,7 +7110,7 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7042,91 +7118,91 @@ msgstr "" "aspoň jedno" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, 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:910 +#: src/pr.c:907 #, fuzzy, c-format msgid "invalid page range %s" msgstr "chybný rozsah stránok %s" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "„-l DĹŽKA_STRÁNKY“ neplatný počet riadkov: %s" -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "„-N ČÍSLO“ chybné číslo počiatočného riadka: %s" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "„-o OKRAJ“ chybný posun riadka: %s" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "„-w ŠÍRKA_STRÁNKY“ neplatný počet znakov: %s" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "„-W ŠÍRKA_STRÁNKY“ neplatný počet znakov: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, 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:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "šírka stránky je príliš malá" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" -#: src/pr.c:2380 +#: src/pr.c:2350 #, fuzzy, c-format msgid "page number overflow" msgstr "Pretečenie čísla strany" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7136,7 +7212,7 @@ msgid "" " columns on each page\n" msgstr "" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7146,7 +7222,7 @@ msgid "" " double space the output\n" msgstr "" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7158,7 +7234,7 @@ msgid "" " and trailer without -F)\n" msgstr "" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7171,16 +7247,33 @@ msgid "" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -#: src/pr.c:2798 +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" Porovnáva súbory ĽAVÝ_SÚBOR a PRAVÝ_SÚBOR, ktorých riadky sú usporiadané\n" +"podľa nejakého kľúča, riadok po riadku. Výstupom sú tri stĺpce, riadky " +"obsiahnuté\n" +"iba v ľavom súbore, riadky obsiahnuté iba v pravom súbore, riadky spoločné\n" +"obom súborom.\n" +"\n" +" -1 neukazuje riadky obsiahnuté iba v ľavom súbore\n" +" -2 neukazuje riadky obsiahnuté iba v pravom súbore\n" +" -3 neukazuje riadky spoločné obom súborom\n" +" --help vypíše tuto nápovedu a skončí\n" +" --version vypíše označenie verzie a skončí\n" + +#: src/pr.c:2775 +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7190,7 +7283,7 @@ msgid "" " page printed (see +FIRST_PAGE)\n" msgstr "" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7199,7 +7292,7 @@ msgid "" " omit warning when a file cannot be opened\n" msgstr "" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7210,17 +7303,22 @@ msgid "" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -#: src/pr.c:2828 +#: src/pr.c:2802 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7234,7 +7332,7 @@ msgid "" "(72)\n" msgstr "" -#: src/pr.c:2845 +#: src/pr.c:2822 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -7255,16 +7353,6 @@ msgstr "" " --help vypíše tuto nápovedu a skončí\n" " --version vypíše označenie verzie a skončí\n" -#: src/pr.c:2853 -#, fuzzy -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"Bez SÚBORu alebo keď SÚBOR je - číta zo štand. vstupu.\n" - #: src/printenv.c:62 #, fuzzy, c-format msgid "" @@ -7398,15 +7486,20 @@ msgid "" "files.\n" msgstr "" -#: src/ptx.c:1830 +#: src/ptx.c:1831 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:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -7414,7 +7507,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7424,7 +7517,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7432,20 +7525,16 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Bez SÚBORu alebo keď SÚBOR je - číta zo štand. vstupu.\n" - #: src/ptx.c:1951 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "chybné číslo položky: `%s'" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "neplatná šírka riadka: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -7469,7 +7558,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "zmena skupiny %s na %s zlyhala\n" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "zlyhalo stat() %s" @@ -7489,8 +7578,8 @@ msgstr "ignurujú sa argumenty, ktoré nie sú voľbami" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Použitie: %s [VOĽBA]... [SÚBOR]...\n" @@ -7680,16 +7769,16 @@ msgstr "" #: src/rm.c:342 #, fuzzy, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: odstrániť všetky argumenty? " msgstr[1] "%s: odstrániť všetky argumenty? " msgstr[2] "%s: odstrániť všetky argumenty? " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: odstrániť všetky argumenty? " msgstr[1] "%s: odstrániť všetky argumenty? " msgstr[2] "%s: odstrániť všetky argumenty? " @@ -7881,12 +7970,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "neplatný argument s plávajúcou desatinnou čiarkou: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s je neznámy typ souboru" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -7904,7 +7993,16 @@ msgid "" "for even very expensive hardware probing to recover the data.\n" msgstr "" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Bez SÚBORu alebo keď SÚBOR je - číta zo štand. vstupu.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -7913,7 +8011,7 @@ msgid "" " -s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n" msgstr "" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -7922,11 +8020,9 @@ msgid "" " -z, --zero add a final overwrite with zeros to hide shredding\n" msgstr "" -#: src/shred.c:192 +#: src/shred.c:196 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.\n" @@ -7938,7 +8034,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -7949,7 +8045,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -7961,7 +8057,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -7970,7 +8066,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -7982,134 +8078,134 @@ msgid "" "\n" msgstr "" -#: src/shred.c:241 +#: src/shred.c:243 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:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync zlyhalo" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync zlyhal" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: nie je možné presunúť sa na začiatok súboru" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: prechod %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: chyba pri zápise na ofset %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek zlyhal" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: súbor je príliš veľký" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: prechod %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: prechod %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat zlyhal" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: neplatný typ súboru" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: súbor má zápornú dĺžku" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: chyba pri skracovaní" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl zlyhalo" -#: src/shred.c:994 +#: src/shred.c:996 #, 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:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: maže sa" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: premenovaný na %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: nepodarilo sa odstrániť" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: zmazaný" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: nepodarilo sa zatvoriť" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: nepodarilo sa otvoriť na zápis" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: neplatný počet prechodov" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "boli uvedené viaceré náhodné zdroje" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: neplatná veľkosť súboru" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -8120,11 +8216,11 @@ msgstr "" " alebo: %s -e [VOĽBA]... [ARG]...\n" " alebo: %s -i LO-HI [VOĽBA]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -8135,37 +8231,37 @@ msgid "" " -r, --repeat output lines can be repeated\n" msgstr "" -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "príliš veľa zopakovaných riadkov" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "uvedených viacero volieb -i" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "neplatný rozash vstupu %s" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "naplatný počet riadkov %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "uvedených viacero výstupných súborov" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "nie je možné kombinovať voľby -e a -i" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -8193,12 +8289,12 @@ 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:323 +#: src/sleep.c:135 src/timeout.c:325 #, fuzzy, c-format msgid "invalid time interval %s" msgstr "chybné číslo položky: `%s'" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "nie je možné prečítať hodiny reálneho času" @@ -8207,13 +8303,13 @@ msgstr "nie je možné prečítať hodiny reálneho času" msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:437 +#: src/sort.c:438 #, fuzzy msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" @@ -8235,19 +8331,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:443 +#: src/sort.c:444 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:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8255,7 +8351,7 @@ msgid "" " -r, --reverse reverse the result of comparisons\n" msgstr "" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8265,19 +8361,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -8286,7 +8382,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8295,13 +8391,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8309,7 +8405,7 @@ msgid "" " -S, --buffer-size=SIZE use SIZE for main memory buffer\n" msgstr "" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8324,7 +8420,7 @@ msgid "" "run\n" msgstr "" -#: src/sort.c:511 +#: src/sort.c:512 #, fuzzy msgid "" "\n" @@ -8355,129 +8451,127 @@ msgstr "" "\n" "VEĽKOSŤ môže byť nasledovaná nasledovnými príponami násobkov:\n" -#: src/sort.c:524 +#: src/sort.c:525 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:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "4ak8 sa na %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:884 +#: src/sort.c:883 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "nie je možné vytvoriť dočasný súbor %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "zlyhalo otvorenie" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "fflush zlyhalo" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "zlyhalo zatvorenie súboru" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "nebolo možné vytvoriť dočasný súbor" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "nie je možné vytvoriť proces pre %s -d" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "upozornenie: nie je možné odstrániť: %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "chybný argument %s pre `%s'" -#: src/sort.c:1341 +#: src/sort.c:1340 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "neplatný %s%s argument „%s“" -#: src/sort.c:1356 +#: src/sort.c:1355 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s%s argument „%s“ je príliš veľký" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "zlyhal stat" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "zlyhalo čítanie" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "transformácia reťazca sa nepodarila" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "netransformovaný reťazec bol %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -8485,352 +8579,358 @@ 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:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "chyba pri zápise" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: nezotriediteľné: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "štandardná chyba" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "nie je možné spustiť %s" -#: src/sort.c:4017 +#: src/sort.c:4016 #, fuzzy, c-format msgid "%s: invalid field specification %s" msgstr "%s: chybne zadaná položka `%s'" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "" -#: src/sort.c:4079 +#: src/sort.c:4078 #, fuzzy, c-format msgid "%s: invalid count at start of %s" msgstr "%s: chybný počet na začiatku `%s'" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "chybné číslo za `-'" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "chybné číslo za `.'" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "neočakávaný znak v špecifikácii položky" -#: src/sort.c:4403 +#: src/sort.c:4402 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "\\%c: neprípustná sekvencia" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "chybné číslo na začiatku položky" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "číslo položky je nula" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "pozícia znaku je nula" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "chybné číslo za `,'" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "prázdna záložka" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, fuzzy, c-format msgid "cannot read file names from %s" msgstr "nie je možné vytvoriť odkaz %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "neplatná skupina" -#: src/sort.c:4619 +#: src/sort.c:4618 #, fuzzy, c-format msgid "no input from %s" msgstr "vytváram súbor `%s'\n" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, 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:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 +#: src/split.c:224 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Použitie: %s [PREPÍNAČ] [SÚBOR [PREDPONA]]\n" -#: src/split.c:207 +#: src/split.c:228 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "vytvára sa súbor %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "nepodarilo sa nastaviť novú rolu %s" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "nepodarilo sa odstrániť %s" -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" msgstr "zatvíra sa adresár %s" -#: src/split.c:410 +#: src/split.c:464 #, fuzzy, c-format msgid "closing output pipe" msgstr "zatváram výstupný súbor %s" -#: src/split.c:414 +#: src/split.c:468 #, fuzzy, c-format msgid "moving input pipe" msgstr "vytváram súbor `%s'\n" -#: src/split.c:416 +#: src/split.c:470 #, fuzzy, c-format msgid "closing input pipe" msgstr "vytváram súbor `%s'\n" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "nepodarilo sa zmeniť bezpečnostný kontext %s na %s" -#: src/split.c:427 +#: src/split.c:481 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "nie je možné zatvoriť adresár %s" -#: src/split.c:463 +#: src/split.c:517 #, fuzzy, c-format msgid "waiting for child process" msgstr "chyba pri zápise %s" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "súbor sa nedá rozdeliť viacerými spôsobmi" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: neplatný počet sekúnd" -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: chybné číslo" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: neplatná dĺžka prípony" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: chybný počet bajtov" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: chybný počet riadkov" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "viacznakový tabulátor `%s'" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "znakový špeciálny súbor" -#: src/split.c:1286 +#: src/split.c:1383 #, 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:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "neplatné počiatočné číslo riadka: %s" -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: neplatná veľkosť súboru" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "nepodarilo sa otvoriť %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "upozornenie: nerozpoznaná úniková klauzula „\\%c“" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: neplatná direktíva" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "upozornenie: spätná lomka na konci reťazca" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, 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:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -8841,7 +8941,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -8849,30 +8949,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, fuzzy, c-format msgid "Context: %C\n" msgstr "neplatný kontexxt: %s" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -8880,17 +8980,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -8900,7 +9000,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -8912,7 +9012,7 @@ msgid "" " %C SELinux security context string\n" msgstr "" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -8922,7 +9022,7 @@ msgid "" " %G group name of owner\n" msgstr "" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -8935,7 +9035,7 @@ msgid "" " %T minor device type in hex, for character/block device special files\n" msgstr "" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -8950,7 +9050,7 @@ msgid "" "\n" msgstr "" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -8961,7 +9061,7 @@ msgid "" " %f free blocks in file system\n" msgstr "" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9021,8 +9121,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -9047,7 +9146,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "nie je možné nastaviť bezpečnostný kontext %s na %s" -#: src/stty.c:516 +#: src/stty.c:524 #, fuzzy, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9058,11 +9157,11 @@ msgstr "" " alebo: %s [-F ZARIADENIE] [--file=ZARIADENIE] [-a|--all]\n" " alebo: %s [-F ZARIADENIE] [--file=ZARIADENIE] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 #, fuzzy msgid "" " -a, --all print all current settings in human-readable form\n" @@ -9078,85 +9177,138 @@ msgstr "" " -F, --file=ZARIADENIE otvoriť a používať zadané zariadenie namiesto\n" " štandardného vstupu\n" -#: src/stty.c:535 +#: src/stty.c:543 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:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +msgid "" " 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 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:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" msgstr "" -#: src/stty.c:559 +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" + +#: src/stty.c:614 +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 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:578 +#: src/stty.c:632 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" +msgstr "" + +#: src/stty.c:637 +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:584 +#: src/stty.c:641 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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -9165,7 +9317,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb používať dva stop bity (jeden s „-“)\n" " [-]hup poslať signál zavesenia, keď posledný proces zatvorí " @@ -9174,7 +9325,11 @@ 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:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -9182,143 +9337,249 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +msgid "" " [-]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:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:619 +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +msgid "" " [-]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:627 +#: src/stty.c:712 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:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" -msgstr "" -"* [-]ocrnl prekladať znaky návratu na začiatok riadka na nové riadky\n" -"* [-]ofdel pre vyplnenie použiť znaky vymazania namiesto nulových " -"znakov\n" -"* [-]ofill použiť výplňové znaky namiesto oneskorení\n" -"* [-]olcuc prekladať malé znaky na veľké\n" -"* [-]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:643 -msgid "" -" * [-]onocr do not print carriage returns in the first column\n" -" [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 +msgid "" " * 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:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +msgid "" " * 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr "" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:672 +#: src/stty.c:843 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" +msgstr "" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:875 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:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -#: src/stty.c:699 +#: src/stty.c:919 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:707 +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -9327,25 +9588,27 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -9360,57 +9623,62 @@ msgstr "" "^c, 0x37, 0177 alebo 127; pre zákaz špeciálneho znaku treba použiť\n" "^- alebo undef.\n" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "môže byť zadané iba jedno zariadenie" -#: src/stty.c:830 +#: src/stty.c:1154 #, 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:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: nie je možné opustiť neblokovací režim" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, fuzzy, c-format msgid "invalid argument %s" msgstr "chybný argument %s pre `%s'" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, fuzzy, c-format msgid "missing argument to %s" msgstr "nejednoznačný argument %s pre `%s'" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: chyba pri skracovaní" + +#: src/stty.c:1331 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "chybné číslo položky: `%s'" -#: src/stty.c:1057 +#: src/stty.c:1401 #, 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:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: neexistuje informácia o veľkosti tohoto zariadenia" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "neplatný celočíselný argument %s" #. This is a proper name. See the gettext manual, section Names. @@ -9420,8 +9688,14 @@ msgstr "Kayvan Aghaiepour" #: src/sum.c:62 #, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Vypísať kontrolný súčet CRC a počet bajtov každého SÚBORu.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -9432,18 +9706,54 @@ msgstr "" "veľkosti 1 KB\n" " -s, --sysv použije algoritmus System V a bloky veľkosti 512 bajtov\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Použitie: %s [PREPÍNAČ] [SÚBOR]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" +"\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" msgstr "" -#: src/sync.c:69 +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "chyba pri čítaní %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: nie je možné opustiť neblokovací režim" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "chyba pri čítaní %s" + +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "ignorujú sa všetky argumenty" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -9452,15 +9762,23 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help zobrazí tohto pomocníka a skončí\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version vypíše informácie o verzii a skončí\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Bez SÚBORu alebo keď SÚBOR je - číta zo štand. vstupu.\n" + +#: src/system.h:544 #, fuzzy msgid "" "\n" @@ -9469,7 +9787,7 @@ msgstr "" "Povinné argumenty dlhých tvarov volieb sú taktiež povinné pre krátke tvary " "volieb.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -9477,7 +9795,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -9486,7 +9804,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, fuzzy, c-format msgid "" "\n" @@ -9497,22 +9815,27 @@ msgstr "Domovská stránka %s: <%s>\n" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" msgstr "" -#: src/system.h:591 +#: src/system.h:613 #, 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:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9534,9 +9857,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\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" @@ -9554,57 +9875,56 @@ msgstr "" " -s, --separator=REŤAZEC použije REŤAZEC ako oddeľovač namiesto nového " "riadku\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: zlyhalo posunutie v súbore" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "záznam je príliš dlhý" -#: src/tac.c:450 +#: src/tac.c:459 #, 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:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s: nepodarilo sa otvoriť na zápis" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "nie je možné zachovať časy %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: chyba pri zápise" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "nie je možné otvoriť %s pre čítanie" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "oddeľovač nemôže byť prázdny" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 +#: src/tail.c:257 #, 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" 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 " @@ -9612,13 +9932,13 @@ msgstr "" "súboru. Ak SÚBOR nebude zadaný alebo bude -, načíta sa štandardný vstup.\n" "\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -9626,7 +9946,7 @@ msgid "" " -F same as --follow=name --retry\n" msgstr "" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -9639,14 +9959,14 @@ msgid "" " with inotify, this option is rarely useful\n" msgstr "" -#: src/tail.c:293 +#: src/tail.c:288 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 if it is inaccessible\n" msgstr "" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -9655,7 +9975,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -9666,7 +9986,7 @@ msgid "" "\n" msgstr "" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -9676,176 +9996,176 @@ msgid "" "named file in a way that accommodates renaming, removal and creation.\n" msgstr "" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "zatvára sa %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, fuzzy, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "súbor `%s' bol nahradený iným, neumožňujúcim sledovanie jeho konca." -#: src/tail.c:980 +#: src/tail.c:973 #, fuzzy, c-format msgid "%s has become inaccessible" msgstr "`%s' sa stal nedostupným" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, fuzzy, c-format msgid "%s has become accessible" msgstr "`%s' sa stal dostupným" -#: src/tail.c:1035 +#: src/tail.c:1032 #, fuzzy, c-format -msgid "%s has appeared; following end of new file" +msgid "%s has appeared; following new file" msgstr "súbor %s sa objavil. Sledovanie konca súboru pokračuje." -#: src/tail.c:1046 +#: src/tail.c:1042 #, fuzzy, c-format -msgid "%s has been replaced; following end of new file" +msgid "%s has been replaced; following new file" msgstr "" "súbor %s bol nahradený iným. Sledovanie konca súboru\n" "pokračuje." -#: src/tail.c:1163 +#: src/tail.c:1159 #, fuzzy, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: nie je možné opustiť neblokovací režim" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: súbor bol skrátený" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "už nezostávajú žiadne súbory" -#: src/tail.c:1424 +#: src/tail.c:1440 #, fuzzy, c-format msgid "cannot watch parent directory of %s" msgstr "nie je možné stat() aktuálny adresár (%s)" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, fuzzy, c-format msgid "inotify resources exhausted" msgstr "vyčerpaná pamäť" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, fuzzy, c-format msgid "cannot watch %s" msgstr "nie je možné vykonať touch %s" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: prepísať %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1597 #, fuzzy, c-format msgid "error reading inotify event" msgstr "chyba pri čítaní %s" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: nie je možné sledovať koniec tohoto typu súboru; zanechávam tento názov" -#: src/tail.c:1961 -#, fuzzy, c-format -msgid "number in %s is too large" -msgstr "%s je príliš veľa" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "" "%s: neplatné číslo maximálneho počtu nezmenených výsledkov funkcie stat\n" "medzi otvoreniami" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: chybné PID" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: neplatný počet sekúnd" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "neplatný počet stĺpcov: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "" -#: src/tail.c:2096 +#: src/tail.c:2135 #, fuzzy, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" "upozornenie: PID bol ignorovaný; --pid=PID je užitočné iba pri nasledovaní" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" "upozornenie: PID bol ignorovaný; --pid=PID je užitočné iba pri nasledovaní" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "upozornenie: --pid=PID nie je na tomto systéme podporované" -#: src/tail.c:2209 +#: src/tail.c:2250 #, fuzzy, c-format msgid "cannot follow %s by name" msgstr "nie je možné vytvoriť dočasný súbor" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 #, fuzzy msgid "" "Copy standard input to each FILE, and also to standard output.\n" @@ -9860,58 +10180,72 @@ msgstr "" " --help vypísať túto pomoc a skončiť\n" " --version vypísať informáciu o verzii a skončiť\n" -#: src/tee.c:71 +#: src/tee.c:93 +msgid "" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" +msgstr "" + +#: src/tee.c:98 msgid "" "\n" -"If a FILE is -, copy again to standard output.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, fuzzy, c-format msgid "missing argument after %s" msgstr "nejednoznačný argument %s pre `%s'" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "neplatné celé číslo %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "očakávaný znak „)”" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "očakávaný znak „)”, nájdený %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: očakával sa unárny operátor" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt neakceptuje -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef neakceptuje -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot neakceptuje -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "neznámy binárny operátor" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: očakával sa binárny operátor" -#: src/test.c:704 +#: src/test.c:706 #, fuzzy msgid "" "Usage: test EXPRESSION\n" @@ -9923,13 +10257,13 @@ msgstr "" "Použitie: %s [SÚBOR]...\n" " alebo: %s [VOĽBA]\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" msgstr "" -#: src/test.c:717 +#: src/test.c:719 #, fuzzy msgid "" "\n" @@ -9941,7 +10275,7 @@ msgstr "" " --help vypíše túto nápovedu a skončí\n" " --version vypíše označenie verzie a skončí\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -9950,7 +10284,7 @@ msgid "" " EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n" msgstr "" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -9960,7 +10294,7 @@ msgid "" " STRING1 != STRING2 the strings are not equal\n" msgstr "" -#: src/test.c:737 +#: src/test.c:739 #, fuzzy msgid "" "\n" @@ -9989,7 +10323,7 @@ msgstr "" " CELÉČÍSLO1 -lt CELÉČÍSLO2 CELÉČÍSLO1 je menšie ako CELÉČÍSLO2\n" " CELÉČÍSLO1 -ne CELÉČÍSLO2 CELÉČÍSLO1 sa nerovná CELÉČÍSLO2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -9997,7 +10331,7 @@ msgid "" " FILE1 -ot FILE2 FILE1 is older than FILE2\n" msgstr "" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -10006,7 +10340,7 @@ msgid "" " -e FILE FILE exists\n" msgstr "" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -10015,7 +10349,7 @@ msgid "" " -k FILE FILE exists and has its sticky bit set\n" msgstr "" -#: src/test.c:766 +#: src/test.c:768 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" @@ -10024,7 +10358,7 @@ msgid "" " -s FILE FILE exists and has a size greater than zero\n" msgstr "" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -10033,7 +10367,7 @@ msgid "" " -x FILE FILE exists and execute (or search) permission is granted\n" msgstr "" -#: src/test.c:780 +#: src/test.c:782 #, fuzzy msgid "" "\n" @@ -10047,33 +10381,33 @@ msgstr "" "lomítkami. CELÉČÍSLO môže byť tiež -l REŤAZEC, čo sa vyhodnotí na\n" "dĺžku REŤAZCA.\n" -#: src/test.c:786 +#: src/test.c:788 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 +#: src/test.c:793 msgid "test and/or [" msgstr "test a/alebo [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 #, fuzzy msgid "missing ']'" msgstr "chýba „]”" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "argument %s je naviac" @@ -10093,7 +10427,7 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -10102,14 +10436,14 @@ msgstr "" "Použitie: %s VOĽBA POUŽÍVATEĽ PRÍKAZ [ARGUMENT]...\n" " alebo: %s VOĽBA\n" -#: src/timeout.c:232 +#: src/timeout.c:234 #, fuzzy msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" "Povinné argumenty dlhých tvarov volieb sú taktiež povinné pre krátke tvary " "volieb.\n" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -10127,7 +10461,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -10135,7 +10469,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -10146,7 +10480,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -10161,6 +10495,11 @@ msgstr "chyba pri zápise %s" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -10475,12 +10814,12 @@ msgstr "" msgid "Exit with a status code indicating failure." msgstr "" -#: src/truncate.c:96 +#: src/truncate.c:69 #, fuzzy, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Použitie: %s [VOĽBA]... [SÚBOR]...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -10491,23 +10830,23 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 #, fuzzy msgid " -c, --no-create do not create any files\n" msgstr " -d, --directory vytvoriť adresár, nie súbor\n" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -10515,57 +10854,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: súbor má zápornú dĺžku" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "súbor sa nedá rozdeliť viacerými spôsobmi" -#: src/truncate.c:205 +#: src/truncate.c:178 #, fuzzy, c-format msgid "overflow rounding up size of file %s" msgstr "pretečenie pozície pri čítaní súboru %s" -#: src/truncate.c:215 +#: src/truncate.c:188 #, fuzzy, c-format msgid "overflow extending size of file %s" msgstr "pretečenie pozície pri čítaní súboru %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, fuzzy, c-format msgid "failed to truncate %s at % bytes" msgstr "presúvam sa za %s bajtov vo výstupnom súbore %s" -#: src/truncate.c:303 +#: src/truncate.c:276 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "boli uvedené viaceré cieľové adresáre" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "neplatné číslo %s" + +#: src/truncate.c:307 #, 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:340 +#: src/truncate.c:314 #, 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:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "nie je možné otvoriť %s na čítanie" @@ -10576,12 +10920,10 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Použitie: %s [VOĽBA] [SÚBOR]\n" "Výstupom je úplne zotriedený zoznam v súlade s čiastočným zotriedením " @@ -10589,12 +10931,17 @@ msgstr "" " Pokiaľ nie je SÚBOR zadaný, načíta sa štandardný vstup.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: vstup obsahuje nepárny počet tokenov" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: vstup obsahuje cyklus:" @@ -10653,9 +11000,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\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" @@ -10700,8 +11045,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -10712,7 +11057,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -10858,11 +11203,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "" - #: src/uptime.c:214 #, fuzzy, c-format msgid "" @@ -10884,13 +11224,17 @@ msgstr "" "Pokiaľ nie je zadaný SÚBOR, použiť %s. %s ako SÚBOR je obvyklý.\n" "\n" -#: src/wc.c:117 -#, fuzzy +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -10905,13 +11249,13 @@ msgstr "" " -m, --chars vypíše počet znakov\n" " -l, --lines vypíše počet riadkov\n" -#: src/wc.c:128 +#: src/wc.c:134 #, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=F načítať vstup zo súborov na základe\n" @@ -11060,10 +11404,10 @@ msgstr "" "Rovnaké ako id -un.\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: nie je možné zistiť meno pre ID používateľa %lu\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "nie je možné zistiť meno pre ID používateľa %u\n" #: src/yes.c:41 #, c-format @@ -11080,6 +11424,115 @@ msgid "" "\n" msgstr "" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "Bez SÚBORu alebo keď SÚBOR je - číta zo štand. vstupu.\n" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Bez SÚBORu alebo keď SÚBOR je - číta zo štand. vstupu.\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "ignorujú sa všetky argumenty" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: chybné číslo" + +# src/tail.c:968 +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s je príliš veľký, preto nie je reprezentovateľný" + +#~ msgid "number of lines" +#~ msgstr "počet riadkov" + +#~ msgid "number of bytes" +#~ msgstr "počet bajtov" + +#, fuzzy +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: chybný počet riadkov" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: chybný počet bajtov" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: chybný počet riadkov" + +#, fuzzy +#~ msgid "number in %s is too large" +#~ msgstr "%s je príliš veľa" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: neplatný počet sekúnd" + +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "nie je možné nastaviť ďalšie skupiny" + +#, fuzzy +#~ 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 "" +#~ "\n" +#~ "Poslaním signálu %s bežiacemu procesu „dd“ spôsobíte, že\n" +#~ "vypíše štatistiku V/V na štandardný chybový výstup a bude pokračovať v " +#~ "kopírovaní.\n" +#~ "\n" +#~ " $ dd if=/dev/zero of=/dev/null& pid=$!\n" +#~ " $ kill -%s $pid; sleep 1; kill $pid\n" +#~ " 18335302+0 záznamov prečítaných\n" +#~ " 18335302+0 záznamov zapísaných\n" +#~ " 9387674624 skopírovaných bajtov (9.4 GB), 34.6279 sekúnd, 271 MB/s\n" +#~ "\n" +#~ "Voľby sú:\n" +#~ "\n" + +#, fuzzy +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ "* [-]ocrnl prekladať znaky návratu na začiatok riadka na nové " +#~ "riadky\n" +#~ "* [-]ofdel pre vyplnenie použiť znaky vymazania namiesto nulových " +#~ "znakov\n" +#~ "* [-]ofill použiť výplňové znaky namiesto oneskorení\n" +#~ "* [-]olcuc prekladať malé znaky na veľké\n" +#~ "* [-]onlcr prekladať nové riadky na znaky návratu na začiatok " +#~ "riadka\n" +#~ "* [-]onlret znak nového riadku prejde na začiatok riadka\n" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: nie je možné zistiť meno pre ID používateľa %lu\n" + #, fuzzy #~ msgid "cannot create pipe" #~ msgstr "nie je možné vytvoriť adresár %s" @@ -11368,29 +11821,6 @@ msgstr "" #~ msgid "invalid format precision" #~ msgstr "neplatná presnosť vo formáte" -#, fuzzy -#~ msgid "" -#~ "Display the current time in the given FORMAT, or set the system date.\n" -#~ "\n" -#~ " -d, --date=STRING display time described by STRING, not `now'\n" -#~ " -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -#~ msgstr "" -#~ "Vypísať aktuálny čas v zadanom FORMÁTE alebo nastaviť systémový čas.\n" -#~ "\n" -#~ " -d, --date=REŤAZEC zobraziť čas zadaný REŤAZCOM namiesto `teraz'\n" -#~ " -f, --file=SÚBOR ako --date pre každý riadok SÚBORU\n" -#~ " -I, --iso-8601[=ŠPEC] vypísať dátum/čas v ISO-8601 formáte.\n" -#~ " ŠPEC=`date' (alebo nič) pre samotný dátum,\n" -#~ " `hours', `minutes', alebo `seconds' pre dátum\n" -#~ " a čas po zadanú presnosť.\n" -#~ " -r, --reference=SÚBOR zobraziť čas poslednej zmeny SÚBORU\n" -#~ " -R, --rfc-822 vypísať čas vo formáte vyhovujúcom RFC-822\n" -#~ " -s, --set=REŤAZEC nastaviť čas zadaný REŤAZCOM\n" -#~ " -u, --utc, --universal vypísať alebo nastaviť univerzálny svetový " -#~ "čas\n" -#~ " --help vypísať túto pomoc a skončiť\n" -#~ " --version vypísať informáciu o verzii a skončiť\n" - #~ msgid "" #~ "\n" #~ "SIZE may be (or may be an integer optionally followed by) one of " @@ -11520,9 +11950,6 @@ msgstr "" #~ msgid "FIXME unknown" #~ msgstr "FIXME neznámy" -#~ msgid "Usage: %s [OPTION] [FILE]...\n" -#~ msgstr "Použitie: %s [PREPÍNAČ] [SÚBOR]...\n" - #~ msgid "Richard Stallman" #~ msgstr "Richard Stallman" diff --git a/po/sl.gmo b/po/sl.gmo index 6ae15cd2..e1a1edd9 100644 Binary files a/po/sl.gmo and b/po/sl.gmo differ diff --git a/po/sl.po b/po/sl.po index 04fce34b..bafc0563 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,16 +1,17 @@ # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU coreutils. -# Copyright (C) 1996, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. +# Copyright (C) 1996, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. # This file is distributed under the same license as the coreutils package. -# Primož Peterlin , 1996, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013. +# Primož Peterlin , 1996, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # Klemen Košir , 2011. -# $Id: coreutils-8.22-pre41.sl.po,v 1.1 2013/12/09 21:09:17 peterlin Exp $ +# $Id: coreutils-8.23-pre1.sl.po,v 1.2 2014/11/15 21:21:37 peterlin Exp $ # +#: src/stty.c:941 msgid "" msgstr "" -"Project-Id-Version: GNU coreutils 8.22-pre4\n" +"Project-Id-Version: GNU coreutils 8.23-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" -"PO-Revision-Date: 2013-12-09 22:09+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" +"PO-Revision-Date: 2014-11-15 22:21+0100\n" "Last-Translator: Primož Peterlin \n" "Language-Team: Slovenian \n" "Language: sl\n" @@ -38,18 +39,18 @@ msgstr "Veljavni argumenti so:" msgid "error closing file" msgstr "napaka pri zapiranju datoteke" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "napaka pri pisanju" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "ohranjajo se dovoljenja za %s" @@ -101,7 +102,7 @@ msgstr "znakovna enota" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "strnjeni podatki" #: lib/file-type.c:75 msgid "fifo" @@ -109,44 +110,39 @@ msgstr "FIFO" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "dveri" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "bločna enota" +msgstr "multipleksirana bločna enota" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "znakovna enota" +msgstr "multipleksirana znakovna enota" #: lib/file-type.c:87 -#, fuzzy msgid "multiplexed file" -msgstr "več vlog" +msgstr "multipleksirana datoteka" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "čudna datoteka" +msgstr "poimenovana datoteka" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "bločna enota" +msgstr "omrežna enota" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "prenesena datoteka s podatki" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "prenesena datoteka brez podatkov" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "vrata" #: lib/file-type.c:105 msgid "socket" @@ -154,7 +150,7 @@ msgstr "vtičnica" #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "izbledelo" #: lib/file-type.c:110 msgid "weird file" @@ -236,57 +232,62 @@ msgstr "Parametrični niz nepravilno kodiran" msgid "Unknown error" msgstr "Neznana napaka" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: izbira »%s« je dvoumna; možnosti:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: izbira »-W %s« je dvoumna\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: izbira »--%s« ne dovoljuje argumenta\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: izbira »%c%s« ne dovoljuje argumenta\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: izbira »--%s« zahteva argument\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: neprepoznana izbira »--%s«\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: neprepoznana izbira »%c%s«\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: neveljavna izbira -- '%c'\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: izbira zahteva argument -- '%c'\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: izbira »-W %s« je dvoumna\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: izbira »-W %s« ne dovoljuje argumenta\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: izbira »-W %s« zahteva argument\n" @@ -296,14 +297,14 @@ msgstr "%s: izbira »-W %s« zahteva argument\n" msgid "cannot change permissions of %s" msgstr "dovoljenj %s ni mogoče spremeniti" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "imenika %s ni mogoče ustvariti" # ! INEXACT -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "zmanjkalo pomnilnika" @@ -352,6 +353,12 @@ msgstr "«" msgid "%s: end of file" msgstr "%s: konec datoteke" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: napaka pri branju" + #: lib/regcomp.c:131 msgid "Success" msgstr "Uspešno" @@ -460,7 +467,7 @@ msgstr "^[jJdD]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "nastavljajo se dovoljenja za %s" @@ -897,7 +904,7 @@ msgstr "" "Base64 kodira ali dekodira DATOTEKO ali standardni vhod na standardni " "izhod.\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -912,15 +919,7 @@ msgstr "" "\\\n" " N=0 pomeni brez preloma vrstic\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Če DATOTEKA ni podana, ali pa je enaka -, beremo s standardnega vhoda.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -937,51 +936,51 @@ msgstr "" "druge\n" "znake izven abecede base64.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "napaka pri branju" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "neveljavni vhod" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "neveljavna širina: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "odvečni operand %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "zapira se standardni vhod" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1004,7 +1003,6 @@ msgstr "" "se izpiše ime datoteke brez pripone.\n" #: src/basename.c:60 -#, fuzzy msgid "" " -a, --multiple support multiple arguments and treat each as a NAME\n" " -s, --suffix=SUFFIX remove a trailing SUFFIX; implies -a\n" @@ -1012,7 +1010,7 @@ msgid "" msgstr "" " -a, --multiple podpiraj več argumentov in obravnavaj vsakega kot " "IME\n" -" -s, --suffix=PRIPONA odstrani PRIPONO\n" +" -s, --suffix=PRIPONA odstrani PRIPONO; privzema -a\n" " -z, --zero vrstice zaključi z znakom NUL namesto z LF\n" #: src/basename.c:67 @@ -1033,38 +1031,45 @@ msgstr "" " %s -a nekaj/niz1 nekaj/niz2 -> »niz1« ki mu sledi »niz2«\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "manjkajoč operand" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Uporaba: %s [IZBIRA]... [DATOTEKA]...\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"Vsebino vseh DATOTEK na vhodu združimo, uredimo in izpišemo na standarni " +"izhod.\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1083,7 +1088,7 @@ msgstr "" " -n, --number oštevilči vse izpisane vrstice\n" " -s, --squeeze-blank zaporedje več praznih vrstic skrči v eno\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1096,7 +1101,7 @@ msgstr "" " -v, --show-nonprinting krmilne znake razen LF in TAB izpiši kot ^ and " "M-\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1110,17 +1115,18 @@ msgstr "" "vsebino »g«.\n" " %s Prepiši vsebino standardnega vhoda na standardni izhod.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "ioctl na »%s« ni mogoč" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "standardni izhod" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: vhodna in izhodna datoteka sta isti" @@ -1132,10 +1138,10 @@ msgstr "Russel Coker" #. This is a proper name. See the gettext manual, section Names. #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58 -#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1149,8 +1155,8 @@ msgstr "ustvarjenje varnostnega konteksta ni uspelo: %s" msgid "failed to set %s security context component to %s" msgstr "nastavitev %s varnostnega konteksta na %s ni bila uspešna" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "branje varnostnega konteksta %s ni uspelo" @@ -1165,13 +1171,13 @@ msgstr "delnega konteksta ni mogoče uporabiti na neoznačeni datoteki %s" msgid "failed to change context of %s to %s" msgstr "zamenava konteksta %s na %s ni uspela" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "dostop do %s ni mogoč" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "imenika %s ni mogoče prebrati" @@ -1187,7 +1193,7 @@ msgstr "spreminja se varnostni kontekst %s\n" msgid "fts_read failed" msgstr "fts_read ni uspel" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1305,7 +1311,7 @@ msgid "-R -h requires -P" msgstr "-R -h zahteva -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1322,9 +1328,8 @@ msgid "conflicting security context specifiers given" msgstr "podana določila varnostnega konteksta si nasprotujejo" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "branje prilastkov (atributov) %s ni uspelo" @@ -1639,17 +1644,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "neveljavno ime skupine %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "neveljaven seznam skupin %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1658,7 +1663,7 @@ msgstr "" "Uporaba: %s [IZBIRA] NOVI_KOREN [UKAZ [ARGUMENT]...]\n" " ali: %s IZBIRA\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1666,15 +1671,26 @@ msgstr "" "Izvedemo UKAZ tako, da se korenski imenik postavi na KOREN.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" +" --userspec=UPORABNIK:SKUPINA določi uporabnika ali skupino (ID ali ime)\n" +" --groups=SEZNAM določi dodatne skupine (g1, g2,... gN)\n" + +#: src/chroot.c:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" " --userspec=UPORABNIK:SKUPINA določi uporabnika ali skupino (ID ali ime)\n" " --groups=SEZNAM določi dodatne skupine (g1, g2,... gN)\n" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" @@ -1682,42 +1698,47 @@ msgstr "" "\n" "Če UKAZ ni podan, izvedemo »${SHELL} -i« (privzeto »/bin/sh -i«).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "korenskega imenika ni mogoče prestaviti na %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "korenski imenik ni dosegljiv s chdir" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" -msgstr "" +msgstr "nobena skupina ni določena za neznani UID: %d" -#: src/chroot.c:383 -#, fuzzy, c-format +#: src/chroot.c:400 +#, c-format msgid "failed to get supplemental groups" -msgstr "dodatne skupine ni mogoče nastaviti" +msgstr "dodatnih skupin ni bilo mogoče pridobiti" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" -msgstr "dodatne skupine ni mogoče nastaviti" +msgid "failed to set supplemental groups" +msgstr "dodatnih skupin ni bilo mogoče pridobiti" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "nastavitev GID ni uspela" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "nastavitev UID ni uspela" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "ukaza %s ni uspelo izvesti" @@ -1759,7 +1780,16 @@ msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "" "Urejeni datoteki DATOTEKA1 in DATOTEKA2 primerjamo vrstico za vrstico.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Če DATOTEKA ni podana, ali pa je enaka -, beremo s standardnega vhoda.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1772,7 +1802,7 @@ msgstr "" "DATOTEKI2,\n" "v tretjem pa vrstice, skupne obema datotekama.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1784,7 +1814,7 @@ msgstr "" " -2 izpusti vrstice, ki se pojavijo samo v drugi datoteki\n" " -3 izpusti vrstice, ki se pojavijo v obeh datotekah\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1796,11 +1826,11 @@ msgstr "" " vse vhodne vrstice s pari\n" " --nocheck-order ne preverjaj, ali je vhod pravilno urejen\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=NIZ razmejilnik med stolpci naj bo NIZ\n" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" @@ -1808,7 +1838,7 @@ msgstr "" "\n" "Primerjave upoštevajo pravila, navedena v »LC_COLLATE«.\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1823,310 +1853,324 @@ msgstr "" " %s -3 datoteka1 datoteka2 Izpiši vrstice, ki so le v datoteki1, ne pa \n" " tudi v datoteki2, ali obratno\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "datoteka %d ni urejena" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "podanih je več razmejilnikov" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "prazen %s ni dovoljen" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "premikanje z lseek po %s ni mogoče" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "napaka pri branju %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "premikanje z lseek po %s ni mogoče" +msgid "error reading %s" +msgstr "napaka pri branju %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "napaka pri pisanju na %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "napaka pri branju %s" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s: branje informacij extents ni uspelo" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: pisanje ni uspelo" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "razširjanje %s ni uspelo" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "brišejo se dovoljenja za %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "lastništvo za %s ni bilo ohranjeno" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "vpogled v datoteko %s ni uspel" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "avtorstvo datoteke %s ni bilo ohranjeno" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "nastavitev privzetega konteksta datoteke na %s ni uspela" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "nastavitev privzetega konteksta datoteke za %s ni uspela" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "nastavitev varnostnega konteksta %s ni uspela" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "datotek %s ni mogoče odpreti za branje" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "statusa %s ni moč ugotoviti s fstat" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "izpusti se datoteka %s, ker je bila med prepisom zamenjana" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "ni mogoče odstraniti %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "odstranjena %s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "ne piše se prek obvisene simbolne povezave %s" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "ni mogoče ustvariti navadne datoteke %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "ustvarjanje klona %s iz %s ni uspelo" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "ohranjajo se časi za %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "zapiranje %s ni uspelo" -#: src/copy.c:1580 -#, fuzzy, c-format +#: src/copy.c:1669 +#, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " -msgstr "%s: naj pišemo prek %s navzlic zaščiti %04lo (%s)? " +msgstr "%s: naj nadomestimo %s navzlic zaščiti %04lo (%s)? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " -msgstr "" +msgstr "%s: nepisljiva %s (zaščita %04lo, %s); naj vseeno poskusimo? " -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: naj pišemo prek %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (varnostna kopija: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "povrnitev privzetega konteksta ustvarjenja datoteke ni uspela" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "ni mogoče ustvariti trde povezave %s na %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "statusa %s ni moč ugotoviti s stat" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "izpušča se imenik %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "opozorilo: izvorna datoteka %s je podana več kot enkrat" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s in %s sta ena in ista datoteka" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "prek ne-imenika %s ne moremo pisati imenika %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "prek pravkar ustvarjene datoteke %s ne moremo zapisati %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "prek imenika %s ne moremo zapisati ne-imenika" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "imenika ne moremo premakniti v ne-imenik: %s -> %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "ni mogoče izdelati varnostne kopije %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "imenika %s se ne da prepisati vase, v %s" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "opozorilo: izvorna datoteka %s je podana več kot enkrat" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "ni mogoče premakniti %s v %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "ni mogoče prepisati ciklične simbolne povezave %s" # ! INEXACT -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "ni mogoče ustvariti simbolne povezave %s na %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "ni mogoče ustvariti FIFO %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "ni mogoče ustvariti posebne datoteke %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "ni mogoče prebrati simbolne povezave %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "ni mogoče ustvariti simbolne povezave %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s ima neznan tip datoteke" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "ni mogoče odstraniti varnostne kopije %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (brez varnostne kopije)\n" @@ -2134,30 +2178,35 @@ msgstr "%s -> %s (brez varnostne kopije)\n" #. This is a proper name. See the gettext manual, section Names. #: src/coreutils.c:47 msgid "Alex Deymo" -msgstr "" +msgstr "Alex Deymo" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" -msgstr "" +msgstr "Uporaba: %s --coreutils-prog=PROGRAM [IZBIRE]...\n" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" +"Izvede vgrajeni program z imenom PROGRAM in mu prenese podane IZBIRE.\n" +"\n" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" +"\n" +"Uporabite: »%s --coreutils-prog=PROGRAM --help« za pomoč za posamezni " +"program.\n" -#: src/coreutils.c:178 src/coreutils.c:202 -#, fuzzy, c-format +#: src/coreutils.c:177 src/coreutils.c:201 +#, c-format msgid "unknown program %s" -msgstr "neznani tok" +msgstr "neznani program %s" # ! INEXACT #: src/cp.c:157 src/mv.c:288 @@ -2320,17 +2369,19 @@ msgstr "" " -x, --one-file-system dejanje omejeno na krajevni datotečni sistem\n" #: src/cp.c:232 -#, fuzzy msgid "" " -Z set SELinux security context of destination\n" " file to default type\n" " --context[=CTX] like -Z, or if CTX is specified then set the\n" " SELinux or SMACK security context to CTX\n" msgstr "" -" -Z, --context[=KONTEKST] varnostni kontekst SELinux za ciljno " +" -Z varnostni kontekst SELinux za ciljno " "datoteko\n" -" se nastavi na privzeti tip, ali na " -"KONTEKST\n" +" se nastavi na privzeti tip\n" +" --context[=KONTEKST] varnostni kontekst SELinux ali SMACK za " +"ciljno\n" +" datoteko se nastavi na KONTEKST, če je ta\n" +" podan, sicer na privzeti tip\n" # ! INEXACT #: src/cp.c:240 @@ -2432,8 +2483,8 @@ msgstr "%s obstaja, vendar ni imenik" msgid "failed to access %s" msgstr "dostop do %s ni uspel" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "manjkajoč operand datoteke" @@ -2507,131 +2558,130 @@ msgstr "" "razširjenih atributov ni moč ohraniti, cp je zgrajen brez podpore za xattr" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "vhod je izginil" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: številka vrstice izven razpona" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: številka vrstice izven razpona" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " pri ponovitvi %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: ujemanja ni" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "napaka pri iskanju z regularnimi izrazi" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "napaka pri pisanju za %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: za razmejilnikom pričakovano celo število" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: pri ponovitvah je zahtevan »}«" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: med »{« in »}« je zahtevano celo število" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: manjkajoč zaključni razmejilnik »%c«" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: neveljavni regularni izraz: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: neveljavni vzorec" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: število vrstice mora biti pozitivno" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "manjkajoče določilo pretvorbe v priponi" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "neveljavno določilo pretvorbe v priponi: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "neveljavno določilo pretvorbe v priponi: \\\\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "neveljavna označba v določilu pretvorbe: %%%c%c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "preveč določil pretvorbe %% v priponi" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "manjkajoče določilo pretvorbe %% v priponi" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: neveljavno število" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +msgid "invalid number" +msgstr "neveljavno število" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Uporaba: %s [IZBIRA]... DATOTEKA VZOREC...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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" @@ -2640,7 +2690,16 @@ msgstr "" "»xx02«...,\n" "število bajtov v vsakem posamičnem kosu pa izpišemo na standardni izhod.\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Če je DATOTEKA -, se bere s standardnega vhoda. VZOREC je lahko eden od:\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2652,11 +2711,11 @@ msgstr "" " -k, --keep-files ob napaki ne odstrani nepopolno zapisanih " "datotek\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr " -m, --suppress-matched brez izpisa vrstic, ki ustrezajo VZORCU\n" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2667,17 +2726,11 @@ msgstr "" " -s, --quiet, --silent brez izpisa velikosti na standardni izhod\n" " -z, --elide-empty-files odstrani prazne izhodne datoteke\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Če je DATOTEKA -, se bere s standardnega vhoda. VZOREC je lahko eden od:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 +#, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2712,7 +2765,7 @@ msgstr "" "Izbrane dele vrstic iz vsake od navedenih DATOTEK izpišemo na standardni " "izhod.\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2722,7 +2775,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:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2736,7 +2789,7 @@ msgstr "" " izbira -s\n" " -n (se ne upošteva)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2744,7 +2797,7 @@ msgstr "" " --complement komplement množice izbranih bajtov, znakov ali " "polj\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2754,7 +2807,7 @@ msgstr "" " --output-delimiter=NIZ naj bo NIZ razmejilnik na izhodu\n" " privzeti izhodni razmejilnik je enak vhodnemu\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2768,7 +2821,8 @@ msgstr "" "v\n" "istem vrstnem redu, kot je bil prebran, in je zapisan natanko enkrat.\n" -#: src/cut.c:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2776,8 +2830,6 @@ msgid "" " 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 "" "Vsak razpon ima lahko obliko:\n" "\n" @@ -2788,50 +2840,51 @@ msgstr "" "\n" "Če DATOTEKA ni podana, ali če je enaka - (minusu), se bere standardni vhod.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "neveljavni seznam bajtov, znakov ali polj" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "polja in pozicije se štejejo od 1 dalje" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "neveljavni razpon brez končne točke: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "neveljavni padajoči razpon" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "odmik %s (v bajtih) je prevelik" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "številka polja %s je prevelika" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "določen je lahko samo en tip seznama" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "razmejilnik mora biti en sam znak" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "podati je treba seznam bajtov, znakov ali polj" -#: src/cut.c:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2839,11 +2892,11 @@ msgstr "" "neizpisovanje vrstic, ki ne vsebujejo razmejilnika\n" "\tje smiselno le, kadar delamo s polji" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "seznam polj manjka" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "seznam položajev manjka" @@ -2862,13 +2915,25 @@ msgstr "" "Izpišemo trenutni čas v podani OBLIKI, ali pa nastavimo sistemski čas.\n" #: src/date.c:134 +#, fuzzy +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" +"Izpišemo trenutni čas v podani OBLIKI, ali pa nastavimo sistemski čas.\n" +"\n" +" -d, --date=NIZ izpiši čas podan v NIZU namesto trenutnega\n" +" -f, --file=DATOTEKA enako kot --date za vsako vrstico v DATOTEKI\n" + +#: src/date.c:138 +#, fuzzy msgid "" -" -d, --date=STRING display time described by STRING, not 'now'\n" -" -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -" -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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" " -d, --date=NIZ izpiši čas podan v NIZU namesto trenutnega\n" " -f, --file=DATOTEKA enako kot --date za vsako vrstico v DATOTEKI\n" @@ -2879,25 +2944,24 @@ msgstr "" " »hours«, »minutes«, »seconds« ali »ns« za izpis\n" " datuma in ure v zahtevani natančnosti.\n" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=DATOTEKA izpiši čas zadnje spremembe za navedeno " "DATOTEKO\n" " -R, --rfc-2822 čas izpiši skladno s priporočilom RFC-2822\n" -#: src/date.c:147 +#: src/date.c:149 +#, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=DOLOČILO datum v obliki, skladni s priporočilom RFC-3339\n" " DOLOČILO je lahko »date«, »seconds« ali »ns«\n" @@ -2908,8 +2972,19 @@ msgstr "" " -u, --utc, --universal izpis ali nastavitev časa v UTC namesto v " "lokalnem\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2922,7 +2997,7 @@ msgstr "" " %% znak za odstotek: %\n" " %a lokalizirano okrajšano ime dneva v tednu (npr. ned)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2934,7 +3009,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:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2946,7 +3021,7 @@ msgstr "" " %D datum; isto kot %m/%d/%y\n" " %e dan v mesecu, dopolnjen s presledki; isto kot %_d\n" -#: src/date.c:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2957,7 +3032,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:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2969,7 +3044,7 @@ msgstr "" " %I ura (01..12)\n" " %j dan v letu (001..366)\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2981,7 +3056,7 @@ msgstr "" " %m mesec (01..12)\n" " %M minuta (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2999,7 +3074,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:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3011,7 +3086,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:209 +#: src/date.c:215 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" @@ -3024,7 +3099,7 @@ msgstr "" " %W številka tedna v letu s ponedeljkom kot prvim dnevom v tednu " "(00..53)\n" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3036,7 +3111,7 @@ msgstr "" " %y zadnji dve števki leta (00..99)\n" " %Y leto\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3057,7 +3132,7 @@ msgstr "" "Privzeto so številčna polja v datumu do polne dolžine polja dopolnjena\n" "z ničlami.\n" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3075,7 +3150,7 @@ msgstr "" " »^« če je mogoče, uporabi velike črke\n" " »#« če je mogoče, uporabi nasprotne črke\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3089,7 +3164,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:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3114,35 +3189,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:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "standardni vhod" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "neveljavni datum %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "podana je več kot ena oblika izhoda" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3153,23 +3228,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:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "datuma ni mogoče nastaviti" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3178,7 +3253,7 @@ msgstr "" "Uporaba: %s [OPERAND]...\n" " ali: %s IZBIRA\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3198,7 +3273,8 @@ 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:541 +#: src/dd.c:570 +#, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3207,8 +3283,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=DATOTEKA beri z navedene DATOTEKE namesto s standardnega vhoda\n" " iflag=ZASTAVICA beri kot z vejicami ločen seznam simbolov\n" @@ -3222,7 +3300,7 @@ msgstr "" " status=IZPIS omeji IZPIS na stderr; »noxfer« brez statistike prenosa,\n" " »none« brez vseh izpisov\n" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3240,7 +3318,7 @@ msgstr "" "PRETVORBA je lahko (več izbir ločimo z vejico):\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3268,7 +3346,7 @@ msgstr "" " tudi block ali unblock, zapolni s presledki namesto z znaki " "NUL\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3284,7 +3362,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:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3299,135 +3377,98 @@ msgstr "" "priporočeno\n" " conv=notrunc)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio uporabi vzporedne vhodno-izhodne funkcije za podatke\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct uporabi neposredne vhodno-izhodne funkcije za podatke\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory opusti, razen če je imenik\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" " dsync uporabi sinhronizirane vhodno-izhodne funkcije za podatke\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync enako, a tudi za metapodatke\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock naberi polne bloke na vhodu (zgolj iflag)\n" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock uporabi neblokirne vhodno-izhodne funkcije\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime ne ažuriraj časa zadnjega dostopa\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nocache zavrzi medpomnjene podatke\n" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty ne določaj krmilnega terminala iz datoteke\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow ne sledi simbolnim povezavam\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks opusti, če je datoteka večkratno povezana\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary uporabi binarne vhodno-izhodne funkcije za podatke\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text uporabi besedilne vhodno-izhodne funkcije za podatke\n" -#: src/dd.c:620 +#: src/dd.c:651 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:623 +#: src/dd.c:654 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:626 +#: src/dd.c:657 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:631 +#: src/dd.c:661 #, 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 "" -"\n" -"Če pošljemo tekočemu procesu »dd« signal %s, ta izpiše vhodno-izhodne\n" -"statistike na standardni izhod za napake in nadaljuje z delom.\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" -"Izbire so:\n" -"\n" -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +#: src/dd.c:699 +#, fuzzy, c-format +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "pomnilnik porabljen z vhodnim medpomnilnikom velikosti %zu bajtov (%s)" -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +#: src/dd.c:721 +#, fuzzy, c-format +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" "pomnilnik porabljen z izhodnim medpomnilnikom velikosti %zu bajtov (%s)" -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" -"%+% zapisov na vhodu\n" -"%+% zapisov na izhodu\n" - -# ! INEXACT -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% odrezanih zapisov\n" -msgstr[1] "% odrezan zapis\n" -msgstr[2] "% odrezana zapisa\n" -msgstr[3] "% odrezani zapisi\n" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" @@ -3436,7 +3477,7 @@ msgstr[1] "% bajt (%s) prepisan" msgstr[2] "% bajta (%s) prepisana" msgstr[3] "% bajti (%s) prepisani" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "neskončno B" @@ -3450,85 +3491,105 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% zapisov na vhodu\n" +"%+% zapisov na izhodu\n" + +# ! INEXACT +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% odrezanih zapisov\n" +msgstr[1] "% odrezan zapis\n" +msgstr[2] "% odrezana zapisa\n" +msgstr[3] "% odrezani zapisi\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "zapiramo vhodno datoteko %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "zapiramo izhodno datoteko %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "izklop O_DIRECT ni uspel: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "pišemo na %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "neprepoznan operand %s" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "neveljavna pretvorba" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "neveljavna vhodna zastavica" # ! INEXACT -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "neveljavno izhodna zastavica" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "neveljavna statusna zastavica" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "neveljavno število %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "pretvorbe ascii, ebcdic in ibm se medsebojno izključujejo" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "pretvorbi block in unblock se medsebojno izključujeta" # ! INEXACT -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "pretvorbi lcase in ucase se medsebojno izključujeta" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "pretvorbi excl in nocreat se medsebojno izključujeta" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "izbiri direct in nocache se medsebojno izključujeta" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3537,62 +3598,62 @@ msgstr "" "opozorilo: obvoz okoli napake lseek v jedru za datoteko (%s)\n" " vrste mt_type=0x%0lx -- glejte za seznam zvrsti" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: pri branju premik s »skip« ni mogoč" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: pri pisanju premik s »seek« ni mogoč" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "prekoračitev odmika pri branju datoteke %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "opozorilo: neveljavni odmik datoteke po napaki pri branju" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "napake v jedru ni bilo mogoče zaobiti" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "nastavljanje zastavic za %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: pri branju premik na zahtevani odmik ni mogoč" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "obrezovanje na % bajtov pri izhodni datoteki %s ni uspelo" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync ni uspel za %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "fsync ni uspel za %s<" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "odpiranje %s ni uspelo" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3601,19 +3662,19 @@ msgstr "" "odmik prevelik: ni moč odrezati na dolžino seek=% (%lu-bajtnih) " "blokov" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "obrezovanje na % bajtov pri izhodni datoteki %s ni uspelo" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "neuspela zavržba medpomnjenih podatkov za: %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3694,12 +3755,12 @@ msgstr "Kapacit." msgid "%s-%s" msgstr "%s-%s" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" -msgstr "" +msgstr "ni mogoče dostopati do %s: priklopljeno k drugi napravi" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3709,14 +3770,14 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 #, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3726,11 +3787,10 @@ msgstr "" " velikosti v enotah po 1.048.576 bajtov\n" " Glej obliko zapisa VELIKOSTI niže.\n" " --total izpis skupne porabe\n" -" -h, --human-readable velikosti v človeku umljivi obliki (npr. 1K 234M " -"2G)\n" -" -H, --si podobno kot -h, vendar z bazo 1000 namesto 1024\n" +" -h, --human-readable izpis velikosti v potencah 1024 (npr. 1023M)\n" +" -H, --si izpis velikosti v potencah 1000 (npr. 1.1G)\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3743,13 +3803,38 @@ msgstr "" " -l, --local omejimo seznam na lokalni datotečni sistem\n" " --no-sync brez klica sync() pred izpisom porabe (privzeto)\n" -#: src/df.c:1409 +#: src/df.c:1429 +#, 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" +msgstr "" +" --output[=SEZNAM_POLJ] uporabi format izpisa, določen s " +"SEZNAMOM_POLJ,\n" +" ali izpiši vsa polja, če SEZNAM_POLJ ni\n" +" določen.\n" +" -P, --portability izhodni format POSIX\n" +" --sync klic sync() pred izpisom porabe\n" +" -t, --type=TIP samo datotečni sistemi tipa TIP\n" +" -T, --print-type izpis datotečnega sistem\n" +" -x, --exclude-type=TIP brez datotečnih sistemov tipa TIP\n" +" -v (se ne upošteva)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose z izpisom diagnostike tik\n" +" preden odpremo posamično datoteko\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3766,7 +3851,7 @@ msgstr "" " -x, --exclude-type=TIP brez datotečnih sistemov tipa TIP\n" " -v (se ne upošteva)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3780,25 +3865,25 @@ msgstr "" "»size«, »used«, »avail«, »pcent«, »file« in »target« (oglejte si stran " "info).\n" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "izbiri %s in %s se medsebojno izključujeta" -#: src/df.c:1610 +#: src/df.c:1636 #, 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:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Opozorilo: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "tabele priklopljenih datotečnih sistemov ni moč prebrati" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "obdelan ni bil noben datotečni sistem" @@ -3896,9 +3981,8 @@ msgstr "" "imenik).\n" #: src/dirname.c:59 -#, fuzzy msgid " -z, --zero end each output line with NUL, not newline\n" -msgstr " -0, --null vrstice naj se zaključijo z znakom NUL, ne LF\n" +msgstr " -z, --zero zaključuj vrstice z znakom NUL, ne LF\n" #: src/dirname.c:64 #, c-format @@ -3915,7 +3999,7 @@ msgstr "" " %s dir1/str dir2/str -> »dir1«, ki mu sledi »dir2«\n" " %s stdio.h -> ».«\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3925,12 +4009,13 @@ msgstr "" " ali: %s [IZBIRA]... --files0-from=F\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +#, fuzzy +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Povzetek porabe diska za datoteko DATOTEKA, rekurzivno po podimenikih.\n" #: src/du.c:291 -#, fuzzy msgid "" " -0, --null end each output line with NUL, not newline\n" " -a, --all write counts for all files, not just directories\n" @@ -4064,62 +4149,56 @@ msgstr "" msgid "Infinity" msgstr "neskončno" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "fts_read ni uspel: %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "neveljavna največja globina %s" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "neveljavni --threshold argument '-0'" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "možnosti se izključujeta - ali izpis vseh, ali povzetek" -#: src/du.c:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "opozorilo: povzetek se izključuje z --max-depth=%lu" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "opozorilo: izbiri --apparent-size in -b pri --inodes nimata vpliva" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "datotečnih operandov ni mogoče kombinirati z izbiro --files0-from." -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: napaka pri branju" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "neveljavno ime (dolžina nič) datoteke" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "skupno" @@ -4226,7 +4305,6 @@ msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" msgstr "Določi VREDNOST spremenljivki okolja z danim IMENOM in poženi UKAZ.\n" #: src/env.c:61 -#, fuzzy msgid "" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with NUL, not newline\n" @@ -4262,9 +4340,8 @@ msgid "cannot specify --null (-0) with command" msgstr "ni mogoče določiti --null (-0) z ukazom" #: 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" +#, fuzzy +msgid "Convert tabs in each FILE to spaces, writing to standard output.\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), " @@ -4312,7 +4389,7 @@ msgid "input line is too long" msgstr "vhodna vrstica je predolga" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4466,12 +4543,12 @@ msgstr "napaka v ujemalniku z regularnimi izrazi" msgid "non-integer argument" msgstr "ne-celoštevilčni argument" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "deljenje z nič" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "nastavite LC_ALL='C', da bi odpravili težavo." @@ -4482,31 +4559,31 @@ msgid "the strings compared were %s and %s" msgstr "primerjana niza sta bila %s in %s" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "Niels Möller" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, 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:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "prekoračitev obsega za vrsto squfof" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s ni veljavno pozitivno celo število" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s je preveliko" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4515,7 +4592,7 @@ msgstr "" "Uporaba: %s [ŠTEVILO]...\n" " ali: %s IZBIRA\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -4560,7 +4637,7 @@ msgstr "" "izhod.\n" "Izbira -ŠIRINA je okrajšava za --width=ŠTEVILO.\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4572,7 +4649,7 @@ msgstr "" " tega pridaj oblikovanim vrsticam\n" " -s, --split-only poreži predolge vrstice, a brez poravnave\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4586,7 +4663,7 @@ msgstr "" " -w, --width=ŠIRINA največja širina vrstice (privzeto 75 znakov)\n" " -g, --goal=ŠIRINA želena širina (privzeto 93% celotne širine)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4595,20 +4672,19 @@ msgstr "" "neveljavna izbira -- %c; -WIDTH je prepoznana le, če je navedena kot prva\n" "izbira; namesto tega uporabite -w N" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "neveljavna širina: %s" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +#, fuzzy +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "Vrstice v vsaki DATOTEKI na vhodu (privzet je standardni vhod) prelomimo\n" "in rezultat izpišemo na standardni izhod.\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4618,9 +4694,9 @@ msgstr "" " -s, --spaces prelom na presledkih\n" " -w, --width=ŠIRINA nastavimo ŠIRINO vrstic (privzeto 80)\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "neveljavno število stoplcev: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4692,17 +4768,17 @@ msgstr "pravega GID ni mogoče ugotoviti" msgid "%s: no such user" msgstr "%s: uporabnik ne obstaja" -#: src/head.c:109 +#: src/head.c:110 +#, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "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" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4721,7 +4797,7 @@ msgstr "" "zadnjih\n" " K vrstic vsake datoteke\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4729,7 +4805,7 @@ msgstr "" " -q, --quiet, --silent vedno brez izpisa imena datoteke\n" " -v, --verbose vedno izpišemo še ime datoteke\n" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4741,48 +4817,36 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: datoteka se je preveč skrčila" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: število bajtov je preveliko" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: premik na odmik %s ni mogoč" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: premik na relativni odmik %s ni mogoč" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "število vrstic" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "število bajtov" +msgid "%s: number of bytes is too large" +msgstr "%s: število bajtov je preveliko" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "neveljavno število vrstic" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "neveljavno število bajtov" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "neveljavna zaključna izbira -- %c" @@ -4845,7 +4909,6 @@ msgstr "" "ali (kadar UPORABNIK ni podan), za trenutnega uporabnika.\n" #: src/id.c:90 -#, fuzzy msgid "" " -a ignore, for compatibility with other versions\n" " -Z, --context print only the security context of the process\n" @@ -4861,7 +4924,7 @@ msgstr "" "Če uporabnik ni naveden, se izpišejo podatki za trenutnega uporabnika.\n" "\n" " -a (se ne upošteva, združljivost s starejšimi različicami)\n" -" -Z, --context izpiši le varnostni kontekst danega uporabnika\n" +" -Z, --context izpiši le varnostni kontekst procesa\n" " -g, --group izpiši le efektivno številko skupine (GID)\n" " -G, --groups izpiši številke vseh skupin\n" " -n, --name pri izbirah -ugG izpiši ime uporabnika namesto številke\n" @@ -4973,7 +5036,7 @@ msgstr "lastništva %s ni mogoče spremeniti" msgid "cannot set time stamps for %s" msgstr "datoteke %s ni moč časovno označiti" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "vejitev ni mogoča" @@ -5099,7 +5162,6 @@ msgstr "" " -v, --verbose z izpisom imen vseh ustvarjenih imenikov\n" #: src/install.c:648 -#, fuzzy msgid "" " --preserve-context preserve SELinux security context\n" " -Z set SELinux security context of destination\n" @@ -5108,10 +5170,12 @@ msgid "" " SELinux or SMACK security context to CTX\n" msgstr "" " --preserve-context ohrani varnostni kontekst SELinux\n" -" -Z, --context[=KONTEKST] nastavi varnostni kontekst SELinux podane " -"datoteke\n" -" na privzeti tip, ali na KONTEKST, če je ta " -"podan\n" +" -Z varnostni kontekst SELinux za podano datoteko\n" +" se nastavi na privzeti tip\n" +" --context[=KONTEKST] varnostni kontekst SELinux ali SMACK za podano\n" +" datoteko se nastavi na KONTEKST, če je ta " +"podan,\n" +" sicer na privzeti tip\n" #: src/install.c:696 src/unlink.c:86 #, c-format @@ -5136,7 +5200,7 @@ msgstr "opcija »strip« ni dovoljena pri namestitvi imenika" msgid "target directory not allowed when installing a directory" msgstr "navedba ciljnega imenika ni dovoljena pri namestitvi imenika" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "neveljavni način %s" @@ -5175,8 +5239,13 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5195,7 +5264,7 @@ msgstr "" " 1 ali 2, kar ustreza DATOTEKI1 in DATOTEKI2)\n" " -e PRAZNO manjkajoče vhodno polje nadomestimo z nizom PRAZNO\n" -#: src/join.c:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5208,7 +5277,7 @@ msgstr "" " -t ZNAK navedeni ZNAK naj bo ločilo med polji na vhodu in " "izhodu\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5229,13 +5298,12 @@ msgstr "" " --header obravnavaj prvo vrstico vsake datoteke kot zaglavje;\n" " izpiši ga, ne da bi ga skušal vzporediti\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 -#, fuzzy +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" -" -z, --zero-terminated vrstice naj se zaključijo z znakom NUL, ne LF\n" +" -z, --zero-terminated vrstice se zaključijo z znakom NUL, ne LF\n" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5271,47 +5339,47 @@ msgstr "" "Če vhod ni urejen in nekaterih vrstic ni mogoče združiti, bo izpisano\n" "opozorilno sporočilo.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:%: ni urejeno: %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "neveljavna številka polja: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "neveljavno določilo polja: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "neveljavna številka datoteke v določilu polja: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "nezdružljivi združevalni polji %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "nasprotujoča si niza za nadomestitev praznega polja" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "večznakovni tabulator %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "nezdružljivi tabulatorji" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "obeh datotek ne moremo hkrati brati s standardnega vhoda" @@ -5388,17 +5456,17 @@ msgstr "signala ni moč kombinirati z izbirama -l ali -t" msgid "no process ID specified" msgstr "številka procesa (PID) ni določena" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "neuspešna dodelitev % bajtov za izravnalnik stdio\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "neveljavni izravnalni način %s za %s\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "izravnavanja %s ni moč nastaviti v način %s\n" @@ -5591,7 +5659,7 @@ msgstr "izbira --relative ni mogoča brez izbire --symbolic" msgid "FIXME: unknown" msgstr "POPRAVI: neznano" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Uporaba: %s [IZBIRA]\n" @@ -5604,7 +5672,7 @@ msgstr "" "Izpišemo uporabniško ime trenutnega uporabnika.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "uporabniško ime manjka" @@ -5614,7 +5682,7 @@ msgstr "uporabniško ime manjka" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -5623,99 +5691,99 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" # ! INEXACT -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "ne upoštevamo neveljavne vrednosti spremenljivke QUOTING_STYLE: %s" - -# ! INEXACT -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "ne upoštevamo neveljavne širine v spremenljivki COLUMNS: %s" # ! INEXACT -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "ne upoštevamo neveljavnega tabulatorja v spremenljivki TABSIZE: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "neveljavna širina vrstice: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "neveljavni tabulator: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "neveljavna oblika ure %s" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "Veljavni argumenti so:\n" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr " - +FORMAT (npr. +%H:%M) za izpis v slogu »date«\n" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "napaka pri inicializaciji nizov za mesece" # ! INEXACT -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "neprepoznana predpona: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "vrednosti v spremenljivki LS_COLORS ni moč raztolmačiti" -#: src/ls.c:2557 src/pwd.c:164 +# ! INEXACT +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "ne upoštevamo neveljavne vrednosti spremenljivke QUOTING_STYLE: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "imenika %s ni mogoče odpreti" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "ni mogoče ugotoviti enote in inoda datoteke %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: že izpisanega imenika ne podvajamo" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "beremo imenik %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "zapiramo imenik %s" # ! INEXACT -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "ni mogoče primerjati imen datotek %s in %s" -#: src/ls.c:4781 +#: src/ls.c:4775 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" @@ -5723,7 +5791,7 @@ 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" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5737,7 +5805,7 @@ msgstr "" " -b, --escape izpis C-jevske ubežne kode za neizpisljive " "znake\n" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5764,12 +5832,14 @@ msgstr "" " sicer: urejeno po ctime, začenši z " "najnovejšim\n" -#: src/ls.c:4804 +#: src/ls.c:4798 +#, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5784,7 +5854,7 @@ msgstr "" " brez sledenja simbolnim povezavam\n" " -D, --dired izpis primeren za način »dired« v Emacsu\n" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5801,11 +5871,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time kot -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr " -g kot -l, vendar brez izpisa lastnika\n" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5818,8 +5888,7 @@ msgstr "" " mogoča je dopolnitev z izbiro --sort, raba\n" " --sort=none (-U) onemogoči združevanje\n" -#: src/ls.c:4829 -#, fuzzy +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5827,12 +5896,13 @@ msgid "" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" " -G, --no-group kot -l, vendar brez izpisa skupine\n" -" -h, --human-readable skupaj z -l izpiši velikost v človeku umljivem\n" -" zapisu (npr.1K 234M 2G)\n" +" -h, --human-readable skupaj z -l in/ali -s izpiši velikost v " +"človeku \n" +" umljivem zapisu (npr.1K 234M 2G)\n" " --si podobno kot -h, vendar v bazi 1000 namesto " "1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5852,7 +5922,7 @@ msgstr "" " ki kažejo na imenike\n" " --hide=VZOREC brez impliciranih vnosov, opisanih z VZORCEM\n" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5873,7 +5943,7 @@ msgstr "" " -k, --kibibytes uporabljaj 1024-bajtne bloke za velikost na " "disku\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5888,7 +5958,7 @@ msgstr "" " -m z vejicami ločena imena prek celotne širine " "vrstice\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5905,7 +5975,7 @@ msgstr "" " -p, --indicator-style=slash imenike označimo s pripono »/«\n" # ! INEXACT -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -5925,7 +5995,7 @@ msgstr "" "»locale«,\n" " »shell«, »shell-always«, »c« ali »escape«\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5936,18 +6006,19 @@ msgstr "" " -R, --recursive rekurziven izpis podimenikov\n" " -s, --size izpis velikosti datotek (v blokih)\n" -#: src/ls.c:4886 +#: src/ls.c:4881 +#, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S datoteke uredi po velikosti\n" " --sort=BESEDA namesto po imenu uredi po: brez urejanja \n" @@ -5963,7 +6034,7 @@ msgstr "" " z izbiro --sort=time tudi uredi po izbranem " "času\n" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -5988,7 +6059,7 @@ msgstr "" " podani slog samo izven krajevnega okolja " "POSIX\n" -#: src/ls.c:4908 +#: src/ls.c:4904 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -5997,11 +6068,12 @@ msgstr "" " začenši z najnovejšim časom\n" " -T, --tabsize=STOLPCEV tabulator nastavljen na STOLPCEV namesto na 8\n" -#: src/ls.c:4912 +#: src/ls.c:4908 +#, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -6015,14 +6087,15 @@ msgstr "" " -U brez urejanja; kot so v imeniku\n" " -v urejanje po številki različice\n" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=STOLPCEV širina zaslova STOLPCEV namesto trenutne " "vrednosti\n" @@ -6032,7 +6105,7 @@ msgstr "" "datoteko\n" " -1 izpis po eno datoteko v vrstici\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6046,7 +6119,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:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6076,50 +6149,53 @@ msgid "David Madore" msgstr "David Madore" #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" "Uporaba: %s [IZBIRA]... [DATOTEKA]...\n" "Izpiše ali preveri nadzorne vsote %s (%d-bitne).\n" "Če DATOTEKA ni podana ali če je enaka -, se bere s standardnega vhoda.\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" " -b, --binary beri binarno (privzeto, razen pri branju s " "terminala)\n" -#: src/md5sum.c:178 -msgid " -b, --binary read in binary mode\n" +#: src/md5sum.c:180 +#, fuzzy +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary beri binarno\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr " --tag ustvari nadzorno vsoto v slogu BSD\n" -#: src/md5sum.c:188 +#: src/md5sum.c:191 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:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text beri besedilno (privzeto)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -6140,14 +6216,15 @@ msgstr "" " z nadzornimi vsotami MD5\n" "\n" -#: src/md5sum.c:206 -#, c-format +#: src/md5sum.c:209 +#, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "Izračun nadzornih vsot je opisan v %s. Pri preverjanju mora biti datoteka\n" @@ -6156,35 +6233,35 @@ msgstr "" "besedilne datoteke) in imenom DATOTEKE, za katero je bila izračunana\n" "nadzorna vsota.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: preveč vrstic z nadzorno vsoto" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: nepravilno oblikovana vrstica z nadzorno vsoto %s" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: NAPAKA pri odpiranju ali branju\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "NAPAKA" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "V REDU" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, 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:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" @@ -6193,7 +6270,7 @@ msgstr[1] "OPOZORILO: % vrstica je nepravilno oblikovana" msgstr[2] "OPOZORILO: % vrstici sta nepravilno oblikovani" msgstr[3] "OPOZORILO: % vrstice so nepravilno oblikovane" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" @@ -6202,7 +6279,7 @@ msgstr[1] "OPOZORILO: % navedene datoteke ni mogoče prebrati" msgstr[2] "OPOZORILO: % navedenih datotek ni mogoče prebrati" msgstr[3] "OPOZORILO: % navedenih datotek ni mogoče prebrati" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" @@ -6211,39 +6288,39 @@ msgstr[1] "OPOZORILO: % nadzorna vsota se NE ujema" msgstr[2] "OPOZORILO: % nadzorni vsoti se NE ujemata" msgstr[3] "OPOZORILO: % nadzorne vsote se NE ujemajo" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "--tag ne podpira načina --text" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "izbira --tag ni smiselna pri preverjanju nadzornih vsot" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, 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:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "izbira --strict je smiselna samo pri preverjanju nadzornih vsot" @@ -6258,7 +6335,6 @@ msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "Ustvari IMENIK (ali več imenikov), če ta še ne obstaja.\n" #: src/mkdir.c:65 -#, fuzzy msgid "" " -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" " -p, --parents no error if existing, make parent directories as needed\n" @@ -6269,9 +6345,6 @@ msgstr "" " -p, --parents brez opozorila če imenik obstaja; po potrebi ustvari\n" " še starševske imenike\n" " -v, --verbose z obvestilom o vsakem ustvarjenem imeniku\n" -" -Z, --context[=KONTEKST] nastavi varnostni kontekst za vsak ustvarjeni\n" -" imenik na privzeti tip ali na KONTEKST, če je ta " -"podan\n" #: src/mkdir.c:70 msgid "" @@ -6281,23 +6354,29 @@ msgid "" " --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n" " or SMACK security context to CTX\n" msgstr "" +" -Z varnostni kontekst SELinux za vsak ustvarjeni\n" +" imenik se nastavi na privzeti tip\n" +" --context[=KONTEKST] varnostni kontekst SELinux ali SMACK za " +"ustvarjeni\n" +" imenik se nastavi na KONTEKST, če je ta podan, sicer\n" +" na privzeti tip\n" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "nastavitev privzetega konteksta datoteke za %s ni uspela" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" msgstr "kontekst za %s ni bil uspešno obnovljen" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "ustvarjen imenik %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6325,6 +6404,10 @@ msgid "" " --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n" " or SMACK security context to CTX\n" msgstr "" +" -Z varnostni kontekst SELinux se nastavi na privzeti " +"tip\n" +" --context[=KONTEKST] varnostni kontekst SELinux ali SMACK se nastavi\n" +" na KONTEKST, če je ta podan, sicer na privzeti tip\n" #: src/mkfifo.c:153 src/mknod.c:150 #, c-format @@ -6511,7 +6594,7 @@ msgstr "preveč predlog" msgid "with --suffix, template %s must end in X" msgstr "ob izbiri --suffix se mora vzorec %s končati z X" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "neveljavna pripona %s, vsebuje ločilnik imenikov" @@ -6650,9 +6733,8 @@ msgid "Scott Bartram" msgstr "Scott Bartram" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "Vsako od DATOTEK prepišemo na standardni izhod in spotoma oštevilčimo " "vrstice.\n" @@ -6764,27 +6846,27 @@ msgstr "neveljavni slog oštevilčenja telesa: %s" msgid "invalid footer numbering style: %s" msgstr "neveljavni slog oštevilčenja noge: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "neveljavna začetna številka vrstice: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "neveljavni vrstični inkrement: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "neveljavno število praznih vrstic: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "neveljavna širina polja s številko vrstice: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "neveljavna oblika oštevilčenja vrstic: %s" @@ -6807,10 +6889,10 @@ msgstr "" "\n" #: src/nohup.c:65 -#, c-format +#, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6830,45 +6912,45 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "onemogočenje standardnega izhoda ni uspelo" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "ne upoštevamo vhoda" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "ne upoštevamo vhoda; izhod dodajamo na konec %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "izhod dodajamo na konec %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "nastavitev, da se kopija stderr zapre ob koncu izvajanja, ni uspela" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" "ne upoštevamo vhoda; standardni izhod za napake preusmerimo na standardni " "izhod" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "standardni izhod za napake preusmerjamo na standardni izhod" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -6895,57 +6977,52 @@ msgstr "" " --all izpiši število nameščenih procesorjev\n" " --ignore=N če je mogoče, izloči N procesnih enot\n" -#: 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "Assaf Gordon" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "vrednost je prevelika, da bi bila lahko pretvorjena: %s" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, c-format msgid "invalid number: %s" msgstr "neveljavno število: %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "zavrnjena pripona na vhodu: %s (morda je rešitev --from)" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" msgstr "neveljavna pripona na vhodu: %s" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "manjkajoča pripona 'i' na vhodu: %s (npr. Ki/Mi/Gi)" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "vrednosti '%Lf' ni uspelo pripraviti za natis" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, c-format msgid "invalid unit size: %s" msgstr "neveljavna velikost enote: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Uporaba: %s [IZBIRA]... [ŠTEVILO]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" @@ -6954,24 +7031,27 @@ msgstr "" "podano\n" "nobeno število.\n" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" " --debug izpiši opozorila ob neveljavnih podatkih na vhodu\n" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" " -d, --delimiter=X uporabi znak X namesto presledka za razmejitev polj\n" -#: src/numfmt.c:827 +#: src/numfmt.c:893 +#, fuzzy msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" " --field=N nadomesti število v vhodnem polju št. N (privzeto 1)\n" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" @@ -6979,7 +7059,7 @@ msgstr "" " --format=FORMAT uporabi FORMAT za realna števila v slogu printf;\n" " glej FORMAT spodaj za podrobnosti\n" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" @@ -6989,14 +7069,14 @@ msgstr "" "privzeto\n" " je »none«; glej ENOTO spodaj\n" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" " --from-unit=N določi velikost enote za vhodne podatke (privzeto 1)\n" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -7008,7 +7088,7 @@ msgstr "" " (izbira nima učinka v lokaliziranem okolju C/" "POSIX)\n" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" @@ -7016,7 +7096,7 @@ msgstr "" " --header[=N] brez pretvorbe izpiši prvih N vrstic zaglavja;\n" " če ni določeno drugače, je N privzeto enak 1\n" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" @@ -7024,7 +7104,7 @@ msgstr "" " --invalid=NAČIN način obravnave neveljavnih števil; NAČIN je lahko:\n" " »abort« (privzeto), »fail«, »warn« ali »ignore«\n" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -7040,7 +7120,7 @@ msgstr "" " širši od N; privzeto se zapolni samodejno, če je\n" " med podatki presledek\n" -#: src/numfmt.c:860 +#: src/numfmt.c:927 msgid "" " --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" " up, down, from-zero (default), towards-zero, " @@ -7051,7 +7131,7 @@ msgstr "" " lahko »up«, »down«, »from-zero« (privzeto), \n" " »towards-zero« ali »nearest«\n" -#: src/numfmt.c:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" @@ -7060,21 +7140,21 @@ msgstr "" "neobvezno\n" " PRIPONO pri številih na vhodu\n" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" " --to=ENOTA samodejno pretvori števila na izhodu v ENOTO;\n" " glej ENOTO spodaj\n" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" " --to-unit=N določi velikost enote za izhodne podatke (privzeto " "1)\n" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" @@ -7082,11 +7162,11 @@ msgstr "" "\n" "Izbire za ENOTO:\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr " none brez samodejnega pretvarjanja; pripone sprožijo napako\n" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -7100,7 +7180,7 @@ msgstr "" " 1M = 1000000,\n" " 1Mi = 1048576,\n" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -7112,7 +7192,7 @@ msgstr "" " 1M = 1000000,\n" " ...\n" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7124,7 +7204,7 @@ msgstr "" " 1M = 1048576,\n" " ...\n" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7136,7 +7216,28 @@ msgstr "" " 1Mi = 1048576,\n" " ...\n" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Vsak razpon ima lahko obliko:\n" +"\n" +" N N-ti bajt, znak ali polje, šteto od 1 dalje\n" +" N- od N-tega bajta, znaka ali polja do konca vrstice\n" +" N-M od N-tega do vključno M-tega bajta, znaka ali polja\n" +" -M od prvega do vključno M-tega bajta, znaka ali polja\n" +"\n" +"Če DATOTEKA ni podana, ali če je enaka - (minusu), se bere standardni vhod.\n" + +#: src/numfmt.c:983 #, fuzzy, c-format msgid "" "\n" @@ -7145,14 +7246,16 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" "\n" "FORMAT mora biti primeren za izpis enega realnoštevilskega argumenta '%f'.\n" "Neobvezni narekovaj (%'f) omogoči --grouping, če to podpira lokalizirano\n" -"okolje. Neobvezna podana širina (%10f) zapolni izpis. Neobvezna negativna\n" +"okolje. Neobvezna podana širina (%10f) zapolni izpis. Neobvezna podana \n" +"ničelna širina (%010f) zapolni izpis z ničlami. Neobvezna negativna\n" "vrednost širine (%-10f) zapolni izpis tako, da je levo poravnan.\n" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7172,8 +7275,8 @@ msgstr "" "statusna koda pa je 0. S podano izbiro --invalid='ignore' se napake pri\n" "pretvorbi ne diagnosticirajo, program pa izide z izhodno statusno kodo 0.\n" -#: src/numfmt.c:922 -#, c-format +#: src/numfmt.c:1000 +#, fuzzy, c-format msgid "" "\n" "Examples:\n" @@ -7187,8 +7290,8 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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 "" @@ -7209,112 +7312,124 @@ msgstr "" " $ ls -lh | %s --header --field 5 --from=iec --padding=10\n" " $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n" -#: src/numfmt.c:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "določilo %s ne vsebuje direktive %%" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "neveljavni format %s (prekoračitev širine)" -#: src/numfmt.c:1008 -#, c-format -msgid "--format padding overridding --padding" -msgstr "" +#: src/numfmt.c:1085 +#, fuzzy, c-format +msgid "--format padding overriding --padding" +msgstr "zapolnitev --format prevlada nad --padding" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "določilo %s se zaključi z %%" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "neveljavna natančnost: %s" + +#: src/numfmt.c:1126 #, fuzzy, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" -msgstr "neveljavni format %s, direktiva mora biti v obliki %%['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" +msgstr "neveljavni format %s, direktiva mora biti v obliki %%[0]['][-][N]f" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "določilo %s vsebuje preveč direktiv %%" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, c-format msgid "invalid suffix in input %s: %s" msgstr "neveljavna pripona pri vhodu %s: %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, fuzzy, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "vrednost prevelika za izpis: '%Lg' (razmislite o uporabi --to)" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "vrednost prevelika za izpis: '%Lg' (razmislite o uporabi --to)" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "vrednost prevelika za izpis: '%Lg' (vrednosti > 999Y niso podprte)" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "velika vhodna vrednost %s: mogoča izguba natančnosti" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "vhodna vrstica je prekratka, manjkajo števila za pretvorbo v polju %ld" +msgid "invalid field value %s" +msgstr "neveljavna vrednost polja %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, c-format msgid "invalid padding value %s" msgstr "neveljavna vrednost polnila %s" -#: src/numfmt.c:1417 -#, c-format -msgid "invalid field value %s" -msgstr "neveljavna vrednost polja %s" +#: src/numfmt.c:1646 +#, fuzzy, c-format +msgid "multiple field specifications" +msgstr "%s: neveljavno določilo polja: %s" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, c-format msgid "invalid header value %s" msgstr "neveljavna vrednost glave %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "izbire --grouping ni mogoče kombinirati z izbiro --format" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "nobena izbira za pretvorbo ni podana" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "grupiranja ni mogoče kombinirati z izbiro --to" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "grupiranje v tem lokaliziranem okolju nima učinka" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "izbira --header je preklicana z vnosom iz ukazne vrstice" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "napaka pri branju vhoda" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "pretvorba nekaterih vhodnih števil ni uspela" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7327,14 +7442,13 @@ msgstr "" " ali: %s --traditional [IZBIRA] [DATOTEKA] [[+]ODMIK[.][b] [[+]OZNAKA][.]" "[b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Na standardni izhod zapišemo enoznačno predstavitev DATOTEKE, privzeto\n" @@ -7343,8 +7457,10 @@ msgstr "" "standardnega vhoda.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 +#, 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" @@ -7359,8 +7475,7 @@ msgstr "" "predpona 0x ali 0X naznanja šestnajstiški zapis. Pripone so lahko . za\n" "osmiški zapis ali b za množenje s 512.\n" -#: src/od.c:344 -#, fuzzy +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7372,10 +7487,12 @@ msgstr "" "je \n" " eden od znakov [doxn] (decimalni, osmiški,\n" " šestnajstiški, noben)\n" +" --endian={big|little} zamenjan vrsti red bajtov glede na podano " +"zahtevo\n" " -j, --skip-bytes=ŠTEVILO pri vsaki datoteki preskočimo prvih ŠTEVILO " "bajtov\n" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -7398,7 +7515,7 @@ msgstr "" " --traditional sprejmi argumente v tretji zgoraj navedeni " "obliki\n" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -7416,7 +7533,7 @@ msgstr "" " -c isto kot -t c, neizpisljive znake uvedi z obratno poševnico\n" " -d isto kot -t u2, desetiški izpis dvobajtnih nepredznačenih enot\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7433,7 +7550,7 @@ 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:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -7448,7 +7565,7 @@ msgstr "" " c izpisljivi znaki; neizpisljivi znaki uvedeni z obratno " "poševnico\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7462,7 +7579,7 @@ msgstr "" " u[ENOTA] nepredznačeno desetiško celo število dolžine ENOTA bajtov\n" " x[ENOTA] šestnajstiško število dolžine ENOTA bajtov\n" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -7476,7 +7593,7 @@ 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:401 +#: src/od.c:404 msgid "" "\n" "Adding a z suffix to any type displays printable characters at the end of\n" @@ -7487,7 +7604,7 @@ msgstr "" "vsake\n" "izpisane vrstice.\n" -#: src/od.c:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -7510,12 +7627,12 @@ msgstr "" " M 1024×1024\n" "in tako dalje za G, T, P, E, Z, Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "neveljavna oznaka tipa %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7524,7 +7641,7 @@ msgstr "" "neveljavna oznaka tip %s;\n" "ta sistem ne omogoča %lu-bajtnega celoštevilčnega tipa" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7533,36 +7650,36 @@ msgstr "" "neveljavna oznaka tip %s;\n" "ta sistem ne omogoča %lu-bajtnega zapisa v plavajoči vejici" -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" msgstr "neveljavni znak %c v oznaki tipa %s" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "ni mogoče prek konca kombiniranega vhoda" -#: src/od.c:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, 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:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "združljivostni način podpira največ eno datoteko" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "vsota preskočenih in prebranih bajtov je prevelika" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "opozorilo: neveljavna širina %lu; namesto nje jemljemo %d" @@ -7578,10 +7695,10 @@ 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" msgstr "" "Vsaki od vrstic iz prve DATOTEKE s tabulatorjem na konec pridružimo " "istoležno\n" @@ -7724,12 +7841,12 @@ msgstr "Kdaj" msgid "Where" msgstr "Kje" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Uporaba: %s [IZBIRA]... [UPORABNIK]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7745,7 +7862,7 @@ msgstr "" " -p v dolgi obliki izpusti uporabnikovo datoteko .plan\n" " -s kratka oblika izpisa (privzeto)\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7761,7 +7878,7 @@ msgstr "" "računalnika\n" " in čas neaktivnosti\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -7772,97 +7889,97 @@ msgstr "" "Poenostavljeni program »finger«: izpis informacij o uporbnikih.\n" "Datoteka UTMP bo %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, 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" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "»--pages=PRVA_STRAN[:ZADNJA_STRAN]«: manjkajoči argument" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "neveljavni razpon strani %s" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "»-l DOLŽINA_STRANI« nedovoljeno število vrstic: %s" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "»-N ŠTEVILKA« nedovoljena številka začetne vrstice: %s" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "»-o ROB« nedovoljeni odmik od levega roba: %s" -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "»-w ŠIRINA_STRANI« neveljavno število znakov: %s" -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "»-W ŠIRINA_STRANI« neveljavno število znakov: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, 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:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "širina strani premajhna" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "začetna stran % presega skupno število strani %" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "prekoračitev števila strani" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Stran %" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "Oštevilčimo strani ali poravnamo besedilo v DATOTEKI v stolpce za izpis.\n" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7880,7 +7997,7 @@ msgstr "" "strani\n" " je uravnoteženo.\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7897,7 +8014,7 @@ msgstr "" " -d, --double-space\n" " izpis z dvojnim razmakom\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7918,7 +8035,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:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7940,11 +8057,25 @@ 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:2798 +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l, --length=DOLŽINA_STRANI\n" +" določimo DOLŽINO STRANI, v vrsticah (privzeto 66)\n" +" (privzeto število vrstic besedila je 56, z -F 63)\n" +" -m, --merge datoteke izpisujemo vzporedno, po eno v stolpec. " +"Predolge\n" +" vrstice porežemo, razen z izbiro -J, kjer združimo " +"celotne\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -7956,7 +8087,7 @@ msgstr "" " vrstice porežemo, razen z izbiro -J, kjer združimo " "celotne\n" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7976,7 +8107,7 @@ msgstr "" "na\n" " prvi natisnjeni strani (glej +PRVA_STRAN)\n" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7991,8 +8122,7 @@ msgstr "" " -r, --no-file-warnings\n" " brez opozoril, kadar ni mogoče odpreti datoteke\n" -#: src/pr.c:2820 -#, fuzzy +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -8005,18 +8135,18 @@ msgstr "" " -s[ZNAK], --separator[=ZNAK]\n" " stolpce ločimo z navedenim ZNAKOM; privzeti ZNAK je " "TAB,\n" -" če ni podana izbira -w in 'no char' pri izbiri -w;\n" +" če ni podana izbira -w in 'no char' pri izbiri -w.\n" " -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:2828 +#: src/pr.c:2802 +#, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -S[NIZ], --sep-string[=NIZ]\n" " stolpce ločimo z navedenim NIZOM\n" @@ -8024,7 +8154,13 @@ msgstr "" " isto kot -S\" \"), brez učinka na nastavitve stolpcev\n" " -t, --omit-header brez zglavja in repa\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -8048,7 +8184,7 @@ msgstr "" "72);\n" " samo besedilo v več stolpcih; -s[znak] izklopi\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -8063,16 +8199,6 @@ msgstr "" "na\n" " izbiri -s in -S\n" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"Če je DOLŽINA_STRANI <= 10, se privzame izbira -t. Kadar DATOTEKA ni podana\n" -"ali je enaka -, se bere standardni vhod.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -8086,7 +8212,6 @@ msgstr "" "Če SPREMENLJIVKA ni podana, izpiše imena in vrednosti vseh spremenljivk.\n" #: src/printenv.c:69 -#, fuzzy msgid " -0, --null end each output line with NUL, not newline\n" msgstr " -0, --null vrstice naj se zaključijo z znakom NUL, ne LF\n" @@ -8226,11 +8351,11 @@ msgid "" msgstr "" "Izpis permutiranega kazala gesel v vhodnih datotekah, skupaj s kontekstom.\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 +#, fuzzy 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 izpis samodejno generiranih vnosov\n" " -G, --traditional obnašanje kot »ptx« v sistemu System V\n" @@ -8239,6 +8364,12 @@ msgstr "" #: src/ptx.c:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -8252,7 +8383,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:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8272,7 +8403,7 @@ msgstr "" " -o, --only-file=FILE preberi le seznam besed iz navedene " "DATOTEKE\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8283,20 +8414,16 @@ msgstr "" " -t, --typeset-mode - ni izvedeno -\n" " -w, --width=ŠTEVILO širina izhoda v znakih, brez sklicev\n" -#: src/ptx.c:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Če DATOTEKA ni podana, ali pa je enaka -, se bere s standardnega vhoda.\n" -"Privzeto je »-F /«.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "neveljavna širina razmaka: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "neveljavna širina vrstice: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8320,13 +8447,15 @@ msgid "" "\n" "If no option is specified, -P is assumed.\n" msgstr "" +"\n" +"Če ni podana nobena izbira, se privzame -P.\n" #: src/pwd.c:169 #, c-format msgid "failed to chdir to %s" msgstr "menjava imenika v %s ni uspela" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "branje statistike %s ni uspelo" @@ -8346,8 +8475,8 @@ msgstr "ne-izbirnih argumentov ne upoštevamo" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Uporaba: %s [IZBIRA]... DATOTEKA...\n" @@ -8384,7 +8513,6 @@ 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 " @@ -8406,8 +8534,8 @@ msgstr "" " -q, --quiet,\n" " -s, --silent brez izpisa večine poročil o napakah\n" " -v, --verbose z poročili o napakah\n" -" -z, --zero izpis razmejen z znaki NUL namesto nove " -"vrstice\n" +" -z, --zero zaključi vsako vrstico z znaki NUL namesto " +"LF\n" #: src/readlink.c:152 #, c-format @@ -8425,7 +8553,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" @@ -8448,8 +8575,8 @@ msgstr "" " --relative-base=DATOTEKA izpiši absolutne poti, razen za poti pod \n" " DATOTEKO\n" " -s, --strip, --no-symlinks ne razrešuj simbolnih povezav\n" -" -z, --zero izpis loči z znakom NUL namesto z novo " -"vrstico\n" +" -z, --zero zaključi vsako vrstico z znakom NUL namesto " +"LF\n" #: src/relpath.c:130 msgid "generating relative path" @@ -8617,18 +8744,18 @@ msgstr "" "nepovratno izbrisana, razmislite o uporabi ukaza shred.\n" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: naj se %zu argumentov rekurzivno odstrani? " msgstr[1] "%s: naj se %zu argument rekurzivno odstrani? " msgstr[2] "%s: naj se %zu argumenta rekurzivno odstranita? " msgstr[3] "%s: naj se %zu argumenti rekurzivno odstranijo? " #: src/rm.c:345 -#, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +#, fuzzy, c-format +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: naj se odstrani %zu argumentov? " msgstr[1] "%s: naj se odstrani %zu argument? " msgstr[2] "%s: naj se odstranita %zu argumenta? " @@ -8848,12 +8975,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "argument ni neveljavno število v plavajoči vejici: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "določilo %s vsebuje neznano direktivo %%%c" -#: src/seq.c:557 +#: src/seq.c:603 #, 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" @@ -8872,7 +8999,16 @@ msgstr "" "drugo vsebino, s čimer je branje uničenih podatkov močno oteženo tudi\n" "s specializiranimi orodji.\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Če je DATOTEKA enaka -, prepišemo nazaj na standardni izhod.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8886,7 +9022,7 @@ msgstr "" " -s, --size=N uničimo podano število bajtov (dovoljene pripone K, M, " "G...)\n" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -8902,11 +9038,10 @@ msgstr "" " -z, --zero na koncu zapiši prek datoteke ničle, da se prikrije " "uničenje\n" -#: src/shred.c:192 +#: src/shred.c:196 +#, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -8931,7 +9066,7 @@ msgstr "" "»wipesync«: vsak zabrisani bajt sinhroniziramo z diskom\n" "Privzeti način je »wipesync«, kar pa je lahko potratno.\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8951,7 +9086,7 @@ msgstr "" "datotečnega sistema:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8973,7 +9108,7 @@ msgstr "" " strežnik NFS podjetja Network Appliace\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8987,7 +9122,7 @@ msgstr "" "* stisnjeni datotečni sistemi\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -9011,7 +9146,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:241 +#: src/shred.c:243 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" @@ -9021,127 +9156,127 @@ msgstr "" "in oddaljenih zrcalih. Teh izvodov ne moremo odstraniti in iz njih je\n" "mogoče rekonstruirati uničeno datoteko.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: klic fdatasync ni uspel" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync ni uspel" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: ni mogoče previti na začetek" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: prehod %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: napaka med pisanjem pri odmiku %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: klic lseek ni uspel" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: datoteka prevelika" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: prehod %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: prehod %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: klic fstat ni uspel" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: neveljavni tip datoteke" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: velikost datoteke negativna" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: napaka pri krajšanju" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: klic fcntl ni uspel" -#: src/shred.c:994 +#: src/shred.c:996 #, 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:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: odstranjujemo" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: preimenovano v %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: ni mogoče odstraniti" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: odstranjeno" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: ni mogoče zapreti" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: ni mogoče odpreti za pisanje" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: neveljavno število prehodov" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "naveden je več kot en izvor naključnih števil" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: neveljavna velikost datoteke" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -9152,12 +9287,11 @@ msgstr "" " ali: %s [IZBIRA]... [ARGUMENT]...\n" " ali: %s -i SP-ZG [IZBIRA]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 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" -#: src/shuf.c:73 -#, fuzzy +#: src/shuf.c:75 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 " @@ -9173,45 +9307,43 @@ msgstr "" " -n, --head-count=ŠTEVILO izpiši največ navedeno ŠTEVILO vrstic\n" " -o, --output=DATOTEKA zapiši rezultat na DATOTEKO namesto na std. " "izhod\n" -" --random-source=DATOTEKA preberi naključne bajte iz datoteke\n" +" --random-source=DATOTEKA preberi naključne bajte iz DATOTEKE\n" " -r. --repeat pri izhodnih vrsticah je dovoljeno ponavljanje\n" -" -z, --zero-terminated zaključi vrstice z \\0, ne z znakom za novo " -"vrstico\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "preveč vrstic na vhodu" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "podanih je več izbir -i" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "neveljavni vhodni razpon %s" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "neveljavno število vrstic %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "podana je več kot ena izhodna datoteka" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "izbir -e in -i ni mogoče kombinirati" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" -msgstr "" +msgstr "ni vrstic za ponovitev" #: src/sleep.c:44 #, c-format @@ -9235,12 +9367,12 @@ msgstr "" "velja premor za vsoto njihovih vrednosti.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "neveljavni časovni interval %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "ure s stvarnim časom ni moč prebrati" @@ -9251,7 +9383,7 @@ msgstr "" "Vsebino vseh DATOTEK na vhodu združimo, uredimo in izpišemo na standarni " "izhod.\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -9259,7 +9391,7 @@ msgstr "" "Izbire pri urejanju:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9270,7 +9402,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:443 +#: src/sort.c:444 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -9280,13 +9412,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:448 +#: src/sort.c:449 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:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9298,7 +9430,7 @@ msgstr "" " --random-source=DATOTEKA beri naključne bajte iz DATOTEKE\n" " -r, --reverse izpis v obrnjenem vrstnem redu\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9312,7 +9444,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:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -9320,7 +9452,7 @@ msgstr "" "Druge izbire:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9328,7 +9460,7 @@ msgstr "" " --batch-size=N združuj največ N vhodov naenkrat; pri večjem\n" " številu uporabi začasne datoteke\n" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -9343,7 +9475,7 @@ msgstr "" " --compress-program=PROGRAM začasne datoteke stisni s PROGRAMOM; pri\n" " dekomprimiranju uporabi »PROGRAM -d«\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9357,7 +9489,7 @@ msgstr "" " imena so zaključena z NUL; če je DATOTEKA »-« ,\n" " se bere standardni vhod\n" -#: src/sort.c:487 +#: src/sort.c:488 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -9366,7 +9498,7 @@ msgstr "" " -m, --merge že urejene datoteke združi brez ponovnega " "urejanja\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9379,7 +9511,7 @@ msgstr "" " primerjav\n" " -S, --buffer-size=VELIKOST določi VELIKOST izravnalnika\n" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9404,7 +9536,7 @@ msgstr "" " sicer izpiši samo prve od zaporednih enakih " "vrstic\n" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9433,12 +9565,11 @@ msgstr "" "\n" "VELIKOSTI lahko sledi ena od naslednji multiplikativnih pripon:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -9453,118 +9584,118 @@ msgstr "" "obnašanje\n" "(urejanje po številski vrednosti bajtov), uporabite LC_ALL=C.\n" -#: src/sort.c:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "čakamo na %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] se je zaključil nenormalno" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "začasne datoteke v %s ni mogoče ustvariti" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "odpiranje ni uspelo" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "klic fflush ni uspel" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "zapiranje ni uspelo" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "začasne datoteke ni mogoče ustvariti" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "ni mogoče ustvariti procesa za %s -d" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "opozorilo: ni moč odstraniti %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "neveljavni --%s argument %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "najmanjši --%s argument je %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "--%s argument %s je prevelik" -#: src/sort.c:1359 +#: src/sort.c:1358 #, 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:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "število vzporednih stolpcev mora biti večje od nič" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "poizvedba po statusu ni uspela" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "branje ni uspelo" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "pretvorba niza ni uspela" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "nepretvorjeni niz je bil %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "^ brez ujemanja za ključ\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "uporabljen opuščen ključ »%s«; nadomestite ga z »%s«" -#: src/sort.c:2428 +#: src/sort.c:2427 #, 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:2439 +#: src/sort.c:2438 #, 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:2452 +#: src/sort.c:2451 #, 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:2484 +#: src/sort.c:2483 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -9573,150 +9704,152 @@ 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:2490 +#: src/sort.c:2489 #, 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:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "pisanje ni uspelo" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: neurejenost: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "standardna napaka" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "branje ni mogoče" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: neveljavno določilo polja: %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "izbire »-%s« so nezdružljive" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: neveljavni števec na začetku %s" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "neveljavno število za »-«" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "neveljavno število za ».«" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "zablodeli znak v določilu polja" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "podan je več kot en program za stiskanje" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "neveljavno število začetka polja" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "številka polja je nič" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "znakovni zamik je nič" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" msgstr "neveljavno število za »,«" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "prazen tabulator" # POZOR!!! Razisci, kaj program res tu pocne! # ! INEXACT -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "ni mogoče prebrati imen datotek iz %s" # ! INEXACT -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: neveljavno ime datoteke (dolžina nič)" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "ni vhoda iz %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "z uporabo %s pravil za urejanje" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "z uporabo preproste primerjave bajtov" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "dodatni operand %s pri izbiri -%c ni dovoljen" -#: src/split.c:186 -#, c-format -msgid "the suffix length needs to be at least %zu" +#: src/split.c:207 +#, fuzzy, c-format +msgid "the suffix length needs to be at least %" msgstr "dolžina pripone mora biti najmanj %zu" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Uporaba: %s [IZBIRA]... [VHOD [PREDPONA]]\n" -#: src/split.c:207 +#: src/split.c:228 +#, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\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" -#: src/split.c:215 -#, c-format +#: src/split.c:236 +#, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file names\n" " -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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" " -a, --suffix-length=N uporabi pripone dolžine N (privzeto %d)\n" @@ -9733,7 +9866,7 @@ msgstr "" "nižje\n" " -u, --unbuffered takoj prepiši vhod na izhod z »-n r/...«\n" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9741,16 +9874,17 @@ msgstr "" " --verbose z izpisom diagnostike tik\n" " preden odpremo posamično datoteko\n" -#: src/split.c:235 +#: src/split.c:258 +#, fuzzy 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" "\n" "KOSI so lahko:\n" @@ -9762,190 +9896,195 @@ 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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "pripone izhodnih datotek so izčrpane" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "ustvarjanje datoteke %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "%s bi pisal prek vhoda; prekinjamo" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "nastavitev spremenljivke FILE ni uspela" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "izvajamo s FILE=%s\n" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "ni mogoče ustvariti cevovoda" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "zapiramo prejšnji cevovod" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "zapiramo izhodni cevovod" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "prestavljamo vhodni cevovod" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "zapiramo vhodni cevovod" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "ukaz ni bil uspešno izveden: \"%s -c %s\"" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "zapiranje vhodnega cevovoda ni uspelo" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "čakamo na nasledniški proces" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "pri FILE=%s prejeli signal %s od ukaza: %s" -#: src/split.c:481 +#: src/split.c:535 #, 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:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "neznani status ukaza (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "razcep na več kot en način ni mogoč" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: neveljavno število kosov" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: neveljavno število kosa" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: neveljavno dolžina pripone" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: neveljavno število bajtov" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: neveljavno število vrstic" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "večznakovni tabulator %s" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "multipleksirana znakovna enota" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "števec vrstic -%s%c... je prevelik" -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: neveljavna začetna vrednost za številčno pripono" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: neveljavna velikost V/I bloka" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "--filter ne obdeluje kosa, zapisanega na standardni izhod" -#: src/split.c:1384 +#: src/split.c:1477 #, 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:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "kanoniziranje %s ni uspelo" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "opozorilo: neprepoznana izbira »\\%c«" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: neveljavna direktiva" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "opozorilo: obratna poševnica na koncu formatnega določila" -#: src/stat.c:1262 +#: src/stat.c:1265 #, 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:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "ni mogoče prebrati datotečnega sistema %s" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9961,7 +10100,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9971,30 +10110,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "Kontekst: %C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -10006,11 +10145,11 @@ msgstr "" "Spremem.: %z\n" " Rojstvo: %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "Izpišemo status datoteke ali datotečnega sistema.\n" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" @@ -10019,7 +10158,7 @@ msgstr "" " -f, --file-system izpis statusa datotečnega sistema, ne statusa " "datoteke\n" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -10035,7 +10174,7 @@ msgstr "" " verstice; če jo želite, dodajte \\n v OBLIKO\n" " -t, --terse izpis podatkov v zgoščeni obliki\n" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -10055,7 +10194,7 @@ msgstr "" " %B - velikost v bajtih za vsak blok, ki ga javi »%b«\n" " %C - niz z varnostnim kontekstom SELinux\n" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -10071,7 +10210,7 @@ msgstr "" " %g - številka skupine (GID) lastnika\n" " %G - ime skupine lastnika\n" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -10095,8 +10234,7 @@ msgstr "" " %T - pomožna številka zvrsti enote, šestnajstiško, za bločne/znakovne " "enote\n" -#: src/stat.c:1461 -#, fuzzy +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -10116,13 +10254,13 @@ msgstr "" " %W - čas rojstva datoteke, v sekundah od 1970-01-01; 0 če ni znan\n" " %x - čas zadnjega dostopa, človeku berljiv zapis\n" " %X - čas zadnjega dostopa, v sekundah od 1970-01-01\n" -" %y - čas zadnje spremembe, človeku berljiv zapis\n" -" %Y - čas zadnje spremembe, v sekundah od 1970-01-01\n" +" %y - čas zadnje spremembe podatkov, človeku berljiv zapis\n" +" %Y - čas zadnje spremembe podatkov, v sekundah od 1970-01-01\n" " %z - čas zadnje spremembe inoda, človeku berljiv zapis\n" " %Z - čas zadnje spremembe inoda, v sekundah od 1970-01-01\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -10140,7 +10278,7 @@ msgstr "" " %d - število prostih inodov v datotečnem sistemu\n" " %f - število prostih blokov v datotečnem sistemu\n" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -10214,11 +10352,11 @@ msgstr "" "bajtov.\n" #: src/stdbuf.c:116 +#, fuzzy 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" +"for example) then that will override corresponding changes 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 "" @@ -10251,7 +10389,7 @@ msgstr "vrstično izravnavanje standardnega vhoda ni smiselno" msgid "you must specify a buffering mode option" msgstr "navesti morate izbiro izravnalnega načina" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10262,11 +10400,11 @@ msgstr "" " ali: %s [-F ENOTA] [--file=ENOTA] [-a|-all]\n" " ali: %s [-F ENOTA] [--file=ENOTA] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "Izpišemo ali spremenimo lastnosti terminala.\n" -#: src/stty.c:528 +#: src/stty.c:536 msgid "" " -a, --all print all current settings in human-readable form\n" " -g, --save print all current settings in a stty-readable form\n" @@ -10279,7 +10417,7 @@ msgstr "" " -F, --file=ENOTA odpri in uporabi navedeno ENOTO namesto standardnega " "vhoda\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10290,11 +10428,24 @@ msgstr "" "označuje nastavitve, ki so razširitve standarda POSIX. Dejansko\n" "dostopne nastavitve so odvisne od sistema.\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -10305,9 +10456,13 @@ msgstr "" " eof ZNAK ZNAK bo zaključil datoteko (končal vhod)\n" " eol ZNAK ZNAK bo zaključil vrstico\n" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -10317,35 +10472,59 @@ msgstr "" " intr ZNAK ZNAK bo poslal signal za prekinitev\n" " kill ZNAK ZNAK bo pobrisal trenutno vrstico\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" msgstr "" -" * lnext ZNAK ZNAK bo vnesel naslednji navedeni znak\n" -" quit ZNAK ZNAK bo poslal signal za končanje\n" -" * rprnt ZNAK ZNAK bo obnovil (ponovno izrisal) trenutno vrstico\n" -" start ZNAK ZNAK bo ponovno pognal ustavljeni izhod\n" -#: src/stty.c:559 +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 ZNAK ZNAK bo ustavil izhod\n" " susp ZNAK ZNAK bo poslal signal za ustavitev terminala\n" " * swtch ZNAK ZNAK bo preklopil v drugo plast lupine\n" " * werase ZNAK ZNAK bo pobrisal nazadnje vneseno besedo\n" -#: src/stty.c:565 -msgid "" -"\n" +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 +#, fuzzy +msgid "" +"\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Posebne nastavitve:\n" +"\n" +" N hitrosti vhoda in izhoda nastavi na N bitov/s\n" +" * cols N sporoči jedru, da uporabljamo terminal z N stolpci\n" +" * columns N isto kot cols N\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -10356,10 +10535,17 @@ msgstr "" " * cols N sporoči jedru, da uporabljamo terminal z N stolpci\n" " * columns N isto kot cols N\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -10369,11 +10555,22 @@ 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:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N sporoči jedru, da uporabljamo terminal z N vrsticami\n" +" * size izpiši podatke iz jedra o številu stolpcev in vrstic\n" +" speed izpiši hitrost terminala\n" +" time N z -icanon, nastavi iztek časa pri branju na N desetink " +"sekunde\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -10383,26 +10580,28 @@ msgstr "" " time N z -icanon, nastavi iztek časa pri branju na N desetink " "sekunde\n" -#: src/stty.c:584 +#: src/stty.c:641 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" -"Krmilne nastavitve:\n" -" [-]clocal onemogoči modemske krmilne signale\n" -" [-]cread omogoči sprejem vhoda\n" -" * [-]crtscts omogoči usklajevanje RTS/CTS\n" -" * [-]cdtrdsr omogoči usklajevanje DTR/DSR\n" -" csN nastavi velikost znaka v bitih na N; N je v intervalu " -"[5..8]\n" -#: src/stty.c:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 +#, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -10410,7 +10609,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb dva končna bita za znak (pri »-« je en sam)\n" " [-]hup pošlji signal za odložitev, ko zadnji proces zapre " @@ -10420,7 +10618,12 @@ msgstr "" " [-]parodd izberi liho pariteto (oziroma sodo pri »-«)\n" " [-]cmspar uporabi stalno parnost (mark/space)\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -10428,6 +10631,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Vhodne nastavitve:\n" @@ -10436,10 +10640,14 @@ msgstr "" " [-]ignbrk ne upoštevaj prekinitvenih znakov\n" " [-]igncr ne upoštevaj znaka za pomik na levi rob\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -10450,15 +10658,25 @@ msgstr "" " [-]inpck omogoči preverjanje paritete na vhodu\n" " [-]istrip najvišji (osmi) bit znakov vedno postavi na nič\n" -#: src/stty.c:616 +#: src/stty.c:692 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:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" +" * [-]iutf8 privzemi, da znaki na vhodu uporabljajo kodiranje UTF-8\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -10472,61 +10690,83 @@ msgstr "" " [-]parmrk označi napako v pariteti z zaporedjem 255-0-ZNAK\n" " [-]tandem isto kot [-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Izhodne nastavitve:\n" -" * bsN slog zakasnitve pri brisalki; N je v intervalu [0..1]\n" -" * crN slog zakasnitve pri pomiku na začetek vrste; N je v [0..3]\n" -" * ffN slog zakasnitve pri pomiku na naslednjo stran; N je v " -"[0..1]\n" -" * nlN slog zakasnitve pri skoku v naslednjo vrsto; N je v [0..1]\n" -#: src/stty.c:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" msgstr "" -" * [-]ocrnl pretvori znake CR v NL\n" -" * [-]ofdel zapolnjuj z znaki za brisanje namesto z znaki NUL\n" -" * [-]ofill uporabi znake za zapolnjevanje namesto časovnih zakasnitev\n" -" * [-]olcuc pretvori male črke v velike\n" -" * [-]onlcr pretvori znake NL v CR\n" -" * [-]onlret znak NL opravi še pomik na začetek vrste\n" -#: src/stty.c:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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 "" -" * [-]onocr ne izpisuj znakov CR v prvem stolpcu\n" -" [-]opost dodatna obdelava izhoda\n" -" * tabN slog zakasnitve pri tabulatorju; N je v intervalu [0..1]\n" -" * tabs isto kot tab0\n" -" * -tabs isto kot tab3\n" -" * vtN slog zakasnitve pri vertikalnem tabulatorju; N je v [0..1]\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10536,42 +10776,64 @@ 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +#, fuzzy +msgid " [-]echo echo input characters\n" +msgstr "" +" * [-]iutf8 privzemi, da znaki na vhodu uporabljajo kodiranje UTF-8\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]ctlecho krmilne znake izpisuj v zapisu s strešico (npr. »^C«)\n" -" [-]echo izpisuj vnesene znake\n" -" * [-]echoctl isto kot [-]ctlecho\n" -" [-]echoe isti kot [-]crterase\n" -" [-]echok izpiši znak za novo vrstico po brisanju vrstice\n" -#: src/stty.c:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]echoke isto kot [-]crtkill\n" -" [-]echonl izpisuj znak za novo vrstico, četudi ostalih ne\n" -" * [-]echoprt izpisuj pobrisane znake nazaj, med »\\« in »/«\n" -" [-]icanon omogoči posebne znake erase, kill, werase in rprnt\n" -" [-]iexten omogoči posebne znake, ki niso del priporočila POSIX\n" +" [-]isig omogoči posebne znake interrupt, quit in suspend\n" +" [-]noflsh onemogoči izpraznitev medpomnilnika po znakih interrupt in " +"quit\n" +" * [-]prterase isto kot [-]echoprt\n" +" * [-]tostop ustavi vsa opravila v ozadju, ki poskušajo pisati na " +"terminal\n" +" * [-]xcase skupaj z icanon, predhodi vse velike črke z obratno\n" +" poševnico »\\«\n" -#: src/stty.c:672 +#: src/stty.c:843 +#, fuzzy 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 "" " [-]isig omogoči posebne znake interrupt, quit in suspend\n" " [-]noflsh onemogoči izpraznitev medpomnilnika po znakih interrupt in " @@ -10582,11 +10844,33 @@ msgstr "" " * [-]xcase skupaj z icanon, predhodi vse velike črke z obratno\n" " poševnico »\\«\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -10596,40 +10880,50 @@ msgstr "" " cbreak isto kot -icanon\n" " -cbreak isto kot icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 isto kot brkint ignpar istrip icrnl ixon opost isig\n" " icanon, znaka eof in eol na njuni privzeti vrednosti\n" " -cooked isto kot raw\n" " crt isto kot echoe echoctl echoke\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -" dec isto kot echoe echoctl echoke -ixany intr ^c erase 0177\n" -" kill ^u\n" -" * [-]decctlq isto kot [-]ixany\n" -" ek znaka erase in kill na njuni privzeti vrednosti\n" -" evenp isto kot parenb -parodd cs7\n" -#: src/stty.c:699 +#: src/stty.c:919 +#, fuzzy 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 "" " -evenp isto kot -parenb cs8\n" " * [-]lcase isto kot xcase iuclc olcuc\n" @@ -10638,7 +10932,19 @@ msgstr "" " nl isto kot -icrnl -onlcr\n" " -nl isto kot icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"Kombinacijske nastavitve:\n" +" * [-]LCASE isto kot [-]lcase\n" +" cbreak isto kot -icanon\n" +" -cbreak isto kot icanon\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10652,11 +10958,12 @@ msgstr "" " pass8 isto kot -parenb -istrip cs8\n" " -pass8 isto kot parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw isto kot -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" @@ -10664,14 +10971,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw isto kot cooked\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane isto kot cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10680,7 +10988,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, vsi posebni znaki\n" " na njihove privzete vrednosti\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10695,12 +11003,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:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "navedena je lahko samo ena enota" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10709,45 +11017,50 @@ msgstr "" "izbiri za izpis v človeku berljivi obliki ter obliki, ki jo lahko prebere\n" "stty, sta si nasprotujoči" -#: src/stty.c:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: ne-blokirnega načina ni mogoče ponovno zagnati" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "neveljavni argument %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "izbiri %s manjka argument" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: napaka pri krajšanju" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "neveljavni komunikacijski protokol %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: vseh zahtevanih operacij se ni dalo izvesti" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: ni podatka o velikosti te enote" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "neveljavni celoštevilčni argument %s" #. This is a proper name. See the gettext manual, section Names. @@ -10756,8 +11069,15 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Izpišemo nadzorno vsoto in dolžino v bajtih za vsako DATOTEKO.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -10768,20 +11088,54 @@ msgstr "" " -s, --sysv algoritmom System V za nadzorno vsoto, velikost blokov 512 " "B\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Uporaba: %s [IZBIRA] [DATOTEKA]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Stanje na disku uskladimo s stanjem v diskovnem medpomnilniku.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "napaka pri branju %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: ne-blokirnega načina ni mogoče ponovno zagnati" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "napaka pri branju %s" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/sync.c:69 +#: src/sync.c:216 #, c-format -msgid "ignoring all arguments" -msgstr "ne upoštevamo nobenih argumentov" +msgid "--data needs at least one argument" +msgstr "" -#: src/system.h:343 +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10794,15 +11148,23 @@ 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:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help ta navodila\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version različica programa\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Če DATOTEKA ni podana, ali pa je enaka -, beremo s standardnega vhoda.\n" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -10811,8 +11173,7 @@ msgstr "" "Argumenti, navedeni kot obvezni pri dolgi obliki izbire, so obvezni tudi za " "kratko.\n" -#: src/system.h:551 -#, fuzzy +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10820,12 +11181,11 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" "\n" -"VELIKOST je celo število, ki mu lahko sledi enota (npr. 10M = " -"10×1024×1024).\n" +"VELIKOST je celo število, ki mu lahko sledi enota (zgled: 10K = 10×1024).\n" "Enote so K, M, G, T, P, E, Z, Y (potence 1024) ali KB, MB... (potence " "1000).\n" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10839,7 +11199,7 @@ msgstr "" "BLOCKSIZE. Privzeta enota je 1024 bajtov (512 pri nastavljenem " "POSIXLY_CORRECT).\n" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -10852,24 +11212,29 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" "Napake v prevodu %s sporočite na \n" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" -msgstr "Za popolno dokumentacijo poženite: info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "" -#: src/system.h:591 +#: src/system.h:613 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Poskusite »%s --help« za izčrpnejša navodila\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10890,9 +11255,8 @@ msgid "Jay Lepreau" msgstr "Jay Lepreau" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, last line first.\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" @@ -10908,64 +11272,63 @@ 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:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: klic seek ni uspel" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "zapis je prevelik" -#: src/tac.c:450 +#: src/tac.c:459 #, c-format msgid "failed to create temporary file in %s" msgstr "začasne datoteke v %s ni mogoče ustvariti" -#: src/tac.c:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" msgstr "%s ni mogoče odpreti za pisanje" -#: src/tac.c:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" msgstr "toka za %s ni mogoče previti na začetek" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: napaka pri pisanju" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "datoteke %s ni mogoče odpreti za branje" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "ločilo ne more biti prazno" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 -#, c-format +#: src/tail.c:257 +#, 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" 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" "datoteke. Če DATOTEKA ni podana ali je enaka -, beremo s standardnega " "vhoda.\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" @@ -10974,7 +11337,7 @@ msgstr "" "+K\n" " za izpis bajtov od K-tega dalje v vsaki datoteki\n" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10986,7 +11349,7 @@ msgstr "" " argument se obravnava kot 'descriptor'\n" " -F isto kot --follow=name --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -11010,7 +11373,7 @@ msgstr "" "datotekah);\n" " z inotify je ta izbira redkokdaj uporabna.\n" -#: src/tail.c:293 +#: src/tail.c:288 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -11020,7 +11383,7 @@ msgstr "" " -q, --quiet, --silent vedno brez izpisa glave z imenom datoteke\n" " --retry datoteko poskušaj odpreti, četudi ni dostopna\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -11034,7 +11397,7 @@ msgstr "" " vsakih N sekund.\n" " -v, --verbose vedno z izpisom glave z imenom datoteke\n" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -11052,7 +11415,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:316 +#: src/tail.c:311 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" @@ -11070,22 +11433,22 @@ msgstr "" "»tail« periodično poskusi odpreti datoteko in tako preverja, ali ta še\n" "obstaja, ali pa je bila vmes zbrisana ter ponovno ustvarjena.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "zapiramo %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, 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:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "ni moč ugotoviti lokacije %s, uporabljamo programsko izpraševanje" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -11094,148 +11457,148 @@ 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:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "%s je bila nadomeščena s simbolno povezavo; opuščamo" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s je postala nedostopna" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s je postala dostopna" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s se je pojavila; sledimo konec nove datoteka" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s je bila zamenjana; sledimo konec nove datoteke" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: ne-blokirnega načina ni mogoče spremeniti" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: datoteka je porezana" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "nobene datoteke ni več" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "opazovanje nadimenika %s ni mogoče" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "viri za inotify so izčrpani" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "opazovanje %s ni mogoče" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: naj nadomestimo %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "napaka pri nadzoru dogodka inotify" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "napaka pri branju dogodka inotify" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "%s: koncu te zvrsti datoteke ni mogoče slediti; s tem imenom odnehamo" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "število v %s je preveliko" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "%s: neveljavno največje število nespremenjenih statusov med odpiranji" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: neveljavna številka procesa (PID)" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: neveljavno število sekund" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "neveljavno število stoplcev: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "izbira je uporabljena v neveljavnem kontekstu -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "opozorilo: --retry ni upoštevan; --retry je uporabna samo pri sledenju" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "opozorilo: --retry ima učinek le pri začetnem odprtju" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "opozorilo: PID ni upoštevan; --pid=PID je uporabno samo pri sledenju" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "opozorilo: izbira --pid=PID na tem sistemu ni podprta" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "sledenje %s po imenu ni mogoče" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "opozorilo: sledenje standardnemu vhodu za vekomaj ni učinkovito" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "ni moč uporabiti inotify, uporabljamo programsko izpraševanje" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -11249,60 +11612,72 @@ msgstr "" "prek\n" " -i, --ignore-interrupts ne upoštevaj signalov za prekinitev\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Če je DATOTEKA enaka -, prepišemo nazaj na standardni izhod.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "manjkajoč argument za %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "neveljavno celo število %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "pričakuje se »)«" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "pričakuje se »)«, naleteli na %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: pričakuje se unarni operator" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt ne sprejema -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef ne sprejema -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot ne sprejema -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "neznan binarni operator" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: pričakuje se binarni operator" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11316,7 +11691,7 @@ msgstr "" " ali: [ ]\n" " ali: [ IZBIRA\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11324,7 +11699,7 @@ msgstr "" "Ovrednoti IZRAZ in rezultat vrne kot izhodno kodo.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11335,7 +11710,7 @@ msgstr "" "(false).\n" "Izpuščen IZRAZ se privzeto ovrednoti kot neresnično. IZRAZ je eden od:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11349,7 +11724,7 @@ msgstr "" " IZRAZ1 -a IZRAZ2 IZRAZ1 in IZRAZ2 sta oba pravilna\n" " IZRAZ1 -o IZRAZ2 IZRAZ1 ali IZRAZ2 sta pravilna\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11365,7 +11740,7 @@ msgstr "" " NIZ1 = NIZ2 niza sta enaka\n" " NIZ1 != NIZ2 niza se razlikujeta\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11385,7 +11760,7 @@ msgstr "" " ŠTEVILO1 -lt ŠTEVILO2 celo ŠTEVILO1 je manjše od celega ŠTEVILU2\n" " ŠTEVILO1 -ne ŠTEVILO2 celo ŠTEVILO1 ni enako celemu ŠTEVILU2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11398,7 +11773,7 @@ msgstr "" "DATOTEKA2\n" " DATOTEKA1 -ot DATOTEKA2 DATOTEKA1 je bila spremenjena prej kot DATOTEKA2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11412,7 +11787,7 @@ msgstr "" " -d DATOTEKA DATOTEKA obstaja in je imenik\n" " -e DATOTEKA DATOTEKA obstaja\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11426,7 +11801,7 @@ msgstr "" " -h DATOTEKA DATOTEKA obstaja in je simbolna povezava (isto kot -L)\n" " -k DATOTEKA DATOTEKA obstaja in ima postavljen lepljivi bit\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11440,7 +11815,7 @@ msgstr "" " -r DATOTEKA DATOTEKA obstaja in jo smemo brati\n" " -s DATOTEKA DATOTEKA obstaja in ni prazna (dolžina > 0)\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11455,7 +11830,7 @@ msgstr "" " -w DATOTEKA DATOTEKA obstaja in nanjo smemo pisati\n" " -x DATOTEKA DATOTEKA obstaja in jo smemo izvajati ali iskati\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11469,7 +11844,7 @@ msgstr "" "obratnimi poševnicami, da jih ne tolmači ukazna lupina. Celo ŠTEVILO je\n" "lahko tudi -l NIZ, ki se ovrednoti na dolžino NIZA.\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11479,25 +11854,25 @@ msgstr "" "Pomnite: [ upošteva izbiri --help in --version, »test« pa ne.\n" "»test« tudi ta niza obravnava enako kot druge neprazne NIZE.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test in/ali [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "manjkajoč »]«" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "odvečen argument %s" @@ -11517,7 +11892,7 @@ msgstr "opozorilo: timer_settime" msgid "warning: timer_create" msgstr "opozorilo: timer_create" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11526,11 +11901,11 @@ msgstr "" "Uporaba: %s [IZBIRA] TRAJANJE UKAZ [ARGUMENT]...\n" " ali: %s [IZBIRA]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 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" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11564,7 +11939,7 @@ msgstr "" " SIGNAL lahko podamo z imenom (npr. »HUP«) ali številko;\n" " seznam signalov lahko izvemo z ukazom »kill -l«.\n" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11575,7 +11950,7 @@ msgstr "" "TRAJANJE je realno število z neobvezno pripono:\n" "»s« za sekunde (privzeto), »m« za minute, »h« za ure in »d« za dneve.\n" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -11594,7 +11969,7 @@ msgstr "" "mogoče prestreči. Ob poslanem signalu KILL(9) izhodni status ni 124,\n" "ampak 128+9.\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "opozorilo: pomnilniških izmetov ni mogoče onemogočiti" @@ -11609,6 +11984,11 @@ msgstr "napaka pri čakanju na ukaz" msgid "the monitored command dumped core" msgstr "nadzorovani ukaz je izvrgel pomnilniško sliko" +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "neznani status ukaza (0x%X)" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -11976,12 +12356,12 @@ msgstr "Zaključi s statusno kodo, ki kaže uspeh." msgid "Exit with a status code indicating failure." msgstr "Zaključi s statusno kodo, ki kaže neuspeh." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Uporaba: %s IZBIRA... DATOTEKA...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -11999,18 +12379,18 @@ msgstr "" "Če je VELIKOST DATOTEKE manjša od navedene, se ta podaljša tako, da se do\n" "predpisane dolžine dopolni z znaki \\0.\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create ne ustvari nobene datoteke\n" -#: src/truncate.c:112 +#: src/truncate.c:85 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:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" @@ -12018,7 +12398,7 @@ msgstr "" " -r, --reference=DATOTEKA uporabi velikost navedene DATOTEKE\n" " -s, --size=VELIKOST nastavi ali spremeni VELIKOST datoteke (v bajtih)\n" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -12031,58 +12411,63 @@ msgstr "" "»/« zaokroži navzdol na večkratnik od, »%« zaokroži navzgor na večkratnik " "od.\n" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" "prekoračitev obsega pri dolžini %×% bajtov datoteke %s" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s ima neuporabno, navidezno negativno velikost" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "ni mogoče prebrati velikosti %s" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "prekoračitev obsega pri zaokrožitvi navzgor velikosti datoteke %s" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "prekoračitev obsega pri povečevanju dolžine datoteke %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "ni mogoče odrezati datoteke %s pri dolžini % bajtov" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "podanih je več relativnih modifikatorjev" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "neveljavno število" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "navesti morate bodisi %s bodisi %s" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "navesti morate relativni %s z %s" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "%s je bil določen, %s pa ne" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "%s ni mogoče odpreti za pisanje" @@ -12093,24 +12478,27 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Uporaba: %s [IZBIRA] [DATOTEKA]\n" "Zapiše se povsem urejen seznam, usklajen z delno ureditvijo v DATOTEKI.\n" "Če DATOTEKA ni podana ali je enaka -, se bere s standardnega vhoda.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: liho število vnosov na vhodu" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: zanka na vhodu:" @@ -12175,9 +12563,8 @@ msgid "cannot get system name" msgstr "ime sistema ni ugotovljivo" #: 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" +#, fuzzy +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "Presledki v vsaki DATOTEKI se nadomestijo s tabulatorji, rezultat se zapiše\n" "na standardni izhod. Če DATOTEKA ni podana ali je enaka -, se bere s\n" @@ -12237,9 +12624,10 @@ msgstr "" "skupino\n" #: src/uniq.c:187 +#, fuzzy msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" " -D, --all-repeated[=RAZMEJITEV] izpiši vse podvojene vrstice\n" @@ -12251,9 +12639,10 @@ msgid " -f, --skip-fields=N avoid comparing the first N fields\n" msgstr " -f, --skip-fields=N pri primerjanju izpusti prvih N polj\n" #: src/uniq.c:195 +#, fuzzy msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" " --group[=METODA] prikaži vse elemente, skupine loči s prazno vrstico\n" @@ -12261,7 +12650,6 @@ msgstr "" "both}\n" #: src/uniq.c:199 -#, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing\n" " -s, --skip-chars=N avoid comparing the first N characters\n" @@ -12270,7 +12658,6 @@ msgstr "" " -i, --ignore-case male in velike črke obravnavaj enakovredno\n" " -s, --skip-chars=N pri primerjanju izpusti prvih N znakov\n" " -u, --unique izpiši samo nepodvojene vrstice\n" -" -z, --zero-terminated vrstice zaključi z znakom NUL, ne LF\n" #: src/uniq.c:207 msgid " -w, --check-chars=N compare no more than N characters in lines\n" @@ -12415,11 +12802,6 @@ msgstr "" "Speči procesi, ki\n" "jih ni mogoče prekiniti, tudi prispevajo k prikazu obremenitve.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -12440,12 +12822,17 @@ msgstr "" "Če DATOTEKA ni navedena, se uporabi %s. Običajno je DATOTEKA %s.\n" "\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -12464,12 +12851,13 @@ msgstr "" " -m, --chars izpis števila znakov\n" " -l, --lines izpis števila vrstic\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=DATOTEKA preberi imena datotek s seznama\n" @@ -12638,10 +13026,10 @@ msgstr "" "Isto kot »id -un«.\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: uporabniško ime za UID %lu ni ugotovljivo\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "uporabniškega imena za UID %s ni moč ugotoviti" #: src/yes.c:41 #, c-format @@ -12660,6 +13048,228 @@ msgstr "" "Ponavljaje izpisujemo vrstico s podanim NIZOM (privzeto »y«).\n" "\n" +#~ msgid "input line is too short, no numbers found to convert in field %ld" +#~ msgstr "" +#~ "vhodna vrstica je prekratka, manjkajo števila za pretvorbo v polju %ld" + +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "Če je DOLŽINA_STRANI <= 10, se privzame izbira -t. Kadar DATOTEKA ni " +#~ "podana\n" +#~ "ali je enaka -, se bere standardni vhod.\n" + +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Če DATOTEKA ni podana, ali pa je enaka -, se bere s standardnega vhoda.\n" +#~ "Privzeto je »-F /«.\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Stanje na disku uskladimo s stanjem v diskovnem medpomnilniku.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "ne upoštevamo nobenih argumentov" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: neveljavno število" + +#~ msgid "invalid number %s" +#~ msgstr "neveljavno število %s" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s je tako veliko, da ni predstavljivo" + +#~ msgid "number of lines" +#~ msgstr "število vrstic" + +#~ msgid "number of bytes" +#~ msgstr "število bajtov" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: neveljavno število izločenih enot" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: neveljavno število bajtov" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: neveljavno število vrstic" + +#~ msgid "number in %s is too large" +#~ msgstr "število v %s je preveliko" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: neveljavno število sekund" + +#~ msgid "failed to %s supplemental groups" +#~ msgstr "dodatnih skupin ni bilo mogoče %s" + +#~ 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 "" +#~ "\n" +#~ "Če pošljemo tekočemu procesu »dd« signal %s, ta izpiše vhodno-izhodne\n" +#~ "statistike na standardni izhod za napake in nadaljuje z delom.\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" +#~ "Izbire so:\n" +#~ "\n" + +#~ 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 ZNAK ZNAK bo vnesel naslednji navedeni znak\n" +#~ " quit ZNAK ZNAK bo poslal signal za končanje\n" +#~ " * rprnt ZNAK ZNAK bo obnovil (ponovno izrisal) trenutno vrstico\n" +#~ " start ZNAK ZNAK bo ponovno pognal ustavljeni izhod\n" + +#~ 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" +#~ "Krmilne nastavitve:\n" +#~ " [-]clocal onemogoči modemske krmilne signale\n" +#~ " [-]cread omogoči sprejem vhoda\n" +#~ " * [-]crtscts omogoči usklajevanje RTS/CTS\n" +#~ " * [-]cdtrdsr omogoči usklajevanje DTR/DSR\n" +#~ " csN nastavi velikost znaka v bitih na N; N je v intervalu " +#~ "[5..8]\n" + +#~ 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 "" +#~ "\n" +#~ "Izhodne nastavitve:\n" +#~ " * bsN slog zakasnitve pri brisalki; N je v intervalu [0..1]\n" +#~ " * crN slog zakasnitve pri pomiku na začetek vrste; N je v " +#~ "[0..3]\n" +#~ " * ffN slog zakasnitve pri pomiku na naslednjo stran; N je v " +#~ "[0..1]\n" +#~ " * nlN slog zakasnitve pri skoku v naslednjo vrsto; N je v " +#~ "[0..1]\n" + +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl pretvori znake CR v NL\n" +#~ " * [-]ofdel zapolnjuj z znaki za brisanje namesto z znaki NUL\n" +#~ " * [-]ofill uporabi znake za zapolnjevanje namesto časovnih " +#~ "zakasnitev\n" +#~ " * [-]olcuc pretvori male črke v velike\n" +#~ " * [-]onlcr pretvori znake NL v CR\n" +#~ " * [-]onlret znak NL opravi še pomik na začetek vrste\n" + +#~ 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 "" +#~ " * [-]onocr ne izpisuj znakov CR v prvem stolpcu\n" +#~ " [-]opost dodatna obdelava izhoda\n" +#~ " * tabN slog zakasnitve pri tabulatorju; N je v intervalu " +#~ "[0..1]\n" +#~ " * tabs isto kot tab0\n" +#~ " * -tabs isto kot tab3\n" +#~ " * vtN slog zakasnitve pri vertikalnem tabulatorju; N je v " +#~ "[0..1]\n" + +#~ 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 "" +#~ " * [-]ctlecho krmilne znake izpisuj v zapisu s strešico (npr. »^C«)\n" +#~ " [-]echo izpisuj vnesene znake\n" +#~ " * [-]echoctl isto kot [-]ctlecho\n" +#~ " [-]echoe isti kot [-]crterase\n" +#~ " [-]echok izpiši znak za novo vrstico po brisanju vrstice\n" + +#~ 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 "" +#~ " * [-]echoke isto kot [-]crtkill\n" +#~ " [-]echonl izpisuj znak za novo vrstico, četudi ostalih ne\n" +#~ " * [-]echoprt izpisuj pobrisane znake nazaj, med »\\« in »/«\n" +#~ " [-]icanon omogoči posebne znake erase, kill, werase in rprnt\n" +#~ " [-]iexten omogoči posebne znake, ki niso del priporočila POSIX\n" + +#~ 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 "" +#~ " dec isto kot echoe echoctl echoke -ixany intr ^c erase 0177\n" +#~ " kill ^u\n" +#~ " * [-]decctlq isto kot [-]ixany\n" +#~ " ek znaka erase in kill na njuni privzeti vrednosti\n" +#~ " evenp isto kot parenb -parodd cs7\n" + +#~ msgid "For complete documentation, run: info coreutils '%s invocation'\n" +#~ msgstr "Za popolno dokumentacijo poženite: info coreutils '%s invocation'\n" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: uporabniško ime za UID %lu ni ugotovljivo\n" + #~ msgid "cannot create pipe" #~ msgstr "ni mogoče ustvariti cevovoda" @@ -13113,17 +13723,6 @@ msgstr "" #~ " -v, --verbose z izpisom diagnostike ob vsaki obdelani " #~ "datoteki\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 "" -#~ "Izpišemo trenutni čas v podani OBLIKI, ali pa nastavimo sistemski čas.\n" -#~ "\n" -#~ " -d, --date=NIZ izpiši čas podan v NIZU namesto trenutnega\n" -#~ " -f, --file=DATOTEKA enako kot --date za vsako vrstico v DATOTEKI\n" - #~ msgid "" #~ "\n" #~ "SIZE may be (or may be an integer optionally followed by) one of " @@ -13402,9 +14001,6 @@ msgstr "" #~ "samo in rezultat zapišemo na IZHOD (standardni izhod).\n" #~ "\n" -#~ msgid "Usage: %s [OPTION] [FILE]...\n" -#~ msgstr "Uporaba: %s [IZBIRA] [DATOTEKA]...\n" - #~ msgid "" #~ " -P, --no-dereference never follow symbolic links in SOURCE\n" #~ msgstr "" @@ -14358,9 +14954,6 @@ msgstr "" #~ "če je začetna vrednost manjša kot meja, mora biti\n" #~ "korak pozitiven" -#~ msgid "invalid number" -#~ msgstr "neveljavno število" - #~ msgid "*** invalid date/time ***" #~ msgstr "*** neveljavni datum/čas ***" diff --git a/po/sr.gmo b/po/sr.gmo new file mode 100644 index 00000000..2bf391ba Binary files /dev/null and b/po/sr.gmo differ diff --git a/po/sr.po b/po/sr.po new file mode 100644 index 00000000..b29eebe1 --- /dev/null +++ b/po/sr.po @@ -0,0 +1,13251 @@ +# Serbian translation of GNU coreutils. +# Copyright (C) 2014 Free Software Foundation, Inc. +# This file is distributed under the same license as the coreutils package. +# Мирослав Николић , 2014. +#: src/stty.c:941 +msgid "" +msgstr "" +"Project-Id-Version: GNU coreutils 8.23-pre1\n" +"Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" +"PO-Revision-Date: 2014-09-12 21:53+0200\n" +"Last-Translator: Мирослав Николић \n" +"Language-Team: Serbian <(nothing)>\n" +"Language: sr\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" + +#: lib/argmatch.c:133 +#, c-format +msgid "invalid argument %s for %s" +msgstr "неисправан аргумент „%s“ за „%s“" + +#: lib/argmatch.c:134 +#, c-format +msgid "ambiguous argument %s for %s" +msgstr "нејасан аргумент „%s“ за „%s“" + +#: lib/argmatch.c:153 +msgid "Valid arguments are:" +msgstr "Исправни аргументи су:" + +#: lib/closein.c:100 +msgid "error closing file" +msgstr "грешка затварања датотеке" + +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: src/unexpand.c:426 src/unexpand.c:442 +#, c-format +msgid "write error" +msgstr "грешка писања" + +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 +#, c-format +msgid "preserving permissions for %s" +msgstr "причувавам овлашћења за %s" + +#: lib/error.c:191 +msgid "Unknown system error" +msgstr "Непозната системска грешка" + +#: lib/file-type.c:40 +msgid "regular empty file" +msgstr "обична празна датотека" + +#: lib/file-type.c:40 +msgid "regular file" +msgstr "обична датотека" + +#: lib/file-type.c:43 +msgid "directory" +msgstr "директоријум" + +#: lib/file-type.c:46 +msgid "symbolic link" +msgstr "симболичка веза" + +#: lib/file-type.c:52 +msgid "message queue" +msgstr "ред порука" + +#: lib/file-type.c:55 +msgid "semaphore" +msgstr "семафор" + +#: lib/file-type.c:58 +msgid "shared memory object" +msgstr "заједнички меморијски објекат" + +#: lib/file-type.c:61 +msgid "typed memory object" +msgstr "типски меморијски објекат" + +#: lib/file-type.c:66 +msgid "block special file" +msgstr "посебна датотека блока" + +#: lib/file-type.c:69 +msgid "character special file" +msgstr "посебна датотека знака" + +#: lib/file-type.c:72 +msgid "contiguous data" +msgstr "непрекидни подаци" + +#: lib/file-type.c:75 +msgid "fifo" +msgstr "пупи" + +#: lib/file-type.c:78 +msgid "door" +msgstr "врата" + +#: lib/file-type.c:81 +msgid "multiplexed block special file" +msgstr "посебна датотека мултиплексираног блока" + +#: lib/file-type.c:84 +msgid "multiplexed character special file" +msgstr "посебна датотека мултиплексираног знака" + +#: lib/file-type.c:87 +msgid "multiplexed file" +msgstr "мултиплексирана датотека" + +#: lib/file-type.c:90 +msgid "named file" +msgstr "именована датотека" + +#: lib/file-type.c:93 +msgid "network special file" +msgstr "посебна датотека мреже" + +#: lib/file-type.c:96 +msgid "migrated file with data" +msgstr "пресељена датотека са подацима" + +#: lib/file-type.c:99 +msgid "migrated file without data" +msgstr "пресељена датотека без података" + +#: lib/file-type.c:102 +msgid "port" +msgstr "прикључник" + +#: lib/file-type.c:105 +msgid "socket" +msgstr "прикључница" + +#: lib/file-type.c:108 +msgid "whiteout" +msgstr "слободни излаз" + +#: lib/file-type.c:110 +msgid "weird file" +msgstr "чудна датотека" + +#: lib/gai_strerror.c:57 +msgid "Address family for hostname not supported" +msgstr "Породица адреса за назив домаћина није подржана" + +#: lib/gai_strerror.c:58 +msgid "Temporary failure in name resolution" +msgstr "Привремени неуспех одређивања назива" + +#: lib/gai_strerror.c:59 +msgid "Bad value for ai_flags" +msgstr "Неисправна вредност за аи_опције" + +#: lib/gai_strerror.c:60 +msgid "Non-recoverable failure in name resolution" +msgstr "Непоправљива грешка при одређивању назива" + +#: lib/gai_strerror.c:61 +msgid "ai_family not supported" +msgstr "аи_породица није подржана" + +#: lib/gai_strerror.c:62 +msgid "Memory allocation failure" +msgstr "Расподела меморије није успела" + +#: lib/gai_strerror.c:63 +msgid "No address associated with hostname" +msgstr "Ниједна адреса није придружена називу домаћина" + +#: lib/gai_strerror.c:64 +msgid "Name or service not known" +msgstr "Није позната услуга или назив" + +#: lib/gai_strerror.c:65 +msgid "Servname not supported for ai_socktype" +msgstr "Назив сервера није подржан за аи_врступрикључнице" + +#: lib/gai_strerror.c:66 +msgid "ai_socktype not supported" +msgstr "аи_врстаприкључнице није подржана" + +#: lib/gai_strerror.c:67 +msgid "System error" +msgstr "Системска грешка" + +#: lib/gai_strerror.c:68 +msgid "Argument buffer too small" +msgstr "Међумеморија аргумента је премала" + +#: lib/gai_strerror.c:70 +msgid "Processing request in progress" +msgstr "Захтев обрађивања је у току" + +#: lib/gai_strerror.c:71 +msgid "Request canceled" +msgstr "Захтев је отказан" + +#: lib/gai_strerror.c:72 +msgid "Request not canceled" +msgstr "Захтев није отказан" + +#: lib/gai_strerror.c:73 +msgid "All requests done" +msgstr "Сви захтеви су готови" + +#: lib/gai_strerror.c:74 +msgid "Interrupted by a signal" +msgstr "Прекинуто сигналом" + +#: lib/gai_strerror.c:75 +msgid "Parameter string not correctly encoded" +msgstr "Ниска параметра није исправно кодирана" + +#: lib/gai_strerror.c:87 +msgid "Unknown error" +msgstr "Непозната грешка" + +#: lib/getopt.c:575 lib/getopt.c:604 +#, c-format +msgid "%s: option '%s' is ambiguous; possibilities:" +msgstr "%s: опција „%s“ је нејасна; могућности:" + +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: опција „-W %s“ је нејасна\n" + +#: lib/getopt.c:654 lib/getopt.c:658 +#, c-format +msgid "%s: option '--%s' doesn't allow an argument\n" +msgstr "%s: опција „--%s“ не дозвољава аргумент\n" + +#: lib/getopt.c:667 lib/getopt.c:672 +#, c-format +msgid "%s: option '%c%s' doesn't allow an argument\n" +msgstr "%s: опција „%c%s“ не дозвољава аргумент\n" + +#: lib/getopt.c:715 lib/getopt.c:734 +#, c-format +msgid "%s: option '--%s' requires an argument\n" +msgstr "%s: опција „--%s“ захтева аргумент\n" + +#: lib/getopt.c:772 lib/getopt.c:775 +#, c-format +msgid "%s: unrecognized option '--%s'\n" +msgstr "%s: непозната опција „--%s“\n" + +#: lib/getopt.c:783 lib/getopt.c:786 +#, c-format +msgid "%s: unrecognized option '%c%s'\n" +msgstr "%s: непозната опција „%c%s“\n" + +#: lib/getopt.c:835 lib/getopt.c:838 +#, c-format +msgid "%s: invalid option -- '%c'\n" +msgstr "%s: неисправна опција -- „%c“\n" + +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#, c-format +msgid "%s: option requires an argument -- '%c'\n" +msgstr "%s: опција захтева аргумент -- „%c“\n" + +#: lib/getopt.c:964 lib/getopt.c:980 +#, c-format +msgid "%s: option '-W %s' is ambiguous\n" +msgstr "%s: опција „-W %s“ је нејасна\n" + +#: lib/getopt.c:1004 lib/getopt.c:1022 +#, c-format +msgid "%s: option '-W %s' doesn't allow an argument\n" +msgstr "%s: опција „-W %s“ не дозвољава аргумент\n" + +#: lib/getopt.c:1043 lib/getopt.c:1061 +#, c-format +msgid "%s: option '-W %s' requires an argument\n" +msgstr "%s: опција „-W %s“ захтева аргумент\n" + +#: lib/mkdir-p.c:181 src/install.c:487 +#, c-format +msgid "cannot change permissions of %s" +msgstr "не могу да променим овлашћења за „%s“" + +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 +#, c-format +msgid "cannot create directory %s" +msgstr "не могу да направим директоријум „%s“" + +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 +#, c-format +msgid "memory exhausted" +msgstr "меморија је потрошена" + +#: lib/openat-die.c:38 +#, c-format +msgid "unable to record current working directory" +msgstr "не могу да снимим тренутни радни директоријум" + +#: lib/openat-die.c:57 src/find-mount-point.c:107 +#, c-format +msgid "failed to return to initial working directory" +msgstr "не могу да се вратим у почетни радни директоријум" + +#. 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 +#. +#. 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: крај датотеке" + +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: грешка читања" + +#: lib/regcomp.c:131 +msgid "Success" +msgstr "Успешно" + +#: lib/regcomp.c:134 +msgid "No match" +msgstr "Нема поклапања" + +#: lib/regcomp.c:137 +msgid "Invalid regular expression" +msgstr "Неисправан регуларни израз" + +#: lib/regcomp.c:140 +msgid "Invalid collation character" +msgstr "Неисправан знак слагања" + +#: lib/regcomp.c:143 +msgid "Invalid character class name" +msgstr "Неисправан назив класе знака" + +#: lib/regcomp.c:146 +msgid "Trailing backslash" +msgstr "Пратећа контра коса црта" + +#: lib/regcomp.c:149 +msgid "Invalid back reference" +msgstr "Неисправна повратна упута" + +#: lib/regcomp.c:152 +msgid "Unmatched [ or [^" +msgstr "Не одговара [ или [^" + +#: lib/regcomp.c:155 +msgid "Unmatched ( or \\(" +msgstr "Не одговара ( или \\(" + +#: lib/regcomp.c:158 +msgid "Unmatched \\{" +msgstr "Не одговара \\{" + +#: lib/regcomp.c:161 +msgid "Invalid content of \\{\\}" +msgstr "Неисправан садржај \\{\\}" + +#: lib/regcomp.c:164 +msgid "Invalid range end" +msgstr "Неисправан крај опсега" + +#: lib/regcomp.c:167 +msgid "Memory exhausted" +msgstr "Меморија је потрошена" + +#: lib/regcomp.c:170 +msgid "Invalid preceding regular expression" +msgstr "Неисправан регуларан израз који претходи" + +#: lib/regcomp.c:173 +msgid "Premature end of regular expression" +msgstr "Прерани крај регуларног израза" + +#: lib/regcomp.c:176 +msgid "Regular expression too big" +msgstr "Регуларни израз је превелик" + +#: lib/regcomp.c:179 +msgid "Unmatched ) or \\)" +msgstr "Не одговара ) или \\)" + +#: lib/regcomp.c:707 +msgid "No previous regular expression" +msgstr "Нема претходног регуларног израза" + +#: lib/root-dev-ino.h:37 +#, c-format +msgid "it is dangerous to operate recursively on %s" +msgstr "опасно је радити дубински на „%s“" + +#: lib/root-dev-ino.h:41 +#, c-format +msgid "it is dangerous to operate recursively on %s (same as %s)" +msgstr "опасно је радити дубински на „%s“ (исто као %s)" + +#: lib/root-dev-ino.h:43 +#, c-format +msgid "use --no-preserve-root to override this failsafe" +msgstr "користите „--no-preserve-root“ да заобиђете ову бебзбедност" + +#. 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:150 +msgid "^[yY]" +msgstr "^[yY]" + +#. 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:163 +msgid "^[nN]" +msgstr "^[nN]" + +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 +#, c-format +msgid "setting permissions for %s" +msgstr "подешавам овлашћења за %s" + +#: lib/siglist.h:31 +msgid "Hangup" +msgstr "Обустави" + +#: lib/siglist.h:34 +msgid "Interrupt" +msgstr "Прекини" + +#: lib/siglist.h:37 +msgid "Quit" +msgstr "Изађи" + +#: lib/siglist.h:40 +msgid "Illegal instruction" +msgstr "Неисправна инструкција" + +#: lib/siglist.h:43 +msgid "Trace/breakpoint trap" +msgstr "Замка праћења/тачке прекида" + +#: lib/siglist.h:46 +msgid "Aborted" +msgstr "Прекинуто" + +#: lib/siglist.h:49 +msgid "Floating point exception" +msgstr "Изузетак покретног зареза" + +#: lib/siglist.h:52 +msgid "Killed" +msgstr "Убијен" + +#: lib/siglist.h:55 +msgid "Bus error" +msgstr "Грешка сабирнице" + +#: lib/siglist.h:58 +msgid "Segmentation fault" +msgstr "Неуспех сегментације" + +#: lib/siglist.h:61 +msgid "Broken pipe" +msgstr "Оштећена спојка" + +#: lib/siglist.h:64 +msgid "Alarm clock" +msgstr "Аларм" + +#: lib/siglist.h:67 +msgid "Terminated" +msgstr "Окончано" + +#: lib/siglist.h:70 +msgid "Urgent I/O condition" +msgstr "Хитни У/И услов" + +#: lib/siglist.h:73 +msgid "Stopped (signal)" +msgstr "Заустављен (сигнал)" + +#: lib/siglist.h:76 +msgid "Stopped" +msgstr "Заустављен" + +#: lib/siglist.h:79 +msgid "Continued" +msgstr "Настављен" + +#: 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 "I/O је могућ" + +#: 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 "Кориснички одређени сигнал 1" + +#: lib/siglist.h:112 +msgid "User defined signal 2" +msgstr "Кориснички одређени сигнал 2" + +#: 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/strsignal.c:114 +#, c-format +msgid "Real-time signal %d" +msgstr "Сигнал у стварном времену %d" + +#: lib/strsignal.c:118 +#, c-format +msgid "Unknown signal %d" +msgstr "Непознати сигнал %d" + +#: 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 "не могу да претворим U+%04X у месни скуп знакова" + +#: lib/unicodeio.c:183 +#, c-format +msgid "cannot convert U+%04X to local character set: %s" +msgstr "не могу да претворим U+%04X у месни скуп знакова: %s" + +#: 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 "Запаковао је %s (%s)\n" + +#: lib/version-etc.c:77 +#, c-format +msgid "Packaged by %s\n" +msgstr "Запаковао је %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 "©" + +#: lib/version-etc.c:86 +msgid "" +"\n" +"License GPLv3+: GNU GPL version 3 or later .\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" +"Лиценца ОЈЛв3+: ГНУ ОЈЛ издање 3 или касније .\n" +"Ово је слободан софтвер: слободни сте да га мењате и расподељујете.\n" +"Не постоји НИКАКВА ГАРАНЦИЈА, у оквирима дозвољеним законом.\n" +"\n" + +#. TRANSLATORS: %s denotes an author name. +#: lib/version-etc.c:102 +#, c-format +msgid "Written by %s.\n" +msgstr "Написао је %s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#: lib/version-etc.c:106 +#, c-format +msgid "Written by %s and %s.\n" +msgstr "Написали су %s и %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 "Написали су %s, %s, и %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 "" +"Написали су %s, %s, %s,\n" +"и %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 "" +"Написали су %s, %s, %s,\n" +"%s, и %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 "" +"Написали су %s, %s, %s,\n" +"%s, %s, и %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 "" +"Написали су %s, %s, %s,\n" +"%s, %s, %s, и %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 "" +"Написали су %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"и %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 "" +"Написали су %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, и %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 "" +"Написали су %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, %s, и други.\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" +"Грешке пријавите на: %s\n" + +#: lib/version-etc.c:247 +#, c-format +msgid "Report %s bugs to: %s\n" +msgstr "Грешке програма „%s“ пријавите на: %s\n" + +#: lib/version-etc.c:251 +#, c-format +msgid "%s home page: <%s>\n" +msgstr "%s матична страница: <%s>\n" + +#: lib/version-etc.c:253 +#, c-format +msgid "%s home page: \n" +msgstr "%s матична страница: \n" + +#: lib/version-etc.c:256 +msgid "General help using GNU software: \n" +msgstr "Општа помоћ користећи Гнуов софтвер: \n" + +#: 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 "нисам успео да поново отворим „%s“ са режимом %s" + +#: lib/xmemcoll.c:39 src/expr.c:878 +#, c-format +msgid "string comparison failed" +msgstr "није успело поређење ниске" + +#: lib/xmemcoll.c:40 +#, c-format +msgid "Set LC_ALL='C' to work around the problem." +msgstr "Поставите LC_ALL='C' да решите проблем." + +#: lib/xmemcoll.c:42 +#, c-format +msgid "The strings compared were %s and %s." +msgstr "Поређене ниске су „%s“ и „%s“." + +#: 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 "неисправан %s%s аргумент „%s“" + +#: lib/xstrtol-error.c:68 +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "неисправан суфикс у %s%s аргументу „%s“" + +#: lib/xstrtol-error.c:72 +#, c-format +msgid "%s%s argument '%s' too large" +msgstr "%s%s аргумент „%s“ је превелик" + +#. 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 "" +"Употреба: %s [ОПЦИЈА]... [ДАТОТЕКА]\n" +"ДАТОТЕКА кодирања или декодирања основе 64, или стандардни улаз, на " +"стандардни излаз.\n" + +#: src/base64.c:68 +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 "" +" -d, --decode декодира податке\n" +" -i, --ignore-garbage када декодира, занемарује не-словне знакове\n" +" -w, --wrap=СТУПЦИ прелама кодиране редове након СТУБАЦА знакова " +"(основно је 76).\n" +" Користите 0 да искључите преламање реда\n" +"\n" + +#: src/base64.c:77 +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 "" +"\n" +"Подаци се кодирају као што је описано за алфабет основе-64 у РФЦ 3548.\n" +"Приликом декодирања, улаз може садржати нове редове као додатак бајтовима\n" +"званичног алфабета основе-64. Користите „--ignore-garbage“ да покушате да\n" +"опоравите од свих других не-алфабетских бајтова у кодираном току.\n" + +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 +#, c-format +msgid "read error" +msgstr "грешка читања" + +#: src/base64.c:229 +#, c-format +msgid "invalid input" +msgstr "неисправан улаз" + +#: src/base64.c:266 +#, c-format +msgid "invalid wrap size: %s" +msgstr "неисправна величина прелома: %s" + +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 +#: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 +#: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 +#, c-format +msgid "extra operand %s" +msgstr "додатни операнд %s" + +#: src/base64.c:317 src/cat.c:765 +#, 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:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 +#: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 +#: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 +#: 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 "" +"Употреба: %s НАЗИВ [СУФИКС]\n" +" или: %s ОПЦИЈА... НАЗИВ...\n" + +#: src/basename.c:53 +msgid "" +"Print NAME with any leading directory components removed.\n" +"If specified, also remove a trailing SUFFIX.\n" +msgstr "" +"Исписује НАЗИВ са уклоњеним сваким водећим састојком директоријума.\n" +"Ако је наведено, такође уклања пратећи СУФИКС.\n" + +#: src/basename.c:60 +msgid "" +" -a, --multiple support multiple arguments and treat each as a NAME\n" +" -s, --suffix=SUFFIX remove a trailing SUFFIX; implies -a\n" +" -z, --zero end each output line with NUL, not newline\n" +msgstr "" +" -a, --multiple подржава више аргумената и сваки сматра за НАЗИВ\n" +" -s, --suffix=СУФИКС уклања пратећи СУФИКС; подразумева „-a“\n" +" -z, --zero завршава сваки излазни ред са НИШТА, не новим редом\n" + +#: 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 "" +"\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 any/str1 any/str2 —> \"str1\" за којим следи \"str2\"\n" + +#: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 +#: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 +#, c-format +msgid "missing operand" +msgstr "недостаје операнд" + +#. This is a proper name. See the gettext manual, section Names. +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 +#: src/split.c:48 +msgid "Torbjorn Granlund" +msgstr "Торбјорн Гранлунд" + +#. This is a proper name. See the gettext manual, section Names. +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 +msgid "Richard M. Stallman" +msgstr "Ричард М. Столман" + +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 +#, c-format +msgid "Usage: %s [OPTION]... [FILE]...\n" +msgstr "Употреба: %s [ОПЦИЈА]... [ДАТОТЕКА]...\n" + +#: src/cat.c:92 +#, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "Исписује поређано надодавање свих ДАТОТЕКА на стандардни излаз.\n" + +#: src/cat.c:98 +#, fuzzy +msgid "" +"\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 "" +"Надовежите ДАТОТЕКУ(е), или стандардни улаз, на стандардни излаз.\n" +"\n" +" -A, --show-all исто што и „-vET“\n" +" -b, --number-nonblank набраја непразне излазне редове, заобилази „-n“\n" +" -e исто што и „-vE“\n" +" -E, --show-ends приказује $ на крају сваког реда\n" +" -n, --number број свих излазних редова\n" +" -s, --squeeze-blank потискује поновљене празне излазне редове\n" + +#: src/cat.c:107 +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 "" +" -t исто што и „-vT“\n" +" -T, --show-tabs приказује знаке табулатора као „^I“\n" +" -u (занемарено)\n" +" -v, --show-nonprinting користи ^ и M- истицање, осим за ЛФД и ТАБ\n" + +#: src/cat.c:115 +#, 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 "" +"\n" +"Примери:\n" +" %s f - g Исписује садржај ф-а, затим стандардан улаз, затим садржаје г-" +"а.\n" +" %s Умножава стандардни улаз на стандардни излаз.\n" + +#: src/cat.c:327 +#, c-format +msgid "cannot do ioctl on %s" +msgstr "не могу да обавим „ioctl“ над „%s“" + +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 +#, c-format +msgid "standard output" +msgstr "стандардни излаз" + +#: src/cat.c:700 +#, c-format +msgid "%s: input file is output file" +msgstr "%s: улазна датотека је излазна датотека" + +#. 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:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 +msgid "Jim Meyering" +msgstr "Џим Мејерин" + +#: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237 +#, c-format +msgid "failed to create security context: %s" +msgstr "нисам успео да направим садржај безбедности: %s" + +#: src/chcon.c:112 +#, c-format +msgid "failed to set %s security context component to %s" +msgstr "нисам успео да подесим састојак садржаја безбедности „%s“ на %s" + +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 +#, c-format +msgid "failed to get security context of %s" +msgstr "нисам успео да добавим безбедносни контекст за %s" + +#: src/chcon.c:166 +#, c-format +msgid "can't apply partial context to unlabeled file %s" +msgstr "не могу да применим делимичан садржај на нобележеној датотеци „%s“" + +#: src/chcon.c:190 +#, c-format +msgid "failed to change context of %s to %s" +msgstr "нисам успео да изменим садржај „%s“ на %s" + +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 +#, c-format +msgid "cannot access %s" +msgstr "не могу да приступим „%s“" + +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 +#, c-format +msgid "cannot read directory %s" +msgstr "не могу да читам директоријум „%s“" + +#: src/chcon.c:292 +#, c-format +msgid "changing security context of %s\n" +msgstr "мењам садржај безбедности за „%s“\n" + +#: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567 +#: src/selinux.c:323 +#, c-format +msgid "fts_read failed" +msgstr "није успело „fts_read“" + +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 +#: src/remove.c:581 src/selinux.c:334 +#, c-format +msgid "fts_close failed" +msgstr "није успело „fts_close“" + +#: 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 "" +"Употреба: %s [ОПЦИЈА]... САДРЖАЈ ДАТОТЕКА...\n" +" или: %s [ОПЦИЈА]... [-u КОРИСНИК] [-r ПРАВИЛО] [-l ОПСЕГ] [-t ВРСТА] " +"ДАТОТЕКА...\n" +" or: %s [ОПЦИЈА]... --reference=РДАТОТЕКА ДАТОТЕКА...\n" + +#: src/chcon.c:357 +msgid "" +"Change the SELinux security context of each FILE to CONTEXT.\n" +"With --reference, change the security context of each FILE to that of " +"RFILE.\n" +msgstr "" +"Измените безбедносни контекст СЕЛинукса сваке ДАТОТЕКЕ у САДРЖАЈ.\n" +"Са „--reference“, измените безбедносни садржај сваке ДАТОТЕКЕ у онај из " +"РДАТОТЕКЕ.\n" + +#: 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 утиче на упуту сваке симболичке везе (ово је\n" +" основно), уместо на саму симболичку везу\n" +" -h, --no-dereference утиче на симболичке везе уместо на неку упутну " +"датотеку\n" + +#: 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=КОРИСНИК подешава корисника КОРИСНИК у циљном безбедносном " +"садржају\n" +" -r, --role=УЛОГА подешава улогу УЛОГА у циљном безбедносном " +"садржају\n" +" -t, --type=ВРСТА подешава врсту ВРСТА у циљном безбедносном " +"садржају\n" +" -l, --range=ОПСЕГ подешава опсег ОПСЕГ у циљном безбедносном " +"садржају\n" + +#: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110 +msgid "" +" --no-preserve-root do not treat '/' specially (the default)\n" +" --preserve-root fail to operate recursively on '/'\n" +msgstr "" +" --no-preserve-root не сматра „/“ посебним (основно)\n" +" --preserve-root не успева да ради дубински над „/“\n" + +#: src/chcon.c:379 +msgid "" +" --reference=RFILE use RFILE's security context rather than " +"specifying\n" +" a CONTEXT value\n" +msgstr "" +" --reference=РДТТКА користи безбедносни садржај РДАТОТЕКЕ уместо да " +"наводи\n" +" врдедност САДРЖАЈА\n" + +#: src/chcon.c:383 src/chgrp.c:140 src/chown.c:118 +msgid " -R, --recursive operate on files and directories recursively\n" +msgstr "" +" -R, --recursive ради дубински над датотекама и директоријумима\n" + +#: src/chcon.c:386 +msgid " -v, --verbose output a diagnostic for every file processed\n" +msgstr "" +" -v, --verbose исписује дијагнозу за сваку обрађену датотеку\n" + +#: 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 "" +"\n" +"Следеће опције мењају начин преласка хијерархије када је опција „-R“ такође\n" +"наведена. Ако је наведена више од једне, само последња има дејства.\n" +"\n" +" -H ако је аргумент линије наредби симболичка веза\n" +" ка директоријуму, прелази је\n" +" -L прелази сваку симболичку везу ка директору\n" +" на коју наиђе\n" +" -P не прелази симболичке везе (основно)\n" +"\n" + +#: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266 +#, c-format +msgid "-R --dereference requires either -H or -L" +msgstr "-R --dereference захтева било „-H“ или „-L“" + +#: src/chcon.c:522 +#, c-format +msgid "-R -h requires -P" +msgstr "„-R“ „-h“ захтевају „-P“" + +#: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 +#: src/mknod.c:172 src/tr.c:1785 +#, c-format +msgid "missing operand after %s" +msgstr "недостаје оператор после „%s“" + +#: src/chcon.c:560 src/runcon.c:250 +#, c-format +msgid "invalid context: %s" +msgstr "неисправан склоп: %s" + +#: src/chcon.c:566 +#, c-format +msgid "conflicting security context specifiers given" +msgstr "дат је сукобљавајући одредник безбедносног садржаја" + +#: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 +#, c-format +msgid "failed to get attributes of %s" +msgstr "нисам успео да добавим особине за „%s“" + +#: src/chgrp.c:92 +#, c-format +msgid "invalid group: %s" +msgstr "неисправна група: %s" + +#: src/chgrp.c:108 +#, c-format +msgid "" +"Usage: %s [OPTION]... GROUP FILE...\n" +" or: %s [OPTION]... --reference=RFILE FILE...\n" +msgstr "" +"Употреба: %s [ОПЦИЈА]... ГРУПА ДАТОТЕКА...\n" +" или: %s [ОПЦИЈА]... --reference=РДАТОТЕКА ДАТОТЕКА...\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 "" +"Измените групу сваке ДАТОТЕКЕ у ГРУПУ.\n" +"Са „--reference“, измените групу сваке ДАТОТЕКЕ у ону РДАТОТЕКЕ.\n" +"\n" + +#: src/chgrp.c:118 src/chmod.c:385 src/chown.c:89 +msgid "" +" -c, --changes like verbose but report only when a change is made\n" +" -f, --silent, --quiet suppress most error messages\n" +" -v, --verbose output a diagnostic for every file processed\n" +msgstr "" +" -c, --changes као опширно али извештава само при начињеним " +"изменама\n" +" -f, --silent, --quiet потискује већину порука грешака\n" +" -v, --verbose oисписује дијагнозу за сваку обрађену датотеку\n" + +#: src/chgrp.c:128 src/chown.c:99 +msgid "" +" (useful only on systems that can change the\n" +" ownership of a symlink)\n" +msgstr "" +" (корисно само на системима који могу да измене\n" +" власништво симболичке везе)\n" + +#: src/chgrp.c:136 +msgid "" +" --reference=RFILE use RFILE's group rather than specifying a\n" +" GROUP value\n" +msgstr "" +" --reference=РДТТКА користи групу РДАТОТЕКЕ уместо да наводи\n" +" врдедност ГРУПЕ\n" + +#: 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 "" +"\n" +"Примери:\n" +" %s staff /u Мења групу „/u“ у „staff“.\n" +" %s -hR staff /u Мења групу „/u“ и поддатотеке у „staff“.\n" + +#: src/chmod.c:127 +#, c-format +msgid "getting new attributes of %s" +msgstr "добављам нове особина за „%s“" + +#: src/chmod.c:151 src/chown-core.c:147 +#, c-format +msgid "neither symbolic link %s nor referent has been changed\n" +msgstr "ни симболичка веза „%s“ ни упутник нису измењени\n" + +#: src/chmod.c:165 +#, c-format +msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n" +msgstr "режим „%s“ је измењен из %04lo (%s) у %04lo (%s)\n" + +#: src/chmod.c:168 +#, c-format +msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n" +msgstr "нисам успео да изменим режим „%s“ из %04lo (%s) у %04lo (%s)\n" + +#: src/chmod.c:171 +#, c-format +msgid "mode of %s retained as %04lo (%s)\n" +msgstr "режим „%s“ је задржан као %04lo (%s)\n" + +#: src/chmod.c:238 +#, c-format +msgid "cannot operate on dangling symlink %s" +msgstr "не могу да радим над сувишном симболичком везом „%s“" + +#: src/chmod.c:278 +#, c-format +msgid "changing permissions of %s" +msgstr "мењам овлашћења за „%s“" + +#: src/chmod.c:314 +#, c-format +msgid "%s: new permissions are %s, not %s" +msgstr "%s: нова овлашћења су %s, а не %s" + +#: src/chmod.c:374 +#, c-format +msgid "" +"Usage: %s [OPTION]... MODE[,MODE]... FILE...\n" +" or: %s [OPTION]... OCTAL-MODE FILE...\n" +" or: %s [OPTION]... --reference=RFILE FILE...\n" +msgstr "" +"Употреба: %s [ОПЦИЈА]... РЕЖИМ[,РЕЖИМ]... ДАТОТЕКА...\n" +" или: %s [ОПЦИЈА]... ОКТАЛНИ-РЕЖИМ ДАТОТЕ...\n" +" или: %s [ОПЦИЈА]... --reference=РДАТОТЕКА ДАТОТЕКА...\n" + +#: src/chmod.c:380 +msgid "" +"Change the mode of each FILE to MODE.\n" +"With --reference, change the mode of each FILE to that of RFILE.\n" +"\n" +msgstr "" +"Измените режим сваке ДАТОТЕКЕ у РЕЖИМ.\n" +"Са „--reference“, измените режим сваке ДАТОТЕКЕ у ону РДАТОТЕКЕ.\n" +"\n" + +#: src/chmod.c:394 +msgid " --reference=RFILE use RFILE's mode instead of MODE values\n" +msgstr "" +" --reference=РДТТКА користи режим РДАТОТЕКЕ уместо вредности РЕЖИМА\n" + +#: src/chmod.c:397 +msgid " -R, --recursive change files and directories recursively\n" +msgstr " -R, --recursive мења датотеке и директоријуме дубински\n" + +#: src/chmod.c:402 +msgid "" +"\n" +"Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n" +msgstr "" +"\n" +"Сваки РЕЖИМ је у облику „[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+“.\n" + +#: src/chmod.c:516 +#, c-format +msgid "cannot combine mode and --reference options" +msgstr "не можете да мешате режим и опције „--reference“" + +#: src/chmod.c:547 +#, c-format +msgid "invalid mode: %s" +msgstr "неисправан режим: %s" + +#: src/chown-core.c:158 +#, c-format +msgid "changed ownership of %s from %s to %s\n" +msgstr "измењено је власништво за „%s“ из %s у %s\n" + +#: src/chown-core.c:159 +#, c-format +msgid "changed group of %s from %s to %s\n" +msgstr "измењена је група за „%s“ из %s у %s\n" + +#: src/chown-core.c:160 +#, c-format +msgid "no change to ownership of %s\n" +msgstr "нема измена власништва за „%s“\n" + +#: src/chown-core.c:165 +#, c-format +msgid "failed to change ownership of %s from %s to %s\n" +msgstr "нисам успео да изменим власништво за „%s“ из %s у %s\n" + +#: src/chown-core.c:166 +#, c-format +msgid "failed to change group of %s from %s to %s\n" +msgstr "нисам успео да изменим групу за „%s“ из %s у %s\n" + +#: src/chown-core.c:167 src/chown-core.c:173 +#, c-format +msgid "failed to change ownership of %s\n" +msgstr "нисам успео да изменим власништво за „%s“\n" + +#: src/chown-core.c:171 +#, c-format +msgid "failed to change ownership of %s to %s\n" +msgstr "нисам успео да изменим власништво за „%s“ у %s\n" + +#: src/chown-core.c:172 +#, c-format +msgid "failed to change group of %s to %s\n" +msgstr "нисам успео да изменим групу за „%s“ у %s\n" + +#: src/chown-core.c:180 +#, c-format +msgid "ownership of %s retained as %s\n" +msgstr "власништво за „%s“ је задржано као %s\n" + +#: src/chown-core.c:181 +#, c-format +msgid "group of %s retained as %s\n" +msgstr "група за „%s“ је задржана као %s\n" + +#: src/chown-core.c:182 +#, c-format +msgid "ownership of %s retained\n" +msgstr "власништво за „%s“ је задржано\n" + +#: src/chown-core.c:379 +#, c-format +msgid "cannot dereference %s" +msgstr "не могу да уклоним упуту „%s“" + +#: src/chown-core.c:467 +#, c-format +msgid "changing ownership of %s" +msgstr "мењам власништво за „%s“" + +#: src/chown-core.c:468 +#, c-format +msgid "changing group of %s" +msgstr "мењам групу за „%s“" + +#: src/chown.c:79 +#, c-format +msgid "" +"Usage: %s [OPTION]... [OWNER][:[GROUP]] FILE...\n" +" or: %s [OPTION]... --reference=RFILE FILE...\n" +msgstr "" +"Употреба: %s [ОПЦИЈА]... [ВЛАСНИК][:[ГРУПА]] ДАТОТЕКА...\n" +" или: %s [ОПЦИЈА]... --reference=РДТТКА ДАТОТЕКА...\n" + +#: 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 "" +"Измените власника и/или групу сваке ДАТОТЕКЕ у ВЛАСНИКА и/или ГРУПУ.\n" +"Са „--reference“, измените власника и групу сваке ДАТОТЕКЕ у ону РДАТОТЕКЕ.\n" +"\n" + +#: 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 "" +" --from=ТЕКУЋИ_ВЛАСНИК:ТЕКУЋА_ГРУПА\n" +" мења власника и/или групу сваке датотеке само ако " +"њихов\n" +" тренутни власник и/или група одговарају овим " +"наведеним\n" +" овде. Једно може бити изостављено, у ком случају " +"поклапање није\n" +" потребно за изостављену особину.\n" + +#: src/chown.c:114 +msgid "" +" --reference=RFILE use RFILE's owner and group rather than\n" +" specifying OWNER:GROUP values\n" +msgstr "" +" --reference=РДТТКА користи власника и групу РДАТОТЕКЕ уместо да\n" +" наводи вредности ВЛАСНИК:ГРУПА\n" + +#: 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 "" +"\n" +"Власник је неизмењен ако недостаје. Група је неизмењена ако недостаје, али " +"се мења у\n" +"групу пријављивања ако је назначено са „:“ пратећи симболичког ВЛАСНИКА.\n" +"ВЛАСНИК и ГРУПА могу бити бројевни као и симболички.\n" + +#: 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 "" +"\n" +"Примери:\n" +" %s root /u Мења власника за „/u“ у „root“.\n" +" %s root:staff /u Слично, али такође мења групу у „staff“.\n" +" %s -hR root /u Мења власника за „/u“ и поддатотеке у „root“.\n" + +#. This is a proper name. See the gettext manual, section Names. +#: src/chroot.c:38 +msgid "Roland McGrath" +msgstr "Ролан МекГрат" + +#: src/chroot.c:137 src/install.c:583 +#, c-format +msgid "invalid group %s" +msgstr "неисправна група „%s“" + +#: src/chroot.c:152 +#, c-format +msgid "invalid group list %s" +msgstr "неисправан списак групе „%s“" + +#: src/chroot.c:185 +#, c-format +msgid "" +"Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" +" or: %s OPTION\n" +msgstr "" +"Употреба: %s [ОПЦИЈА] НОВИКОРЕН [НАРЕДБА [АРГ]...]\n" +" или: %s ОПЦИЈА\n" + +#: src/chroot.c:190 +msgid "" +"Run COMMAND with root directory set to NEWROOT.\n" +"\n" +msgstr "Покрените НАРЕДБУ са кореним директоријумом подешеним на НОВИКОРЕН.\n" + +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" +" --userspec=КОРИСНИК:ГРУПА наводи корисника и групу (ИБ или назив) за " +"коришћење\n" +" --groups=Г_СПИСАК наводи додатне групе као g1,g2,..,gN\n" + +#: src/chroot.c:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" +" --userspec=КОРИСНИК:ГРУПА наводи корисника и групу (ИБ или назив) за " +"коришћење\n" +" --groups=Г_СПИСАК наводи додатне групе као g1,g2,..,gN\n" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 +msgid "" +"\n" +"If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" +msgstr "" +"\n" +"Ако није дата ниједна наредба, покреће „${SHELL} -i“ (основно је: „/bin/sh -" +"i“).\n" + +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 +#, c-format +msgid "cannot change root directory to %s" +msgstr "не могу да променим корени директоријум на „%s“" + +#: src/chroot.c:333 +#, c-format +msgid "cannot chdir to root directory" +msgstr "не могу променим дир у корени директоријум" + +#: src/chroot.c:375 +#, c-format +msgid "no group specified for unknown uid: %d" +msgstr "није наведена група за непознати јиб: %d" + +#: src/chroot.c:400 +#, c-format +msgid "failed to get supplemental groups" +msgstr "нисам успео да добавим додатне групе" + +#: src/chroot.c:412 +#, fuzzy, c-format +msgid "failed to set supplemental groups" +msgstr "нисам успео да подесим додатну(е) групу(е)" + +#: src/chroot.c:418 +#, c-format +msgid "failed to set group-ID" +msgstr "нисам успео да подесим ИБ групе" + +#: src/chroot.c:421 +#, c-format +msgid "failed to set user-ID" +msgstr "нисам успео да подесим ИБ корисника" + +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 +#, c-format +msgid "failed to run command %s" +msgstr "нисам успео да покренем наредбу „%s“" + +#. 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 "%s: датотека је предуга" + +#: src/cksum.c:263 +#, c-format +msgid "" +"Usage: %s [FILE]...\n" +" or: %s [OPTION]\n" +msgstr "" +"Употреба: %s [ДАТОТЕКА]...\n" +" или: %s [ОПЦИЈА]\n" + +#: src/cksum.c:268 +msgid "" +"Print CRC checksum and byte counts of each FILE.\n" +"\n" +msgstr "Исписшите ЦРЦ суму провере и број бајтова за сваку ДАТОТЕКУ.\n" + +#: src/comm.c:103 src/join.c:191 +#, c-format +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Употреба: %s [ОПЦИЈА]... ДАТОТЕКА1 ДАТОТЕКА2\n" + +#: src/comm.c:107 +msgid "Compare sorted files FILE1 and FILE2 line by line.\n" +msgstr "Поредите поређане датотеке ДАТОТЕКА1 И ДАТОТЕКА2 ред по ред.\n" + +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Без ДАТОТЕКЕ, или када је ДАТОТЕКА -, чита стандардни улаз.\n" + +#: src/comm.c:114 +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 "" +"\n" +"Без опција, даје излаз у три ступца. Први стубац садржи редове\n" +"јединствене за ДАТОТЕКУ1, други стубац садржи редове јединствене\n" +"за ДАТОТЕКУ2, а у трећем се налазе редови заједнички за обе датотеке.\n" + +#: src/comm.c:120 +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 "" +"\n" +" -1 потискује стубац 1 (редови јединствени за ДАТОТЕКУ1)\n" +" -2 потискује стубац 2 (редови јединствени за ДАТОТЕКУ2)\n" +" -3 потискује стубац 3 (редове који се појављују у обе " +"датотеке)\n" + +#: src/comm.c:126 +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 "" +"\n" +" --check-order проверава да ли је излаз исправно поређан, чак\n" +" и ако су сви улазни редови упариви\n" +" --nocheck-order не проверава да ли је улаз исправно поређан\n" + +#: src/comm.c:132 +msgid " --output-delimiter=STR separate columns with STR\n" +msgstr " --output-delimiter=НИСКА раздваја ступце НИСКОМ\n" + +#: src/comm.c:137 +msgid "" +"\n" +"Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" +msgstr "" +"\n" +"Напомена, поређење поштује правила наведена са „LC_COLLATE“.\n" + +#: src/comm.c:141 +#, 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 "" +"\n" +"Примери:\n" +" %s -12 датотека1 датотека2 Исписује само редове присутне и у датотеци1 и " +"у датотеци2.\n" +" %s -3 датотека1 датотека2 Исписује редове у датотеци1 не у датотеци2, и " +"обрнуто.\n" + +#: src/comm.c:226 +#, c-format +msgid "file %d is not in sorted order" +msgstr "датотека „%d“ није поређаним редоследом" + +#: src/comm.c:411 +#, c-format +msgid "multiple delimiters specified" +msgstr "наведено је више ограничавача" + +#: src/comm.c:415 +#, c-format +msgid "empty %s not allowed" +msgstr "празно „%s“ није допуштено" + +#: src/copy.c:181 src/copy.c:452 +#, c-format +msgid "cannot lseek %s" +msgstr "не могу да л-премотам „%s“" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" +msgstr "грешка читања „%s“" + +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 +#, c-format +msgid "error reading %s" +msgstr "грешка читања „%s“" + +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 +#, c-format +msgid "error writing %s" +msgstr "грешка писања „%s“" + +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "грешка читања „%s“" + +#: src/copy.c:419 +#, c-format +msgid "%s: failed to get extents info" +msgstr "%s: нисам успео да добавим податке проширења" + +#: src/copy.c:478 +#, c-format +msgid "%s: write failed" +msgstr "%s: писање није успело" + +#: src/copy.c:547 src/copy.c:1295 +#, c-format +msgid "failed to extend %s" +msgstr "нисам успео да раширим „%s“" + +#: src/copy.c:789 +#, c-format +msgid "clearing permissions for %s" +msgstr "чистим овлашћења за „%s“" + +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 +#, c-format +msgid "failed to preserve ownership for %s" +msgstr "нисам успео да очувам власништво за „%s“" + +#: src/copy.c:850 +#, c-format +msgid "failed to lookup file %s" +msgstr "нисам успео да потражим датотеку „%s“" + +#: src/copy.c:855 +#, c-format +msgid "failed to preserve authorship for %s" +msgstr "нисам успео да сачувам ауторство за „%s“" + +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 +#: src/mkfifo.c:143 src/mknod.c:199 +#, c-format +msgid "failed to set default file creation context to %s" +msgstr "нисам успео да подесим основни контекст стварања датотеке на „%s“" + +#: src/copy.c:922 +#, c-format +msgid "failed to set default file creation context for %s" +msgstr "нисам успео да подесим основни контекст стварања датотеке за „%s“" + +#: src/copy.c:948 +#, c-format +msgid "failed to set the security context of %s" +msgstr "нисам успео да подесим безбедносни контекст за „%s“" + +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 +#, c-format +msgid "cannot open %s for reading" +msgstr "не могу да отворим „%s“ за читање" + +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 +#, c-format +msgid "cannot fstat %s" +msgstr "не могу да утврдим стање „%s“" + +#: src/copy.c:1037 +#, c-format +msgid "skipping file %s, as it was replaced while being copied" +msgstr "прескачем датотеку „%s“, јер је замењена за време умножавања" + +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 +#: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 +#, c-format +msgid "cannot remove %s" +msgstr "не могу да уклоним „%s“" + +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 +#, c-format +msgid "removed %s\n" +msgstr "уклонио сам „%s“\n" + +#: src/copy.c:1134 +#, c-format +msgid "not writing through dangling symlink %s" +msgstr "не пишем кроз сувишну симболичку везу „%s“" + +#: src/copy.c:1172 +#, c-format +msgid "cannot create regular file %s" +msgstr "не могу да створим обичну датотеку „%s“" + +#: src/copy.c:1193 +#, c-format +msgid "failed to clone %s from %s" +msgstr "нисам успео да клонирам „%s“ из „%s“" + +#: src/copy.c:1310 src/copy.c:2767 +#, c-format +msgid "preserving times for %s" +msgstr "причувавам времена за „%s“" + +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 +#, c-format +msgid "failed to close %s" +msgstr "нисам успео да затворим „%s“" + +#: src/copy.c:1669 +#, c-format +msgid "%s: replace %s, overriding mode %04lo (%s)? " +msgstr "%s: мењам „%s“, да заобиђем режим %04lo (%s)? " + +#: src/copy.c:1670 +#, c-format +msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " +msgstr "%s: неуписиво „%s“ (режим %04lo, %s); да покушам ипак? " + +#: src/copy.c:1677 +#, c-format +msgid "%s: overwrite %s? " +msgstr "%s: да препишем „%s“?" + +#: src/copy.c:1747 +#, c-format +msgid " (backup: %s)" +msgstr " (резерва: %s)" + +#: src/copy.c:1757 +#, c-format +msgid "failed to restore the default file creation context" +msgstr "нисам успео да вратим основни контекст стварања датотеке" + +#: src/copy.c:1795 +#, c-format +msgid "cannot create hard link %s to %s" +msgstr "не могу да направим чврсту везу „%s“ до %s" + +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 +#: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 +#: src/stat.c:1304 src/truncate.c:337 +#, c-format +msgid "cannot stat %s" +msgstr "не могу да утврдим стање „%s“" + +#: src/copy.c:1866 +#, c-format +msgid "omitting directory %s" +msgstr "изостављам директоријум „%s“" + +#: src/copy.c:1880 +#, c-format +msgid "warning: source file %s specified more than once" +msgstr "упозорење: изворна датотека „%s“ је наведена више пута" + +#: src/copy.c:1929 src/ln.c:262 +#, c-format +msgid "%s and %s are the same file" +msgstr "„%s“ и „%s“ су исте датотеке" + +#: src/copy.c:2019 +#, c-format +msgid "cannot overwrite non-directory %s with directory %s" +msgstr "не могу да препишем не-директоријум „%s“ директоријумом „%s“" + +#: src/copy.c:2037 src/ln.c:230 +#, c-format +msgid "will not overwrite just-created %s with %s" +msgstr "нећу преписати управо направљено „%s“ са „%s“" + +#: src/copy.c:2055 +#, c-format +msgid "cannot overwrite directory %s with non-directory" +msgstr "не могу да препишем директоријум „%s“ са не-директоријумом" + +#: src/copy.c:2069 +#, c-format +msgid "cannot move directory onto non-directory: %s -> %s" +msgstr "не могу да преместим директоријум преко не-директоријума: %s —> %s" + +#: src/copy.c:2099 +#, c-format +msgid "backing up %s would destroy source; %s not moved" +msgstr "стварање резерве за „%s“ ће уништити извор; „%s“ није премештено" + +#: src/copy.c:2100 +#, c-format +msgid "backing up %s would destroy source; %s not copied" +msgstr "стварање резерве за „%s“ ће уништити извор; „%s“ није умножено" + +#: src/copy.c:2123 src/ln.c:292 +#, c-format +msgid "cannot backup %s" +msgstr "не могу да направим резерву „%s“" + +#: src/copy.c:2187 +#, c-format +msgid "will not copy %s through just-created symlink %s" +msgstr "нећу умножити „%s“ кроз управо направљену симболичку везу %s" + +#: src/copy.c:2264 +#, c-format +msgid "cannot copy a directory, %s, into itself, %s" +msgstr "не могу умножити директоријум, %s, у себе самог, %s" + +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "упозорење: изворна датотека „%s“ је наведена више пута" + +#: src/copy.c:2294 +#, c-format +msgid "will not create hard link %s to directory %s" +msgstr "нећу направити чврсту везу „%s“ до директоријума „%s“" + +#: src/copy.c:2351 +#, c-format +msgid "cannot move %s to a subdirectory of itself, %s" +msgstr "не могу да преместим „%s“ у поддиректоријум себе самог, %s" + +#: src/copy.c:2394 +#, c-format +msgid "cannot move %s to %s" +msgstr "не могу да преместим „%s“ у „%s“" + +#: src/copy.c:2410 +#, c-format +msgid "inter-device move failed: %s to %s; unable to remove target" +msgstr "није успео потез унутрашњег уређаја: %s у %s; не могу да уклоним мету" + +#: src/copy.c:2450 +#, c-format +msgid "cannot copy cyclic symbolic link %s" +msgstr "не могу да умножим поновљиву симболичку везу „%s“" + +#: src/copy.c:2570 +#, c-format +msgid "%s: can make relative symbolic links only in current directory" +msgstr "" +"%s: могу да направим релативне симболичке везе само у текућем директоријуму" + +#: src/copy.c:2577 +#, c-format +msgid "cannot create symbolic link %s to %s" +msgstr "не могу да створим симболичку везу „%s“ до „%s“" + +#: src/copy.c:2629 src/mkfifo.c:169 +#, c-format +msgid "cannot create fifo %s" +msgstr "не могу да створим пупи „%s“" + +#: src/copy.c:2638 +#, c-format +msgid "cannot create special file %s" +msgstr "не могу да направим посебну датотеку „%s“" + +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 +#, c-format +msgid "cannot read symbolic link %s" +msgstr "не могу прочитам симболичку везу „%s“" + +#: src/copy.c:2676 +#, c-format +msgid "cannot create symbolic link %s" +msgstr "не могу да направим симболичку везу „%s“" + +#: src/copy.c:2708 +#, c-format +msgid "%s has unknown file type" +msgstr "%s: има непознату врсту датотеке" + +#: src/copy.c:2871 src/ln.c:375 +#, c-format +msgid "cannot un-backup %s" +msgstr "не могу да поништим резерву „%s“" + +#: src/copy.c:2875 +#, c-format +msgid "%s -> %s (unbackup)\n" +msgstr "%s —> %s (поништена резерва)\n" + +#. This is a proper name. See the gettext manual, section Names. +#: src/coreutils.c:47 +msgid "Alex Deymo" +msgstr "Алекс Дејмо" + +#: src/coreutils.c:64 +#, c-format +msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" +msgstr "Употреба: %s --coreutils-prog=НАЗИВ_ПРОГРАМА [ПАРАМЕТРИ]... \n" + +#: src/coreutils.c:67 +msgid "" +"Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" +"\n" +msgstr "" +"Извршите уграђени програм НАЗИВ_ПРОГРАМА са датим ПАРАМЕТРИМА.\n" +"\n" + +#: src/coreutils.c:85 +#, c-format +msgid "" +"\n" +"Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" +msgstr "" +"\n" +"Користите: „%s --coreutils-prog=НАЗИВ_ПРОГРАМА --help“ за помоћ појединачног " +"програма.\n" + +#: src/coreutils.c:177 src/coreutils.c:201 +#, c-format +msgid "unknown program %s" +msgstr "непознат програм „%s“" + +#: src/cp.c:157 src/mv.c:288 +#, c-format +msgid "" +"Usage: %s [OPTION]... [-T] SOURCE DEST\n" +" or: %s [OPTION]... SOURCE... DIRECTORY\n" +" or: %s [OPTION]... -t DIRECTORY SOURCE...\n" +msgstr "" +"Употреба: %s [ОПЦИЈА]... [-T] ИЗВОР ОДРЕД\n" +" или: %s [ОПЦИЈА]... ИЗВОР... ДИРЕКТОРИЈУМ\n" +" или: %s [ОПЦИЈА]... -t ДИРЕКТОРИЈУМ ИЗВОР...\n" + +#: src/cp.c:163 +msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" +msgstr "Умножите ИЗВОР у ОДРЕДИШТЕ, или више ИЗВОРА у ДИРЕКТОРИЈУМ.\n" + +#: src/cp.c:169 +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 "" +" -a, --archive исто као „-dR --preserve=све“\n" +" --attributes-only не умножава податке датотеке, само особине\n" +" --backup[=УПРАВЉАЊЕ] прави резерву сваке постојеће одредишне " +"датотеке\n" +" -b као „--backup али не прихвата аргументе\n" +" --copy-contents умножава садржај посебних датотека када су " +"дубинске\n" +" -d исто као „--no-dereference --preserve=везе“\n" + +#: src/cp.c:178 +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 "" +" -f, --force ако постојећа датотека одредишта не може " +"бити\n" +" отворена, уклања је и покушава опет (ова " +"опција\n" +" се занемарује када се такође користи и " +"опција „-n“)\n" +" -i, --interactive пита пре преписивања (превазилази претходну „-" +"n“\n" +" опцију)\n" +" -H прати симболичке везе линије наредби у " +"ИЗВОРУ\n" + +#: src/cp.c:187 +msgid "" +" -l, --link hard link files instead of copying\n" +" -L, --dereference always follow symbolic links in SOURCE\n" +msgstr "" +" -l, --link прави чврсту везу датотека уместо да " +"умножава\n" +" -L, --dereference увек прати симболичке везе у ИЗВОРУ\n" + +#: src/cp.c:191 +msgid "" +" -n, --no-clobber do not overwrite an existing file (overrides\n" +" a previous -i option)\n" +" -P, --no-dereference never follow symbolic links in SOURCE\n" +msgstr "" +" -n, --no-clobber не преписује постојећу датотеку (заобилази\n" +" претходну опцију „-i“)\n" +" -P, --no-dereference никад не прати симболичке везе у ИЗВОРУ\n" + +#: src/cp.c:196 +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 "" +" -p исто као „--preserve=режим,власништво," +"временск_ознака“\n" +" --preserve[=СПИСАК_ОСОБ] очувава наведене особине (основно:\n" +" режим,власништво,временска_ознака), ако је " +"могуће\n" +" додатне особине: садржај, везе, иксособ,\n" +" све\n" + +#: src/cp.c:204 +msgid "" +" --no-preserve=ATTR_LIST don't preserve the specified attributes\n" +" --parents use full source file name under DIRECTORY\n" +msgstr "" +" --no-preserve=СПИСАКА_ОСОБ не очувава наведене особине\n" +" --parents користи пуни назив изворне датотеке под " +"ДИРЕКТОРИЈУМОМ\n" + +#: src/cp.c:208 +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 "" +" -R, -r, --recursive умножава директоријуме дубински\n" +" --reflink[=КАДА] контролише умношцима клона/ЦоВ. Видите испод\n" +" --remove-destination уклања сваку постојећу одредишну датотеку " +"пре\n" +" него ли покуша да је отвори (супротност са " +"„--force“)\n" + +#: src/cp.c:214 +msgid "" +" --sparse=WHEN control creation of sparse files. See below\n" +" --strip-trailing-slashes remove any trailing slashes from each " +"SOURCE\n" +" argument\n" +msgstr "" +" --sparse=КАДА управља стварањем расутих датотека. Видите " +"испод\n" +" --strip-trailing-slashes уклања све пратеће косе црте из сваког " +"аргумента\n" +" ИЗВОРА\n" + +#: src/cp.c:219 +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 "" +" -s, --symbolic-link прави симболичке везе уместо да умножава\n" +" -S, --suffix=СУФИКС заобилази уобичајени суфикс резерве\n" +" -t, --target-directory=ДИР умножава све аргументе ИЗВОРА у ДИРЕКТОРИЈУМ\n" +" -T, --no-target-directory сматра ОДРЕДИШТЕ обичном датотеком\n" + +#: src/cp.c:225 +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 "" +" -u, --update умножава само када је датотека ИЗВОРА новија\n" +" од датотеке одредишта или када\n" +" недостаје датотека одредишта\n" +" -v, --verbose објашњава шта је урађено\n" +" -x, --one-file-system остаје на овом систему датотека\n" + +#: src/cp.c:232 +msgid "" +" -Z set SELinux security context of destination\n" +" file to default type\n" +" --context[=CTX] like -Z, or if CTX is specified then set the\n" +" SELinux or SMACK security context to CTX\n" +msgstr "" +" -Z подешава СЕЛинукс безбедносни садржај " +"одредишне\n" +" датотеке на основну вредност\n" +" --context[=СДРЖ] као „-Z“, или ако је наведен СДРЖ тада " +"подешава\n" +" СЕЛинукс или СМАЦК безбедносни садржај на " +"СДРЖ\n" + +#: src/cp.c:240 +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 "" +"\n" +"По основи, расуте ИЗВОРНЕ датотеке се откривају чистом срећом а " +"одговарајућа\n" +"ОДРЕДИШНА датотека се начини расутом такође. То је понашање изабрано\n" +"„--sparse=самостално“. Наведите „--sparse=увек“ да направите расуту " +"ОДРЕДИШНУ\n" +"датотеку кад год ИЗВОРНА датотека садржи довољно дуг низ нултих бајтова.\n" +"Користите „--sparse=новије“ да забраните стварање расутих датотека.\n" +"\n" +"Када је наведено „--reflink[=увек]“, обавља лагано умножавање, где се\n" +"блокови података умножавају само када се измене. Ако то није могуће " +"умножавање\n" +"не успева, или ако је наведено „--reflink=самостално“, пребацује се на " +"уобичајени умножак.\n" + +#: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326 +msgid "" +"\n" +"The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" +"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 "" +"\n" +"Суфикс за резерве је „~“, осим ако је постављен помоћу „--suffix“ или " +"променљивом окружења\n" +"„SIMPLE_BACKUP_SUFFIX“. Начин управљања издањем се може изабрати помоћу " +"опције\n" +"„--backup“ или кроз променљиву окружења „VERSION_CONTROL“. Ево вредности:\n" +"\n" + +#: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333 +msgid "" +" none, off never make backups (even if --backup is given)\n" +" numbered, t make numbered backups\n" +" existing, nil numbered if numbered backups exist, simple otherwise\n" +" simple, never always make simple backups\n" +msgstr "" +" none, off не прави резерве (чак и ако је наведено „--backup“)\n" +" numbered, t прави побројане резерве\n" +" existing, nil побројане ако већ постоје побројане резерве, иначе обичне\n" +" simple, never увек прави обичне резерве\n" + +#: src/cp.c:265 +msgid "" +"\n" +"As a special case, cp makes a backup of SOURCE when the force and backup\n" +"options are given and SOURCE and DEST are the same name for an existing,\n" +"regular file.\n" +msgstr "" +"\n" +"Као посебан случај, „cp“ прави резерву ИЗВОРА када су дате опције\n" +"присиле и резерве а ИЗВОР и ОДРЕДИШТЕ су исти назив за постојећу,\n" +"обичну датотеку.\n" + +#: src/cp.c:324 +#, c-format +msgid "failed to preserve times for %s" +msgstr "нисам успео да очувам времена за „%s“" + +#: src/cp.c:355 +#, c-format +msgid "failed to preserve permissions for %s" +msgstr "нисам успео да очувам овлашћења за „%s“" + +#: src/cp.c:482 +#, c-format +msgid "cannot make directory %s" +msgstr "не могу да направим директоријум „%s“" + +#: src/cp.c:531 src/cp.c:550 +#, c-format +msgid "%s exists but is not a directory" +msgstr "„%s“ постоји али није директоријум" + +#: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133 +#: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405 +#, c-format +msgid "failed to access %s" +msgstr "нисам успео да приступим „%s“" + +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 +#, c-format +msgid "missing file operand" +msgstr "недостаје оператор датотеке" + +#: src/cp.c:599 src/install.c:959 src/ln.c:577 src/mv.c:450 +#, c-format +msgid "missing destination file operand after %s" +msgstr "недостаје оператор одредишне датотеке после „%s“" + +#: src/cp.c:608 src/install.c:968 src/mv.c:459 +#, c-format +msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)" +msgstr "" +"не могу да помешам „--target-directory (-t)“ и „--no-target-directory (-T)“" + +#: src/cp.c:624 src/cp.c:1082 src/install.c:407 src/install.c:930 +#: src/install.c:981 src/ln.c:135 src/ln.c:535 src/ln.c:591 src/mv.c:408 +#: src/mv.c:473 +#, c-format +msgid "target %s is not a directory" +msgstr "циљ „%s“ није директоријум" + +#: src/cp.c:735 +#, c-format +msgid "with --parents, the destination must be a directory" +msgstr "са „--parents“, одредиште мора бити директоријум" + +#: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400 +#, c-format +msgid "multiple target directories specified" +msgstr "наведено је више крајњих директоријума" + +#: src/cp.c:1116 src/install.c:903 +#, c-format +msgid "warning: ignoring --context; it requires an SELinux-enabled kernel" +msgstr "упозорење: занемарујем „--context“; захтева СЕЛинукс-укључено језгро" + +#: src/cp.c:1137 +#, c-format +msgid "cannot make both hard and symbolic links" +msgstr "не могу да направим и чврсте и симболичке везе" + +#: src/cp.c:1144 src/mv.c:480 +#, c-format +msgid "options --backup and --no-clobber are mutually exclusive" +msgstr "опције „--backup“ и „--no-clobber“ се међусобно искључују." + +#: src/cp.c:1150 +#, c-format +msgid "--reflink can be used only with --sparse=auto" +msgstr "„--reflink“ се може користити само са „--sparse=ауто“" + +#: src/cp.c:1158 src/install.c:938 src/ln.c:599 src/mv.c:488 +msgid "backup type" +msgstr "врста резерве" + +#: src/cp.c:1186 src/install.c:944 +#, c-format +msgid "cannot set target context and preserve it" +msgstr "не могу да подесим садржај мете и да га очувам" + +#: src/cp.c:1190 +#, c-format +msgid "cannot preserve security context without an SELinux-enabled kernel" +msgstr "не могу да очувам безбеносни садржај без СЕЛинукс укљученог језгра" + +#: src/cp.c:1206 +#, c-format +msgid "cannot preserve extended attributes, cp is built without xattr support" +msgstr "" +"не могу да очувам проширене особине, цп је изграђен без подршке икс-особина" + +#. This is a proper name. See the gettext manual, section Names. +#: src/csplit.c:43 src/dd.c:47 +msgid "Stuart Kemp" +msgstr "Стјуарт Камп" + +#: src/csplit.c:544 +#, c-format +msgid "input disappeared" +msgstr "улаз је нестао" + +#: src/csplit.c:674 src/csplit.c:685 +#, c-format +msgid "%s: line number out of range" +msgstr "%s: број реда је ван опсега" + +#: src/csplit.c:714 +#, c-format +msgid "%s: %s: line number out of range" +msgstr "%s: %s: број реда је ван опсега" + +#: src/csplit.c:717 src/csplit.c:773 +#, c-format +msgid " on repetition %s\n" +msgstr " при понављању „%s“\n" + +#: src/csplit.c:767 +#, c-format +msgid "%s: %s: match not found" +msgstr "%s: %s: нисам пронашао поклапање" + +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 +#, c-format +msgid "error in regular expression search" +msgstr "грешка у претрази регуларног израза" + +#: src/csplit.c:1007 +#, c-format +msgid "write error for %s" +msgstr "грешка писања за „%s“" + +#: src/csplit.c:1083 +#, c-format +msgid "%s: integer expected after delimiter" +msgstr "%s: цео број је очекиван након граничника" + +#: src/csplit.c:1099 +#, c-format +msgid "%s: '}' is required in repeat count" +msgstr "%s: } се захтева у броју понављања" + +#: src/csplit.c:1109 +#, c-format +msgid "%s}: integer required between '{' and '}'" +msgstr "%s}: цео број се тражи између { и }" + +#: src/csplit.c:1136 +#, c-format +msgid "%s: closing delimiter '%c' missing" +msgstr "%s: недостаје затварајући граничник „%c“" + +#: src/csplit.c:1153 +#, c-format +msgid "%s: invalid regular expression: %s" +msgstr "%s: неисправан регуларан израз: %s" + +#: src/csplit.c:1186 +#, c-format +msgid "%s: invalid pattern" +msgstr "%s: неисправан шаблон" + +#: src/csplit.c:1189 +#, c-format +msgid "%s: line number must be greater than zero" +msgstr "%s: број реда мора бити већи од нуле" + +#: src/csplit.c:1195 +#, c-format +msgid "line number %s is smaller than preceding line number, %s" +msgstr "број реда %s је мањи од претходећег броја реда, %s" + +#: src/csplit.c:1201 +#, c-format +msgid "warning: line number %s is the same as preceding line number" +msgstr "упозорење: број реда %s је исти као претходећи број реда" + +#: src/csplit.c:1279 +#, c-format +msgid "missing conversion specifier in suffix" +msgstr "недостаје одредник претварања у суфиксу" + +#: src/csplit.c:1285 +#, c-format +msgid "invalid conversion specifier in suffix: %c" +msgstr "неисправан одредник претварања у суфиксу: %c" + +#: src/csplit.c:1288 +#, c-format +msgid "invalid conversion specifier in suffix: \\%.3o" +msgstr "неисправан одредник претварања у суфиксу: \\%.3o" + +#: src/csplit.c:1293 +#, c-format +msgid "invalid flags in conversion specification: %%%c%c" +msgstr "неисправне опције у одредници претварања: %%%c%c" + +#: src/csplit.c:1310 +#, c-format +msgid "too many %% conversion specifications in suffix" +msgstr "превише %% одредница претварања у суфиксу" + +#: src/csplit.c:1324 +#, c-format +msgid "missing %% conversion specification in suffix" +msgstr "недостаје %% одредница претварања у суфиксу" + +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "неисправан број %s" + +#: src/csplit.c:1477 +#, c-format +msgid "Usage: %s [OPTION]... FILE PATTERN...\n" +msgstr "Употреба: %s [ОПЦИЈА]... ДАТОТЕКА ОБРАЗАЦ...\n" + +#: src/csplit.c:1481 +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 "" +"Излазни делови ДАТОТЕКЕ раздвојени ШАБЛОНОМ до датотека „xx00“, " +"„xx01“, ...,\n" +"и број излазних бајтова сваког дела на стандардни излаз.\n" + +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Чита стандардни улаз ако је ДАТОТЕКА -. Сваки ШАБЛОН може бити:\n" + +#: src/csplit.c:1492 +#, 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=ЗАПИС користи „sprintf“ ЗАПИС уместо %02d\n" +" -f, --prefix=ПРЕФИКС користи ПРЕФИКС уместо „xx“\n" +" -k, --keep-files не уклања излазне датотеке при грешкама\n" + +#: src/csplit.c:1497 +msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" +msgstr " -m, --suppress-matched потискује ШАБЛОН поклапања редова\n" + +#: src/csplit.c:1500 +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=ЦИФРЕ користи наведени број цифара уместо 2\n" +" -s, --quiet, --silent не исписује бројеве величина излазних датотека\n" +" -z, --elide-empty-files уклања празне излазне датотеке\n" + +#: src/csplit.c:1507 +#, fuzzy +msgid "" +"\n" +"Each PATTERN may be:\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 "" +"\n" +" ЦЕО БРОЈ умножава али не укључује наведени број реда\n" +" /REGEXP/[ПОМЕРАЈ] умножава али не укључује ред поклапања\n" +" %REGEXP%[ПОМЕРАЈ] прескаче, али не укључује ред поклапања\n" +" {ЦЕО БРОЈ} понавља претходни шаблон наведени број пута\n" +" {*} понавља претходни шаблон што више пута може\n" +"\n" +"ПОМЕРАЈ реда захтева + или - за којим следи позитиван цео број.\n" + +#. This is a proper name. See the gettext manual, section Names. +#: src/cut.c:44 src/paste.c:52 +msgid "David M. Ihnat" +msgstr "Дејвид М. Ајнат" + +#: src/cut.c:172 +#, c-format +msgid "Usage: %s OPTION... [FILE]...\n" +msgstr "Употреба: %s ОПЦИЈА... [ДАТОТЕКА]...\n" + +#: src/cut.c:176 +msgid "Print selected parts of lines from each FILE to standard output.\n" +msgstr "" +"Исписује изабране делове редова из сваке ДАТОТЕКЕ на стандардни излаз.\n" + +#: src/cut.c:183 +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=СПИСАК бира само ове бајтове\n" +" -c, --ЗНАКacters=СПИСАК бира само ове знакове\n" +" -d, --delimiter=ГРАНИЧ користи ГРАНИЧНИК уместо ТАБУЛАТОРА за граничника " +"поља\n" + +#: src/cut.c:188 +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=СПИСАК бира само ова поља; такође исписује сваки ред\n" +" који не садржи знак граничника, осим ако\n" +" није наведена опција „-s“\n" +" -n (занемарено)\n" + +#: src/cut.c:194 +msgid "" +" --complement complement the set of selected bytes, characters\n" +" or fields\n" +msgstr "" +" --complement допуњава скуп изабраних бајтова, знакова\n" +" или поља\n" + +#: src/cut.c:198 +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" +" --output-delimiter=НИСКА користи НИСКУ као граничника излаза\n" +" основно је коришћење граничника улаза\n" + +#: src/cut.c:205 +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" +"Користи једно, и само једно од „-b“, „-c“ или „-f“. Сваки СПИСАК се састоји " +"од једног\n" +"опсега, или више опсега одвојених зарезима. Изабрани улаз се пише\n" +"истим редоследом као што се чита, а пише се само једном.\n" + +#: src/cut.c:211 +#, fuzzy +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" +msgstr "" +"Сваки опсег је један од:\n" +"\n" +" N N-ти бајт, знак или поље, бројећи од 1\n" +" N- од N-тог бајта, знака или поља, до краја реда\n" +" N-M од N-тог до M-тог (закључно) бајта, знака или поља\n" +" -M од првог до M-тог (закључно) бајта, знака или поља\n" +"\n" +"Без ДАТОТЕКЕ, или када је ДАТОТЕКА -, чита стандардни улаз.\n" + +#: src/cut.c:299 src/cut.c:393 +msgid "invalid byte, character or field list" +msgstr "неисправан списак бајта, знака или поља" + +#: src/cut.c:304 src/cut.c:344 +msgid "fields and positions are numbered from 1" +msgstr "поља и положаји су нумерисани од 1" + +#: src/cut.c:319 +msgid "invalid range with no endpoint: -" +msgstr "неисправан опсег без крајње тачке: -" + +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format +msgid "invalid decreasing range" +msgstr "неисправан опадајући опсег" + +#: src/cut.c:382 +#, c-format +msgid "byte offset %s is too large" +msgstr "померај бајта „%s“ је превелик" + +#: src/cut.c:385 +#, c-format +msgid "field number %s is too large" +msgstr "број поља %s је превелик" + +#: src/cut.c:734 src/cut.c:742 +msgid "only one type of list may be specified" +msgstr "може бити наведена само једна врста списка" + +#: src/cut.c:751 src/numfmt.c:1655 +#, c-format +msgid "the delimiter must be a single character" +msgstr "граничник мора бити један знак" + +#: src/cut.c:786 +msgid "you must specify a list of bytes, characters, or fields" +msgstr "морате навести списак бајтова, знакова, или поља" + +#: src/cut.c:789 +msgid "an input delimiter may be specified only when operating on fields" +msgstr "граничник улаза може бити наведен само када ради над пољима" + +#: src/cut.c:793 +msgid "" +"suppressing non-delimited lines makes sense\n" +"\tonly when operating on fields" +msgstr "" +"потискивање не-ограничених редова има смисла\n" +" само када се ради над пољима" + +#: src/cut.c:799 +msgid "missing list of fields" +msgstr "недостаје списак поља" + +#: src/cut.c:801 +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 "" +"Употреба: %s [ОПЦИЈА]... [+ЗАПИС]\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 "Приказује текуће време у датом ЗАПИСУ, или подешава датум система.\n" + +#: 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" +msgstr "" + +#: src/date.c:138 +#, fuzzy +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" +msgstr "" +" -d, --date=НИСКА приказује време описано НИСКОМ, а не „now“\n" +" -f, --file=ДАТУМ као „--date“ једном за сваки ред ДАТОТЕКЕДАТУМА\n" +" -I[ВРЕМЕ], --iso-8601[=ВРЕМЕ] исписује датум/време у ИСО 8601 запису.\n" +" ОДРЕДНИЦАВРЕМЕНА=„date“ за датум само " +"(основно),\n" +" „hours“, „minutes“, „seconds“, или „ns“ за " +"датум\n" +" и време до назначене тачности.\n" + +#: src/date.c:145 +#, fuzzy +msgid "" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" +msgstr "" +" -r, --reference=ДАТОТЕКА приказуе време последње измене ДАТОТЕКЕ\n" +" -R, --rfc-2822 исписује датум и време у РФЦ 2822 запису.\n" +" Пример: Пон, 07 Авг 2006 12:34:56 -0600\n" + +#: src/date.c:149 +#, fuzzy +msgid "" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" +msgstr "" +" --rfc-3339=ВРЕМЕ исписује датум и време у РФЦ 3339 запису.\n" +" ОДРЕДНИЦАВРЕМЕНА=„date“, „seconds“, или „ns“ за\n" +" датум и време до назначене тачности.\n" +" Састојци датума ивремена су раздвојени\n" +" једним размаком: 2006-08-07 12:34:56-06:00\n" +" -s, --set=НИСКА подешава време описано НИСКОМ\n" +" -u, --utc, --universal исписује или подешава Кординисано универзално " +"време (КУВ)\n" + +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + +#: src/date.c:158 +msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +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 "" +"\n" +"ЗАПИС управља излазом. Протумачени низови су:\n" +"\n" +" %% дословно %\n" +" %a локално скраћени назив дана седмице (нпр., Нед)\n" + +#: src/date.c:171 +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 пун назив дана у седмици (нпр., Недеља)\n" +" %b скраћени назив месеца (нпр., Јан)\n" +" %B пун назив месеца (нпр., Јануар)\n" +" %c датум и време (нпр., Пон Мар 3 23:05:25 2005)\n" + +#: src/date.c:177 +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 век; као %Y, изузев изостављања последње две цифре (нпр., 20)\n" +" %d дан у месецу (нпр., 01)\n" +" %D датум; исто као %m/%d/%y\n" +" %e дан у месецу, попуњен размаком; исто као %_d\n" + +#: src/date.c:183 +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 пун датум; исто као %Y-%m-%d\n" +" %g последње две цифре године ИСО броја седмице (видите %G)\n" +" %G година ИСО броја седмице (видите %V); обично је корисно само уз %V\n" + +#: src/date.c:188 +msgid "" +" %h same as %b\n" +" %H hour (00..23)\n" +" %I hour (01..12)\n" +" %j day of year (001..366)\n" +msgstr "" +" %h исто као %b\n" +" %H сати (00..23)\n" +" %I сати (01..12)\n" +" %j дан у години (001..366)\n" + +#: src/date.c:194 +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 сат, попуњен размаком ( 0..23); исто као %_H\n" +" %l сат, попуњен размаком ( 1..12); исто као %_I\n" +" %m месец (01..12)\n" +" %M минут (00..59)\n" + +#: src/date.c:200 +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 "" +" %n нови ред\n" +" %N наносекунде (000000000..999999999)\n" +" %p еквивалент за ПрП или ПоП; празно ако није познато\n" +" %P као %p, али малим словима\n" +" %r 12-часовно време (нпр., 11:11:04 ПоП)\n" +" %R 24-часовни сати и минути; исто као %H:%M\n" +" %s секунде од 1970-01-01 00:00:00 UTC\n" + +#: src/date.c:209 +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 "" +" %S секунде (00..60)\n" +" %t табулатор\n" +" %T време; исто као %H:%M:%S\n" +" %u дан у седмици (1..7); 1 је понедељак\n" + +#: src/date.c:215 +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 број седмице у години, са недељом као првим даном седмице (00..53)\n" +" %V ИСО број седмице, са понедељком као првим даном седмице (01..53)\n" +" %w дан у седмици (0..6); 0 је недеља\n" +" %W број седмице у години, са понедељком као првим даном седмице " +"(00..53)\n" + +#: src/date.c:221 +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 месно представљање датума (нпр., 12/31/99)\n" +" %X месно представљање времена (нпр., 23:13:48)\n" +" %y последње две цифре године (00..99)\n" +" %Y година\n" + +#: src/date.c:227 +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 "" +" %z +hhmm бројчана временска зона (нпр., -0400)\n" +" %:z +hh:mm бројчана временска зона (нпр., -04:00)\n" +" %::z +hh:mm:ss бројчана временска зона (нпр., -04:00:00)\n" +" %:::z бројчана временска зона са : до потребне тачности (нпр., -04, " +"+05:30)\n" +" %Z азбучна скраћеница временске зоне (нпр., ЕДТ)\n" +"\n" +"По основи, датум попуњава поља бројева нулама.\n" + +#: src/date.c:236 +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 "" +"Следеће изборне опције могу да прате %:\n" +"\n" +" - (цртица) не попуњава поље\n" +" _ (подвлака) попуњава размацима\n" +" 0 (нула) попуњава нулама\n" +" ^ користи велика слова ако је могуће\n" +" # користи супротну величину слова ако је могуће\n" + +#: src/date.c:245 +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 "" +"\n" +"Након сваке опције долази изборна ширина поља, као децимални број;\n" +"затим изборни измењивач, који је или\n" +"„E“ за коришћење месних заменских представљања ако су доступна, или\n" +"„O“ за коришћење месних заменских бројчаних симбола ако су доступни.\n" + +#: src/date.c:252 +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 "" +"\n" +"Примери:\n" +"Претвара секунде од времена (1970-01-01 UTC) до датума\n" +" $ date --date='@2147483647'\n" +"\n" +"Показује време на западној обали Сједињених америчких држава (користи " +"„tzselect(1)“ да нађе ВЗ)\n" +" $ TZ='America/Los_Angeles' date\n" +"\n" +"Показује месно време за 9ПрП следећег петка на западној обали Сједињених " +"америчких држава\n" +" $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" + +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 +#, c-format +msgid "standard input" +msgstr "стандардни улаз" + +#: src/date.c:313 src/date.c:533 +#, c-format +msgid "invalid date %s" +msgstr "неисправан датум „%s“" + +#: src/date.c:424 src/date.c:458 +#, c-format +msgid "multiple output formats specified" +msgstr "наведено је више излазних записа" + +#: src/date.c:436 +#, c-format +msgid "the options to specify dates for printing are mutually exclusive" +msgstr "опције за навођење датума за исписивање се међусобно искључују" + +#: src/date.c:443 +#, c-format +msgid "the options to print and set the time may not be used together" +msgstr "" +"опције за исписивање и подешавање времена не могу бити коришћене заједно" + +#: src/date.c:464 +#, 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 "" +"аргументу „%s“ недостаје водећи +;\n" +"при коришћењу опције за навођење датума, сваки аргумент\n" +"не-опције мора бити ниска записа која почиње са +" + +#: src/date.c:541 +#, c-format +msgid "cannot set date" +msgstr "не могу да поставим датум" + +#: src/date.c:564 src/du.c:383 +#, 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:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 +msgid "Paul Rubin" +msgstr "Пол Рубин" + +#: src/dd.c:556 +#, c-format +msgid "" +"Usage: %s [OPERAND]...\n" +" or: %s OPTION\n" +msgstr "" +"Употреба: %s [ОПЕРАНД]...\n" +" или: %s ОПЦИЈА\n" + +#: src/dd.c:561 +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 "" +"Умножите датотеку, претварајући и обликујући у складу са операндима.\n" +"\n" +" bs=БАЈТОВИ чита и пише до БАЈТОВИ бајтова у исто време\n" +" cbs=БАЈТОВИ претвара БАЈТОВИ бајтова у исто време\n" +" conv=ПРЕТВ претвара датотеку као према списку симбола раздвојених " +"зарезом\n" +" count=N умножава само N улазних блокова\n" +" ibs=БАЈТОВИ чита до БАЈТОВИ бајтова у исто време (основно је: 512)\n" + +#: src/dd.c:570 +#, fuzzy +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=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" +msgstr "" +" if=ДАТОТЕКА чита из ДАТОТЕКЕ уместо са стандардног улаза\n" +" iflag=ОПЦИЈЕ чита као за списак симбола раздвојених зарезом\n" +" obs=БАЈТОВИ пише БАЈТОВИ бајтова у исто време (основно је: 512)\n" +" of=ДАТОТЕКА пише у ДАТОТЕКУ уместо на стандардни излаз\n" +" oflag=ОПЦИЈЕ пише као за списак симбола раздвојених зарезом\n" +" seek=N прескаче блокове N ибв-величине на почетку излаза\n" +" skip=N прескаче блокове N убв-величине на почетку улаза\n" +" status=КОЈЕ КОЈЕ податке да потисне исписујући на стандардну грешку;\n" +" „noxfer“ потискује стања преноса, „none“ потискује све\n" + +#: src/dd.c:583 +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 "" +"\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" +"Сваки симбол ПРЕТВАРАЊА може бити:\n" +"\n" + +#: src/dd.c:592 +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 "" +" ascii из ЕБЦДИЦ-а У АСКРИ\n" +" ebcdic из АСКРИ-ја у ЕБЦДИЦ\n" +" ibm из АСКРИ-ја у заменски ЕБЦДИЦ\n" +" block попуњава записе окончане новим редом размацима до цбс-величине\n" +" unblock замењује пратеће размаке у записима цбс-величине новим редом\n" +" lcase мења велика слова у мала\n" +" ucase мења мала слова у велика\n" +" sparse покушава да премота уместо да пише излаз за НИШТА улазних " +"блокова\n" +" swab размењује сваки пар улазних бајтова\n" +" sync попуњава сваки улазни блок са НИШТА до убв-величине; када се " +"користи\n" +" са блоком или разблоком, попуњава размацима радије него ли " +"НИШТИцама\n" + +#: src/dd.c:605 +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 "" +" excl не успева ако излазна датотека већ постоји\n" +" nocreat не ствара излазну датотеку\n" +" notrunc не скраћује излазну датотеку\n" +" noerror наставља након грешака читања\n" +" fdatasync физички пише податке излазне датотеке пре завршавања\n" +" fsync слично, али такође пише метаподатке\n" + +#: src/dd.c:613 +msgid "" +"\n" +"Each FLAG symbol may be:\n" +"\n" +" append append mode (makes sense only for output; conv=notrunc " +"suggested)\n" +msgstr "" +"\n" +"Сваки симбол ОПЦИЈЕ може бити:\n" +"\n" +" append режим придодавања (има смисла само за излаз; саветује се " +"„conv=notrunc“)\n" + +#: src/dd.c:620 +msgid " cio use concurrent I/O for data\n" +msgstr " cio користи конкурентски У/И за податке\n" + +#: src/dd.c:622 +msgid " direct use direct I/O for data\n" +msgstr " direct користи непосредни У/И за податке\n" + +#: src/dd.c:624 +msgid " directory fail unless a directory\n" +msgstr " directory не успева осим ако није директоријум\n" + +#: src/dd.c:626 +msgid " dsync use synchronized I/O for data\n" +msgstr " dsync користи усаглашене У/И за податке\n" + +#: src/dd.c:628 +msgid " sync likewise, but also for metadata\n" +msgstr " sync слично, али такође за метаподатке\n" + +#: src/dd.c:629 +msgid " fullblock accumulate full blocks of input (iflag only)\n" +msgstr " fullblock нагомилава пуне блокове улаза (само „iflag“)\n" + +#: src/dd.c:632 +msgid " nonblock use non-blocking I/O\n" +msgstr " nonblock користи не-блокирајући У/И\n" + +#: src/dd.c:634 +msgid " noatime do not update access time\n" +msgstr " noatime не освежава време приступа\n" + +#: src/dd.c:637 +msgid " nocache discard cached data\n" +msgstr " nocache одбацује причуване податке\n" + +#: src/dd.c:640 +msgid " noctty do not assign controlling terminal from file\n" +msgstr " noctty не додељује управљајући терминал из датотеке\n" + +#: src/dd.c:643 +msgid " nofollow do not follow symlinks\n" +msgstr " nofollow не прати симболичке везе\n" + +#: src/dd.c:645 +msgid " nolinks fail if multiply-linked\n" +msgstr " nolinks не успева ако је направљено више веза\n" + +#: src/dd.c:647 +msgid " binary use binary I/O for data\n" +msgstr " binary користи извршни У/И за податке\n" + +#: src/dd.c:649 +msgid " text use text I/O for data\n" +msgstr " text користи У/И текста за податке\n" + +#: src/dd.c:651 +msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" +msgstr " count_bytes сматра „count=N“ као број бајта (само „iflag“)\n" + +#: src/dd.c:654 +msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" +msgstr " skip_bytes сматра „skip=N“ као број бајта (само „iflag“)\n" + +#: src/dd.c:657 +msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" +msgstr " seek_bytes сматра „seek=N“ као број бајта (само „oflag“)\n" + +#: src/dd.c:661 +#, 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" +"Options are:\n" +"\n" +msgstr "" + +#: src/dd.c:699 +#, fuzzy, c-format +msgid "memory exhausted by input buffer of size % bytes (%s)" +msgstr "меморија је истрошена улазном међумеморијом величине %zu бајта (%s)" + +#: src/dd.c:721 +#, fuzzy, c-format +msgid "memory exhausted by output buffer of size % bytes (%s)" +msgstr "меморија је истрошена излазном међумеморијом величине %zu бајта (%s)" + +#: src/dd.c:774 +#, c-format +msgid "% byte (%s) copied" +msgid_plural "% bytes (%s) copied" +msgstr[0] "% бајт (%s) је умножен" +msgstr[1] "% бајта (%s) су умножена" +msgstr[2] "% бајтова (%s) је умножено" + +#: src/dd.c:794 +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:807 +#, c-format +msgid ", %g s, %s/s\n" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% записа у\n" +"%+% записа ван\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% скраћени запис\n" +msgstr[1] "% скраћена записа\n" +msgstr[2] "% скраћених записа\n" + +#: src/dd.c:920 +#, c-format +msgid "closing input file %s" +msgstr "затварам улазну датотеку „%s“" + +#: src/dd.c:927 +#, c-format +msgid "closing output file %s" +msgstr "затварам излазну датотеку „%s“" + +#: src/dd.c:1142 +#, c-format +msgid "failed to turn off O_DIRECT: %s" +msgstr "нисам успео да искључим „O_DIRECT“: %s" + +#: src/dd.c:1213 src/dd.c:2079 +#, c-format +msgid "writing to %s" +msgstr "уписујем у „%s“" + +#: src/dd.c:1365 src/dd.c:1425 +#, c-format +msgid "unrecognized operand %s" +msgstr "непознат операнд „%s“" + +#: src/dd.c:1376 +msgid "invalid conversion" +msgstr "неисправно претварање" + +#: src/dd.c:1379 src/dd.c:1467 +msgid "invalid input flag" +msgstr "неисправна улазна опција" + +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 +msgid "invalid output flag" +msgstr "неисправна излазна опција" + +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" +msgstr "неисправна опција стања" + +#: src/dd.c:1518 +#, c-format +msgid "cannot combine any two of {ascii,ebcdic,ibm}" +msgstr "не можете смешати нека два од {ascii,ebcdic,ibm}" + +#: src/dd.c:1520 +#, c-format +msgid "cannot combine block and unblock" +msgstr "не можете смешати „block“ и „unblock“" + +#: src/dd.c:1522 +#, c-format +msgid "cannot combine lcase and ucase" +msgstr "не можете смешати „lcase“ и „ucase“" + +#: src/dd.c:1524 +#, c-format +msgid "cannot combine excl and nocreat" +msgstr "не можете смешати „excl“ и „nocreat“" + +#: src/dd.c:1527 +#, c-format +msgid "cannot combine direct and nocache" +msgstr "не можете смешати „direct“ и „nocache“" + +#: src/dd.c:1685 +#, c-format +msgid "" +"warning: working around lseek kernel bug for file (%s)\n" +" of mt_type=0x%0lx -- see for the list of types" +msgstr "" +"упозорење: радим око грешке језгра „lseek“ за датотеку (%s)\n" +" mt_type=0x%0lx — видите за списак врста" + +#: src/dd.c:1773 +#, c-format +msgid "%s: cannot skip" +msgstr "%s: не могу да прескочим" + +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 +#, c-format +msgid "%s: cannot seek" +msgstr "%s: не могу да премотам" + +#: src/dd.c:1847 +#, c-format +msgid "offset overflow while reading file %s" +msgstr "прекорачење помераја за време читања датотеке „%s“" + +#: src/dd.c:1859 +#, c-format +msgid "warning: invalid file offset after failed read" +msgstr "упозорење: неисправан померај датотеке након неуспелог читања" + +#: src/dd.c:1863 +#, c-format +msgid "cannot work around kernel bug after all" +msgstr "не могу уопште да радим око грешке језгра" + +#: src/dd.c:2006 +#, c-format +msgid "setting flags for %s" +msgstr "подешавам опције за „%s“" + +#: src/dd.c:2060 +#, c-format +msgid "%s: cannot skip to specified offset" +msgstr "%s: не могу да прескочим до наведеног помераја" + +#: src/dd.c:2288 +#, c-format +msgid "failed to truncate to % bytes in output file %s" +msgstr "нисам успео да скратим на % бајта у излазној датотеци „%s“" + +#: src/dd.c:2301 +#, c-format +msgid "fdatasync failed for %s" +msgstr "„fdatasync“ није успело за „%s“" + +#: src/dd.c:2311 +#, c-format +msgid "fsync failed for %s" +msgstr "„fsync“ није успело за „%s“" + +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 +#, c-format +msgid "failed to open %s" +msgstr "нисам успео да отворим „%s“" + +#: src/dd.c:2401 +#, c-format +msgid "" +"offset too large: cannot truncate to a length of seek=% (%lu-byte) " +"blocks" +msgstr "" +"померај је превелик: не могу да скратим на дужину од „seek=%“ (%lu-" +"бајта) блокова" + +#: src/dd.c:2422 +#, c-format +msgid "failed to truncate to % bytes in output file %s" +msgstr "нисам успео да скратим на % бајта у излазној датотеци „%s“" + +#: src/dd.c:2438 src/dd.c:2444 +#, c-format +msgid "failed to discard cache for: %s" +msgstr "нисам успео да одбацим оставу за: %s" + +#. This is a proper name. See the gettext manual, section Names. +#: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 +msgid "Paul Eggert" +msgstr "Пол Егерт" + +#: src/df.c:174 +msgid "Filesystem" +msgstr "Систем датотека" + +#: src/df.c:177 +msgid "Type" +msgstr "Врста" + +#: src/df.c:180 src/df.c:547 +msgid "blocks" +msgstr "блокови" + +#: src/df.c:183 +msgid "Used" +msgstr "Заузето" + +#: src/df.c:186 +msgid "Available" +msgstr "Доступно" + +#: src/df.c:189 +msgid "Use%" +msgstr "Користи%" + +#: src/df.c:192 +msgid "Inodes" +msgstr "И-чворови" + +#: src/df.c:195 +msgid "IUsed" +msgstr "ИЗаузето" + +#: src/df.c:198 +msgid "IFree" +msgstr "ИСлободно" + +#: src/df.c:201 +msgid "IUse%" +msgstr "ИКористи%" + +#: src/df.c:204 +msgid "Mounted on" +msgstr "Прикачено на" + +#: src/df.c:207 +msgid "File" +msgstr "Датотека" + +#: src/df.c:387 +#, c-format +msgid "option --output: field %s unknown" +msgstr "опција „--output“: поље %s није познато" + +#: src/df.c:394 +#, c-format +msgid "option --output: field %s used more than once" +msgstr "опција „--output“: поље %s је употребљено више од једном" + +#: src/df.c:415 src/df.c:454 +msgid "Size" +msgstr "Величина" + +#: src/df.c:419 src/df.c:456 +msgid "Avail" +msgstr "Доступно" + +#: src/df.c:479 +msgid "Capacity" +msgstr "Капацитет" + +#. TRANSLATORS: this is the "1K-blocks" header in "df" output. +#. TRANSLATORS: this is the "1024-blocks" header in "df -P". +#: src/df.c:550 src/df.c:559 +#, c-format +msgid "%s-%s" +msgstr "%s-%s" + +#: src/df.c:1236 +#, c-format +msgid "cannot access %s: over-mounted by another device" +msgstr "не могу да приступим „%s“: прекачен је другим уређајем" + +#: src/df.c:1405 +msgid "" +"Show information about the file system on which each FILE resides,\n" +"or all file systems by default.\n" +msgstr "" +"Приказује податке о систему датотека на коме се налази свака ДАТОТЕКА,\n" +"или свих система датотека по основи.\n" + +#. TRANSLATORS: The thousands and decimal separators are best +#. adjusted to an appropriate default for your locale. +#: src/df.c:1414 +#, fuzzy +msgid "" +" -a, --all include pseudo, duplicate, inaccessible 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" +" -h, --human-readable print sizes in powers of 1024 (e.g., 1023M)\n" +" -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" +msgstr "" +" -a, --all укључује привидне системе датотека\n" +" -B, --block-size=ВЕЛИЧИНА сразмерава величине ВЕЛИЧИНОМ пре него ли их " +"исписше; нпр.,\n" +" „-BM“ испсиује величине у јединицама од " +"1,048,576 бајта;\n" +" видите запис ВЕЛИЧИНЕ испод\n" +" --total даје велику укупност\n" +" -h, --human-readable исписује величине као степене од 1024 (нпр., 1023M)\n" +" -H, --si исписује величине као степене од 1000 (нпр., 1.1G)\n" + +#: src/df.c:1422 +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 "" +" -i, --inodes исписује податке и-чвора уместо искоришћености " +"блока\n" +" -k као „--block-size=1K“\n" +" -l, --local ограничава исписивање на месне системе датотека\n" +" --no-sync не призива усаглашавање пре добављања података " +"искоришћености (основно)\n" + +#: src/df.c:1429 +#, 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" +msgstr "" +" --output[=СПИСАК_ПОЉА] користи излазни запис одређен СПИСКОМ_ПОЉА,\n" +" или исписује сва поља ако је изостављен " +"СПИСАК_ПОЉА.\n" +" -P, --portability користи излазни запис ПОСИКС-а\n" +" --sync призива усаглашавање пре добављања података " +"искоришћености\n" +" -t, --type=ВРСТА ограничава исписивање на системе датотека врсте " +"ВРСТА\n" +" -T, --print-type исписује врсту система датотека\n" +" -x, --exclude-type=ВРСТА ограничава исписивање на системе датотека који " +"нису врсте ВРСТА\n" +" -v (занемарено)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose исписује дијагнозу одмах пре отварања\n" +" сваке излазне датотеке\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" +" -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 "" +" --output[=СПИСАК_ПОЉА] користи излазни запис одређен СПИСКОМ_ПОЉА,\n" +" или исписује сва поља ако је изостављен " +"СПИСАК_ПОЉА.\n" +" -P, --portability користи излазни запис ПОСИКС-а\n" +" --sync призива усаглашавање пре добављања података " +"искоришћености\n" +" -t, --type=ВРСТА ограничава исписивање на системе датотека врсте " +"ВРСТА\n" +" -T, --print-type исписује врсту система датотека\n" +" -x, --exclude-type=ВРСТА ограничава исписивање на системе датотека који " +"нису врсте ВРСТА\n" +" -v (занемарено)\n" + +#: src/df.c:1449 +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', 'file' and 'target' (see info page).\n" +msgstr "" +"\n" +"СПИСАК_ПОЉА је зарезом раздвојени списак стубаца који ће бити укључени. " +"Исправни\n" +"називи поља су: „source“, „fstype“, „itotal“, „iused“, „iavail“, „ipcent“,\n" +"„size“, „used“, „avail“, „pcent“, „file“ и „target“ (погледајте страницу " +"података).\n" + +#: src/df.c:1486 +#, c-format +msgid "options %s and %s are mutually exclusive" +msgstr "опције „%s“ и „%s“ се међусобно искључују" + +#: src/df.c:1636 +#, c-format +msgid "file system type %s both selected and excluded" +msgstr "врста система датотека „%s“ је и изабрана и искључена" + +#: src/df.c:1694 +msgid "Warning: " +msgstr "Упозорење: " + +#: src/df.c:1696 src/stat.c:845 +msgid "cannot read table of mounted file systems" +msgstr "не могу да прочитам табелу прикачених система датотека" + +#: src/df.c:1735 +#, 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:198 src/users.c:105 +#, c-format +msgid "Usage: %s [OPTION]... [FILE]\n" +msgstr "Употреба: %s [ОПЦИЈА]... [ДАТОТЕКА]\n" + +#: 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 "" +"Исписује наредбе за подешавање променљиве окружења „LS_COLORS“.\n" +"\n" +"Одређује запис излаза:\n" +" -b, --sh, --bourne-shell исписује код Борнове шкољке за подешавање " +"„LS_COLORS“\n" +" -c, --csh, --c-shell исписује код Ц шкољке за подешавање " +"„LS_COLORS“\n" +" -p, --print-database исписује основно\n" + +#: 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 "" +"\n" +"Ако је наведено ДАТОТЕКА, чита је да одреди које боје ће користити за које\n" +"врсте датотека и проширења. У супротном, користи се унапред припремљена " +"база података.\n" +"За појединости о запису ових датотека, покрените „dircolors --print-" +"database“.\n" + +#: src/dircolors.c:286 +#, c-format +msgid "%s:%lu: invalid line; missing second token" +msgstr "%s:%lu: неисправан ред; недостаје други елемент" + +#: src/dircolors.c:358 +#, c-format +msgid "%s:%lu: unrecognized keyword %s" +msgstr "%s:%lu: непозната кључна реч „%s“" + +#: src/dircolors.c:359 +msgid "" +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 "" +"опције за исписивање унутрашње базе података дирбоја и\n" +"за бирање синтаксе шкољке се међусобно искључују" + +#: src/dircolors.c:450 +msgid "file operands cannot be combined with --print-database (-p)" +msgstr "операнди датотеке не могу бити комбиновани са „--print-database (-p)“" + +#: 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 "Употреба: %s [ОПЦИЈА] НАЗИВ...\n" + +#: 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 "" +"Исписује сваки НАЗИВ са његовим последњим састојком који није коса црта и са " +"уклоњеним пратећим\n" +"косим цртама; ако НАЗИВ не садржи /, исписује „.“ (што значи текући " +"директоријум).\n" +"\n" + +#: src/dirname.c:59 +msgid " -z, --zero end each output line with NUL, not newline\n" +msgstr " -z, --zero завршава сваки излазни ред са НИШТА, не новим редом\n" + +#: 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 "" +"\n" +"Примери:\n" +" %s /usr/bin/ —> „/usr“\n" +" %s dir1/str dir2/str —> „dir1“ за којим следи „dir2“\n" +" %s stdio.h —> „.“\n" + +#: src/du.c:281 src/sort.c:422 src/wc.c:113 +#, c-format +msgid "" +"Usage: %s [OPTION]... [FILE]...\n" +" or: %s [OPTION]... --files0-from=F\n" +msgstr "" +"Употреба: %s [ОПЦИЈА]... [ДАТОТЕКА]\n" +" или: %s [ОПЦИЈА]... --files0-from=Д\n" + +#: src/du.c:285 +#, fuzzy +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" +msgstr "" +"Прави сажетак искоришћености диска сваке ДАТОТЕКЕ, дубински за " +"директоријуме.\n" + +#: src/du.c:291 +msgid "" +" -0, --null end each output line with NUL, not newline\n" +" -a, --all write counts for all files, not just directories\n" +" --apparent-size print apparent sizes, rather than disk usage; " +"although\n" +" 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 "" +" -0, --null завршава сваки излазни ред са НИШТА, не новим редом\n" +" -a, --all пише број за све датотеке, не само за директоријуме\n" +" --apparent-size испсиује привидне величине, уместо искоришћености " +"диска; иако\n" +" привидна величина је обично мања, може бити\n" +" већа услед рупа у („расутим“) датотекама, " +"унутрашње уситњености, индиректних блокова, и слично\n" +" \n" + +#: src/du.c:300 +msgid "" +" -B, --block-size=SIZE scale sizes by SIZE before printing them; e.g.,\n" +" '-BM' prints sizes in units of 1,048,576 bytes;\n" +" see SIZE format below\n" +" -b, --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 "" +" -B, --block-size=ВЕЛИЧИНА сразмерава величине ВЕЛИЧИНОМ пре њиховог " +"исписивања; нпр.,\n" +" „-BM“ исписује величине у јединицама од 1,048,576 " +"бајта;\n" +" видите запис ВЕЛИЧИНЕ испод\n" +" -b, --bytes исто што и „--apparent-size --block-size=1“\n" +" -c, --total даје велику укупност\n" +" -D, --dereference-args уклања упуте само симболичких веза које су " +"исписане на\n" +" линији наредби\n" +" -d, --max-depth=N исписује укупност за директоријум (или датотеку, са " +"„--all“)\n" +" само ако је N или неколико нивоа испод аргумента\n" +" линије наредби; „--max-depth=0“ је исто као\n" +" „--summarize“\n" + +#: src/du.c:313 +msgid "" +" --files0-from=F summarize disk usage of the\n" +" NUL-terminated file names specified in file F;\n" +" if F is -, then read names from standard input\n" +" -H equivalent to --dereference-args (-D)\n" +" -h, --human-readable print sizes in human readable format (e.g., 1K 234M " +"2G)\n" +" --inodes list inode usage information instead of block usage\n" +msgstr "" +" --files0-from=Д прави сажетак искоришћености диска\n" +" назива датотека завршених на НИШТА наведених у " +"датотеци Д;\n" +" ако је Д -, тада чита називе са стандардног улаза\n" +" -H исто што и „--dereference-args (-D)“\n" +" -h, --human-readable исписује величине у људима читљивом запису (нпр., 1K " +"234M 2G)\n" +" --inodes испсиује податке искоришћености и-чвора уместо " +"искоришћености блока\n" + +#: src/du.c:322 +msgid "" +" -k like --block-size=1K\n" +" -L, --dereference dereference all symbolic links\n" +" -l, --count-links count sizes many times if hard linked\n" +" -m like --block-size=1M\n" +msgstr "" +" -k као „--block-size=1K“\n" +" -L, --dereference уклања упуте свих симболичких веза\n" +" -l, --count-links броји величине више пута ако су чврсто повезане\n" +" -m као „--block-size=1M“\n" + +#: src/du.c:328 +msgid "" +" -P, --no-dereference don't follow any symbolic links (this is the " +"default)\n" +" -S, --separate-dirs for directories do not include size of " +"subdirectories\n" +" --si like -h, but use powers of 1000 not 1024\n" +" -s, --summarize display only a total for each argument\n" +msgstr "" +" -P, --no-dereference не прати симболичке везе (ово је основно)\n" +" -S, --separate-dirs за директоријуме не укључује величину садржаних " +"директоријума\n" +" --si као „-h“, али користи степене од 1000 а не 1024\n" +" -s, --summarize приказује само укупност за сваки аргумент\n" + +#: src/du.c:334 +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, which can be:\n" +" full-iso, long-iso, iso, or +FORMAT;\n" +" FORMAT is interpreted like in 'date'\n" +msgstr "" +" -t, --threshold=ВЕЛИЧИНА искључује уносе мање од ВЕЛИЧИНЕ ако је " +"позитиван,\n" +" или уносе веће од ВЕЛИЧИНЕ ако је негативан\n" +" --time показује време последње измене сваке датотеке у\n" +" директоријуму, или сваком од његових " +"поддиректоријума\n" +" --time=РЕЧ показује време као РЕЧ уместо времена измене:\n" +" „atime“, „access“, „use“, „ctime“ или „status“\n" +" --time-style=СТИЛ показује времена користећи СТИЛ, који може бити:\n" +" „full-iso“, „long-iso“, „iso“, или +ЗАПИС;\n" +" ЗАПИС се тумачи као у „date“\n" + +#: src/du.c:345 +msgid "" +" -X, --exclude-from=FILE exclude files that match any pattern in FILE\n" +" --exclude=PATTERN exclude files that match PATTERN\n" +" -x, --one-file-system skip directories on different file systems\n" +msgstr "" +" -X, --exclude-from=ДАТОТЕКА искључује датотеке које одговарају сваком " +"шаблону у ДАТОТЕЦИ\n" +" --exclude=ШАБЛОН искључује датотеке које одговарају ШАБЛОНУ\n" +" -x, --one-file-system прескаче директоријуме на другачијим системима " +"датотека\n" + +#: src/du.c:398 +msgid "Infinity" +msgstr "Бесконачно" + +#: src/du.c:657 +#, c-format +msgid "fts_read failed: %s" +msgstr "није успело „fts_read“: %s" + +#: src/du.c:808 +#, c-format +msgid "invalid maximum depth %s" +msgstr "неисправна највећа дубина „%s“" + +#: src/du.c:837 +#, c-format +msgid "invalid --threshold argument '-0'" +msgstr "неисправан „--threshold“ аргумент „-0“" + +#: src/du.c:919 +#, c-format +msgid "cannot both summarize and show all entries" +msgstr "не могу и да направим сажетак и да прикажем све уносе" + +#: src/du.c:926 +#, c-format +msgid "warning: summarizing is the same as using --max-depth=0" +msgstr "упозорење: прављење сажетка је исто као коришћење „--max-depth=0“" + +#: src/du.c:932 +#, c-format +msgid "warning: summarizing conflicts with --max-depth=%lu" +msgstr "упозорење: стварање сажетка се сукобљава са „--max-depth=%lu“" + +#: src/du.c:943 +#, c-format +msgid "warning: options --apparent-size and -b are ineffective with --inodes" +msgstr "" +"упозорење: опције „--apparent-size“ и „-b“ немају дејства са „--inodes“" + +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 +msgid "file operands cannot be combined with --files0-from" +msgstr "операнди датотеке не могу бити комбиновани са „--files0-from“" + +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 +#, c-format +msgid "when reading file names from stdin, no file name of %s allowed" +msgstr "" +"приликом читања назива датотека са стандардног улаза, није допуштен назив " +"датотеке „%s“" + +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 +msgid "invalid zero-length file name" +msgstr "неисправан назив датотеке нулте дужине" + +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 +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 "" +"Употреба: %s [КРАТКА_ОПЦИЈА]... [НИСКА]...\n" +" или: %s ДУГА_ОПЦИЈА\n" + +#: src/echo.c:45 +msgid "" +"Echo the STRING(s) to standard output.\n" +"\n" +" -n do not output the trailing newline\n" +msgstr "" +"Испсиује НИСКУ на стандардни излаз.\n" +"\n" +" -n не испсиује пратећи нови ред\n" + +#: src/echo.c:51 +msgid "" +" -e enable interpretation of backslash escapes (default)\n" +" -E disable interpretation of backslash escapes\n" +msgstr "" +" -e укључује тумачење контра косе црте новог реда (основно)\n" +" -E искључује тумачење контра косе црте новог реда\n" + +#: src/echo.c:54 +msgid "" +" -e enable interpretation of backslash escapes\n" +" -E disable interpretation of backslash escapes (default)\n" +msgstr "" +" -e укључује тумачење контра косе црте новог реда\n" +" -E искључује тумачење контра косе црте новог реда (основно)\n" + +#: src/echo.c:60 +msgid "" +"\n" +"If -e is in effect, the following sequences are recognized:\n" +"\n" +msgstr "" +"\n" +"Ако је „-e“ у дејству, препознају се следећи низови:\n" +"\n" + +#: 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 "" +" \\\\ контра коса црта\n" +" \\a упозорење (ЗВОНЦЕ)\n" +" \\b повратница\n" +" \\c не даје будуће излазе\n" +" \\e крај реда\n" +" \\f облик довода\n" +" \\n нови ред\n" +" \\r повратак носиоца\n" +" \\t водоравни табулатор\n" +" \\v усправни табулатор\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 бајт са окталном вредношћу NNN (1 до 3 цифре)\n" +" \\xHH бајт са хексадецималном вредношћу HH (1 до 2 цифре)\n" + +#. 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 "Употреба: %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 "" +" -i, --ignore-environment start with an empty environment\n" +" -0, --null end each output line with NUL, not newline\n" +" -u, --unset=NAME remove variable from the environment\n" +msgstr "" +" -i, --ignore-environment почиње празним окружењем\n" +" -0, --null завршава сваки излазни ред са НИШТА, не новим " +"редом\n" +" -u, --unset=НАЗИВ уклања променљиву из окружења\n" + +#: src/env.c:68 +msgid "" +"\n" +"A mere - implies -i. If no COMMAND, print the resulting environment.\n" +msgstr "" +"\n" +"Сами - подразумева „-i“. Ако нема НАРЕДБЕ, исписује резултирајуће " +"окружење.\n" + +#: src/env.c:124 +#, c-format +msgid "cannot unset %s" +msgstr "не могу да поништим подешавање „%s“" + +#: src/env.c:135 +#, c-format +msgid "cannot set %s" +msgstr "не могу да подесим „%s“" + +#: 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" +msgstr "" +"Претвара табулаторе у свакој датотеци у размаке, пишући на стандардном " +"излазу.\n" +"Без ДАТОТЕКЕ, или када је ДАТОТЕКА -, чита стандардни улаз.\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 "" +" -i, --initial не претвара табулаторе након не празних\n" +" -t, --tabs=БРОЈ има засебан БРОЈ знакова табулатора, а не 8\n" + +#: src/expand.c:118 +msgid "" +" -t, --tabs=LIST use comma separated list of explicit tab positions\n" +msgstr "" +" -t, --tabs=СПИСАК користи зарезом раздвојен списак изричитих положаја " +"табулатора\n" + +#: src/expand.c:171 src/unexpand.c:190 +#, c-format +msgid "tab stop is too large %s" +msgstr "заустављање табулатора је превелико %s" + +#: src/expand.c:179 src/unexpand.c:198 +#, c-format +msgid "tab size contains invalid character(s): %s" +msgstr "величина табулатора садржи неисправан знак: %s" + +#: src/expand.c:205 src/unexpand.c:224 +#, c-format +msgid "tab size cannot be 0" +msgstr "величина табулатора не може бити 0" + +#: 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:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 +msgid "Mike Parker" +msgstr "Мајк Паркер" + +#. This is a proper name. See the gettext manual, section Names. +#: src/expr.c:151 src/groups.c:36 +msgid "James Youngman" +msgstr "Џејмс Јангмен" + +#: src/expr.c:202 +#, c-format +msgid "" +"Usage: %s EXPRESSION\n" +" or: %s OPTION\n" +msgstr "" +"Употреба: %s ИЗРАЗ\n" +" или: %s ОПЦИЈА\n" + +#: src/expr.c:210 +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 "" +"\n" +"Испсиује вредност ИЗРАЗА на стандардни излаз. Празан ред испод\n" +"раздваја повећавајуће првенство група. ИЗРАЗ може бити:\n" +"\n" +" АРГ1 | АРГ2 АРГ1 ако није ни ништаван ни 0, у супротном АРГ2\n" +"\n" +" АРГ1 & АРГ2 АРГ1 ако ниједан аргумент није ништаван или 0, у " +"супротном 0\n" + +#: src/expr.c:219 +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 "" +"\n" +" АРГ1 < АРГ2 АРГ1 је мањи од АРГ2\n" +" АРГ1 <= АРГ2 АРГ1 је мањи или једнак АРГ2\n" +" АРГ1 = АРГ2 АРГ1 је једнак АРГ2\n" +" АРГ1 != АРГ2 АРГ1 није једнак АРГ2\n" +" АРГ1 >= АРГ2 АРГ1 је већи или једнак АРГ2\n" +" АРГ1 > АРГ2 АРГ1 је већи од АРГ2\n" + +#: src/expr.c:228 +msgid "" +"\n" +" ARG1 + ARG2 arithmetic sum of ARG1 and ARG2\n" +" ARG1 - ARG2 arithmetic difference of ARG1 and ARG2\n" +msgstr "" +"\n" +" АРГ1 + АРГ2 аритметички збир АРГ1 и АРГ2\n" +" АРГ1 - АРГ2 аритметичка разлика АРГ1 и АРГ2\n" + +#: src/expr.c:235 +#, 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 "" +"\n" +" АРГ1 * АРГ2 аритметички производ АРГ1 и АРГ2\n" +" АРГ1 / АРГ2 аритметички коефицијенат АРГ1 подељеног са АРГ2\n" +" АРГ1 % АРГ2 аритметички остатак АРГ1 подељеног са АРГ2\n" + +#: src/expr.c:241 +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 "" +"\n" +" НИСКА : РЕГИЗР прикачени шаблон поклапања РЕГИЗР-а у НИСЦИ\n" +"\n" +" match НИСКА РЕГИЗР исто као НИСКА : РЕГИЗР\n" +" substr НИСКА ПОЛ ДУЖИНА подниска НИСКЕ, ПОЛОЖАЈ бројан од 1\n" +" index НИСКА ЗНАЦИ попис у НИСЦИ где је сваки ЗНАК пронађен, или " +"0\n" +" length НИСКА дужина НИСКЕ\n" + +#: src/expr.c:250 +msgid "" +" + TOKEN interpret TOKEN as a string, even if it is a\n" +" keyword like 'match' or an operator like '/'\n" +"\n" +" ( EXPRESSION ) value of EXPRESSION\n" +msgstr "" +" + ЕЛЕМЕНТ тумачи ЕЛЕМЕНТ као ниску, чак и ако је\n" +" кључна реч као „match“ или оператор као /\n" +"\n" +" ( ИЗРАЗ ) вредност ИЗРАЗА\n" + +#: src/expr.c:256 +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 "" +"\n" +"Опрез јер многи оператори морају имати знак краја или морају бити цитирани " +"за шкољке.\n" +".\n" +"Поклапања шаблона дају ниску поклопљену између \\( и \\) или ништа; ако се\n" +"\\( и \\) не користе, дају број поклопљених знакова или 0.\n" + +#: src/expr.c:263 +msgid "" +"\n" +"Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is " +"null\n" +"or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n" +msgstr "" +"\n" +"Излазно стање је 0 ако ИЗРАЗ није ни ништа ни 0, 1 ако је ИЗРАЗ ништаван\n" +"или 0, 2 ако је ИЗРАЗ садржајно неисправан, а 3 ако дође до грешке.\n" + +#: src/expr.c:277 +#, c-format +msgid "syntax error" +msgstr "садржајна грешка" + +#: src/expr.c:591 src/ptx.c:284 +#, c-format +msgid "error in regular expression matcher" +msgstr "грешка у упоређивачу регуларног израза" + +#: src/expr.c:783 src/expr.c:820 +#, c-format +msgid "non-integer argument" +msgstr "аргумент не целог броја" + +#: src/expr.c:785 src/truncate.c:288 +#, c-format +msgid "division by zero" +msgstr "дељење нулом" + +#: src/expr.c:879 src/sort.c:2076 +#, c-format +msgid "set LC_ALL='C' to work around the problem" +msgstr "поставите LC_ALL='C' да решите проблем" + +#: src/expr.c:881 +#, c-format +msgid "the strings compared were %s and %s" +msgstr "поређене ниске су „%s“ и „%s“" + +#. This is a proper name. See the gettext manual, section Names. +#: src/factor.c:112 +msgid "Niels Moller" +msgstr "Нилс Молер" + +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 +#, c-format +msgid "Lucas prime test failure. This should not happen" +msgstr "Неуспех пробе Лукасовог простог броја. Ово није требало да се деси" + +#: src/factor.c:2078 +#, c-format +msgid "squfof queue overflow" +msgstr "прекорачење реда „squfof“-а" + +#: src/factor.c:2492 +#, c-format +msgid "%s is not a valid positive integer" +msgstr "%s није исправан позитиван цео број" + +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 +#, c-format +msgid "%s is too large" +msgstr "%s је превелик" + +#: src/factor.c:2528 +#, c-format +msgid "" +"Usage: %s [NUMBER]...\n" +" or: %s OPTION\n" +msgstr "" +"Употреба: %s [БРОЈ]...\n" +" или: %s ОПЦИЈА\n" + +#: src/factor.c:2533 +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 "" +"Исписује чиниоце простог броја сваког наведеног целог броја БРОЈ. Ако нису\n" +"наведени на линији наредби, чита их са стандардног улаза.\n" +"\n" + +#: 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 "не могу да пређем у директоријум „%s“" + +#: src/find-mount-point.c:70 +#, c-format +msgid "cannot stat current directory (now %s)" +msgstr "не могу да добавим податке текућег директоријума (сада је %s)" + +#. 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 "Употреба: %s [-ШИРИНА] [ОПЦИЈА]... [ДАТОТЕКА]...\n" + +#: src/fmt.c:271 +msgid "" +"Reformat each paragraph in the FILE(s), writing to standard output.\n" +"The option -WIDTH is an abbreviated form of --width=DIGITS.\n" +msgstr "" +"Поново обликује сваки пасус у ДАТОТЕЦИ, пишући на стандардни излаз.\n" +"Опција -ШИРИНА је скраћени облик од „--width=ЦИФРЕ“.\n" + +#: src/fmt.c:279 +msgid "" +" -c, --crown-margin preserve indentation of first two lines\n" +" -p, --prefix=STRING reformat only lines beginning with STRING,\n" +" reattaching the prefix to reformatted lines\n" +" -s, --split-only split long lines, but do not refill\n" +msgstr "" +" -c, --crown-margin очувава увлачење прва два реда\n" +" -p, --prefix=НИСКА поново обликује само редове који почињу НИСКОМ,\n" +" поново прикачињући префикс на поново " +"обликоване редове\n" +" -s, --split-only дели дуге редове, али не испуњава поново\n" + +#: src/fmt.c:288 +#, 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" +" -u, --uniform-spacing један размак између речи, два након реченице\n" +" -w, --width=ШИРИНА највећа ширина реда (основно је 75 стубаца)\n" +" -g, --goal=ШИРИНА циљна ширина (основно је 93% ширине)\n" + +#: src/fmt.c:356 +#, c-format +msgid "" +"invalid option -- %c; -WIDTH is recognized only when it is the first\n" +"option; use -w N instead" +msgstr "" +"неисправна опција — „%c“; -ШИРИНА се препознаје само када је прва\n" +"опција; уместо тога користите „-w N“" + +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" +msgstr "неисправна ширина: %s" + +#: src/fold.c:69 +#, fuzzy +msgid "Wrap input lines in each FILE, writing to standard output.\n" +msgstr "" +"Прелама улазне редове у свакој ДАТОТЕЦИ (стандардном улазу по основи), " +"пишући на\n" +"стандардни излаз.\n" + +#: src/fold.c:76 +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 броји бајтове уместо стубаца\n" +" -s, --spaces застаје на размацима\n" +" -w, --width=ШИРИНА користи ШИРИНА стубаца уместо 80\n" + +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" +msgstr "неисправан број стубаца: %s" + +#. This is a proper name. See the gettext manual, section Names. +#: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 +#: src/truncate.c:37 +msgid "Padraig Brady" +msgstr "Падрејг Брејди" + +#: src/getlimits.c:66 +#, c-format +msgid "Usage: %s\n" +msgstr "Употреба: %s\n" + +#: src/getlimits.c:70 +msgid "" +"Output platform dependent limits in a format useful for shell scripts.\n" +"\n" +msgstr "" +"Ограничења излаза зависна од платформе у запису корисном за списе шкољке.\n" +"\n" + +#: src/group-list.c:69 src/id.c:412 +#, c-format +msgid "failed to get groups for user %s" +msgstr "нисам успео да добавим групе за корисника „%s“" + +#: src/group-list.c:74 src/id.c:415 +#, 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 "не могу да нађем назив за ИБ групе „%lu“" + +#: src/groups.c:53 +#, c-format +msgid "Usage: %s [OPTION]... [USERNAME]...\n" +msgstr "Употреба: %s [ОПЦИЈА]... [ИМЕКОРИСНИКА]...\n" + +#: 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 "" +"Исписује чланове групе за свако КОРИСНИЧКОИМЕ или, ако није наведено " +"КОРИСНИЧКОИМЕ, за\n" +"текући процес (који може да се разликује ако је измењена база података " +"група).\n" + +#: src/groups.c:105 src/id.c:274 +#, c-format +msgid "cannot get real UID" +msgstr "не могу да одбавим стварни ЈИБ" + +#: src/groups.c:110 src/id.c:282 +#, c-format +msgid "cannot get effective GID" +msgstr "не могу да добавим ефективни ГИБ" + +#: src/groups.c:115 src/id.c:287 +#, c-format +msgid "cannot get real GID" +msgstr "не могу да одбавим стварни ГИБ" + +#: src/groups.c:128 src/id.c:246 +#, c-format +msgid "%s: no such user" +msgstr "%s: нема таквог корисника" + +#: src/head.c:110 +#, 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" +msgstr "" +"Испсиује првих 10 редова сваке ДАТОТЕКЕ на стандардни излаз.\n" +"Са више од једне ДАТОТЕКЕ, претходи сваку са заглављем дајући назив " +"датотеке.\n" +"Без ДАТОТЕКЕ, или када је ДАТОТЕКА -, чита стандардни улаз.\n" + +#: src/head.c:118 +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 "" +" -c, --bytes=[-]K испсиује првих K бајта сваке датотеке;\n" +" са водећим -, исписује све осим последња\n" +" K бајта сваке датотеке\n" +" -n, --lines=[-]K исписује првих K редова уместо првих 10;\n" +" са водећим -, исписује све осим последња\n" +" K реда сваке датотеке\n" + +#: src/head.c:126 +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" +" -v, --verbose увек исписује заглавља која дају називе датотека\n" + +#: src/head.c:132 +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" +"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/head.c:152 +#, c-format +msgid "%s: file has shrunk too much" +msgstr "%s: датотека је скупљена превише" + +#: src/head.c:224 src/tail.c:448 +#, c-format +msgid "%s: cannot seek to offset %s" +msgstr "%s: не могу да премотам на померај %s" + +#: src/head.c:225 src/tail.c:452 +#, c-format +msgid "%s: cannot seek to relative offset %s" +msgstr "%s: не могу да премотам на привидни померај „%s“" + +#: src/head.c:267 +#, c-format +msgid "%s: number of bytes is too large" +msgstr "%s: број бајтова је превелик" + +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 +msgid "invalid number of lines" +msgstr "неисправан број редова" + +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 +msgid "invalid number of bytes" +msgstr "неисправан број бајтова" + +#: src/head.c:991 src/head.c:1049 +#, c-format +msgid "invalid trailing option -- %c" +msgstr "неисправна пратећа опција — %c" + +#: src/hostid.c:42 +#, c-format +msgid "" +"Usage: %s [OPTION]\n" +"Print the numeric identifier (in hexadecimal) for the current host.\n" +"\n" +msgstr "" +"Употреба: %s [ОПЦИЈА]\n" +"Исписује бројни одредник (хексадецимално) за текућег домаћина.\n" +"\n" + +#: 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 "" +"Употреба: %s [НАЗИВ]\n" +" или: %s ОПЦИЈА\n" +"Исписује или подешава назив домаћина текућег система.\n" +"\n" + +#: src/hostname.c:94 +#, c-format +msgid "cannot set name to %s" +msgstr "не могу да подесим назив на „%s“" + +#: 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:40 src/touch.c:42 +msgid "Arnold Robbins" +msgstr "Арнолд Робинс" + +#: src/id.c:84 +#, c-format +msgid "Usage: %s [OPTION]... [USER]\n" +msgstr "Употреба: %s [ОПЦИЈА]... [КОРИСНИК]\n" + +#: src/id.c:85 +msgid "" +"Print user and group information for the specified USER,\n" +"or (when USER omitted) for the current user.\n" +"\n" +msgstr "" +"Исписује податке о кориснику и групи за наведеног КОРИСНИКА,\n" +"или (када је КОРИСНИК изостављен) за текућег корисника.\n" +"\n" + +#: src/id.c:90 +msgid "" +" -a ignore, for compatibility with other versions\n" +" -Z, --context print only the security context of the process\n" +" -g, --group print only the effective group ID\n" +" -G, --groups print all group IDs\n" +" -n, --name print a name instead of a number, for -ugG\n" +" -r, --real print the real ID instead of the effective ID, with -ugG\n" +" -u, --user print only the effective user ID\n" +" -z, --zero delimit entries with NUL characters, not whitespace;\n" +" not permitted in default format\n" +msgstr "" +" -a занемарује, зарад сагласности са другим издањима\n" +" -Z, --context исписује само безбедносни садржај процеса\n" +" -g, --group исписује само стварни ИБ групе\n" +" -G, --groups исписује све ИБ-ове група\n" +" -n, --name исписује име уместо броја, за „-ugG“\n" +" -r, --real исписује прави ИБ уместо стварног ИБ-а, са „-ugG“\n" +" -u, --user исписује само стварни ИБ корисника\n" +" -z, --zero ограничава уносе НИШТАВНИМ знацима, не празнинама;\n" +" није дозвољено у основном запису\n" + +#: src/id.c:103 +msgid "" +"\n" +"Without any OPTION, print some useful set of identified information.\n" +msgstr "" +"\n" +"Без икакве ОПЦИЈЕ, исписује неки користан скуп препознатих података.\n" + +#: src/id.c:151 +#, c-format +msgid "--context (-Z) works only on an SELinux/SMACK-enabled kernel" +msgstr "„--context (-Z)“ ради само на СЕЛинукс/СМАЦК укљученом језгру" + +#: src/id.c:156 +#, c-format +msgid "--context (-Z) works only on an SELinux-enabled kernel" +msgstr "„--context (-Z)“ ради само на СЕЛинукс укљученом језгру" + +#: src/id.c:195 +#, c-format +msgid "cannot print security context when user specified" +msgstr "не могу да испишем безбедносни садржај када је наведен корисник" + +#: src/id.c:198 +#, c-format +msgid "cannot print \"only\" of more than one choice" +msgstr "не могу да испишем „само“ више од једног избора" + +#: src/id.c:205 +#, c-format +msgid "cannot print only names or real IDs in default format" +msgstr "не могу да испишем само називе или праве ИБ-ове у основном запису" + +#: src/id.c:209 +#, c-format +msgid "option --zero not permitted in default format" +msgstr "опција „--zero“ није дозвољена у основном запису" + +#: src/id.c:225 +#, c-format +msgid "can't get process context" +msgstr "не могу да добавим садржај процеса" + +#: src/id.c:265 +#, c-format +msgid "cannot get effective UID" +msgstr "не могу да добавим стварни ЈИБ" + +#: src/id.c:354 +#, c-format +msgid "cannot find name for user ID %s" +msgstr "не могу да нађем име за ИБ корисника „%s“" + +#: src/id.c:372 +#, c-format +msgid "uid=%s" +msgstr "јиб=%s" + +#: src/id.c:377 +#, c-format +msgid " gid=%s" +msgstr " гиб=%s" + +#: src/id.c:384 +#, c-format +msgid " euid=%s" +msgstr " ејиб=%s" + +#: src/id.c:392 +#, c-format +msgid " egid=%s" +msgstr " егиб=%s" + +#: src/id.c:421 +msgid " groups=" +msgstr " групе=" + +#: src/id.c:437 +#, c-format +msgid " context=%s" +msgstr " садржај=%s" + +#: src/install.c:376 +#, c-format +msgid "warning: %s: failed to change context to %s" +msgstr "упозорење: %s: нисам успео да променим садржај у „%s“" + +#: src/install.c:417 +#, c-format +msgid "creating directory %s" +msgstr "правим директоријум „%s“" + +#: src/install.c:485 +#, c-format +msgid "cannot change ownership of %s" +msgstr "не могу да променим власништво за „%s“" + +#: src/install.c:509 +#, c-format +msgid "cannot set time stamps for %s" +msgstr "не могу да подесим временске ознаке за „%s“" + +#: src/install.c:531 src/split.c:479 src/timeout.c:444 +#, c-format +msgid "fork system call failed" +msgstr "није успео позив системског рачвања" + +#: src/install.c:535 +#, c-format +msgid "cannot run %s" +msgstr "не могу да покренем „%s“" + +#: src/install.c:539 +#, c-format +msgid "waiting for strip" +msgstr "чекам на огољавање" + +#: src/install.c:541 +#, c-format +msgid "strip process terminated abnormally" +msgstr "процес огољавања је неочекивано прекинут" + +#: src/install.c:565 +#, c-format +msgid "invalid user %s" +msgstr "неисправан корисник „%s“" + +#: src/install.c:601 +#, c-format +msgid "" +"Usage: %s [OPTION]... [-T] SOURCE DEST\n" +" or: %s [OPTION]... SOURCE... DIRECTORY\n" +" or: %s [OPTION]... -t DIRECTORY SOURCE...\n" +" or: %s [OPTION]... -d DIRECTORY...\n" +msgstr "" +"Употреба: %s [ОПЦИЈА]... [-T] ИЗВОР ОДРЕД\n" +" или: %s [ОПЦИЈА]... ИЗВОР... ДИРЕКТОРИЈУМ\n" +" или: %s [ОПЦИЈА]... -t ДИРЕКТОРИЈУМ ИЗВОР...\n" +" или: %s [ОПЦИЈА]... -d ДИРЕКТОРИЈУМ...\n" + +#: src/install.c:608 +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 "" +"\n" +"Овај инсталациони програм умножава датотеке (често само преведене) на " +"одредишна\n" +"места која изаберете. Ако желите да преузмете и инсталирате пакете сперемне " +"за\n" +"употребу на ГНУ/Линукс систему, онда бисте требали да користите управника\n" +"пакетима као што је „yum(1)“ или „apt-get(1)“.\n" +"\n" +"У прва три облика, умножава ИЗВОР у ОДРЕДИШТЕ или више ИЗВОРА у\n" +"постојећи ДИРЕКТОРИЈУМ, док подешава режиме овлашћења и власника/групу\n" +"У 4-том облику, ствара све састојке датог(их) ДИРЕКТОРИЈУМА.\n" + +#: src/install.c:622 +msgid "" +" --backup[=CONTROL] make a backup of each existing destination file\n" +" -b like --backup but does not accept an argument\n" +" -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 "" +" --backup[=УПРАВЉАЊЕ] прави резерву сваке постојеће датотеке " +"одредишта\n" +" -b као „--backup“ али не прихвата аргумент\n" +" -c (занемарено)\n" +" -C, --compare пореди сваки пар извора и датотека одредишта, и у\n" +" неким случајевима, уопште не мења одредиште\n" +" -d, --directory сматра све аргументе називима директоријума; ствара\n" +" све састојке наведених директоријума\n" + +#: src/install.c:631 +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 "" +" -D ствара све водеће састојке ОДРЕДИШТА осим " +"последњег,\n" +" затим умножава ИЗВОР у ОДРЕДИШТЕ\n" +" -g, --group=ГРУПА поставља власништво групе, уместотекуће групе " +"процеса\n" +" -m, --mode=РЕЖИМ поставља режим власништва (као у „chmod“-у), уместо " +"„rwxr-xr-x“\n" +" -o, --owner=ВЛАСНИК поставља власништво (само администратор)\n" + +#: src/install.c:638 +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 "" +" -p, --preserve-timestamps примењује времена приступа/измене ИЗВОРНИХ " +"датотека\n" +" на одговарајуће датотеке одредишта\n" +" -s, --strip огољава табеле симбола\n" +" --strip-program=ПРОГРАМ програм коришћен за огољавање извршних\n" +" -S, --suffix=СУФИКС преписује уобичајени суфикс резерве\n" +" -t, --target-directory=ДИРЕКТОРИЈУМ умножава све ИЗВОРНЕ аргументе у " +"ДИРЕКТОРИЈУМ\n" +" -T, --no-target-directory сматра ОДРЕДИШТЕ обичним датотекама\n" +" -v, --verbose исписује назив сваког директоријума како бива " +"направљен\n" + +#: src/install.c:648 +msgid "" +" --preserve-context preserve SELinux security context\n" +" -Z set SELinux security context of destination\n" +" file to default type\n" +" --context[=CTX] like -Z, or if CTX is specified then set the\n" +" SELinux or SMACK security context to CTX\n" +msgstr "" +" --preserve-context очувава СЕЛинукс безбедносни садржај\n" +" -Z подешава СЕЛинукс безбедносни садржај " +"одредишне\n" +" датотеке на основну вредност\n" +" --context[=СДРЖ] као „-Z“, или ако је наведен СДРЖ тада " +"подешава\n" +" СЕЛинукс или СМАЦК безбедносни садржај на " +"СДРЖ\n" + +#: src/install.c:696 src/unlink.c:86 +#, c-format +msgid "cannot unlink %s" +msgstr "не могу да развежем „%s“" + +#: src/install.c:877 +#, c-format +msgid "" +"WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" +msgstr "" +"УПОЗОРЕЊЕ: занемарујем „--preserve-context“; ово језгро није СЕЛинукс " +"укључено" + +#: src/install.c:917 +#, c-format +msgid "the strip option may not be used when installing a directory" +msgstr "" +"опција огољавања не може бити коришћена приликом инсталирања директоријума" + +#: src/install.c:920 +#, c-format +msgid "target directory not allowed when installing a directory" +msgstr "циљни директоријум није допуштен приликом инсталирања директоријума" + +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 +#, c-format +msgid "invalid mode %s" +msgstr "неисправан режим „%s“" + +#: src/install.c:996 +#, c-format +msgid "WARNING: ignoring --strip-program option as -s option was not specified" +msgstr "" +"УПОЗОРЕЊЕ: занемарујем опцију „--strip-program“ јер опција „-s“ није наведена" + +#: src/install.c:1001 +#, c-format +msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" +msgstr "" +"опције „--compare (-C)“ и „--preserve-timestamps“ се међусобно искључују" + +#: src/install.c:1008 +#, c-format +msgid "options --compare (-C) and --strip are mutually exclusive" +msgstr "опције „--compare (-C)“ и „--strip“ се међусобно искључују" + +#: src/install.c:1014 +#, c-format +msgid "" +"the --compare (-C) option is ignored when you specify a mode with non-" +"permission bits" +msgstr "" +"опција „--compare (-C)“ се занемарује када наведете режим са битима не-" +"овлашћења" + +#. 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:195 +msgid "" +"For each pair of input lines with identical join fields, write a line to\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" +"\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 "" +"За сваки пар улазних редова са истим пољима придруживања, пише ред на\n" +"стандардни излаз. Основно поље придруживања је прво, ограничено\n" +"празнином. Када је ДАТОТЕКА1 или ДАТОТЕКА2 (не обе) -, чита стандардни " +"улаз.\n" +"\n" +" -a БРОЈДАТОТЕКЕ такође испсиује неупарене редове из датотеке " +"БРОЈДАТОТЕКЕ, где је\n" +" БРОЈДАТОТЕКЕ 1 или 2, који одговара ДАТОТЕЦИ1 или " +"ДАТОТЕЦИ2\n" +" -e ПРАЗНО замењује недостајућа улазна поља са ПРАЗНО\n" + +#: src/join.c:210 +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 занемарује разлике у величини слова када упоређује поља\n" +" -j ПОЉЕ исто што и „-1 ПОЉЕ -2 ПОЉЕ“\n" +" -o ЗАПИС извршава ЗАПИС када ствара излазни ред\n" +" -t ЗНАК користи ЗНАК као раздвојник улазног и излазног поља\n" + +#: src/join.c:216 +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 "" +" -v БРОЈДАТОТЕКЕ као „-a БРОЈДАТОТЕКЕ“, али \n" +" -1 ПОЉЕ придружује на овом ПОЉУ датотеке 1\n" +" -2 ПОЉЕ придружује на овом ПОЉУ датотеке 2\n" +" --check-order проверава да ли је улаз исправно поређан, чак\n" +" и ако су сви улазни редови упариви\n" +" --nocheck-order не проверава да ли је улаз исправно поређан\n" +" --header сматра први ред у свакој датотеци заглављима поља,\n" +" исписује их а да не покушава да их упари\n" + +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 +msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" +msgstr " -z, --zero-terminated ограничавач реда је НИШТА, не нови ред\n" + +#: src/join.c:231 +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 "" +"\n" +"Осим ако није дато „-t ЗНАК“, водеће празнине раздвајају поља и занемарене " +"су,\n" +"у супротном поља се раздвајају ЗНАКОМ. Свако ПОЉЕ је број поља бројан\n" +"од 1. ЗАПИС је једна или више зарезом или празнинама раздвојених одредби,\n" +"и свака је „FILENUM.FIELD“ или „0“. Основни ЗАПИС исписује поље припајања,\n" +"преостала поља из ДАТОТЕКЕ1, преостала поља из ДАТОТЕКЕ2, све\n" +"раздвојено ЗНАКОМ. Ако је ЗАПИС кључна реч „auto“, тада први ред сваке\n" +"датотеке одређује број излаза поља за сваки ред.\n" +"\n" +"Важно: ДАТОТЕКА1 и ДАТОТЕКА2 морају бити поређане на пољима припајања.\n" +"Нпр., користите „sort -k 1b,1“ ако „join“ нема опција,\n" +"или користите „join -t ''“ ако „sort“ нема опција.\n" +"Напомена, поређења поштују правила која наводи „LC_COLLATE“.\n" +"Ако улаз није поређан а неки редови не могу бити припојени,\n" +"биће дата порука упозорења.\n" + +#: src/join.c:416 +#, c-format +msgid "%s:%: is not sorted: %.*s" +msgstr "%s:%: није поређано: %.*s" + +#: src/join.c:853 src/join.c:1051 +#, c-format +msgid "invalid field number: %s" +msgstr "неисправан број поља: %s" + +#: src/join.c:874 src/join.c:883 +#, c-format +msgid "invalid field specifier: %s" +msgstr "неисправан одредник поља: %s" + +#: src/join.c:890 +#, c-format +msgid "invalid file number in field spec: %s" +msgstr "неисправан број датотеке у одредби поља: %s" + +#: src/join.c:933 +#, c-format +msgid "incompatible join fields %lu, %lu" +msgstr "несагласна поља припајања %lu, %lu" + +#: src/join.c:1062 +#, c-format +msgid "conflicting empty-field replacement strings" +msgstr "сукобљавајуће ниске замене празног поља" + +#: src/join.c:1114 src/sort.c:4508 +#, c-format +msgid "multi-character tab %s" +msgstr "више-знаковни табулатор „%s“" + +#: src/join.c:1118 src/sort.c:4513 +#, c-format +msgid "incompatible tabs" +msgstr "несагласни табулатори" + +#: src/join.c:1191 +#, 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 "" +"Употреба: %s [-s СИГНАЛ | -СИГНАЛ] ПИБ...\n" +" или: %s -l [СИГНАЛ]...\n" +" или: %s -t [СИГНАЛ]...\n" + +#: src/kill.c:82 +msgid "Send signals to processes, or list signals.\n" +msgstr "Шаље сигнале процесима, или исписује сигнале.\n" + +#: 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 "" +" -s, --signal=СИГНАЛ, -СИГНАЛ\n" +" наводи назив или број сигнала за слање\n" +" -l, --list исписује називе сигнала, или претвара називе сигнала у/из " +"бројева\n" +" -t, --table исписује табелу података сигнала\n" + +#: 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 "" +"\n" +"СИГНАЛ може бити назив сигнала као „HUP“, или број сигнала као „1“,\n" +"или излазно стање процеса окончаног сигналом.\n" +"ПИБ је цео број; ако је негативан означава групу процеса.\n" + +#: src/kill.c:205 +#, c-format +msgid "%s: invalid process id" +msgstr "%s: неисправан иб процеса" + +#: src/kill.c:259 +#, c-format +msgid "invalid option -- %c" +msgstr "неисправна опција -- „%c“" + +#: src/kill.c:268 +#, c-format +msgid "%s: multiple signals specified" +msgstr "%s: наведено је више сигнала" + +#: src/kill.c:282 +#, c-format +msgid "multiple -l or -t options specified" +msgstr "наведено је више „-l“ или „-t“ опција" + +#: src/kill.c:299 +#, c-format +msgid "cannot combine signal with -l or -t" +msgstr "не можете комбиновати сигнал са „-l“ или „-t“" + +#: src/kill.c:305 +#, c-format +msgid "no process ID specified" +msgstr "није наведен ИБ процеса" + +#: src/libstdbuf.c:107 +#, c-format +msgid "failed to allocate a % byte stdio buffer\n" +msgstr "нисам успео да доделим стдуи међумеморије % бајта\n" + +#: src/libstdbuf.c:114 +#, c-format +msgid "invalid buffering mode %s for %s\n" +msgstr "неисправан режим међумеморије „%s“ за „%s“\n" + +#: src/libstdbuf.c:122 +#, c-format +msgid "could not set buffering of %s to mode %s\n" +msgstr "не могу да подесим међумеморисање за „%s“ на режим „%s“\n" + +#. This is a proper name. See the gettext manual, section Names. +#: src/link.c:36 src/unlink.c:36 src/who.c:50 +msgid "Michael Stone" +msgstr "Мајкл Стоун" + +#: src/link.c:45 +#, c-format +msgid "" +"Usage: %s FILE1 FILE2\n" +" or: %s OPTION\n" +msgstr "" +"Употреба: %s ДАТОТЕКА1 ДАТОТЕКА2\n" +" или: %s ОПЦИЈА\n" + +#: src/link.c:48 +msgid "" +"Call the link function to create a link named FILE2 to an existing FILE1.\n" +"\n" +msgstr "" +"Позива функцију везе да направи везу под називом ДАТОТЕКА2 према постојећој " +"ДАТОТЕЦИ1.\n" +"\n" + +#: src/link.c:90 +#, c-format +msgid "cannot create link %s to %s" +msgstr "не могу да направим везу „%s“ до %s" + +#: src/ln.c:206 +#, c-format +msgid "%s: hard link not allowed for directory" +msgstr "%s: чврста веза није дозвољена за директоријум" + +#: src/ln.c:271 +#, c-format +msgid "%s: cannot overwrite directory" +msgstr "%s: не могу да препишем директоријум" + +#: src/ln.c:276 +#, c-format +msgid "%s: replace %s? " +msgstr "%s: да заменим „%s“? " + +#: src/ln.c:362 +#, c-format +msgid "failed to create symbolic link %s" +msgstr "нисам успео да направим симболичку везу „%s“" + +#: src/ln.c:363 +#, c-format +msgid "failed to create symbolic link %s -> %s" +msgstr "нисам успео да направим симболичку везу „%s“ —> %s" + +#: src/ln.c:365 +#, c-format +msgid "failed to create hard link to %.0s%s" +msgstr "нисам успео да направим чврсту везу за „%.0s%s“" + +#: src/ln.c:368 +#, c-format +msgid "failed to create hard link %s" +msgstr "нисам успео да направим чврсту везу „%s“" + +#: src/ln.c:369 +#, c-format +msgid "failed to create hard link %s => %s" +msgstr "нисам успео да направим чврсту везу „%s“ => %s" + +#: src/ln.c:391 +#, 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 "" +"Употреба: %s [ОПЦИЈА]... [-T] МЕТА НАЗИВ_ВЕЗЕ (1° облик)\n" +" или: %s [ОПЦИЈА]... МЕТА (2° облик)\n" +" или: %s [ОПЦИЈА]... МЕТА... ДИРЕКТОРИЈУМ (3° облик)\n" +" или: %s [ОПЦИЈА]... -t ДИРЕКТОРИЈУМ МЕТА... (4° облик)\n" + +#: src/ln.c:398 +msgid "" +"In the 1st form, create a link to TARGET with the name LINK_NAME.\n" +"In the 2nd form, create a link to TARGET in the current directory.\n" +"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 "" +"У 1° облику, прави везу ка МЕТИ са називом НАЗИВ_ВЕЗЕ.\n" +"У 2° облику, прави везу ка МЕТИ у текућем директоријуму.\n" +"У 3° и 4° облику, прави везе ка свакој МЕТИ у ДИРЕКТОРИЈУМУ.\n" +"Ствара чврсте везе по основи, симболичке везе са „--symbolic“.\n" +"По основи, свако одредиште (назив нове везе) не сме већ постојати.\n" +"Када прави чврсте везе, свака МЕТА мора постојати. Симболичке везе\n" +"могу садржати изборни текст; ако је решена касније, односна веза се\n" +"тумачи у односу према свом родитељском директоријуму.\n" + +#: src/ln.c:411 +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 "" +" --backup[=УПРАВЉАЊЕ] прави резерву сваке постојеће датотеке " +"одредишта\n" +" -b као „--backup“ али не прихвата аргумент\n" +" -d, -F, --directory дозвољава администраторима да покушају да " +"чврсто повежу\n" +" директоријуме (напомена: вероватно неће " +"успети због\n" +" системских ограничења, чак и " +"администраторима)\n" +" -f, --force уклања постојеће датотеке одредишта\n" + +#: src/ln.c:419 +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 "" +" -i, --interactive пита да ли да уклони одредишта\n" +" -L, --logical укида упуту МЕТАМА које су симболичке везе\n" +" -n, --no-dereference сматра НАЗИВ_ВЕЗЕ обичном датотеком ако\n" +" је симболичка веза ка директоријуму\n" +" -P, --physical прави чврсте везе непосредно ка симболичким " +"везама\n" +" -r, --relative прави симболичке безе односне на место везе\n" +" -s, --symbolic прави симболичке везе уместо чврстих веза\n" + +#: src/ln.c:428 +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 "" +" -S, --suffix=СУФИКС преписује уобичајени суфикс резерве\n" +" -t, --target-directory=ДИР наводи ДИРЕКТОРИЈУМ у коме ће направити\n" +" везе\n" +" -T, --no-target-directory сматра НАЗИВ_ВЕЗЕ увек обичном датотеком\n" +" -v, --verbose исписује назив сваке повезане датотеке\n" + +#: src/ln.c:450 +#, c-format +msgid "" +"\n" +"Using -s ignores -L and -P. Otherwise, the last option specified controls\n" +"behavior when a TARGET is a symbolic link, defaulting to %s.\n" +msgstr "" +"\n" +"Употреба „-s“ занемарује „-L“ и „-P“. Другачије, последња наведена опција " +"управља\n" +"понашањем када је МЕТА симболичка веза, подразумевајући „%s“.\n" + +#: src/ln.c:571 +#, c-format +msgid "cannot combine --target-directory and --no-target-directory" +msgstr "не могу да помешам „--target-directory“ и „--no-target-directory“" + +#: src/ln.c:605 +#, c-format +msgid "cannot do --relative without --symbolic" +msgstr "не могу да урадим „--relative“ без „--symbolic“" + +#. This is a proper name. See the gettext manual, section Names. +#: src/logname.c:30 +msgid "FIXME: unknown" +msgstr "ПОПРАВИТИ: непознато" + +#: src/logname.c:39 +#, c-format +msgid "Usage: %s [OPTION]\n" +msgstr "Употреба: %s [ОПЦИЈА]\n" + +#: src/logname.c:40 +msgid "" +"Print the name of the current user.\n" +"\n" +msgstr "" +"Испсиује име тренутног корисника.\n" +"\n" + +#: src/logname.c:79 +#, 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:737 +msgid "%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. +#. 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:750 +msgid "%b %e %H:%M" +msgstr "%e. %b. у %H:%M" + +#: src/ls.c:1599 +#, c-format +msgid "ignoring invalid width in environment variable COLUMNS: %s" +msgstr "занемарујем неисправну ширину у променљивој окружења „СТУПЦИ“: %s" + +#: src/ls.c:1629 +#, c-format +msgid "ignoring invalid tab size in environment variable TABSIZE: %s" +msgstr "" +"занемарујем неисправну величину табулатора у променљивој окружења " +"„ВЕЛИЧИНАТАБУЛАТОРА“: %s" + +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" +msgstr "неисправна ширина реда: %s" + +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" +msgstr "неисправна величина табулатора: %s" + +#: src/ls.c:2021 +#, c-format +msgid "invalid time style format %s" +msgstr "неисправан запис времена „%s“" + +#: src/ls.c:2045 +msgid "Valid arguments are:\n" +msgstr "Исправни аргументи су:\n" + +#: src/ls.c:2049 +msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" +msgstr " - +ЗАПИС (нпр., +%H:%M) за запис „date“ (датума)\n" + +#: src/ls.c:2084 +#, c-format +msgid "error initializing month strings" +msgstr "грешка покретања ниски месеца" + +#: src/ls.c:2428 +#, c-format +msgid "unrecognized prefix: %s" +msgstr "непознат префикс: %s" + +#: src/ls.c:2458 +#, c-format +msgid "unparsable value for LS_COLORS environment variable" +msgstr "необрадљива вредност за променљиву окружења „LS_COLORS“" + +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" +"занемарујем неисправну вредност променљиве окружења „СТИЛ_ИСТИЦАЊА“: %s" + +#: src/ls.c:2554 src/pwd.c:164 +#, c-format +msgid "cannot open directory %s" +msgstr "не могу да отворим директоријум „%s“" + +#: src/ls.c:2569 +#, c-format +msgid "cannot determine device and inode of %s" +msgstr "не могу да одредим уређај и и-чвор за „%s“" + +#: src/ls.c:2578 +#, c-format +msgid "%s: not listing already-listed directory" +msgstr "%s: не исписујем већ исписани директоријум" + +#: src/ls.c:2655 src/pwd.c:232 +#, c-format +msgid "reading directory %s" +msgstr "читам директоријум „%s“" + +#: src/ls.c:2670 +#, c-format +msgid "closing directory %s" +msgstr "затварам директоријум „%s“" + +#: src/ls.c:3355 +#, c-format +msgid "cannot compare file names %s and %s" +msgstr "не могу упоредим називе датотека „%s“ и „%s“" + +#: src/ls.c:4775 +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 "" +"Исписује податке о ДАТОТЕКАМА (текући директоријум по основи).\n" +"Ређа уносе азбучним редом ако није наведено ни „-cftuvSUX“ ни „--sort“.\n" + +#: src/ls.c:4782 +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 "" +" -a, --all не занемарује уносе који почињу тачком (.)\n" +" -A, --almost-all не исписује подразумевану . и ..\n" +" --author са „-l“, исписује аутора сваке датотеке\n" +" -b, --escape исписује завршетке у Ц-стилу за неграфичке " +"знакове\n" + +#: src/ls.c:4788 +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 "" +" --block-size=ВЕЛИЧИНА сразмерава величине ВЕЛИЧИНОМ пре њиховог " +"исписивања; нпр.,\n" +" „--block-size=M“ исписује величине у " +"јединицама од\n" +" 1,048,576 бајта; видите запис ВЕЛИЧИНЕ испод\n" +" -B, --ignore-backups не исписује подразумеване уносе који се " +"завршавају на ~\n" +" -c са „-lt“: ређа према, и показује, " +"„ctime“ (време последње\n" +" измене података стања датотеке);\n" +" са „-l“: показује „ctime“ и ређа према " +"називу;\n" +" у супротном: ређа према „ctime“-у, прво " +"новије\n" + +#: src/ls.c:4798 +#, fuzzy +msgid "" +" -C list entries by columns\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" +" -d, --directory list directories themselves, not their " +"contents\n" +" -D, --dired generate output designed for Emacs' dired mode\n" +msgstr "" +" -C исписује уносе према ступцима\n" +" --color[=КАДА] обојава излаз; КАДА може бити „never“ — никада, " +"„auto“ — самостално,\n" +" или „always“ — увек (основно); више података " +"испод\n" +" -d, --directory исписује саме директоријуме, а не њихов " +"садржај\n" +" -D, --dired ствара излаз осмишљен за Емаксов тешки режим\n" + +#: src/ls.c:4807 +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 "" +" -f не ређа, укључује „-aU“, искључује „-ls --" +"color“\n" +" -F, --classify придодаје указивач (један од */=>@|) уносима\n" +" --file-type слично, осим што не придодаје *\n" +" --format=РЕЧ кроз „-x“, зарези „-m“, водоравно „-x“, дуго „-" +"l“,\n" +" један стубац „-1“, опширно „-l“, усправно „-" +"C“\n" +" --full-time као „-l --time-style=full-iso“\n" + +#: src/ls.c:4815 +msgid " -g like -l, but do not list owner\n" +msgstr " -g као „-l“, али не исписује власника\n" + +#: src/ls.c:4818 +msgid "" +" --group-directories-first\n" +" group directories before files;\n" +" can be augmented with a --sort option, but " +"any\n" +" use of --sort=none (-U) disables grouping\n" +msgstr "" +" --group-directories-first\n" +" групише директоријуме пре датотека;\n" +" може бити повећано опцијом „--sort“, али " +"свако\n" +" коришћење „--sort=none (-U)“ искључује " +"груписање\n" + +#: src/ls.c:4824 +msgid "" +" -G, --no-group in a long listing, don't print group names\n" +" -h, --human-readable with -l and/or -s, print human readable sizes\n" +" (e.g., 1K 234M 2G)\n" +" --si likewise, but use powers of 1000 not 1024\n" +msgstr "" +" -G, --no-group при дугим списковима, не исписује називе група\n" +" -h, --human-readable са „-l“ и/или „-s“, исписује људима читљиве " +"величине\n" +" (нпр., 1K 234M 2G)\n" +" --si слично, али користе степене од 1000 а не 1024\n" + +#: src/ls.c:4830 +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 "" +" -H, --dereference-command-line\n" +" прати симболичке везе исписане на линији " +"наредби\n" +" --dereference-command-line-symlink-to-dir\n" +" прати сваку симболичку везу линије наредби\n" +" која указује на директоријум\n" +" --hide=ШАБЛОН не исписује подразумеване уносе који одговарају " +"ШАБЛОНУ шкољке\n" +" (превазиђено са „-a“ или „-A“)\n" + +#: src/ls.c:4840 +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 default to 1024-byte blocks for disk usage\n" +msgstr "" +" --indicator-style=РЕЧ придодаје указивач са стилом РЕЧИ на називе " +"уноса:\n" +" ништа (основно), коса црта (-p),\n" +" врста датотеке (--file-type), разврстај (-F)\n" +" -i, --inode исписује број индекса сваке датотеке\n" +" -I, --ignore=ШАБЛОН не исписује подразумеване уносе који одговарају " +"ШАБЛОНУ шкољке\n" +" -k, --kibibytes основност за 1024-бајтне блокове за коришћење " +"диска\n" + +#: src/ls.c:4850 +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 "" +" -l користи дуги запис списка\n" +" -L, --dereference када показује податке о датотеци за симболичку\n" +" везу, показује податке за датотеку на коју " +"упућује\n" +" веза уместо са саму везу\n" +" -m испуњава ширину зарезом раздвојеним списком " +"уноса\n" + +#: src/ls.c:4858 +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 "" +" -n, --numeric-uid-gid као „-l“, али исписује бројчане кориснике и ИБ-" +"ове група\n" +" -N, --literal исписује сирове називе уноса (не сматра нпр. " +"знакове\n" +" управљања нарочитим)\n" +" -o као „-l“, али не исписује податке о групи\n" +" -p, --indicator-style=коса црта\n" +" придодаје указник / директоријумима\n" + +#: src/ls.c:4866 +msgid "" +" -q, --hide-control-chars print ? instead of nongraphic characters\n" +" --show-control-chars show nongraphic characters as-is (the default,\n" +" unless program is 'ls' and output is a " +"terminal)\n" +" -Q, --quote-name enclose entry names in double quotes\n" +" --quoting-style=WORD use quoting style WORD for entry names:\n" +" literal, locale, shell, shell-always, c, " +"escape\n" +msgstr "" +" -q, --hide-control-ЗНАКs исписује ? уместо неграфичких знакова\n" +" --show-control-ЗНАКs приказује неграфичке знакове кавим јесу " +"(основно,\n" +" осим ако програм није „ls“ а излаз терминал)\n" +" -Q, --quote-name ставља називе уноса под двоструке наводнике\n" +" --quoting-style=РЕЧ користи РЕЧ стила цитирања за називе уноса:\n" +" literal, locale, shell, shell-always, c, " +"escape\n" + +#: src/ls.c:4876 +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 прокреће редослед приликом ређања\n" +" -R, --recursive исписује поддиректоријуме дубински\n" +" -s, --size исписује додељену величину сваке датотеке, у " +"блоковима\n" + +#: src/ls.c:4881 +#, fuzzy +msgid "" +" -S sort by file size, largest first\n" +" --sort=WORD sort by WORD instead of name: none (-U), size (-" +"S),\n" +" time (-t), version (-v), extension (-X)\n" +" --time=WORD with -l, show time as WORD instead of default\n" +" modification time: atime or access or use (-" +"u);\n" +" ctime or status (-c); also use specified " +"time\n" +" as sort key if --sort=time (newest first)\n" +msgstr "" +" -S ређа према величини датотеке\n" +" --sort=РЕЧ ређа према РЕЧИ уместо према називу: ништа (-" +"U), величина (-S),\n" +" време (-t), издање (-v), проширење (-X)\n" +" --time=РЕЧ са „-l“, приказује време као РЕЧ уместо " +"основног\n" +" времена измене: „atime“ или приступ или " +"користи „(-u)\n" +" ctime“ или стање (-c); такође користи " +"наведено време\n" +" као кључ ређања ако је „--sort=време“\n" + +#: src/ls.c:4892 +msgid "" +" --time-style=STYLE with -l, show times using style STYLE:\n" +" full-iso, long-iso, iso, locale, or +FORMAT;\n" +" FORMAT is interpreted like in 'date'; if " +"FORMAT\n" +" is FORMAT1FORMAT2, then FORMAT1 " +"applies\n" +" to non-recent files and FORMAT2 to recent " +"files;\n" +" if STYLE is prefixed with 'posix-', STYLE\n" +" takes effect only outside the POSIX locale\n" +msgstr "" +" --time-style=СТИЛ са „-l“, приказује времена користећи стил СТИЛ:\n" +" пуни-исо, дуги-исо, исо, језик, или +ЗАПИС;\n" +" ЗАПИС се тумачи као у „date“; ако је ЗАПИС\n" +" ЗАПИС1<нови_ред>ЗАПИС2, тада се ЗАПИС1 " +"примењује\n" +" на не-скорашње датотеке а ЗАПИС2 на " +"скорашње;\n" +" ако је СТИЛ са префиксом „posix-“, СТИЛ\n" +" ступа у дејство само изван језика ПОСИКСА\n" + +#: src/ls.c:4904 +msgid "" +" -t sort by modification time, newest first\n" +" -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" +msgstr "" +" -t ређа према времену измене, прво новије\n" +" -T, --tabsize=СТУПЦИ подразумева застој табулатора на сваком СТУПЦУ " +"уместо на 8\n" + +#: src/ls.c:4908 +#, fuzzy +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, newest first\n" +" -U do not sort; list entries in directory order\n" +" -v natural sort of (version) numbers within text\n" +msgstr "" +" -u са „-lt“: ређа према, и приказује, време " +"приступа;\n" +" са „-l“: приказује време приступа и ређа " +"према називу;\n" +" у супротном: ређа према времену приступа\n" +" -U не ређа; исписује уносе поретку директоријума\n" +" -v природно ређање бројева (издања) у тексту\n" + +#: src/ls.c:4915 +#, fuzzy +msgid "" +" -w, --width=COLS assume screen width instead of current value\n" +" -x list entries by lines instead of by columns\n" +" -X sort alphabetically by entry extension\n" +" -Z, --context print any security context of each file\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" +msgstr "" +" -w, --width=СТУПЦИ подразумева ширину екрана уместо текуће " +"вредности\n" +" -x исписује уносе по редовима уместо по ступцима\n" +" -X ређа азбучним редом према проширењу уноса\n" +" -Z, --context исписује сваки безбедносни садржај сваке " +"датотеке\n" +" -1 исписује једну датотеку у реду\n" + +#: src/ls.c:4926 +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 "" +"\n" +"Коришћење боје за разликовање врста датотека је искључено и по основи и\n" +"са „--color=never“. Са „--color=auto“, „ls“ издаје кодове боје само када\n" +"је стандардни излаз повезан на терминал. Променљива окружења „LS_COLORS“\n" +"може да измени подешавања. Користите наредбу „dircolors“ да их подесите.\n" + +#: src/ls.c:4933 +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 "" +"\n" +"Стања излаза:\n" +" 0 ако је у реду,\n" +" 1 за мање проблеме (нпр., не може приступити поддиректоријуму),\n" +" 2 за озбиљне проблеме (нпр., не може приступити аргументу линије " +"наредби).\n" + +#. 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 +#, fuzzy, c-format +msgid "" +"Usage: %s [OPTION]... [FILE]...\n" +"Print or check %s (%d-bit) checksums.\n" +msgstr "" +"Употреба: %s [ОПЦИЈА]... [ДАТОТЕКА]...\n" +"Исписује или проверава „%s“ (%d-бит) суме провере.\n" +"Без ДАТОТЕКЕ, или када је ДАТОТЕКА -, чита стандардни улаз.\n" +"\n" + +#: src/md5sum.c:175 +#, fuzzy +msgid "" +"\n" +" -b, --binary read in binary mode (default unless reading tty " +"stdin)\n" +msgstr "" +" -b, --binary чита у извршном режиму (основно је осим ако не чита " +"са стандардног улаза конзоле)\n" + +#: src/md5sum.c:180 +#, fuzzy +msgid "" +"\n" +" -b, --binary read in binary mode\n" +msgstr " -b, --binary чита у извршном режиму\n" + +#: src/md5sum.c:184 +#, c-format +msgid " -c, --check read %s sums from the FILEs and check them\n" +msgstr " -c, --check чита суме „%s“ из ДАТОТЕКЕ и проверава их\n" + +#: src/md5sum.c:187 +msgid " --tag create a BSD-style checksum\n" +msgstr " --tag ствара суму провере у БСД стилу\n" + +#: src/md5sum.c:191 +msgid "" +" -t, --text read in text mode (default if reading tty stdin)\n" +msgstr "" +" -t, --text чита у текстуалном режиму (основно је ако чита са " +"стандардног улаза конзоле)\n" + +#: src/md5sum.c:195 +msgid " -t, --text read in text mode (default)\n" +msgstr " -t, --text чита у текстуалном режиму (основно)\n" + +#: src/md5sum.c:198 +msgid "" +"\n" +"The following four options are useful only when verifying checksums:\n" +" --quiet don't print OK for each successfully verified file\n" +" --status don't output anything, status code shows success\n" +" --strict exit non-zero for improperly formatted checksum " +"lines\n" +" -w, --warn warn about improperly formatted checksum lines\n" +"\n" +msgstr "" +"\n" +"Следеће четири опције су корисне само приликом проверавања сума провере:\n" +" --quiet не исписује У реду за сваку успешно проверену " +"датотеку\n" +" --status не даје никакав излаз, код стања приказује успех\n" +" --strict излази са не-нулом за неисправно обликоване редове " +"суме провере\n" +" -w, --warn упозорава о неисправно обликованим редовима суме " +"провере\n" +"\n" + +#: src/md5sum.c:209 +#, fuzzy, 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 a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" +msgstr "" +"\n" +"Суме се израчунавају као што је описано у „%s“. Приликом провере, улаз\n" +"треба да буде бивши излаз тог програма. Основни режим је исписивање реда\n" +"сумом провере, знак који указује на улазни режим (* за извршне, размак\n" +"за текст), и назив за сваку ДАТОТЕКУ.\n" + +#: src/md5sum.c:524 +#, c-format +msgid "%s: too many checksum lines" +msgstr "%s: превише редова суме провере" + +#: src/md5sum.c:548 +#, c-format +msgid "%s: %: improperly formatted %s checksum line" +msgstr "%s: %: неисправно обликован „%s“ ред суме провере" + +#: src/md5sum.c:573 +#, c-format +msgid "%s: FAILED open or read\n" +msgstr "%s: НЕУСПЕЛО отварање или читање\n" + +#: src/md5sum.c:596 +msgid "FAILED" +msgstr "НЕУСПЕХ" + +#: src/md5sum.c:598 +msgid "OK" +msgstr "У реду" + +#: src/md5sum.c:622 +#, c-format +msgid "%s: no properly formatted %s checksum lines found" +msgstr "%s: нису пронађени исправно обликовани „%s“ редови суме провере" + +#: src/md5sum.c:632 +#, c-format +msgid "WARNING: % line is improperly formatted" +msgid_plural "WARNING: % lines are improperly formatted" +msgstr[0] "УПОЗОРЕЊЕ: % ред је неисправно обликован" +msgstr[1] "УПОЗОРЕЊЕ: % реда су неисправно обликована" +msgstr[2] "УПОЗОРЕЊЕ: % редова је неисправно обликовано" + +#: src/md5sum.c:640 +#, c-format +msgid "WARNING: % listed file could not be read" +msgid_plural "WARNING: % listed files could not be read" +msgstr[0] "УПОЗОРЕЊЕ: % исписана датотека не може бити прочитана" +msgstr[1] "УПОЗОРЕЊЕ: % исписане датотеке не могу бити прочитане" +msgstr[2] "УПОЗОРЕЊЕ: % исписаних датотека не може бити прочитано" + +#: src/md5sum.c:648 +#, c-format +msgid "WARNING: % computed checksum did NOT match" +msgid_plural "WARNING: % computed checksums did NOT match" +msgstr[0] "УПОЗОРЕЊЕ: % израчуната провера суме НЕ одговара" +msgstr[1] "УПОЗОРЕЊЕ: % израчунате провере суме НЕ одговарају" +msgstr[2] "УПОЗОРЕЊЕ: % израчунатих провера суме НЕ одговара" + +#: src/md5sum.c:767 +#, c-format +msgid "--tag does not support --text mode" +msgstr "„--tag“ не подржава „--text“ режим" + +#: src/md5sum.c:773 +#, c-format +msgid "the --tag option is meaningless when verifying checksums" +msgstr "опција „--tag“ нема смисла приликом проверавања сума провере" + +#: src/md5sum.c:780 +#, c-format +msgid "" +"the --binary and --text options are meaningless when verifying checksums" +msgstr "" +"опције „--binary“ и „--text“ немају смисла приликом проверавања сума провере" + +#: src/md5sum.c:788 +#, c-format +msgid "the --status option is meaningful only when verifying checksums" +msgstr "опција „--status“ има смисла само приликом проверавања сума провере" + +#: src/md5sum.c:795 +#, c-format +msgid "the --warn option is meaningful only when verifying checksums" +msgstr "опција „--warn“ има смисла само приликом проверавања сума провере" + +#: src/md5sum.c:802 +#, c-format +msgid "the --quiet option is meaningful only when verifying checksums" +msgstr "опција „--quiet“ има смисла само приликом проверавања сума провере" + +#: src/md5sum.c:809 +#, c-format +msgid "the --strict option is meaningful only when verifying checksums" +msgstr "опција „--strict“ има смисла само приликом проверавања сума провере" + +#: src/mkdir.c:58 src/rmdir.c:164 +#, c-format +msgid "Usage: %s [OPTION]... DIRECTORY...\n" +msgstr "Употреба: %s [ОПЦИЈА]... ДИРЕКТОРИЈУМ...\n" + +#: src/mkdir.c:59 +msgid "Create the DIRECTORY(ies), if they do not already exist.\n" +msgstr "Прави ДИРЕКТОРИЈУМ(Е), ако већ не постоје.\n" + +#: src/mkdir.c:65 +msgid "" +" -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" +" -p, --parents no error if existing, make parent directories as needed\n" +" -v, --verbose print a message for each created directory\n" +msgstr "" +" -m, --mode=РЕЖИМ поставља режим датотеке (као у „chmod“-у), а не „a=rwx - " +"umask“\n" +" -p, --parents без грешака ако постоје, прави родитељске директоријуме " +"као што је потребно\n" +" -v, --verbose исписује поруку за сваки направљени директоријум\n" + +#: src/mkdir.c:70 +msgid "" +" -Z set SELinux security context of each created " +"directory\n" +" to the default type\n" +" --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n" +" or SMACK security context to CTX\n" +msgstr "" +" -Z подешава СЕЛинукс безбедносни садржај сваког " +"створеног директоријума\n" +" на основну вредност\n" +" --context[=СДРЖ] као „-Z“, или ако је наведен СДРЖ тада подешава\n" +" СЕЛинукс или СМАЦК безбедносни садржај на СДРЖ\n" + +#: src/mkdir.c:127 src/mkdir.c:160 +#, c-format +msgid "failed to set default creation context for %s" +msgstr "нисам успео да подесим основни контекст стварања за „%s“" + +#: src/mkdir.c:180 +#, c-format +msgid "failed to restore context for %s" +msgstr "нисам успео да повратим контекст за „%s“" + +#: src/mkdir.c:220 +#, c-format +msgid "created directory %s" +msgstr "направих директоријум „%s“" + +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 +#, c-format +msgid "" +"warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" +msgstr "" +"упозорење: занемарујем „--context“; захтева СЕЛинукс/СМАЦК-укључено језгро" + +#: src/mkfifo.c:53 src/pathchk.c:89 +#, c-format +msgid "Usage: %s [OPTION]... NAME...\n" +msgstr "Употреба: %s [ОПЦИЈА]... НАЗИВ...\n" + +#: src/mkfifo.c:54 +msgid "Create named pipes (FIFOs) with the given NAMEs.\n" +msgstr "Прави именоване спојке (ПУПН-е) са датим НАЗИВОМ(има).\n" + +#: src/mkfifo.c:60 src/mknod.c:62 +msgid "" +" -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" +msgstr "" +" -m, --mode=РЕЖИМ поставља бите овлашћења датотеке на РЕЖИМ, а не „a=rw - " +"umask“\n" + +#: src/mkfifo.c:63 src/mknod.c:65 +msgid "" +" -Z set the SELinux security context to default type\n" +" --context[=CTX] like -Z, or if CTX is specified then set the SELinux\n" +" or SMACK security context to CTX\n" +msgstr "" +" -Z подешава безбедносни садржај СЕЛинукса на основну " +"врсту\n" +" --context[=СДРЖ] као -Z, или ако је СДРЖ наведено тада подешава " +"СЕЛинукс\n" +" или СМАЦК безбедносни садржај на СДРЖ\n" + +#: src/mkfifo.c:153 src/mknod.c:150 +#, c-format +msgid "invalid mode" +msgstr "неисправан режим" + +#: src/mkfifo.c:160 src/mknod.c:157 +#, c-format +msgid "mode must specify only file permission bits" +msgstr "режим мора навести само битове овлашћења датотеке" + +#: src/mkfifo.c:174 src/mknod.c:269 +#, c-format +msgid "cannot set permissions of %s" +msgstr "не могу да подесим овлашћења за „%s“" + +#: src/mknod.c:54 +#, c-format +msgid "Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n" +msgstr "Употреба: %s [ОПЦИЈА]... НАЗИВ ВРСТА [ВЕЋИ МАЊИ]\n" + +#: src/mknod.c:56 +msgid "Create the special file NAME of the given TYPE.\n" +msgstr "Прави посебан НАЗИВ датотеке дате ВРСТЕ.\n" + +#: src/mknod.c:72 +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 "" +"\n" +"И ВЕЋИ и МАЊИ морају бити наведени када је ВРСТА „b“, „c“, или „u“, а " +"морају\n" +"бити изостављени кад је ВРСТА „p“. Ако ВЕЋИ или МАЊИ почиње на 0x или 0X,\n" +"тумачи се као хексадецимални; у супротном, ако почиње 0, као октални;\n" +"у супротном, као децимални. ВРСТА може бити:\n" + +#: src/mknod.c:79 +msgid "" +"\n" +" b create a block (buffered) special file\n" +" c, u create a character (unbuffered) special file\n" +" p create a FIFO\n" +msgstr "" +"\n" +" b прави блоковну (међумемориссану) посебну датотеку\n" +" c, u прави знаковну (немеђумемориссану) посебну датотеку\n" +" p прави ПУПН\n" + +#: src/mknod.c:175 +msgid "Special files require major and minor device numbers." +msgstr "Посебне датотеке захтевају већи и мањи број уређаја." + +#: src/mknod.c:185 +msgid "Fifos do not have major and minor device numbers." +msgstr "ПУПН-и немају већи и мањи број уређаја." + +#: src/mknod.c:210 +#, c-format +msgid "block special files not supported" +msgstr "блоковне посебне датотеке нису подржане" + +#: src/mknod.c:219 +#, c-format +msgid "character special files not supported" +msgstr "знаковне посебне датотеке нису подржане" + +#: src/mknod.c:235 +#, c-format +msgid "invalid major device number %s" +msgstr "неисправан већи број уређаја %s" + +#: src/mknod.c:240 +#, c-format +msgid "invalid minor device number %s" +msgstr "неисправан мањи број уређаја %s" + +#: src/mknod.c:245 +#, c-format +msgid "invalid device %s %s" +msgstr "неисправан уређај %s %s" + +#: src/mknod.c:264 +#, c-format +msgid "invalid device type %s" +msgstr "неисправна врста уређаја „%s“" + +#. This is a proper name. See the gettext manual, section Names. +#: src/mktemp.c:36 +msgid "Eric Blake" +msgstr "Ерик Блејк" + +#: src/mktemp.c:66 +#, c-format +msgid "Usage: %s [OPTION]... [TEMPLATE]\n" +msgstr "Употреба: %s [ОПЦИЈА]... [ШАБЛОН]\n" + +#: src/mktemp.c:67 +msgid "" +"Create a temporary file or directory, safely, and print its name.\n" +"TEMPLATE must contain at least 3 consecutive 'X's in last component.\n" +"If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.\n" +msgstr "" +"Прави привремену датотеку или директоријум, безбедно, и исписује назив.\n" +"ШАБЛОН мора да садржи најмање 3 „X“ за редом у последњем састојку.\n" +"Ако ШАБЛОН није наведен, користи „tmp.XXXXXXXXXX“, а „--tmpdir“ се " +"подразумева.\n" + +#: src/mktemp.c:72 +msgid "" +"Files are created u+rw, and directories u+rwx, minus umask restrictions.\n" +msgstr "" +"Датотеке су направљене са „u+rw“, а директоријуми са „u+rwx“, минус " +"ограничења умаска.\n" + +#: src/mktemp.c:76 +msgid "" +" -d, --directory create a directory, not a file\n" +" -u, --dry-run do not create anything; merely print a name (unsafe)\n" +" -q, --quiet suppress diagnostics about file/dir-creation failure\n" +msgstr "" +" -d, --directory прави директоријум, а не датотеку\n" +" -u, --dry-run не прави ништа; само исписује назив (несигурно)\n" +" -q, --quiet потискује дијагнозу о неуспеху стварања датотеке/" +"директоријума\n" + +#: src/mktemp.c:81 +msgid "" +" --suffix=SUFF append SUFF to TEMPLATE; SUFF must not contain a " +"slash.\n" +" This option is implied if TEMPLATE does not end in " +"X\n" +msgstr "" +" --suffix=СУФ додаје СУФИКС на ШАБЛОН; СУФИКС не сме садржати косу " +"црту.\n" +" Ова опција се подразумева ако се ШАБЛОН не завршава " +"на X\n" + +#: src/mktemp.c:85 +msgid "" +" -p DIR, --tmpdir[=DIR] interpret TEMPLATE relative to DIR; if DIR is not\n" +" specified, use $TMPDIR if set, else /tmp. With\n" +" this option, TEMPLATE must not be an absolute name;\n" +" unlike with -t, TEMPLATE may contain slashes, but\n" +" mktemp creates only the final component\n" +msgstr "" +" -p ДИР, --tmpdir[=ДИР] тумачи ШАБЛОН односан на ДИР; ако ДИР није " +"наведен,\n" +" користи „$TMPDIR“ ако је подешен, у супротном „/" +"tmp. Са\n" +" овом опцијом, ШАБЛОН не сме бити апсолутни назив;\n" +" осим са „-t“, ШАБЛОН може да садржи косе црте, али\n" +" „mktemp“ прави само крајњи састојак\n" + +#: src/mktemp.c:92 +msgid "" +" -t interpret TEMPLATE as a single file name component,\n" +" relative to a directory: $TMPDIR, if set; else the\n" +" directory specified via -p; else /tmp [deprecated]\n" +msgstr "" +" -t тумачи ШАБЛОН као један састојак назива датотеке,\n" +" односан на директоријум: „$TMPDIR“, ако је подешено; " +"другачије\n" +" директоријум наведен путем „-p“; у супротном „/" +"tmp“ [застарело]\n" + +#: src/mktemp.c:210 +#, c-format +msgid "too many templates" +msgstr "превише шаблона" + +#: src/mktemp.c:230 +#, c-format +msgid "with --suffix, template %s must end in X" +msgstr "са „--suffix“, шаблон „%s“ се мора завршити на Х" + +#: src/mktemp.c:255 src/split.c:1266 +#, c-format +msgid "invalid suffix %s, contains directory separator" +msgstr "неисправан суфикс „%s“, садржи раздвојник директоријума" + +#: src/mktemp.c:260 +#, c-format +msgid "too few X's in template %s" +msgstr "премало Х-а у шаблону „%s“" + +#: src/mktemp.c:276 +#, c-format +msgid "invalid template, %s, contains directory separator" +msgstr "неисправан шаблон, %s, садржи раздвојник директоријума" + +#: src/mktemp.c:290 +#, c-format +msgid "invalid template, %s; with --tmpdir, it may not be absolute" +msgstr "неисправан шаблон, %s; са „--tmpdir“, не сме бити апсолутан" + +#: src/mktemp.c:311 +#, c-format +msgid "failed to create directory via template %s" +msgstr "нисам успео да направим директоријум из шаблона „%s“" + +#: src/mktemp.c:322 +#, c-format +msgid "failed to create file via template %s" +msgstr "нисам успео да направим датотеку из шаблона „%s“" + +#: src/mv.c:294 +msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" +msgstr "" +"Преименујте ИЗВОР у ОДРЕДИШТЕ, или преместите ИЗВОР(е) у ДИРЕКТОРИЈУМ.\n" + +#: src/mv.c:300 +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 "" +" --backup[=УПРАВЉАЊЕ] прави резерву сваке постојеће одредишне " +"датотеке\n" +" -b као „--backup“ али не прихвата аргумент\n" +" -f, --force не поставља упит пре преписивања\n" +" -i, --interactive поставља упит пре преписивања\n" +" -n, --no-clobber не пише преко постојеће датотеке\n" +"Ако наведете више од једног „-i“, „-f“, „-n“, само крајње ће имати дејства.\n" + +#: src/mv.c:309 +msgid "" +" --strip-trailing-slashes remove any trailing slashes from each " +"SOURCE\n" +" argument\n" +" -S, --suffix=SUFFIX override the usual backup suffix\n" +msgstr "" +" --strip-trailing-slashes уклања све пратеће косе црте из сваког " +"аргумента\n" +" ИЗВОРА\n" +" -S, --suffix=СУФИКС заобилази уобичајени суфикс резерве\n" + +#: src/mv.c:314 +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" +" -Z, --context set SELinux security context of destination\n" +" file to default type\n" +msgstr "" +" -t, --target-directory=ДИР премешта све аргументе ИЗВОРА у ДИРЕКТОРИЈУМ\n" +" -T, --no-target-directory сматра ОДРЕДИШТЕ обичном датотеком\n" +" -u, --update премешта само када је датотека ИЗВОРА новија\n" +" од датотеке одредишта или када\n" +" недостаје датотека одредишта\n" +" -v, --verbose објашњава шата је урађено\n" +" -Z, --context поставља безбедносни садржај СЕЛинукса " +"одредишне\n" +" датотеке на основну врсту\n" + +#: src/nice.c:72 +#, c-format +msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" +msgstr "Употреба: %s [ОПЦИЈА] [НАРЕДБА [АРГ]...]\n" + +#: 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 "" +"Покреће НАРЕДБУ са дотераном финоћом, која утиче на заказивање процеса.\n" +"Без НАРЕДБЕ, испсиује текућу финоћу. Вредност финоће иде од %d " +"(најприкладније за процес) до %d (најмање прикладно за процес).\n" + +#: 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: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" +msgstr "" +"Пише сваку ДАТОТЕКУ на стандардни излаз, са додатим бројевима редова\n" +"Без ДАТОТЕКЕ, или када је ДАТОТЕКА -, чита стандардни улаз.\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 "" +" -b, --body-numbering=СТИЛ користи СТИЛ за нумерисање редова разраде\n" +" -d, --section-delimiter=ЦЦ користи ЦЦ за раздвајање логичких страница\n" +" -f, --footer-numbering=СТИЛ користи СТИЛ за нумерисање редова подножја\n" + +#: 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 "" +" -h, --header-numbering=СТИЛ користи СТИЛ за нумерисање редова заглавља\n" +" -i, --line-increment=БРОЈ повећање броја реда на сваком реду\n" +" -l, --join-blank-lines=БРОЈ група од БРОЈ празних редова бројана као " +"један\n" +" -n, --number-format=ЗАПИС умеће бројеве редова у складу са ЗАПИСОМ\n" +" -p, --no-renumber не поставља поново бројеве редова на " +"логичким страницама\n" +" -s, --number-separator=НИСКА додаје НИСКУ након (могућег) броја реда\n" + +#: 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=NБРОЈ први број реда на свакој логичкој " +"страници\n" +" -w, --number-width=БРОЈ користи БРОЈ стубаца за бројеве редова\n" + +#: 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 "" +"\n" +"По основи, бира „-v1 -i1 -l1 -sTAB -w6 -nrn -hn -bt -fn“. ЦЦ су\n" +"два знака ограничавача за раздвајање логичких страница, недостајући\n" +"други знак подразумева :. Куцајте \\\\ за \\. СТИЛ је један од:\n" + +#: 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 "" +"\n" +" a нумерише све редове\n" +" t нумерише само не празне редове\n" +" n не нумерише редове\n" +" pBRE нумерише само редове који садрже поклапање за основни регуларни\n" +" израз, „BRE“\n" +"\n" +"ЗАПИС је један од:\n" +"\n" +" ln лево поравнање, без водећих нула\n" +" rn десно поравнање, без водећих нула\n" +" rz десно поравнање, са водећим нулама\n" +"\n" + +#: src/nl.c:278 +#, c-format +msgid "line number overflow" +msgstr "прекорачење броја редова" + +#: src/nl.c:478 +#, c-format +msgid "invalid header numbering style: %s" +msgstr "неисправан стил нумерисања заглавља: %s" + +#: src/nl.c:486 +#, c-format +msgid "invalid body numbering style: %s" +msgstr "неисправан стил нумерисања разраде: %s" + +#: src/nl.c:494 +#, c-format +msgid "invalid footer numbering style: %s" +msgstr "неисправан стил нумерисања подножја: %s" + +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" +msgstr "неисправан почетни број реда: %s" + +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" +msgstr "неисправно повећање броја реда: %s" + +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" +msgstr "неисправан број празних редова: %s" + +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" +msgstr "неисправна ширина поља броја реда: %s" + +#: src/nl.c:531 +#, c-format +msgid "invalid line numbering format: %s" +msgstr "неисправан запис нумерисања реда: %s" + +#: src/nohup.c:53 +#, c-format +msgid "" +"Usage: %s COMMAND [ARG]...\n" +" or: %s OPTION\n" +msgstr "" +"Употреба: %s НАРЕДБА [АРГ]...\n" +" или: %s ОПЦИЈА\n" + +#: src/nohup.c:59 +msgid "" +"Run COMMAND, ignoring hangup signals.\n" +"\n" +msgstr "" +"Покреће НАРЕДБУ, занемарујући сигнале прекида.\n" +"\n" + +#: src/nohup.c:65 +#, fuzzy, c-format +msgid "" +"\n" +"If standard input is a terminal, redirect it from an unreadable file.\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 "" +"\n" +"Ако је стандардни улаз терминал, преусмерава га из „/dev/null“-а.\n" +"Ако је стандардни излаз терминал, придодаје излаз на „nohup.out“ ако је " +"могуће,\n" +"у супротном на „$HOME/nohup.out“.\n" +"Ако је стандардна грешка терминал, преусмерава је на стандардни излаз.\n" +"Да сачувате излаз у ДАТОТЕКУ, користите „%s НАРЕДБА > ДАТОТЕКА“.\n" + +#: src/nohup.c:127 +#, c-format +msgid "failed to render standard input unusable" +msgstr "нисам успео да исцртам стандардни улаз бескорисним" + +#: src/nohup.c:129 +#, c-format +msgid "ignoring input" +msgstr "занемарујем улаз" + +#: src/nohup.c:173 +#, c-format +msgid "ignoring input and appending output to %s" +msgstr "занемарујем улаз и придодајем излаз на „%s“" + +#: src/nohup.c:174 +#, c-format +msgid "appending output to %s" +msgstr "придодајем излаз на „%s“" + +#: src/nohup.c:191 +#, c-format +msgid "failed to set the copy of stderr to close on exec" +msgstr "" +"нисам успео да подесим умножак стандардне грешке да се затвори на извршавање" + +#: src/nohup.c:196 +#, c-format +msgid "ignoring input and redirecting stderr to stdout" +msgstr "занемарујем улаз и преусмеравам стандардну грешку на стандардни излаз" + +#: src/nohup.c:197 +#, c-format +msgid "redirecting stderr to stdout" +msgstr "преусмеравам стандардну грешку на стандардни излаз" + +#: src/nohup.c:201 +#, c-format +msgid "failed to redirect standard error" +msgstr "нисам успео да преусмерим стандардну грешку" + +#. This is a proper name. See the gettext manual, section Names. +#: src/nproc.c:33 src/sync.c:34 +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 "Употреба: %s [ОПЦИЈА]...\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 "" +"Исписује број обрађивачких јединица доступних текућем процесу,\n" +"који може бити мањи од броја процесора на мрежи\n" + +#: src/nproc.c:63 +msgid "" +" --all print the number of installed processors\n" +" --ignore=N if possible, exclude N processing units\n" +msgstr "" +" --all исписује број инсталираних процесора\n" +" --ignore=N ако је могуће, искључује N обрађивачких јединица\n" + +#. This is a proper name. See the gettext manual, section Names. +#: src/numfmt.c:42 +msgid "Assaf Gordon" +msgstr "Асаф Гордон" + +#: src/numfmt.c:690 +#, c-format +msgid "value too large to be converted: %s" +msgstr "вредност је превелика за претварање: %s" + +#: src/numfmt.c:694 +#, c-format +msgid "invalid number: %s" +msgstr "неисправан број: %s" + +#: src/numfmt.c:698 +#, c-format +msgid "rejecting suffix in input: %s (consider using --from)" +msgstr "одбацујем суфикс у улазу: %s (размотрите коришћење „--from“)" + +#: src/numfmt.c:702 +#, c-format +msgid "invalid suffix in input: %s" +msgstr "неисправан суфикс на улазу: %s" + +#: src/numfmt.c:706 +#, c-format +msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" +msgstr "недистаје суфикс „i“ на улазу: %s (нпр. Ki/Mi/Gi)" + +#: src/numfmt.c:753 src/numfmt.c:805 +#, c-format +msgid "failed to prepare value '%Lf' for printing" +msgstr "нисам успео да припремим вредност „%Lf“ за исписивање" + +#: src/numfmt.c:854 +#, c-format +msgid "invalid unit size: %s" +msgstr "неисправна величина јединице: %s" + +#: src/numfmt.c:880 +#, c-format +msgid "Usage: %s [OPTION]... [NUMBER]...\n" +msgstr "Употреба: %s [ОПЦИЈА]... [БРОЈ]...\n" + +#: src/numfmt.c:883 +msgid "" +"Reformat NUMBER(s), or the numbers from standard input if none are " +"specified.\n" +msgstr "" +"Преобликује БРОЈ(еве), или бројеве са стандардног улаза ако ниједан није " +"наведен.\n" + +#: src/numfmt.c:887 +msgid " --debug print warnings about invalid input\n" +msgstr " --debug исписује упозорења о неисправном улазу\n" + +#: src/numfmt.c:890 +msgid "" +" -d, --delimiter=X use X instead of whitespace for field delimiter\n" +msgstr " -d, --delimiter=X користи Х уместо празнине за граничник поља\n" + +#: src/numfmt.c:893 +#, fuzzy +msgid "" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" +msgstr " --field=N замењује број у улазном пољу N (основно је 1)\n" + +#: src/numfmt.c:897 +msgid "" +" --format=FORMAT use printf style floating-point FORMAT;\n" +" see FORMAT below for details\n" +msgstr "" +" --format=ЗАПИС користи ЗАПИС покретног зареза у „printf“ стилу;\n" +" видите ЗАПИС испод за појединости\n" + +#: src/numfmt.c:901 +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:905 +msgid "" +" --from-unit=N specify the input unit size (instead of the default " +"1)\n" +msgstr "" +" --from-unit=N одређује улазну величину јединице (уместо основног " +"1)\n" + +#: src/numfmt.c:908 +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" +" (што значи да нема дејства у језику Ц/ПОСИКС)\n" + +#: src/numfmt.c:912 +msgid "" +" --header[=N] print (without converting) the first N header lines;\n" +" N defaults to 1 if not specified\n" +msgstr "" +" ->, --more-than=БРОЈ исписује поруке са више од оволико одредница,\n" +" подразумева се 1 ако није постављено\n" + +#: src/numfmt.c:916 +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:920 +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" + +#: src/numfmt.c:927 +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“ — од нуле " +"(основно), „towards-zero“ — изнад нуле, „nearest“ — најближе\n" + +#: src/numfmt.c:931 +msgid "" +" --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" +" SUFFIX in input numbers\n" +msgstr "" +" --suffix=СУФИКС додаје СУФИКС излазним бројевима, и прихвата изборни\n" +" СУФИКС у улазним бројевима\n" + +#: src/numfmt.c:935 +msgid "" +" --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" +msgstr "" +" --to=ЈЕДИНИЦА самостално сразмерава излазне бројеве на ЈЕДИНИЦУ; " +"видите испод ЈЕДИНИЦУ\n" + +#: src/numfmt.c:938 +msgid "" +" --to-unit=N the output unit size (instead of the default 1)\n" +msgstr " --to-unit=N величина излазне јединице (уместо основног 1)\n" + +#: src/numfmt.c:945 +msgid "" +"\n" +"UNIT options:\n" +msgstr "" +"\n" +"опције ЈЕДИНИЦЕ:\n" + +#: src/numfmt.c:948 +msgid " none no auto-scaling is done; suffixes will trigger an error\n" +msgstr "" +" none не ради се самостално сразмеравање; суфикси ће окинути грешку\n" + +#: src/numfmt.c:951 +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:957 +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:962 +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:967 +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:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Сваки опсег је један од:\n" +"\n" +" N N-ти бајт, знак или поље, бројећи од 1\n" +" N- од N-тог бајта, знака или поља, до краја реда\n" +" N-M од N-тог до M-тог (закључно) бајта, знака или поља\n" +" -M од првог до M-тог (закључно) бајта, знака или поља\n" +"\n" +"Без ДАТОТЕКЕ, или када је ДАТОТЕКА -, чита стандардни улаз.\n" + +#: src/numfmt.c:983 +#, fuzzy, c-format +msgid "" +"\n" +"FORMAT must be suitable for printing one floating-point argument '%f'.\n" +"Optional quote (%'f) will enable --grouping (if supported by current " +"locale).\n" +"Optional width value (%10f) will pad output. Optional zero (%010f) width\n" +"will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" +msgstr "" +"\n" +"ЗАПИС мора бити подесан за исписивање једног аргумента са покретним зарезом " +"„%f“.\n" +"Изборни наводник (%'f) ће укључити „--grouping“ (ако је подржано текућим " +"језиком).\n" +"Изборна вредност ширине (%10f) ће попунити излаз. Изборна нулта (%010f) " +"ширина\n" +"ће нулом попунити број. Изборне негативне вредности (%-10f) ће попунити с " +"лева.\n" + +#: src/numfmt.c:991 +#, 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. Са „--invalid='warn'“ свака грешка претварања се\n" +"дијагностикује, али излазно стање је 0. Са „--invalid='ignore'“ грешке\n" +"претварање се не дијагностикују а излазно стање је 0.\n" + +#: src/numfmt.c:1000 +#, fuzzy, 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 -B1 | %s --header --field 2-4 --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:1053 src/seq.c:228 +#, c-format +msgid "format %s has no %% directive" +msgstr "запис „%s“ нема одредбу „%%“" + +#: src/numfmt.c:1080 +#, c-format +msgid "invalid format %s (width overflow)" +msgstr "неисправан запис „%s“ (прекорачење ширине)" + +#: src/numfmt.c:1085 +#, fuzzy, c-format +msgid "--format padding overriding --padding" +msgstr "„--format“ попуњавање преписује „--padding“" + +#: src/numfmt.c:1104 src/seq.c:245 +#, c-format +msgid "format %s ends in %%" +msgstr "запис „%s“ се завршава у „%%“" + +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "неисправна тачност: %s" + +#: src/numfmt.c:1126 +#, fuzzy, c-format +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" +msgstr "неисправан запис „%s“, одредба мора бити „%%[0]['][-][N]f“" + +#: src/numfmt.c:1134 src/seq.c:252 +#, c-format +msgid "format %s has too many %% directives" +msgstr "запис „%s“ има превише одредби „%%“" + +#: src/numfmt.c:1177 +#, c-format +msgid "invalid suffix in input %s: %s" +msgstr "неисправан суфикс на улазу „%s“: %s" + +#: src/numfmt.c:1206 +#, fuzzy, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" +"вредност је превелика да би била исписана: „%Lg“ (размотрите коришћење „--" +"to“)" + +#: src/numfmt.c:1210 +#, c-format +msgid "value too large to be printed: '%Lg' (consider using --to)" +msgstr "" +"вредност је превелика да би била исписана: „%Lg“ (размотрите коришћење „--" +"to“)" + +#: src/numfmt.c:1219 +#, c-format +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgstr "" +"вредност је превелика да би била исписана: „%Lg“ (не могу да радим са " +"вредностима већим од 999Y)" + +#: src/numfmt.c:1305 +#, c-format +msgid "large input value %s: possible precision loss" +msgstr "велика вредност улаза „%s“: могућ губитак тачности" + +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, c-format +msgid "invalid field value %s" +msgstr "неисправна вредност поља „%s“" + +#: src/numfmt.c:1631 +#, c-format +msgid "invalid padding value %s" +msgstr "неисправна вредност попуњавања „%s“" + +#: src/numfmt.c:1646 +#, fuzzy, c-format +msgid "multiple field specifications" +msgstr "%s: неисправна одредба поља „%s“" + +#: src/numfmt.c:1677 +#, c-format +msgid "invalid header value %s" +msgstr "неисправна вредност заглавља „%s“" + +#: src/numfmt.c:1704 +#, c-format +msgid "--grouping cannot be combined with --format" +msgstr "„--grouping“ не иде заједно са „--format“" + +#: src/numfmt.c:1709 +#, c-format +msgid "no conversion option specified" +msgstr "није наведена опција претварања" + +#: src/numfmt.c:1717 +#, c-format +msgid "grouping cannot be combined with --to" +msgstr "груписање не иде заједно са „--to“" + +#: src/numfmt.c:1719 +#, c-format +msgid "grouping has no effect in this locale" +msgstr "грписање нема дејства у овом језику" + +#: src/numfmt.c:1732 +#, c-format +msgid "--header ignored with command-line input" +msgstr "„--header“ се занемарује са улазом линије наредби" + +#: src/numfmt.c:1757 +#, c-format +msgid "error reading input" +msgstr "грешка читања улаза" + +#: src/numfmt.c:1770 +#, c-format +msgid "failed to convert some of the input numbers" +msgstr "нисам успео да претворим неке од улазних бројева" + +#: src/od.c:321 +#, 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 "" +"Употреба: %s [ОПЦИЈА]... [ДАТОТЕКА]...\n" +" или: %s [-abcdfilosx]... [ДАТОТЕКА] [[+]ПОМЕРАЈ[.][b]]\n" +" ИЛИ: %s --traditional [ОПЦИЈА]... [ДАТОТЕКА] [[+]ПОМЕРАЈ[.][b] [+]" +"[НАТПИС][.][b]]\n" + +#: src/od.c:327 +#, fuzzy +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" +msgstr "" +"\n" +"Пише представљање које није нејасно, окталне бајтове по основи,\n" +"ДАТОТЕКЕ на стандардни излаз. Са више од једним аргументом ДАТОТЕКЕ,\n" +"надовезује их по списковном поретку за стварање улаза.\n" +"Без ДАТОТЕКЕ, или када је ДАТОТЕКА -, чита стандардни улаз.\n" +"\n" + +#: src/od.c:335 +#, 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" +"ако последњи операнд почиње на + или (ако постоје два операнда 2) цифром.\n" +"Операнд ПОМЕРАЈА значи „-j ПОМЕРАЈ“. НАТПИС је псеудо адреса\n" +"на првом исписаном бајту, повећаном када испис напредује.\n" +"За ПОМЕРАЈ и НАТПИС, префикс 0x или 0X означава хексадецималне;\n" +"суфикси могу бити . за окталне и „b“ за умношке од 512.\n" + +#: src/od.c:347 +msgid "" +" -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" +" of [doxn], for Decimal, Octal, Hex or None\n" +" --endian={big|little} swap input bytes according the specified " +"order\n" +" -j, --skip-bytes=BYTES skip BYTES input bytes first\n" +msgstr "" +" -A, --address-radix=РАДИКС излазни запис за помераје датотеке; РАДИКС " +"може бити\n" +" [doxn], за Децимални, Октални, " +"Хексадецимални или Ништа\n" +" --endian={big|little} размењује улазне бајтове у складу са наведеним " +"редоследом\n" +" -j, --skip-bytes=БАЈТОВИ прескаче прво БАЈТОВА улазних бајтова\n" + +#: src/od.c:353 +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=БАЈТОВИ ограничава испис на БАЈТОВИ улазна бајта\n" +" -S БАЈТОВИ, --strings[=БАЈТОВИ] даје ниске од најмање БАЈТОВА графичка " +"знака;\n" +" 3 се подразумева када БАЈТОВИ нису наведени\n" +" -t, --format=ВРСТА бира излазни запис или записе\n" +" -v, --output-duplicates не користи * да означи потискивање реда\n" +" -w[БАЈТОВИ], --width[=БАЈТОВИ] исписује БАЈТОВИ бајта по излазном реду;\n" +" 32 \n" +" --traditional прихвата аргументе у горњем трећем облику\n" + +#: src/od.c:366 +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 printable characters or backslash escapes\n" +" -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“, бира исписиве знакове или крајеве редова контра " +"косе црте\n" +" -d исто као „-t u2“, бира неозначене децималне 2-бајтне јединице\n" + +#: src/od.c:375 +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" +" -i исто као „-t dI“, бира децималне целе бројеве\n" +" -l исто као „-t dL“, бира децималне дуге\n" +" -o исто као „-t o2“, бира окталне 2-бајтне јединице\n" +" -s исто као „-t d2“, бира децималне 2-бајтне јединице\n" +" -x исто као „-t x2“, бира хексадецималне 2-бајтне јединице\n" + +#: src/od.c:383 +msgid "" +"\n" +"\n" +"TYPE is made up of one or more of these specifications:\n" +" a named character, ignoring high-order bit\n" +" c printable character or backslash escape\n" +msgstr "" +"\n" +"\n" +"ВРСТА је направљена од једне или од више ових одредби:\n" +" a именовани знак, занемарујући бит вишег реда\n" +" c исписив знак или крај реда контра косе црте\n" + +#: src/od.c:390 +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 "" +" d[ВЕЛИЧИНА] назначени децимални, ВЕЛИЧИНА бајтова по целом броју\n" +" f[ВЕЛИЧИНА] покретни зарез, ВЕЛИЧИНА бајтова по целом броју\n" +" o[ВЕЛИЧИНА] октални, ВЕЛИЧИНА бајтова по целом броју\n" +" u[ВЕЛИЧИНА] неназначени децимални, ВЕЛИЧИНА бајтова по целом броју\n" +" x[ВЕЛИЧИНА] хексадецимални, ВЕЛИЧИНА бајтова по целом броју\n" + +#: src/od.c:397 +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 "" +"\n" +"ВЕЛИЧИНА је број. За ВРСТУ у [doux], ВЕЛИЧИНА такође може бити „C“ за\n" +"„sizeof(ЗНАК)“, „S“ за „sizeof(short)“, „I“ за „sizeof(int)“ или „L“ за\n" +"„sizeof(long)“. Ако је ВРСТА „f“, ВЕЛИЧИНА такође може бити „F“ за " +"„sizeof(float)“, „D“\n" +"за „sizeof(double)“ или „L“ за „sizeof(long double)“.\n" + +#: src/od.c:404 +msgid "" +"\n" +"Adding a z suffix to any type displays printable characters at the end of\n" +"each output line.\n" +msgstr "" +"\n" +"Додавање суфикса „z“ некој врсти приказује испсиве знакове на крају\n" +"сваког излазног реда.\n" + +#: src/od.c:409 +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" +"\n" +"БАЈТОВИ су хексадецимални са префиксом 0x или 0X, и могу имати умножавајући " +"суфикс:\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:683 src/od.c:803 +#, c-format +msgid "invalid type string %s" +msgstr "неисправна ниска врсте „%s“" + +#: src/od.c:693 +#, c-format +msgid "" +"invalid type string %s;\n" +"this system doesn't provide a %lu-byte integral type" +msgstr "" +"неисправна ниска врсте „%s“;\n" +"овај систем не обезбеђује %lu-бајтну врсту интеграла" + +#: src/od.c:814 +#, c-format +msgid "" +"invalid type string %s;\n" +"this system doesn't provide a %lu-byte floating point type" +msgstr "" +"неисправна ниска врсте „%s“;\n" +"овај систем не обезбеђује %lu-бајтну врсту покретног зареза" + +#: src/od.c:872 +#, c-format +msgid "invalid character '%c' in type string %s" +msgstr "неисправан знак „%c“ у ниски врсте „%s“" + +#: src/od.c:1105 +#, c-format +msgid "cannot skip past end of combined input" +msgstr "не могу да прескочим прошли крај комбинованог улаза" + +#: src/od.c:1658 +#, c-format +msgid "invalid output address radix '%c'; it must be one character from [doxn]" +msgstr "неисправан излазни радикс адресе „%c“; мора бити један знак из [doxn]" + +#: src/od.c:1796 +#, c-format +msgid "no type may be specified when dumping strings" +msgstr "никаква врста не може бити наведена приликом исписа ниски" + +#: src/od.c:1871 +msgid "compatibility mode supports at most one file" +msgstr "режим сагласности подржава највише једну датотеку" + +#: src/od.c:1892 +#, c-format +msgid "skip-bytes + read-bytes is too large" +msgstr "бајтови прескакања + бајтови читања су превелики" + +#: src/od.c:1935 +#, c-format +msgid "warning: invalid width %lu; using %d instead" +msgstr "упозорење: неисправна ширина %lu; користим %d уместо тога" + +#: src/operand2sig.c:69 +#, c-format +msgid "%s: invalid signal" +msgstr "%s: неисправан сигнал" + +#: src/paste.c:220 +#, c-format +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" +msgstr "" +"Пише редове који се састоје од низовно одговарајућих редова из\n" +"сваке ДАТОТЕКЕ, раздвојених ТАБУЛАТОРИМА, на стандардни излаз.\n" +"Без ДАТОТЕКЕ, или када је ДАТОТЕКА -, чита стандардни улаз.\n" + +#: src/paste.c:447 +msgid "" +" -d, --delimiters=LIST reuse characters from LIST instead of TABs\n" +" -s, --serial paste one file at a time instead of in parallel\n" +msgstr "" +" -d, --delimiters=СПИСАК поново користи знакове са СПИСКА уместо " +"ТАБУЛАТОРА\n" +" -s, --serial прослеђује по једну датотеку уместо паралелно\n" + +#: src/paste.c:508 +#, c-format +msgid "delimiter list ends with an unescaped backslash: %s" +msgstr "списак граничника се завршава контра косом цртом без краја реда: %s" + +#: 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 "" +".\n" +"\n" +" -p проверава за већином ПОСИКС система\n" +" -P проверава за празним називима и водећим -\n" +" --portability проверава за свим ПОСИКС системима (исто што и „-p, -" +"P“)\n" + +#: src/pathchk.c:170 +#, c-format +msgid "leading '-' in a component of file name %s" +msgstr "водећа - у састојку назива датотеке „%s“" + +#: src/pathchk.c:196 +#, c-format +msgid "nonportable character %s in file name %s" +msgstr "непренесив знак „%s“ у називу датотеке „%s“" + +#: 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 "%s: не могу да одредим највећу дужину назива датотеке" + +#: src/pathchk.c:325 +#, c-format +msgid "limit %lu exceeded by length %lu of file name %s" +msgstr "ограничење %lu је премашено дужином %lu назива датотеке „%s“" + +#: src/pathchk.c:411 +#, c-format +msgid "limit %lu exceeded by length %lu of file name component %s" +msgstr "ограничење %lu је премашено дужином %lu састојком назива датотеке „%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 +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 "???\n" + +#: 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 "План:\n" + +#: 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:494 +#, c-format +msgid "Usage: %s [OPTION]... [USER]...\n" +msgstr "Употреба: %s [ОПЦИЈА]... [КОРИСНИК]...\n" + +#: src/pinky.c:495 +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 "" +"\n" +" -l даје излаз дугог записа за наведеног КОРИСНИКА\n" +" -b изоставља корисников лични директоријум и шкољку у дугом " +"запису\n" +" -h изоставља корисникову датотеку пројекта у дугом запису\n" +" -p изоставља корисникову датотеку плана у дугом запису\n" +" -s даје излаз кратког записа, ово је основно\n" + +#: src/pinky.c:503 +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 "" +" -f изоставља ред заглавља ступца у кратком запису\n" +" -w изоставља корисниково име и презиме у кратком запису\n" +" -i изоставља корисниково име и презиме, удаљеног домаћина у " +"кратком запису\n" +" -q изоставља корисниково име и презиме, удаљеног домаћина\n" +" и време мировања у кратком запису\n" + +#: src/pinky.c:512 +#, c-format +msgid "" +"\n" +"A lightweight 'finger' program; print user information.\n" +"The utmp file will be %s.\n" +msgstr "" +"\n" +"Лаган програм „finger“; исписује податке о кориснику.\n" +"Датотека „utmp“ ће бити „%s“.\n" + +#: src/pinky.c:596 +#, c-format +msgid "no username specified; at least one must be specified when using -l" +msgstr "" +"није наведено име корисника; барем једно мора бити наведено када се користи " +"„-l“" + +#. This is a proper name. See the gettext manual, section Names. +#: src/pr.c:331 +msgid "Pete TerMaat" +msgstr "Пете ТерМат" + +#. This is a proper name. See the gettext manual, section Names. +#: src/pr.c:332 +msgid "Roland Huebner" +msgstr "Роланд Хуебнер" + +#: src/pr.c:905 +#, c-format +msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" +msgstr "„--pages=ПРВА_СТРАНИЦА[:ПОСЛЕДЊА_СТРАНИЦА]“ недостаје аргумент" + +#: src/pr.c:907 +#, c-format +msgid "invalid page range %s" +msgstr "неисправан опсег странице „%s“" + +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" +msgstr "„-l ДУЖИНА_СТРАНИЦЕ“ неисправан број редова: %s" + +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" +msgstr "„-N БРОЈ“ неисправан број почетног реда: %s" + +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" +msgstr "„-o ИВИЦА“ неисправан померај реда: %s" + +# или можда пикселу? +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" +msgstr "„-w ШИРИНА_СТРАНИЦЕ“ неисправан број знакова: %s" + +# или можда пикселу? +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" +msgstr "„-W ШИРИНА_СТРАНИЦЕ“ неисправан број знакова: %s" + +#: src/pr.c:1059 +#, c-format +msgid "cannot specify number of columns when printing in parallel" +msgstr "не могу да наведем број стубаца када исписујем паралелно" + +#: src/pr.c:1063 +#, c-format +msgid "cannot specify both printing across and printing in parallel" +msgstr "не можете навести исписивање унакрст и исписивање у паралели" + +#: src/pr.c:1166 +#, c-format +msgid "'-%c' extra characters or invalid number in the argument: %s" +msgstr "„-%c“ вишак знакова или неисправан број у аргументу: %s" + +#: src/pr.c:1263 +#, c-format +msgid "page width too narrow" +msgstr "ширина странице је преуска" + +#: src/pr.c:2323 +#, c-format +msgid "starting page number % exceeds page count %" +msgstr "број почетне странице % премашује број страница %" + +#: src/pr.c:2350 +#, c-format +msgid "page number overflow" +msgstr "прекорачење броја страница" + +#: src/pr.c:2355 +#, c-format +msgid "Page %" +msgstr "Страница %" + +#: src/pr.c:2727 +msgid "Paginate or columnate FILE(s) for printing.\n" +msgstr "Спрема ДАТОТЕКУ(Е) као странице или ступце за исписивање.\n" + +#: src/pr.c:2734 +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 "" +" +ПРВА_СТРАНИЦА[:ПОСЛЕДЊА_СТРАНИЦА], --pages=ПРВА_СТРАНИЦА[:" +"ПОСЛЕДЊА_СТРАНИЦА]\n" +" почиње [зауставља] исписивање страницом " +"ПРВА_[ПОСЛЕДЊА_]СТРАНИЦА\n" +" -СТУБАЦ, --columns=СТУБАЦ\n" +" исписује СТУБАЦ стубаца и исписује ступце,\n" +" осим ако се не користи „-a“. Уравнотежава број редова у\n" +" ступцима на свакој страници\n" + +#: src/pr.c:2742 +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 "" +" -a, --across исписује ступце унакрст уместо доле, користи се заједно\n" +" са -СТУБАЦ\n" +" -c, --show-control-ЗНАКs\n" +" користи назначавање капицом (^G) и октално назначавање " +"контра косом цртом\n" +" -d, --double-space\n" +" удвостручава простор излаза\n" + +#: src/pr.c:2750 +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 "" +" -D, --date-format=ЗАПИС\n" +" користи ЗАПИС за датум заглавља\n" +" -e[ЗНАК[ШИРИНА]], --expand-tabs[=ЗНАК[ШИРИНА]]\n" +" проширује улазни(е) ЗНАК(е) (ТАБУЛАТОРе) на ШИРИНУ " +"табулатора (8)\n" +" -F, -f, --form-feed\n" +" користи доводе облика уместо нових редова за раздвајање " +"страница\n" +" (заглављем 3-редне странице са „-F“ или 5-редним " +"заглављем\n" +" и завршетком без „-F“)\n" + +#: src/pr.c:2760 +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 "" +" -h, --header=ЗАГЛАВЉЕ\n" +" користи усредиштено ЗАГЛАВЉЕ уместо назива датотеке у " +"заглављу странице,\n" +" „-h \"\"“ исписује празан ред, не користи „-h\"\"“\n" +" -i[ЗНАК[ШИРИНА]], --output-tabs[=ЗНАК[ШИРИНА]]\n" +" замењује размаке ЗНАКОМ(цима) (ТАБУЛАТОРОМ/има) на " +"ШИРИНУ табулатора (8)\n" +" -J, --join-lines стапа читаве редове, искључује „-W“ краћење реда, без " +"поравнања\n" +" ступца, --sep-string[=НИСКА] подешава раздвојнике\n" + +#: src/pr.c:2769 +#, fuzzy +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" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l, --length=ДУЖИНА_СТРАНИЦЕ\n" +" подешава дужину странице на ДУЖИНА_СТРАНИЦЕ (66) редова\n" +" (основни број редова текста је 56, а са „-F“ 63)\n" +" -m, --merge исписује све датотеке у паралели, једну у сваком " +"ступцу,\n" +" крати редове, али припаја редове пуне дужине са „-J“\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" +" -m, --merge print all files in parallel, one in each column,\n" +" truncate lines, but join lines of full length with -J\n" +msgstr "" +" -l, --length=ДУЖИНА_СТРАНИЦЕ\n" +" подешава дужину странице на ДУЖИНА_СТРАНИЦЕ (66) редова\n" +" (основни број редова текста је 56, а са „-F“ 63)\n" +" -m, --merge исписује све датотеке у паралели, једну у сваком " +"ступцу,\n" +" крати редове, али припаја редове пуне дужине са „-J“\n" + +#: src/pr.c:2779 +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 "" +" -n[РАЗ[ЦИФРЕ]], --number-lines[=РАЗ[ЦИФРЕ]]\n" +" пише бројеве редова, користи ЦИФРЕ (5) цифара, затим " +"РАЗДВОЈНИК (ТАБУЛАТОР),\n" +" основно бројање почиње првим редом улазне датотеке\n" +" -N, --first-line-number=БРОЈ\n" +" почиње бројање БРОЈЕМ на првом реду прве\n" +" исписане странице (видите +ПРВА_СТРАНИЦА)\n" + +#: src/pr.c:2787 +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 "" +" -o, --indent=ИВИЦА\n" +" помера сваки ред са ИВИЦА (нула) размака, не\n" +" утиче на „-w“ или „-W“, ИВИЦА ће бити додата на " +"ШИРИНУ_СТРАНИЦЕ\n" +" -r, --no-file-warnings\n" +" изоставља упозорење када датотека не може бити отворена\n" + +#: src/pr.c:2794 +msgid "" +" -s[CHAR], --separator[=CHAR]\n" +" separate columns by a single character, default for " +"CHAR\n" +" is the character without -w and 'no char' with -" +"w.\n" +" -s[CHAR] turns off line truncation of all 3 column\n" +" options (-COLUMN|-a -COLUMN|-m) except -w is set\n" +msgstr "" +" -s[ЗНАК], --separator[=ЗНАК]\n" +" раздваја ступце једним знаком, основно за ЗНАК\n" +" је <ТАБ> знак без „-w“ и „no ЗНАК“ са „-w“\n" +" -s[ЗНАК] искључује краћење реда за све 3 опције\n" +" ступца (-СТУБАЦ|-a -СТУБАЦ|-m) осим ако је „-w“ " +"подешено\n" + +#: src/pr.c:2802 +#, fuzzy +msgid "" +" -S[STRING], --sep-string[=STRING]\n" +" separate columns by STRING,\n" +" without -S: Default separator with -J and \n" +" otherwise (same as -S\" \"), no effect on column " +"options\n" +msgstr "" +" -S[НИСКА], --sep-string[=НИСКА]\n" +" раздваја ступце НИСКОМ,\n" +" без „-S“: Основни раздвојник <ТАБ> са „-J“ и <размак>\n" +" у супротном (исто као „-S\" \"“), нема дејства на опције " +"ступца\n" +" -t, --omit-header изоставља заглавља странице и завршетке\n" + +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 +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 "" +" -T, --omit-pagination\n" +" изоставља заглавља страница и завршетке, елиминише сва " +"остраничења\n" +" из подешавања довода у улазним датотекама\n" +" -v, --show-nonprinting\n" +" користи октално назначавање контра косе црте\n" +" -w, --width=ШИРИНА_СТРАНИЦЕ\n" +" подешава ширину странице на ШИРИНА_СТРАНИЦЕ (72) знакова " +"за\n" +" вишеструки излаз текста-ступца само, „-s[знак]“ " +"искључује (72)\n" + +#: src/pr.c:2822 +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 "" +" -W, --page-width=ШИРИНА_СТРАНИЦЕ\n" +" подешава ширину странице на ШИРИНА_СТРАНИЦЕ (72) знакова " +"увек,\n" +" крати редове, осим ако је постављена опција „-J“, не " +"утиче\n" +" на „-S“ или „-s“\n" + +#: 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 "" +"Употреба: %s [ОПЦИЈА]... [ПРОМЕНЉИВА]...\n" +"Исписује вредности наведене ПРОМЕНЉИВЕ окружења.\n" +"Ако није наведена ПРОМЕНЉИВА, исписује парове назива и вредности за све " +"њих.\n" +"\n" + +#: src/printenv.c:69 +msgid " -0, --null end each output line with NUL, not newline\n" +msgstr " -0, --null завршава сваки излазни ред са НИШТА, не новим редом\n" + +#: src/printf.c:79 +#, c-format +msgid "" +"warning: %s: character(s) following character constant have been ignored" +msgstr "упозорење: %s: знак(ци) који прати константу знака је занемарен" + +#: src/printf.c:88 +#, c-format +msgid "" +"Usage: %s FORMAT [ARGUMENT]...\n" +" or: %s OPTION\n" +msgstr "" +"Употреба: %s ЗАПИС [АРГУМЕНТ]...\n" +" или: %s ОПЦИЈА\n" + +#: src/printf.c:93 +msgid "" +"Print ARGUMENT(s) according to FORMAT, or execute according to OPTION:\n" +"\n" +msgstr "" +"Исписује АРГУМЕНТ(е) према ЗАПИСУ, или извршава према ОПЦИЈИ:\n" +"\n" + +#: src/printf.c:99 +msgid "" +"\n" +"FORMAT controls the output as in C printf. Interpreted sequences are:\n" +"\n" +" \\\" double quote\n" +msgstr "" +"\n" +"ЗАПИС управља излазом као у „C printf“-у. Протумачени низови су:\n" +"\n" +" \\\" двоструки наводник\n" + +#: 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 "" +" \\NNN бајт са окталном вредношћу NNN (1 до 3 цифре)\n" +" \\xHH бајт са хексадецималном вредношћу HH (1 до 2 цифре)\n" +" \\uHHHH Знак Јуникода (ISO/IEC 10646) са хексадецималном вредношћу HHHH " +"(4 цифре)\n" +" \\UHHHHHHHH Знак Јуникода са хексадецималном вредношћу HHHHHHHH (8 " +"цифара)\n" + +#: 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 "" +" %% један %\n" +" %b АРГУМЕНТ као ниска са тумаченим \\ завршетака реда,\n" +" осим ако октални завршеци реда нису у облику „\\0“ или „\\0NNN“\n" +"\n" +"а све одредбе Ц записа се завршавају једним од „diouxXfeEgGcs“, са\n" +"АРГУМЕНТима претвореним на сопствену врсту. Ради се и са ширинама " +"променљивих.\n" + +#: src/printf.c:148 +#, c-format +msgid "%s: expected a numeric value" +msgstr "%s: очекивах бројну вредност" + +#: src/printf.c:150 +#, c-format +msgid "%s: value not completely converted" +msgstr "%s: вредност није потпуно претворена" + +#: 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 "неисправан назив свеопштег знака „\\%c%0*x“" + +#: src/printf.c:547 +#, c-format +msgid "invalid field width: %s" +msgstr "неисправна ширина поља: %s" + +#: src/printf.c:582 +#, c-format +msgid "invalid precision: %s" +msgstr "неисправна тачност: %s" + +#: src/printf.c:609 +#, c-format +msgid "%.*s: invalid conversion specification" +msgstr "%.*s: неисправна одредба претварања" + +#: src/printf.c:692 +#, c-format +msgid "warning: ignoring excess arguments, starting with %s" +msgstr "упозорење: занемарујем аргументе премашаја, почињем са „%s“" + +#. 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:420 +#, c-format +msgid "%s (for regexp %s)" +msgstr "%s (за регуларан израз „%s“)" + +#: src/ptx.c:1820 +#, c-format +msgid "" +"Usage: %s [OPTION]... [INPUT]... (without -G)\n" +" or: %s -G [OPTION]... [INPUT [OUTPUT]]\n" +msgstr "" +"Употреба: %s [ОПЦИЈА]... [УЛАЗ]... (без -G)\n" +" or: %s -G [ОПЦИЈА]... [УЛАЗ [ИЗЛАЗ]]\n" + +#: src/ptx.c:1824 +msgid "" +"Output a permuted index, including context, of the words in the input " +"files.\n" +msgstr "" +"Даје пермутовани индекс, укључујући контекст, речи у улазним датотекама.\n" + +#: src/ptx.c:1831 +#, fuzzy +msgid "" +" -A, --auto-reference output automatically generated references\n" +" -G, --traditional behave more like System V 'ptx'\n" +msgstr "" +" -A, --auto-reference исписује самостално створене упуте\n" +" -G, --traditional понаша се више као „ptx“ Система V\n" +" -F, --flag-truncation=НИСКА користи НИСКУ за постављање заставица на " +"скраћивања редова\n" + +#: src/ptx.c:1835 +msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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 "" +" -M, --macro-name=НИСКА назив макроа за коришћење уместо „xx“\n" +" -O, --format=roff ствара излаз као прописе рофф-а\n" +" -R, --right-side-refs ставља упуте на десно, не броји се у „-w“\n" +" -S, --sentence-regexp=РЕГИЗР за крај редова или за крај реченица\n" +" -T, --format=tex ствара излаз као пропис ТеКс-а\n" + +#: src/ptx.c:1846 +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 "" +" -W, --word-regexp=РЕГИЗР користи РЕГИЗР за поклапање сваке кључне " +"речи\n" +" -b, --break-file=ДАТОТЕКА знаци прекида речи у овој ДАТОТЕЦИ\n" +" -f, --ignore-case мења мала слова у велика за ређање\n" +" -g, --gap-size=БРОЈ величина размака у ступцима исмеђу излазних " +"поља\n" +" -i, --ignore-file=ДАТОТЕКА чита списак речи занемаривања из ДАТОТЕКЕ\n" +" -o, --only-file=ДАТОТЕКА чита списак речи само из ове ДАТОТЕКЕ\n" + +#: src/ptx.c:1854 +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 прво поље сваког реда је упута\n" +" -t, --typeset-mode - није примењено -\n" +" -w, --width=БРОЈ излазна ширина у ступцима, упута искључена\n" + +#: src/ptx.c:1951 +#, c-format +msgid "invalid gap width: %s" +msgstr "неисправна ширина размака: %s" + +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "неисправна ширина реда: %s" + +#: src/pwd.c:57 +msgid "" +"Print the full filename of the current working directory.\n" +"\n" +msgstr "" +"Исписује пуни назив датотеке текућег радног директоријума.\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 користи „PWD“ из окружења, чак и ако садржи симболичке " +"везе\n" +" -P, --physical избегава све симболичке везе\n" + +#: src/pwd.c:67 +msgid "" +"\n" +"If no option is specified, -P is assumed.\n" +msgstr "" +"\n" +"Ако није наведена опција, подразумева се „-P“.\n" + +#: src/pwd.c:169 +#, c-format +msgid "failed to chdir to %s" +msgstr "нисам успео да изменим директоријум на „%s“" + +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 +#, c-format +msgid "failed to stat %s" +msgstr "нисам успео да добавим податке %s" + +#: src/pwd.c:238 +#, c-format +msgid "couldn't find directory entry in %s with matching i-node" +msgstr "не могу да нађем унос директоријума у „%s“ са одговарајућим и-чвором" + +#: src/pwd.c:367 +#, 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/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 +#, c-format +msgid "Usage: %s [OPTION]... FILE...\n" +msgstr "Употреба: %s [ОПЦИЈА]... ДАТОТЕКА...\n" + +#: src/readlink.c:63 +msgid "" +"Print value of a symbolic link or canonical file name\n" +"\n" +msgstr "" +"Исписује вредност симболичке везе или канонски назив датотеке\n" +"\n" + +#: 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 "" +" -f, --canonicalize стандардизује пратећи сваку симболичку везу " +"у\n" +" сваком састојку датог назива дубински;\n" +" сви осим последњег састојка морају " +"постојати\n" +" -e, --canonicalize-existing стандардизује пратећи сваку симболичку везу " +"у\n" +" сваком састојку датог назива дубински,\n" +" сви састојци морају постојати\n" + +#: 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 end each output line with NUL, not newline\n" +msgstr "" +" -m, --canonicalize-missing стандардизује пратећи сваку симболичку везу " +"у\n" +" сваком састојку датог назива дубински,\n" +" без захтева за постојањем састојака\n" +" -n, --no-newline не исписује завршни граничник\n" +" -q, --quiet,\n" +" -s, --silent потискује већину порука грешака\n" +" -v, --verbose извештава о порукама грешака\n" +" -z, --zero завршава сваки излазни ред са НИШТА, не " +"новим редом\n" + +#: src/readlink.c:152 +#, c-format +msgid "ignoring --no-newline with multiple arguments" +msgstr "занемарујем „--no-newline“ са више аргумената" + +#: src/realpath.c:72 +msgid "" +"Print the resolved absolute file name;\n" +"all but the last component must exist\n" +"\n" +msgstr "" +"Исписује решени апсолутни назив датотеке;\n" +"сви осим последњег састојка морају постојати\n" +"\n" + +#: 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 end each output line with NUL, not newline\n" +"\n" +msgstr "" +" -e, --canonicalize-existing сви састојци путање морају постојати\n" +" -m, --canonicalize-missing ниједан састојак путање не мора постојати\n" +" -L, --logical решава састојке .. пре симболичких веза\n" +" -P, --physical решава симболичке везе како их сретне " +"(основно)\n" +" -q, --quiet потискује већину порука грешака\n" +" --relative-to=ДАТОТЕКА исписује решену путању односну на ДАТОТЕКУ\n" +" --relative-base=ДАТОТЕКА исписује апсолутне путање осим путања испод " +"ДАТОТЕКЕ\n" +" -s, --strip, --no-symlinks не шири симболичке везе\n" +" -z, --zero завршава сваки излазни ред са НИШТА, не новим " +"редом\n" +"\n" + +#: src/relpath.c:130 +msgid "generating relative path" +msgstr "стварам односну путању" + +#: src/remove.c:273 +#, c-format +msgid "%s: descend into write-protected directory %s? " +msgstr "%s: да сиђем у директоријум заштићен од писања „%s“? " + +#: src/remove.c:274 +#, c-format +msgid "%s: descend into directory %s? " +msgstr "%s: да сиђем у директоријум „%s“? " + +#. TRANSLATORS: In the next two strings the second %s is +#. replaced by the type of the file. To avoid grammatical +#. problems, it may be more convenient to translate these +#. strings instead as: "%1$s: %3$s is write-protected and +#. is of type '%2$s' -- remove it? ". +#: src/remove.c:291 +#, c-format +msgid "%s: remove write-protected %s %s? " +msgstr "%s: да уклоним %s заштићен од писања „%s“? " + +#: src/remove.c:292 +#, c-format +msgid "%s: remove %s %s? " +msgstr "%s: да уклоним %s %s? " + +#: src/remove.c:375 +#, c-format +msgid "removed directory: %s\n" +msgstr "уклоњени директоријум: %s\n" + +#: src/remove.c:447 +#, c-format +msgid "refusing to remove %s or %s directory: skipping %s" +msgstr "одбијам да уклоним „%s“ или „%s“ директоријум: прескачем „%s“" + +#: src/remove.c:505 +#, c-format +msgid "skipping %s, since it's on a different device" +msgstr "прескачем „%s“, јер је на другом уређају" + +#: src/remove.c:525 +#, c-format +msgid "traversal failed: %s" +msgstr "пролазак није успео: %s" + +#: src/remove.c:531 +#, c-format +msgid "" +"unexpected failure: fts_info=%d: %s\n" +"please report to %s" +msgstr "" +"неочекивани неуспех: fts_info=%d: %s\n" +"пријавите ово на „%s“" + +#: src/rm.c:119 +#, c-format +msgid "Try '%s ./%s' to remove the file %s.\n" +msgstr "Пробајте „%s ./%s“ да уклоните датотеку „%s“.\n" + +#: 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 "" +"Уклања (развезује) ДАТОТЕКУ.\n" +"\n" +" -f, --force занемарује непостојеће датотеке и аргументе, никада " +"не поставља упит\n" +" -i поставља упит пре сваког уклањања\n" + +#: 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 "" +" -I пита једном пре уклањања више од три датотеке, или\n" +" када уклања дубински; мање је нападно од „-i“,\n" +" док још увек пружа заштиту против већине грешака\n" +" --interactive[=КАДА] пита у складу са КАДА: „never“ — никада, „once (-" +"I)“ — једном, или\n" +" „always (-i)“ — увек; без КАДА, увек пита\n" + +#: 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 када дубински уклања хијерархију, прескаче све\n" +" директоријуме који су на систему датотека " +"другачијем од\n" +" оног одговарајућег аргумента линије наредби\n" + +#: 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" +" -d, --dir уклања празне директоријуме\n" +" -v, --verbose објашњава шта је урађено\n" + +#: 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 "" +"\n" +"По основи, „rm“ не уклања директоријуме. Користите „--recursive“ (-r или -" +"R)\n" +"да уклоните сваки излистани директоријум, такође, са свим њиховим " +"садржајима.\n" + +#: 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 "" +"\n" +"Да уклоните датотеку чији назив почиње на -, на пример „-foo“,\n" +"користите једну од ових наредби:\n" +" %s -- -foo\n" +"\n" +" %s ./-foo\n" + +#: 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 "" +"\n" +"Знајте да ако користите „rm“ за уклањање датотеке, може бити могуће " +"повратити\n" +"нешто од њеног садржаја, ако имате довољно искуства и/или времена. Зарад " +"веће\n" +"сигурности да је садржај стварно непоправљив, размотрите коришћење „shred“-" +"а.\n" + +#: src/rm.c:342 +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " +msgstr[0] "%s: да уклоним дубински %zu аргумент? " +msgstr[1] "%s: да уклоним дубински %zu аргумента? " +msgstr[2] "%s: да уклоним дубински %zu аргумената? " + +#: src/rm.c:345 +#, fuzzy, c-format +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " +msgstr[0] "%s: да уклоним %zu аргумент? " +msgstr[1] "%s: да уклоним %zu аргумента? " +msgstr[2] "%s: да уклоним %zu аргумената? " + +#: src/rmdir.c:134 src/rmdir.c:233 +#, c-format +msgid "removing directory, %s" +msgstr "уклањам директоријум, %s" + +#: src/rmdir.c:148 +#, c-format +msgid "failed to remove directory %s" +msgstr "нисам успео да уклоним директоријум „%s“" + +#: 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 "" +"Уклања ДИРЕКТОРИЈУМ(е), ако су празни.\n" +"\n" +" --ignore-fail-on-non-empty\n" +" занемарује сваки неуспех који је усамљен зато што " +"директоријум\n" +" није празан\n" + +#: 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 "" +" -p, --parents уклања ДИРЕКТОРИЈУМ и све његове старије; нпр., „rmdir -p " +"a/b/c“ је\n" +" слично са „rmdir a/b/c a/b a“\n" +" -v, --verbose даје дијагнозу за сваки обрађени директоријум\n" + +#: src/rmdir.c:242 +#, c-format +msgid "failed to remove %s" +msgstr "нисам успео да уклоним „%s“" + +#: 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 "" +"Употреба: %s КОНТЕКСТ НАРЕДБА [арг-ти]\n" +" или: %s [ -c ] [-u КОРИСНИК] [-r УЛОГА] [-t ВРСТА] [-l ОПСЕГ] НАРЕДБА " +"[арг-ти]\n" + +#: src/runcon.c:87 +msgid "" +"Run a program in a different SELinux security context.\n" +"With neither CONTEXT nor COMMAND, print the current security context.\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" +" -u, --user=USER user identity\n" +" -r, --role=ROLE role\n" +" -l, --range=RANGE levelrange\n" +"\n" +msgstr "" +" КОНТЕКСТ Довршава безбедносни контекст\n" +" -c, --compute израчунава контекст прелаза процеса пре измене\n" +" -t, --type=ВРСТА врста (за исту улогу као родитељ)\n" +" -u, --user=КОРИСНИК идентитет корисника\n" +" -r, --role=УЛОГА улога\n" +" -l, --range=ОПСЕГ опсег нивоа\n" +"\n" + +#: 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 "морате навести -c, -t, -u, -l, -r, или контекст" + +#: src/runcon.c:195 +#, c-format +msgid "no command specified" +msgstr "није наведена наредба" + +#: src/runcon.c:200 +#, c-format +msgid "%s may be used only on a SELinux kernel" +msgstr "„%s“ може бити коришћено само на СЕЛинукс језгру" + +#: src/runcon.c:226 +#, c-format +msgid "failed to compute a new context" +msgstr "нисам успео да израчунам нови контекст" + +#: src/runcon.c:240 +#, c-format +msgid "failed to set new user %s" +msgstr "нисам успео да подесим новог корисника „%s“" + +#: src/runcon.c:242 +#, c-format +msgid "failed to set new type %s" +msgstr "нисам успео да подесим нову врсту „%s“" + +#: src/runcon.c:244 +#, c-format +msgid "failed to set new range %s" +msgstr "нисам успео да подесим нови опсег „%s“" + +#: src/runcon.c:246 +#, c-format +msgid "failed to set new role %s" +msgstr "нисам успео да подесим нову улогу „%s“" + +#: src/runcon.c:254 +#, c-format +msgid "unable to set security context %s" +msgstr "не могу да подесим безбедносни контекст „%s“" + +#: src/selinux.c:127 src/selinux.c:300 +#, c-format +msgid "error canonicalizing %s" +msgstr "грешка стандардизације „%s“" + +#: src/seq.c:68 +#, c-format +msgid "" +"Usage: %s [OPTION]... LAST\n" +" or: %s [OPTION]... FIRST LAST\n" +" or: %s [OPTION]... FIRST INCREMENT LAST\n" +msgstr "" +"Употреба: %s [ОПЦИЈА]... ПОСЛЕДЊИ\n" +" или: %s [ОПЦИЈА]... ПРВИ ПОСЛЕДЊИ\n" +" или: %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 "" +" -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 "" +" -f, --format=ЗАПИС користи ЗАПИС покретног зареза у стилу „printf“-" +"а\n" +" -s, --separator=НИСКА користи НИСКУ за раздвајање бројева (основно: " +"\\n)\n" +" -w, --equal-width изједначава ширину испуњавајући водећим нулама\n" + +#: 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" +"The sequence of numbers ends when the sum of the current number and\n" +"INCREMENT would become greater than LAST.\n" +"FIRST, INCREMENT, and LAST are interpreted as floating point values.\n" +"INCREMENT is usually positive if FIRST is smaller than LAST, and\n" +"INCREMENT is usually negative if FIRST is greater than LAST.\n" +msgstr "" +"\n" +"Ако је ПРВИ или ПОВЕЋАЊЕ изостављено, прелази на 1. Тако је,\n" +"изостављено ПОВЕЋАЊЕ прелази на 1 чак и када је ПОСЛЕДЊИ мањи од ПРВОГ.\n" +"Низ бројева се завршава када би збир текућег броја и\n" +"ПОВЕЋАЊА постао већи од ПОСЛЕДЊЕГ.\n" +"ПРВИ, ПОВЕЋАЊЕ, и ПОСЛЕДЊИ се тумаче као вредности покретног зареза.\n" +"ПОВЕЋАЊЕ је обично позитивно ако је ПРВИ мањи од ПОСЛЕДЊЕГ, а\n" +"ПОВЕЋАЊЕ је обично негативно ако је ПРВИ већи од ПОСЛЕДЊЕГ.\n" + +#: src/seq.c:96 +msgid "" +"FORMAT must be suitable for printing one argument of type 'double';\n" +"it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n" +"decimal numbers with maximum precision PREC, and to %g otherwise.\n" +msgstr "" +"ЗАПИС мора бити подесан за исписивање једног аргумента врсте „double“;\n" +"подразумева „%.PRECf“ ако су ПРВИ, ПОВЕЋАЊЕ и ПОСЛЕДЊИ сви децимални " +"бројеви\n" +"непокретног зареза са највећом тачношћу ТАЧН, а „%g“ у супротном.\n" + +#: src/seq.c:142 +#, c-format +msgid "invalid floating point argument: %s" +msgstr "неисправан аргумент покретног зареза: %s" + +#: src/seq.c:248 +#, c-format +msgid "format %s has unknown %%%c directive" +msgstr "запис „%s“ има непознату одредбу „%%%c“" + +#: src/seq.c:603 +#, c-format +msgid "format string may not be specified when printing equal width strings" +msgstr "" +"ниска записа не може бити наведена приликом исписивања ниски исте ширине" + +#. This is a proper name. See the gettext manual, section Names. +#: src/shred.c:74 +msgid "Colin Plumb" +msgstr "Колин Пламб" + +#: src/shred.c:170 +msgid "" +"Overwrite the specified FILE(s) repeatedly, in order to make it harder\n" +"for even very expensive hardware probing to recover the data.\n" +msgstr "" +"Преписује наведену ДАТОТЕКУ(е) са понављањем, да би је учинио тежом\n" +"чак и за врло скуп хардверски покушај спашавања података.\n" + +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Ако је ДАТОТЕКА „-“, опет умножава на стандардни излаз.\n" + +#: src/shred.c:181 +#, 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 "" +" -f, --force мења овлашћења да омогући писање ако је потребно\n" +" -n, --iterations=N преписује N пута уместо основних (%d)\n" +" --random-source=ДАТОТЕКА добавља насумичне бајтове из ДАТОТЕКЕ\n" +" -s, --size=N растура ове многе бајтове (прихватају се суфикси као K, M, " +"G)\n" + +#: src/shred.c:187 +msgid "" +" -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" +" -v, --verbose show progress\n" +" -x, --exact do not round file sizes up to the next full block;\n" +" this is the default for non-regular files\n" +" -z, --zero add a final overwrite with zeros to hide shredding\n" +msgstr "" +" -u, --remove[=КАКО] крати и уклања датотеку након преписивања; Видите " +"испод\n" +" -v, --verbose приказује напредак\n" +" -x, --exact не заокружује величине датотека на следећи пуни блок;\n" +" ово је основно за не-обичне датотеке\n" +" -z, --zero додаје крајње преписивање нулама да сакрије растурање\n" + +#: src/shred.c:196 +#, fuzzy +msgid "" +"\n" +"Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" +"the files because it is common to operate on device files like /dev/hda,\n" +"and those files usually should not be removed.\n" +"The optional HOW parameter indicates how to remove a directory entry:\n" +"'unlink' => use a standard unlink call.\n" +"'wipe' => also first obfuscate bytes in the name.\n" +"'wipesync' => also sync each obfuscated byte to disk.\n" +"The default mode is 'wipesync', but note it can be expensive.\n" +"\n" +msgstr "" +"\n" +" -, shred standard output.\n" +"\n" +"D --remove (-u) is specified. T\n" +"t /dev/hda,\n" +"a.\n" +"The optional HOW parameter indicates how to remove a directory entry:\n" +"„unlink“ => користи стандардни позив .\n" +"„wipe“ => also first obfuscate bytes in the name.\n" +"„wipesync“ => also sync each obfuscated byte to disk.\n" +"Основни режим је „wipesync“, али знајте да може бити скуп.\n" +"\n" + +#: src/shred.c:208 +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 "" +"ОПРЕЗ: Знајте да се растурање заснива ва врло важној претпоставци да систем\n" +"датотека преписује податке на месту. То је традиционалан начин за обављање\n" +"ствари, али многи савремени системи датотека се осмишљавају да не задовоље " +"ту\n" +"претпоставку. Следећи су примери система датотека на којима растурање\n" +"нема дејства, или се не гарантује делотворност у свим режимима система " +"датотека:\n" +"\n" + +#: src/shred.c:216 +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 "" +"* дневничко-склопљени или журналисани системи датотека, као они што се " +"испоручују уз\n" +"АИКС и Соларис (и ЈФС, РајзерФС, Екст3, итд.)\n" +"\n" +"* системи датотека који пишу прекомерне податке и настављају чак и ако нека " +"писања\n" +"не успеју, као што су системи датотека засновани на РАИД-у\n" +"\n" +"* системи датотека који праве снимке, као што је НФС сервер мрежне примене\n" +"\n" + +#: src/shred.c:226 +msgid "" +"* file systems that cache in temporary locations, such as NFS\n" +"version 3 clients\n" +"\n" +"* compressed file systems\n" +"\n" +msgstr "" +"* системи датотека који остављају на привременим местима, као што су " +"клијенти\n" +"НФС издања 3\n" +"\n" +"* запаковани системи датотека\n" +"\n" + +#: src/shred.c:233 +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 "" +"У случају екст3 система датотека, горњи уговор о коришћењу се примењује\n" +"(а растурање је ограничене делотворности) само у режиму „подаци=журнал“,\n" +"који журналира податке датотеке као додатак само метаподацима. У оба\n" +"режима „подаци=сређени“ (основно) и „подаци=записивање“, растурање ради као " +"обично.\n" +"Режими екст3 јурналирања могу бити измењени додавањем опције „подаци=нешто“\n" +"опцијама монтирања за нарочит систем датотека у датотеци „/etc/fstab“,\n" +"као што је документовано на страници упутства монтирања (man mount).\n" +"\n" + +#: src/shred.c:243 +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 "" +"Као додатак, резерве система датотека и удаљена огледала могу да садрже\n" +"умношке датотеке која не може бити уклоњена, а то ће омогућити растуреној\n" +" датотеци да буде повраћена касније.\n" + +#: src/shred.c:342 +#, c-format +msgid "%s: fdatasync failed" +msgstr "%s: није успело „fdatasync“" + +#: src/shred.c:353 +#, c-format +msgid "%s: fsync failed" +msgstr "%s: није успело „fsync“" + +#: src/shred.c:463 +#, c-format +msgid "%s: cannot rewind" +msgstr "%s: не могу да премотам уназад" + +#: src/shred.c:483 +#, c-format +msgid "%s: pass %lu/%lu (%s)..." +msgstr "%s: корак %lu/%lu (%s)..." + +#: src/shred.c:531 +#, c-format +msgid "%s: error writing at offset %s" +msgstr "%s: грешка писања на померају „%s“" + +#: src/shred.c:551 +#, c-format +msgid "%s: lseek failed" +msgstr "%s: није успело „lseek“" + +#: src/shred.c:563 +#, c-format +msgid "%s: file too large" +msgstr "%s: датотека је превелика" + +#: src/shred.c:587 +#, c-format +msgid "%s: pass %lu/%lu (%s)...%s" +msgstr "%s: корак %lu/%lu (%s)...%s" + +#: src/shred.c:603 +#, c-format +msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" +msgstr "%s: корак %lu/%lu (%s)...%s/%s %d%%" + +#: src/shred.c:861 +#, c-format +msgid "%s: fstat failed" +msgstr "%s: није успело „fstat“" + +#: src/shred.c:872 +#, c-format +msgid "%s: invalid file type" +msgstr "%s: нисправна врста датотеке" + +#: src/shred.c:877 +#, c-format +msgid "%s: file has negative size" +msgstr "%s: датотека има негативну величину" + +#: src/shred.c:971 src/sort.c:959 src/split.c:431 +#, c-format +msgid "%s: error truncating" +msgstr "%s: грешка скраћивања" + +#: src/shred.c:991 +#, c-format +msgid "%s: fcntl failed" +msgstr "%s: није успело „fcntl“" + +#: src/shred.c:996 +#, c-format +msgid "%s: cannot shred append-only file descriptor" +msgstr "%s: не могу да растурим описника датотеке само за додавање" + +#: src/shred.c:1080 +#, c-format +msgid "%s: removing" +msgstr "%s: уклањам" + +#: src/shred.c:1104 +#, c-format +msgid "%s: renamed to %s" +msgstr "%s: преименовао сам у „%s“" + +#: src/shred.c:1126 +#, c-format +msgid "%s: failed to remove" +msgstr "%s: нисам успео да уклоним" + +#: src/shred.c:1130 +#, c-format +msgid "%s: removed" +msgstr "%s: уклоњено је" + +#: src/shred.c:1137 src/shred.c:1180 +#, c-format +msgid "%s: failed to close" +msgstr "%s: нисам успео да затворим" + +#: src/shred.c:1173 +#, c-format +msgid "%s: failed to open for writing" +msgstr "%s: нисам успео да отворим за писање" + +#: src/shred.c:1236 +#, fuzzy +msgid "invalid number of passes" +msgstr "%s: неисправан број корака" + +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 +#, c-format +msgid "multiple random sources specified" +msgstr "наведено је више насумичних извора" + +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" +msgstr "%s: нисправна величина датотеке" + +#: src/shuf.c:62 +#, c-format +msgid "" +"Usage: %s [OPTION]... [FILE]\n" +" or: %s -e [OPTION]... [ARG]...\n" +" or: %s -i LO-HI [OPTION]...\n" +msgstr "" +"Употреба: %s [ОПЦИЈА]... [ДАТОТЕКА]\n" +" или: %s -e [ОПЦИЈА]... [АРГ]...\n" +" или: %s -i НИСКО-ВИСОКО [ОПЦИЈА]...\n" + +#: src/shuf.c:68 +msgid "Write a random permutation of the input lines to standard output.\n" +msgstr "Пише насумичну пермутацију улазних редова на стандардни излаз.\n" + +#: src/shuf.c:75 +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" +" -r, --repeat output lines can be repeated\n" +msgstr "" +" -e, --echo сматра сваки АРГУМЕНТ као улазни ред\n" +" -i, --input-range=НИС-ВИС сматра сваки број од НИСКОГ до ВИСОКОГ као " +"улазни ред\n" +" -n, --head-count=БРОЈ исписује највише БРОЈ редова\n" +" -o, --output=ДАТОТЕКА пише резултат у ДАТОТЕКУ уместо на стандардни " +"излаз\n" +" --random-source=ДАТОТЕКА добавља насумичне бајтове из ДАТОТЕКЕ\n" +" -r, --repeat излазни редови се могу понављати\n" + +#: src/shuf.c:226 +#, c-format +msgid "too many input lines" +msgstr "превише улазних редова" + +#: src/shuf.c:428 +#, c-format +msgid "multiple -i options specified" +msgstr "наведено је више „-i“ опција" + +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" +msgstr "неисправан опсег улаза „%s“" + +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" +msgstr "неисправан број реда %s" + +#: src/shuf.c:466 src/sort.c:4475 +#, c-format +msgid "multiple output files specified" +msgstr "наведено је више излазних датотека" + +#: src/shuf.c:496 +#, c-format +msgid "cannot combine -e and -i options" +msgstr "не можете да мешате опције „-e“ и „-i“" + +#: src/shuf.c:580 +#, c-format +msgid "no lines to repeat" +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 "" +"Употреба: %s БРОЈ[СУФИКС]...\n" +" или: %s ОПЦИЈА\n" +"Застаје за БРОЈ секунде. СУФИКС може бити „s“ за секунде (основно),\n" +"„m“ за минуте, „h“ за часове или „d“ за дане. За разлику од већине примена\n" +"које захтевају да БРОЈ буде цео број, овде БРОЈ може бити произвољан број\n" +"са покретним зарезом. Са дата два или више аргумента, застаје за износ\n" +"времена наведеног збиром њихових вредности.\n" +"\n" + +#: src/sleep.c:135 src/timeout.c:325 +#, c-format +msgid "invalid time interval %s" +msgstr "неисправан временски распон „%s“" + +#: src/sleep.c:146 src/tail.c:1251 +#, c-format +msgid "cannot read realtime clock" +msgstr "не могу да читам сат стварног времена" + +#: src/sort.c:427 +msgid "Write sorted concatenation of all FILE(s) to standard output.\n" +msgstr "Исписује поређано надодавање свих ДАТОТЕКА на стандардни излаз.\n" + +#: src/sort.c:434 +msgid "" +"Ordering options:\n" +"\n" +msgstr "Опције ређања:\n" + +#: src/sort.c:438 +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 занемарује водеће празнине\n" +" -d, --dictionary-order узима у обзир само празнине и словно-бројевне " +"знаке\n" +" -f, --ignore-case пребацује знакове малих слова у велика\n" + +#: src/sort.c:444 +msgid "" +" -g, --general-numeric-sort compare according to general numerical value\n" +" -i, --ignore-nonprinting consider only printable characters\n" +" -M, --month-sort compare (unknown) < 'JAN' < ... < 'DEC'\n" +msgstr "" +" -g, --general-numeric-sort упоређује према општој бројчаној вредности\n" +" -i, --ignore-nonprinting узима у обзир само исписиве знакове\n" +" -M, --month-sort упоређује (непознато) < „ЈАН“ < ... < „ДЕЦ“\n" + +#: src/sort.c:449 +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:452 +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 упоређује према општој бројчаној вредности\n" +" -R, --random-sort ређа насумичним хешом кључева\n" +" --random-source=ДАТОТЕКА добавља насумичне бајтове из ДАТОТЕКЕ\n" +" -r, --reverse окреће резултат поређења\n" + +#: src/sort.c:458 +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 "" +" --sort=РЕЧ ређа према РЕЧИ:\n" +" опште-бројчано „-g“, људско-бројчано „-h“, " +"месец „-M“,\n" +" бројчано „-n“, насумично „-R“, издање „-V“\n" +" -V, --version-sort природно ређање (издања) бројева унутар " +"текста\n" +"\n" + +#: src/sort.c:466 +msgid "" +"Other options:\n" +"\n" +msgstr "" +"Остале опције:\n" +"\n" + +#: src/sort.c:470 +msgid "" +" --batch-size=NMERGE merge at most NMERGE inputs at once;\n" +" for more use temp files\n" +msgstr "" +" --batch-size=БРСТАПАЊА стапа највише БРСТАПАЊА улаза одједном;\n" +" за већу употребу привремених датотека\n" + +#: src/sort.c:474 +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 "" +" -c, --check, --check=дијагноза-прво проверава за поређаним улазом; не " +"ређа\n" +" -C, --check=нечујно, --check=тихо као „-c“, али не извештава о првом " +"лошем реду\n" +" --compress-program=ПРОГ пакује привремености ПРОГРАМОМ;\n" +" распакује их са „ПРОГРАМ -d“\n" + +#: src/sort.c:481 +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 "" +" --debug прибележава део реда коришћеног за ређање,\n" +" и упозорава о упитљивом коришћењу на " +"стандардној грешци\n" +" --files0-from=Д чита улаз из датотека наведених\n" +" називима завршеним на НИШТА у датотеци Д;\n" +" Ако је Д -, тада чита називе са стандардног " +"улаза\n" + +#: src/sort.c:488 +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=ОДРКЉУЧА ређа путем кључа; ОДРЕДНИЦАКЉУЧА даје место и " +"врсту\n" +" -m, --merge стапа већ поређане датотеке; не ређа\n" + +#: src/sort.c:492 +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=ДАТОТЕКА пише резултат у ДАТОТЕКУ уместо на стандардни " +"излаз\n" +" -s, --stable стабилизује ређање искључивањем поређења " +"последњег поновног ређања\n" +" -S, --buffer-size=ВЕЛИЧИНА користи ВЕЛИЧИНУ за главну међумеморију\n" + +#: src/sort.c:498 +#, 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 "" +" -t, --field-separator=РАЗД користи РАЗДВОЈНИК уместо не-празних у празне " +"прелазе\n" +" -T, --temporary-directory=ДИР користи ДИРЕКТОРИЈУМ за привремености, а не " +"„$TMPDIR“ или „%s“;\n" +" више опција наводе више директоријума\n" +" --parallel=N мења број покретања ређања истовремено на N\n" +" -u, --unique са „-c“, проверава за изричитим уређењем;\n" +" без „-c“, исписује само прво од истог " +"покретања\n" + +#: src/sort.c:512 +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 "" +"\n" +"ОДРЕДБАКЉУЧА F[.C][ОПЦИЈЕ][,F[.C][ОПЦИЈЕ]] за положај покретања и " +"заустављања, где је F број\n" +"поља а C положај знака у пољу; оба су порекла 1, а\n" +"положај заустављања подразумева се на крај реда. Ако ни „-t“ ни „-b“ није " +"у\n" +"дејству, знаци у пољу се броје од почетка претходеће\n" +"празнине. ОПЦИЈЕ је једна или више једнословних опција сређивања " +"[bdfgiMhnRrV],\n" +"која превазилази опште опције сређивања за тај кључ. Ако кључ није дат, " +"користи\n" +"цео ред као кључ.\n" +"\n" +"За ВЕЛИЧИНОМ могу да иду пратећи умножавајући суфикси:\n" + +#: src/sort.c:525 +#, fuzzy +msgid "" +"% 1% of memory, b 1, K 1024 (default), and so on for M, G, T, P, E, Z, Y.\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 "" +"% 1% меморије, b 1, K 1024 (основно), и тако редом за M, G, T, P, E, Z, Y.\n" +"\n" +"Без ДАТОТЕКЕ, или када је ДАТОТЕКА -, чита стандардни улаз.\n" +"\n" +"*** УПОЗОРЕЊЕ ***\n" +"Локалитет наведен окружењем утиче на редослед ређања.\n" +"Подешава „LC_ALL=C“ да добави традиционални редослед ређања који користи\n" +"изворне вредности бајта.\n" + +#: src/sort.c:724 +#, c-format +msgid "waiting for %s [-d]" +msgstr "чекам на „%s“ [-d]" + +#: src/sort.c:729 +#, c-format +msgid "%s [-d] terminated abnormally" +msgstr "%s [-d] је неочекивано окончано" + +#: src/sort.c:883 +#, c-format +msgid "cannot create temporary file in %s" +msgstr "не могу да направим привремену датотеку у „%s“" + +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 +msgid "open failed" +msgstr "није успело отварање" + +#: src/sort.c:997 +msgid "fflush failed" +msgstr "није успело „fflush“" + +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 +msgid "close failed" +msgstr "није успело затварање" + +#: src/sort.c:1139 +msgid "couldn't create temporary file" +msgstr "не могу да направим привремену датотеку" + +#: src/sort.c:1178 +#, c-format +msgid "couldn't create process for %s -d" +msgstr "не могу да направим процес за „%s -d“" + +#: src/sort.c:1251 +#, c-format +msgid "warning: cannot remove: %s" +msgstr "упозорење: не могу да уклоним: %s" + +#: src/sort.c:1337 +#, c-format +msgid "invalid --%s argument %s" +msgstr "неисправан „--%s“ аргумент „%s“" + +#: src/sort.c:1340 +#, c-format +msgid "minimum --%s argument is %s" +msgstr "најмањи „--%s“ аргумент је „%s“" + +#: src/sort.c:1355 +#, c-format +msgid "--%s argument %s too large" +msgstr "„--%s“ аргумент „%s“ је превелик" + +#: src/sort.c:1358 +#, c-format +msgid "maximum --%s argument with current rlimit is %s" +msgstr "највећи „--%s“ аргумент са текућим р-ограничењем је „%s“" + +#: src/sort.c:1440 +#, c-format +msgid "number in parallel must be nonzero" +msgstr "број у паралели не сме бити нула" + +#: src/sort.c:1525 +msgid "stat failed" +msgstr "није успело добављање података" + +#: src/sort.c:1787 +msgid "read failed" +msgstr "није успело читање" + +#: src/sort.c:2075 +#, c-format +msgid "string transformation failed" +msgstr "није успело преображавање ниске" + +#: src/sort.c:2078 +#, c-format +msgid "the untransformed string was %s" +msgstr "непрображена ниска беше „%s“" + +#: src/sort.c:2241 +#, c-format +msgid "^ no match for key\n" +msgstr "^ нема поклапања за кључ\n" + +#: src/sort.c:2421 +#, c-format +msgid "obsolescent key %s used; consider %s instead" +msgstr "коришћен је застарели кључ „%s“; уместо њга користите „%s“" + +#: src/sort.c:2427 +#, c-format +msgid "key %lu has zero width and will be ignored" +msgstr "кључ „%lu“ има нулту ширину и биће занемарен" + +#: src/sort.c:2438 +#, c-format +msgid "leading blanks are significant in key %lu; consider also specifying 'b'" +msgstr "водеће празнине су значалне у кључу „%lu“; наведите такође и „b“" + +#: src/sort.c:2451 +#, c-format +msgid "key %lu is numeric and spans multiple fields" +msgstr "кључ „%lu“ је бројчани и простире се преко више поља" + +#: src/sort.c:2483 +#, c-format +msgid "option '-%s' is ignored" +msgid_plural "options '-%s' are ignored" +msgstr[0] "опција „-%s“ је занемарена" +msgstr[1] "опције „-%s“ су занемарене" +msgstr[2] "опције „-%s“ су занемарене" + +#: src/sort.c:2489 +#, c-format +msgid "option '-r' only applies to last-resort comparison" +msgstr "опција „-r“ се примењује само на поређење последњег поновног ређања" + +#: src/sort.c:2763 src/sort.c:2772 +msgid "write failed" +msgstr "писање није успело" + +#: src/sort.c:2815 +#, c-format +msgid "%s: %s:%s: disorder: " +msgstr "%s: %s:%s: поништава ређање: " + +#: src/sort.c:2818 +msgid "standard error" +msgstr "стандардна грешка" + +#: src/sort.c:3737 +msgid "cannot read" +msgstr "не могу да читам" + +#: src/sort.c:4016 +#, c-format +msgid "%s: invalid field specification %s" +msgstr "%s: неисправна одредба поља „%s“" + +#: src/sort.c:4027 +#, c-format +msgid "options '-%s' are incompatible" +msgstr "опције „-%s“ нису сагласне" + +#: src/sort.c:4078 +#, c-format +msgid "%s: invalid count at start of %s" +msgstr "%s: неисправан број на почетку „%s“" + +#: src/sort.c:4335 +msgid "invalid number after '-'" +msgstr "неисправан број након „-“" + +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 +msgid "invalid number after '.'" +msgstr "неисправан број након „.“" + +#: src/sort.c:4355 src/sort.c:4461 +msgid "stray character in field spec" +msgstr "залутали знак у одредби поља" + +#: src/sort.c:4402 +#, c-format +msgid "multiple compress programs specified" +msgstr "наведено је више програма запакивања" + +#: src/sort.c:4419 +msgid "invalid number at field start" +msgstr "неисправан број на почетку поља" + +#: src/sort.c:4423 src/sort.c:4451 +msgid "field number is zero" +msgstr "број поља је нула" + +#: src/sort.c:4432 +msgid "character offset is zero" +msgstr "померај знака је нула" + +#: src/sort.c:4447 +msgid "invalid number after ','" +msgstr "неисправан број након „,“" + +#: src/sort.c:4497 +#, c-format +msgid "empty tab" +msgstr "празан табулатор" + +#: src/sort.c:4590 src/wc.c:726 +#, c-format +msgid "cannot read file names from %s" +msgstr "не могу да прочитам називе датотека из „%s“" + +#: src/sort.c:4612 +#, c-format +msgid "%s:%lu: invalid zero-length file name" +msgstr "%s:%lu: неисправан назив датотеке нулте дужине" + +#: src/sort.c:4618 +#, c-format +msgid "no input from %s" +msgstr "нема улаза са „%s“" + +#: src/sort.c:4664 +#, c-format +msgid "using %s sorting rules" +msgstr "користим %s правила ређања" + +#: src/sort.c:4667 +#, c-format +msgid "using simple byte comparison" +msgstr "користим поређење једног бајта" + +#: src/sort.c:4698 +#, c-format +msgid "extra operand %s not allowed with -%c" +msgstr "додатни операнд „%s“ није допуштен са „-%c“" + +#: src/split.c:207 +#, fuzzy, c-format +msgid "the suffix length needs to be at least %" +msgstr "дужина суфикса треба да буде барем %zu" + +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" +msgstr "Употреба: %s [ОПЦИЈА]... [УЛАЗ [ПРЕФИКС]]\n" + +#: src/split.c:228 +#, fuzzy +msgid "" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" +msgstr "" +"Исписује комаде сталне величине УЛАЗА на ПРЕФИКСaa, ПРЕФИКСab, ...; основна\n" +"величина је 1000 редова, а основни ПРЕФИКС је „x“. Без УЛАЗА, или када је " +"УЛАЗ\n" +"-, чита стандардни улаз.\n" + +#: src/split.c:236 +#, fuzzy, c-format +msgid "" +" -a, --suffix-length=N generate suffixes of length N (default %d)\n" +" --additional-suffix=SUFFIX append an additional SUFFIX to file names\n" +" -b, --bytes=SIZE put SIZE bytes per output file\n" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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/records per output file\n" +" -n, --number=CHUNKS generate CHUNKS output files; see explanation " +"below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" +" -u, --unbuffered immediately copy input to output with '-n r/...'\n" +msgstr "" +" -a, --suffix-length=N ствара суфиксе дужине N (основно је %d)\n" +" --additional-suffix=СУФИКС придодаје додатни СУФИКС на називе " +"датотека\n" +" -b, --bytes=ВЕЛИЧИНА ставља ВЕЛИЧИНА бајтова по излазној датотеци\n" +" -C, --line-bytes=ВЕЛИЧИНА ставља највише ВЕЛИЧИНА бајтова редова по " +"излазној датотеци\n" +" -d, --numeric-suffixes[=ОД] користи бројчане суфиксе уместо азбучне;\n" +" F (default 0)\n" +" -e, --elide-empty-files не ствара празне излазне датотеке са „-n“\n" +" --filter=НАРЕДБА пише НАРЕДБУ на шкољку; назив датотеке је " +"„$ДАТОТЕКА“\n" +" -l, --lines=БРОЈ ставља БРОЈ редова по излазној датотеци\n" +" -n, --number=ДЕЛИЋИ ствара ДЕЛИЋИ излазне датотеке; видите објашњење " +"испод\n" +" -u, --unbuffered одмах умножава улаз на излаз са „-n r/...“\n" + +#: src/split.c:251 +msgid "" +" --verbose print a diagnostic just before each\n" +" output file is opened\n" +msgstr "" +" --verbose исписује дијагнозу одмах пре отварања\n" +" сваке излазне датотеке\n" + +#: src/split.c:258 +#, fuzzy +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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" +"\n" +"ДЕЛИЋИ могу бити:\n" +"N дели на N датотека на основу величине улаза\n" +"K/N даје K-ти од N на стандардни излаз\n" +"l/N дели на N датотека без дељења редова\n" +"l/K/N даје K-ти од N на стандардни излаз без дељења редова\n" +"r/N као „l“ али користи расподелу кружног додељивања\n" +"r/K/N слично али даје само K-ти од N на стандардни излаз\n" + +#: src/split.c:407 +#, c-format +msgid "output file suffixes exhausted" +msgstr "потрошени су суфикси излазне датотеке" + +#: src/split.c:419 +#, c-format +msgid "creating file %s\n" +msgstr "правим датотеку „%s“\n" + +#: src/split.c:428 +#, c-format +msgid "%s would overwrite input; aborting" +msgstr "„%s“ би преписао улаз; прекидам" + +#: src/split.c:444 +#, c-format +msgid "failed to set FILE environment variable" +msgstr "нисам успео да подесим променљиву окружења ДАТОТЕКЕ" + +#: src/split.c:446 +#, c-format +msgid "executing with FILE=%s\n" +msgstr "извршавам са ДАТОТЕКА=%s\n" + +#: src/split.c:448 +#, c-format +msgid "failed to create pipe" +msgstr "нисам успео да направим спојку" + +#: src/split.c:462 +#, c-format +msgid "closing prior pipe" +msgstr "затварам пређашњу спојку" + +#: src/split.c:464 +#, c-format +msgid "closing output pipe" +msgstr "затварам излазну спојку" + +#: src/split.c:468 +#, c-format +msgid "moving input pipe" +msgstr "премештам улазну спојку" + +#: src/split.c:470 +#, c-format +msgid "closing input pipe" +msgstr "затварам улазну спојку" + +#: src/split.c:475 +#, c-format +msgid "failed to run command: \"%s -c %s\"" +msgstr "нисам успео да покренем наредбу „%s -c %s“" + +#: src/split.c:481 +#, c-format +msgid "failed to close input pipe" +msgstr "нисам успео да затворим улазну спојку" + +#: src/split.c:517 +#, c-format +msgid "waiting for child process" +msgstr "чекам на подређени процес" + +#: src/split.c:527 +#, c-format +msgid "with FILE=%s, signal %s from command: %s" +msgstr "са ДАТОТЕКА=%s, сигнал „%s“ из наредбе: %s" + +#: src/split.c:535 +#, c-format +msgid "with FILE=%s, exit %d from command: %s" +msgstr "са ДАТОТЕКА=%s, излаз „%d“ из наредбе: %s" + +#: src/split.c:542 +#, c-format +msgid "unknown status from command (0x%X)" +msgstr "непознато стање из наредбе (0x%X)" + +#: src/split.c:1195 +#, c-format +msgid "cannot split in more than one way" +msgstr "не могу да поделим на више од једног начина" + +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" +msgstr "%s: неисправан број делића" + +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" +msgstr "%s: неисправан број делића" + +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" +msgstr "%s: неисправна дужина суфикса" + +#: src/split.c:1333 +#, c-format +msgid "empty record separator" +msgstr "" + +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "више-знаковни табулатор „%s“" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "посебна датотека мултиплексираног знака" + +#: src/split.c:1383 +#, c-format +msgid "line count option -%s%c... is too large" +msgstr "опција бројања реда „-%s%c...“ је превелика" + +#: src/split.c:1395 +#, c-format +msgid "%s: invalid start value for numerical suffix" +msgstr "%s: неисправна почетна вредност за бројчани суфикс" + +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" +msgstr "%s: неисправна УИ величина блока" + +#: src/split.c:1437 +#, c-format +msgid "--filter does not process a chunk extracted to stdout" +msgstr "„--filter“ не обрађује делић извучен на стандардни излаз" + +#: src/split.c:1477 +#, c-format +msgid "numerical suffix start value is too large for the suffix length" +msgstr "вредност почетка бројчаног суфикса је превелика за дужину суфикса" + +#: src/split.c:1528 +#, c-format +msgid "%s: cannot determine file size" +msgstr "%s: не могу да одредим величину датотеке" + +#. This is a proper name. See the gettext manual, section Names. +#: src/stat.c:179 +msgid "Michael Meskes" +msgstr "Мајкл Мескес" + +#: src/stat.c:890 +#, c-format +msgid "failed to canonicalize %s" +msgstr "нисам успео да стандардизујем „%s“" + +#: src/stat.c:1132 +#, c-format +msgid "warning: unrecognized escape '\\%c'" +msgstr "упозорење: непознато истицање „\\%c“" + +#: src/stat.c:1187 +#, c-format +msgid "%s: invalid directive" +msgstr "%s: неисправна упута" + +#: src/stat.c:1234 +#, c-format +msgid "warning: backslash at end of format" +msgstr "упозорење: контра коса црта на крају записа" + +#: src/stat.c:1265 +#, c-format +msgid "using %s to denote standard input does not work in file system mode" +msgstr "" +"коришћење „%s“ за назначавање стандардног улаза не ради у режиму система " +"датотека" + +#: src/stat.c:1272 +#, c-format +msgid "cannot read file system information for %s" +msgstr "не могу да прочитам податке о систему датотека за „%s“" + +#: src/stat.c:1293 +#, 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:1329 +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 "" +" Датотека: „%n“\n" +" ИБ: %-8i Дужназива: %-7l Врста: %T\n" +"Величина блока: %-10s Основна величина блока: %S\n" +"Блокови: Укупно: %-10b Слободних: %-10f Доступних: %a\n" +"И-чворови: Укупно: %-10c Слободних: %d\n" + +#. TRANSLATORS: This string uses format specifiers from +#. 'stat --help' without --file-system, and NOT from printf. +#: src/stat.c:1352 +msgid "" +" File: %N\n" +" Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" +msgstr "" +" Датотека: %N\n" +" Величина: %-10s\tБлокови: %-10b УИ блок: %-6o %F\n" + +#. TRANSLATORS: This string uses format specifiers from +#. 'stat --help' without --file-system, and NOT from printf. +#: src/stat.c:1362 +msgid "Device: %Dh/%dd\tInode: %-10i Links: %-5h Device type: %t,%T\n" +msgstr "Уређај: %Dh/%dd\tИ-чвор: %-10i Веза: %-5h Врста уређаја: %t,%T\n" + +#. TRANSLATORS: This string uses format specifiers from +#. 'stat --help' without --file-system, and NOT from printf. +#: src/stat.c:1370 +msgid "Device: %Dh/%dd\tInode: %-10i Links: %h\n" +msgstr "Уређај: %Dh/%dd\tИ-чвор: %-10i Везе: %h\n" + +#. TRANSLATORS: This string uses format specifiers from +#. 'stat --help' without --file-system, and NOT from printf. +#: src/stat.c:1379 +msgid "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" +msgstr "Приступ: (%04a/%10.10A) Јиб: (%5u/%8U) Гиб: (%5g/%8G)\n" + +#. TRANSLATORS: This string uses format specifiers from +#. 'stat --help' without --file-system, and NOT from printf. +#: src/stat.c:1389 +#, c-format +msgid "Context: %C\n" +msgstr "Контекст: %C\n" + +#: src/stat.c:1397 +msgid "" +"Access: %x\n" +"Modify: %y\n" +"Change: %z\n" +" Birth: %w\n" +msgstr "" +"Приступ: %x\n" +"Измена: %y\n" +"Промена: %z\n" +" Створен: %w\n" + +#: src/stat.c:1415 +msgid "Display file or file system status.\n" +msgstr "Приказује стање датотеке или система датотека.\n" + +#: src/stat.c:1421 +msgid "" +" -L, --dereference follow links\n" +" -f, --file-system display file system status instead of file status\n" +msgstr "" +" -L, --dereference прати везе\n" +" -f, --file-system приказује стање система датотека уместо стања " +"датотеке\n" + +#: src/stat.c:1425 +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 "" +" -c --format=ЗАПИС користи наведени ЗАПИС уместо основног;\n" +" даје нови ред након сваког коришћења ЗАПИСА\n" +" --printf=ЗАПИС као „--format“, али тумачи крајичнике контра косе " +"црте,\n" +" а не даје обавезни пратећи нови ред;\n" +" ако желите нови ред, укључите \\n у ЗАПИСУ\n" +" -t, --terse исписује податке у сажетом облику\n" + +#: src/stat.c:1436 +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 "" +"\n" +"Исправни низови записа за датотеке (без --file-system):\n" +"\n" +" %a права приступа у окталу\n" +" %A права приступа у облику читљивом људима\n" +" %b број додељених блокова (видите %B)\n" +" %B величина у бајтовима сваког блока које извести %b\n" +" %C ниска безбедносног контекста СЕЛинукса\n" + +#: src/stat.c:1445 +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 "" +" %d децимални број уређаја\n" +" %D хексадецимални број уређаја\n" +" %f хексадецимални сирови режим\n" +" %F врста датотеке\n" +" %g ИБ групе власника\n" +" %G назив групе власника\n" + +#: src/stat.c:1453 +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, for character/block device special files\n" +" %T minor device type in hex, for character/block device special files\n" +msgstr "" +" %h број чврстих веза\n" +" %i број и-чвора\n" +" %m тачка качења\n" +" %n назив датотеке\n" +" %N цитирани назив датотеке са разупутом ако је симболичка веза\n" +" %o оптимална величина У/И преноса\n" +" %s укупна величина, у бајтовима\n" +" %t врста већег уређаја хексадецимално, за посебне датотеке уређаја знака/" +"блока\n" +" %T врста мањег уређаја хексадецимално, за посебне датотеке уређаја знака/" +"блока\n" + +#: src/stat.c:1464 +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 data modification, human-readable\n" +" %Y time of last data modification, seconds since Epoch\n" +" %z time of last status change, human-readable\n" +" %Z time of last status change, seconds since Epoch\n" +"\n" +msgstr "" +" %u кориснички ИБ власника\n" +" %U корисничко име власника\n" +" %w време стварања датотеке, људима читљиво; - ако је непознато\n" +" %W време стварања датотеке, секунде од старине; 0 ако је непознато\n" +" %x време последњег приступа, људима читљиво\n" +" %X време последњег приступа, секунде од старине\n" +" %y време последње измене података, људима читљиво\n" +" %Y време последње измене података, секунде од старине\n" +" %z време последње промене стања, људима читљиво\n" +" %Z време последње промене стања, секунде од старине\n" +"\n" + +#: src/stat.c:1478 +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 "" +"Исправни низови записа за системе датотека:\n" +"\n" +" %a слободни блокови доступни обичном кориснику\n" +" %b укупно блокова података на систему датотека\n" +" %c укупно чворова датотека на систему датотека\n" +" %d слободни чворови датотека на систему датотека\n" +" %f слободни блокови на систему датотека\n" + +#: src/stat.c:1487 +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 "" +" %i ИБ система датотека хексадецимално\n" +" %l највећа дужина назива датотека\n" +" %n назив датотеке\n" +" %s величина блока (за бржи пренос)\n" +" %S основна величина блока (за број блокова)\n" +" %t врста система датотека хексадецимално\n" +" %T врста система датотека у облику читљивом људима\n" + +#: src/stdbuf.c:90 +#, c-format +msgid "Usage: %s OPTION... COMMAND\n" +msgstr "Употреба: %s ОПЦИЈА... НАРЕДБА...\n" + +#: src/stdbuf.c:91 +msgid "" +"Run COMMAND, with modified buffering operations for its standard streams.\n" +msgstr "" +"Покреће НАРЕДБУ, са измењеним радњама међумеморисања за њене уобичајене " +"токове.\n" + +#: 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=РЕЖИМ дотерује међумеморисање тока стандардног улаза\n" +" -o, --output=РЕЖИМ дотерује међумеморисање тока стандардног излаза\n" +" -e, --error=РЕЖИМ дотерује међумеморисање тока стандардне грешке\n" + +#: 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" +"Ако је РЕЖИМ „L“ одговарајући ток ће бити редом међумеморисан.\n" +"Ова опција је неисправна са стандардним улазом.\n" + +#: src/stdbuf.c:107 +msgid "" +"\n" +"If MODE is '0' the corresponding stream will be unbuffered.\n" +msgstr "" +"\n" +"Ако је РЕЖИМ „0“ одговарајући ток неће бити међумеморисан.\n" + +#: 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 "" +"\n" +"У супротном РЕЖИМ је број за којим може да следи једно од следећег:\n" +"KB 1000, K 1024, MB 1000*1000, M 1024*1024, и тако редом за G, T, P, E, Z, " +"Y.\n" +"У том случају одговарајући ток ће бити потпуно међумеморисан са величином\n" +"међумеморије постављеном на РЕЖИМ бајтова.\n" + +#: src/stdbuf.c:116 +#, fuzzy +msgid "" +"\n" +"NOTE: If COMMAND adjusts the buffering of its standard streams ('tee' does\n" +"for example) then that will override corresponding changes 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 "" +"\n" +"НАПОМЕНА: Ако НАРЕДБА дотерује међумеморисање својих стандардних токова " +"(„tee“\n" +"нпр.) тада ће то заобићи одговарајућа подешавања измењених „stdbuf“-ом.\n" +"Такође неки пропусници (као „dd“ и „cat“ итд.) не користе токове за У/И,\n" +"а то су они на које не утичу подешавања „stdbuf“-а.\n" + +#: src/stdbuf.c:241 +#, c-format +msgid "failed to find %s" +msgstr "нисам успео да нађем „%s“" + +#: src/stdbuf.c:265 src/stdbuf.c:299 +#, c-format +msgid "failed to update the environment with %s" +msgstr "нисам успео да освежим окружење са „%s“" + +#: src/stdbuf.c:345 +#, c-format +msgid "line buffering stdin is meaningless" +msgstr "међумеморисање редом стандардног улаза нема смисла" + +#: src/stdbuf.c:376 +#, c-format +msgid "you must specify a buffering mode option" +msgstr "морате навести опцију режима међумеморисања" + +#: src/stty.c:524 +#, 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 [-F УРЕЂАЈ | --file=УРЕЂАЈ] [ПОДЕШАВАЊЕ]...\n" +" или: %s [-F УРЕЂАЈ | --file=УРЕЂАЈ] [-a|--all]\n" +" или: %s [-F УРЕЂАЈ | --file=УРЕЂАЈ] [-g|--save]\n" + +#: src/stty.c:530 +msgid "Print or change terminal characteristics.\n" +msgstr "Испсиује или мења одлике терминала.\n" + +#: src/stty.c:536 +msgid "" +" -a, --all print all current settings in human-readable form\n" +" -g, --save print all current settings in a stty-readable form\n" +" -F, --file=DEVICE open and use the specified DEVICE instead of stdin\n" +msgstr "" +" -a, --all исписује сва текућа подешавања у облику читљивом " +"људима\n" +" -g, --save исписује сва текућа подешавања у облику читљивом с-" +"конзоли\n" +" -F, --file=УРЕЂАЈ отвара и користи наведени УРЕЂАЈ уместо стандардног " +"улаза\n" + +#: src/stty.c:543 +msgid "" +"\n" +"Optional - before SETTING indicates negation. An * marks non-POSIX\n" +"settings. The underlying system defines which settings are available.\n" +msgstr "" +"\n" +"Изборна - пре ПОДЕШАВАЊА означава негацију. Знак * не-ПОСИКС\n" +"подешавања. Систем у употреби одређује која подешавања су доступна.\n" + +#: src/stty.c:548 +msgid "" +"\n" +"Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" +" * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" +" eof CHAR CHAR will send an end of file (terminate the input)\n" +" eol CHAR CHAR will end the line\n" +msgstr "" +"\n" +"Посебни знаци:\n" +" * dsusp ЗНАК ЗНАК ће послати знак за заустављање терминала након " +"пресипања улаза\n" +" eof ЗНАК ЗНАК ће послати крај датотеке (окончати улаз)\n" +" eol ЗНАК ЗНАК ће завршити ред\n" + +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy +msgid "" +" 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 ЗНАК заменски ЗНАК за крај реда\n" +" erase ЗНАК ЗНАК ће обрисати последњи укуцани знак\n" +" intr ЗНАК ЗНАК ће послати сигнал прекида\n" +" kill ЗНАК ЗНАК ће обрисати текући ред\n" + +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 +#, fuzzy +msgid "" +" start CHAR CHAR will restart the output after stopping it\n" +" stop CHAR CHAR will stop the output\n" +" susp CHAR CHAR will send a terminal stop signal\n" +msgstr "" +" stop ЗНАК ЗНАК ће зауставити излаз\n" +" susp ЗНАК ЗНАК ће послати сигнал заустављања терминала\n" +" * swtch ЗНАК ЗНАК ће пребацити на други слој конзоле\n" +" * werase ЗНАК ЗНАК ће обрисати последњу укуцану реч\n" + +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 +#, fuzzy +msgid "" +"\n" +"Special settings:\n" +" N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Посебна подешавања:\n" +" N поставља брзину улаза и излаза на N бита у сек.\n" +" * cols N говори језгру да терминал има N ступца\n" +" * columns N исто као „cols N“\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" +" * cols N tell the kernel that the terminal has N columns\n" +" * columns N same as cols N\n" +msgstr "" +"\n" +"Посебна подешавања:\n" +" N поставља брзину улаза и излаза на N бита у сек.\n" +" * cols N говори језгру да терминал има N ступца\n" +" * columns N исто као „cols N“\n" + +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy +msgid "" +" min N with -icanon, set N characters minimum for a completed " +"read\n" +" ospeed N set the output speed to N\n" +msgstr "" +" ispeed N подешава улазну брзину на N\n" +" * line N користи дисциплину реда N\n" +" min N са „-icanon“, поставља најмање N знакова за обављено " +"читање\n" +" ospeed N поставља излазну брзину на N\n" + +#: src/stty.c:632 +#, fuzzy +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" +msgstr "" +" * rows N говори језгру да терминал има N реда\n" +" * size исписује број редова и стубаца у складу са језгром\n" +" speed исписује брзину терминала\n" +" time N са „-icanon“, подешава време истека читања на N десетих " +"секунде\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" +" speed print the terminal speed\n" +" time N with -icanon, set read timeout of N tenths of a second\n" +msgstr "" +" * rows N говори језгру да терминал има N реда\n" +" * size исписује број редова и стубаца у складу са језгром\n" +" speed исписује брзину терминала\n" +" time N са „-icanon“, подешава време истека читања на N десетих " +"секунде\n" + +#: src/stty.c:641 +msgid "" +"\n" +"Control settings:\n" +" [-]clocal disable modem control signals\n" +" [-]cread allow input to be received\n" +msgstr "" + +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 +#, fuzzy +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 "" +" [-]cstopb користи два бита заустављања по знаку (један са -)\n" +" [-]hup шаље сигнал прекида када последњи процес затвори конзолу\n" +" [-]hupcl исто као „[-]hup“\n" +" [-]parenb ствара бит паритета на излазу и очекује бит паритета на " +"улазу\n" +" [-]parodd поставља непарни паритет (или парни са -)\n" +" * [-]cmspar користи „stick“ (/space) паритет\n" + +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy +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" +" [-]ignpar ignore characters with parity errors\n" +msgstr "" +"\n" +"Подешавања улаза:\n" +" [-]brkint прекиди доводе до сигнала прекида\n" +" [-]icrnl преводи крајник реда у нови ред\n" +" [-]ignbrk занемарује знаке прекида\n" +" [-]igncr занемарује крајник реда\n" + +#: src/stty.c:682 +msgid "" +" * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" +" [-]inlcr translate newline to carriage return\n" +" [-]inpck enable input parity checking\n" +" [-]istrip clear high (8th) bit of input characters\n" +msgstr "" +" [-]ignpar занемарује знаке са грашкама паритета\n" +" * [-]imaxbel пишти и не пресипа пуну улазну међумеморију на знаку\n" +" [-]inlcr преводи нови ред у крајник реда\n" +" [-]inpck укључује проверу паритета улаза\n" +" [-]istrip чисти високи (8-ми) бит од знакова улаза\n" + +#: src/stty.c:692 +msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" +msgstr " * [-]iutf8 подразумева УТФ-8 кодирање улазних знакова\n" + +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr " * [-]iutf8 подразумева УТФ-8 кодирање улазних знакова\n" + +#: src/stty.c:702 +msgid "" +" * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" +" [-]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 "" +" * [-]iuclc преводи знакове великих слова у мала слова\n" +" * [-]ixany даје сваком знаку да поново покрене излаз, а не само знаку " +"покретања\n" +" [-]ixoff укључује слање знакова покретања/заустављања\n" +" [-]ixon укључује ИксУКЉ./ИксИСКЉ. управљање током\n" +" [-]parmrk означава грешке паритета (низом 255-0-знакова)\n" +" [-]tandem исто као „[-]ixoff“\n" + +#: src/stty.c:712 +msgid "" +"\n" +"Output settings:\n" +msgstr "" + +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 +msgid "" +" * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" +" * [-]ofill use fill (padding) characters instead of timing for delays\n" +msgstr "" + +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 +msgid "" +" * tabN horizontal tab delay style, N in [0..3]\n" +" * tabs same as tab0\n" +" * -tabs same as tab3\n" +msgstr "" + +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 +msgid "" +"\n" +"Local settings:\n" +" [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" +" * 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 "" +"\n" +"Месна подешавања:\n" +" [-]crterase „echo“ брише знакове као повратница-размак-повратница\n" +" * crtkill убија све редове извршавајући подешавања „echoprt“-а и " +"„echoe“-а\n" +" * -crtkill убија све редове извршавајући подешавања „echoctl“-а и " +"„echok“-а\n" + +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +#, fuzzy +msgid " [-]echo echo input characters\n" +msgstr " * [-]iutf8 подразумева УТФ-8 кодирање улазних знакова\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 +msgid "" +" [-]echoe same as [-]crterase\n" +" [-]echok echo a newline after a kill character\n" +msgstr "" + +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 +msgid "" +" * [-]echoprt echo erased characters backward, between '\\' and '/'\n" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\n" +" [-]iexten enable non-POSIX special characters\n" +msgstr "" +" [-]isig укључује посебне знаке прекида, завршетка и обустављања\n" +" [-]noflsh искључује испирање након нарочитих знакова прекида и " +"завршетка\n" +" * [-]prterase исто као „[-]echoprt“\n" +" * [-]tostop зауставља позадинске послове који покушавају да пишу на " +"терминал\n" +" * [-]xcase са „icanon“, завршава ред са \\ за знаке великих слова\n" + +#: src/stty.c:843 +#, fuzzy +msgid "" +" [-]isig enable interrupt, quit, and suspend special characters\n" +" [-]noflsh disable flushing after interrupt and quit special " +"characters\n" +msgstr "" +" [-]isig укључује посебне знаке прекида, завршетка и обустављања\n" +" [-]noflsh искључује испирање након нарочитих знакова прекида и " +"завршетка\n" +" * [-]prterase исто као „[-]echoprt“\n" +" * [-]tostop зауставља позадинске послове који покушавају да пишу на " +"терминал\n" +" * [-]xcase са „icanon“, завршава ред са \\ за знаке великих слова\n" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 +msgid "" +"\n" +"Combination settings:\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" +" cbreak same as -icanon\n" +" -cbreak same as icanon\n" +msgstr "" +"\n" +"Подешавања комбинације:\n" +" * [-]LCASE исто као: [-]lcase\n" +" cbreak исто као: -icanon\n" +" -cbreak исто као: icanon\n" + +#: src/stty.c:875 +#, fuzzy +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" +msgstr "" +" cooked исто као " +"„brkint“ „ignpar“ „istrip“ „icrnl“ „ixon“ „opost“ „isig“\n" +" „icanon“, „eof“ и „eol“ знакове на њихове основне " +"вредности\n" +" -cooked исто као „raw“\n" +" crt исто као „echoe“ „echoctl“ „echoke“\n" + +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format +msgid "" +" dec same as %s intr ^c erase 0177\n" +" kill ^u\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" +" ek erase and kill characters to their default values\n" +" evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 +#, fuzzy +msgid "" +" litout same as -parenb -istrip -opost cs8\n" +" -litout same as parenb istrip opost cs7\n" +msgstr "" +" -evenp исто као: -parenb cs8\n" +" * [-]lcase исто као: xcase iuclc olcuc\n" +" litout исто као: -parenb -istrip -opost cs8\n" +" -litout исто као: parenb istrip opost cs7\n" +" nl исто као: -icrnl -onlcr\n" +" -nl исто као: icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" + +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"Подешавања комбинације:\n" +" * [-]LCASE исто као: [-]lcase\n" +" cbreak исто као: -icanon\n" +" -cbreak исто као: icanon\n" + +#: src/stty.c:943 +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 "" +" oddp исто као: parenb parodd cs7\n" +" -oddp исто као: -parenb cs8\n" +" [-]parity исто као: [-]evenp\n" +" pass8 исто као: -parenb -istrip cs8\n" +" -pass8 исто као: parenb istrip cs7\n" + +#: src/stty.c:950 +#, fuzzy, c-format +msgid "" +" raw same as -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" +" -raw same as cooked\n" +msgstr "" +" raw исто као: -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 исто као: cooked\n" + +#: src/stty.c:969 +#, fuzzy, c-format +msgid "" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" +msgstr "" +" sane исто као: 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" +" знаке на њихове основне вредности\n" + +#: src/stty.c:1052 +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 "" +"\n" +"Ради са редом конзоле повезаном на стандардни улаз. Без аргумената,\n" +"исписује проток бајтова, дисциплину реда, и одступање од здраве с-конзоле.\n" +"У подешавањима, ЗНАК се узима дословно, или кодиран као у ^c, 0x37, 0177 " +"или\n" +"127; нарочите вредности ^- или „undef“ коришћено за искључивање нарочитих " +"знакова.\n" + +#: src/stty.c:1124 +#, c-format +msgid "only one device may be specified" +msgstr "само један уређај може бити наведен" + +#: src/stty.c:1154 +#, c-format +msgid "" +"the options for verbose and stty-readable output styles are\n" +"mutually exclusive" +msgstr "" +"опције за стилове опширног и читљиве с-конзоле се\n" +"међусобно искључују" + +#: src/stty.c:1160 +#, c-format +msgid "when specifying an output style, modes may not be set" +msgstr "приликом навођења излазног стила,режими не могу бити подешени" + +#: src/stty.c:1175 +#, c-format +msgid "%s: couldn't reset non-blocking mode" +msgstr "%s: не могу поново да поставим режим не-блокирања" + +#: src/stty.c:1226 src/stty.c:1350 +#, c-format +msgid "invalid argument %s" +msgstr "неисправан аргумент „%s“" + +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 +#, c-format +msgid "missing argument to %s" +msgstr "недостаје аргумент за „%s“" + +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: грешка скраћивања" + +#: src/stty.c:1331 +#, c-format +msgid "invalid line discipline %s" +msgstr "неисправна дисциплина реда „%s“" + +#: src/stty.c:1401 +#, c-format +msgid "%s: unable to perform all requested operations" +msgstr "%s: не могу да обавим све затражене радње" + +#: src/stty.c:1747 +#, c-format +msgid "%s: no size information for this device" +msgstr "%s: нема података величине за овај уређај" + +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" +msgstr "неисправан аргумент целог броја %s" + +#. This is a proper name. See the gettext manual, section Names. +#: src/sum.c:37 +msgid "Kayvan Aghaiepour" +msgstr "Кајван Агајепур" + +#: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "Исписшите ЦРЦ суму провере и број бајтова за сваку ДАТОТЕКУ.\n" + +#: src/sum.c:68 +#, fuzzy +msgid "" +"\n" +" -r use BSD sum algorithm, use 1K blocks\n" +" -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" +msgstr "" +"Исписује суму провере и број блокова за сваку ДАТОТЕКУ.\n" +"\n" +" -r користи алгоритам збира БСД-а, користи блокове од 1K\n" +" -s, --sysv користи алгоритам збира Система V, користи блокове од 512 " +"бајта\n" + +#: src/sync.c:64 +#, fuzzy, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Употреба: %s [ОПЦИЈА]... [ДАТОТЕКА]...\n" + +#: src/sync.c:65 +msgid "" +"Synchronize cached writes to persistent storage\n" +"\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" +"\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "грешка читања „%s“" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: не могу поново да поставим режим не-блокирања" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "грешка читања „%s“" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "" + +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 +#, 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 "" +"\n" +"НАПОМЕНА: ваша шкољка може имати своје издање %s, које обично смењује\n" +"издање које је описано овде. Молим погледајте документацију ваше шкољке\n" +"за детаље о опцијама које подржава.\n" + +#: src/system.h:343 +msgid " --help display this help and exit\n" +msgstr " --help приказује ову помоћ и излази\n" + +#: src/system.h:345 +msgid " --version output version information and exit\n" +msgstr " --version исписује податке о издању и излази\n" + +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Без ДАТОТЕКЕ, или када је ДАТОТЕКА -, чита стандардни улаз.\n" + +#: 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" +"The SIZE argument is an integer and optional unit (example: 10K is " +"10*1024).\n" +"Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" +msgstr "" +"\n" +"Аргумент ВЕЛИЧИНА је цео број и изборна јединица (пример: 10K је 10*1024).\n" +"Јединице су K,M,G,T,P,E,Z,Y (степени од 1024) или KB,MB,... (степени од " +"1000).\n" + +#: 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 "" +"\n" +"Приказане вредности у јединицама прве доступне ВЕЛИЧИНЕ из „--block-size“,\n" +"и „%s_BLOCK_SIZE“, „BLOCK_SIZE“ и „BLOCKSIZE“ променљиве окружења.\n" +"У супротном, јединице прелазе на 1024 бајта (или 512 ако је подешено " +"„POSIXLY_CORRECT“).\n" + +#: src/system.h:590 +#, c-format +msgid "" +"\n" +"%s online help: <%s>\n" +msgstr "" +"\n" +"Помоћ на мрежи за „%s“: <%s>\n" + +#. TRANSLATORS: Replace LANG_CODE in this URL with your language code +#. 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:601 +#, c-format +msgid "Report %s translation bugs to \n" +msgstr "" +"Грешке у преводу „%s“ пријавите на „“\n" + +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "" + +#: src/system.h:613 +#, c-format +msgid "Try '%s --help' for more information.\n" +msgstr "Пробајте „%s --help“ за више података.\n" + +#: src/system.h:655 +#, 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 "" +"УПОЗОРЕЊЕ: Кружна структура директоријума.\n" +"Ово скоро сигурно значи да сте оштетили систем датотека.\n" +"ОБАВЕСТИТЕ ВАШЕГ АДМИНИСТРАТОРА СИСТЕМА.\n" +"Следећи директоријум је део круга:\n" +" %s\n" + +#. 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" +msgstr "" +"Пише сваку ДАТОТЕКУ на стандардни излаз, прво последњи ред\n" +"Без ДАТОТЕКЕ, или када је ДАТОТЕКА -, чита стандардни улаз.\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 "" +" -b, --before придодаје раздвојника пре уместо после\n" +" -r, --regex тумачи раздвојника као регуларан израз\n" +" -s, --separator=НИСКА користи НИСКУ као раздвојника уместо новог реда\n" + +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 +#, c-format +msgid "%s: seek failed" +msgstr "%s: није успело „seek“" + +#: src/tac.c:277 +#, c-format +msgid "record too large" +msgstr "снимакје превелик" + +#: src/tac.c:459 +#, c-format +msgid "failed to create temporary file in %s" +msgstr "нисам успео да направим привремену датотеку у „%s“" + +#: src/tac.c:467 +#, c-format +msgid "failed to open %s for writing" +msgstr "нисам успео да отворим „%s“ за читање" + +#: src/tac.c:484 +#, c-format +msgid "failed to rewind stream for %s" +msgstr "нисам успео да премотам ток уназад за „%s“" + +#: src/tac.c:521 src/tac.c:533 +#, c-format +msgid "%s: write error" +msgstr "%s: грешка уписа" + +#: src/tac.c:587 +#, c-format +msgid "failed to open %s for reading" +msgstr "нисам успео да отворим %s за читање" + +#: src/tac.c:645 +#, c-format +msgid "separator cannot be empty" +msgstr "раздвојник не може бити празан" + +#. This is a proper name. See the gettext manual, section Names. +#: src/tail.c:73 +msgid "Ian Lance Taylor" +msgstr "Јан Ленс Тејлор" + +#: src/tail.c:257 +#, 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" +msgstr "" +"Испсиује последњих „%d“ редова сваке ДАТОТЕКЕ на стандардни излаз.\n" +"Са више од једне ДАТОТЕКЕ, претходи сваку са заглављем дајући назив " +"датотеке.\n" +"Без ДАТОТЕКЕ, или када је ДАТОТЕКА -, чита стандардни улаз.\n" + +#: src/tail.c:265 +msgid "" +" -c, --bytes=K output the last K bytes; or use -c +K to output\n" +" bytes starting with the Kth of each file\n" +msgstr "" +" -c, --bytes=K исписује последња K бајта; или користите „-c +K“ " +"да испишете\n" +" бајтове почевши са K-тим сваке датотеке\n" + +#: src/tail.c:269 +msgid "" +" -f, --follow[={name|descriptor}]\n" +" output appended data as the file grows;\n" +" an absent option argument means 'descriptor'\n" +" -F same as --follow=name --retry\n" +msgstr "" +" -f, --follow[={назив|описника}]\n" +" исписује придодате податке како се повећава " +"датотека;\n" +" одсутан аргумент опције значи „descriptor“\n" +" -F исто као „--follow=назив“ --retry\n" + +#: src/tail.c:275 +#, c-format +msgid "" +" -n, --lines=K output the last K lines, instead of the last %d;\n" +" or use -n +K to output starting with the Kth\n" +" --max-unchanged-stats=N\n" +" with --follow=name, reopen a FILE which has not\n" +" changed size after N (default %d) iterations\n" +" to see if it has been unlinked or renamed\n" +" (this is the usual case of rotated log files);\n" +" with inotify, this option is rarely useful\n" +msgstr "" +" -n, --lines=K output the last K lines, instead of the last %d;\n" +" or use -n +K to output starting with the Kth\n" +" --max-unchanged-stats=N\n" +" са „--follow=назив“, поново отвара ДАТОТЕКУ која\n" +" није променила величину након N (основно %d)\n" +" понављања да види да ли је развезана или " +"преименована\n" +" (ово је уобичајени случај окренутих датотека " +"дневника);\n" +" са „inotify“, ова опција је ретко корисна\n" + +#: src/tail.c:288 +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 if it is inaccessible\n" +msgstr "" +" --pid=ПИБ са „-f“, окончава након умирања ИБ-а, ПИБ-а " +"процеса\n" +" -q, --quiet, --silent никада не исписује заглавља која дају називе " +"датотека\n" +" --retry покушава да отвори датотеку ако је неприступачна\n" + +#: src/tail.c:293 +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 "" +" -s, --sleep-interval=N са „-f“, спава приближно N секунде\n" +" (основно 1.0) између понављања;\n" +" са „inotify“ и „--pid=P“, проверава процес „P“\n" +" барем једном сваке N секунде\n" +" -v, --verbose увек исписује заглавља која дају називе датотека\n" + +#: src/tail.c:302 +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 "" +"\n" +"Ако је први знак за K (број бајтова или редова) +, исписује\n" +"почевши са K-том ставком од почетка сваке датотеке, у супротном,\n" +"исписује последње K ставке у датотеци. K може имати суфикс умножавања:\n" +"b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024, GB 1000*1000*1000,\n" +"G 1024*1024*1024, и тако редом за T, P, E, Z, Y.\n" +"\n" + +#: src/tail.c:311 +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 "" +"Са „--follow (-f)“, „tail“ се пребацује да прати описника датотеке, што " +"значи\n" +"чак и када је „tail“-ована датотека преименована, „tail“ ће наставити да " +"прати\n" +"њен крај. Ово основно понашање није пожељно када стварно желите да пратите\n" +"стварни назив датотеке, а не описника датотеке (нпр., окретањедневника).\n" +"Користите „--follow=назив“ у том случају. Ово доводи до тога да„tail“ " +"прати\n" +"именовану датотеку на начин који омогућава преименовање, уклањање и " +"стварање.\n" + +#: src/tail.c:363 +#, c-format +msgid "closing %s (fd=%d)" +msgstr "затварам „%s“ (fd=%d)" + +#: src/tail.c:456 +#, c-format +msgid "%s: cannot seek to end-relative offset %s" +msgstr "%s: не могу да премотам на привидни-крајњи померај „%s“" + +#: src/tail.c:893 +#, c-format +msgid "cannot determine location of %s. reverting to polling" +msgstr "не могу да одредим место „%s“. враћам на пропитивање" + +#: src/tail.c:905 +#, c-format +msgid "" +"unrecognized file system type 0x%08lx for %s. please report this to %s. " +"reverting to polling" +msgstr "" +"непозната врста система датотека 0x%08lx за „%s“. пријавите ово %s. враћам " +"на пропитивање" + +#: src/tail.c:958 +#, c-format +msgid "%s has been replaced with a symbolic link. giving up on this name" +msgstr "„%s“ је замењен симболичком везом. одустајем за сада" + +#: src/tail.c:973 +#, c-format +msgid "%s has become inaccessible" +msgstr "„%s“ је постао недоступан" + +#: src/tail.c:990 +#, c-format +msgid "%s has been replaced with an untailable file; giving up on this name" +msgstr "" +"„%s“ је замењен датотеком која није постављива на крај; одустајем за сада" + +#: src/tail.c:999 +#, c-format +msgid "%s has been replaced with a remote file. giving up on this name" +msgstr "„%s“ је замењен удаљеном датотеком. одустајем за сада" + +#: src/tail.c:1020 +#, c-format +msgid "%s has become accessible" +msgstr "„%s“ је постао доступан" + +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" +msgstr "„%s“ се појавио; пратим крај нове датотеке" + +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" +msgstr "„%s“ је замењен; пратим крај нове датотеке" + +#: src/tail.c:1159 +#, c-format +msgid "%s: cannot change nonblocking mode" +msgstr "%s: не могу да изменим режим не-блокирања" + +#: src/tail.c:1204 src/tail.c:1346 +#, c-format +msgid "%s: file truncated" +msgstr "%s: датотека је скраћена" + +#: src/tail.c:1228 src/tail.c:1546 +#, c-format +msgid "no files remaining" +msgstr "нема преосталих датотека" + +#: src/tail.c:1440 +#, c-format +msgid "cannot watch parent directory of %s" +msgstr "не могу да гледам родитељски директоријум за „%s“" + +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 +#, c-format +msgid "inotify resources exhausted" +msgstr "нема више изворишта инотифија" + +#: src/tail.c:1464 src/tail.c:1636 +#, c-format +msgid "cannot watch %s" +msgstr "не могу да гледам „%s“" + +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: да заменим „%s“? " + +#: src/tail.c:1577 +#, c-format +msgid "error monitoring inotify event" +msgstr "грешка праћења догађаја инотифија" + +#: src/tail.c:1597 +#, c-format +msgid "error reading inotify event" +msgstr "грешка читања догађаја инотифија" + +#: src/tail.c:1902 +#, c-format +msgid "%s: cannot follow end of this type of file; giving up on this name" +msgstr "%s: не могу да пратим крај ове врсте датотеке; за сада одустајем" + +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" +msgstr "%s: неисправан највећи број неизмењених стања између отварања" + +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" +msgstr "%s: неисправан ПИБ" + +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "неисправан број стубаца: %s" + +#: src/tail.c:2123 +#, c-format +msgid "option used in invalid context -- %c" +msgstr "опција је коришћена у неисправном контексту -- %c" + +#: src/tail.c:2135 +#, c-format +msgid "warning: --retry ignored; --retry is useful only when following" +msgstr "" +"упозорење: „--retry“ је занемарено; „--retry“ је корисно само при праћењу" + +#: src/tail.c:2139 +#, c-format +msgid "warning: --retry only effective for the initial open" +msgstr "упозорење: „--retry“ има дејства само за почетно отварање" + +#: src/tail.c:2144 +#, c-format +msgid "warning: PID ignored; --pid=PID is useful only when following" +msgstr "упозорење: ПИБ је занемарен; „--pid=ПИБ“ је корисно само при праћењу" + +#: src/tail.c:2147 +#, c-format +msgid "warning: --pid=PID is not supported on this system" +msgstr "упозорење: „--pid=ПИБ“ није подржано на овом систему" + +#: src/tail.c:2250 +#, c-format +msgid "cannot follow %s by name" +msgstr "не могу да пратим „%s“ по називу" + +#: src/tail.c:2256 +#, c-format +msgid "warning: following standard input indefinitely is ineffective" +msgstr "упозорење: праћење стандардног улаза неодређено је без дејства" + +#: src/tail.c:2337 +#, c-format +msgid "inotify cannot be used, reverting to polling" +msgstr "инотифи не може бити коришћен, враћам на пропитивање" + +#: src/tee.c:87 +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 "" +"Умножава стандардни улаз на сваку датотеку, и такође на стандардни излаз.\n" +"\n" +" -a, --append придодаје датој ДАТОТЕЦИ, не преписује\n" +" -i, --ignore-interrupts занемарује сигнале прекида\n" + +#: src/tee.c:93 +msgid "" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" +msgstr "" + +#: src/tee.c:98 +msgid "" +"\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" + +#: src/test.c:125 +#, c-format +msgid "missing argument after %s" +msgstr "недостаје аргумент након „%s“" + +#: src/test.c:161 +#, c-format +msgid "invalid integer %s" +msgstr "неисправ цео број %s" + +#: src/test.c:243 +msgid "')' expected" +msgstr "очекивах )" + +#: src/test.c:246 +#, c-format +msgid "')' expected, found %s" +msgstr "очекивах ), а нађох %s" + +#: src/test.c:262 src/test.c:620 +#, c-format +msgid "%s: unary operator expected" +msgstr "%s: очекиван је једночлани оператор" + +#: src/test.c:331 +msgid "-nt does not accept -l" +msgstr "„-nt“ не прихвата „-l“" + +#: src/test.c:344 +msgid "-ef does not accept -l" +msgstr "„-ef“ не прихвата „-l“" + +#: src/test.c:360 +msgid "-ot does not accept -l" +msgstr "„-ot“ не прихвата „-l“" + +#: src/test.c:369 +msgid "unknown binary operator" +msgstr "непознат бинарни оператор" + +#: src/test.c:648 +#, c-format +msgid "%s: binary operator expected" +msgstr "%s: очекиван је двочлани оператор" + +#: src/test.c:706 +msgid "" +"Usage: test EXPRESSION\n" +" or: test\n" +" or: [ EXPRESSION ]\n" +" or: [ ]\n" +" or: [ OPTION\n" +msgstr "" +"Употреба: test ИЗРАЗ\n" +" или: test\n" +" или: [ ИЗРАЗ ]\n" +" или: [ ]\n" +" или: [ ОПЦИЈА\n" + +#: src/test.c:713 +msgid "" +"Exit with the status determined by EXPRESSION.\n" +"\n" +msgstr "" +"Излази са стањем одређеним ИЗРАЗОМ.\n" +"\n" + +#: src/test.c:719 +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 "" +"\n" +"Изостављени ИЗРАЗ се пребацује на нетачно. У супротном, ИЗРАЗ\n" +"је тачан или нетачан и поставља излазно стање. Једно је од:\n" + +#: src/test.c:724 +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 "" +"\n" +" ( ИЗРАЗ ) ИЗРАЗ је тачан\n" +" ! ИЗРАЗ ИЗРАЗ је нетачан\n" +" ИЗРАЗ1 -a ИЗРАЗ2 и ИЗРАЗ1 и ИЗРАЗ2 су тачни\n" +" ИЗРАЗ1 -o ИЗРАЗ2 или ИЗРАЗ1 или ИЗРАЗ2 је тачан\n" + +#: src/test.c:731 +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 "" +"\n" +" -n НИСКА дужина НИСКЕ није нула\n" +" НИСКА исто што и „-n НИСКА“\n" +" -z НИСКА дужина НИСКЕ\n" +" НИСКА1 = НИСКА2 ниске су исте\n" +" НИСКА1 != НИСКА2 ниске нису исте\n" + +#: src/test.c:739 +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 "" +"\n" +" ЦЕО_БРОЈ1 -eq ЦЕО_БРОЈ2 ЦЕО_БРОЈ1 је једнак са ЦЕЛИМ_БРОЈЕМ2\n" +" ЦЕО_БРОЈ1 -ge ЦЕО_БРОЈ2 ЦЕО_БРОЈ1 је већи или једнак ЦЕЛОМ_БРОЈУ2\n" +" ЦЕО_БРОЈ1 -gt ЦЕО_БРОЈ2 ЦЕО_БРОЈ1 је већи од ЦЕЛОГ_БРОЈА2\n" +" ЦЕО_БРОЈ1 -le ЦЕО_БРОЈ2 ЦЕО_БРОЈ1 је мањи или једнак ЦЕЛОМ_БРОЈУ2\n" +" ЦЕО_БРОЈ1 -lt ЦЕО_БРОЈ2 ЦЕО_БРОЈ1 је мањи од ЦЕЛОГ_БРОЈА2\n" +" ЦЕО_БРОЈ1 -ne ЦЕО_БРОЈ2 ЦЕО_БРОЈ1 није једнак ЦЕЛОМ_БРОЈУ2\n" + +#: src/test.c:748 +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 "" +"\n" +" ДАТОТЕКА1 -ef ДАТОТЕКА2 ДАТОТЕКА1 и ДАТОТЕКА2 имају исте бројеве уређаја " +"и и-чвора\n" +" ДАТОТЕКА1 -nt ДАТОТЕКА2 ДАТОТЕКА1 је новија (датум измене) него " +"ДАТОТЕКА2\n" +" ДАТОТЕКА1 -ot ДАТОТЕКА2 ДАТОТЕКА1 је старија од ДАТОТЕКЕ2\n" + +#: src/test.c:754 +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 "" +"\n" +" -b ДАТОТЕКА ДАТОТЕКА постоји и посебна је по блоку\n" +" -c ДАТОТЕКА ДАТОТЕКА постоји и посебна је по знаку\n" +" -d ДАТОТЕКА ДАТОТЕКА постоји и јесте директоријум\n" +" -e ДАТОТЕКА ДАТОТЕКА постоји\n" + +#: src/test.c:761 +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 "" +" -f ДАТОТЕКА ДАТОТЕКА постоји и јесте обична датотека\n" +" -g ДАТОТЕКА ДАТОТЕКА постоји и јесте постави-ИБ-групе\n" +" -G ДАТОТЕКА ДАТОТЕКА постоји и поседује је стварни ИБ групе\n" +" -h ДАТОТЕКА ДАТОТЕКА постоји и јесте симболичка веза (исто као „-L“)\n" +" -k ДАТОТЕКА ДАТОТЕКА постоји и има подешен свој лепљиви бит\n" + +#: src/test.c:768 +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 "" +" -L ДАТОТЕКА ДАТОТЕКА постоји и јесте симболичка веза (исто као „-h“)\n" +" -O ДАТОТЕКА ДАТОТЕКА постоји и поседује је стварни ИБ корисника\n" +" -p ДАТОТЕКА ДАТОТЕКА постоји и јесте именована спојка\n" +" -r ДАТОТЕКА ДАТОТЕКА постоји и овлашћење читања је обезбеђено\n" +" -s ДАТОТЕКА ДАТОТЕКА постоји и има величину већу од нуле\n" + +#: src/test.c:775 +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 "" +" -S ДАТОТЕКА ДАТОТЕКА постоји и јесте прикључница\n" +" -t ОД описник датотеке ОД се отвара у терминалу\n" +" -u ДАТОТЕКА ДАТОТЕКА постоји и њен бит подеси-ИБ-корисника је " +"постављен\n" +" -w ДАТОТЕКА ДАТОТЕКА постоји и овлашћење писања је обезбеђено\n" +" -x ДАТОТЕКА ДАТОТЕКА постоји и овлашћење извршавања (или претраге) је " +"обезбеђено\n" + +#: src/test.c:782 +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 "" +"\n" +"Осим за „-h“ и „-L“, сви тестови односни на ДАТОТЕКУ поништавају упуту " +"симболичких веза.\n" +"Пазите на то да заградама треба да претходи знак новог реда (нпр. контра " +"коса црта) за шкољке.\n" +"ЦЕО_БРОЈ може такође бити „-l НИСКА“, који се процењује на дужину НИСКЕ.\n" + +#: src/test.c:788 +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 "" +"\n" +"НАПОМЕНА: [ поштује опције „--help“ и „--version“, али тест не.\n" +"тест сматра сваку од њих као што сматра сваку не празну НИСКУ.\n" + +#: src/test.c:793 +msgid "test and/or [" +msgstr "„test“ и/или [" + +#. This is a proper name. See the gettext manual, section Names. +#: src/test.c:805 +msgid "Kevin Braunsdorf" +msgstr "Кевин Браунсдорф" + +#. This is a proper name. See the gettext manual, section Names. +#: src/test.c:806 +msgid "Matthew Bradburn" +msgstr "Метју Бредбурн" + +#: src/test.c:860 +msgid "missing ']'" +msgstr "недостаје ]" + +#: src/test.c:874 +#, c-format +msgid "extra argument %s" +msgstr "додатни аргумент „%s“" + +#: src/timeout.c:112 +#, c-format +msgid "warning: sigprocmask" +msgstr "упозорење: sigprocmask" + +#: src/timeout.c:146 +#, c-format +msgid "warning: timer_settime" +msgstr "упозорење: timer_settime" + +#: src/timeout.c:151 +#, c-format +msgid "warning: timer_create" +msgstr "упозорење: timer_create" + +#: src/timeout.c:230 +#, c-format +msgid "" +"Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" +" or: %s [OPTION]\n" +msgstr "" +"Употреба: %s [ОПЦИЈА] ТРАЈАЊЕ НАРЕДБА [АРГ]...\n" +" или: %s ОПЦИЈА\n" + +#: src/timeout.c:234 +msgid "Start COMMAND, and kill it if still running after DURATION.\n" +msgstr "Започиње НАРЕДБУ, и убија је ако и даље ради након ТРАЈАЊА.\n" + +#: src/timeout.c:240 +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 get TTY signals;\n" +" in this mode, children of COMMAND will not be timed out\n" +" -k, --kill-after=DURATION\n" +" also send a KILL signal if COMMAND is still running\n" +" this long after the initial signal was sent\n" +" -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 "" +" --preserve-status\n" +" излази са истим стањем као НАРЕДБА, чак и када\n" +" наредби истекне време\n" +" --foreground\n" +" када не ради време истиче непосредно са упита шкољке\n" +" омогућава НАРЕДБИ да чита са конзоле и добавља сигнале " +"конзоле;\n" +" у овом режиму, пород НАРЕДБЕ неће имати временски истек\n" +" -k, --kill-after=ТРАЈАЊЕ\n" +" такође шаље сигнал УБИЈ ако НАРЕДБА још увек ради\n" +" тако дуго након што је послат почетни сигнал\n" +" -s, --signal=СИГНАЛ\n" +" наводи сигнал за слање при временском истеку;\n" +" СОГНАЛ може бити назив као „HUP“ или број;\n" +" видите „kill -l“ за списак сигнала\n" + +#: src/timeout.c:259 +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 "" +"\n" +"ТРАЈАЊЕ је број са покретним зарезом са изборним суфиксом:\n" +"„s“ за секунде (основно), „m“ за минуте, „h“ за часове или „d“ за дане.\n" + +#: src/timeout.c:264 +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 "" +"\n" +"Ако истекне време наредби, а „--preserve-status“ није подешено, тада излази\n" +"са стањем 124. У супротном, излази са стањем НАРЕДБЕ. Ако није наведен\n" +"ниједан сигнал, шаље сигнал „TERM“ по истеку времена. Сигнал „TERM“ убија\n" +"сваки процес који није блокирао или ухватио овај сигнал. Може бити " +"неопходно\n" +"коришћење сигнала „KILL (9)“, јер овај сигнал не може бити ухваћен, у том\n" +"случају излазно стање је 128+9 уместо 124.\n" + +#: src/timeout.c:368 +#, c-format +msgid "warning: disabling core dumps failed" +msgstr "упозорење: није успело искључивање избацивања језгра" + +#: src/timeout.c:474 +#, c-format +msgid "error waiting for command" +msgstr "грешка чекајући на наредбу" + +#: src/timeout.c:485 +#, c-format +msgid "the monitored command dumped core" +msgstr "надгледана наредба је избацила језгро" + +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "непознато стање из наредбе (0x%X)" + +#. 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 "неисправан запис датума „%s“" + +#: src/touch.c:191 +#, c-format +msgid "cannot touch %s" +msgstr "не могу да додирнем „%s“" + +#: src/touch.c:197 +#, c-format +msgid "setting times of %s" +msgstr "подешавам времена за „%s“" + +#: 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 "" +"Освежава времена приступа и измене сваке ДАТОТЕКЕ на текуће време.\n" +"\n" +"Аргумент ДАТОТЕКЕ који не постоји се ствара празним, осим ако је\n" +"достављено „-c“ или „-h“\n" +"\n" +"Ниском аргумента ДАТОТЕКЕ - се ради посебно и доводи до тога да\n" +"„touch“ измени времена датотеке придружене стандардном излазу.\n" + +#: 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 мења само време приступа\n" +" -c, --no-create не ствара никакву датотеку\n" +" -d, --date=НИСКА обрађује НИСКУ и користи је уместо текућег времена\n" +" -f (занемарено)\n" + +#: 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 "" +" -h, --no-dereference утиче на сваку симболичку везу уместо сваке упутне\n" +" датотеке (корисно само на системима који могу да " +"измене\n" +" временске ознаке симболичких веза)\n" +" -m мења само време измене\n" + +#: 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 "" +" -r, --reference=ДАТОТЕКА користи времена ове датотеке уместо текућег " +"времена\n" +" -t ОЗНАКА користи [[ЦЦ]ГГ]ММДДччмм[.ss] уместо текућег " +"времена\n" +" --time=РЕЧ мења наведено време:\n" +" РЕЧ је „access“, „atime“, или „use“: исто као " +"„-a“\n" +" РЕЧ је „modify“ или „mtime“: исто као „-m“\n" + +#: src/touch.c:246 +msgid "" +"\n" +"Note that the -d and -t options accept different time-date formats.\n" +msgstr "" +"\n" +"Знајте да опције „-d“ и „-t“ прихватају различите записе времена-датума.\n" + +#: 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 "" +"упозорење: „touch %s“ је застарело; користите „touch -t %04ld%02d%02d%02d" +"%02d.%02d“" + +#: src/tr.c:286 +#, c-format +msgid "Usage: %s [OPTION]... SET1 [SET2]\n" +msgstr "Употреба: %s [ОПЦИЈА]... СКУП1 [СКУП2]\n" + +#: 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 "" +"Преводи, цеди, и/или брише знакове са стандардног улаза\n" +"пишући на стандардни излаз.\n" +"\n" +" -c, -C, --complement користи замену СКУПА1\n" +" -d, --delete брише знаке у СКУПУ1, не преводи\n" +" -s, --squeeze-repeats замењује сваки улазни низ поновљеног знака\n" +" који је наведен у СКУПУ1 само једном појавом\n" +" тог знака\n" +" -t, --truncate-set1 прво скраћује СКУП1 на дужину СКУПА2\n" + +#: 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 "" +"\n" +"СКУПови су наведени као ниске знакова. Многи представљају себе саме.\n" +"Протумачени низови су:\n" +"\n" +" \\NNN знак са окталном вредношћу NNN (1 до 3 окталне цифре)\n" +" \\\\ контра коса црта\n" +" \\a чујно ЗВОНО\n" +" \\b повратница\n" +" \\f довод облика\n" +" \\n нови ред\n" +" \\r повратак\n" +" \\t водоравни табулатор\n" + +#: 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 "" +" \\v усправни табулатор\n" +" ЗНАК1-ЗНАК2 сви знаци из ЗНАКА1 до ЗНАКА2 растућим поретком\n" +" [ЗНАК*] у СКУПУ2, умножава ЗНАК све до дужине СКУПА1\n" +" [ЗНАК*ПОНОВИ] ПОНОВИ умножава ЗНАК, ПОНОВИ октални ако почиње 0\n" +" [:alnum:] сва слова и цифре\n" +" [:alpha:] сва слова\n" +" [:blank:] све водоравне празнине\n" +" [:cntrl:] сви знаци управљања\n" +" [:digit:] све цифре\n" + +#: 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 "" +" [:graph:] сви исписиви знаци, не укључујући размак\n" +" [:lower:] сва мала слова\n" +" [:print:] сви исписиви знаци, укључујући размак\n" +" [:punct:] сви знаци тачке\n" +" [:space:] све водоравне и усправне празнине\n" +" [:upper:] сва велика слова\n" +" [:xdigit:] све хексадецималне цифре\n" +" [=CHAR=] сви знаци који су исти са ЗНАКОМ\n" + +#: 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 "" +"\n" +"До превођења долази ако „-d“ није дато а појаве се и СКУП1 и СКУП2.\n" +"„-t“ се може користити само при превођењу. СКУП2 је проширен до дужине\n" +"СКУПА1 понављањем свог последњег знака ако је потребно. Вишак знакова\n" +"СКУПА2 се занемарује. Само су [:lower:] и [:upper:] осигурани да буду\n" +"раширени растућим поретко; коришћено у СКУПУ2 при превођењу, могу бити\n" +"коришћени само у паровима да наведу претварање величине слова. „-s“\n" +"користи СКУП1 ако не преводи нити брише; другачије цеђење користи СКУП2\n" +"и дешава се након превођења или брисања.\n" + +#: 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 "" +"упозорење: нејасан октални пренос реда „\\%c%c%c“ је\n" +"\tпротумачен као 2-бајтни низ „\\0%c%c, %c“" + +#: 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 "крајње тачке опсега за „%s-%s“ су у обрнутом поретку сравњивања низа" + +#: src/tr.c:829 +#, c-format +msgid "invalid repeat count %s in [c*n] construct" +msgstr "неисправан број понављања %s у [c*n] саставу" + +#: 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 "неисправан разред знака „%s“" + +#: src/tr.c:947 +#, c-format +msgid "%s: equivalence class operand must be a single character" +msgstr "%s: операнд једнакости разреда мора бити један знак" + +#: src/tr.c:1229 +#, c-format +msgid "misaligned [:upper:] and/or [:lower:] construct" +msgstr "непоравнат [:upper:] и/или [:lower:] састав" + +#: 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 "" +"приликом превођења са ниском1 дужом од ниске2,\n" +"каснија ниска можда се неће заврши ти разредом знака" + +#: src/tr.c:1480 +#, c-format +msgid "the [c*] repeat construct may not appear in string1" +msgstr "[c*] састав понављања можда се неће појавити у нисци1" + +#: src/tr.c:1490 +#, c-format +msgid "only one [c*] repeat construct may appear in string2" +msgstr "само један [c*] састав понављања може да се појави у нисци2" + +#: src/tr.c:1498 +#, c-format +msgid "[=c=] expressions may not appear in string2 when translating" +msgstr "[=c=] изрази не могу се појавити у нисци2 приликом превођења" + +#: src/tr.c:1505 +#, c-format +msgid "" +"when translating, the only character classes that may appear in\n" +"string2 are 'upper' and 'lower'" +msgstr "" +"приликом превођења, једини разреди знака који се могу појавити у\n" +"нисци2 су „upper“ и „lower“" + +#: src/tr.c:1520 +#, c-format +msgid "when not truncating set1, string2 must be non-empty" +msgstr "када не скраћује скуп1, ниска2 не сме бити празна" + +#: 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 "" +"приликом превођења допуњеним разредима знака, ниска2\n" +"мора мапирати све знакове у домену до један" + +#: src/tr.c:1538 +#, c-format +msgid "the [c*] construct may appear in string2 only when translating" +msgstr "[c*] састав се може појавити у нисци2 само приликом превођења" + +#: 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 "" +"Употреба: %s [занемарени аргументи линије наредби]\n" +" или: %s ОПЦИЈА\n" + +#: 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:69 +#, c-format +msgid "Usage: %s OPTION... FILE...\n" +msgstr "Употреба: %s ОПЦИЈА... ДАТОТЕКА...\n" + +#: src/truncate.c:70 +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 "" +"Повећава или смањује величину сваке ДАТОТЕКЕ на наведену величину\n" +"\n" +"Аргумент ДАТОТЕКЕ који не постоји се ствара.\n" +"\n" +"Ако је ДАТОТЕКА већа од наведене величине, вишак података се губи.\n" +"Ако је ДАТОТЕКА мања, проширује се а проширени део (читав) чита\n" +"као нулте бајтове.\n" + +#: src/truncate.c:82 +msgid " -c, --no-create do not create any files\n" +msgstr " -c, --no-create не прави датотеке\n" + +#: src/truncate.c:85 +msgid "" +" -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" +msgstr "" +" -o, --io-blocks сматра ВЕЛИЧИНУ као број УИ блокова уместо бајтова\n" + +#: src/truncate.c:88 +msgid "" +" -r, --reference=RFILE base size on RFILE\n" +" -s, --size=SIZE set or adjust the file size by SIZE bytes\n" +msgstr "" +" -r, --reference=РДАТОТЕКА основна величина на РДАТОТЕЦИ\n" +" -s, --size=ВЕЛИЧИНА поставља или дотерује величину датотеке " +"бајтовима ВЕЛИЧИНЕ\n" + +#: src/truncate.c:94 +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 "" +"\n" +"ВЕЛИЧИНИ може бити додат префикс једног од следећих знакова измене:\n" +"+ повећава за, - смањује за, < највише, > најмање,\n" +"/ заокружује доле на множитеља од, % заокружује горе на множитеља од.\n" + +#: src/truncate.c:122 +#, c-format +msgid "overflow in % * % byte blocks for file %s" +msgstr "прекорачење у % * % блокова бајта за датотеку „%s“" + +#: src/truncate.c:146 +#, c-format +msgid "%s has unusable, apparently negative size" +msgstr "„%s“ има неупотребљиву, привидно негативну величину" + +#: src/truncate.c:156 src/truncate.c:358 +#, c-format +msgid "cannot get the size of %s" +msgstr "не могу да добавим величину за „%s“" + +#: src/truncate.c:178 +#, c-format +msgid "overflow rounding up size of file %s" +msgstr "прекорачење заокружује величину датотеке „%s“" + +#: src/truncate.c:188 +#, c-format +msgid "overflow extending size of file %s" +msgstr "прекорачење проширује величину датотеке „%s“" + +#: src/truncate.c:203 +#, c-format +msgid "failed to truncate %s at % bytes" +msgstr "нисам успео да скратим „%s“ на % бајта" + +#: src/truncate.c:276 +#, c-format +msgid "multiple relative modifiers specified" +msgstr "наведено је више односних измењивача" + +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "неисправан број %s" + +#: src/truncate.c:307 +#, c-format +msgid "you must specify either %s or %s" +msgstr "морате навести или „%s“ или „%s“" + +#: src/truncate.c:314 +#, c-format +msgid "you must specify a relative %s with %s" +msgstr "морате навести односно „%s“ са „%s“" + +#: src/truncate.c:321 +#, c-format +msgid "%s was specified but %s was not" +msgstr "„%s“ је наведено али „%s“ није" + +#: src/truncate.c:378 +#, c-format +msgid "cannot open %s for writing" +msgstr "не могу да отворим „%s“ за писање" + +# 48x48/emblems/emblem-marketing.icon.in.h:1 +#. This is a proper name. See the gettext manual, section Names. +#: src/tsort.c:40 +msgid "Mark Kettenis" +msgstr "Марк Кетенис" + +#: src/tsort.c:82 +#, fuzzy, c-format +msgid "" +"Usage: %s [OPTION] [FILE]\n" +"Write totally ordered list consistent with the partial ordering in FILE.\n" +msgstr "" +"Употреба: %s [ОПЦИЈА] [ДАТОТЕКА]\n" +"Пише потпуно сређени списак који се састоји од делимичног сређивања у " +"ДАТОТЕКУ.\n" +"Без ДАТОТЕКЕ, или када је ДАТОТЕКА -, чита стандардни улаз.\n" +"\n" + +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 +#, c-format +msgid "%s: input contains an odd number of tokens" +msgstr "%s: улаз садржи непаран број симбола" + +#: src/tsort.c:521 +#, c-format +msgid "%s: input contains a loop:" +msgstr "%s: улаз садржи петљу:" + +#: 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 "" +"Исписује назив датотеке терминала повезаног на стандардни улаз.\n" +"\n" +" -s, --silent, --quiet не исписује ништа, даје само стање излаза\n" + +#: 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 "" +"Исписује неке податке система. Без ОПЦИЈЕ, исто као „-s“.\n" +"\n" +" -a, --all исписује све податке, следећим редом,\n" +" изузев изостављања „-p“ и „-i“ ако су " +"непознати:\n" +" -s, --kernel-name исписује назив језгра\n" +" -n, --nodename исписује назив домаћина мрежног чвора\n" +" -r, --kernel-release исписује издање језгра\n" + +#: 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 "" +" -v, --kernel-version исписује издање језгра\n" +" -m, --machine исписује назив хардвера машине\n" +" -p, --processor исписује врсту процесора или „unknown“\n" +" -i, --hardware-platform исписује платформу хардвера или „unknown“\n" +" -o, --operating-system исписује оперативни систем\n" + +#: src/uname.c:143 +msgid "" +"Print machine architecture.\n" +"\n" +msgstr "" +"Исписује архитектуру машине.\n" +"\n" + +#: 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" +msgstr "" +"Претвара празнине у свакој датотеци у табулаторе, пишући на стандардном " +"излазу.\n" +"Без ДАТОТЕКЕ, или када је ДАТОТЕКА -, чита стандардни улаз.\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 "" +" -a, --all претвара све празнине, уместо само почетне празнине\n" +" --first-only претвара само водеће низове празнина (превазилази „-a“)\n" +" -t, --tabs=N има табулаторе померене N знакова уместо 8 (укључује „-" +"a“)\n" +" -t, --tabs=СПИСАК користи зарезом раздвојен СПИСАК положаја табулатора " +"(укључује „-a“)\n" + +#: 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:170 +#, c-format +msgid "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n" +msgstr "Употреба: %s [ОПЦИЈА]... [УЛАЗ [ИЗЛАЗ]]\n" + +#: src/uniq.c:174 +msgid "" +"Filter adjacent matching lines from INPUT (or standard input),\n" +"writing to OUTPUT (or standard output).\n" +"\n" +"With no options, matching lines are merged to the first occurrence.\n" +msgstr "" +"Пропушта суседне редове поклапања из УЛАЗА (или стандардног улаза),\n" +"пишићи на ИЗЛАЗ (или стандардни излаз).\n" +"\n" +"Без опција, редови поређења се стапају са првом појавом.\n" + +#: src/uniq.c:183 +msgid "" +" -c, --count prefix lines by the number of occurrences\n" +" -d, --repeated only print duplicate lines, one for each group\n" +msgstr "" +" -c, --count ставља број појављивањакао префикс редова\n" +" -d, --repeated исписује само удвостручене редове, један за сваку " +"групу\n" + +#: src/uniq.c:187 +#, fuzzy +msgid "" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" +" METHOD={none(default),prepend,separate}\n" +msgstr "" +" -D, --all-repeated[=НАЧИН] исписује све удвостручене редове\n" +" групе могу бити ограничене празним редом\n" +" НАЧИН={none(default),prepend,separate}\n" + +#: src/uniq.c:192 +msgid " -f, --skip-fields=N avoid comparing the first N fields\n" +msgstr " -f, --skip-fields=N избегава поређење првих N поља\n" + +#: src/uniq.c:195 +#, fuzzy +msgid "" +" --group[=METHOD] show all items, separating groups with an empty " +"line;\n" +" METHOD={separate(default),prepend,append,both}\n" +msgstr "" +" --group[=НАЧИН] показује све ставке, одвајајући групе празним редом\n" +" НАЧИН={separate(основно),prepend,append,both}\n" + +#: src/uniq.c:199 +msgid "" +" -i, --ignore-case ignore differences in case when comparing\n" +" -s, --skip-chars=N avoid comparing the first N characters\n" +" -u, --unique only print unique lines\n" +msgstr "" +" -i, --ignore-case занемарује разлике у случају када пореди\n" +" -s, --skip-chars=N избегава поређење првих N знакова\n" +" -u, --unique исписује само јединствене редове\n" + +#: src/uniq.c:207 +msgid " -w, --check-chars=N compare no more than N characters in lines\n" +msgstr " -w, --check-chars=N упоређује не више од N знакова у редовима\n" + +#: src/uniq.c:212 +msgid "" +"\n" +"A field is a run of blanks (usually spaces and/or TABs), then non-blank\n" +"characters. Fields are skipped before chars.\n" +msgstr "" +"\n" +"Поље је покренуто празнинама обично размацима и/или табулаторима, затим не-" +"празним\n" +"знацима. Поља се прескачу пре знакова.\n" + +#: src/uniq.c:217 +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" +"Напомена: „uniq“ не открива поновљене редове осим ако нису суседни.\n" +"Можда ћете пожелети да прво поређате улаз, или да користите „sort -u“ без " +"„uniq“.\n" +"Такође, поређења поштују правила која наведе „LC_COLLATE“.\n" + +#: src/uniq.c:428 +#, c-format +msgid "too many repeated lines" +msgstr "превише поновљених редова" + +#: src/uniq.c:604 +msgid "invalid number of fields to skip" +msgstr "неисправан број поља за прескакање" + +#: src/uniq.c:613 +msgid "invalid number of bytes to skip" +msgstr "неисправан број бајтова за прескакање" + +#: src/uniq.c:623 +msgid "invalid number of bytes to compare" +msgstr "неисправан број бајтова за поређење" + +#: src/uniq.c:645 +#, c-format +msgid "--group is mutually exclusive with -c/-d/-D/-u" +msgstr "„--group“ се међусобно искључује са „-c/-d/-D/-u“" + +#: src/uniq.c:652 +#, c-format +msgid "grouping and printing repeat counts is meaningless" +msgstr "груписање и исписивање поновљених бројања је бесмислено" + +#: src/uniq.c:659 +#, c-format +msgid "printing all duplicated lines and repeat counts is meaningless" +msgstr "исписивање свих удвостручених редова и броја понављања је бесмислено" + +#: src/unlink.c:45 +#, c-format +msgid "" +"Usage: %s FILE\n" +" or: %s OPTION\n" +msgstr "" +"Употреба: %s ДАТОТЕКА\n" +" или: %s ОПЦИЈА\n" + +#: src/unlink.c:48 +msgid "" +"Call the unlink function to remove the specified FILE.\n" +"\n" +msgstr "" +"Позива функцију развезивања да уклони наведену ДАТОТЕКУ.\n" +"\n" + +#: src/uptime.c:125 +#, c-format +msgid "couldn't get boot time" +msgstr "не могу да добавим време подизања" + +# strftime format of a time in 24-hour format, +# without seconds. +# This is a strftime() format. %H = hour (0-23), %M = minute. +#. TRANSLATORS: This prints the current clock time. +#: src/uptime.c:136 +msgid " %H:%M%P " +msgstr " %H:%M%P " + +#: 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] "до %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" +msgid_plural "%lu users" +msgstr[0] "%lu корисник" +msgstr[1] "%lu корисника" +msgstr[2] "%lu корисника" + +#: src/uptime.c:161 +#, c-format +msgid ", load average: %.2f" +msgstr ", просек учитавања: %.2f" + +#: src/uptime.c:199 +#, c-format +msgid "" +"Print the current time, the length of time the system has been up,\n" +"the number of users on the system, and the average number of jobs\n" +"in the run queue over the last 1, 5 and 15 minutes." +msgstr "" +"Исписује тренутно време, време за које је систем радио,\n" +"број корисника на систему, и просечан број послова,\n" +"у реду покретања последњег 1, 5 и 15 минута." + +#: src/uptime.c:208 +#, c-format +msgid "" +" Processes in\n" +"an uninterruptible sleep state also contribute to the load average.\n" +msgstr "" +" Процеси у\n" +"непрекидивом стању спавања такође доприносе просеку учитавања.\n" + +#: src/uptime.c:214 +#, c-format +msgid "" +"If FILE is not specified, use %s. %s as FILE is common.\n" +"\n" +msgstr "" +"Ако ДАТОТЕКА није наведена, користи „%s“. „%s“ као ДАТОТЕКА је опште.\n" +"\n" + +#: 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 "" +"Исписује ко је тренутно пријављен према ДАТОТЕЦИ.\n" +"Ако датотека није наведена, користи „%s“. „%s“ као ДАТОТЕКА је опште.\n" +"\n" + +#: src/wc.c:118 +msgid "" +"Print newline, word, and byte counts for each FILE, and a total line if\n" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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 "" +"Исписује бројања нових редова, речи, и бајтова за сваку ДАТОТЕКУ, и укупан " +"ред\n" +"ако је наведено више од једне ДАТОТЕКЕ. Без ДАТОТЕКЕ, или када је ДАТОТЕКА " +"-,\n" +"чита стандардни улаз. Реч је низ не-нулте-дужине знакова\n" +"ограничена празнином.\n" +"Опције испод могу бити коришћене за бирање која бројања се исписују, увек\n" +"следећим редом: нови ред, реч, знак, бајт, највећа дужина реда.\n" +" -c, --bytes исписује број бајтова\n" +" -m, --chars исписује број знакова\n" +" -l, --lines исписује број нових редова\n" + +#: src/wc.c:134 +#, fuzzy +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 maximum display width\n" +" -w, --words print the word counts\n" +msgstr "" +" --files0-from=F чита улаз са датотека наведених\n" +" НИЧИМ-окончаним називима у датотеци F;\n" +" Ако је F - тада чита називе са стандардног улаза\n" +" -L, --max-line-length исписује дужину најдужег реда\n" +" -w, --words исписује број речи\n" + +#: 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 "" +"\n" +"# корисници=%lu\n" + +#: 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 "Употреба: %s [ОПЦИЈА]... [ ДАТОТЕКА | АРГ1 АРГ2 ]\n" + +#: src/who.c:641 +msgid "Print information about users who are currently logged in.\n" +msgstr "Исписује податке о корисницима који су тренутно пријављени.\n" + +#: 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 "" +"\n" +" -a, --all исто као „-b -d --login -p -r -t -T -u“\n" +" -b, --boot време последњег подизања система\n" +" -d, --dead исписује мртве процесе\n" +" -H, --heading исписује ред заглавља ступца\n" + +#: src/who.c:651 +msgid " -l, --login print system login processes\n" +msgstr " -l, --login исписује процесе пријављивања система\n" + +#: 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 покушава да стандардизује називе домаћина путем ДНС-а\n" +" -m само име домаћина и корисник придружени стандардном " +"улазу\n" +" -p, --process исписује радне процесе изрођене инитом\n" + +#: 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 сва имена пријављивања и број пријављених корисника\n" +" -r, --runlevel исписује текући радни ниво\n" +" -s, --short исписује само назив, ред, и време (основно)\n" +" -t, --time исписује последњу измену системског сата\n" + +#: 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 додаје стање поруке корисника као +, - или ?\n" +" -u, --users исписује пријављене кориснике\n" +" --message исто као -T\n" +" --writable исто као -T\n" + +#: 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" +"Ако ДАТОТЕКА није наведена, користи „%s“. „%s“ као ДАТОТЕКА је опште.\n" +"Ако је АРГ1 АРГ2 дато, „-m“ претпостављено: „am i“ или „mom likes“ су " +"уобичајени.\n" + +#: src/whoami.c:45 +msgid "" +"Print the user name associated with the current effective user ID.\n" +"Same as id -un.\n" +"\n" +msgstr "" +"Исписује име корисника придружено текућем стварном ИБ корисника.\n" +"Исто као „id -un“.\n" +"\n" + +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "не могу да нађем име за ИБ корисника „%s“" + +#: src/yes.c:41 +#, c-format +msgid "" +"Usage: %s [STRING]...\n" +" or: %s OPTION\n" +msgstr "" +"Употреба: %s [НИСКА]...\n" +" или: %s ОПЦИЈА\n" + +#: src/yes.c:47 +msgid "" +"Repeatedly output a line with all specified STRING(s), or 'y'.\n" +"\n" +msgstr "" +"Понављајући исписује ред са свим наведеним НИСКА(ма), или „y“.\n" +"\n" + +#~ msgid "input line is too short, no numbers found to convert in field %ld" +#~ msgstr "" +#~ "улазни ред је прекратак, нисам нашао бројеве за претварање у %ld. пољу" + +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "-t се подразумева ако је ДУЖИНА_СТРАНИЦЕ <= 10. Без ДАТОТЕКЕ, или када " +#~ "је ДАТОТЕКА -,\n" +#~ "чита стандардни улаз.\n" + +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Без ДАТОТЕКЕ, или када је ДАТОТЕКА -, чита стандардни улаз.\n" +#~ "Основно је „-F /“.\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Приморава измењене блокове на диск, освежава супер блок.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "занемарујем све аргументе" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: неисправан број" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: „%s“ је толико велико да се не може приказати" + +#~ msgid "number of lines" +#~ msgstr "број редова" + +#~ msgid "number of bytes" +#~ msgstr "број бајтова" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: неисправан број за занемаривање" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: неисправан број бајтова" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: неисправан број редова" + +#~ msgid "number in %s is too large" +#~ msgstr "број у „%s“ је превелик" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: неисправан број секунди" + +#~ msgid "failed to %s supplemental groups" +#~ msgstr "нисам успео да „%s“ додатне групе" + +#~ 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 "" +#~ "\n" +#~ "Шљући сигнал „%s“ покренутом „dd“ процесу чини да исписује\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" +#~ " 9387674624 бајта (9.4 GB) умножених, 34.6279 секунде, 271 MB/s\n" +#~ "\n" +#~ "Опције су:\n" +#~ "\n" + +#~ 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 ЗНАК ЗНАК ће унети следећи знак цитиран\n" +#~ " quit ЗНАК ЗНАК ће послати сигнал изласка\n" +#~ " * rprnt ЗНАК ЗНАК ће поново исцртати текући ред\n" +#~ " start ЗНАК ЗНАК ће поново покренути излаз након што га заустави\n" + +#~ 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" +#~ " * [-]cdtrdsr укључује ДТР/ДСР руковање\n" +#~ " csN подешава величину знака на N бита, N у [5..8]\n" + +#~ 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 "" +#~ "\n" +#~ "Подешавања излаза:\n" +#~ " * bsN стил застоја повратнице, N у [0..1]\n" +#~ " * crN стил застоја крајника реда, N у [0..3]\n" +#~ " * ffN стил застоја довода облика, N у [0..1]\n" +#~ " * nlN стил застоја новог реда, N у [0..1]\n" + +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl преводи крајника реда у нови ред\n" +#~ " * [-]ofdel користи знаке брисања за испуњавање уместо ништавних " +#~ "знакова\n" +#~ " * [-]ofill користи знаке испуњавања (попуне) уместо да чека на " +#~ "временски истек застоја\n" +#~ " * [-]olcuc преводи знакове малих слова у велике\n" +#~ " * [-]onlcr преводи нови ред у нови ред крајника реда\n" +#~ " * [-]onlret нови ред обавља крајника реда\n" + +#~ 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 "" +#~ " * [-]onocr не исписује крајнике редова у првом ступцу\n" +#~ " [-]opost излаз подређеног процеса\n" +#~ " * tabN стил застоја водоравног табулатора, N у [0..3]\n" +#~ " * tabs исто као „tab0“\n" +#~ " * -tabs исто као „tab3“\n" +#~ " * vtN стил застоја усправног табулатора, N у [0..1]\n" + +#~ 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 "" +#~ " * [-]ctlecho оглашава знаке управљања у назнаци капице („^c“)\n" +#~ " [-]echo оглашава улазне знаке\n" +#~ " * [-]echoctl исто као „[-]ctlecho“\n" +#~ " [-]echoe исто као „[-]crterase“\n" +#~ " [-]echok оглашава нови ред након знака убијања\n" + +#~ 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 "" +#~ " * [-]echoke исто као „[-]crtkill“\n" +#~ " [-]echonl понавља нови ред чак и ако не понавља друге знаке\n" +#~ " * [-]echoprt понавља обрисане знаке уназад, између \\ и /\n" +#~ " [-]icanon укључује нарочите знаке „erase“, „kill“, „werase“, и " +#~ "„rprnt“\n" +#~ " [-]iexten укључује не-ПОСИКС нарочите знаке\n" + +#~ 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 "" +#~ " dec исто као: echoe echoctl echoke -ixany intr ^c erase " +#~ "0177\n" +#~ " kill ^u\n" +#~ " * [-]decctlq исто као: [-]ixany\n" +#~ " ek брише и поставља знаке на њихове основне вредности\n" +#~ " evenp исто као: parenb -parodd cs7\n" + +#~ msgid "For complete documentation, run: info coreutils '%s invocation'\n" +#~ msgstr "" +#~ "За потпуну документацију, покрените: „info coreutils '%s invocation'“\n" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: не могу да нађем име за ИБ корисника „%lu“\n" + +#~ msgid "" +#~ " -Z, --context[=CTX] set the SELinux security context of NAME to\n" +#~ " default type, or to CTX if specified\n" +#~ msgstr "" +#~ " -Z, --context[=СДРЖ] подешава безбедносни садржај СЕЛинукса НАЗИВА\n" +#~ " на основну врсту, или на САДРЖАЈ ако је наведен\n" + +#~ msgid "" +#~ "Usage: %s [SHORT-OPTION]... USER COMMAND [ARGUMENT]...\n" +#~ " or: %s LONG-OPTION\n" +#~ msgstr "" +#~ "Употреба: %s [КРАТКА_ОПЦИЈА]... КОРИСНИК НАРЕДБА [АРГУМЕНТ]...\n" +#~ " или: %s ДУГА_ОПЦИЈА\n" + +#~ msgid "" +#~ "Drop any supplemental groups, assume the user-ID and group-ID of the " +#~ "specified\n" +#~ "USER (numeric ID or user name), and run COMMAND with any specified " +#~ "ARGUMENTs.\n" +#~ "Exit with status 111 if unable to assume the required user and group ID.\n" +#~ "Otherwise, exit with the exit status of COMMAND.\n" +#~ "This program is useful only when run by root (user ID zero).\n" +#~ "\n" +#~ msgstr "" +#~ "Убацује сваку додатну групу, подразумева ИБ корисника и ИБ групе " +#~ "наведеног\n" +#~ "КОРИСНИКА (бројни ИБ или име корисника), и покреће НАРЕДБУ са сваким " +#~ "наведеним АРГУМЕНТОМ.\n" +#~ "Излази са стањем 111 ако није у могућности да подразуме захтевани ИБ " +#~ "корисника и групе.\n" +#~ "У супротном, излази са излазним стањем НАРЕДБЕ.\n" +#~ "Овај програм је користан само када га покрене администратор (ИБ корисника " +#~ "нула).\n" +#~ "\n" + +#~ msgid "" +#~ " -g GID[,GID1...] also set the primary group-ID to the numeric GID, " +#~ "and\n" +#~ " (if specified) supplemental group IDs to GID1, ...\n" +#~ msgstr "" +#~ " -g ГИБ[,ГИБ1...] такође постављапримарни ИБ групе на бројевни ГИБ, и\n" +#~ " (ако је наведен) додатни ИБ групе на ГИБ1, ...\n" + +#~ msgid "unknown user-ID: %s" +#~ msgstr "непознат ИБ корисника: %s" + +#~ msgid "to use user-ID %s you need to use -g too" +#~ msgstr "да користите ИБ корисника %s треба такође да користите „-g“" + +#~ msgid "cannot set group-ID to %lu" +#~ msgstr "не могу да подесим ИБ групе на %lu" + +#~ msgid "cannot set user-ID to %lu" +#~ msgstr "не могу да подесим ИБ корисника на %lu" diff --git a/po/sv.gmo b/po/sv.gmo index a885d547..eff0f263 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index 4bb9273e..2702d157 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,14 +6,15 @@ # Daniel Resare 1999, 2000. # Göran Uddeborg , 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # -# $Revision: 1.185 $ +# $Revision: 1.187 $ # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils 8.23-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" -"PO-Revision-Date: 2014-07-18 17:56+0200\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" +"PO-Revision-Date: 2014-09-26 23:00+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -40,18 +41,18 @@ msgstr "Giltiga argument är:" msgid "error closing file" msgstr "fel när fil stängdes" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "skrivfel" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "bevarar rättigheter på %s" @@ -232,57 +233,62 @@ msgstr "Parametersträng inte korrekt kodad" msgid "Unknown error" msgstr "Okänt fel" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: flaggan ”%s” är tvetydig; möjligheter:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: flaggan ”-W %s” är tvetydig\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: flaggan ”--%s” tar inget argument\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: flaggan ”%c%s” tar inget argument\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: flaggan ”--%s” kräver ett argument\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: okänd flagga ”--%s”\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: okänd flagga ”%c%s”\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ogiltig flagga -- ”%c”\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: flaggan kräver ett argument -- ”%c”\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: flaggan ”-W %s” är tvetydig\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: flaggan ”-W %s” tar inget argument\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: flaggan ”-W %s” kräver ett argument\n" @@ -292,13 +298,13 @@ msgstr "%s: flaggan ”-W %s” kräver ett argument\n" msgid "cannot change permissions of %s" msgstr "kan inte ändra rättigheter på %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "kan inte skapa katalog %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "minnet slut" @@ -347,6 +353,12 @@ msgstr "”" msgid "%s: end of file" msgstr "%s: filslut" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: läsfel" + #: lib/regcomp.c:131 msgid "Success" msgstr "Lyckas" @@ -454,7 +466,7 @@ msgstr "^[yYjJ]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "sätter rättigheter på %s" @@ -891,7 +903,7 @@ msgstr "" "Användning: %s [FLAGGA]… [FIL]\n" "Base64-koda eller -avkoda FIL, eller standard in, till standard ut.\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -907,15 +919,7 @@ msgstr "" " Använd 0 för att slå av radbrytning\n" "\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Utan FIL, eller när FIL är -, läs standard in.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -930,51 +934,51 @@ msgstr "" "att försöka återhämta från tecken utanför alfabetet i den kodade\n" "strömmen.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "läsfel" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "ogiltig indata" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "ogiltig radbrytningslängd: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "extra operand %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "stänger standard in" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1024,38 +1028,43 @@ msgstr "" " %s -a any/str1 any/str2 → ”str1” följt av ”str2”\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "argument saknas" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Användning: %s [FLAGGA]... [FIL]...\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "Skriv en sorterad sammanfogning av alla FIL(er) till standard ut.\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1073,7 +1082,7 @@ msgstr "" " -n, --number numrera alla rader\n" " -s, --squeeze-blank utelämna upprepade tomma rader\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1085,7 +1094,7 @@ msgstr "" " -u (ignorerad)\n" " -v, --show-nonprinting använd ^ och M-notation, utom för nyrad och TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1099,17 +1108,18 @@ msgstr "" "innehåll.\n" " %s Kopiera standard in till standard ut.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "kan inte göra ”ioctl” på %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "standard ut" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: infil är utfil" @@ -1121,10 +1131,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1138,8 +1148,8 @@ msgstr "kunde inte skapa säkerhetskontext: %s" msgid "failed to set %s security context component to %s" msgstr "kunde inte sätta %s-komponenten av säkerhetskontexten till %s" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "kunde inte ta reda på säkerhetskontext för %s" @@ -1154,13 +1164,13 @@ msgstr "det går inte att sätta en partiell kontext på filen %s utan etikett" 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:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "kan inte komma åt %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "kan inte läsa katalog %s" @@ -1176,7 +1186,7 @@ msgstr "ändrar säkerhetskontext för %s\n" msgid "fts_read failed" msgstr "fts_read misslyckades" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1293,7 +1303,7 @@ msgid "-R -h requires -P" msgstr "-R -h kräver -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1310,9 +1320,8 @@ msgid "conflicting security context specifiers given" msgstr "motstridiga specificerare för säkerhetskontext angivna" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "kunde inte hämta attribut för %s" @@ -1620,17 +1629,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "ogiltig grupp %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "ogiltig grupplista %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1639,7 +1648,7 @@ msgstr "" "Användning: %s [FLAGGA] NYROT [KOMMANDO [ARG]...]\n" " eller: %s FLAGGA\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1647,16 +1656,28 @@ msgstr "" "Kör KOMMANDO med rotkatalogen satt till NYROOT.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" msgstr "" " --userspec=ANV:GRUPP ange användare och grupp (ID eller namn) att " "använda\n" " --groups=G_LISTA ange tilläggsgrupper som g1,g2,..,gN\n" -#: src/chroot.c:203 +#: src/chroot.c:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" +" --userspec=ANV:GRUPP ange användare och grupp (ID eller namn) att " +"använda\n" +" --groups=G_LISTA ange tilläggsgrupper som g1,g2,..,gN\n" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" @@ -1664,42 +1685,47 @@ msgstr "" "\n" "Om inget kommando angivs, kör ”${SHELL} -i” (standard: ”/bin/sh -i”).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "kan inte ändra rotkatalog till %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "kan inte byta katalog till rotkatalog" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "ingen grupp angiven för okänt uid: %d" -#: src/chroot.c:383 +#: src/chroot.c:400 #, c-format msgid "failed to get supplemental groups" msgstr "misslyckades att hämta tilläggsgrupp(er)" -#: src/chroot.c:395 -#, c-format -msgid "failed to %s supplemental groups" -msgstr "misslyckades att %s tilläggsgrupp(er)" +#: src/chroot.c:412 +#, fuzzy, c-format +msgid "failed to set supplemental groups" +msgstr "misslyckades att hämta tilläggsgrupp(er)" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "misslyckades att sätta grupp-ID" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "misslyckades att sätta användar-ID" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "misslyckades att köra kommandot %s" @@ -1741,7 +1767,16 @@ msgstr "Användning: %s [FLAGGA]... FIL1 FIL2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Jämför de sorterade filerna FIL1 och FIL2 rad för rad.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Utan FIL, eller när FIL är -, läs standard in.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1753,7 +1788,7 @@ msgstr "" "rader unika för FIL1, kolumn två innehåller filer unika för FIL2 och\n" "kolumn tre innehåller rader gemensamma för båda filerna.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1766,7 +1801,7 @@ msgstr "" " -3 skriv ej kolumn 3 (rader som är förekommer i båda " "filerna)\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1778,11 +1813,11 @@ msgstr "" " alla indatarader går att para ihop\n" " --nocheck-order kontrollera inte att indata är korrekt sorterad\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=STR separera kolumner med STR\n" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" @@ -1790,7 +1825,7 @@ msgstr "" "\n" "Observera, jämförelser tar hänsyn till reglerna som anges av ”LC_COLLATE”.\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1804,309 +1839,323 @@ msgstr "" " %s -3 fil1 fil2 Skriv ut rader i fil1 som inte finns i fil2, och " "omvänt.\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "fil %d är inte i sorterad ordning" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "multipla avgränsare angivna" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "tom %s är inte tillåtet" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "kan inte göra lseek i %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "fel vid läsning av %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "kan inte göra lseek i %s" +msgid "error reading %s" +msgstr "fel vid läsning av %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "fel vid skrivning av %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "fel vid läsning av %s" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s: misslyckades att hämta information om utsträckningar" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: misslyckades skriva" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "misslyckades att utöka %s" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "tar bort rättigheter på %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "misslyckades att bevara ägare av %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "misslyckades att hitta filen %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "misslyckades att bevara författarskap för %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "misslyckades att sätta standardkontext för skapade filer till %s" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "misslyckades att sätta standardkontext för skapade filer på %s" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "misslyckades att sätta säkerhetskontexten på %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "kan inte öppna %s för läsning" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "kan inte göra fstat på %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "hoppar över fil %s eftersom den byttes ut medan den kopierades" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "kan inte ta bort %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "tog bort %s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "skriver inte via en lös symbolisk länk %s" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "kan inte skapa normal fil %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "misslyckades att klona %s från %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "bevarar tider på %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "misslyckades att stänga %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: ersätt %s, åsidosätt rättigheterna %04lo (%s)? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "%s: oskrivbar %s (rättigheter %04lo, %s); försök ändå? " -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: skriva över %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr "(säkerhetskopia: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "misslyckades att återställa standardkontext för filskapande" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "kan inte skapa hård länk %s till %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "kan inte ta status på %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "utesluter katalog %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, 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:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s och %s är samma fil" -#: src/copy.c:1939 +#: src/copy.c:2019 #, 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:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "kommer inte skriva över nyligen skapade %s med %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "kan inte skriva över katalog %s med icke-katalog" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "kan inte flytta katalog på icke-katalog: %s → %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, 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:2020 +#: src/copy.c:2100 #, 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:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "kan inte göra säkerhetskopia %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, 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:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "varning: källfil %s angiven mer än en gång" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "kan inte flytta %s till %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "kan inte kopiera cyklisk symbolisk länk %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "kan inte skapa symbolisk länk %s till %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "kan inte skapa fifo %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "kan inte skapa specialfil %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "kan inte läsa symbolisk länk %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "kan inte skapa symbolisk länk %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s har okänd filtyp" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "kan inte avsäkerhetskopiera %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s → %s (återta säkerhetskopia)\n" @@ -2116,12 +2165,12 @@ msgstr "%s → %s (återta säkerhetskopia)\n" msgid "Alex Deymo" msgstr "Alex Deymo" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "Användning: %s --coreutils-prog=PROGRAMNAMN [PARAMETRAR]…\n" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" @@ -2129,7 +2178,7 @@ msgstr "" "Kör det inbyggda programmet PROGRAMNAMN med de angivna PARAMETRARNA.\n" "\n" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" @@ -2139,7 +2188,7 @@ msgstr "" "Använd: ”%s --coreutils-prog=PROGRAMNAMN --help” för hjälp med individuella " "program.\n" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, c-format msgid "unknown program %s" msgstr "okänt program %s" @@ -2405,8 +2454,8 @@ msgstr "%s finns men är inte en katalog" msgid "failed to access %s" msgstr "misslyckades att komma åt %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "filoperand saknas" @@ -2481,131 +2530,131 @@ msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "kan inte bevara utökade attribut, cp byggdes utan stöd för xattr" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "indata försvann" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: radnummer utanför intervallet" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: radnummer utanför intervallet" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " vid upprepning %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: ingen träff" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "fel i sökning med reguljärt uttryck" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "skrivfel för %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: heltal förväntades efter avskiljare" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: upprepningsoperatorn måste avslutas med ”}”" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: heltal krävs mellan ”{” och ”}”" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: avslutande avskiljare ”%c” saknas" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: felaktigt reguljärt uttryck: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: felaktigt mönster" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: radnummer måste vara större än noll" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, 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:1200 +#: src/csplit.c:1201 #, 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:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "saknar formatbeskrivning i ändelse" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "felaktig formatbeskrivning i ändelse: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "felaktig formatbeskrivning i ändelse: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "ogiltiga flaggor formatbeskrivning: %%%c%c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "för många %%-formatbeskrivningar i ändelse" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "saknar %%-formatbeskrivning i ändelse" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: felaktigt tal" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "ogiltigt antal %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Användning: %s [FLAGGA]... FIL MÖNSTER...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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" @@ -2613,7 +2662,17 @@ msgstr "" "Skriv ut delar av FIL avdelade med MÖNSTER till filer ”xx00”, ”xx01”, …,\n" "och skriv ut byte-antal för varje del till standard ut.\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Läs standard in om FIL är -. Varje MÖNSTER kan vara:\n" +"\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2624,11 +2683,11 @@ msgstr "" " -f, --prefix=PREFIX använd PREFIX i stället för ”xx”\n" " -k, --keep-files ta inte bort utfiler vid fel\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr " -m, --suppress-matched utelämna rader som matchar MÖNSTER\n" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2638,18 +2697,11 @@ msgstr "" " -s, --quiet, --silent skriv inte ut storleken på utmatningsfiler\n" " -z, --elide-empty-files ta bort tomma utmatningsfiler\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Läs standard in om FIL är -. Varje MÖNSTER kan vara:\n" -"\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 +#, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2683,7 +2735,7 @@ msgstr "Användning: %s FLAGGA... [FIL]...\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:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2694,7 +2746,7 @@ msgstr "" " -d, --delimiter=AVSKILJ använd AVSKILJ i stället för TAB som " "fältavskiljare\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2705,7 +2757,7 @@ msgstr "" " saknar avskiljare, om inte flaggan -s anges\n" " -n (ignorerad)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2714,7 +2766,7 @@ msgstr "" "eller \n" " fälten\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2724,7 +2776,7 @@ msgstr "" " --output-delimiter=STRÄNG använd STRÄNG som avskiljare vid utmatning\n" " standard är att använda inmatningsavskiljaren\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2736,7 +2788,8 @@ msgstr "" "intervall, eller flera intervall avskiljda med komman. Utvald indata\n" "skrivs i samma ordning som den läses, och skrivs exakt en gång.\n" -#: src/cut.c:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2744,8 +2797,6 @@ msgid "" " 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 "" "Varje intervall är en av:\n" "\n" @@ -2756,50 +2807,51 @@ msgstr "" "\n" "Utan FIL eller när FIL är -, läs standard in.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "felaktig byte-, tecken- eller fältlista" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "fält och positioner numreras från 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "ogiltigt intervall utan slutpunkt: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "ogiltigt sjunkande intervall" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "byteposition %s är för stor" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "fältnummer %s är för stort" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "endast en sorts lista får användas" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "avskiljaren måste vara endast ett tecken" -#: src/cut.c:787 +#: src/cut.c:786 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:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2807,11 +2859,11 @@ msgstr "" "att undertrycka ej avskiljda rader är endast rimligt\n" "\tvid arbete på fält" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "saknar fältlista" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "saknar lista med positionsangivelser" @@ -2830,12 +2882,19 @@ msgstr "Visa aktuell tid med angivet FORMAT, eller ställ in systemtiden.\n" #: 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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" + +#: src/date.c:138 +#, fuzzy +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" " -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" @@ -2846,25 +2905,24 @@ msgstr "" "datum\n" " och tid med den angivna precisionen.\n" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=FIL visa den tidpunkt då FIL senast modifierades\n" " -R, --rfc-2822 skriv ut tid och datum enligt formatet RFC 2822\n" " Exempel: Mon, 07 Aug 2006 12:34:56 +0200\n" -#: src/date.c:147 +#: src/date.c:149 +#, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=TIDSPEC skriv ut tid och datum enligt formatet RFC " "3339.\n" @@ -2879,8 +2937,19 @@ msgstr "" " -u, --utc, --universal sätt eller visa koordinerad universell tid " "(UTC)\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2893,7 +2962,7 @@ msgstr "" " %% ett literalt %\n" " %a lokalens förkortade veckodagsnamn (t.ex. sön)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2905,7 +2974,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:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2917,7 +2986,7 @@ msgstr "" " %D datum, samma som %m/%d/%y\n" " %e dag i månad, blankutfyllt, samma som %_d\n" -#: src/date.c:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2928,7 +2997,7 @@ msgstr "" " %G året motsvarande ISO-veckonumret (se %V), normalt användbart endast\n" " med %V\n" -#: src/date.c:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2940,7 +3009,7 @@ msgstr "" " %I timme (01-12)\n" " %j dag på året (001-366)\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2952,7 +3021,7 @@ msgstr "" " %m månad (01-12)\n" " %M minut (00-59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2970,7 +3039,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:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2982,7 +3051,7 @@ msgstr "" " %T tid, samma som %H:%M:%S\n" " %u dag i veckan (1-7), 1 är måndag\n" -#: src/date.c:209 +#: src/date.c:215 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" @@ -2994,7 +3063,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:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -3006,7 +3075,7 @@ msgstr "" " %y sista två siffrorna i årtalet (00-99)\n" " %Y år\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3026,7 +3095,7 @@ msgstr "" "\n" "Normalt fyller date ut numeriska fält med nollor.\n" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3044,7 +3113,7 @@ msgstr "" " ^ använd versaler om möjligt\n" " # använd motsatt skiftläge om möjligt\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3059,7 +3128,7 @@ msgstr "" "eller\n" "O för att använda lokalens alternativa numeriska symboler om tillgängliga.\n" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3083,36 +3152,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:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "standard in" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "ogiltigt datum %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "multipla utformat angivna" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3123,23 +3192,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:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "kan inte ställa klockan" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3148,7 +3217,7 @@ msgstr "" "Användning: %s [OPERAND]...\n" " eller: %s FLAGGA\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3166,7 +3235,8 @@ 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:541 +#: src/dd.c:570 +#, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3175,8 +3245,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\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" @@ -3189,7 +3261,7 @@ msgstr "" " standard fel; ”noxfer” utelämnar överföringsstatistik,\n" " ”none” utelämnar allt\n" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3207,7 +3279,7 @@ msgstr "" "Varje KONV-symbol kan vara:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3234,7 +3306,7 @@ msgstr "" " det används med block eller unblock, fyll ut med blanktecken\n" " istället för nulltecken\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3250,7 +3322,7 @@ msgstr "" " fdatasync skriv fysiskt data till utfilen före avslut\n" " fsync d:o, men skriv även metadata\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3264,135 +3336,103 @@ msgstr "" " append lägg-till-läge (meningsfullt endast för utmatning, conv=notrunc\n" " rekommenderas)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio använd samtidig I/O för data\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct använd direkt I/O för data\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory misslyckas om inte en katalog\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync använd synkroniserad I/O för data\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync d:o, men även för metadata\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock ackumulera hela block av indata (endast iflag)\n" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock använd icke blockerande I/O\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime uppdatera inte åtkomsttiden\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nocache kasta mellanlagrade data\n" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty tilldela inte styrterminal från fil\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow följ inte symboliska länkar\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks misslyckas ifall flera länkar\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary använd binär I/O för data\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text använd text-I/O för data\n" -#: src/dd.c:620 +#: src/dd.c:651 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:623 +#: src/dd.c:654 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:626 +#: src/dd.c:657 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:631 +#: src/dd.c:661 #, 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 "" -"\n" -"Genom att skicka en %s-signal till en körande ”dd”-process får\n" -"man den att skriva in-/utstatistik på standard, och sedan fortsätta\n" -"kopiera.\n" -"\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ kill -%s $pid; sleep 1; kill $pid\n" -" 18335302+0 poster in\n" -" 18335302+0 poster ut\n" -" 9387674624 byte (9.4 GB) kopierade, 34.6279 sekunder, 271 MB/s\n" -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +#: src/dd.c:699 +#, fuzzy, c-format +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "minnet slut av indatabuffert av storlek %zu byte (%s)" -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +#: src/dd.c:721 +#, fuzzy, c-format +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "minnet slut av utdatabuffert av storlek %zu byte (%s)" -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" -"%+% poster in\n" -"%+% poster ut\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% avhuggen post\n" -msgstr[1] "% avhuggna poster\n" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "% byte (%s) kopierad" msgstr[1] "% byte (%s) kopierade" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "Oändligt B" @@ -3406,83 +3446,100 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% poster in\n" +"%+% poster ut\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% avhuggen post\n" +msgstr[1] "% avhuggna poster\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "stänger infil %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "stänger utdatafil %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "misslyckades att slå av O_DIRECT: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "skrivning till %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "okänd operand %s" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "ogiltig konvertering" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "ogiltig inflagga" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "ogiltig utflagga" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "ogiltig statusflagga" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "ogiltigt antal %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, 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:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "kan inte kombinera block och unblock" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "kan inte kombinera lcase och ucase" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "kan inte kombinera excl och nocreate" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "det går inte att kombinera direct och nocache" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3491,62 +3548,62 @@ msgstr "" "varning: går runt fel i kärnan i lseek för fil (%s)\n" " med mt_type=0x%0lx -- se för en lista av typer" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: kan inte hoppa över" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: kan inte söka" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "spill i filposition vid läsning av filen %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "varning: ogiltig filposition efter misslyckad läsning" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "kan inte kringgå fel i kärnan trots allt" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "sätter flaggor för %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: kan inte hoppa över till angiven position" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "misslyckades att hugga av vid % byte i utdatafil %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync misslyckades för %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "fsync misslyckades för %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "misslyckades att öppna %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3555,19 +3612,19 @@ msgstr "" "positionen för stor: kan inte hugga av till en längd av seek=% (%lu-" "byte-)block" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "misslyckades att hugga av vid % byte i utdatafil %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "misslyckades att kasta mellanlager för: %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3648,12 +3705,12 @@ msgstr "Kapacitet" msgid "%s-%s" msgstr "%s-%s" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "kan inte komma åt %s: övermonterat av en annan enhet" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3663,13 +3720,14 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 +#, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3682,7 +3740,7 @@ msgstr "" " -h, --human-readable skriv storlekar i multiplar av 1024 (t.ex. 1023M)\n" " -H, --si skriv storlekar i multiplar av 1000 (t.ex. 1,1M)\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3696,13 +3754,37 @@ msgstr "" " --no-sync anropa inte sync innan information hämtas " "(normalfall)\n" -#: src/df.c:1409 +#: src/df.c:1429 +#, 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" +msgstr "" +" --output[=FÄLTLISTA] använd utformatet definierat av FÄLTLISTA, " +"eller\n" +" skriv alla fält om FÄLTLISTA utelämnas.\n" +" -P, --portability använd POSIX-format\n" +" --sync anropa sync innan information hämtas\n" +" -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" +" -v (ignorerad)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose skriv ett meddelande strax före varje\n" +" utfil öppnas\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3718,7 +3800,7 @@ msgstr "" " -x, --exclude-type=TYP utelämna filsystem av typ TYP\n" " -v (ignorerad)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3731,25 +3813,25 @@ msgstr "" "fältnamn är: ”source”, ”fstype”, ”itotal”, ”iused”, ”iavail”, ”ipcent”,\n" "”size”, ”used”, ”avail”, ”pcent”, ”file” och ”target” (se infosidan).\n" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "flaggorna %s och %s är ömsesidigt uteslutande" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "filsystemstypen %s är både vald och exkluderad" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Varning: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "kan inte läsa tabellen över monterade filsystem" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "inga filsystem bearbetade" @@ -3861,7 +3943,7 @@ msgstr "" " %s dir1/str dir2/str → ”dir1” följt av ”dir2”\n" " %s stdio.h → ”.”.\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3871,7 +3953,9 @@ msgstr "" " eller: %s [FLAGGA]... --files0-from=F\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +#, fuzzy +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "Sammanfatta diskanvändningen för varje FIL, rekursivt för kataloger.\n" #: src/du.c:291 @@ -4007,62 +4091,56 @@ msgstr "" msgid "Infinity" msgstr "Oändligt" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "fts_read misslyckades: %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "ogiltigt maxdjup %s" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "felaktigt argument till --threshold ”-0”" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "kan inte samtidigt bara visa summan och alla storlekar" -#: src/du.c:905 +#: src/du.c:926 #, 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:911 +#: src/du.c:932 #, 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:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" "varning: flaggorna --apparent-size och -b har ingen effekt med --inodes" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "filoperander kan inte kombineras med --files0-from" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: läsfel" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, 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:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "ogiltigt filnamn med längd noll" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "totalt" @@ -4140,6 +4218,7 @@ msgstr "" " \\a varning (SIGNAL)\n" " \\b backsteg\n" " \\c producera ingen ytterligare utmatning\n" +" \\e escape-tecken\n" " \\f sidmatning\n" " \\n nyrad\n" " \\r vagnretur\n" @@ -4203,9 +4282,8 @@ msgid "cannot specify --null (-0) with command" msgstr "det går inte att ange --null (-0) med ett kommando" #: 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" +#, fuzzy +msgid "Convert tabs in each FILE to spaces, writing to standard output.\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" @@ -4250,7 +4328,7 @@ msgid "input line is too long" msgstr "för lång rad in" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4403,12 +4481,12 @@ msgstr "fel i matchningen av reguljärt uttryck" msgid "non-integer argument" msgstr "argument som inte är heltal" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "division med noll" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "sätt LC_ALL='C' för att kringgå problemet" @@ -4419,31 +4497,31 @@ msgid "the strings compared were %s and %s" msgstr "de jämförda strängarna var %s och %s" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "Niels Möller" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "Lucas primtalstest misslyckades. Detta skall inte hända" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "squfof köspill" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s är inte ett giltigt positivt heltal" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s är för stort" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4453,7 +4531,7 @@ msgstr "" " eller: %s FLAGGA\n" "\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -4497,7 +4575,7 @@ msgstr "" "Formatera om varje stycke i FILen/-erna, skriv till standard ut.\n" "Flaggan -BREDD är en förkortad form av --width=SIFFROR.\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4509,7 +4587,7 @@ msgstr "" " sätt tillbaka prefixet på omformaterade rader\n" " -s, --split-only dela långa rader, men justera ej\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4523,7 +4601,7 @@ msgstr "" " -w, --width=LÄNGD maximal radlängd (standardvärde 75 kolumner)\n" " -g, --goal=LÄNGD målradlängd (standard är 93 % av bredden)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4532,20 +4610,19 @@ 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:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "ogiltig radlängd: %s" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +#, fuzzy +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "Bryt inmatade rader i varje fil (standard in som standard) och skriv till\n" "standard ut.\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4555,9 +4632,9 @@ msgstr "" " -s, --spaces bryt vid mellanrum\n" " -w, --width=ANTAL använd ANTAL kolumner i stället för 80\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "felaktigt antal kolumner: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4631,17 +4708,17 @@ msgstr "kan inte få fram verklig GID" msgid "%s: no such user" msgstr "%s: ingen sådan användare" -#: src/head.c:109 +#: src/head.c:110 +#, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Skriv de 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" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4660,7 +4737,7 @@ msgstr "" "sista\n" " K raderna av varje fil\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4668,7 +4745,7 @@ msgstr "" " -q, --quiet, --silent skriv aldrig huvuden med filnamn\n" " -v, --verbose skriv alltid huvuden med filnamn\n" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4680,48 +4757,36 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: filen har krympt för mycket" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: antal byte är för stort" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: kan inte söka till position %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: kan inte söka till relativ position %s" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "antal rader" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "antal byte" +msgid "%s: number of bytes is too large" +msgstr "%s: antal byte är för stort" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "felaktigt antal rader" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "felaktigt antal byte" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "ogiltig avslutande flagga -- %c" @@ -4910,7 +4975,7 @@ msgstr "kan inte byta ägare av %s" msgid "cannot set time stamps for %s" msgstr "kan inte sätta tidsstämpel för %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "systemanropet fork misslyckades" @@ -5069,7 +5134,7 @@ msgstr "strip-flaggan kan inte användas vid installation av en katalog" msgid "target directory not allowed when installing a directory" msgstr "målkatalog kan inte användas vid installation av en katalog" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "ogiltig rättighet %s" @@ -5107,8 +5172,13 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5124,7 +5194,7 @@ msgstr "" " eller 2, motsvarande FIL1 eller FIL2\n" " -e TOM ersätt tomma inmatningsfält med TOM\n" -#: src/join.c:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5136,7 +5206,7 @@ msgstr "" " -o FORMAT följ FORMAT när utskriftsrader konstrueras\n" " -t TECKEN använd TECKEN som fältseparator för in- och utmatning\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5156,11 +5226,11 @@ msgstr "" " --header hantera första raden i varje fil som filhuvuden,\n" " skriv dem utan att försöka att para ihop dem\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr " -z, --zero-terminated radavgränsare är NOLL, inte nyrad\n" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5195,47 +5265,47 @@ msgstr "" "Om indata inte är sorterad och några rader inte kan förenas, ges ett\n" "varningsmeddelande.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:%: är inte sorterad: %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "felaktigt fältnummer: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "felaktig fältspecifikation: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "felaktigt filnummer i fältspec: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "inkompatibla join-fält %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "motsägelsefulla ersättningssträngar för tomma fält" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "flerteckenstabulator %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "inkompatibla tabulatorer" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "båda filerna kan inte vara standard in" @@ -5312,17 +5382,17 @@ msgstr "kan inte kombinera signal med -l eller -t" msgid "no process ID specified" msgstr "inget process-ID angivet" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "misslyckades att allokera en % byte stdio-buffert\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "felaktigt buffringsläge %s för %s\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "kunde inte ställa in buffring av %s till läge %s\n" @@ -5510,7 +5580,7 @@ msgstr "kan inte göra --relative utan --symbolic" msgid "FIXME: unknown" msgstr "FIXA: okänd" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Användning: %s [FLAGGA]\n" @@ -5523,7 +5593,7 @@ msgstr "" "Skriv ut namnet på aktuell användare.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "inget inloggningsnamn" @@ -5533,7 +5603,7 @@ msgstr "inget inloggningsnamn" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%e %b %Y" @@ -5542,94 +5612,94 @@ msgstr "%e %b %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%e %b %H.%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "ignorerar ogiltigt värde på miljövariabeln QUOTING_STYLE: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "ignorerar felaktig bredd i miljövariabeln COLUMNS: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "ignorerar felaktigt tabulatorsteg i miljövariabeln TABSIZE: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "felaktig radlängd: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "felaktigt tabulatorsteg %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "felaktigt tidsstilsformat %s" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "Giltiga argument är:\n" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr " - +FORMAT (t.ex., +%H.%M) för ett format i ”date”-stil\n" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "fel vid initiering av månadssträngar" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "okänt prefix: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "obegripligt värde på LS_COLORS-miljövariabeln" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "ignorerar ogiltigt värde på miljövariabeln QUOTING_STYLE: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "kan inte öppna katalog %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "kan inte avgöra enhet och inod för %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: listar inte redan listad katalog" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "läser katalog %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "stänger katalog %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "kan inte jämföra filnamnen %s och %s" -#: src/ls.c:4781 +#: src/ls.c:4775 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" @@ -5637,7 +5707,7 @@ msgstr "" "Visa information om FILerna (aktuell katalog om inget anges). Sortera\n" "posterna alfabetiskt om ingen av -cftuvSUX eller --sort anges.\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5650,7 +5720,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:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5676,12 +5746,14 @@ msgstr "" " med -l: visa ctime och sortera alfabetiskt;\n" " annars: sortera efter ctime, nyast först\n" -#: src/ls.c:4804 +#: src/ls.c:4798 +#, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5694,7 +5766,7 @@ msgstr "" " -d, --directory lista själva katalogerna, inte deras innehåll\n" " -D, --dired anpassa utdata för Emacs dired-funktion\n" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5711,11 +5783,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time som -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr " -g som -l, men skriv inte ut ägare\n" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5729,7 +5801,7 @@ msgstr "" "användning\n" " av --sort=none (-U) avaktiverar gruppering\n" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5742,7 +5814,7 @@ msgstr "" " en människa (t.ex. 1K 234M 2G)\n" " --si d:o, men använd potenser av 1000, inte 1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5764,7 +5836,7 @@ msgstr "" "MÖNSTER\n" " (åsidosätts av -a eller -A)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5785,7 +5857,7 @@ msgstr "" " -k, --kibibytes använd som standard 1024-bytesblock för\n" " diskanvändning\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5802,7 +5874,7 @@ msgstr "" " -m fyll bredden med en kommaseparerad lista av " "poster\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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,7 +5892,7 @@ msgstr "" " -p, --indicator-style=slash\n" " lägg till en /-indikator till kataloger\n" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -5841,7 +5913,7 @@ msgstr "" " literal, locale, shell, shell-always, c, " "escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5853,18 +5925,19 @@ msgstr "" " -s, --size skriv allokerade storleken i block för varje " "fil\n" -#: src/ls.c:4886 +#: src/ls.c:4881 +#, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S sortera efter filstorlek\n" " --sort=ORD sortera enligt ORD istället för namn: none (-" @@ -5878,7 +5951,7 @@ msgstr "" " angiven tid som sorteringsnyckel om --" "sort=time\n" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -5902,7 +5975,7 @@ msgstr "" "effekt\n" " endast utanför lokalen POSIX\n" -#: src/ls.c:4908 +#: src/ls.c:4904 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -5910,11 +5983,12 @@ msgstr "" " -t sortera efter modifieringstid, nyast först\n" " -T, --tabsize=KOLUMN antag tabulatorsteg varje KOLUMN, inte var 8:e\n" -#: src/ls.c:4912 +#: src/ls.c:4908 +#, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -5925,13 +5999,15 @@ msgstr "" " -U sortera inte; lista poster i katalogordning\n" " -v naturlig sortering av (versions)nummer i text\n" -#: src/ls.c:4919 +#: src/ls.c:4915 +#, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=KOLUMN anta skärmbredd istället för aktuellt värde\n" " -x lista poster radvis istället för kolumnvis\n" @@ -5939,7 +6015,7 @@ msgstr "" " -Z, --context skriv eventuell säkerhetskontext för varje fil\n" " -1 lista en fil per rad\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5954,7 +6030,7 @@ msgstr "" "Miljövariablen LS_COLORS kan ändra inställningen. Använd kommandot\n" "dircolors för att sätta den.\n" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5984,51 +6060,54 @@ msgid "David Madore" msgstr "David Madore" #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" "Användning: %s [FLAGGA]... [FIL]...\n" "Skriv eller kontrollera %s (%d-bitars) kontrollsummor.\n" "Utan FIL eller om FIL är -, läs standard in.\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" 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:178 -msgid " -b, --binary read in binary mode\n" +#: src/md5sum.c:180 +#, fuzzy +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary läs i binärt läge\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr " --tag skapa en kontrollsumma i BSD-stil\n" -#: src/md5sum.c:188 +#: src/md5sum.c:191 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:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text läs i textläge (standard)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -6049,14 +6128,15 @@ msgstr "" " -w, --warn varna för felaktigt formaterade kontrollsummerader\n" "\n" -#: src/md5sum.c:206 -#, c-format +#: src/md5sum.c:209 +#, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "Summorna beräknas så som beskrivs i %s. Vid kontroll ska indata vara\n" @@ -6064,89 +6144,88 @@ 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:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: för många kontrollsummerader" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: felaktigt formaterad %s-kontrollsummerad" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: MISSLYCKADES att öppna eller läsa\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "MISSLYCKADES" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "OK" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: inga korrekt formaterade %s-kontrollsummerader funna" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "VARNING: % rad är felaktigt formaterad" msgstr[1] "VARNING: % rader är felaktigt formaterade" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "VARNING: % listad fil kunde inte läsas" msgstr[1] "VARNING: % listade filer kunde inte läsas" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "VARNING: % beräknad kontrollsumma stämde INTE" msgstr[1] "VARNING: % beräknade kontrollsummor stämde INTE" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "--tag stödjer inte läget --text" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "flaggan --tag är meningslös när kontrollsummor verifieras" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "" -"flaggorna --binary och --text är meningsfulla enbart när kontrollsummor\n" -"verifieras" +"flaggorna --binary och --text är meningslösa när kontrollsummor verifieras" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 +#: src/md5sum.c:802 #, 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:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "flaggan --strict är meningsfull enbart när kontrollsummor verifieras" @@ -6185,22 +6264,22 @@ msgstr "" " --context[=KTX] som -Z, eller om KTX anges, sätt då SELinux- eller\n" " SMACK-säkerhetskontext till KTX\n" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "misslyckades att sätta standardkontext för %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" msgstr "misslyckades att återställa kontext för %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "skapade katalog %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6405,7 +6484,7 @@ msgstr "för många mallar" msgid "with --suffix, template %s must end in X" msgstr "med --suffix måste mallen %s sluta med X" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "ogiltigt suffix %s, innehåller katalogseparator" @@ -6540,9 +6619,8 @@ msgid "Scott Bartram" msgstr "Scott Bartram" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, with line numbers added.\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" @@ -6649,27 +6727,27 @@ msgstr "felaktig stil för numrering av kropp: %s" msgid "invalid footer numbering style: %s" msgstr "felaktig stil för numrering av sidfot: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "felaktigt första radnummer: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "felaktig ökning av radnummer: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "felaktigt antal tomma rader: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "felaktig bredd på radnumrets fält: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "felaktigt format på radnummer: %s" @@ -6692,10 +6770,10 @@ msgstr "" "\n" #: src/nohup.c:65 -#, c-format +#, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6714,43 +6792,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "misslyckades att göra standard in oanvändbar" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "ignorerar indata" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "ignorerar indata och lägger till utdata till %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "lägger till utdata till %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "misslyckades att ställa in kopian av standard fel att stängas vid exec" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "ignorerar indata och omdirigerar standard fel och standard ut" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "omdirigerar standard fel och standard ut" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -6778,78 +6856,76 @@ msgstr "" " --all skriv antalet installerade processorer\n" " --ignore=N om möjligt, uteslut N processorenheter\n" -#: 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "Assaf Gordon" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, 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:663 +#: src/numfmt.c:694 #, c-format msgid "invalid number: %s" msgstr "ogiltigt antal: %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, 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:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" msgstr "felaktigt suffix i indata: %s" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, 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:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "misslyckades förbereda värdet ”%Lf” för utskrift" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, c-format msgid "invalid unit size: %s" msgstr "felaktigt enhetssteg: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Användning: %s [FLAGGA]… [NUMMER]…\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 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:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr " --debug skriv varningar om ogiltig indata\n" -#: src/numfmt.c:824 +#: src/numfmt.c:890 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:827 +#: src/numfmt.c:893 +#, fuzzy msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr " --field=N ersätt talet i indatafält N (standard är 1)\n" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" @@ -6857,7 +6933,7 @@ msgstr "" " --format=FORMAT använd flyttalsformat FORMAT av typ printf;\n" " se FORMAT nedan för detaljer\n" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" @@ -6867,14 +6943,14 @@ msgstr "" "är\n" " ”none”; se ENHET nedan\n" -#: src/numfmt.c:838 +#: src/numfmt.c:905 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:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6885,7 +6961,7 @@ msgstr "" " t.ex. 1 000 000 (vilket betyder att det inte har\n" " någon effekt i lokalen C/POSIX)\n" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" @@ -6893,7 +6969,7 @@ msgstr "" " --header[=N] skriv (utan konvertering) de första N rubrikraderna;\n" " N blir 1 som standard om det inte anges\n" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" @@ -6901,7 +6977,7 @@ msgstr "" " --invalid=SÄTT felhanteringssätt för felaktiga tal: SÄTT kan vara:\n" " abort (standard), fail, warn, ignore\n" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -6916,7 +6992,7 @@ msgstr "" " standard är att automatiskt fylla ut om ett\n" " blanktecken finns\n" -#: src/numfmt.c:860 +#: src/numfmt.c:927 msgid "" " --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" " up, down, from-zero (default), towards-zero, " @@ -6927,7 +7003,7 @@ msgstr "" " up, down, from-zero (standard), towards-zero, " "nearest\n" -#: src/numfmt.c:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" @@ -6936,20 +7012,20 @@ msgstr "" "ett\n" " möjligt SUFFIX i indatatal\n" -#: src/numfmt.c:868 +#: src/numfmt.c:935 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:871 +#: src/numfmt.c:938 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:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" @@ -6957,12 +7033,12 @@ msgstr "" "\n" "ENHETSflaggor:\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 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:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6976,7 +7052,7 @@ msgstr "" " 1M = 1000000,\n" " 1Mi = 1048576,\n" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -6988,7 +7064,7 @@ msgstr "" " 1M = 1000000,\n" " …\n" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7000,7 +7076,7 @@ msgstr "" " 1M = 1048576,\n" " …\n" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7012,8 +7088,29 @@ msgstr "" " 1Mi = 1048576,\n" " …\n" -#: src/numfmt.c:906 -#, c-format +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Varje intervall är en av:\n" +"\n" +" N N:te byte, tecken eller fält, räknat från 1\n" +" N- från N:te byte, tecken eller fält, till radslut\n" +" N-M från N:te till och med M:te byte, tecken eller fält\n" +" -M från första till och med M:te byte, tecken eller fält\n" +"\n" +"Utan FIL eller när FIL är -, läs standard in.\n" + +#: src/numfmt.c:983 +#, fuzzy, c-format msgid "" "\n" "FORMAT must be suitable for printing one floating-point argument '%f'.\n" @@ -7021,6 +7118,7 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" "\n" "FORMAT måste passa för att skriva ett flyttalsargument ”%f”. En möjlig\n" @@ -7031,7 +7129,7 @@ msgstr "" "negativt\n" "värde (%-10f) kommer vänsterställa utdata.\n" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7052,8 +7150,8 @@ msgstr "" "konverteringsfel\n" "och slutstatusen är 0.\n" -#: src/numfmt.c:922 -#, c-format +#: src/numfmt.c:1000 +#, fuzzy, c-format msgid "" "\n" "Examples:\n" @@ -7067,8 +7165,8 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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 "" @@ -7089,113 +7187,125 @@ msgstr "" " $ ls -lh | %s --header --field 5 --from=iec --padding=10\n" " $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n" -#: src/numfmt.c:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "målet %s har inget %%-direktiv" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "felaktigt format %s (spill i bredden)" -#: src/numfmt.c:1008 -#, c-format -msgid "--format padding overridding --padding" +#: src/numfmt.c:1085 +#, fuzzy, c-format +msgid "--format padding overriding --padding" msgstr "utfyllnad med --format åsidosätter --padding" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "format %s avslutas med %%" -#: src/numfmt.c:1030 -#, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "ogiltig precision: %s" + +#: src/numfmt.c:1126 +#, fuzzy, c-format +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "ogiltigt format %s, direktivet måste vara %%[0]['][-][N]f" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "format %s har för många %%-direktiv" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, c-format msgid "invalid suffix in input %s: %s" msgstr "felaktigt suffix i indata %s: %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, fuzzy, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "värdet är för stort för att skrivas: ”%Lg” (överväg att använda --to)" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "värdet är för stort för att skrivas: ”%Lg” (överväg att använda --to)" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" "värdet är för stort för att skrivas: ”%Lg” (kan inte hantera värden > 999Y)" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "stort indatavärde %s: möjlig förlust av precision" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "indataraden är för kort, inga tal fanns att konvertera i fält %ld" +msgid "invalid field value %s" +msgstr "felaktigt fältvärde %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, c-format msgid "invalid padding value %s" msgstr "ogiltigt utfyllnadsvärde %s" -#: src/numfmt.c:1417 -#, c-format -msgid "invalid field value %s" -msgstr "felaktigt fältvärde %s" +#: src/numfmt.c:1646 +#, fuzzy, c-format +msgid "multiple field specifications" +msgstr "%s: felaktig fältspecifikation %s" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, c-format msgid "invalid header value %s" msgstr "ogiltigt huvudvärde %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "--grouping kan inte kombineras med --format" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "ingen konverteringsflagga angiven" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "gruppering kan inte kombineras med --to" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "gruppering har ingen effekt i den här lokalen" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "--header ignoreras vid kommandoradsindata" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "fel vid läsning av indata" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "misslyckades att konvertera några av indatatalen" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7208,14 +7318,13 @@ msgstr "" " eller: %s --traditional [FLAGGA]... [FIL] [[+]FÖRSKJUTNING[.][b] [+]" "[ETIKETT][.][b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Skriv en otvetydig representation, normalt oktala tecken, av FIL till\n" @@ -7224,8 +7333,10 @@ msgstr "" "in.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 +#, 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" @@ -7241,7 +7352,7 @@ msgstr "" "indikerar förstavelserna 0x eller 0X hexadecimalt, ändelser kan vara\n" ". för oktalt och b multiplicerar med 512.\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7255,7 +7366,7 @@ msgstr "" " byteordning\n" " -j, --skip-bytes=BYTE hoppa först över BYTE byte i indata\n" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -7278,7 +7389,7 @@ msgstr "" " 32 underförstås när BYTE inte anges\n" " --traditional acceptera argument i tredje formatet ovan\n" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -7297,7 +7408,7 @@ msgstr "" " snedstreck\n" " -d samma som -t u2, välj decimala 2-byteenheter utan tecken\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7313,7 +7424,7 @@ msgstr "" " -s samma som -t d2, välj decimala 2-byteenheter\n" " -x samma som -t x2, välj hexadecimala 2-byteenheter\n" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -7327,7 +7438,7 @@ msgstr "" " a namngivet tecken, ignorera höga biten\n" " c skrivbara tecken eller sekvens med omvänt snedstreck\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7341,7 +7452,7 @@ msgstr "" " u[STORLEK] decimalt utan tecken, STORLEK byte per heltal\n" " x[STORLEK] hexadecimalt, STORLEK byte per heltal\n" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -7355,7 +7466,7 @@ msgstr "" "sizeof(long). Om TYP är f kan STORLEK också vara F för sizeof(float), D\n" "för sizeof(double) eller L för sizeof(long double).\n" -#: src/od.c:401 +#: src/od.c:404 msgid "" "\n" "Adding a z suffix to any type displays printable characters at the end of\n" @@ -7366,7 +7477,7 @@ msgstr "" "slutet\n" "av varje utdatarad.\n" -#: src/od.c:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -7388,12 +7499,12 @@ msgstr "" " M 1024·1024\n" "och så vidare för G, T, P, E, Z, Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "ogiltig typsträng %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7402,7 +7513,7 @@ msgstr "" "ogiltig typsträng %s;\n" "detta system har ingen %lu-bytes heltalstyp" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7411,38 +7522,38 @@ msgstr "" "ogiltig typsträng %s;\n" "detta system har ingen %lu-bytes flyttalstyp" -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" msgstr "ogiltigt tecken ”%c” i typsträngen %s" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "kan inte hoppa förbi slutet på en kombinerad inmatning" -#: src/od.c:1650 +#: src/od.c:1658 #, 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:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "ingen typ kan anges när strängar sparas" -#: src/od.c:1863 +#: src/od.c:1871 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:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "skip-bytes + read-bytes är för stort" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "varning: ogiltig bredd %lu; använder %d i stället" @@ -7458,10 +7569,10 @@ msgid "standard input is closed" msgstr "standard in stängd" #: src/paste.c:439 +#, fuzzy msgid "" "Write lines consisting of the sequentially corresponding lines from\n" "each FILE, separated by TABs, to standard output.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Skriv rader som består av sekventiellt korresponderande rader från\n" "varje FIL, åtskilda med TAB, till standard ut. Utan FIL eller om\n" @@ -7606,12 +7717,12 @@ msgstr "När" msgid "Where" msgstr "Var" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Användning: %s [FLAGGA]... [ANVÄNDARE]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7628,7 +7739,7 @@ msgstr "" " -p utelämna användarens planfil i det långa formatet\n" " -s skriv ut i kort format, detta är standard\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7644,7 +7755,7 @@ msgstr "" " -q utelämna användarens fullständiga namn, fjärrvärd och \n" " overksamma tiden i kort format\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -7655,96 +7766,96 @@ msgstr "" "Ett lättviktigt ”finger”-program; skriver ut användarinformation.\n" "utmp-filen kommer att vara %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "inget användarnamn angivet; åtminstone ett måste anges när -l används" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "”--pages=FÖRSTA_SIDA[:SISTA_SIDA]” saknar argument" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "ogiltigt sidintervall %s" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "”-l SIDLÄNGD” felaktigt antal rader: %s" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "”-N NUMMER” felaktigt första radnummer: %s" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "”-o MARGINAL” felaktigt indrag av rad: %s" -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "”-w SIDBREDD” felaktigt antal tecken: %s" -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "”-W SIDBREDD” felaktigt antal tecken: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, 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:1100 +#: src/pr.c:1063 #, 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:1196 +#: src/pr.c:1166 #, 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:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "bredden på sidan är för smal" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "första sidnummer % överskrider antalet sidor %" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "spill i sidnummer" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Sida %" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "Paginera eller skapa kolumner av FIL(er) för utskrift.\n" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7761,7 +7872,7 @@ msgstr "" "kolumnerna\n" " på varje sida\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7778,7 +7889,7 @@ msgstr "" " -d, --double-space\n" " skriv ut med dubbelt radavstånd\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7799,7 +7910,7 @@ msgstr "" " separera sidor (med ett 3-raders huvud vid -F eller\n" " 5-raders huvud och fot utan -F)\n" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7822,11 +7933,23 @@ msgstr "" "ingen\n" " kolumnjustering, --sep-string[STRÄNG] anger avskiljare\n" -#: src/pr.c:2798 +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l, --length=SIDLÄNGD\n" +" sätt sidlängden till SIDLÄNGD (66) rader\n" +" (standard 56 rader text, och med -F 63)\n" +" -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:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -7836,7 +7959,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:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7853,7 +7976,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:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7868,7 +7991,7 @@ msgstr "" " -r, --no-file-warnings\n" " utelämna varning när en fil inte kan öppnas\n" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7886,14 +8009,14 @@ msgstr "" "kolumnflaggorna\n" " (-KOLUMN|-a KOLUMN|-m) utom när -w är angivet\n" -#: src/pr.c:2828 +#: src/pr.c:2802 +#, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -S[STRÄNG], --sep-string[=STRÄNG]\n" " åtskilj kolumner med STRÄNG,\n" @@ -7902,7 +8025,13 @@ msgstr "" "kolumnflaggor\n" " -t, --omit-header utelämna sidhuvud och sidfot\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7924,7 +8053,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:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7937,16 +8066,6 @@ msgstr "" " utmatning, hugg av rader utom om flagga -J är satt,\n" " ingen koppling till -S eller -s\n" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"-t är implicit om SIDLÄNGD ≤ 10. Utan FIL, eller när FIL är -, läs\n" -"standard in.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -8100,11 +8219,11 @@ msgid "" msgstr "" "Mata ut ett permuterat index, med sammanhang, av orden i indatafilerna.\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 +#, fuzzy msgid "" " -A, --auto-reference output automatically generated references\n" " -G, --traditional behave more like System V 'ptx'\n" -" -F, --flag-truncation=STRING use STRING for flagging line truncations\n" msgstr "" " -A, --auto-reference skriv ut automatiskt genererade referenser\n" " -G, --traditional uppträd mer som System V:s ”ptx”\n" @@ -8113,6 +8232,12 @@ msgstr "" #: src/ptx.c:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -8125,7 +8250,7 @@ msgstr "" " -S, --sentence-regexp=REGUTTR för radslut eller meningsslut\n" " -T, --format=tex generera utdata som TeX-direktiv\n" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8143,7 +8268,7 @@ msgstr "" " -o, --only-file=FIL läs lista av ord att endast använda från " "FIL\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8155,19 +8280,16 @@ msgstr "" " -w, --width=ANTAL utmatningsbredd i kolumner, utan " "referenser\n" -#: src/ptx.c:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Utan FIL, eller när FIL är -, läs standard in. Standard är ”-F /”.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "ogiltig gapbredd: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "felaktig radlängd: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8198,7 +8320,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "misslyckades att ändra katalog till %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "misslyckades att ta status på %s" @@ -8218,8 +8340,8 @@ msgstr "ignorerar argument som inte är flaggor" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Användning: %s [FLAGGA]... FIL...\n" @@ -8485,16 +8607,16 @@ msgstr "" "överväg att använda shred.\n" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: ta bort %zu argument rekursivt? " msgstr[1] "%s: ta bort %zu argument rekursivt? " #: src/rm.c:345 -#, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +#, fuzzy, c-format +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: ta bort %zu argument? " msgstr[1] "%s: ta bort %zu argument? " @@ -8712,12 +8834,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "felaktigt flyttalsargument: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "formatet %s har okänt %%%c-direktiv" -#: src/seq.c:557 +#: src/seq.c:603 #, 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" @@ -8735,7 +8857,16 @@ msgstr "" "Skriv över de angivna FIL(erna) upprepade gånger, för att göra det svårare\n" "även för väldigt dyra hårdvaruutrustningar att ta fram data.\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Om FIL är -, kopiera igen till standard ut.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8748,7 +8879,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:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -8764,11 +8895,10 @@ msgstr "" " -z, --zero lägg till en avslutande överskrivning med nollor för att\n" " dölja strimlandet\n" -#: src/shred.c:192 +#: src/shred.c:196 +#, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -8793,7 +8923,7 @@ msgstr "" "Standardläget är ”wipesync”, men observera att detta kan vara dyrt.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8812,7 +8942,7 @@ msgstr "" "lägen:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8832,7 +8962,7 @@ msgstr "" "* filsystem som tar ögonblicksbilder, såsom Network Appliances NFS-server\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8846,7 +8976,7 @@ msgstr "" "* komprimerade filsystem\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -8867,7 +8997,7 @@ msgstr "" "mount (man mount).\n" "\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -8878,128 +9008,128 @@ msgstr "" "av filen som inte kan tas bort, och som kan göra det möjligt att återta en\n" "strimlad fil senare.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync misslyckades" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync misslyckades" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: kan inte backa till början" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: pass %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: fel vid skrivning vid position %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek misslyckades" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: filen är för stor" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: pass %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: pass %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat misslyckades" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: ogiltig filtyp" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: filen har negativ storlek" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: fel vid avhuggning" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl misslyckades" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "" "%s: kan inte skriva över filidentifierare som bara är öppnad för tillägg" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: tar bort" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: namnändrad till %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: misslyckades att ta bort" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: borttagen" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: misslyckades att stänga" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: misslyckades öppna för skrivning" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: ogiltigt antal pass" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "multipla slumpkällor angivna" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: ogiltig filstorlek" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -9010,11 +9140,11 @@ msgstr "" " eller: %s -e [FLAGGA]... [ARG]\n" " eller: %s -i LÅ-HÖ [FLAGGA]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 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:73 +#: src/shuf.c:75 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 " @@ -9033,37 +9163,37 @@ msgstr "" " --random-source=FIL hämta slumpbyte:ar från FIL\n" " -r, --repeat utskrivna rader kan upprepas\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "för många indatarader" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "multipla -l-flaggor angivna" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "ogiltigt indataintervall %s" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "felaktig radantal %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "multipla utfiler angivna" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "det går inte att kombinera flaggorna -e och -i" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "inga rader att upprepa" @@ -9090,12 +9220,12 @@ msgstr "" "flera argument, gör paus så länge som summan av dem anger\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "felaktigt tidsintervall: %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "kan inte läsa realtidsklockan" @@ -9104,7 +9234,7 @@ msgstr "kan inte läsa realtidsklockan" 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:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -9112,7 +9242,7 @@ msgstr "" "Sorteringsflaggor:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9124,7 +9254,7 @@ msgstr "" "tecken\n" " -f, --ignore-case byt gemener mot versaler\n" -#: src/sort.c:443 +#: src/sort.c:444 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -9134,13 +9264,13 @@ msgstr "" " -i, --ignore-nonprinting beakta endast skrivbara tecken\n" " -M, --month-sort jämför (okänd) < ”JAN” < … < ”DEC”\n" -#: src/sort.c:448 +#: src/sort.c:449 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:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9152,7 +9282,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:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9168,7 +9298,7 @@ msgstr "" " -V, --version-sort naturlig sortering av (versions)nummer i text\n" "\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -9176,7 +9306,7 @@ msgstr "" "Andra flaggor:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9184,7 +9314,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:473 +#: src/sort.c:474 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 " @@ -9199,7 +9329,7 @@ msgstr "" " --compress-program=PROG komprimera temporärfiler med PROG;\n" " packa upp dem med PROG -d\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9215,7 +9345,7 @@ msgstr "" " nollterminerade namn i filen F.\n" " Om F är - så läs namn från standard in\n" -#: src/sort.c:487 +#: src/sort.c:488 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -9224,7 +9354,7 @@ msgstr "" "typ\n" " -m, --merge slå samman redan sorterade filer, sortera inte\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9237,7 +9367,7 @@ msgstr "" " sista-utvägsjämförelse\n" " -S, --buffer-size=STORLEK använd STORLEK för huvudminnesbuffert\n" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9264,7 +9394,7 @@ msgstr "" " utan -c, skriv ut endast den första av flera " "lika\n" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9295,12 +9425,11 @@ msgstr "" "\n" "STORLEK kan följas av följande multiplikativa ändelser:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -9316,265 +9445,267 @@ msgstr "" "Sätt LC_ALL=C för att få traditionell sorteringsordning som använder\n" "de underliggande bytevärdena.\n" -#: src/sort.c:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "väntar på %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] avslutade oväntat" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "det går inte att skapa en temporärfil i %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "misslyckades öppna" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "fflush misslyckades" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "misslyckades stänga" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "det går inte att skapa temporärfil" -#: src/sort.c:1179 +#: src/sort.c:1178 #, 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:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "varning: kan inte ta bort: %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "felaktigt argument %2$s till --%1$s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "minsta argument till --%s är %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "argument %2$s till %1$s är för stort" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "maximalt argument till --%s vid aktuell rlimit är %s" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "antal parallella måste skilt från noll" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "misslyckades ta status" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "misslyckades läsa" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "strängtransformation misslyckades" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "den otransformerade strängen var %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "^ ingen match för nyckel\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, 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:2428 +#: src/sort.c:2427 #, 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:2439 +#: src/sort.c:2438 #, 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:2452 +#: src/sort.c:2451 #, 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:2484 +#: src/sort.c:2483 #, 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:2490 +#: src/sort.c:2489 #, 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:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "misslyckades skriva" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: oordning: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "standard fel" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "kan inte läsa" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: felaktig fältspecifikation %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "flaggorna ”-%s” är inkompatibla" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: felaktigt antal i början på %s" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "felaktigt nummer efter ”-”" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "felaktigt nummer efter ”.”" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "extra tecken i fältspecifikation" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "multipla komprimeringsprogram angivna" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "felaktigt nummer vid fältstart" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "fältnummer är noll" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "teckenplats är noll" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" msgstr "felaktigt nummer efter ”,”" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "tom tabulator" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "kan inte läsa filnamn från %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: ogiltigt filnamn med längd noll" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "ingen indata från %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "använder %s-sorteringsregler" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "använder enkel bytejämförelse" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "extra operand %s inte tillåten med -%c" -#: src/split.c:186 -#, c-format -msgid "the suffix length needs to be at least %zu" +#: src/split.c:207 +#, fuzzy, c-format +msgid "the suffix length needs to be at least %" msgstr "ändelsens längd behöver vara åtminstone %zu" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Användning: %s [FLAGGA]... [INFIL [PREFIX]]\n" -#: src/split.c:207 +#: src/split.c:228 +#, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\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" -#: src/split.c:215 -#, c-format +#: src/split.c:236 +#, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file names\n" " -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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" " -a, --suffix-length=N använd ändelser av längd N (standard %d)\n" @@ -9592,7 +9723,7 @@ msgstr "" "…”\n" "\n" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9600,16 +9731,17 @@ msgstr "" " --verbose skriv ett meddelande strax före varje\n" " utfil öppnas\n" -#: src/split.c:235 +#: src/split.c:258 +#, fuzzy 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" "\n" "BITAR kan vara:\n" @@ -9620,189 +9752,194 @@ 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:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "slut på utfiländelser" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "skapar filen %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "%s skulle skriva över indata, avbryter" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "misslyckades att sätta miljövariabeln FILE" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "kör med FIL=%s\n" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "misslyckades att skapa rör" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "stänger tidigare rör" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "stänger utdatarör" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "flyttar indatarör" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "stänger indatafil" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "misslyckades att köra kommandot ”%s -c %s”" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "misslyckades att stänga indatarör" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "väntar på barnprocess" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "med FILE=%s, signal %s från kommando: %s" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "med FILE=%s, slutkod %d från kommando: %s" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "okänd status från kommando (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "kan inte dela på mer än ett sätt" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: ogiltigt antal bitar" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: felaktigt bitantal" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: felaktig ändelselängd" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: felaktigt antal byte" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: felaktigt antal rader" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "flerteckenstabulator %s" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "multiplexad teckenspecialfil" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "radantalsflagga -%s%c... är för stor" -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: felaktigt startvärde för numerisk ändelse" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: ogiltig blockstorlek för IO" -#: src/split.c:1347 +#: src/split.c:1437 #, 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:1384 +#: src/split.c:1477 #, 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:1419 +#: src/split.c:1528 #, 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:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "misslyckades att kanonisera %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "varning: okänd sekvens med omvänt snedstreck ”\\%c”" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: ogiltigt direktiv" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "varning: omvänt snedstreck vid slutet av formatet" -#: src/stat.c:1262 +#: src/stat.c:1265 #, 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:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "kan inte läsa filsysteminformation för %s" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9818,7 +9955,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9828,30 +9965,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "Kontext: %C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9863,11 +10000,11 @@ msgstr "" " Ändring: %z\n" " Född: %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "Visa fil- eller filsystemstatus.\n" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" @@ -9875,7 +10012,7 @@ msgstr "" " -L, --dereference följ länkar\n" " -f, --file-system visa filsystemstatus istället för filstatus\n" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9893,7 +10030,7 @@ msgstr "" " \\n i FORMAT\n" " -t, --terse skriv informationen på kortfattad form\n" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9913,7 +10050,7 @@ msgstr "" " %B storleken i byte på varje block rapporterat av %b\n" " %C SELinux-säkerhetskontextsträng\n" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9929,7 +10066,7 @@ msgstr "" " %g grupp-ID på ägare\n" " %G gruppnamn på ägare\n" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9951,7 +10088,7 @@ msgstr "" " %t övre enhetsnummer hexadecimalt, för tecken-/blockenhetsspecialfiler\n" " %T undre enhetsnummer hexadecimalt, för tecken-/blockenhetsspecialfiler\n" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9977,7 +10114,7 @@ msgstr "" " %Z senaste statusändringstid, sekunder sedan Epok\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9995,7 +10132,7 @@ msgstr "" " %d fria filnoder i filsystem\n" " %f fria block i filsystem\n" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -10071,11 +10208,11 @@ msgstr "" "LÄGE byte.\n" #: src/stdbuf.c:116 +#, fuzzy 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" +"for example) then that will override corresponding changes 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 "" @@ -10108,7 +10245,7 @@ msgstr "radbuffring av standard in är meningslöst" msgid "you must specify a buffering mode option" msgstr "du måste ange en flagga för buffringsläge" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10119,11 +10256,11 @@ msgstr "" " eller: %s [-F ENHETS | --file=ENHETS] [-a|--all]\n" " eller: %s [-F ENHETS | --file=ENHETS] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "Skriv ut eller ändra terminalkarakteristik.\n" -#: src/stty.c:528 +#: src/stty.c:536 msgid "" " -a, --all print all current settings in human-readable form\n" " -g, --save print all current settings in a stty-readable form\n" @@ -10134,7 +10271,7 @@ msgstr "" " -F, --file=ENHET öppna och använd angiven ENHET istället för standard " "in\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10145,11 +10282,24 @@ msgstr "" "icke-POSIX-inställning. Det underliggande systemet definierar vilka\n" "inställningar som är tillgängliga.\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -10159,9 +10309,13 @@ msgstr "" " eof TECKEN TECKEN skickar ett filslut (avsluta inmatning)\n" " eol TECKEN TECKEN avslutar raden\n" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -10171,35 +10325,58 @@ msgstr "" " intr TECKEN TECKEN skickar en avbrottssignal\n" " kill TECKEN TECKEN raderar nuvarande rad\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" msgstr "" -" * lnext TECKEN TECKEN skriver nästa tecken som ett specialtecken\n" -" quit TECKEN TECKEN skickar en avslutningssignal\n" -" * rprnt TECKEN TECKEN ritar om nuvarande rad\n" -" start TECKEN TECKEN startar utskrift igen efter att ha stoppat den\n" -#: src/stty.c:559 +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 TECKEN TECKEN stoppar utskriften\n" " susp TECKEN TECKEN skickar en terminalstoppsignal\n" " * swtch TECKEN TECKEN byter till ett annat skal\n" " * werase TECKEN TECKEN raderar det senast skrivna ordet\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 +#, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Specialinställningar:\n" +" N sätt in- och utmatningshastighet till N baud\n" +" * cols N säg till kärnan att terminalen har N kolumner\n" +" * columns N samma som cols N\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -10209,10 +10386,17 @@ msgstr "" " * cols N säg till kärnan att terminalen har N kolumner\n" " * columns N samma som cols N\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -10223,11 +10407,22 @@ msgstr "" "läsning\n" " ospeed N sätt utmatningshastighet till N\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N säg till kärnan att terminalen har N rader\n" +" * size skriv ut antalet rader och kolumner enligt kärnan\n" +" speed skriv ut terminalens hastighet\n" +" time N med -icanon, sätt timeout för läsning till N tiondels " +"sekunder\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -10237,25 +10432,28 @@ msgstr "" " time N med -icanon, sätt timeout för läsning till N tiondels " "sekunder\n" -#: src/stty.c:584 +#: src/stty.c:641 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" -" * [-]cdtrdse möjliggör DTR/DSR-handskakning\n" -" csN sätt teckenstorleken till N bitar, N i [5..8]\n" -#: src/stty.c:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 +#, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -10263,7 +10461,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb använd två stoppbitar per tecken (en med ”-”)\n" " [-]hup skicka en påläggningssignal när sista processen stänger " @@ -10274,7 +10471,12 @@ msgstr "" " [-]parodd ställ in udda paritet (eller jämn paritet med ”-”)\n" " * [-]cmspar använd ”fast” (märke/blank) paritet\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -10282,6 +10484,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Inställningar för inmatning:\n" @@ -10290,10 +10493,14 @@ msgstr "" " [-]ignbrk ignorera avbrottstecken\n" " [-]igncr ignorera vagnretur\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -10305,14 +10512,23 @@ msgstr "" " [-]inpck möjliggör paritetskontroll av indata\n" " [-]istrip rensa den höga (8:e) biten i ett inmatningstecken\n" -#: src/stty.c:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 anta inmatningstecken är UTF-8-kodade\n" -#: src/stty.c:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr " * [-]iutf8 anta inmatningstecken är UTF-8-kodade\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -10326,61 +10542,83 @@ msgstr "" " [-]parmrk markera paritetsfel (med en 255-0 teckensekvens)\n" " [-]tandem samma som [-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Inställningar för utmatning:\n" -" * bsN fördröjning på backsteg, N är [0-1]\n" -" * crN fördröjning på vagnretur, N är [0-3]\n" -" * 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:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" msgstr "" -" * [-]ocrnl översätt vagnretur till nyrad\n" -" * [-]ofdel använd raderingstecken till utfyllnad, istället för NOLL-" -"tecken\n" -" * [-]ofill använd utfyllnadstecken istället för tidstagning vid \n" -" fördröjningar\n" -" * [-]olcuc översätt gemener till versaler\n" -" * [-]onlcr översätt nyrad till vagnretur-nyrad\n" -" * [-]onlret nyrad utför vagnretur\n" -#: src/stty.c:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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 "" -" * [-]onocr skriv inte ut vagnretur i första kolumnen\n" -" [-]opost bearbetar utdata\n" -" * tabN fördröjning på horisontell tabulator, N är [0-3]\n" -" * tabs samma som tab0\n" -" * -tabs samma som tab3\n" -" * vtN fördröjning på vertikal tabulator, N är [0-1]\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10392,42 +10630,62 @@ msgstr "" " * -crtkill radera hela raden genom att använda inställningarna\n" " för echoctl och echok\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +#, fuzzy +msgid " [-]echo echo input characters\n" +msgstr " * [-]iutf8 anta inmatningstecken är UTF-8-kodade\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]ctlecho eka kontrolltecken med hattnotation (”^c”)\n" -" [-]echo eka inmatade tecken\n" -" * [-]echoctl samma som [-]ctlecho\n" -" [-]echoe samma som [-]crterase\n" -" [-]echok eka ett nyrad efter ett dödatecken\n" -#: src/stty.c:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]echoke samma som [-]crtkill\n" -" [-]echonl eka nyrad även om inga andra tecken ekas\n" -" * [-]echoprt eka raderade tecken baklänges, mellan ”\\” och ”/”\n" -" [-]icanon möjliggör specialtecknen erase, kill, werase och rprnt\n" -" [-]iexten möjliggör specialtecken som inte är POSIX-tecken\n" +" [-]isig möjliggör specialtecken för avbrott, slut och vila\n" +" [-]noflsh koppla bort rensning efter avbrottsignaler och \n" +" specialsluttecken\n" +" * [-]prterase samma som [-]echoprt\n" +" * [-]tostop stoppa bakgrundsjobb som försöker skriva till terminalen\n" +" * [-]xcase tillsammans med icanon, används ”\\” som kontrollsekvens\n" +" för versaltecken\n" -#: src/stty.c:672 +#: src/stty.c:843 +#, fuzzy 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 "" " [-]isig möjliggör specialtecken för avbrott, slut och vila\n" " [-]noflsh koppla bort rensning efter avbrottsignaler och \n" @@ -10437,11 +10695,33 @@ msgstr "" " * [-]xcase tillsammans med icanon, används ”\\” som kontrollsekvens\n" " för versaltecken\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -10451,12 +10731,12 @@ msgstr "" " cbreak samma som -icanon\n" " -cbreak samma som icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 samma som brkint ignpar istrip icrnl ixon oppst isig " "icanon,\n" @@ -10464,28 +10744,38 @@ msgstr "" " -cooked samma som raw\n" " crt samma som echoe echoctl echoke\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -" dec samma som echoe echoctl echoke -ixany intr ^c erase 0177\n" -" kill ^u\n" -" * [-]decctlq samma som [-]ixany\n" -" ek radera- och återställtecken till sina standardvärden\n" -" evenp samma som parenb -parodd cs7\n" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 +#, fuzzy 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 "" " -evenp samma som -parenb cs8\n" " * [-]lcase samma som xcase iuclc olcuc\n" @@ -10494,7 +10784,19 @@ msgstr "" " nl samma som -icrnl -onlcr\n" " -nl samma som icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"Kombinationsinställningar:\n" +" * [-]LCASE samma som [-]lcase\n" +" cbreak samma som -icanon\n" +" -cbreak samma som icanon\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10508,11 +10810,12 @@ msgstr "" " pass8 samma som -parenb -istrip cs8\n" " -pass8 samma som parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw samma som -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" @@ -10520,14 +10823,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw samma som cooked\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane samma som cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" " -ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10536,7 +10840,7 @@ msgstr "" " -xcase -tostop -echoprt echoctl echoke, \n" " alla specialtecken till sina standardvärden\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10550,12 +10854,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:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "endast en enhet får anges" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10564,45 +10868,50 @@ msgstr "" "flaggorna för utförlig och stty-läsbar utmatningsstil är ömsesidigt\n" "uteslutande" -#: src/stty.c:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: kan inte starta om icke-blockerande läge" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "felaktigt argument %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "argument saknas till %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: fel vid avhuggning" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "felaktig linjedisciplin %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: kunde inte utföra alla efterfrågade operationer" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: ingen storleksinformation på denna enhet" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "felaktigt heltalsargument %s" #. This is a proper name. See the gettext manual, section Names. @@ -10611,8 +10920,15 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Skriv CRC-kontrollsumma och byteantal för varje FIL.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -10623,20 +10939,54 @@ msgstr "" " -s, --sysv använd System V:s summeringsalgoritm, använd 512-" "byteblock\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, fuzzy, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Användning: %s [FLAGGA]... [FIL]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Tvinga ut ändrade block till disk, uppdatera superblocket.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" -#: src/sync.c:69 +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "fel vid läsning av %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: kan inte starta om icke-blockerande läge" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "fel vid läsning av %s" + +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "ignorerar alla argument" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10650,15 +11000,23 @@ msgstr "" "beskrivs här. Se dokumentationen för ditt skal för detaljer om valen det\n" "stödjer.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help visa denna hjälptext och avsluta\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version visa versionsinformation och avsluta\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Utan FIL, eller när FIL är -, läs standard in.\n" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -10667,7 +11025,7 @@ msgstr "" "Obligatoriska argument till långa flaggor är obligatoriska även för de " "korta.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10680,7 +11038,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:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10693,7 +11051,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:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -10706,24 +11064,29 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" "Rapportera anmärkningar på översättningen av %s till \n" -#: src/system.h:584 +#: src/system.h:604 #, 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" +msgid "Full documentation at: <%s%s>\n" +msgstr "" -#: src/system.h:591 +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "" + +#: src/system.h:613 #, 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:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10744,9 +11107,8 @@ msgid "Jay Lepreau" msgstr "Jay Lepreau" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, last line first.\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" @@ -10762,63 +11124,62 @@ msgstr "" " -s, --separator=STRÄNG använd STRÄNG som skiljetecken i stället för ny " "rad\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: sökning misslyckades" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "för stor post" -#: src/tac.c:450 +#: src/tac.c:459 #, c-format msgid "failed to create temporary file in %s" msgstr "misslyckades att att skapa en temporärfil i %s" -#: src/tac.c:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" msgstr "misslyckades öppna %s för skrivning" -#: src/tac.c:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" msgstr "misslyckades att spola tillbaka strömmen för %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: skrivfel" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "misslyckades att öppna %s för läsning" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "skiljetecken kan inte vara tomt" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 -#, c-format +#: src/tail.c:257 +#, 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" 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" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" @@ -10829,7 +11190,7 @@ msgstr "" "varje\n" " fil\n" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10842,7 +11203,7 @@ msgstr "" "”filidentifierare”\n" " -F samma som --follow=name --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10869,7 +11230,7 @@ msgstr "" "loggfiler);\n" " med inotify är denna flagga sällan meningsfull\n" -#: src/tail.c:293 +#: src/tail.c:288 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -10880,7 +11241,7 @@ msgstr "" " --retry fortsätt försöka öppna en fil om den är " "oåtkomlig\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -10894,7 +11255,7 @@ msgstr "" " åtminstone var N:e sekund\n" " -v, --verbose skriv alltid ut huvuden med filnamn\n" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -10912,7 +11273,7 @@ msgstr "" "GB 1000·1000·1000, G 1024·1024·1024, och så vidare för T, P, E, Z, Y.\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -10929,22 +11290,22 @@ msgstr "" "tail följer den namngivna filen på ett sätt som hanterar att dess namn\n" "ändras, eller att filen tas bort eller skapas.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "stänger %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, 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:898 +#: src/tail.c:893 #, 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:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -10953,148 +11314,148 @@ msgstr "" "okänd filsystemtyp 0x%08lx för %s. Rapportera gärna detta till %s. Återgår " "till pollning" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "%s har ersatts av en symbolisk länk. ger upp detta namn" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s har blivit oåtkomlig" -#: src/tail.c:997 +#: src/tail.c:990 #, 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:1006 +#: src/tail.c:999 #, 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:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s har blivit åtkomlig" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s har dykt upp; följer slutet på en ny fil" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s har bytts ut, följer slutet på den nya filen" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: kan inte ändra icke-blockerande läge" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: filen avhuggen" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "inga fler filer" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "kan inte bevaka föräldrakatalog till %s" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "slut på inotify-resurser" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "kan inte bevaka %s" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: ersätt %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "fel vid övervakning av inotify-händelse" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "fel vid läsning av inotify-händelse" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "%s: kan inte följa slutet på denna sorts fil, ger upp med detta namn" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "tal i %s är för stort" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "%s: ogiltigt antal oförändrade status mellan öppningar" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: felaktigt PID" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: ogiltigt antal sekunder" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "felaktigt antal kolumner: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "flagga använd i felaktigt sammanhang -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" "varning: --retry ignoreras; --pid=PID är meningsfull bara när man följer" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "varning: --retry har endast effekt för det ursprungliga öppnandet" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "varning: PID ignorerad, --pid=PID är användbar bara när man följer" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "varning: --pid=PID stödjs inte på detta system" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "kan inte följa %s vid namn" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "varning: att följa standard in obegränsat är ineffektivt" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "inotify kan inte användas, återgår till pollning" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -11106,60 +11467,72 @@ msgstr "" " -a, --append lägg till till angivna FILer, skriv inte över\n" " -i, --ignore-interrupts ignorera avbrottssignaler\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Om FIL är -, kopiera igen till standard ut.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "argument saknas efter %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "ogiltigt heltal %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "”)” förväntades" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "”)” förväntades, fann %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: unär operator förväntas" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt tar inte -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef tar inte -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot accepterar inte -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "okänd binär operator" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: binär operator förväntades" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11173,7 +11546,7 @@ msgstr "" " eller: [ ]\n" " eller: [ FLAGGA\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11181,7 +11554,7 @@ msgstr "" "Avsluta med status som bestäms av UTTRYCK.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11191,7 +11564,7 @@ msgstr "" "Ett utelämnat UTTRYCK behandlas som falskt. Annars är UTTRYCK sant\n" "eller falskt och sätter returvärdet. Det är något av:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11205,7 +11578,7 @@ msgstr "" " UTTRYCK1 -a UTTRYCK2 både UTTRYCK1 och UTTRYCK2 är sanna\n" " UTTRYCK1 -o UTTRYCK2 något av UTTRYCK1 eller UTTRYCK2 är sant\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11221,7 +11594,7 @@ msgstr "" " STRÄNG1 = STRÄNG2 strängarna är lika\n" " STRÄNG1 != STRÄNG2 strängarna är inte lika\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11239,7 +11612,7 @@ msgstr "" " HELTAL1 -lt HELTAL2 HELTAL1 är mindre än HELTAL2\n" " HELTAL1 -ne HELTAL2 HELTAL1 är inte lika med HELTAL2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11251,7 +11624,7 @@ msgstr "" " FIL1 -nt FIL2 FIL1 är nyare (ändringstidpunkt) än FIL2\n" " FIL1 -ot FIL2 FIL1 är äldre än FIL2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11265,7 +11638,7 @@ msgstr "" " -d FIL FIL finns och är en katalog\n" " -e FIL FIL finns\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11279,7 +11652,7 @@ msgstr "" " -h FIL FIL finns och är en symbolisk länk (samma som -L)\n" " -k FIL FIL finns med fastbiten satt\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11293,7 +11666,7 @@ msgstr "" " -r FIL FIL finns och läsning är tillåten\n" " -s FIL FIL finns och har större storlek än noll\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11307,7 +11680,7 @@ msgstr "" " -w FIL FIL existerar och skrivning är tillåten\n" " -x FIL FIL existerar och körning (eller sökning) är tillåten\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11321,7 +11694,7 @@ msgstr "" "(t.ex. av omvänt snedstreck) för skal. HELTAL kan också vara -l STRÄNG,\n" "som har värdet av längden på STRÄNG.\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11331,25 +11704,25 @@ msgstr "" "OBS: [ godkänner flaggorna --help och --version, men test gör det inte.\n" "test behandlar båda dessa som den behandlar alla andra icketomma strängar.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test och/eller [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr " ”]” saknas" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "extra argument %s" @@ -11369,7 +11742,7 @@ msgstr "varning: timer_settime" msgid "warning: timer_create" msgstr "varning: timer_create" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11378,11 +11751,11 @@ msgstr "" "Användning: %s [FLAGGA] LÖPTID KOMMANDO [ARG]...\n" " eller: %s [FLAGGA]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 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:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11414,7 +11787,7 @@ msgstr "" " SIGNAL kan vara ett namn som ”HUP” eller ett nummer;\n" " se ”kill -l” för en lista över signaler\n" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11426,7 +11799,7 @@ msgstr "" "”s” för sekunder (standard), ”m” för minuter, ”h” för timmar eller ”d” för\n" "dagar.\n" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -11447,7 +11820,7 @@ msgstr "" "vilket\n" "fall slutstatusen är 128+9 istället för 124.\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "varning: det gick inte att avaktivera minnesdumpar" @@ -11462,6 +11835,11 @@ msgstr "fel vid inväntande av kommando" msgid "the monitored command dumped core" msgstr "det bevakade programmet skrev en minnesdump" +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "okänd status från kommando (0x%X)" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -11830,12 +12208,12 @@ msgstr "Avsluta med en statuskod som indikerar framgång." msgid "Exit with a status code indicating failure." msgstr "Avsluta med en statuskod som indikerar misslyckande." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Användning: %s FLAGGA… FIL…\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -11853,18 +12231,18 @@ msgstr "" "Om en FIL är kortare utökas den och den utökade delen (ett hål) läses\n" "som noll-byte:ar.\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create skapa inga filer en fil\n" -#: src/truncate.c:112 +#: src/truncate.c:85 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:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" @@ -11872,7 +12250,7 @@ msgstr "" " -r, --reference=RFIL basera storlek på RFIL\n" " -s, --size=STORLEK ange eller justera filstorlek med STORLEK byte\n" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11884,57 +12262,62 @@ 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:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "spill i % · % byte-block för fil %s" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s: filen har oanvändbar, till synes negativ storlek" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "kan inte hämta storleken på %s" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "spill vid avrundning uppåt av storlek på filen %s" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "spill vid utökning av storlek av filen %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "misslyckades att hugga av %s vid % byte" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "multipla relativa modifierare angivna" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "ogiltigt antal %s" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "du måste ange antingen %s eller %s" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "du måste ange en relativ %s till %s" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "%s angavs men inte %s" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "kan inte öppna %s för skrivning" @@ -11945,24 +12328,27 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Användning: %s [FLAGGA] [FIL]\n" "Skriv en fullständigt ordnad lista konsistent med den partiella ordningen i\n" "FIL. ”Utan FIL eller om FIL är -, läs standard in.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: indata innehåller ett udda antal element" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: indata innehåller en slinga:" @@ -12028,9 +12414,8 @@ msgid "cannot get system name" msgstr "kan inte avgöra systemnamn" #: 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" +#, fuzzy +msgid "Convert blanks in each FILE to tabs, writing to standard output.\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" @@ -12086,9 +12471,10 @@ msgstr "" " -d, --repeated skriv endast repeterade rader, en för varje grupp\n" #: src/uniq.c:187 +#, fuzzy msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" " -D, --all-repeated[=METOD] skriv ut alla upprepade rader\n" @@ -12100,9 +12486,10 @@ msgid " -f, --skip-fields=N avoid comparing the first N fields\n" msgstr " -f, --skip-fields=N undvik att jämföra de första N fälten\n" #: src/uniq.c:195 +#, fuzzy msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" " --group[=METOD] visa alla saker, separera grupper med en tom rad\n" @@ -12259,11 +12646,6 @@ msgstr "" " Processer som sover i ett tillstånd\n" "som inte går att avbryta bidrar också till lastgenomsnittet.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -12284,12 +12666,17 @@ msgstr "" "Om FIL inte är angiven, använd %s. %s som FIL är vanligt.\n" "\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -12305,12 +12692,13 @@ msgstr "" " -m, --chars skriv antalet tecken\n" " -l, --lines skriv antalet rader\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=F läs indata från filer som anges med\n" @@ -12479,10 +12867,10 @@ msgstr "" "Samma som id -un.\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: kan inte hitta namn för användar-ID %lu\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "kan inte hitta ett namn för användar-ID %s" #: src/yes.c:41 #, c-format @@ -12500,3 +12888,214 @@ msgid "" msgstr "" "Skriv gång på gång en rad med alla specificerade STRÄNG(ar), eller ”y”\n" "\n" + +#~ msgid "input line is too short, no numbers found to convert in field %ld" +#~ msgstr "indataraden är för kort, inga tal fanns att konvertera i fält %ld" + +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "-t är implicit om SIDLÄNGD ≤ 10. Utan FIL, eller när FIL är -, läs\n" +#~ "standard in.\n" + +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Utan FIL, eller när FIL är -, läs standard in. Standard är ”-F /”.\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Tvinga ut ändrade block till disk, uppdatera superblocket.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "ignorerar alla argument" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: felaktigt tal" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s är så stor att den inte kan representeras" + +#~ msgid "number of lines" +#~ msgstr "antal rader" + +#~ msgid "number of bytes" +#~ msgstr "antal byte" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: felaktigt antal att ignorera" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: felaktigt antal byte" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: felaktigt antal rader" + +#~ msgid "number in %s is too large" +#~ msgstr "tal i %s är för stort" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: ogiltigt antal sekunder" + +#~ msgid "failed to %s supplemental groups" +#~ msgstr "misslyckades att %s tilläggsgrupp(er)" + +#~ 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 "" +#~ "\n" +#~ "Genom att skicka en %s-signal till en körande ”dd”-process får\n" +#~ "man den att skriva in-/utstatistik på standard, och sedan fortsätta\n" +#~ "kopiera.\n" +#~ "\n" +#~ " $ dd if=/dev/zero of=/dev/null& pid=$!\n" +#~ " $ kill -%s $pid; sleep 1; kill $pid\n" +#~ " 18335302+0 poster in\n" +#~ " 18335302+0 poster ut\n" +#~ " 9387674624 byte (9.4 GB) kopierade, 34.6279 sekunder, 271 MB/s\n" + +#~ 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 TECKEN TECKEN skriver nästa tecken som ett specialtecken\n" +#~ " quit TECKEN TECKEN skickar en avslutningssignal\n" +#~ " * rprnt TECKEN TECKEN ritar om nuvarande rad\n" +#~ " start TECKEN TECKEN startar utskrift igen efter att ha stoppat den\n" + +#~ 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" +#~ " * [-]cdtrdse möjliggör DTR/DSR-handskakning\n" +#~ " csN sätt teckenstorleken till N bitar, N i [5..8]\n" + +#~ 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 "" +#~ "\n" +#~ "Inställningar för utmatning:\n" +#~ " * bsN fördröjning på backsteg, N är [0-1]\n" +#~ " * crN fördröjning på vagnretur, N är [0-3]\n" +#~ " * ffN fördröjning på sidmatning, N är [0-1]\n" +#~ " * nlN fördröjning på nyrad, N är [0-1]\n" + +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl översätt vagnretur till nyrad\n" +#~ " * [-]ofdel använd raderingstecken till utfyllnad, istället för NOLL-" +#~ "tecken\n" +#~ " * [-]ofill använd utfyllnadstecken istället för tidstagning vid \n" +#~ " fördröjningar\n" +#~ " * [-]olcuc översätt gemener till versaler\n" +#~ " * [-]onlcr översätt nyrad till vagnretur-nyrad\n" +#~ " * [-]onlret nyrad utför vagnretur\n" + +#~ 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 "" +#~ " * [-]onocr skriv inte ut vagnretur i första kolumnen\n" +#~ " [-]opost bearbetar utdata\n" +#~ " * tabN fördröjning på horisontell tabulator, N är [0-3]\n" +#~ " * tabs samma som tab0\n" +#~ " * -tabs samma som tab3\n" +#~ " * vtN fördröjning på vertikal tabulator, N är [0-1]\n" + +#~ 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 "" +#~ " * [-]ctlecho eka kontrolltecken med hattnotation (”^c”)\n" +#~ " [-]echo eka inmatade tecken\n" +#~ " * [-]echoctl samma som [-]ctlecho\n" +#~ " [-]echoe samma som [-]crterase\n" +#~ " [-]echok eka ett nyrad efter ett dödatecken\n" + +#~ 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 "" +#~ " * [-]echoke samma som [-]crtkill\n" +#~ " [-]echonl eka nyrad även om inga andra tecken ekas\n" +#~ " * [-]echoprt eka raderade tecken baklänges, mellan ”\\” och ”/”\n" +#~ " [-]icanon möjliggör specialtecknen erase, kill, werase och rprnt\n" +#~ " [-]iexten möjliggör specialtecken som inte är POSIX-tecken\n" + +#~ 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 "" +#~ " dec samma som echoe echoctl echoke -ixany intr ^c erase " +#~ "0177\n" +#~ " kill ^u\n" +#~ " * [-]decctlq samma som [-]ixany\n" +#~ " ek radera- och återställtecken till sina standardvärden\n" +#~ " evenp samma som parenb -parodd cs7\n" + +#~ msgid "For complete documentation, run: info coreutils '%s invocation'\n" +#~ msgstr "" +#~ "För fullständig dokumentation, kör: info coreutils '%s invocation'\n" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: kan inte hitta namn för användar-ID %lu\n" diff --git a/po/tr.gmo b/po/tr.gmo index 30301e1e..1d9e6dea 100644 Binary files a/po/tr.gmo and b/po/tr.gmo differ diff --git a/po/tr.po b/po/tr.po index 9087d634..d1474894 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,24 +1,27 @@ # translation of coreutils-5.3.0.tr.po to Turkish # Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# This file is distributed under the same license as the coreutils package. +# # Ali Devin Sezer , 2002. # Nilgün Belma Bugüner , 2001, 2002. # Onur Tolga ŞEHİTOĞLU , 1998. # Deniz Akkus Kanca , 2001,2003, 2004. -# +# Volkan Gezer , 2015. +#: src/stty.c:941 msgid "" msgstr "" -"Project-Id-Version: coreutils 5.3.0\n" +"Project-Id-Version: coreutils 8.23-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" -"PO-Revision-Date: 2005-03-14 04:17+0200\n" -"Last-Translator: Deniz Akkus Kanca \n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" +"PO-Revision-Date: 2015-02-20 16:34+0100\n" +"Last-Translator: Volkan Gezer \n" "Language-Team: Turkish \n" "Language: tr\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: KBabel 1.9.1\n" +"X-Generator: Lokalize 1.5\n" #: lib/argmatch.c:133 #, c-format @@ -35,25 +38,24 @@ msgid "Valid arguments are:" msgstr "Geçerli argümanlar:" #: lib/closein.c:100 -#, fuzzy msgid "error closing file" -msgstr "girdi dosyası %s kapatılıyor" - -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +msgstr "dosya kapatılırken hata oluştu" + +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "yazma hatası" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 -#, fuzzy, c-format +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 +#, c-format msgid "preserving permissions for %s" -msgstr "%s'in izinleri ayarlanıyor" +msgstr "%s için izinler korunuyor" #: lib/error.c:191 msgid "Unknown system error" @@ -107,7 +109,7 @@ msgstr "karakter özel dosyası" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "ardışık veri" # #: lib/file-type.c:75 @@ -116,47 +118,39 @@ msgstr "fifo" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "kapı" -# #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "blok özel dosyası" +msgstr "çoklanmış blok özel dosyası" -# #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "karakter özel dosyası" +msgstr "çoklanmış karakter özel dosyası" #: lib/file-type.c:87 msgid "multiplexed file" -msgstr "" +msgstr "çoklanmış dosya" -# #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "garip dosya" +msgstr "isimlendirilmiş dosya" -# #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "blok özel dosyası" +msgstr "ağ özel dosyası" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "veri içeren taşınmış dosya" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "veri içermeyen taşınmış dosya" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "kapı" #: lib/file-type.c:105 msgid "socket" @@ -164,7 +158,7 @@ msgstr "soket" #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "beyaz körlük" # #: lib/file-type.c:110 @@ -172,161 +166,161 @@ msgid "weird file" msgstr "garip dosya" #: lib/gai_strerror.c:57 -#, fuzzy msgid "Address family for hostname not supported" -msgstr "fifo dosyaları desteklenmiyor" +msgstr "Makine adı için adres ailesi desteklenmiyor" #: lib/gai_strerror.c:58 msgid "Temporary failure in name resolution" -msgstr "" +msgstr "İsim çözümlenmesinde geçici başarısızlık" #: lib/gai_strerror.c:59 msgid "Bad value for ai_flags" -msgstr "" +msgstr "ai_flags için bozuk değer" #: lib/gai_strerror.c:60 msgid "Non-recoverable failure in name resolution" -msgstr "" +msgstr "İsim çözümlenmesinde kurtarılamayan hata" #: lib/gai_strerror.c:61 -#, fuzzy msgid "ai_family not supported" -msgstr "fifo dosyaları desteklenmiyor" +msgstr "ai_family desteklenmiyor" #: lib/gai_strerror.c:62 msgid "Memory allocation failure" -msgstr "" +msgstr "Bellek ayırma başarısız" #: lib/gai_strerror.c:63 msgid "No address associated with hostname" -msgstr "" +msgstr "Makine adı ile ilişkilendirilmiş adres yok" #: lib/gai_strerror.c:64 msgid "Name or service not known" -msgstr "" +msgstr "İsim veya hizmet bilinmiyor" #: lib/gai_strerror.c:65 msgid "Servname not supported for ai_socktype" -msgstr "" +msgstr "Servname ai_socktype için desteklenmiyor" #: lib/gai_strerror.c:66 -#, fuzzy msgid "ai_socktype not supported" -msgstr "fifo dosyaları desteklenmiyor" +msgstr "ai_socktype desteklenmiyor" #: lib/gai_strerror.c:67 -#, fuzzy msgid "System error" -msgstr "yazma hatası" +msgstr "Sistem hatası" #: lib/gai_strerror.c:68 msgid "Argument buffer too small" -msgstr "" +msgstr "Argüman tamponu çok küçük" #: lib/gai_strerror.c:70 msgid "Processing request in progress" -msgstr "" +msgstr "İlerleyen istek işleniyor" #: lib/gai_strerror.c:71 msgid "Request canceled" -msgstr "" +msgstr "İstek iptal edildi" #: lib/gai_strerror.c:72 msgid "Request not canceled" -msgstr "" +msgstr "İstek iptal edilmedi" #: lib/gai_strerror.c:73 msgid "All requests done" -msgstr "" +msgstr "Bütün istekler gerçekleştirildi" #: lib/gai_strerror.c:74 msgid "Interrupted by a signal" -msgstr "" +msgstr "Bir işaret tarafından kesildi" #: lib/gai_strerror.c:75 msgid "Parameter string not correctly encoded" -msgstr "" +msgstr "Parametre dizgisi doğru kodlanmadı" #: lib/gai_strerror.c:87 -#, fuzzy msgid "Unknown error" -msgstr "Bilinmeyen sistem hatası" +msgstr "Bilinmeyen hata" -#: lib/getopt.c:547 lib/getopt.c:576 -#, fuzzy, c-format +#: lib/getopt.c:575 lib/getopt.c:604 +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: `%s' seçeneği belirsiz\n" +msgstr "%s: '%s' seçeneği belirsiz; olasılıklar:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 #, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: '-W %s' seçeneği belirsiz\n" + +#: lib/getopt.c:654 lib/getopt.c:658 +#, c-format msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: `--%s' seçeneği argümansız kullanılır\n" +msgstr "%s: '--%s' seçeneği bağımsız değişkene izin vermiyor\n" -#: lib/getopt.c:637 lib/getopt.c:642 -#, fuzzy, c-format +#: lib/getopt.c:667 lib/getopt.c:672 +#, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: seçenek `%c%s' argümansız kullanılır\n" +msgstr "%s: '%c%s' seçeneği bağımsız değişkene izin vermiyor\n" -#: lib/getopt.c:685 lib/getopt.c:704 -#, fuzzy, c-format +#: lib/getopt.c:715 lib/getopt.c:734 +#, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n" +msgstr "%s: '--%s' seçeneği bağımsız bir değişken gerektiriyor\n" -#: lib/getopt.c:742 lib/getopt.c:745 -#, fuzzy, c-format +#: lib/getopt.c:772 lib/getopt.c:775 +#, c-format msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: `--%s' seçeneği bilinmiyor\n" +msgstr "%s: tanınmayan seçenek '--%s'\n" -#: lib/getopt.c:753 lib/getopt.c:756 -#, fuzzy, c-format +#: lib/getopt.c:783 lib/getopt.c:786 +#, c-format msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: `%c%s' seçeneği bilinmiyor\n" +msgstr "%s: tanınmayan seçenek '%c%s'\n" -#: lib/getopt.c:805 lib/getopt.c:808 -#, fuzzy, c-format +#: lib/getopt.c:835 lib/getopt.c:838 +#, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: geçersiz seçenek -- %c\n" +msgstr "%s: geçersiz seçenek -- '%c'\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 -#, fuzzy, c-format +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: seçenek bir argümanla kullanılır -- %c\n" +msgstr "%s: seçenek bir bağımsız değişken gerektiriyor -- '%c'\n" -#: lib/getopt.c:934 lib/getopt.c:950 -#, fuzzy, c-format +#: lib/getopt.c:964 lib/getopt.c:980 +#, c-format msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: `-W %s' seçeneği belirsiz\n" +msgstr "%s: '-W %s' seçeneği belirsiz\n" -#: lib/getopt.c:974 lib/getopt.c:992 -#, fuzzy, c-format +#: lib/getopt.c:1004 lib/getopt.c:1022 +#, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: `-W %s' seçeneği argümansız kullanılır\n" +msgstr "%s: '-W %s' seçeneği bağımsız bir değişkene izin vermiyor\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 -#, fuzzy, c-format +#: lib/getopt.c:1043 lib/getopt.c:1061 +#, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n" +msgstr "%s: '-W %s' seçeneği bağımsız bir değişken gerektiriyor\n" #: lib/mkdir-p.c:181 src/install.c:487 #, c-format msgid "cannot change permissions of %s" msgstr "%s'in erişim izinleri değiştirilemiyor" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "%s dizini oluşturulamıyor" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "bellek tükendi" #: lib/openat-die.c:38 -#, fuzzy, c-format +#, c-format msgid "unable to record current working directory" -msgstr "openat: çalışılan dizini kaydedemedi" +msgstr "Çalışılan dizine kaydedilemedi" #: lib/openat-die.c:57 src/find-mount-point.c:107 #, c-format @@ -363,89 +357,87 @@ msgid "'" msgstr "'" #: lib/randread.c:128 -#, fuzzy, c-format +#, c-format msgid "%s: end of file" -msgstr "%s: arama (seek) başarısız" +msgstr "%s: dosya sonu" + +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: okuma hatası" #: lib/regcomp.c:131 msgid "Success" -msgstr "" +msgstr "Başarılı" #: lib/regcomp.c:134 msgid "No match" -msgstr "" +msgstr "Eşlenemedi" #: lib/regcomp.c:137 -#, fuzzy msgid "Invalid regular expression" -msgstr "%s: geçersiz düzenli ifade(regular expression): %s" +msgstr "Düzenli ifade geçersiz" #: lib/regcomp.c:140 msgid "Invalid collation character" -msgstr "" +msgstr "Karşılaştırma karakteri geçersiz" #: lib/regcomp.c:143 -#, fuzzy msgid "Invalid character class name" -msgstr "geçersiz karakter sınıfı `%s'" +msgstr "Karakter sınıf ismi geçersiz" #: lib/regcomp.c:146 msgid "Trailing backslash" -msgstr "" +msgstr "İzleyen tersbölü" #: lib/regcomp.c:149 msgid "Invalid back reference" -msgstr "" +msgstr "Geriye başvuru geçersiz" #: lib/regcomp.c:152 msgid "Unmatched [ or [^" -msgstr "" +msgstr "Eşleşmeyen [ veya [^" #: lib/regcomp.c:155 msgid "Unmatched ( or \\(" -msgstr "" +msgstr "Eşleşmeyen ( veya \\(" #: lib/regcomp.c:158 msgid "Unmatched \\{" -msgstr "" +msgstr "Eşleşmeyen \\{" #: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" -msgstr "" +msgstr "\\{\\} içeriği geçersiz" #: lib/regcomp.c:164 -#, fuzzy msgid "Invalid range end" -msgstr "Geçersiz sayfa aralığı `%s'" +msgstr "Geçersiz aralık sonu" #: lib/regcomp.c:167 -#, fuzzy msgid "Memory exhausted" -msgstr "bellek tükendi" +msgstr "Bellek tükendi" #: lib/regcomp.c:170 -#, fuzzy msgid "Invalid preceding regular expression" -msgstr "%s: geçersiz düzenli ifade(regular expression): %s" +msgstr "Önceki düzenli ifade geçersiz" #: lib/regcomp.c:173 -#, fuzzy msgid "Premature end of regular expression" -msgstr "düzenli ifade (regular expression) aramasında hata oluştu" +msgstr "Düzenli ifadenin sonu eksik kalmış" #: lib/regcomp.c:176 -#, fuzzy msgid "Regular expression too big" -msgstr "düzenli ifade (regular expression) aramasında hata oluştu" +msgstr "Düzenli ifade çok büyük" #: lib/regcomp.c:179 msgid "Unmatched ) or \\)" -msgstr "" +msgstr "Eşleşmeyen ) ya da \\)" #: lib/regcomp.c:707 -#, fuzzy msgid "No previous regular expression" -msgstr "düzenli ifade (regular expression) aramasında hata oluştu" +msgstr "Önceki düzenli ifade yok" #: lib/root-dev-ino.h:37 #, c-format @@ -482,79 +474,78 @@ msgstr "^[eE]" msgid "^[nN]" msgstr "^[hH]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "%s'in izinleri ayarlanıyor" #: lib/siglist.h:31 msgid "Hangup" -msgstr "" +msgstr "Tıkanma" #: lib/siglist.h:34 msgid "Interrupt" -msgstr "" +msgstr "Durdur" #: lib/siglist.h:37 msgid "Quit" -msgstr "" +msgstr "Çıkış" #: lib/siglist.h:40 msgid "Illegal instruction" -msgstr "" +msgstr "Yönerge kuraldışı" #: lib/siglist.h:43 msgid "Trace/breakpoint trap" -msgstr "" +msgstr "İzleme/kesme noktası yakalayıcı" #: lib/siglist.h:46 msgid "Aborted" -msgstr "" +msgstr "İptal edildi" #: lib/siglist.h:49 msgid "Floating point exception" -msgstr "" +msgstr "Kayar nokta hatası" #: lib/siglist.h:52 msgid "Killed" -msgstr "" +msgstr "Süreç durduruldu" #: lib/siglist.h:55 -#, fuzzy msgid "Bus error" -msgstr "sözdizimi hatası" +msgstr "Veriyolu hatası" #: lib/siglist.h:58 msgid "Segmentation fault" -msgstr "" +msgstr "Parçalanma hatası" #: lib/siglist.h:61 msgid "Broken pipe" -msgstr "" +msgstr "Veri alınamıyor" #: lib/siglist.h:64 msgid "Alarm clock" -msgstr "" +msgstr "Çalar saat" #: lib/siglist.h:67 msgid "Terminated" -msgstr "" +msgstr "Sonlandırıldı" #: lib/siglist.h:70 msgid "Urgent I/O condition" -msgstr "" +msgstr "Acil G/Ç koşulu" #: lib/siglist.h:73 msgid "Stopped (signal)" -msgstr "" +msgstr "Durduruldu (sinyal)" #: lib/siglist.h:76 msgid "Stopped" -msgstr "" +msgstr "Durduruldu" #: lib/siglist.h:79 msgid "Continued" -msgstr "" +msgstr "Devam ediliyor" #: lib/siglist.h:82 msgid "Child exited" @@ -562,82 +553,77 @@ msgstr "" #: lib/siglist.h:85 msgid "Stopped (tty input)" -msgstr "" +msgstr "Durduruldu (konsol girdisi)" #: lib/siglist.h:88 msgid "Stopped (tty output)" -msgstr "" +msgstr "Durduruldu (konsol çıktısı)" #: lib/siglist.h:91 msgid "I/O possible" -msgstr "" +msgstr "G/Ç mümkün" #: lib/siglist.h:94 msgid "CPU time limit exceeded" -msgstr "" +msgstr "İşlemci zaman sınırı aşıldı" #: lib/siglist.h:97 msgid "File size limit exceeded" -msgstr "" +msgstr "Dosya uzunluğu sınırı aşıldı" #: lib/siglist.h:100 msgid "Virtual timer expired" -msgstr "" +msgstr "Sanal süreölçer zaman aşımı" #: lib/siglist.h:103 msgid "Profiling timer expired" -msgstr "" +msgstr "Tanıtım süreölçerde zamanaşımı" #: lib/siglist.h:106 -#, fuzzy msgid "Window changed" -msgstr "saat değişikliği" +msgstr "Pencere değişti" #: lib/siglist.h:109 -#, fuzzy msgid "User defined signal 1" -msgstr "%s: geçersiz sinyal" +msgstr "Kullanıcı tanımlı sinyal 1" #: lib/siglist.h:112 -#, fuzzy msgid "User defined signal 2" -msgstr "%s: geçersiz sinyal" +msgstr "Kullanıcı tanımlı sinyal 1" #: lib/siglist.h:117 msgid "EMT trap" -msgstr "" +msgstr "EMT tuzağı" #: lib/siglist.h:120 -#, fuzzy msgid "Bad system call" -msgstr "fork sistem çağrısı başarısız" +msgstr "Bozuk sistem çağrısı" #: lib/siglist.h:123 msgid "Stack fault" -msgstr "" +msgstr "Yığın hatası" #: lib/siglist.h:126 msgid "Information request" -msgstr "" +msgstr "Bilgi isteği" #: lib/siglist.h:128 -#, fuzzy msgid "Power failure" -msgstr "açma işlemi başarısız" +msgstr "Güç başarısız" #: lib/siglist.h:131 msgid "Resource lost" -msgstr "" +msgstr "Özkaynak kaybı" #: lib/strsignal.c:114 #, c-format msgid "Real-time signal %d" -msgstr "" +msgstr "Gerçek-zamanlı sinyal %d" #: lib/strsignal.c:118 #, c-format msgid "Unknown signal %d" -msgstr "" +msgstr "Bilinmeyen sinyal %d" # #: lib/unicodeio.c:102 @@ -671,31 +657,30 @@ msgid "invalid group" msgstr "grup geçersiz" #: lib/userspec.c:108 -#, fuzzy msgid "invalid spec" -msgstr "kullanıcı geçersiz" +msgstr "geçersiz nitelik" #: lib/verror.c:73 #, c-format msgid "unable to display error message" -msgstr "" +msgstr "hata mesajı gösterilemiyor" #: lib/version-etc.c:74 #, c-format msgid "Packaged by %s (%s)\n" -msgstr "" +msgstr "%s (%s) tarafından paketlendi\n" #: lib/version-etc.c:77 #, c-format msgid "Packaged by %s\n" -msgstr "" +msgstr "%s tarafından paketlendi\n" #. TRANSLATORS: Translate "(C)" to the copyright symbol #. (C-in-a-circle), if this symbol is available in the user's #. locale. Otherwise, do not translate "(C)"; leave it as-is. #: lib/version-etc.c:84 msgid "(C)" -msgstr "" +msgstr "(C)" #: lib/version-etc.c:86 msgid "" @@ -706,6 +691,12 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" msgstr "" +"\n" +"Lisans GPLv3+: GNU GPL sürüm 3 ve sonrası .\n" +"Bu Özgür bir yazılımdır: değiştirmek ve dağıtmakta özgürsünüz.\n" +"Yasaların izin verdiği ölçüde, herhangi bir GARANTİ sunulmaz.\n" +"\n" #. TRANSLATORS: %s denotes an author name. #: lib/version-etc.c:102 @@ -820,58 +811,53 @@ 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" -"Yazılım hatalarını <%s> adresine,\n" -"çeviri hatalarını adresine bildirin.\n" +"Hataları şuraya gönderin: %s,\n" #: lib/version-etc.c:247 -#, fuzzy, c-format +#, c-format msgid "Report %s bugs to: %s\n" -msgstr "" -"\n" -"Yazılım hatalarını <%s> adresine,\n" -"çeviri hatalarını adresine bildirin.\n" +msgstr "%s hatalarını şuraya gönderin: %s\n" #: lib/version-etc.c:251 #, c-format msgid "%s home page: <%s>\n" -msgstr "" +msgstr "%s ana sayfa: <%s>\n" #: lib/version-etc.c:253 #, c-format msgid "%s home page: \n" -msgstr "" +msgstr "%s ana sayfa: \n" #: lib/version-etc.c:256 msgid "General help using GNU software: \n" -msgstr "" +msgstr "GNU yazılımı kullanımı genel yardımı: \n" #: lib/xfreopen.c:35 msgid "stdin" -msgstr "" +msgstr "stdin" #: lib/xfreopen.c:36 msgid "stdout" -msgstr "" +msgstr "stdout" #: lib/xfreopen.c:37 msgid "stderr" -msgstr "" +msgstr "stderr" #: lib/xfreopen.c:38 -#, fuzzy msgid "unknown stream" -msgstr "Bilinmeyen sistem hatası" +msgstr "bilinmeyen akış" #: lib/xfreopen.c:39 -#, fuzzy, c-format +#, c-format msgid "failed to reopen %s with mode %s" -msgstr "%s açılamadı" +msgstr "%s, %s kipi ile yeniden açılamadı" # #: lib/xmemcoll.c:39 src/expr.c:878 @@ -893,27 +879,27 @@ msgstr "Karşılaştırılan dizgeler %s ve %s idi." #: lib/xprintf.c:50 lib/xprintf.c:76 #, c-format msgid "cannot perform formatted output" -msgstr "" +msgstr "biçimlendirilmiş çıktı uygulanamıyor" #: lib/xstrtol-error.c:63 -#, fuzzy, c-format +#, c-format msgid "invalid %s%s argument '%s'" -msgstr "`%s' argümanı geçersiz" +msgstr "geçersiz %s%s argümanı '%s'" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format +#, c-format msgid "invalid suffix in %s%s argument '%s'" -msgstr "tamsayı argüman olarak `%s' geçersiz" +msgstr "%s%s argümanında '%s' geçersiz son ek" #: lib/xstrtol-error.c:72 -#, fuzzy, c-format +#, c-format msgid "%s%s argument '%s' too large" -msgstr "%s: `%.*s' sayımı fazla büyük" +msgstr "%s%s argümanı '%s' çok büyük" #. This is a proper name. See the gettext manual, section Names. #: src/base64.c:40 msgid "Simon Josefsson" -msgstr "" +msgstr "Simon Josefsson" #: src/base64.c:60 #, c-format @@ -922,7 +908,7 @@ msgid "" "Base64 encode or decode FILE, or standard input, to standard output.\n" msgstr "" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -932,15 +918,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"DOSYA verilmemişse veya DOSYA - ise, standart girdi okunur.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -948,76 +926,78 @@ msgid "" "the formal base64 alphabet. Use --ignore-garbage to attempt to recover\n" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" +"\n" +"Veri, RFC 3548'deki base64 alfabesi için tanımlandığı üzere şifrelenmiştir.\n" +"Şifre çözülürken; giriş, formal base 64 alfabesindeki baytların eklerinde\n" +"yeni-satırlar içerebilir. Şifrelenmiş akıştaki alfabetik olmayan baytları\n" +"kurtarmaya çalışmak için --ignore-garbage'i kullan.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "okuma hatası" -#: src/base64.c:231 -#, fuzzy, c-format +#: src/base64.c:229 +#, c-format msgid "invalid input" -msgstr "geçersiz girdi bayrağı: %s" +msgstr "geçersiz girdi" -#: src/base64.c:268 -#, fuzzy, c-format +#: src/base64.c:266 +#, c-format msgid "invalid wrap size: %s" -msgstr "geçersiz sekme boyutu: %s" +msgstr "geçersiz kaydırma boyutu: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "`%s' operandı fazla" # -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "standart girdi kapatılıyor" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 -#, fuzzy msgid "David MacKenzie" -msgstr "Paul Rubin ve 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 "" "Kullanımı: %s İSİM [SONEK]\n" -" veya: %s SEÇENEK\n" +" veya: %s SEÇENEK... İSİM...\n" #: src/basename.c:53 -#, fuzzy msgid "" "Print NAME with any leading directory components removed.\n" "If specified, also remove a trailing SUFFIX.\n" msgstr "" "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:60 msgid "" @@ -1038,40 +1018,45 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "eksik işlenen" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" -msgstr "" +msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 -#, fuzzy +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" -msgstr "Torbjorn Granlund ve Richard M. Stallman" +msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Kullanım: %s [SEÇENEK]... [DOSYA]...\n" #: src/cat.c:92 #, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"\n" +"DOSYA verilmemişse veya DOSYA - ise, standart girdi tekrar kopyalanır.\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1083,13 +1068,14 @@ msgstr "" "DOSYA(ları)yı (veya standart girdiyi) standart çıktıya yazar.\n" "\n" " -A, --show-all -vET ile aynı\n" -" -b, --number-nonblank boş olmayan çıktı satırlarını numaralandırır\n" +" -b, --number-nonblank boş olmayan çıktı satırlarını numaralandırır, -n " +"geçersiz kılınır\n" " -e -vE ile aynı\n" " -E, --show-ends her satırın sonuna bir $ koyar\n" " -n, --number tüm çıktı satırlarını numaralandırır\n" " -s, --squeeze-blank arka arkaya gelen boş satırları bire indirger\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1101,7 +1087,7 @@ msgstr "" " -u (yoksayılır)\n" " -v, --show-nonprinting LFD ve TAB hariç ^ ve M- nitelemesini kullanır\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1109,18 +1095,24 @@ msgid "" " %s f - g Output f's contents, then standard input, then g's contents.\n" " %s Copy standard input to standard output.\n" msgstr "" +"\n" +"Örnekler:\n" +" %s f - g f'nin içeriklerinin çıktısı, sonra standart girdi, sonra g'nin " +"içerikleri.\n" +" %s Standart girdiyi standart çıktıya kopyala.\n" -#: src/cat.c:326 -#, fuzzy, c-format +#: src/cat.c:327 +#, c-format msgid "cannot do ioctl on %s" -msgstr "`%s üzerinde ioctl başarısız" +msgstr "%s üzerinde ioctl başarısız" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "standart çıktı" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: girdi dosyası çıktı dosyası ile aynı" @@ -1128,59 +1120,58 @@ msgstr "%s: girdi dosyası çıktı dosyası ile aynı" #. This is a proper name. See the gettext manual, section Names. #: src/chcon.c:36 src/runcon.c:62 msgid "Russell Coker" -msgstr "" +msgstr "Russell Coker" #. This is a proper name. See the gettext manual, section Names. #: src/chcon.c:37 src/chgrp.c:38 src/chmod.c:40 src/chown.c:37 src/cp.c:58 -#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 -#, fuzzy +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" -msgstr "Jim Meyering ve Paul Eggert" +msgstr "Jim Meyering" #: src/chcon.c:100 src/runcon.c:207 src/runcon.c:237 -#, fuzzy, c-format +#, c-format msgid "failed to create security context: %s" -msgstr "%s'nın sahipliği değiştirilemedi\n" +msgstr "güvenlik bağlamı oluşturma başarısız: %s" #: src/chcon.c:112 #, c-format msgid "failed to set %s security context component to %s" -msgstr "" +msgstr "%s bileşen güvenlik bağlamını %s için ayarlama başarısız" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 -#, fuzzy, c-format +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 +#, c-format msgid "failed to get security context of %s" -msgstr "%s'nın öznitelikleri alınamadı" +msgstr "%s güvenlik içeriği alınamadı" #: src/chcon.c:166 #, c-format msgid "can't apply partial context to unlabeled file %s" -msgstr "" +msgstr "%s etiketsiz dosyasına kısmi içerik uygulanamadı" #: src/chcon.c:190 -#, fuzzy, c-format +#, c-format msgid "failed to change context of %s to %s" -msgstr "%s'nın sahipliği %s olarak değiştirilemedi\n" +msgstr "%s bağlamını %s için değiştiriken hata oluştu" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "%s'e erişilemedi" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "%s dizini okunamıyor" #: src/chcon.c:292 -#, fuzzy, c-format +#, c-format msgid "changing security context of %s\n" -msgstr "%s'nın erişim izinleri değiştiriliyor" +msgstr "%s'nin güvenlik şartları değiştiriliyor\n" #: src/chcon.c:326 src/chmod.c:349 src/chown-core.c:539 src/remove.c:567 #: src/selinux.c:323 @@ -1188,22 +1179,23 @@ msgstr "%s'nın erişim izinleri değiştiriliyor" msgid "fts_read failed" msgstr "fts_read başarısız oldu" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 -#, fuzzy, c-format +#, c-format msgid "fts_close failed" -msgstr "kapatma işlemi başarısız" +msgstr "fts_close başarısız" #: src/chcon.c:351 -#, fuzzy, c-format +#, c-format msgid "" "Usage: %s [OPTION]... CONTEXT FILE...\n" " or: %s [OPTION]... [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE...\n" " or: %s [OPTION]... --reference=RFILE FILE...\n" msgstr "" -"Kullanım: %s [SEÇENEK]... SAHİBİ[:[GRUP]] DOSYA...\n" -" veya: %s [SEÇENEK]... : GRUP DOSYA...\n" -" veya: %s [SEÇENEK]... --reference=REFDOSYA DOSYA...\n" +"Kullanımı: %s [SEÇENEK]... İÇERİK DOSYASI...\n" +" or: %s [SEÇENEK]... [-u KULLANICI] [-r GÖREV] [-l ARALIK] [-t TİP] " +"DOSYA...\n" +" or: %s [SEÇENEK]... --reference=RFILE FILE...\n" #: src/chcon.c:357 msgid "" @@ -1229,13 +1221,12 @@ msgid "" msgstr "" #: src/chcon.c:375 src/chgrp.c:132 src/chmod.c:390 src/chown.c:110 -#, fuzzy msgid "" " --no-preserve-root do not treat '/' specially (the default)\n" " --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" +" --no-preserve-root '/' yoluna özel davranma (öntanımlı)\n" +" --preserve-root '/' üzerinde özyinelemeli işlemeyi başarısız kıl\n" #: src/chcon.c:379 msgid "" @@ -1253,7 +1244,6 @@ msgid " -v, --verbose output a diagnostic for every file processed\n" msgstr "" #: src/chcon.c:389 src/chgrp.c:143 src/chown.c:121 -#, fuzzy msgid "" "\n" "The following options modify how a hierarchy is traversed when the -R\n" @@ -1267,14 +1257,15 @@ msgid "" " -P do not traverse any symbolic links (default)\n" "\n" msgstr "" -"Aşağıdaki seçenekler, -R seçeneği var iken hiyerarşilerin nasıl gezildiğini\n" -"etkiler. Eğer birden fazla seçenek kullanılır ise, ancak sonuncusu etkin\n" -"olur.\n" "\n" -" -H eğer bir komut satırı seçeneği, bir dizine verilen\n" -" sembolik bağ ise, o dizini gezer\n" -" -L bir dizine giden bütün sembolik bağları gezer\n" -" -P hiç bir sembolik bağı gezmez (öntanımlı)\n" +"Aşağıdaki seçenekler -R seçeneği de belirtildiğinde hiyerarşinin nasıl\n" +"geçileceğini değiştirir. Birden fazla belirtilmişse sadece sonuncu dikkate\n" +"alınır.\n" +"\n" +" -H bir komut satırı argümanı bir dizine sembolik " +"bağlantıysa izle\n" +" -L karşılaşılan her dizine sembolik bağlantıyı izle\n" +" -P sembolik bağlantıları izleme (öntanımlı)\n" "\n" #: src/chcon.c:516 src/chgrp.c:264 src/chown.c:266 @@ -1288,34 +1279,33 @@ msgid "-R -h requires -P" msgstr "-R -h ile -P kullanılmalıdır" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" msgstr "`%s'den sonra eksik işlenen" #: src/chcon.c:560 src/runcon.c:250 -#, fuzzy, c-format +#, c-format msgid "invalid context: %s" -msgstr "geçersiz kip: %s" +msgstr "bilinmeyen bağlam: %s" #: src/chcon.c:566 #, c-format msgid "conflicting security context specifiers given" -msgstr "" +msgstr "Çelişkili güvenlik durum belirleyicileri verilmiş" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "%s'nın öznitelikleri alınamadı" #: src/chgrp.c:92 -#, fuzzy, c-format +#, c-format msgid "invalid group: %s" -msgstr "geçersiz grup %s" +msgstr "geçersiz grup: %s" #: src/chgrp.c:108 #, c-format @@ -1341,15 +1331,13 @@ msgid "" msgstr "" #: 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 her sembolik bağın kendisini etkiler, bağın " -"imlediği\n" -" dosyayı değil. (yalnızca sembolik bağ sahibiyetini\n" -" değiştirebilen sistemlerde bulunur.\n" +" (sadece sembolik bağlantının sahipliğini " +"değiştirebilen\n" +" sistemlerde kullanışlıdır)\n" #: src/chgrp.c:136 msgid "" @@ -1365,6 +1353,11 @@ msgid "" " %s staff /u Change the group of /u to \"staff\".\n" " %s -hR staff /u Change the group of /u and subfiles to \"staff\".\n" msgstr "" +"\n" +"Örnekler:\n" +" %s tayfa /u /u'nun grubunu \"tayfa\" olarak ayarlar.\n" +" %s -hR tayfa /u /u'nun ve tüm altdosyalarının grubunu \"tayfa\" olarak " +"ayarlar.\n" #: src/chmod.c:127 #, c-format @@ -1377,14 +1370,14 @@ msgid "neither symbolic link %s nor referent has been changed\n" msgstr "ne sembolik bağ %s ne de imlediği dosya değiştirilmedi\n" #: src/chmod.c:165 -#, fuzzy, c-format +#, c-format msgid "mode of %s changed from %04lo (%s) to %04lo (%s)\n" -msgstr "%s'nin kipi %04lo (%s) olarak değiştirildi\n" +msgstr "%s kipi %04lo (%s) iken %04lo (%s) olarak değişti\n" #: src/chmod.c:168 -#, fuzzy, c-format +#, c-format msgid "failed to change mode of %s from %04lo (%s) to %04lo (%s)\n" -msgstr "%s'nın kipi %04lo (%s) olarak değiştirilemedi\n" +msgstr "%s kipi %04lo (%s) iken %04lo (%s) olarak değiştirilemedi\n" #: src/chmod.c:171 #, c-format @@ -1392,9 +1385,9 @@ msgid "mode of %s retained as %04lo (%s)\n" msgstr "%s'nin kipi %04lo (%s) olarak korundu\n" #: src/chmod.c:238 -#, fuzzy, c-format +#, c-format msgid "cannot operate on dangling symlink %s" -msgstr "%s sembolik bağı oluşturulamadı" +msgstr "askıda kalan sembolik bağ %s üzerinde çalışılamıyor" #: src/chmod.c:278 #, c-format @@ -1402,9 +1395,9 @@ msgid "changing permissions of %s" msgstr "%s'nın erişim izinleri değiştiriliyor" #: src/chmod.c:314 -#, fuzzy, c-format +#, c-format msgid "%s: new permissions are %s, not %s" -msgstr "%s'in izinleri ayarlanıyor" +msgstr "%s: yeni izinler %s, %s değil" #: src/chmod.c:374 #, c-format @@ -1449,14 +1442,14 @@ msgid "invalid mode: %s" msgstr "geçersiz kip: %s" #: src/chown-core.c:158 -#, fuzzy, c-format +#, c-format msgid "changed ownership of %s from %s to %s\n" -msgstr "%s'nin sahipliği %s'e değiştirildi\n" +msgstr "%s sahipliği %s iken %s olarak değişti\n" #: src/chown-core.c:159 -#, fuzzy, c-format +#, c-format msgid "changed group of %s from %s to %s\n" -msgstr "%s'nin grup üyeliği %s'e değiştirildi\n" +msgstr "%s grubu %s iken %s olarak değişti\n" #: src/chown-core.c:160 #, c-format @@ -1464,14 +1457,14 @@ msgid "no change to ownership of %s\n" msgstr "%s'in sahipliği değişmedi\n" #: src/chown-core.c:165 -#, fuzzy, c-format +#, c-format msgid "failed to change ownership of %s from %s to %s\n" -msgstr "%s'nın sahipliği %s olarak değiştirilemedi\n" +msgstr "%s sahipliği %s iken %s olarak değiştirilemedi\n" #: src/chown-core.c:166 -#, fuzzy, c-format +#, c-format msgid "failed to change group of %s from %s to %s\n" -msgstr "%s'in grup üyeliği %s olarak değiştirilemedi\n" +msgstr "%s grubu %s iken %s olarak değiştirilemedi\n" #: src/chown-core.c:167 src/chown-core.c:173 #, c-format @@ -1536,7 +1529,6 @@ msgid "" msgstr "" #: src/chown.c:103 -#, fuzzy msgid "" " --from=CURRENT_OWNER:CURRENT_GROUP\n" " change the owner and/or group of each file only if\n" @@ -1547,10 +1539,13 @@ msgid "" " is not required for the omitted attribute\n" msgstr "" " --from=ŞİMDİKİ_SAHİP:ŞİMDİKİ_GRUP\n" -" her dosyanın sahibini ve/veya grubunu eğer şimdiki\n" -" sahip ve/veya grup burada verilen değerlere eş ise\n" -" değiştirir. Bu değerlerin biri verilmeyebilir, o \n" -" takdirde, verilmeyen değere eşleme yapılmaz.\n" +" geçerli sahibi ve/veya grubu sadece burada " +"belirtilenlerle\n" +" her dosyanın eşleşiyorsa sahip ve/veya grubunu " +"değiştir.\n" +" Herhangi biri boş bırakıldığında, yazılmayan " +"nitelik eşleşmesi\n" +" gerekli değildir\n" #: src/chown.c:114 msgid "" @@ -1559,7 +1554,6 @@ msgid "" msgstr "" #: src/chown.c:136 -#, fuzzy msgid "" "\n" "Owner is unchanged if missing. Group is unchanged if missing, but changed\n" @@ -1567,10 +1561,9 @@ msgid "" "OWNER and GROUP may be numeric as well as symbolic.\n" msgstr "" "\n" -"Sahip değeri yok ise sahip değiştirilmez. Grup değeri yok ise \n" -"değiştirilmez, fakat bir sembolik bir SAHİP'ten sonra':' ile işaret edilmiş\n" -"ise kullanıcının grubuna değiştirilir. SAHİP ve GRUP değerleri \n" -"sembolik olabileceği gibi sayısal değerler de olabilir.\n" +"Eksik ise sahip değiştirilmez. Grup eksikse değiştirilmez, ancak bir ':'\n" +"ve takibinde sembolik bir SAHİP yazılmışsa login grubuna değiştirilir.\n" +"SAHİP ve GRUP sembolik olabileceği gibi sayısal da olabilir.\n" #: src/chown.c:142 #, c-format @@ -1581,32 +1574,39 @@ msgid "" " %s root:staff /u Likewise, but also change its group to \"staff\".\n" " %s -hR root /u Change the owner of /u and subfiles to \"root\".\n" msgstr "" +"\n" +"Örnekler:\n" +" %s root /u /u'nun sahibini \"root\" olarak değiştir.\n" +" %s root:staff /u Yukarıdaki gibi, fakat grubunu da \"staff\" olarak " +"değiştir.\n" +" %s -hR root /u /u'nun ve altındaki tüm dosyaların sahibini \"root\" olarak " +"değiştir.\n" #. This is a proper name. See the gettext manual, section Names. #: src/chroot.c:38 msgid "Roland McGrath" -msgstr "" +msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "geçersiz grup %s" -#: src/chroot.c:150 -#, fuzzy, c-format +#: src/chroot.c:152 +#, c-format msgid "invalid group list %s" -msgstr "geçersiz grup %s" +msgstr "geçersiz grup listesi %s" -#: src/chroot.c:186 -#, fuzzy, c-format +#: src/chroot.c:185 +#, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" " or: %s OPTION\n" msgstr "" -"Kullanımı: %s [SEÇENEK] YENİKÖK [KOMUT...]\n" -" veya: %s SEÇENEK\n" +"Kullanım: %s [SEÇENEK] YENİKÖK [KOMUT [ARG]...]\n" +" or: %s SEÇENEK\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1614,65 +1614,76 @@ msgstr "" "KOMUT'u kök dizin YENİKÖK olarak çalıştırır.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" msgstr "" -#: src/chroot.c:203 -#, fuzzy +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr "" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" msgstr "" "\n" -"Eğer komut verilmemişse, ``${SHELL} -i''yi çalıştırır (öntanımlı: /bin/sh).\n" +"Hiç komut verilmemişse, '${SHELL} -i' (default: '/bin/sh -i') çalıştır.\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "kök dizini %s olarak değiştirilemedi" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "kök dizinine geçilemedi" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 -#, fuzzy, c-format +#: src/chroot.c:400 +#, c-format msgid "failed to get supplemental groups" -msgstr "ek grup listesi alınamadı" +msgstr "tümleyici grupları alma başarısız" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" -msgstr "ek grup atanamadı" +msgid "failed to set supplemental groups" +msgstr "tümleyici grupları alma başarısız" -#: src/chroot.c:402 -#, fuzzy, c-format +#: src/chroot.c:418 +#, c-format msgid "failed to set group-ID" -msgstr "%s durumlanamadı" +msgstr "grup kimliği ayarlama başarısız" -#: src/chroot.c:405 -#, fuzzy, c-format +#: src/chroot.c:421 +#, c-format msgid "failed to set user-ID" -msgstr "%s durumlanamadı" +msgstr "kullanıcı kimliği ayarlama başarısız" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 -#, fuzzy, c-format +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 +#, c-format msgid "failed to run command %s" -msgstr "%s komutu çalıştırılamadı" +msgstr "%s komutunu çalıştırırken hata" #. This is a proper name. See the gettext manual, section Names. #: src/cksum.c:40 msgid "Q. Frank Xia" -msgstr "" +msgstr "Q. Frank Xia" #: src/cksum.c:216 #, c-format @@ -1705,7 +1716,16 @@ msgstr "Kullanım: %s [SEÇENEK]... DOSYA1 DOSYA2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Sıralı dosyalar DOSYA1 ve DOSYA2'yi satır satır karşılaştırır.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"DOSYA verilmemişse veya DOSYA - ise, standart girdi okunur.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1718,8 +1738,7 @@ msgstr "" "bulunan satırları, ikinci sütun yalnızca DOSYA2'de bulunan satırları,\n" "üçüncü sütun her iki dosyada da bulunan satırları içerir.\n" -#: src/comm.c:116 -#, fuzzy +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1727,29 +1746,33 @@ msgid "" " -3 suppress column 3 (lines that appear in both files)\n" msgstr "" "\n" -" -1 salt DOSYA1'de yer alan satırları yazmaz\n" -" -2 salt DOSYA2'de yer alan satırları yazmaz\n" -" -3 her iki dosyada da yer alan satırları yazmaz\n" +" -1 sütun 1'i gizle (satırlar DOSYA1'e özgü)\n" +" -2 sütun 2'yi gizle (satırlar DOSYA2'ye özgü)\n" +" -3 sütun 3'ü gizle (her iki dosyada da görülen satırlar)\n" -#: src/comm.c:122 +#: src/comm.c:126 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 "" +"\n" +" --check-order bitin giriş satırları eşleşebiliyor olsa bile,\n" +" girişin doğru sıralandığını kontrol et\n" +" --nocheck-order girişin doğru sıralandığını kontrol etme\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" -msgstr "" +msgstr " --output-delimiter=STR sütünları STR ile ayır\n" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1758,309 +1781,324 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" -msgstr "" - -#: src/comm.c:407 -#, fuzzy, c-format -msgid "multiple delimiters specified" -msgstr "birden fazla çıktı dosyası belirtilmiş" +msgstr "%d dosyası sıralı bir düzende değil" #: src/comm.c:411 -#, fuzzy, c-format -msgid "empty %s not allowed" -msgstr "-c seçeneği ile ekstra işlenen %s kullanılamaz" +#, c-format +msgid "multiple delimiters specified" +msgstr "çoklu sınırlayıcılar belirlendi" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/comm.c:415 #, c-format -msgid "error reading %s" -msgstr "%s'i okunurken hata" +msgid "empty %s not allowed" +msgstr "boş %s yasaktır" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:181 src/copy.c:452 #, c-format msgid "cannot lseek %s" msgstr "%s'de lseek yapılamadı" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" +msgstr "%s okunurken hata" + +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 +#, c-format +msgid "error reading %s" +msgstr "%s okunurken hata" + +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" -msgstr "%s'e yazarken hata" +msgstr "%s yazarken hata" -#: src/copy.c:323 +#: src/copy.c:302 #, fuzzy, c-format +msgid "overflow reading %s" +msgstr "%s okunurken hata" + +#: src/copy.c:419 +#, c-format msgid "%s: failed to get extents info" -msgstr "%s: silinemedi" +msgstr "%s: uzatılmış bilgiyi getirme başarısız" -#: src/copy.c:383 -#, fuzzy, c-format +#: src/copy.c:478 +#, c-format msgid "%s: write failed" -msgstr "yazma başarısız oldu" +msgstr "%s: yazımı başarısız" -#: src/copy.c:452 src/copy.c:1189 -#, fuzzy, c-format +#: src/copy.c:547 src/copy.c:1295 +#, c-format msgid "failed to extend %s" -msgstr "%s açılamadı" +msgstr "%s genişletilemedi" -#: src/copy.c:687 -#, fuzzy, c-format +#: src/copy.c:789 +#, c-format msgid "clearing permissions for %s" -msgstr "%s'in izinleri ayarlanıyor" +msgstr "%s için izinler temizleniyor" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "%s'nin sahiplik bilgileri korunamadı" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "%s dosyasına bakılamadı" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "%s'nin yazar bilgileri korunamadı" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 -#, fuzzy, c-format +#, c-format msgid "failed to set default file creation context to %s" -msgstr "%s'nın öznitelikleri alınamadı" +msgstr "%s dosyasında varsayılan dosya bağlamını ayarlamada hata" -#: src/copy.c:820 -#, fuzzy, c-format +#: src/copy.c:922 +#, c-format msgid "failed to set default file creation context for %s" -msgstr "%s'nın öznitelikleri alınamadı" +msgstr "%s için varsayılan dosya bağlamını ayarlamada hata" -#: src/copy.c:846 -#, fuzzy, c-format +#: src/copy.c:948 +#, c-format msgid "failed to set the security context of %s" -msgstr "%s'nın öznitelikleri alınamadı" +msgstr "%s güvenlik bağlamını ayarlamada hata" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "%s okumak için açılamadı" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "%s'nin dosya durumu (fstat) alınamadı" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "kopyalandığı esnada değiştirildiği için %s dosyası atlandı" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "%s silinemedi" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "%s silindi\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" -msgstr "" +msgstr "Açılan sembolik link olan %s ye yazım yapılamıyor" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "normal dosya %s oluşturulamadı" -#: src/copy.c:1091 -#, fuzzy, c-format +#: src/copy.c:1193 +#, c-format msgid "failed to clone %s from %s" -msgstr "%s açılamadı" +msgstr "%s, %s konumundan çoğaltılamadı" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "%s'in zaman damgaları korundu" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 -#, fuzzy, c-format +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 +#, c-format msgid "failed to close %s" -msgstr "%s açılamadı" +msgstr "%s kapatılamadı" -#: src/copy.c:1580 -#, fuzzy, c-format +#: src/copy.c:1669 +#, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " -msgstr "%s: %s'ın, %04lo kipi gözardı edilerek, üzerine yazılsın mı?" +msgstr "%s: %s, %04lo (%s) kipinin üzerine yazılarak değiştirilsin mi? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: %s'ın üzerine yazılsın mı?" -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (yedek: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" -msgstr "" +msgstr "Varsayılan dosya oluşturma durumu eski haline getirilemedi" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "%s sabit bağı %s'e bağlanamadı" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "%s durumlanamadı" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "%s dizini atlanıyor" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "uyarı: %s kaynak dosyası bir defadan çok belirtilmiş" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s ve %s aynı dosya" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "Dizin olmayan %s'un üzerine dizin %s yazılamaz" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "yeni oluşturulmuş %s'un üzerine %s yazılamaz" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "Dizin %s'ın üzerine dizin olmayan bir dosya yazılamaz" -#: src/copy.c:1989 +#: src/copy.c:2069 #, 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:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "%s'ı yedeklemek kaynağı yok eder; %s taşınmadı" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "%s'ı yedeklemek kaynağı yok eder; %s kopyalanmadı" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "%s yedeklenemedi" -#: src/copy.c:2107 -#, fuzzy, c-format +#: src/copy.c:2187 +#, c-format msgid "will not copy %s through just-created symlink %s" -msgstr "yeni oluşturulmuş %s'un üzerine %s yazılamaz" +msgstr "" +"%s kopyalama işlemi %s yeni oluşturulan sembolik linki üzerinde yapılmayacak" -#: src/copy.c:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "bir dizin, %s, kendi içine kopyalanamaz, %s" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "uyarı: %s kaynak dosyası bir defadan çok belirtilmiş" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "%s kendi alt dizinine taşınamaz, %s" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "%s %s'e taşınamadı" -#: src/copy.c:2317 +#: src/copy.c:2410 #, 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:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "çevrimli sembolik bağ %s kopyalanamaz" -#: src/copy.c:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "sembolik bağ %s, %s'e bağlanamadı" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "%s fifosu oluşturulamadı" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "özel dosya %s oluşturulamadı" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "%s sembolik bağı okunamadı" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "%s sembolik bağı oluşturulamadı" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s bilinmeyen dosya türüne sahip" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "%s yedeklemesi geri alınamadı" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (yedeklemeyi geri al)\n" @@ -2070,28 +2108,28 @@ msgstr "%s -> %s (yedeklemeyi geri al)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 -#, fuzzy, c-format +#: src/coreutils.c:177 src/coreutils.c:201 +#, c-format msgid "unknown program %s" -msgstr "bilinmeyen kullanıcı kimliği: %s" +msgstr "bilinmeyen program %s" #: src/cp.c:157 src/mv.c:288 #, c-format @@ -2105,14 +2143,10 @@ msgstr "" " veya: %s [SEÇENEK]... -t DİZİN KAYNAK...\n" #: src/cp.c:163 -#, fuzzy msgid "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" -msgstr "" -"KAYNAK'ı HEDEF'e kopyalar veya birden fazla KAYNAK'ı DİZİN'e kopyalar.\n" -"\n" +msgstr "KAYNAKı HEDEFe veya birden fazla KAYNAKLARI DİZİNE kopyala.\n" #: src/cp.c:169 -#, fuzzy msgid "" " -a, --archive same as -dR --preserve=all\n" " --attributes-only don't copy the file data, just the " @@ -2125,16 +2159,15 @@ msgid "" "recursive\n" " -d same as --no-dereference --preserve=links\n" msgstr "" -" -a, --archive -dpR ile aynı\n" -" --backup[=KONTROL] mevcut olan her hedef dosyanın yedeğini " -"alır.\n" -" -b --backup gibi, fakat argüman kabul etmez.\n" -" --copy-contents çevrimli olduğu zaman özel dosyaların " -"içeriğini kopyalar\n" -" -d --no-dereference --preserve=link ile aynı\n" +" -a, --archive -dR --preserve=all ile aynı\n" +" --attributes-only dosya verisini kopyalama, sadece nitelikleri\n" +" --backup[=DENETİM] her mevcut hedef dosyanın yedeğini al\n" +" -b --backup gibi ancak argüman almaz\n" +" --copy-contents özyinelemeli ise özel dosya içeriklerini " +"kopyala\n" +" -d --no-dereference --preserve=links ile aynı\n" #: src/cp.c:178 -#, fuzzy msgid "" " -f, --force if an existing destination file cannot be\n" " opened, remove it and try again (this " @@ -2146,12 +2179,6 @@ msgid "" " option)\n" " -H follow command-line symbolic links in SOURCE\n" msgstr "" -" --no-dereference sembolik bağları izlemez\n" -" -f, --force eğer mevcut bir hedef dosya açılamaz ise, " -"onu\n" -" siler ve tekrar dener\n" -" -i, --interactive üzerine yazmadan önce sorar\n" -" -H komut satırında sembolik bağları izler\n" #: src/cp.c:187 msgid "" @@ -2165,9 +2192,13 @@ msgid "" " a previous -i option)\n" " -P, --no-dereference never follow symbolic links in SOURCE\n" msgstr "" +" -n, --no-clobber var olan bir dosyanın üzerine yazma (bir " +"önceki\n" +" -i seçeneğini geçersiz kılar)\n" +" -P, --no-dereference SOURCE'de asla sembolik bağlantılar takip " +"etme\n" #: src/cp.c:196 -#, fuzzy msgid "" " -p same as --preserve=mode,ownership,timestamps\n" " --preserve[=ATTR_LIST] preserve the specified attributes (default:\n" @@ -2176,30 +2207,22 @@ msgid "" "xattr,\n" " all\n" msgstr "" -" -l, --link dosyaları kopyalamak yerine sembolik bağ\n" -" oluşturur.\n" -" -L, --dereference sembolik bağları hep izler\n" -" -p --preserve=mode,ownership,timestamps ile " -"aynı\n" -" --preserve[=ÖZNİT_LST] belirtilen öznitelikleri korur\n" -" öntanımlı öznitelikler:\n" -" mode,ownership,timestamps\n" -" (kip,sahibi,zaman damgaları)\n" -" diğer öznitelikler:\n" -" links,all\n" +" -p --preserve=mode,ownership,timestamps " +"aynıdır\n" +" --preserve[=ATTR_LIST] belirlenmiş özellikleri koru (mevcut:\n" +" mode,ownership,timestamps), eğer mümkünse\n" +" ek özellikler: context, links, xattr,\n" +" hepsi\n" #: src/cp.c:204 -#, fuzzy msgid "" " --no-preserve=ATTR_LIST don't preserve the specified attributes\n" " --parents use full source file name under DIRECTORY\n" msgstr "" -" --no-preserve=ÖZNT_LİST belirtilen öznitelikleri korumaz\n" -" --parents kaynak yolunu DİZİN'in sonuna ekler\n" -" -P --no-dereference ile aynı\n" +" --no-preserve=ATTR_LIST Tanımlanan özellikleri koruma\n" +" --parents DİZİN altındaki tam kaynak dosya yolu kullan\n" #: src/cp.c:208 -#, fuzzy msgid "" " -R, -r, --recursive copy directories recursively\n" " --reflink[=WHEN] control clone/CoW copies. See below\n" @@ -2207,27 +2230,14 @@ msgid "" " attempting to open it (contrast with --" "force)\n" msgstr "" -" -R, -r, --recursive yinelemeli kopyalar\n" -" --remove-destination bütün mevcut hedef dosyaları açmayı " -"denemeden\n" -" siler (--force ile karşılaştır)\n" #: src/cp.c:214 -#, fuzzy 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 "" -" --reply={yes,no,query} mevcut bir hedef dosya için sorgulamanın " -"nasıl\n" -" yapılacağını ayarlar: \n" -" yes=evet, no=hayır, query=sor\n" -" --sparse=ZAMAN seyrek dosyaların oluşumunu kontrol eder\n" -" --strip-trailing-slashes bütün KAYNAK argümanlarının sonundan " -"kesmeleri\n" -" (/) kaldırır\n" #: src/cp.c:219 msgid "" @@ -2268,7 +2278,6 @@ msgid "" msgstr "" #: src/cp.c:240 -#, fuzzy msgid "" "\n" "By default, sparse SOURCE files are detected by a crude heuristic and the\n" @@ -2283,19 +2292,8 @@ msgid "" "copy\n" "fails, or if --reflink=auto is specified, fall back to a standard copy.\n" msgstr "" -"\n" -"Öntanımlı olarak seyrek KAYNAK dosyalar kaba bir yöntemle bulunur \n" -"ve ilgili HEDEF dosya da seyrek olarak oluşturulur. \n" -"Bu davranış --sparse=auto seçeneği ile belirtilir. \n" -"Eğer --sparse=always seçilir ise KAYNAK dosya yeterli \n" -"uzunlukta sıfır bayt dizisi içerdiği zaman seyrek HEDEF dosya \n" -"oluşturulur\n" -"Hiçbir zaman seyrek dosya oluşturmamak için --sparse=never seçeneğini \n" -"kullanın.\n" -"\n" #: src/cp.c:252 src/install.c:658 src/ln.c:437 src/mv.c:326 -#, fuzzy msgid "" "\n" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -2304,12 +2302,6 @@ msgid "" "the VERSION_CONTROL environment variable. Here are the values:\n" "\n" msgstr "" -"\n" -"Yedekleme soneki eğer --suffix veya SIMPLE_BACKUP_SUFFIX ile belirtilmemiş " -"ise\n" -"'~'dir. Yedekleme kontrol metodu --backup seçeneği ile veya \n" -"VERSION_CONTROL çevre değişkeninden belirlenebilir. Geçerli değerler:\n" -"\n" #: src/cp.c:259 src/install.c:665 src/ln.c:444 src/mv.c:333 msgid "" @@ -2358,12 +2350,12 @@ msgstr "%s var ama bir dizin değil" #: src/cp.c:577 src/cp.c:1079 src/install.c:405 src/install.c:927 src/ln.c:133 #: src/ln.c:197 src/ln.c:218 src/ln.c:532 src/mv.c:156 src/mv.c:405 -#, fuzzy, c-format +#, c-format msgid "failed to access %s" -msgstr "%s açılamadı" +msgstr "" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "dosya işleyeni eksik" @@ -2374,7 +2366,7 @@ msgid "missing destination file operand after %s" msgstr "%s sonrasında hedef dosya işleyeni eksik" #: src/cp.c:608 src/install.c:968 src/mv.c:459 -#, fuzzy, c-format +#, c-format msgid "cannot combine --target-directory (-t) and --no-target-directory (-T)" msgstr "--target-directory (-t) ve --no-target-directory (-T) birleştirilemez" @@ -2386,9 +2378,9 @@ msgid "target %s is not a directory" msgstr "hedef %s bir dizin değil" #: src/cp.c:735 -#, fuzzy, c-format +#, c-format msgid "with --parents, the destination must be a directory" -msgstr "dosya yolları korunurken hedef bir dizin olmalı" +msgstr "--parents kullanıldığında hedef, bir dizin olmalıdır" #: src/cp.c:1074 src/install.c:867 src/ln.c:527 src/mv.c:400 #, c-format @@ -2406,9 +2398,9 @@ msgid "cannot make both hard and symbolic links" msgstr "hem sabit hem sembolik bağ oluşturulamaz" #: src/cp.c:1144 src/mv.c:480 -#, fuzzy, c-format +#, c-format msgid "options --backup and --no-clobber are mutually exclusive" -msgstr "--string ve --check seçenekleri aynı anda kullanılamaz" +msgstr "--backup ve --no-clobber seçenekleri birlikte olamaz" #: src/cp.c:1150 #, c-format @@ -2427,165 +2419,167 @@ msgstr "" #: src/cp.c:1190 #, c-format msgid "cannot preserve security context without an SELinux-enabled kernel" -msgstr "" +msgstr "SELinux-aktif bir kernel olmadan güvenlik bağlantısı korunamıyor." #: src/cp.c:1206 #, c-format msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "" +"genişletilmiş özellik muhafaza edilemez, cp xattr desteği olmadan yapılır" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" -msgstr "" +msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "girdi yok oldu" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: satır sayısı kapsam dışı" -#: src/csplit.c:713 -#, fuzzy, c-format +#: src/csplit.c:714 +#, c-format msgid "%s: %s: line number out of range" -msgstr "%s: `%s': satır sayısı kapsam dışı" +msgstr "%s: %s: satır numarası erim dışı" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " %s tekrarda\n" -#: src/csplit.c:766 -#, fuzzy, c-format +#: src/csplit.c:767 +#, c-format msgid "%s: %s: match not found" -msgstr "%s: `%s': eşleşme bulunamadı" +msgstr "%s: %s: eşleşme bulunamadı" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "düzenli ifade (regular expression) aramasında hata oluştu" -#: src/csplit.c:1006 -#, fuzzy, c-format +#: src/csplit.c:1007 +#, c-format msgid "write error for %s" -msgstr "`%s' için yazım hatası" +msgstr "%s için yazma hatası" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: ayraçtan sonra tamsayı olmalı" -#: src/csplit.c:1098 -#, fuzzy, c-format +#: src/csplit.c:1099 +#, c-format msgid "%s: '}' is required in repeat count" -msgstr "%s: tekrar sayımında `}' gerekli" +msgstr "%s: tekrar sayısında '}' gereklidir" -#: src/csplit.c:1108 -#, fuzzy, c-format +#: src/csplit.c:1109 +#, c-format msgid "%s}: integer required between '{' and '}'" -msgstr "%s}: `{' ve `}' arasına tamsayı yazılmalı" +msgstr "%s}: '{' ve '}' arasında tamsayı gerekli" -#: src/csplit.c:1135 -#, fuzzy, c-format +#: src/csplit.c:1136 +#, c-format msgid "%s: closing delimiter '%c' missing" -msgstr "%s: kapatan ayraç `%c' eksik" +msgstr "%s: satır sonlandırıcı '%c' eksik" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: geçersiz düzenli ifade(regular expression): %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: geçersiz kalıp" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, 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:1194 -#, fuzzy, c-format +#: src/csplit.c:1195 +#, 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" +msgstr "%s satır numarası, önceki %s satır numarasından daha küçük" -#: src/csplit.c:1200 -#, fuzzy, c-format +#: src/csplit.c:1201 +#, 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ı" +msgstr "uyarı: %s satır numarası, önceki satır numarası ile aynı" -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "sonekte dönüşüm belirleyicisi eksik" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "sonekte geçersiz dönüşüm belirleyicisi: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "sonekte geçersiz dönüşüm belirleyicisi: \\%.3o" -#: src/csplit.c:1292 -#, fuzzy, c-format +#: src/csplit.c:1293 +#, c-format msgid "invalid flags in conversion specification: %%%c%c" -msgstr "%.*s: geçersiz çevrim tanımı" +msgstr "" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "sonekte gereğinden fazla %% dönüşüm belirleyicisi var" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "sonekte %% dönüşüm belirleyicisi eksik" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: geçersiz sayı" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +msgid "invalid number" +msgstr "geçersiz sayı" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Kullanım: %s [SEÇENEK]... DOSYA KALIP...\n" -#: src/csplit.c:1483 -#, fuzzy +#: src/csplit.c:1481 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 "" -"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" + +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" "\n" +"Eğer DOSYA - olarak verilmişse, standart girdiyi okur. Her KALIP, aşağıdaki\n" +"seçeneklerden olabilir:\n" -#: src/csplit.c:1490 -#, fuzzy, c-format +#: src/csplit.c:1492 +#, 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=BİÇEM %02d yerine sprintf BİÇEM'ini kullanır\n" -" -f, --prefix=ÖNEK `xx' yerine ÖNEKi kullanır\n" -" -k, --keep-files hata olduğunda çıktı dosyalarını silmez\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2596,19 +2590,10 @@ 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:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Eğer DOSYA - olarak verilmişse, standart girdiyi okur. Her KALIP, aşağıdaki\n" -"seçeneklerden olabilir:\n" - -#: src/csplit.c:1509 -#, fuzzy +#: src/csplit.c:1507 msgid "" "\n" +"Each PATTERN may be:\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" @@ -2617,36 +2602,22 @@ msgid "" "\n" "A line OFFSET is a required '+' or '-' followed by a positive integer.\n" msgstr "" -"\n" -" SAYI verilen SAYI satırına kadar (SAYI satırı hariç) " -"kopyalar\n" -" /DÜZİF/[GÖRELİ] kalıba uyan satıra kadar (uyan satır hariç) kopyalar\n" -" (DÜZİF = düzenli ifade(regular expression)) \n" -" %DÜZİF%[GÖRELİ] uyan satıra kadar (uyan satır hariç) atlar\n" -" {SAYI} bir önceki kalıbı SAYI kere tekrar eder\n" -" {*} bir önceki kalıbı mümkün olduğu kadar tekrar eder\n" -"\n" -"Bir satır GÖRELİ konumu, `+' veya `-' ve ardından bir pozitif sayıdan " -"oluşur.\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 "" +msgstr "David M. Ihnat" #: src/cut.c:172 -#, fuzzy, c-format +#, c-format msgid "Usage: %s OPTION... [FILE]...\n" -msgstr "Kullanım: %s [SEÇENEK]... [DOSYA]...\n" +msgstr "Kullanım: %s SEÇENEK... [DOSYA]...\n" #: src/cut.c:176 -#, fuzzy msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" -"Her DOSYA'daki satırların seçilen bölümlerini standart çıktıya yazdırır.\n" -"\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2656,7 +2627,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:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2669,15 +2640,16 @@ msgstr "" " satırları yazdırır.\n" " -n (yoksayılır)\n" -#: src/cut.c:193 -#, fuzzy +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr "" -" --complement seçili bayt, karakter veya alan kümelerini tümler\n" +" --complement seçilmiş baytların, karakterlerin veya alanların " +"d\n" +" eğerini tamamla\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2687,15 +2659,20 @@ msgstr "" " --output-delimeter=DİZGE\n" " çıktı ayracı olarak DİZGE'yi kullanır \n" -#: src/cut.c:204 +#: src/cut.c:205 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" +"-b, -c ya da -f'den sadece birini kullanın. Her LİSTE bir aralıktan " +"oluşturulmuştur \n" +"ya da çoğu aralıklar virgüllerle ayrılmıştır. Seçilen girdi \n" +"okunduğuna benzer bir düzende ve sadece bir kez yazılmıştır.\n" -#: src/cut.c:210 +#: src/cut.c:211 #, fuzzy msgid "" "Each range is one of:\n" @@ -2704,69 +2681,61 @@ msgid "" " 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 "" +"Şunların herbirinin sırası:\n" "\n" -"-f -b ve -c den yalnız biri kullanılabilir. Her LİSTE bir aralık, veya \n" -"virgüllerle ayrılmış birden fazla aralıktan oluşmalıdır. Seçilen girdi\n" -"okunduğu sırada yazılır ve yalnızca bir defa yazılır. Her aralık\n" -"aşağıdakilerden biri olmalıdır:\n" +" N N. bayt, karakter veya alan, 1'den hesaplandı\n" +" N- N. bayt, karakter veya alandan satırın sonuna kadar\n" +" N-M N.'den M.'ye kadar bayt, karakter veya alan dahil\n" +" -M Birinciden M.'ye kadar, bayt, karakter ve alan dahil\n" "\n" -" N birden başlanarak sayıldığında N. bayt, karakter veya alan\n" -" N- N. bayt, karakter, veya alandan satırın sonuna kadar\n" -" N-M N ile M (dahil) arasında olan bayt, karakter veya alanlar\n" -" -M 1 ile M (dahil) arasında olan bayt, karakter veya alanlar\n" -"\n" -"DOSYA belirtilmediğinde veya - olarak verildiğinde standart girdiden okur.\n" +"FILE yok ile veya FILE standart okuma girişi olduğunda.\n" -#: src/cut.c:300 src/cut.c:394 -#, fuzzy +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" -msgstr "geçersiz bayt veya alan listesi" +msgstr "geçersiz bayt, karakter veya alan listesi" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" -msgstr "" +msgstr "Alanlar ve yerler 1den başlayarak numaralandırıldı." -#: src/cut.c:320 -#, fuzzy +#: src/cut.c:319 msgid "invalid range with no endpoint: -" -msgstr "geçersiz genişlik seçeneği: %s" +msgstr "bitiş noktası olmayan geçersiz aralık: -" -#: src/cut.c:334 -#, fuzzy +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" -msgstr "Geçersiz sayfa aralığı `%s'" +msgstr "bilinmeyen mesafe azaltma" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "bayt görecesi %s çok büyük" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "alan numarası %s çok büyük" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "sadece bir liste türü belirtilebilir" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "ayraç tek karakter olmalıdır" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "bayt, karakter ya da alan listesi belirtilmelidir" -#: src/cut.c:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2774,11 +2743,11 @@ msgstr "" "ayrılmamış alanları atlamak sadece alanlar üzerinde işlem\n" "\tyapılırken anlamlı" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "alan listesi eksik" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "konum listesi eksik" @@ -2796,55 +2765,52 @@ msgid "Display the current time in the given FORMAT, or set the system date.\n" msgstr "" #: src/date.c:134 -#, fuzzy msgid "" -" -d, --date=STRING display time described by STRING, not 'now'\n" -" -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -" -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 "" -"Verilen BİÇEMde zamanı gösterir, ya da sistem zamanını değiştirir.\n" -"\n" -" -d, --date=DİZGE DIZGE ile tanımlanan zamanı gösterir, şimdiki " -"zamanı\n" -" değil\n" -" -f, --file=DOSYA DOSYAnın her satırı için --date uygulanır\n" -" --iso-8601[=BİRİM] ISO-8601 uyumlu tarih/zaman dizgesi gösterir.\n" -" BİRİM=`date' sadece tarihi (öntanımlı),\n" -" `hours', `minutes', `seconds' veya `ns' ile tarih " -"ve\n" -" zaman 'saat', 'dakika', 'saniye' veya nanosaniye\n" -" hassasiyetinde gösterilir.\n" - -#: src/date.c:142 +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" + +#: src/date.c:138 +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" +msgstr "" + +#: src/date.c:145 #, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" -" -r, --reference=DOSYA DOSYAnın son değiştirildiği zamanı gösterir\n" -" -R, --rfc-822 RFC-2822 uyumlu tarih ve zaman gösterir\n" -" -s, --set=DİZGE sistem zamanını DİZGE ile belirtilen zamana " -"ayarlar\n" -" -u, --utc, --universal zamanı Greenwich saatiyle gösterir ya da " -"değiştirir\n" +" -r,--referans=DOSYA DOSYA'nın son değiştirilme zamanını gösterir\n" +" -R, --rfc-2822 çıkış tarih ve saatini RFC 2822 foramtında gösterir.\n" +" Örnek: Pzt, 07 Ağu 2006 12:34:56 -0600\n" -#: src/date.c:147 +#: src/date.c:149 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" +msgstr "" + +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" msgstr "" #: src/date.c:158 -#, fuzzy +msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2853,46 +2819,43 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" "\n" -"BİÇEM çıktıyı kontrol eder. İkinci biçem için tek geçerli seçenek\n" -"Greenwich saatini belirtir. Bilinen biçemler:\n" +"BİÇİM çıkışı kontrol eder. Sıralamaları şu şekilde değerlendir:\n" "\n" -" %% sabit %\n" -" %a yerelin kısaltılmış gün adı (Paz..Cmt)\n" +" %% % doğru\n" +" %a yerel kısaltılmış hafta içi günleri adı (örn, Pzr)\n" -#: src/date.c:165 -#, fuzzy +#: src/date.c:171 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 yerelin uzun gün adı, değişken uzunluk (Pazar..Cumartesi)\n" -" %b yerelin kısaltılmış ay adı (Oca..Ara)\n" -" %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" +" %A yerel tam haftaiçi gün adı (örn, Pazar)\n" +" %b yerel kısaltılmış ay adı (örn, Ock)\n" +" %B yerel tam ay adı (örn, Ocak)\n" +" %c yerel tarih ve zaman (örn, Cum Mar 3 23:05:25 2005)\n" -#: src/date.c:171 -#, fuzzy +#: src/date.c:177 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 yüzyıl (yıl yüze bölünüp tamsayıya budanır) [00-99]\n" -" %d ayın günü (01..31)\n" -" %D tarih (aa/gg/yy)\n" -" %e boşlukla yastıklanmış ayın günü ( 1..31)\n" -#: src/date.c:177 +#: src/date.c:183 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 tam tarih; %Y-%m-%d ile aynı\n" +" %g ISO hafta numarasının son iki hanesi (bkz %G)\n" +" %G ISO hafta numarasının ISO yılı (bkz %V); genelde sadece %V ile " +"kullanılır\n" -#: src/date.c:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2904,21 +2867,15 @@ msgstr "" " %I saat (01..12)\n" " %j yılın günü (001..366)\n" -#: src/date.c:188 -#, fuzzy +#: src/date.c:194 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 saat ( 0..23)\n" -" %l saat ( 1..12)\n" -" %m ay (01..12)\n" -" %M dakika (00..59)\n" -#: src/date.c:194 -#, fuzzy +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2928,59 +2885,52 @@ 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 satırsonu karakteri\n" +" %n bir satırbaşı\n" " %N nanosaniye (000000000..999999999)\n" -" %p büyük harfli yerel ÖÖ/öS belirteci\n" -" %P küçük harfli yerel öö/ös belirteci\n" -" %r 12 saatlik zaman (ss:dd:SS [ÖÖ]S])\n" -" %R 24 saatlik zaman (ss:dd)\n" -" %s `00:00:00 1970-01-01 UTC' saatinden beri saniye sayısı (bir GNU " -"eklentisi)\n" +" %p Ya AM yada PM'in eşdeğeri; eğer bilinmiyorsa boşluk\n" +" %P %p gibi, fakat daha küçük\n" +" %r yerel 12 saatlik zaman (örn, 11:11:04 PM)\n" +" %R 24 saatlik saat ve dakika; %H:%M şeklinde\n" +" %s 1970-01-01 00:00:00 UTC'den beri saniye\n" -# -#: src/date.c:203 -#, fuzzy +#: src/date.c:209 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 "" -" %S saniye (00..60); 60, fazla bir saniyeyi belirtebilmek için " -"gereklidir\n" -" %t yatay sekme\n" -" %T 24 saatlik zaman (ss:dd:SS)\n" -" %u haftanın günü (1..7); 1, pazartesiye tekabül eder\n" +" %S saniye (00..60)\n" +" %t sekme\n" +" %T zaman; %H:%M:%S gibi\n" +" %u haftanın günü (1..7); 1 Pazartesi\n" -#: src/date.c:209 -#, fuzzy +#: src/date.c:215 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 yılın haftası, pazar günü haftanın ilk günü kabul edilir (00..53)\n" -" %V yılın haftası, pazartesi günü haftanın ilk günü kabul edilir " +" %U Pazar, haftanın ilk günü olmak üzere, hafta numarası (00..53)\n" +" %V Pazartesi, haftanın ilk günü olmak üzere, ISO hafta numarası " "(01..53)\n" -" %w haftanın günü (0..6); 0, pazar gününe tekabül eder\n" -" %W yılın haftası, pazartesi günü haftanın ilk günü kabul edilir " -"(00..53)\n" +" %w Haftanın günü (0..6); Pazar 0\n" +" %W Pazartesi, haftanın ilk günü olmak üzere, hafta numarası (00..53)\n" -#: src/date.c:215 -#, fuzzy +#: src/date.c:221 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 yerelin tarih betimlemesi (gg/aa/yy)\n" -" %X yerelin zaman betimlemesi (%H:%M:%S)\n" -" %y yılın son iki basamağı (00..99)\n" -" %Y yıl (1970...)\n" +" %x yerel tarih gösterimi (ör., 12/31/99)\n" +" %X yerel zaman gösterimi (ör., 32:13:48)\n" +" %y yılın son iki basamağı (00..99)\n" +" %Y yıl\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2992,7 +2942,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3003,7 +2953,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3011,8 +2961,13 @@ msgid "" "E to use the locale's alternate representations if available, or\n" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" +"\n" +"Her bayraktan sonra, alan genişliğini belirten bir sayı;\n" +"daha sonra da aşağıdaki tiplerden biri gelebilir:\n" +"E varsa alternatif yerel gösterimi kullanır,\n" +"O varsa alternatif yerel rakamları kullanır.\n" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3026,62 +2981,59 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "standart girdi" -#: src/date.c:307 src/date.c:527 -#, fuzzy, c-format +#: src/date.c:313 src/date.c:533 +#, c-format msgid "invalid date %s" -msgstr "`%s' geçerli bir zaman dizgesi değil" +msgstr "geçersiz tarih '%s'" -#: src/date.c:418 src/date.c:452 -#, fuzzy, c-format +#: src/date.c:424 src/date.c:458 +#, c-format msgid "multiple output formats specified" -msgstr "birden fazla çıktı dosyası belirtilmiş" +msgstr "birden fazla çıktı biçimi belirtilmiş" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 -#, fuzzy, c-format +#: src/date.c:464 +#, 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 "" -"`%s' argümanı bir `+' ile başlamalı;\n" -"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:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "tarih ayarlanamadı" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" -msgstr "" +msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3090,8 +3042,7 @@ msgstr "" "Kullanımı: %s [İŞLEYEN]...\n" " veya: %s SEÇENEK\n" -#: src/dd.c:532 -#, fuzzy +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3101,17 +3052,8 @@ msgid "" " count=N copy only N input blocks\n" " ibs=BYTES read up to BYTES bytes at a time (default: 512)\n" msgstr "" -"Seçeneklere göre biçemleme ve dönüştürme yaparak bir dosya kopyalar.\n" -"\n" -" bs=BAYT ibs=BAYT ve obs=BAYT anlamına gelir \n" -" cbs=BYTES bir seferde BAYT dönüştürür\n" -" conv=ANAHTAR_KELİMELER dosyayı virgülle ayrılmış\n" -" anahtar kelime listesine uygun olarak dönüştürür\n" -" count=BLOK yalnızca BLOK sayıda girdi bloğu kopyalar\n" -" ibs=BAYT bir seferde BAYT bayt okur\n" -#: src/dd.c:541 -#, fuzzy +#: src/dd.c:570 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3120,19 +3062,13 @@ 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=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" -" obs=BAYT bir seferde BAYT bayt yazdırır\n" -" of=DOSYA standart çıktı yerine DOSYA'ya yazdırır\n" -" oflag=BAYRAK virgülle ayrılmış sembol listesine uygun olarak yazdırır\n" -" 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:552 -#, fuzzy +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" +msgstr "" + +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3142,16 +3078,8 @@ msgid "" "Each CONV symbol may be:\n" "\n" msgstr "" -"\n" -"BLOK ve BAYTlar aşağıdaki çarpan sonekleri ile bitebilirler:\n" -"xM M, c 1, w 2, b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n" -"GB 1000*1000*1000, G 1024*1024*1024, ve T, P, E, Z, Y. için diğerleri\n" -"\n" -"Her CONV sembolü:\n" -"\n" -#: src/dd.c:561 -#, fuzzy +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3165,23 +3093,8 @@ msgid "" " sync pad every input block with NULs to ibs-size; when used\n" " with block or unblock, pad with spaces rather than NULs\n" msgstr "" -" ascii EBCDIC'den ASCII'ye\n" -" ebcdic ASCII'den EBCDIC'ye\n" -" ibm ASCII'den alternatifli EBCDIC'ye\n" -" block satırsonu karakteri ile biten kayıtları cbs boyutuna getirmek\n" -" için boşlukla doldurur\n" -" unblock cbs boyutundaki kayıtlarda sonda yer alan boşlukları yenisatır \n" -" ile değiştirir\n" -" lcase büyük harfleri küçük harfe dönüştürür\n" -" ucase küçük harfleri büyük harfe dönüştürür\n" -" swab her girdi bayt çiftini takas eder\n" -" sync her girdi bloğunu NUL karakterle doldurarak ibs boyutuna " -"getirir\n" -" block veya unblock seçenekleri ile kullanıldığı zaman NUL " -"yerine\n" -" boşlukla doldurur\n" - -#: src/dd.c:574 + +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3197,8 +3110,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:582 -#, fuzzy +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3207,149 +3119,112 @@ msgid "" "suggested)\n" msgstr "" "\n" -"Her BAYRAK sembolü:\n" +"Her bir BAYRAK sembolü şunlar olabilir:\n" "\n" -" append ekleme kipi (yalnız çıktı için geçerli)\n" +" append append (ek) kipi (sadece çıkış için anlamlıdır; conv=notrunc " +"önerilir)\n" -#: src/dd.c:589 -#, fuzzy +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" -msgstr " direct veri için direkt I/O kullanır\n" +msgstr " cio veri için eşzamanlı G/Ç kullan\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct veri için direkt I/O kullanır\n" -#: src/dd.c:593 -#, fuzzy +#: src/dd.c:624 msgid " directory fail unless a directory\n" -msgstr " direct veri için direkt I/O kullanır\n" +msgstr " directory dizin olmadığı takdirde başarısız\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync veri için senkron I/O kullanır\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync önceki gibi fakat meta veri için de geçerli\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" -msgstr "" +msgstr " fullblock girişin bütün bloklarını biriktir (sadece iflag)\n" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock bloklamayan I/O kullanır\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" -msgstr "" +msgstr " noatime erişim zamanını güncelleme\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 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:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow sembolik bağları izlemez\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" -msgstr "" +msgstr " nolinks çoklu bağlantı varsa başarısız olur\n" -#: src/dd.c:616 -#, fuzzy +#: src/dd.c:647 msgid " binary use binary I/O for data\n" -msgstr " direct veri için direkt I/O kullanır\n" +msgstr " binary veri için ikili G/Ç kullanır\n" -#: src/dd.c:618 -#, fuzzy +#: src/dd.c:649 msgid " text use text I/O for data\n" -msgstr " direct veri için direkt I/O kullanır\n" +msgstr " text veri için metin G/Ç kullanır\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 -#, fuzzy, c-format +#: src/dd.c:661 +#, 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 "" -"\n" -"Çalışan bir `dd' sürecine SIGUSR1 sinyali göndermek, sürecin I/O\n" -" istatistiklerini standart hataya yazdırmasını ve kopyalamaya\n" -"devam etmesini sağlar.\n" -"\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ kill -USR1 $pid; sleep 1; kill $pid\n" -" 18335302+0 kayıt girdi\n" -" 18335302+0 kayıt çıktı\n" -" 9387674624 bayt (9.4 GB) kopyalandı, 34.6279 saniye, 271 MB/s\n" -"\n" -"Seçenekler:\n" -"\n" -#: src/dd.c:676 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:698 +#: src/dd.c:721 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:748 +#: src/dd.c:774 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" - -#: src/dd.c:754 -#, fuzzy, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "budanmış kayıt" -msgstr[1] "budanmış kayıt" - -#: src/dd.c:766 -#, fuzzy, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" -msgstr[0] "%s bayt (%s) kopyalandı" -msgstr[1] "%s bayt (%s) kopyalandı" +msgstr[0] "% (%s) bayt kopyalandı" +msgstr[1] "% (%s) bayt kopyalandı" -#: src/dd.c:785 -#, fuzzy +#: src/dd.c:794 msgid "Infinity B" -msgstr "Sonsuz" +msgstr "Sonsuz B" #. TRANSLATORS: The two instances of "s" in this string are the SI #. symbol "s" (meaning second), and should not be translated. @@ -3361,90 +3236,103 @@ 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:798 -#, fuzzy, c-format +#: src/dd.c:807 +#, c-format msgid ", %g s, %s/s\n" -msgstr ", %g saniye, %s/s\n" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% kayıt girdi\n" +"%+% kayıt çıktı\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% kesilen kayıt\n" +msgstr[1] "% kesilen kayıt\n" -#: src/dd.c:877 +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "girdi dosyası %s kapatılıyor" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "çıktı dosyası %s kapatılıyor" -#: src/dd.c:1089 -#, fuzzy, c-format +#: src/dd.c:1142 +#, c-format msgid "failed to turn off O_DIRECT: %s" -msgstr "%s dizinine chdir başarısız" +msgstr "" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "%s'e yazılıyor" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "geçersiz işleyen %s" -#: src/dd.c:1285 -#, fuzzy +#: src/dd.c:1376 msgid "invalid conversion" -msgstr "geçersiz dönüşüm: %s" +msgstr "hatalı çevirme" -#: src/dd.c:1288 src/dd.c:1364 -#, fuzzy +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" -msgstr "geçersiz girdi bayrağı: %s" +msgstr "geçersiz giriş bayrağı" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 -#, fuzzy +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" -msgstr "geçersiz çıktı bayrağı: %s" +msgstr "geçersiz çıkış bayrağı" -#: src/dd.c:1294 +#: src/dd.c:1385 #, fuzzy -msgid "invalid status flag" -msgstr "geçersiz durum bayrağı: %s" - -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "geçersiz sayı %s" +msgid "invalid status level" +msgstr "geçersiz durum bayrağı" -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "{ascii, ebcdic, ibm} değerlerinin herhangi ikisi birleştirilemez" # -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "`block' ve `unblock' seçenekleri aynı anda kullanılamaz" -#: src/dd.c:1419 +#: src/dd.c:1522 #, 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:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "`excl' ve `nocreat' seçenekleri birleştirilemez" -#: src/dd.c:1424 -#, fuzzy, c-format +#: src/dd.c:1527 +#, c-format msgid "cannot combine direct and nocache" -msgstr "`excl' ve `nocreat' seçenekleri birleştirilemez" +msgstr "" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3454,83 +3342,84 @@ msgstr "" "alternatifler\n" " kullanılıyor -- tür listesi için 'e bakın" -#: src/dd.c:1670 -#, fuzzy, c-format +#: src/dd.c:1773 +#, c-format msgid "%s: cannot skip" -msgstr "%s: aranamadı" +msgstr "%s: geçilemiyor" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: aranamadı" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "%s dosya okunurken görece taşması" -#: src/dd.c:1756 -#, fuzzy, c-format +#: src/dd.c:1859 +#, c-format msgid "warning: invalid file offset after failed read" -msgstr "uyarı: başarısız okumadan sonra garip dosya atlaması" +msgstr "uyarı: başarısız okumadan ötürü geçersiz dosya ofseti" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" -msgstr "çekirdek hatası bertaraf edilemedi" +msgstr "çekirdek hatası çözülemedi" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "%s için seçenekler belirtiliyor" -#: src/dd.c:1957 -#, fuzzy, c-format +#: src/dd.c:2060 +#, c-format msgid "%s: cannot skip to specified offset" -msgstr "%s: görece %s'ye ilerlenemiyor (seek)" +msgstr "%s: belirtilen konuma geçilemiyor" -#: src/dd.c:2172 -#, fuzzy, c-format +#: src/dd.c:2288 +#, c-format msgid "failed to truncate to % bytes in output file %s" -msgstr "çıktı dosyasında %s bayt ileriye gidildi %s" +msgstr "" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "%s için fdatasync başarısız" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "%s için fsync başarısız" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "%s açılamadı" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "" +"açıklık çok büyük: seek=% (%lu-bayt) blokluk uzunluğa kısaltılamıyor" -#: src/dd.c:2306 -#, fuzzy, c-format +#: src/dd.c:2422 +#, c-format msgid "failed to truncate to % bytes in output file %s" -msgstr "çıktı dosyasında %s bayt ileriye gidildi %s" +msgstr "" -#: src/dd.c:2322 src/dd.c:2328 -#, fuzzy, c-format +#: src/dd.c:2438 src/dd.c:2444 +#, c-format msgid "failed to discard cache for: %s" -msgstr "%s dizinine chdir başarısız" +msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" -msgstr "" +msgstr "Paul Eggert" #: src/df.c:174 msgid "Filesystem" @@ -3578,17 +3467,17 @@ msgstr "Bağlanılan yer" #: src/df.c:207 msgid "File" -msgstr "" +msgstr "Dosya" #: src/df.c:387 -#, fuzzy, c-format +#, c-format msgid "option --output: field %s unknown" -msgstr "çıktı dosyası %s kapatılıyor" +msgstr "" #: src/df.c:394 -#, fuzzy, c-format +#, c-format msgid "option --output: field %s used more than once" -msgstr "uyarı: %s kaynak dosyası bir defadan çok belirtilmiş" +msgstr "" #: src/df.c:415 src/df.c:454 msgid "Size" @@ -3607,37 +3496,33 @@ msgstr "Kapasite" #: src/df.c:550 src/df.c:559 #, c-format msgid "%s-%s" -msgstr "" +msgstr "%s-%s" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" -msgstr "" +msgstr "%s erişimi yapılamıyor: farklı bir aygıt tarafından üzerine bağlanmış" -#: src/df.c:1384 -#, fuzzy +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\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" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3651,29 +3536,33 @@ msgstr "" " --no-sync (öntanımlı) kullanım bilgisini almadan önce sync\n" " yapmaz\n" -#: src/df.c:1409 -#, fuzzy +#: src/df.c:1429 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" +msgstr "" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose sadece açık olan her bir çıkış dosyasından önce\n" +" bir tanılama yaz\n" + +#: src/df.c:1439 +msgid "" " -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 "" -" -P, --portability POSIX çıktı biçemini kullanır\n" -" --sync kullanım bilgisini almadan önce sync yapar\n" -" -t, --type=TÜR bilgi göstermeyi TÜR türünde dosyasistemleri ile\n" -" sınırlar\n" -" -T, --print-type dosyasistemi türünü gösterir\n" -" -x, --exclude-type=TÜR bilgi göstermeyi TÜR türünde olmayan\n" -" dosyasistemleri ile sınırlar\n" -" -v (yoksayılır)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3681,34 +3570,33 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 -#, fuzzy, c-format +#: src/df.c:1486 +#, c-format msgid "options %s and %s are mutually exclusive" -msgstr "--string ve --check seçenekleri aynı anda kullanılamaz" +msgstr "" -#: src/df.c:1610 +#: src/df.c:1636 #, 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:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Uyarı: " -#: src/df.c:1670 src/stat.c:842 -#, fuzzy +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" -msgstr "%s bağlanmış dosyasistemleri tablosu okunamadı" +msgstr "bağlı dosya sistemleri tablosu okunamıyor" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" -msgstr "" +msgstr "hiçbir dosya sistemi işlenemedi." #. This is a proper name. See the gettext manual, section Names. #: src/dircolors.c:35 msgid "H. Peter Anvin" -msgstr "" +msgstr "H. Peter Anvin" #: src/dircolors.c:97 src/uptime.c:198 src/users.c:105 #, c-format @@ -3735,20 +3623,12 @@ msgstr "" " -p, --print-database öntanımlıları çıktılar\n" #: src/dircolors.c:108 -#, fuzzy 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 "" -"\n" -"Eğer DOSYA belirtilmiş ise, hangi dosya türü ve uzantılar için hangi " -"renklerin\n" -"kullanılacağı dosyadan okunur. Eğer DOSYA belirtilmemiş ise önceden " -"derlenmiş\n" -"bir veritabanı kullanılır. Bu dosyaların biçemi için, \n" -"'dircolors --print-database' komutunu çalıştırın.\n" #: src/dircolors.c:286 #, c-format @@ -3774,9 +3654,8 @@ msgstr "" "göre olması çelişkili" #: src/dircolors.c:450 -#, fuzzy msgid "file operands cannot be combined with --print-database (-p)" -msgstr "Dosya işleyenleri --print-database (-p) ile birleştirilemez" +msgstr "dosya terimleri --print-database (-p) ile birleştirilemez" #: src/dircolors.c:473 #, c-format @@ -3789,25 +3668,16 @@ msgid "Usage: %s [OPTION] NAME...\n" msgstr "Kullanım: %s [SEÇENEK] İSİM...\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 "" -"İSİM'min sonundaki / kaldırılarak yazdırılır; eğer İSİM içinde herhangi\n" -"bir / içermiyorsa, `.' basılır (içinde bulunulan dizin anlamında).\n" -"\n" -" --help bu iletiyi gösterir ve çıkar\n" -" --version sürüm bilgilerini gösterir ve çıkar\n" #: src/dirname.c:59 -#, fuzzy msgid " -z, --zero end each output line with NUL, not newline\n" msgstr "" -" -z, --zero-terminated satırları satır-sonu karakteri (\\n) \n" -" yerine 0'la (0 baytı) bitirir\n" #: src/dirname.c:64 #, c-format @@ -3819,7 +3689,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3829,15 +3699,11 @@ msgstr "" " veya: %s [SEÇENEK]... --files0-from=F\n" #: src/du.c:285 -#, fuzzy -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, 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:291 -#, fuzzy msgid "" " -0, --null end each output line with NUL, not newline\n" " -a, --all write counts for all files, not just directories\n" @@ -3847,21 +3713,8 @@ msgid "" " larger due to holes in ('sparse') files, internal\n" " fragmentation, indirect blocks, and the like\n" msgstr "" -" -a, --all sayıları bütün dosyalar için yazar, yalnız dizinler\n" -" için değil\n" -" --apparent-size dosya boylarının görünen boylarını yazar, diskte\n" -" kapladığı alanı değil. Görünen boy genelde daha \n" -" küçüktür, fakat `seyrek' dosyalarda boşluklar, iç\n" -" parçalanmalar, endirekt bloklar gibi şeyler " -"yüzünden\n" -" daha büyük olabilir.\n" -" -B, --block-size=BOY BOY boyunda bloklar kullanır\n" -" -b, --bytes boyları bayt cinsinden yazar\n" -" -c, --total toplam hesaplar\n" -" -D, --dereference-args sembolik bağ olduğu zaman DOSYA'ları takip eder\n" #: src/du.c:300 -#, fuzzy msgid "" " -B, --block-size=SIZE scale sizes by SIZE before printing them; e.g.,\n" " '-BM' prints sizes in units of 1,048,576 bytes;\n" @@ -3876,18 +3729,8 @@ msgid "" " 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:313 -#, fuzzy msgid "" " --files0-from=F summarize disk usage of the\n" " NUL-terminated file names specified in file F;\n" @@ -3897,18 +3740,6 @@ msgid "" "2G)\n" " --inodes list inode usage information instead of block usage\n" msgstr "" -" --files0-from=F F dosyasında isimleri belirtilen, sonu NUL ile " -"biten\n" -" dosyaların disk kullanımı hakkında bilgi verir\n" -" -H --si gibi, fakat yakında --dereference-args (-D) " -"ile\n" -" aynı hale geleceğine dair uyarı verir\n" -" -h, --human-readable boyutları insan okuyabilir biçemde gösterir\n" -" (örn., 1K 234M 2G)\n" -" --si -h gibi fakat 1000'in katlarını kullanır, 1024'ün\n" -" değil.\n" -" -k --block-size=1K gibi\n" -" -l, --count-links Eğer sabit bağ var ise, boyları toplama tekrar alır\n" #: src/du.c:322 msgid "" @@ -3919,7 +3750,6 @@ msgid "" msgstr "" #: src/du.c:328 -#, fuzzy msgid "" " -P, --no-dereference don't follow any symbolic links (this is the " "default)\n" @@ -3928,12 +3758,6 @@ msgid "" " --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" -" -P, --no-dereference sembolik bağları takip etmez (öntanımlı)\n" -" -0, --null her çıktı satırını yenisatır yerine 0 bayt \n" -" ile sonlandırır\n" -" -S, --separate-dirs altdizinlerin boyutunu dahil etmez\n" -" -s, --summarize her argüman için yalnızca toplamı gösterir\n" #: src/du.c:334 msgid "" @@ -3960,83 +3784,76 @@ msgstr "" msgid "Infinity" msgstr "Sonsuz" -#: src/du.c:636 -#, fuzzy, c-format +#: src/du.c:657 +#, c-format msgid "fts_read failed: %s" -msgstr "fts_read başarısız oldu" +msgstr "" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "geçersiz maksimum derinlik %s" -#: src/du.c:816 -#, fuzzy, c-format +#: src/du.c:837 +#, c-format msgid "invalid --threshold argument '-0'" -msgstr "tamsayı argüman olarak `%s' geçersiz" +msgstr "" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "hem özetleyip hem bütün girdiler gösterilemez" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "uyarı: özetlemek --max-depth=0 ile aynı" -#: src/du.c:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "uyarı: özetlemek --max-depth=%lu ile çakışıyor" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 -#, fuzzy +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" -msgstr "Dosya işleyenleri --files0-from ile birleştirilemez" - -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: okuma hatası" +msgstr "dosya işleçleri --files0-from ile birleştirilemez" -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" -msgstr "" +msgstr "stdin'den dosya adları okunurken %s dosya adı kullanılamaz" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "geçersiz sıfır uzunluklu dosya adı" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "toplam" #. This is a proper name. See the gettext manual, section Names. #: src/echo.c:26 msgid "Brian Fox" -msgstr "" +msgstr "Brian Fox" #. This is a proper name. See the gettext manual, section Names. #: src/echo.c:27 msgid "Chet Ramey" -msgstr "" +msgstr "Chet Ramey" #: src/echo.c:41 -#, fuzzy, c-format +#, c-format msgid "" "Usage: %s [SHORT-OPTION]... [STRING]...\n" " or: %s LONG-OPTION\n" msgstr "" -"Kullanımı: %s [DİZGE]...\n" -" veya: %s SEÇENEK\n" +"Kullanım: %s [KISA-SEÇENEK]... [DİZGE]...\n" +" veya: %s UZUN SEÇENEK\n" #: src/echo.c:45 msgid "" @@ -4072,7 +3889,6 @@ msgid "" msgstr "" #: src/echo.c:65 src/printf.c:105 -#, fuzzy msgid "" " \\\\ backslash\n" " \\a alert (BEL)\n" @@ -4085,12 +3901,16 @@ msgid "" " \\t horizontal tab\n" " \\v vertical tab\n" msgstr "" -" \\c sonlayan yenisatırı bastırır\n" -" \\f sayfa sonuna kadar imleci ilerletir\n" -" \\n alt satıra geçer\n" -" \\r imleci satır başına taşır\n" -" \\t imleci yatay sekme kadar ilerletir\n" -" \\v imleci düşey sekme kadar ilerletir\n" +" \\\\ ters bölü\n" +" \\a uyarı (BEL)\n" +" \\b geri sil\n" +" \\c artık çıktı gösterme\n" +" \\e kaçış\n" +" \\f form besleme\n" +" \\n yeni satır\n" +" \\r taşıyıcı döngüsü (CR)\n" +" \\t yatay sekme\n" +" \\v dikey sekme\n" #: src/echo.c:77 msgid "" @@ -4100,9 +3920,8 @@ msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/env.c:32 src/printenv.c:45 src/whoami.c:35 -#, fuzzy msgid "Richard Mlynarik" -msgstr "Richard Mlynarik ve David MacKenzie" +msgstr "Richard Mlynarik" #: src/env.c:52 #, c-format @@ -4114,16 +3933,11 @@ msgid "Set each NAME to VALUE in the environment and run COMMAND.\n" msgstr "" #: src/env.c:61 -#, fuzzy msgid "" " -i, --ignore-environment start with an empty environment\n" " -0, --null end each output line with NUL, not newline\n" " -u, --unset=NAME remove variable from the environment\n" msgstr "" -"Her çevre değişkeni İSİM için bir DEĞER atar ve KOMUTu çalıştırır.\n" -"\n" -" -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:68 msgid "" @@ -4135,14 +3949,14 @@ msgstr "" "listeler.\n" #: src/env.c:124 -#, fuzzy, c-format +#, c-format msgid "cannot unset %s" -msgstr "%s durumlanamadı" +msgstr "%s kaldırılamıyor" #: src/env.c:135 -#, fuzzy, c-format +#, c-format msgid "cannot set %s" -msgstr "%s durumlanamadı" +msgstr "%s ayarlanamıyor" #: src/env.c:152 #, c-format @@ -4151,13 +3965,10 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\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" +"DOSYA verilmemişse veya DOSYA - ise, standart girdi tekrar kopyalanır.\n" #: src/expand.c:114 msgid "" @@ -4202,14 +4013,14 @@ msgid "input line is too long" msgstr "girdi satırı fazla uzun" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" -msgstr "" +msgstr "Mike Parker" #. This is a proper name. See the gettext manual, section Names. #: src/expr.c:151 src/groups.c:36 msgid "James Youngman" -msgstr "" +msgstr "James Youngman" #: src/expr.c:202 #, c-format @@ -4299,19 +4110,12 @@ msgstr "" " length DİZGE DİZGEnin karakter sayısı\n" #: src/expr.c:250 -#, 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 "" -" + ANDAÇ ANDAÇ `match' gibi bir anahtar sözcük ya da " -"`/'\n" -" gibi bir işlemimi bile olsa bir dizge olarak\n" -" yorumlar.\n" -"\n" -" ( İFADE ) İFADEnin değeri\n" #: src/expr.c:256 msgid "" @@ -4349,57 +4153,56 @@ msgid "syntax error" msgstr "sözdizimi hatası" #: src/expr.c:591 src/ptx.c:284 -#, fuzzy, c-format +#, c-format msgid "error in regular expression matcher" -msgstr "düzenli ifade (regular expression) aramasında hata oluştu" +msgstr "düzenli ifadeler eşleşmesinde hata" #: src/expr.c:783 src/expr.c:820 -#, fuzzy, c-format +#, c-format msgid "non-integer argument" -msgstr "nümerik olmayan argüman" +msgstr "" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "sıfırla bölüm" -# -#: src/expr.c:879 src/sort.c:2077 -#, fuzzy, c-format +#: src/expr.c:879 src/sort.c:2076 +#, 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." +msgstr "sorunu çözmek için LC_ALL='C' ayarlayın" #: src/expr.c:881 -#, fuzzy, c-format +#, c-format msgid "the strings compared were %s and %s" -msgstr "Karşılaştırılan dizgeler %s ve %s idi." +msgstr "karşılaştırılan dizgeler %s ile %s idi" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 -#, fuzzy, c-format +#: src/factor.c:2492 +#, c-format msgid "%s is not a valid positive integer" -msgstr "`%s' bir pozitif tamsayı değil." +msgstr "%s geçerli bir pozitif tamsayı değil" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s çok büyük" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4408,16 +4211,15 @@ msgstr "" "Kullanımı: %s [SAYI]...\n" " veya: %s SEÇENEK\n" -#: src/factor.c:2443 -#, fuzzy +#: src/factor.c:2533 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 "" +"Belirtilen her integer SAYInın asal çarpanlarını yazdır.\n" +"Eğer komut satırında belirtilmemişlerse, standart girişten oku.\n" "\n" -" Belirtilen tamsayıların asal çarpanlarını gösterir. Argüman belirtilmezse\n" -" doğrudan standart çıktıyı okuyarak sonucu verir.\n" #: src/find-mount-point.c:40 #, c-format @@ -4438,24 +4240,20 @@ msgstr "şimdiki dizin durumlanamadı (şimdi %s)" #. This is a proper name. See the gettext manual, section Names. #: src/fmt.c:38 msgid "Ross Paterson" -msgstr "" +msgstr "Ross Paterson" #: src/fmt.c:270 -#, fuzzy, c-format +#, c-format msgid "Usage: %s [-WIDTH] [OPTION]... [FILE]...\n" -msgstr "Kullanım: %s [-BASAMAKLAR] [SEÇENEK]... [DOSYA]...\n" +msgstr "Kullanım: %s [-GENİŞLİK] [SEÇENEK]... [DOSYA]...\n" #: src/fmt.c:271 -#, fuzzy msgid "" "Reformat each paragraph in the FILE(s), writing to standard output.\n" "The option -WIDTH is an abbreviated form of --width=DIGITS.\n" msgstr "" -"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" -"\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4468,21 +4266,16 @@ msgstr "" " -s, --split-only uzun satırları böler fakat kısaları " "birleştirmez\n" -#: src/fmt.c:287 -#, fuzzy, no-c-format +#: src/fmt.c:288 +#, 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 paragrafın ilk satırı ikinci satırından farklı\n" -" girintilenir\n" -" -u, --uniform-spacing sözcük arası bir, noktadan sonra iki boşluk " -"koyar.\n" -" -w, --width=GENİŞLİK maksimum satır genişliği (öntanımlı 75 sütun) \n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4491,22 +4284,16 @@ 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:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" 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" +#: src/fold.c:69 +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" -"DOSYA'daki (DOSYA belirtilmediğinde standart girdi'deki) satırları \n" -"katlar ve standart çıktıya yazar\n" -"\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4516,47 +4303,49 @@ msgstr "" " -s, --spaces satırı boşluklarda böler\n" " -w, --width=N 80 yerine N sütun kullanır\n" -#: 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'" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" +msgstr "sütunlarda bilinmeyen numara: %s" #. This is a proper name. See the gettext manual, section Names. #: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 #: src/truncate.c:37 msgid "Padraig Brady" -msgstr "" +msgstr "Padraig Brady" #: src/getlimits.c:66 -#, fuzzy, c-format +#, c-format msgid "Usage: %s\n" -msgstr "Kullanım: %s [SEÇENEK]\n" +msgstr "Kullanım: %s\n" #: src/getlimits.c:70 msgid "" "Output platform dependent limits in a format useful for shell scripts.\n" "\n" msgstr "" +"Çıkış platformu kabuk kotlarının kullanılan formatında sınırlara bağlıdır.\n" +"\n" #: src/group-list.c:69 src/id.c:412 -#, fuzzy, c-format +#, c-format msgid "failed to get groups for user %s" -msgstr "%s'in grup üyeliği %s olarak değiştirilemedi\n" +msgstr "%s kullanıcısı için gruplar alınamadı" #: src/group-list.c:74 src/id.c:415 -#, fuzzy, c-format +#, c-format msgid "failed to get groups for the current process" -msgstr "%s'in grup üyeliği %s olarak değiştirilemedi\n" +msgstr "mevcut işlemden grup alma başarısız" #: src/group-list.c:114 -#, fuzzy, c-format +#, c-format msgid "cannot find name for group ID %lu" -msgstr "%u grup kimliğinin ismi bulunamıyor" +msgstr "%lu grup kimliğinin adı bulunamıyor" #: src/groups.c:53 -#, fuzzy, c-format +#, c-format msgid "Usage: %s [OPTION]... [USERNAME]...\n" -msgstr "Kullanımı: %s [SEÇENEK]... [KULLANICI-İSMİ]\n" +msgstr "Kullanım: %s [SEÇENEK]... [KULLANICIADI]...\n" #: src/groups.c:54 msgid "" @@ -4564,41 +4353,37 @@ msgid "" "for\n" "the current process (which may differ if the groups database has changed).\n" msgstr "" +"Her USERNAME için grup üyeliklerini yazdır veya mevcut işlem için eğer " +"belirtilmiş USERNAME yoksa (eğer gruplarının veritabanı değiştirilmişse " +"farklı olacak).\n" #: src/groups.c:105 src/id.c:274 -#, fuzzy, c-format +#, c-format msgid "cannot get real UID" -msgstr "kullanıcı kimliği atanamıyor" +msgstr "" #: src/groups.c:110 src/id.c:282 -#, fuzzy, c-format +#, c-format msgid "cannot get effective GID" -msgstr "günün zamanı belirlenemedi" +msgstr "" #: src/groups.c:115 src/id.c:287 -#, fuzzy, c-format +#, c-format msgid "cannot get real GID" -msgstr "kullanıcı kimliği atanamıyor" +msgstr "" #: src/groups.c:128 src/id.c:246 -#, fuzzy, c-format +#, c-format msgid "%s: no such user" -msgstr "%s: Böyle bir kullanıcı yok" +msgstr "" -#: src/head.c:109 -#, fuzzy +#: src/head.c:110 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 "" -"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:117 -#, fuzzy +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4607,15 +4392,8 @@ msgid "" " with the leading '-', print all but the last\n" " K lines of each file\n" msgstr "" -" -c, --bytes=[-]N her dosyanın ilk N baytını yazdırır;\n" -" başında `-' verilirse her dosyanın son N baytı\n" -" haricindeki bütün içeriğini yazdırır\n" -" -n, --lines=[-]N ilk 10 yerine ilk N satırı yazdırır;\n" -" başında `-' verilirse her dosyanın son N " -"satırı\n" -" haricindeki bütün içeriğini yazdırır\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4623,78 +4401,57 @@ msgstr "" " -q, --quiet, --silent dosya isimlerini göstermez\n" " -v, --verbose dosya isimlerini gösterir\n" -#: src/head.c:131 -#, fuzzy +#: src/head.c:132 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" -"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/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: dosya fazla küçülmüş" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: bayt sayısı fazla büyük" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: %s görecesine ilerleme (seek) yapılamıyor" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: görece %s'ye ilerlenemiyor (seek)" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "satır sayısı" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "bayt sayısı" +msgid "%s: number of bytes is too large" +msgstr "%s: bayt sayısı fazla büyük" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "geçersiz satır sayısı" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "geçersiz bayt sayısı" -#: src/head.c:982 src/head.c:1040 -#, fuzzy, c-format +#: src/head.c:991 src/head.c:1049 +#, c-format msgid "invalid trailing option -- %c" -msgstr "geçersiz seçenek -- %c" +msgstr "geçersiz takip seçeneği --%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 "" -"Kullanımı: %s\n" -" veya: %s SEÇENEK\n" -"Çalıştırıldığı makinanın kimliğini onaltılık tabanda gösterir.\n" +"Kullanım: %s [OPTION]\n" +"Var olan sunucu için sayısal numaralayıcısı onaltılık sistemde yazdır.\n" "\n" #: src/hostname.c:56 @@ -4711,9 +4468,9 @@ msgstr "" "\n" #: src/hostname.c:94 -#, fuzzy, c-format +#, c-format msgid "cannot set name to %s" -msgstr "isim`%s' yapılamadı" +msgstr "%s ismi ayarlanamaz" #: src/hostname.c:97 #, c-format @@ -4728,12 +4485,12 @@ msgstr "makina ismi saptanamadı" #. This is a proper name. See the gettext manual, section Names. #: src/id.c:40 src/touch.c:42 msgid "Arnold Robbins" -msgstr "" +msgstr "Arnold Robbins" #: src/id.c:84 -#, fuzzy, c-format +#, c-format msgid "Usage: %s [OPTION]... [USER]\n" -msgstr "Kullanımı: %s [SEÇENEK]... [KULLANICI]...\n" +msgstr "" #: src/id.c:85 msgid "" @@ -4743,7 +4500,6 @@ msgid "" msgstr "" #: src/id.c:90 -#, fuzzy msgid "" " -a ignore, for compatibility with other versions\n" " -Z, --context print only the security context of the process\n" @@ -4755,14 +4511,6 @@ msgid "" " -z, --zero delimit entries with NUL characters, not whitespace;\n" " not permitted in default format\n" msgstr "" -"KULLANICI-İSMİ ya da çalıştıran kullanıcı hakkındaki bilgileri gösterir.\n" -"\n" -" -a eski sürümlere uyumluluk için var. Yoksayılır.\n" -" -g, --group sadece grup kimliğini gösterir\n" -" -G, --groups sadece ek grupları gösterir\n" -" -n, --name -ugG için bir sayı yerine bir isim gösterir\n" -" -r, --real -ugG için etkin kimlik yerine gerçek kimliği gösterir\n" -" -u, --user sadece kullanıcı kimliğini gösterir\n" #: src/id.c:103 msgid "" @@ -4781,16 +4529,17 @@ msgstr "" #, c-format msgid "--context (-Z) works only on an SELinux-enabled kernel" msgstr "" +"-- (-Z) bağlamı yalnızca SELinux aktive edilmiş çekirdek üzerinde çalışır" #: src/id.c:195 #, c-format msgid "cannot print security context when user specified" -msgstr "" +msgstr "kullanıcı belirtildiğinde güvenlik içeriği yazdırılamaz" #: src/id.c:198 -#, fuzzy, c-format +#, c-format msgid "cannot print \"only\" of more than one choice" -msgstr "-C -l -b seçenekleri beraber kullanılmaz" +msgstr "pek çok seçenekten \"biri\" yazılamıyor" #: src/id.c:205 #, c-format @@ -4798,24 +4547,24 @@ msgid "cannot print only names or real IDs in default format" msgstr "öntanımlı biçemde gerçek kimlikler veya gerçek isimler gösterilemez" #: src/id.c:209 -#, fuzzy, c-format +#, c-format msgid "option --zero not permitted in default format" -msgstr "öntanımlı biçemde gerçek kimlikler veya gerçek isimler gösterilemez" +msgstr "" #: src/id.c:225 #, c-format msgid "can't get process context" -msgstr "" +msgstr "işlem bağlamı alınamıyor." #: src/id.c:265 -#, fuzzy, c-format +#, c-format msgid "cannot get effective UID" -msgstr "günün zamanı belirlenemedi" +msgstr "" #: src/id.c:354 -#, fuzzy, c-format +#, c-format msgid "cannot find name for user ID %s" -msgstr "%u kullanıcı kimliğinin ismi bulunamıyor" +msgstr "" #: src/id.c:372 #, c-format @@ -4844,12 +4593,12 @@ msgstr " gruplar=" #: src/id.c:437 #, c-format msgid " context=%s" -msgstr "" +msgstr " içerik=%s" #: src/install.c:376 -#, fuzzy, c-format +#, c-format msgid "warning: %s: failed to change context to %s" -msgstr "uyarı: %s dizinine geçilemiyor" +msgstr "uyarı: %s: bağlamı %s'e çevrilemedi" #: src/install.c:417 #, c-format @@ -4866,25 +4615,25 @@ msgstr "%s'in sahipliği değiştirilemiyor" msgid "cannot set time stamps for %s" msgstr "%s için zaman damgalama yapılamadı" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "fork sistem çağrısı başarısız" #: src/install.c:535 -#, fuzzy, c-format +#, c-format msgid "cannot run %s" -msgstr "strip çalıştırılamadı" +msgstr "%s çalıştırılamıyor" #: src/install.c:539 -#, fuzzy, c-format +#, c-format msgid "waiting for strip" -msgstr "%s'e yazılıyor" +msgstr "şerit bekleniyor" #: src/install.c:541 #, c-format msgid "strip process terminated abnormally" -msgstr "" +msgstr "soyma işlemi olağandışı bir şekilde sonlandırıldı" #: src/install.c:565 #, c-format @@ -4905,7 +4654,6 @@ msgstr "" " veya: %s [SEÇENEK]... -d DİZİN...\n" #: src/install.c:608 -#, fuzzy msgid "" "\n" "This install program copies files (often just compiled) into destination\n" @@ -4918,13 +4666,8 @@ msgid "" "the existing DIRECTORY, while setting permission modes and owner/group.\n" "In the 4th form, create all components of the given DIRECTORY(ies).\n" msgstr "" -"İ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" -"Dördüncü biçemde, ilgili DİZİN(ler)in bütün öğelerini oluşturur.\n" -"\n" #: src/install.c:622 -#, fuzzy msgid "" " --backup[=CONTROL] make a backup of each existing destination file\n" " -b like --backup but does not accept an argument\n" @@ -4935,11 +4678,15 @@ msgid "" " -d, --directory treat all arguments as directory names; create all\n" " components of the specified directories\n" msgstr "" -" --backup[=KONTROL] her mevcut hedef dosyasının bir yedeğini alır\n" -" -b --backup gibi ama argüman kabul etmez\n" -" -c (yoksayılır)\n" -" -d, --directory bütün argümanları dizin adı olarak alır; belirtilen\n" -" dizinlerin tüm öğelerini oluşturur\n" +" --backup[=CONTROL] var olan herbir hedef dosyanın bir yedeğini al\n" +" -b --backup gibi fakat bir argüman erişemez\n" +" -c (göz ardı edildi)\n" +" -C, --compare aynı durumdaki herbir kaynak çiftini, hedef dosyaları " +"eşleştir\n" +" hedeflerin hiçbirini düzenleme\n" +" -d, --directory bütün argümanlara dizin adları gibi muamele et; " +"belirtilmiş\n" +" dizinlerdeki bütün bileşenleri oluştur\n" #: src/install.c:631 msgid "" @@ -4961,7 +4708,6 @@ msgstr "" " -o, --owner=SAHİP sahibi atar (yalnızca süper-kullanıcı)\n" #: src/install.c:638 -#, fuzzy msgid "" " -p, --preserve-timestamps apply access/modification times of SOURCE " "files\n" @@ -4974,13 +4720,16 @@ 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 KAYNAK dosyalarının erişim/değişim zaman\n" -" damgalarını ilgili hedef dosyalarına uygular\n" -" -s, --strip sembol tablolarını soyar\n" -" -S, --suffix=SONEK öntanımlı yedek soneki yerine SONEK'i kullanır\n" -" -t, --target-directory=DİZİN bütün KAYNAK argümanlarını DİZİN'e kopyalar " -"-T, --no-target-directory HEDEF'i normal bir dosya kabul eder\n" -" -v, --verbose oluşturuldukça her dizinin adını gösterir\n" +" -p, --preserve-timestamps SOURCE dosyalarının erişim/değiştirme " +"zamanlarını uygula\n" +" ilgili hedef dosyalar uygula\n" +" -s, --strip şerit sembol tabloları\n" +" --strip-program=PROGRAM programı şerit ikililere kullan\n" +" -S, --suffix=SUFFIX kullanışlı yedek önekleri geçersiz kıl\n" +" -t, --target-directory=DIRECTORY bütün SOURCE argümanlarını DIRECTORY " +"içine kopyala\n" +" -T, --no-target-directory DEST'e normal dosya gibi muamele et\n" +" -v, --verbose herbir dizinin adını oluşturulmuş gibi yaz\n" #: src/install.c:648 msgid "" @@ -5001,6 +4750,8 @@ msgstr "%s bağı çözülemedi" msgid "" "WARNING: ignoring --preserve-context; this kernel is not SELinux-enabled" msgstr "" +"UYARI: Göz ardı ediliyor --preserve-context; bu çekirdek SELinux-etkin " +"değildir" #: src/install.c:917 #, c-format @@ -5012,7 +4763,7 @@ msgstr "bir dizin kurulurken strip seçeneği kullanılamaz" msgid "target directory not allowed when installing a directory" msgstr "bir dizin kurulurken hedef dizin belirlenemez" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "geçersiz kip %s" @@ -5021,16 +4772,20 @@ msgstr "geçersiz kip %s" #, c-format msgid "WARNING: ignoring --strip-program option as -s option was not specified" msgstr "" +"UYARI: Göz ardı ediliyor --strip-program seçeneği -s seçeneği gibi " +"belirtilmedi" #: src/install.c:1001 -#, fuzzy, c-format +#, c-format msgid "options --compare (-C) and --preserve-timestamps are mutually exclusive" -msgstr "--string ve --check seçenekleri aynı anda kullanılamaz" +msgstr "" +"--compare (-C) ve --preserve-timestamps seçenekleri ortak ayrıcalıklara " +"sahiptir" #: src/install.c:1008 -#, fuzzy, c-format +#, c-format msgid "options --compare (-C) and --strip are mutually exclusive" -msgstr "tarih belirten bu seçenekler birlikte kullanılamaz" +msgstr "--compare (-C) ve --strip seçenekleri ortak ayrıcalıklara sahiptir" #: src/install.c:1014 #, c-format @@ -5038,48 +4793,37 @@ msgid "" "the --compare (-C) option is ignored when you specify a mode with non-" "permission bits" msgstr "" +"--compare (-C) seçeneği izinsiz bit modu belirttiğinden dolayı reddedildi" #. This is a proper name. See the gettext manual, section Names. #: src/join.c:40 src/sort.c:66 -#, fuzzy msgid "Mike Haertel" -msgstr "Mike Haertel ve Paul Eggert" +msgstr "Mike Haertel" #: src/join.c:195 -#, 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" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +msgid "" "\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 "" -"Her birleştirme (join) alanı aynı olan girdi satırı çifti için standart\n" -"çıktıya bir satır yazar. Öntanımlı birleştırme alanı, boşlukla ayrılmış ilk\n" -"alandır. DOSYA1 veya DOSYA2 - olduğunda (ikisi birden - olamaz), standart \n" -"girdiden okur.\n" -"\n" -" -a DOSYANUM DOSYANUM dosyasından gelen eşleştirilememiş satırları \n" -" yazdırır. DOSYANUM, DOSYA1 veya DOSYA2 dosyasından\n" -" gelinmesine göre 1 veya 2 olabilir.\n" -" -e YAZI eksik girdi alanlarını YAZI ile değiştirir\n" -#: src/join.c:204 -#, fuzzy +#: src/join.c:210 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 karşılaştırma yaparken küçük/büyük harf ayrımı yapmaz\n" -" -j ALAN (eski kullanım)`-1 ALAN -2 ALAN' ile aynı\n" -" -o BİÇEM çıktı satırını oluştururken BİÇEM'i kullanır\n" -" -t HARF HARFi girdi ve çıktı alanlarını ayırmakta kullanır\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5091,15 +4835,11 @@ msgid "" " print them without trying to pair them\n" msgstr "" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 -#, fuzzy +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" -" -z, --zero-terminated satırları satır-sonu karakteri (\\n) \n" -" yerine 0'la (0 baytı) bitirir\n" -#: src/join.c:225 -#, fuzzy +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5117,59 +4857,48 @@ msgid "" "If the input is not sorted and some lines cannot be joined, a\n" "warning message will be given.\n" msgstr "" -"\n" -"Eğer -t HARF verilmemiş ise, başlangıçtaki boşluklar alan ayracıdır ve\n" -"yoksayılırlar. Eğer -t HARF verilmiş ise, ayraç olarak HARF kullanılır.\n" -"ALAN, 1'den başlayarak sayılan alan numarasıdır. BİÇEM, bir veya daha " -"fazla,\n" -"virgül veya boşlukla ayrılmış biçemdir. Biçem, `DOSYANUM.ALAN' veya `0' " -"olarak\n" -"verilir. Öntanımlı BİÇEM, HARF ile ayrılmış olarak, birleştirme alanını,\n" -"DOSYA1'de kalan alanları ve DOSYA2'de kalan alanları gösterir.\n" -"\n" -"Önemli: DOSYA1 ve DOSYA2 birleştirme alanına göre sıralı olmalıdır.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "geçersiz alan numarası: %s" -#: src/join.c:868 src/join.c:877 -#, fuzzy, c-format +#: src/join.c:874 src/join.c:883 +#, c-format msgid "invalid field specifier: %s" -msgstr "geçersiz alan belirleyicisi: `%s'" +msgstr "geçersiz alan tanımlayıcısı: %s" -#: src/join.c:884 -#, fuzzy, c-format +#: src/join.c:890 +#, c-format msgid "invalid file number in field spec: %s" -msgstr "alan tanımlamasında geçersiz dosya numarası: `%s'" +msgstr "spesifikasyon alanında geçersiz dosya numarası: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" -msgstr "" +msgstr "%lu birbirine uymayan birleşme alanları, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" -msgstr "" +msgstr "çelişkili boş-alan değiştirme karakter dizileri" -#: src/join.c:1108 src/sort.c:4509 -#, fuzzy, c-format +#: src/join.c:1114 src/sort.c:4508 +#, c-format msgid "multi-character tab %s" -msgstr "tab yerine kullanılacak `%s' bir karakterden oluşmalı" +msgstr "çoklu-karakter sekmesi %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "uyumsuz sekme" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "her iki dosya da standart girdi olamaz" @@ -5186,11 +4915,8 @@ msgstr "" " ya da: %s -t [SİNYAL]...\n" #: src/kill.c:82 -#, fuzzy msgid "Send signals to processes, or list signals.\n" msgstr "" -"İşlemlere sinyal yollar veya sinyalleri listeler.\n" -"\n" #: src/kill.c:88 msgid "" @@ -5208,17 +4934,12 @@ msgstr "" " -t, --table Sinyal bilgileri tablosu gösterir.\n" #: src/kill.c:96 -#, fuzzy 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 "" -"\n" -"SİNYAL, `HUP' gibi bir sinyal adı veya `1' gibi bir sinyal numarası, \n" -"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:205 #, c-format @@ -5250,17 +4971,17 @@ msgstr "sinyal, -l veya -t ile birleştirilemez" msgid "no process ID specified" msgstr "süreç kimliği belirtilmemiş" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 -#, fuzzy, c-format +#: src/libstdbuf.c:114 +#, c-format msgid "invalid buffering mode %s for %s\n" -msgstr "%s argümanı `%s' için geçersiz" +msgstr "" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -5268,7 +4989,7 @@ 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 "" +msgstr "Michael Stone" #: src/link.c:45 #, c-format @@ -5309,29 +5030,29 @@ msgid "%s: replace %s? " msgstr "%s: %s'un üzerine yazılsın mı?" #: src/ln.c:362 -#, fuzzy, c-format +#, c-format msgid "failed to create symbolic link %s" -msgstr "%s sembolik bağı oluşturulamadı" +msgstr "" #: src/ln.c:363 -#, fuzzy, c-format +#, c-format msgid "failed to create symbolic link %s -> %s" -msgstr "sembolik bağ %s, %s'e bağlanamadı" +msgstr "" #: src/ln.c:365 -#, fuzzy, c-format +#, c-format msgid "failed to create hard link to %.0s%s" -msgstr "%s sabit bağı %s'e bağlanamadı" +msgstr "" #: src/ln.c:368 -#, fuzzy, c-format +#, c-format msgid "failed to create hard link %s" -msgstr "%s sabit bağı %s'e bağlanamadı" +msgstr "" #: src/ln.c:369 -#, fuzzy, c-format +#, c-format msgid "failed to create hard link %s => %s" -msgstr "%s sabit bağı %s'e bağlanamadı" +msgstr "" #: src/ln.c:391 #, c-format @@ -5347,7 +5068,6 @@ msgstr "" " veya: %s [SEÇENEK]... -t DİZİN HEDEF... (4. biçem)\n" #: src/ln.c:398 -#, 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" @@ -5358,13 +5078,6 @@ msgid "" "can hold arbitrary text; if later resolved, a relative link is\n" "interpreted in relation to its parent directory.\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" -"3. ve 4. formlarda, DİZİN içindeki her HEDEF'e bir bağ oluşturur.\n" -"Öntanımlı olarak sabit bağ oluşturulur, --symbolic seçeneği kullanıldığı\n" -"zaman sembolik bağ oluşturulur. Sabit bağ oluşturulduğu zaman, her HEDEF\n" -"mevcut olmak zorundadır.\n" -"\n" #: src/ln.c:411 msgid "" @@ -5401,7 +5114,6 @@ msgid "" msgstr "" #: src/ln.c:428 -#, fuzzy msgid "" " -S, --suffix=SUFFIX override the usual backup suffix\n" " -t, --target-directory=DIRECTORY specify the DIRECTORY in which to " @@ -5410,10 +5122,6 @@ 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=SONEK yedekleme soneki yerine SONEK'i kullanır\n" -" -t, --target-directory=DİZİN bağların oluşturulacağı DİZİN'i belirtir\n" -" -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:450 #, c-format @@ -5424,21 +5132,21 @@ msgid "" msgstr "" #: src/ln.c:571 -#, fuzzy, c-format +#, c-format msgid "cannot combine --target-directory and --no-target-directory" msgstr "--target-directory ve --no-target-directory birleştirilemez" #: src/ln.c:605 -#, fuzzy, c-format +#, c-format msgid "cannot do --relative without --symbolic" -msgstr "%s sembolik bağı oluşturulamadı" +msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/logname.c:30 msgid "FIXME: unknown" -msgstr "" +msgstr "FIXME: bilinmiyor" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Kullanım: %s [SEÇENEK]\n" @@ -5451,7 +5159,7 @@ msgstr "" "Çalıştıran kullanıcının ismini gösterir.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "kullanıcı ismi yok" @@ -5461,7 +5169,7 @@ msgstr "kullanıcı ismi yok" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -5470,109 +5178,102 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "çevre değişkeni QUOTING_STYLE'da bulunan geçersiz değer yoksayıldı: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "" "çevre değişkeni COLUMNS'da belirtilen geçersiz genişlik değeri yoksayıldı: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "çevre değişkeni TABSIZE'da bulunan geçersiz sekme boyutu yoksayıldı: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "geçersiz satır genişliği: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "geçersiz sekme boyutu: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "geçersiz tarih biçemi %s" -#: src/ls.c:2067 -#, fuzzy +#: src/ls.c:2045 msgid "Valid arguments are:\n" -msgstr "Geçerli argümanlar:" +msgstr "" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" -msgstr "" +msgstr "ay dizge başlatmada hata" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "tanımlanmamış önek: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "çevre değişkeni LS_COLORS'da taranamaz değer" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "çevre değişkeni QUOTING_STYLE'da bulunan geçersiz değer yoksayıldı: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "dizin %s açılamadı" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "%s'nın aygıtı ve i-düğümü belirlenemedi" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: önceden listelenmiş dizin tekrar listelenmedi" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "dizin %s okunuyor" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "%s dizini kapatılıyor" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "%s ve %s dosya adları karşılaştırılamaz" -#: src/ls.c:4781 -#, fuzzy +#: src/ls.c:4775 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 "" -"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:4788 -#, fuzzy +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5580,14 +5281,8 @@ msgid "" " -b, --escape print C-style escapes for nongraphic " "characters\n" msgstr "" -" -a, --all . ile başlayan girdileri saklamaz\n" -" -A, --almost-all örtük . ve .. değerlerini göstermez\n" -" --author -l ile her dosyanın yazarını gösterir\n" -" -b, --escape grafik olmayan karakterleri sekizlik\n" -" değerlerle gösterir\n" -#: src/ls.c:4794 -#, fuzzy +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5600,39 +5295,20 @@ msgid "" " with -l: show ctime and sort by name;\n" " otherwise: sort by ctime, newest first\n" msgstr "" -" --block-size=BOY BOY baytta bloklar kullanır\n" -" -B, --ignore-backups sonu ~ ile biten örtük yedekleri göstermez\n" -" -c -lt ile: ctime'a (son dosya durum bilgisi\n" -" değişikliği zamanı) göre sıralar ve ctime'ı\n" -" gösterir\n" -" -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:4804 -#, fuzzy +#: src/ls.c:4798 msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" msgstr "" -" -C Çıktıyı sütunlar halinde gösterir\n" -" --color[=NEZAMAN] Dosya tiplerini belirtmek için değişik renkler\n" -" kullanılıp kullanılmamasını belirler. " -"NEZAMAN\n" -" değerleri never (asla), always (her zaman) " -"veya\n" -" auto (otomatik) olabilir.\n" -" -d, --directory içindekiler yerine dizin bilgilerini gösterir " -"ve\n" -" sembolik bağları izlemez.\n" -" -D, --dired Emacs dired kipine uygun çıktı verir\n" - -#: src/ls.c:4812 -#, fuzzy + +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5641,20 +5317,13 @@ msgid "" " single-column -1, verbose -l, vertical -C\n" " --full-time like -l --time-style=full-iso\n" msgstr "" -" -f sıralama yapmaz, -aU seçeneğini etkinleştirir,\n" -" -lst seçeneğini etkinsizleştir\n" -" -F, --classify çıktı bilgilerine belirteç ( */=@| " -"seçeneklerinden\n" -" birini) ekler\n" -" --format=SÖZCÜK -x yatay, -m virgüllü, -l uzun,\n" -" -1 tek sütun, -l uzun, -C dikey\n" -" --full-time -l --time-style=full-iso gibi\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" +" -g -l gibi, fakat sahiblerin adları listelenmez\n" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5663,23 +5332,15 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 -#, fuzzy +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" " (e.g., 1K 234M 2G)\n" " --si likewise, but use powers of 1000 not 1024\n" msgstr "" -" -a, --all 0 bloğa sahip dosyasistemlerini de dahil eder.\n" -" -b --block-size=BOY BOY baytlık bloklar kullanır\n" -" -h, --human-readable boyutları insan okuyabilir biçemde gösterir\n" -" (örn., 1K 234M 2G)\n" -" -H, --si yukarıdaki gibi fakat 1000'in katlarını kullanır,\n" -" 1024'ün değil.\n" -#: src/ls.c:4835 -#, fuzzy +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5691,22 +5352,8 @@ msgid "" "PATTERN\n" " (overridden by -a or -A)\n" msgstr "" -" -g -l gibi fakat sahibi listelemez\n" -" -G, --no-group -l gibi fakat grup bilgisini göstermez\n" -" -h, --human-readable boyutları insan okuyabilir biçemde gösterir\n" -" (örn., 1K 234M 2G)\n" -" --si benzer ama 1000'in katlarını kullanır,\n" -" 1024'ün değil\n" -" -H, --dereference-command-line\n" -" komut satırındaki sembolik bağları izler\n" -" --dereference-command-line-symlink-to-dir\n" -" dizine işaret eden komut satırı sembolik\n" -" bağları izler.\n" -" --hide=KALIP KALIP'a uyan örtük girdileri göstermez\n" -" (-a veya -A ile etkisizleştirilir)\n" -#: src/ls.c:4845 -#, fuzzy +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5717,16 +5364,8 @@ msgid "" "PATTERN\n" " -k, --kibibytes default to 1024-byte blocks for disk usage\n" msgstr "" -" --indicator-style=SÖZCÜK girdi isimlerine SÖZCÜK tarzında belirteç\n" -" ekler: none (boş -- öntanımlı),\n" -" classify (-F kipi gibi),\n" -" file-type (-p kipi gibi)\n" -" -i, --inode -l ile her dosyanın indeks numarasını gösterir\n" -" -I, --ignore=KALIP kabuk KALIP'ıyla eşleşen örtük girdileri\n" -" göstermez\n" -" -k --block-size=1K gibi\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5743,8 +5382,7 @@ msgstr "" " bilgilerini değil\n" " -m satırı virgül ayraçlı girdilerle doldurur\n" -#: src/ls.c:4863 -#, fuzzy +#: src/ls.c:4858 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. " @@ -5754,17 +5392,15 @@ msgid "" " -p, --indicator-style=slash\n" " append / indicator to directories\n" msgstr "" -" -n, --numeric-uid-gid İsim yerine sayısal grup ve kullanıcı " -"kimliklerini\n" -" (UID ve GID) gösterir\n" -" -N, --literal ham isimleri gösterir (kontrol karakterlerini\n" -" ayrıca işlemez)\n" -" -o grup bilgisi olmaksızın uzun listeleme biçemi\n" -" kullanır\n" -" -p, --file-type bilgilere belirteç ekler ( /=@| dan biri) \n" +" -n, --numeric-uid-gid -l gibi, fakat sayısal kullanıcı ve grup " +"kimliklerini listele\n" +" -N, --literal ham giriş adlarını yaz (işleme örn. özellikle\n" +" kontrol karakterleri)\n" +" -o -l gibi, fakat grup bilgisini listeleme\n" +" -p, --indicator-style=slash\n" +" ekle / bildirgeç dizinlere\n" -#: src/ls.c:4871 -#, fuzzy +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -5775,65 +5411,33 @@ msgid "" " literal, locale, shell, shell-always, c, " "escape\n" msgstr "" -" -q, --hide-control-chars grafik olmayan karakterler yerine ? çıktılar\n" -" --show-control-chars grafik olmayan karakterleri olduğu gibi " -"gösterir\n" -" (program 'ls' ve çıktı bir terminal değil ise\n" -" öntanımlı seçenek)\n" -" -Q, --quote-name çıktı adlarını çift tırnak içinde gösterir\n" -" --quoting-style=SÖZCÜK tırnaklama biçemi için SÖZCÜK'te belirtilen \n" -" değeri kullanır:\n" -" literal (olduğu gibi), locale (yerel),\n" -" shell (kabuk), \n" -" shell-always (her zaman kabuk), c (C dili), \n" -" escape (kaçış karakterli)\n" -#: src/ls.c:4881 -#, fuzzy +#: src/ls.c:4876 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 ters sıralar\n" -" -R, --recursive alt dizinleri çevrimli listeler\n" -" -s, --size -l ile her dosyanın boyutunu blok olarak\n" -" gösterir\n" +" -r, --reverse sıralarken düzeni koru\n" +" -R, --recursive alt dizinleri tekrarlamalı olarak listele\n" +" -s, --size bloklardaki her dosyanın ayrılmış boyutunu yaz\n" -#: src/ls.c:4886 -#, fuzzy +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" -msgstr "" -" -S dosya büyüklüğüne göre sıralar\n" -" --sort=SÖZCÜK sözcükte belirtilen değere göre sıralar: \n" -" extension -X (uzantı), none -U (boş), \n" -" size -S (büyüklük), time -t (zaman),\n" -" version -v (sürüm), status -c (durum)\n" -" time -t (değişim zamanı),\n" -" atime -u (erişim zaman damgası),\n" -" access -u (erişim zamanı),\n" -" use -u (kullanım zamanı)\n" -" --time=SÖZCÜK -l ile zamanı SÖZCÜKte belirtilen değer olarak\n" -" gösterir\n" -" atime (erişim zaman damgası), \n" -" access (erişim), use (kullanım zamanı), \n" -" ctime (dosya durum bilgisi değişim zamanı) veya\n" -" status (durum); eğer --sort=time belirtilmişse\n" -" seçilen zaman değerine göre sıralar.\n" - -#: src/ls.c:4896 -#, fuzzy +" as sort key if --sort=time (newest first)\n" +msgstr "" + +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -5846,58 +5450,33 @@ msgid "" " if STYLE is prefixed with 'posix-', STYLE\n" " takes effect only outside the POSIX locale\n" msgstr "" -" --time-style=BİÇEM zamanı BİÇEM biçeminde gösterir:\n" -" full-iso, long-iso, iso, locale, +BİÇEM\n" -" BİÇEM `date' gibi tanınır; eğer BİÇEM,\n" -" BİÇEM1BİÇEM2 şeklinde ise, BİÇEM1\n" -" eski dosyalara, BİÇEM2, yeni dosyalara " -"uygulanır\n" -" eğer BİÇEM'in başında posix- var ise, BİÇEM\n" -" yalnızca POSIX yerelinin haricinde geçerli " -"olur.\n" -" -t değişim zamanına göre sıralar\n" -" -T, --tabsize=SÜT öntanımlı 8 değeri yerine her SÜT değerinde\n" -" sekme olduğunu varsayar.\n" -#: src/ls.c:4908 +#: src/ls.c:4904 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:4912 -#, fuzzy +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" -" -u -lt ile: erişim zamanını gösterir ve buna göre\n" -" sıralar\n" -" -l ile: erişim zamanını gösterir ve isme göre\n" -" sıralar\n" -" tekbaşına: erişim zamanına göre sıralar\n" -" -U sıralamaz, girdileri dizin sırasına göre " -"gösterir\n" -" -v sürüme göre sıralar\n" -#: src/ls.c:4919 -#, fuzzy +#: src/ls.c:4915 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 security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" -" -w, --width=SÜTUN ekran genişliğini SÜTUNa ayarlar\n" -" -x girdileri satır olarak çıktılar, sütun değil\n" -" -X girdi sonekine göre alfabetik sıralar\n" -" -1 her satıra bir dosya olarak listeler\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5906,7 +5485,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5914,70 +5493,71 @@ msgid "" " 1 if minor problems (e.g., cannot access subdirectory),\n" " 2 if serious trouble (e.g., cannot access command-line argument).\n" msgstr "" +"\n" +"Durumların çıkışı:\n" +" 0 eğer TAMAM ise,\n" +" 1 eğer problemler küçükse (örn, alt dizinlere erişilemiyorsa),\n" +" 2 eğer problemler ciddiyse (örn, komut satırı argümanına erişilemiyorsa).\n" #. This is a proper name. See the gettext manual, section Names. #: src/md5sum.c:94 src/seq.c:39 -#, fuzzy msgid "Ulrich Drepper" -msgstr "Ulrich Drepper ve Scott Miller" +msgstr "Ulrich Drepper" #. This is a proper name. See the gettext manual, section Names. #: src/md5sum.c:95 msgid "Scott Miller" -msgstr "" +msgstr "Scott Miller" #. This is a proper name. See the gettext manual, section Names. #: src/md5sum.c:96 msgid "David Madore" -msgstr "" +msgstr "David Madore" #: src/md5sum.c:164 #, fuzzy, c-format 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 "" -"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" +"Kullanım: %s [SEÇENEK]... [DOSYA]...\n" +"Yazdır veya kontrol et %s (%d-bit) sağlama toplamlarını.\n" +"DOSYA yok veya DOSYA - ise,standart girişi oku.\n" +"\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" -#: src/md5sum.c:178 +#: src/md5sum.c:180 #, fuzzy -msgid " -b, --binary read in binary mode\n" -msgstr "" -"\n" -" -B, --binary konsol aygıtına yazarken ikilik yazma kullanır.\n" +msgid "" "\n" +" -b, --binary read in binary mode\n" +msgstr " binary veri için ikili G/Ç kullanır\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:195 -#, fuzzy +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -5988,116 +5568,103 @@ msgid "" " -w, --warn warn about improperly formatted checksum lines\n" "\n" msgstr "" -"Aşağıdaki iki seçenek sadece sağlama toplamlarını kontrol ederken işe " -"yarar:\n" -" --status çıktı vermez, durum kodu, başarı bilgisini verir\n" -" -w, --warn yanlış formatlı çemlenmiş sağlama toplam satırları " -"hakkında\n" -" uyarı verir\n" -"\n" -#: src/md5sum.c:206 -#, fuzzy, c-format +#: src/md5sum.c:209 +#, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" -"\n" -"Toplamlar %s'de belirtildiği gibi hesaplanır. Toplamlar kontrol edilirken,\n" -"girdi, bu yazılımdan önceden elde edilmiş bir çıktı olmalıdır. Öntanımlı\n" -"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:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: çok fazla sağlama satırı" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: yanlış biçemlenmiş %s sağlama satırı" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s:açma veya okuma BAŞARISIZ\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "BAŞARISIZ" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "Tamam" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, 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:629 -#, fuzzy, c-format +#: src/md5sum.c:632 +#, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" -msgstr[0] "%s: %: yanlış biçemlenmiş %s sağlama satırı" -msgstr[1] "%s: %: yanlış biçemlenmiş %s sağlama satırı" +msgstr[0] "" +msgstr[1] "" -#: src/md5sum.c:637 -#, fuzzy, c-format +#: src/md5sum.c:640 +#, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" -msgstr[0] "Uyarı: listelenmiş dosyanın % / % kısmı okunamadı" -msgstr[1] "Uyarı: listelenmiş dosyanın % / % kısmı okunamadı" +msgstr[0] "" +msgstr[1] "" -#: src/md5sum.c:645 -#, fuzzy, c-format +#: src/md5sum.c:648 +#, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "" -"UYARI: Hesaplanmış sağlamaların % / % kısmı eşleşmedi" msgstr[1] "" -"UYARI: Hesaplanmış sağlamaların % / % kısmı eşleşmedi" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 -#, fuzzy, c-format +#: src/md5sum.c:773 +#, 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ı" +msgstr "" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, 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:785 +#: src/md5sum.c:788 #, 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:792 +#: src/md5sum.c:795 #, 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:799 -#, fuzzy, c-format +#: src/md5sum.c:802 +#, 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ı" +msgstr "--quiet seçeneği sadece sağlamalar doğrulandığında anlam ifade eder" -#: src/md5sum.c:806 -#, fuzzy, c-format +#: src/md5sum.c:809 +#, 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ı" +msgstr "" #: src/mkdir.c:58 src/rmdir.c:164 #, c-format @@ -6105,24 +5672,15 @@ msgid "Usage: %s [OPTION]... DIRECTORY...\n" msgstr "Kullanım: %s [SEÇENEK]... DİZİN...\n" #: src/mkdir.c:59 -#, fuzzy msgid "Create the DIRECTORY(ies), if they do not already exist.\n" msgstr "" -"Eğer yoksa, ilgili DİZİN(ler)i oluşturur.\n" -"\n" #: src/mkdir.c:65 -#, fuzzy msgid "" " -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n" " -p, --parents no error if existing, make parent directories as needed\n" " -v, --verbose print a message for each created directory\n" msgstr "" -" -m, --mode=KİP izin kipini belirtir (chmod gibi), \n" -" rwxrwxrwx öntanımlı değer\n" -" -p, --parents eğer üst dizinler var ise hata vermeden \n" -" gerektiği şekilde üst dizinleri oluşturur\n" -" -v, --verbose oluşturulan her dizin için bir ileti çıktılar\n" #: src/mkdir.c:70 msgid "" @@ -6133,22 +5691,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 -#, fuzzy, c-format +#: src/mkdir.c:127 src/mkdir.c:160 +#, c-format msgid "failed to set default creation context for %s" -msgstr "%s'nın öznitelikleri alınamadı" +msgstr "" -#: src/mkdir.c:191 -#, fuzzy, c-format +#: src/mkdir.c:180 +#, c-format msgid "failed to restore context for %s" -msgstr "%s'in zaman damgaları korunamadı" +msgstr "" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "dizin %s oluşturuldu" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6160,19 +5718,15 @@ msgid "Usage: %s [OPTION]... NAME...\n" msgstr "Kullanımı: %s [SEÇENEK]... İSİM...\n" #: src/mkfifo.c:54 -#, fuzzy msgid "Create named pipes (FIFOs) with the given NAMEs.\n" msgstr "" -"İsimli veri yollarını (FIFO) belirtilen İSİM'lerle oluşturur.\n" -"\n" #: src/mkfifo.c:60 src/mknod.c:62 -#, fuzzy msgid "" " -m, --mode=MODE set file permission bits to MODE, not a=rw - umask\n" msgstr "" -" -m, --mode=KİP izin kipini belirtilen değere değiştirir\n" -" (chmod gibi) varsayılan değer: rw\n" +" -m, --mode=MODE dosya izin bitlerini a=rw - umask'a değil de MODE'a " +"ayarla\n" #: src/mkfifo.c:63 src/mknod.c:65 msgid "" @@ -6189,7 +5743,7 @@ msgstr "geçersiz kip" #: src/mkfifo.c:160 src/mknod.c:157 #, c-format msgid "mode must specify only file permission bits" -msgstr "" +msgstr "kip yalnızca dosya izin bitlerini belirlemeli" #: src/mkfifo.c:174 src/mknod.c:269 #, c-format @@ -6202,11 +5756,8 @@ 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:56 -#, fuzzy msgid "Create the special file NAME of the given TYPE.\n" msgstr "" -"Belirtilen TÜR'de belirtilen İSİM'de özel dosya oluşturur.\n" -"\n" #: src/mknod.c:72 msgid "" @@ -6276,12 +5827,12 @@ msgstr "geçersiz aygıt türü %s" #. This is a proper name. See the gettext manual, section Names. #: src/mktemp.c:36 msgid "Eric Blake" -msgstr "" +msgstr "Eric Blake" #: src/mktemp.c:66 -#, fuzzy, c-format +#, c-format msgid "Usage: %s [OPTION]... [TEMPLATE]\n" -msgstr "Kullanım: %s [SEÇENEK]... [DOSYA]\n" +msgstr "Kullanım: %s [SEÇENEK]... [ŞABLON]\n" #: src/mktemp.c:67 msgid "" @@ -6327,16 +5878,16 @@ msgid "" msgstr "" #: src/mktemp.c:210 -#, fuzzy, c-format +#, c-format msgid "too many templates" -msgstr "çok fazla tekrar eden satır" +msgstr "çok fazla şablon" #: src/mktemp.c:230 #, c-format msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" @@ -6344,37 +5895,33 @@ msgstr "" #: src/mktemp.c:260 #, c-format msgid "too few X's in template %s" -msgstr "" +msgstr "%s şablonunda çok az X var" #: src/mktemp.c:276 #, c-format msgid "invalid template, %s, contains directory separator" -msgstr "" +msgstr "geçersiz şablon, %s dizin ayracı içeriyor" #: src/mktemp.c:290 #, c-format msgid "invalid template, %s; with --tmpdir, it may not be absolute" -msgstr "" +msgstr "geçersiz şablon, %s; --tmpdir ile mutlak olmayabilir" #: src/mktemp.c:311 -#, fuzzy, c-format +#, c-format msgid "failed to create directory via template %s" -msgstr "%s dizini oluşturulamıyor" +msgstr "şablon üzerinden dizin oluşturma başarısız %s" #: src/mktemp.c:322 -#, fuzzy, c-format +#, c-format msgid "failed to create file via template %s" -msgstr "%s'in zaman damgaları korunamadı" +msgstr "şablon üzerinden dosya oluşturma başarısız %s" #: src/mv.c:294 -#, fuzzy msgid "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n" msgstr "" -"KAYNAK'ı HEDEF olarak yeniden adlandırır veya KAYNAK'ları DİZİN'e taşır.\n" -"\n" #: src/mv.c:300 -#, fuzzy msgid "" " --backup[=CONTROL] make a backup of each existing destination " "file\n" @@ -6386,33 +5933,27 @@ msgid "" "If you specify more than one of -i, -f, -n, only the final one takes " "effect.\n" msgstr "" -" --backup[=KONTROL] mevcut her hedef dosyanın bir yedeğini alır.\n" -" -b --backup gibi ama argüman almaz.\n" -" -f, --force üzerine yazmadan önce sormaz\n" -" --reply=yes ile aynı\n" -" -i, --interactive üzerine yazmadan önce sorar\n" -" --reply=query ile aynı\n" +" --backup[=CONTROL] var olan her bir yedek dosyanın yedeğini al\n" +" -b --backup gibi, fakat bir değişkene erişmez\n" +" -f, --force üzerine yazmadan önce sorgulama\n" +" -i, --interactive üzerine yazmadan önce sorgula\n" +" -n, --no-clobber var olan dosyanın üzerine yazma\n" +"Eğer -i, -f, -n'nin birden fazlasını belirtmişsen, sadece son olan etki " +"eder.\n" #: src/mv.c:309 -#, fuzzy msgid "" " --strip-trailing-slashes remove any trailing slashes from each " "SOURCE\n" " argument\n" " -S, --suffix=SUFFIX override the usual backup suffix\n" msgstr "" -" --reply={yes,no,query} mevcut bir hedef dosya için sorgulamanın " -"nasıl\n" -" yapılacağını ayarlar: \n" -" yes=evet, no=hayır, query=sor\n" -" --strip-trailing-slashes bütün KAYNAK argümanlarının sonundan " -"kesmeleri\n" -" (/) kaldırır\n" -" -S, --suffix=SONEK öntanımlı sonek yerine SONEK değerini " -"kullanır.\n" +" --strip-trailing-slashes herbir SOURCE argümanından izleyen " +"kesintileri\n" +" geri al\n" +" -S, --suffix=SUFFIX olağan yedek ön ekleri üzerine yaz\n" #: src/mv.c:314 -#, fuzzy msgid "" " -t, --target-directory=DIRECTORY move all SOURCE arguments into " "DIRECTORY\n" @@ -6424,13 +5965,6 @@ msgid "" " -Z, --context set SELinux security context of destination\n" " file to default type\n" msgstr "" -" -t, --target-directory=DİZİN bütün KAYNAK argümanlarını DİZİN'e taşır\n" -" -T, --no-target-directory HEDEF'i normal bir dosya kabul eder\n" -" -u, --update taşıma işlemini yalnızca KAYNAK dosyası\n" -" hedeften daha yeni ise, veya hedef dosya " -"yok\n" -" ise yapar\n" -" -v, --verbose ne yapıldığını anlatır\n" #: src/nice.c:72 #, c-format @@ -6438,27 +5972,21 @@ msgid "Usage: %s [OPTION] [COMMAND [ARG]...]\n" msgstr "Kullanımı: %s [SEÇENEK] [KOMUT [ARG]...]\n" #: src/nice.c:73 -#, fuzzy, c-format +#, c-format msgid "" "Run COMMAND with an adjusted niceness, which affects process scheduling.\n" "With no COMMAND, print the current niceness. Niceness values range from\n" "%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" -"%d (en yüksek öncelik) ve %d (en düşük öncelik) arasında değişir.\n" -"\n" -" -n, --adjustment=AYAR AYAR değerini şimdiki öncelik değerine ekler\n" -" (öntanımlı 10)\n" #: 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 +#, c-format msgid "invalid adjustment %s" -msgstr "`%s' geçersiz ayar" +msgstr "geçersiz ayar %s" #: src/nice.c:181 #, c-format @@ -6466,30 +5994,23 @@ msgid "a command must be given with an adjustment" msgstr "komut ayarlama ile birlikte verilmeli" #: src/nice.c:188 src/nice.c:199 -#, fuzzy, c-format +#, c-format msgid "cannot get niceness" -msgstr "sistem ismi alınamadı" +msgstr "nice değeri alınamıyor" #: src/nice.c:205 -#, fuzzy, c-format +#, c-format msgid "cannot set niceness" -msgstr "tarih ayarlanamadı" +msgstr "nice değeri ayarlanamıyor" #. This is a proper name. See the gettext manual, section Names. #: src/nl.c:40 msgid "Scott Bartram" -msgstr "" +msgstr "Scott Bartram" #: src/nl.c:179 -#, fuzzy -msgid "" -"Write each FILE to standard output, with line numbers added.\n" -"With no FILE, or when FILE is -, read standard input.\n" +msgid "Write each FILE to standard output, with line numbers added.\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:186 msgid "" @@ -6503,7 +6024,6 @@ msgstr "" " -f, --footer-numbering=TARZ altyazıları TARZ tarzında numaralandırır\n" #: src/nl.c:191 -#, fuzzy msgid "" " -h, --header-numbering=STYLE use STYLE for numbering header lines\n" " -i, --line-increment=NUMBER line number increment at each line\n" @@ -6514,24 +6034,16 @@ msgid "" "pages\n" " -s, --number-separator=STRING add STRING after (possible) line number\n" msgstr "" -" -h, --header-numbering=TARZ üstyazıları TARZ tarzında numaralandırır\n" -" -i, --page-increment=SAYI satır numarası artış miktarı\n" -" -l, --join-blank-lines=SAYI SAYI kadar boş satır grubunu bir satır " -"olarak\n" -" okur\n" -" -n, --number-format=FORMAT satır numaralarını FORMAT şeklinde yazar\n" -" -p, --no-renumber yeni mantıksal sayfaya başladığında satır\n" -" 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:199 -#, fuzzy msgid "" " -v, --starting-line-number=NUMBER first line number on each logical page\n" " -w, --number-width=NUMBER use NUMBER columns for line numbers\n" msgstr "" -" -v, --first-page=SAYI her mantıksal sayfanın ilk satır numarası\n" -" -w, --number-width=SAYI satır numarası genişliğini SAYI yapar\n" +" -v, --starting-line-number=NUMBER her mantıksal sayfadaki ilk satır " +"numarası\n" +" -w, --number-width=NUMBER satır numaraları için NUMBER sütünlarını " +"kullan\n" #: src/nl.c:205 msgid "" @@ -6549,7 +6061,6 @@ msgstr "" "TARZ, aşağıdaki değerlerden biri olarak belirtilmelidir: \n" #: src/nl.c:211 -#, fuzzy msgid "" "\n" " a number all lines\n" @@ -6566,18 +6077,17 @@ msgid "" "\n" msgstr "" "\n" -" a bütün satırları numaralandırır\n" -" t sadece boş olmayan satırları numaralandırır\n" -" n hiç bir satırı numaralandırmaz\n" -" pDÜZİF sadece DÜZİF düzenli ifadesi ile eşleşen satırları " -"numaralandırır\n" -" (DÜZİF: düzenli ifade = regular expression) \n" +" a satır sayısı\n" +" t sadece boş olmayan satır sayısıları\n" +" n satırsız sayılar\n" +" pBRE sadece temel düzenli bir ifade ile eşleşen satırların sayısı\n" +" BRE\n" "\n" -"FORMAT aşağıdakilerden biri olabilir:\n" +"FORMAT şunlardan biridir:\n" "\n" -" ln sola dayalı yazdırır, numaraların başlarına sıfır koymaz\n" -" rn sağa dayalı yazdırır, numaraların başlarına sıfır koymaz\n" -" rz sağa dayalı yazdırır, numaraların başlarına sıfır koyar\n" +" ln sola dayalı, başlama sıfırları yok\n" +" rn sağa dayalı, başlama sıfırları yok\n" +" rz sağa dayalı, başlama sıfırlı\n" "\n" #: src/nl.c:278 @@ -6600,27 +6110,27 @@ msgstr "geçersiz gövde numaralama tarzı: %s" msgid "invalid footer numbering style: %s" msgstr "geçersiz altbilgi numaralama tarzı: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "geçersiz başlangıç satır numarası: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "geçersiz satır numarası artışı: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "geçersiz boş satır sayısı: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "geçersiz satır numarası alan genişliği: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "geçersiz satır numaralama biçemi: %s" @@ -6646,58 +6156,57 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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 -#, fuzzy, c-format +#, c-format msgid "failed to render standard input unusable" -msgstr "standart çıktı yeniden yönlendirilemedi" +msgstr "" -#: src/nohup.c:131 -#, fuzzy, c-format +#: src/nohup.c:129 +#, c-format msgid "ignoring input" -msgstr "argümanların tamamı yoksayılıyor" +msgstr "girdi gözardı ediliyor" -#: src/nohup.c:175 -#, fuzzy, c-format +#: src/nohup.c:173 +#, c-format msgid "ignoring input and appending output to %s" -msgstr "çıktı, %s'nin sonuna ekleniyor" +msgstr "girdi gözardı ediliyor ve çıktı %s e ekleniyor" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "çıktı, %s'nin sonuna ekleniyor" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "standart hatanın kopyası, exec sonunda kapanmaya ayarlanamadı" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" -msgstr "" +msgstr "girdi gözardı ediliyor ve stderr stdout'a gönderiliyor" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" -msgstr "" +msgstr "stderr stdout'a gönderiliyor" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" -msgstr "" +msgstr "Giuseppe Scrivano" #: src/nproc.c:57 src/pwd.c:56 src/tty.c:64 src/uname.c:120 src/whoami.c:44 #, c-format @@ -6717,96 +6226,93 @@ msgid "" " --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: geçersiz satır sayısı" - #. This is a proper name. See the gettext manual, section Names. -#: src/numfmt.c:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 -#, fuzzy, c-format +#: src/numfmt.c:690 +#, c-format msgid "value too large to be converted: %s" -msgstr "%s: değer tamamen dönüştürülmedi" +msgstr "" -#: src/numfmt.c:663 -#, fuzzy, c-format +#: src/numfmt.c:694 +#, c-format msgid "invalid number: %s" -msgstr "geçersiz sayı %s" +msgstr "geçersiz sayı: %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 -#, fuzzy, c-format +#: src/numfmt.c:702 +#, c-format msgid "invalid suffix in input: %s" -msgstr "geçersiz girdi bayrağı: %s" +msgstr "" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 -#, fuzzy, c-format +#: src/numfmt.c:753 src/numfmt.c:805 +#, c-format msgid "failed to prepare value '%Lf' for printing" -msgstr "%s: yazmak için açılamadı" +msgstr "" -#: src/numfmt.c:791 -#, fuzzy, c-format +#: src/numfmt.c:854 +#, c-format msgid "invalid unit size: %s" -msgstr "geçersiz sekme boyutu: %s" +msgstr "geçersiz birim boyutu: %s" -#: src/numfmt.c:814 -#, fuzzy, c-format +#: src/numfmt.c:880 +#, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" -msgstr "Kullanımı: %s [SEÇENEK]... [KULLANICI]...\n" +msgstr "" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6814,19 +6320,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -6836,40 +6342,40 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" msgstr "" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6878,7 +6384,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -6886,7 +6392,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -6894,7 +6400,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -6902,7 +6408,28 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Şunların herbirinin sırası:\n" +"\n" +" N N. bayt, karakter veya alan, 1'den hesaplandı\n" +" N- N. bayt, karakter veya alandan satırın sonuna kadar\n" +" N-M N.'den M.'ye kadar bayt, karakter veya alan dahil\n" +" -M Birinciden M.'ye kadar, bayt, karakter ve alan dahil\n" +"\n" +"FILE yok ile veya FILE standart okuma girişi olduğunda.\n" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -6911,9 +6438,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -6925,7 +6453,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -6940,118 +6468,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 -#, fuzzy, c-format +#: src/numfmt.c:1053 src/seq.c:228 +#, c-format msgid "format %s has no %% directive" -msgstr "hedef %s bir dizin değil" +msgstr "%s biçimi %% talimatına sahip değil" -#: src/numfmt.c:1003 -#, fuzzy, c-format +#: src/numfmt.c:1080 +#, c-format msgid "invalid format %s (width overflow)" -msgstr "geçersiz biçem genişliği" +msgstr "" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" -msgstr "" +msgstr "%s biçimi %%'de biter" + +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "geçersiz kesinlik: %s" -#: src/numfmt.c:1030 +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" -msgstr "" +msgstr "%s biçimi çok fazla %% yönergesine sahip" -#: src/numfmt.c:1081 -#, fuzzy, c-format +#: src/numfmt.c:1177 +#, c-format msgid "invalid suffix in input %s: %s" -msgstr "geçersiz girdi bayrağı: %s" +msgstr "" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, c-format -msgid "input line is too short, no numbers found to convert in field %ld" +msgid "invalid field value %s" msgstr "" -#: src/numfmt.c:1403 -#, fuzzy, c-format +#: src/numfmt.c:1631 +#, c-format msgid "invalid padding value %s" -msgstr "`%s' geçerli bir zaman dizgesi değil" +msgstr "" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "geçersiz alan numarası: %s" +msgid "multiple field specifications" +msgstr "%s: geçersiz alan belirlenimi %s" -#: src/numfmt.c:1447 -#, fuzzy, c-format +#: src/numfmt.c:1677 +#, c-format msgid "invalid header value %s" -msgstr "geçersiz başlık numaralama tarzı: %s" +msgstr "" -#: src/numfmt.c:1473 -#, fuzzy, c-format +#: src/numfmt.c:1704 +#, c-format msgid "--grouping cannot be combined with --format" -msgstr "Dosya işleyenleri --files0-from ile birleştirilemez" +msgstr "" -#: src/numfmt.c:1478 -#, fuzzy, c-format +#: src/numfmt.c:1709 +#, c-format msgid "no conversion option specified" -msgstr "süreç kimliği belirtilmemiş" +msgstr "" -#: src/numfmt.c:1486 -#, fuzzy, c-format +#: src/numfmt.c:1717 +#, c-format msgid "grouping cannot be combined with --to" -msgstr "Dosya işleyenleri --files0-from ile birleştirilemez" +msgstr "" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 -#, fuzzy, c-format +#: src/numfmt.c:1757 +#, c-format msgid "error reading input" -msgstr "%s'i okunurken hata" +msgstr "" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7064,14 +6604,13 @@ msgstr "" "veya: %s --traditional [SEÇENEK] [DOSYA] [[+]GÖRELİ[.][b] [[+]ETİKET]][.]" "[b]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "DOSYA'yı, (hiçbir seçenek belirtilmediğinde sekizlik sayı sisteminde), \n" @@ -7079,9 +6618,9 @@ msgstr "" "standart girdiden okur.\n" "\n" -#: src/od.c:333 -#, fuzzy +#: src/od.c:335 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" @@ -7089,28 +6628,8 @@ msgid "" "For OFFSET and LABEL, a 0x or 0X prefix indicates hexadecimal;\n" "suffixes may be . for octal and b for multiply by 512.\n" msgstr "" -"\n" -"Eğ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:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7119,8 +6638,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 -#, fuzzy +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -7132,17 +6650,8 @@ msgid "" " 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" -" yazdırır.\n" -" -t, --format=FORMAT çıktı formatını FORMAT olarak belirler\n" -" -v, --output-duplicates birbirinin aynı art arda gelen satırları * \n" -" kullanmadan yazar\n" -" -w, --width[=BAYT] her satıra BAYT bayt yazar\n" -" --traditional geleneksel formda argüman kabul eder\n" -#: src/od.c:363 -#, fuzzy +#: src/od.c:366 msgid "" "\n" "\n" @@ -7152,16 +6661,8 @@ msgid "" " -c same as -t c, select printable characters or backslash escapes\n" " -d same as -t u2, select unsigned decimal 2-byte units\n" msgstr "" -"\n" -"Geleneksel formatlar karışık kullanılabilir:\n" -" -a veya -t a , isimli karakterleri seçer (isimli karakterlerin [named\n" -" characters] ne olduğunu öğrenmek için : man od)\n" -" -b veya -t o1, sekizlik baytlar seçer\n" -" -c veya -t c, ASCII karakterleri ve terskesmeyle belirtilmiş kaçış\n" -" karakterlerini seçer\n" -" -d veya -t u2, işsaretsiz (unsigned) ondalık kısa sayıları seçer\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7176,7 +6677,7 @@ 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:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -7185,7 +6686,7 @@ msgid "" " c printable character or backslash escape\n" msgstr "" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7201,8 +6702,7 @@ msgstr "" " için SAYI bayt kullanır\n" " x[SAYI] 16lik sayı olarak yazar, her sayı için SAYI bayt kullanır\n" -#: src/od.c:394 -#, fuzzy +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -7210,23 +6710,15 @@ msgid "" "sizeof(long). If TYPE is f, SIZE may also be F for sizeof(float), D\n" "for sizeof(double) or L for sizeof(long double).\n" msgstr "" -"\n" -"SAYI yerine genelde bir sayı yazılır ( örnek : od -t d1 ), ancak \n" -"FORMAT d,o,u,x den biri olduğunda SAYI yerine sizeof(char) anlamına gelen\n" -"C, sizeof(short) anlamına gelen S veya sizeof(long) anlamana gelen L de\n" -"gelebilir. Eğer FORMAT f ise, SAYI yerine sizeof(float) anlamına gelen\n" -"F, sizeof(double) anlamına gelen D veya sizeof(long double) anlamına\n" -"gelen L de gelebilir.\n" -#: src/od.c:401 +#: src/od.c:404 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:406 -#, fuzzy +#: src/od.c:409 msgid "" "\n" "\n" @@ -7238,68 +6730,62 @@ msgid "" " M 1024*1024\n" "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" -#: src/od.c:680 src/od.c:800 -#, fuzzy, c-format +#: src/od.c:683 src/od.c:803 +#, c-format msgid "invalid type string %s" -msgstr "geçersiz format `%s'" +msgstr "geçersiz biçim `%s'" -#: src/od.c:690 -#, fuzzy, c-format +#: src/od.c:693 +#, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte integral type" msgstr "" -"geçersiz format `%s';\n" +"geçersiz biçim `%s';\n" "bu sistem, yerleşik %lu baytlık tamsayı türü desteklemiyor" -#: src/od.c:811 -#, fuzzy, c-format +#: src/od.c:814 +#, c-format msgid "" "invalid type string %s;\n" "this system doesn't provide a %lu-byte floating point type" msgstr "" -"geçersiz format `%s';\n" +"geçersiz biçim `%s';\n" "bu sistem %lu baytlık bir kayan ondalık (floating point) türü desteklemiyor" -#: src/od.c:869 -#, fuzzy, c-format +#: src/od.c:872 +#, c-format msgid "invalid character '%c' in type string %s" -msgstr "format `%2$s' içinde geçersiz `%1$c' karakteri" +msgstr "" -#: src/od.c:1094 +#: src/od.c:1105 #, 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:1650 -#, fuzzy, c-format +#: src/od.c:1658 +#, 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ı" +msgstr "" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "dizgeler çıktılanırken tür belirtilemez" -#: src/od.c:1863 -#, fuzzy +#: src/od.c:1871 msgid "compatibility mode supports at most one file" -msgstr "Eski kullanım kipi en fazla bir dosya destekler." +msgstr "uyumluluk kipi en fazla bir dosyayı destekler" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "atlanacak baytlar + okunacak baytlar çok büyük" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "uyarı: geçersiz genişlik %lu; %d kullanılıyor" @@ -7315,16 +6801,10 @@ 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" 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:447 msgid "" @@ -7338,7 +6818,7 @@ msgstr "" #: src/paste.c:508 #, c-format msgid "delimiter list ends with an unescaped backslash: %s" -msgstr "" +msgstr "sınırlayıcı listesi kabul edilmeyen ters eğik çizgi ile bitiyor: %s" #: src/pathchk.c:90 msgid "" @@ -7348,6 +6828,11 @@ msgid "" " -P check for empty names and leading \"-\"\n" " --portability check for all POSIX systems (equivalent to -p -P)\n" msgstr "" +"Geçersiz veya taşınamayan dosya adlarını teşhis et.\n" +"\n" +" -p Çoğu POSIX sistemleri kontrol et\n" +" -P boş adları ve \"-\" li olanları kontrol et\n" +" --portability -p -P'ye eşdeğer bütün POSIX sistemleri kontrol et\n" #: src/pathchk.c:170 #, c-format @@ -7359,11 +6844,10 @@ msgstr "" msgid "nonportable character %s in file name %s" msgstr "%2$s dosya adında taşınmaz karakter %1$s bulundu" -# #: src/pathchk.c:272 -#, fuzzy, c-format +#, c-format msgid "empty file name" -msgstr "normal boş dosya" +msgstr "boş dosya adı" #: src/pathchk.c:314 #, c-format @@ -7382,24 +6866,23 @@ msgstr "%1$lu limiti, %3$s dosya adı bileşeninin %2$lu uzunluğu ile aşıldı #. This is a proper name. See the gettext manual, section Names. #: src/pinky.c:36 src/uptime.c:45 src/users.c:35 src/who.c:48 -#, fuzzy msgid "Joseph Arceneaux" -msgstr "Joseph Arceneaux ve David MacKenzie" +msgstr "Joseph Arceneaux" #. This is a proper name. See the gettext manual, section Names. #: src/pinky.c:38 src/uptime.c:47 msgid "Kaveh Ghazi" -msgstr "" +msgstr "Kaveh Ghazi" #. TRANSLATORS: Real name is unknown; at most 19 characters. #: src/pinky.c:242 msgid " ???" -msgstr "" +msgstr " ???" #. TRANSLATORS: Idle time is unknown; at most 5 characters. #: src/pinky.c:266 msgid "?????" -msgstr "" +msgstr "?????" #: src/pinky.c:314 #, c-format @@ -7460,12 +6943,12 @@ msgstr " zaman" msgid "Where" msgstr " yer" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Kullanımı: %s [SEÇENEK]... [KULLANICI]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7481,7 +6964,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:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7497,115 +6980,105 @@ msgstr "" "zamanını\n" " göstermez\n" -#: src/pinky.c:513 -#, fuzzy, c-format +#: src/pinky.c:512 +#, c-format msgid "" "\n" "A lightweight 'finger' program; print user information.\n" "The utmp file will be %s.\n" msgstr "" -"\n" -"Basit bir`finger' uygulaması; kullanıcı bilgilerini gösterir.\n" -"utmp dosyası olarak %s kullanılacaktır.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" "kullanıcı adı belirtilmemiş; -l kullanırken en az bir tane belirtilmeli" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" -msgstr "" +msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 -#, fuzzy +#: src/pr.c:332 msgid "Roland Huebner" -msgstr "Pete TerMaat ve Roland Huebner" +msgstr "Roland Huebner" -#: src/pr.c:908 -#, fuzzy, c-format +#: src/pr.c:905 +#, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" -msgstr "`--pages=İLK_SAYFA[:SON_SAYFA]' argüman eksik" +msgstr "" -#: src/pr.c:910 -#, fuzzy, c-format +#: src/pr.c:907 +#, c-format msgid "invalid page range %s" -msgstr "Geçersiz sayfa aralığı `%s'" +msgstr "geçersiz sayfa genişliği %s" -#: 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:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" +msgstr "geçersiz satır sayısı" -#: 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:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" +msgstr "geçersiz başlangıç satır numarası: %s" -#: 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:986 +msgid "'-o MARGIN' invalid line offset" +msgstr "" -#: 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:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" +msgstr "geçersiz bayt sayısı" -#: 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:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" +msgstr "geçersiz bayt sayısı" -#: src/pr.c:1096 -#, fuzzy, c-format +#: src/pr.c:1059 +#, c-format msgid "cannot specify number of columns when printing in parallel" -msgstr "Paralel yazdırma yapılırken sütun sayısı belirtilemez." +msgstr "paralelde yazılırken sütün sayıları belirtilemez" -#: src/pr.c:1100 -#, fuzzy, c-format +#: src/pr.c:1063 +#, c-format msgid "cannot specify both printing across and printing in parallel" -msgstr "Hem paralel yazım, hem altalta yazım yapılamaz." +msgstr "paralelde ve karşılıklı yazılırken belirtilemez" -#: src/pr.c:1196 -#, fuzzy, c-format +#: src/pr.c:1166 +#, 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'" +msgstr "" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "sayfa genişliği çok dar" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" "başlangıç sayfa numarası % sayfa sayısı % değerini aşıyor" -#: src/pr.c:2380 -#, fuzzy, c-format +#: src/pr.c:2350 +#, c-format msgid "page number overflow" -msgstr "Sayfa numarası taşması" +msgstr "taşan sayfa sayısı" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Sayfa %" -#: src/pr.c:2757 -#, fuzzy +#: src/pr.c:2727 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:2763 -#, fuzzy +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7614,16 +7087,8 @@ msgid "" " unless -a is used. Balance number of lines in the\n" " columns on each page\n" msgstr "" -" +ILK_SAYFA[:SON_SAYFA], --pages=ILK_SAYFA[:SON_SAYFA]\n" -" yazmaya ILK_SAYFA'dan başlar (SON_SAYFA \n" -" belirtilmişse SON_SAYFA'da durur)\n" -" -SÜTUN, -columns=SÜTUN\n" -" yazıyı SÜTUN sütuna ayırır , ve -a seçeneği \n" -" verilmemişse sütunları yukardan aşağı yazar. \n" -" Her sayfada tüm sütunların satır sayılarını \n" -" aynı yapar\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7640,7 +7105,7 @@ msgstr "" " -d, --double-space\n" " çift aralık bırakarak yazar\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7661,8 +7126,7 @@ msgstr "" " yenisatır karakteri yerine (\\n) formfeed (\\f) \n" " karakteri kullanarak sayfaları ayırır\n" -#: src/pr.c:2789 -#, fuzzy +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7674,45 +7138,45 @@ msgid "" "column\n" " alignment, --sep-string[=STRING] sets separators\n" msgstr "" -" -h BASLIK, --header=BASLIK\n" -" Başlık olarak dosya ismi yerine BASLIK'ı\n" -" kullanır ( başlık ortalanarak yazılır),\n" -" -h \"\" boş bir satır yazar, -h\"\" kullanmayın\n" -" -i[KAR[GEN]], --output-tabs[=KAR[GEN]]\n" -" boşluk gördüğü yere GEN tane KAR koyar. GEN belirtil-\n" -" mediğinde 8 , KAR belirtilmediğinde TAB\n" -" kullanır\n" -" -J, --join-lines birden fazla kolondan oluşan çıktılarda \n" -" kolonları birleştirip bir satır oluşturur\n" -" -W seçeneğinin satırları kısaltmasına izin vermez,\n" -" kolonları hizalamaz, --sep-string[=KAR] ayraçları\n" -" belirler\n" - -#: src/pr.c:2798 +" -h, --header=HEADER\n" +" sayfa başında dosya adı yerine ortada HEADER kullan,\n" +" -h \"\" boş bir satır yazar, -h\"\" kullanma\n" +" -i[CHAR[WIDTH]], --output-tabs[=CHAR[WIDTH]]\n" +" boşlukları WIDTH (8) sekmesine CHARs (TABs) ile " +"yerleştir \n" +" -J, --join-lines tüm satırları birleştir, -W satır kesmesini kapat, " +"sütün\n" +" dizisi yok, --sep-string[=STRING] ayıraçları ayarla\n" + +#: src/pr.c:2769 #, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l, --length=PAGE_LENGTH\n" +" sayfa uzunluğunu PAGE_LENGTH (66) satıra ayarla\n" +" (yazının satırının var olan sayısı 56 ve-F ile 63)\n" +" -m, --merge bütün dosyaları paralelde yaz, her bir sütün bir,\n" +" satırları kes, fakat -J ile tüm uzunluğun satırlarını " +"gir\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" -" -l SAYFA_UZUNLUGU, --length=SAYFA_UZUNLUGU\n" -" sayfa uzunluğunu SAYFA_UZUNLUGU yapar. Bu seçenek " -"kullanıl-\n" -" madıkca sayfa uzunluğu 56 satırdır. -F seçeneği " -"kullanıl-\n" -" dığında sayfa uzunluğu 63 tür.\n" -" -m, --merge tüm dosyaları yan yana yazar, her biri bir kolona, çok " -"uzun\n" -" satırları keser, ve yan yana gelen kolonlar tam bir " -"satır\n" -" oluşturuyorlarsa, onları da büyük tek bir kolonda " -"toplar \n" -" ( -J deki gibi)\n" - -#: src/pr.c:2805 -#, fuzzy +" -l, --length=PAGE_LENGTH\n" +" sayfa uzunluğunu PAGE_LENGTH (66) satıra ayarla\n" +" (yazının satırının var olan sayısı 56 ve-F ile 63)\n" +" -m, --merge bütün dosyaları paralelde yaz, her bir sütün bir,\n" +" satırları kes, fakat -J ile tüm uzunluğun satırlarını " +"gir\n" + +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7721,19 +7185,16 @@ msgid "" " start counting with NUMBER at 1st line of first\n" " page printed (see +FIRST_PAGE)\n" msgstr "" -" -n[AYIR[SAY]], --number-lines[=AYIR[SAY]]\n" -" satırları SAY basamak kullanarak numaralandırır\n" -" ve satır numarasını satırdan AYIR ile ayırır. (AYIR \n" -" belirtilmediğinde TAB kullanır, SAY belirtilmediğinde \n" -" 5 kullanır)\n" -" -N SAYI, --first-line-number=SAYI\n" -" satır numaralandırmaya SAYI'dan başlar(örnek: pr -N 5 " -"ilk\n" -" satıra 5 , ikinci satıra 6,... numaralarını verir)\n" -" (+ILK_SAYFA seçeneğine de bakınız)\n" - -#: src/pr.c:2813 -#, fuzzy +" -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" +" satır sayısı, DIGITS (5) digitleri kullan, sonra SEP " +"(TAB),\n" +" mevcut sayıcı giriş dosyasının 1. satırından başlar\n" +" -N, --first-line-number=NUMBER\n" +" yazılan ilk sayfanın 1. satırından NUMBER ile saymaya " +"başlar\n" +" (+FIRST_PAGE'e bakınız)\n" + +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7741,15 +7202,14 @@ msgid "" " -r, --no-file-warnings\n" " omit warning when a file cannot be opened\n" msgstr "" -" -o KENAR, --indent=KENAR\n" -" her sayfanın başında KENAR boşluk bırakır. Bu seçenek\n" -" -w veya -W yu etkilemez, bırakılan boşluk \n" -" SAYFA_GENISLIGI'ne eklenir\n" +" -o, --indent=MARGIN\n" +" her satırı MARGIN (sıfır) boşluklar ile eşleştir, -w " +"veya -W'ye\n" +" etki etme, MARGIN, PAGE_WIDTH'e eklenecek\n" " -r, --no-file-warnings\n" -" belirtilen dosyayı açamadığında hata mesajı vermez\n" +" eğer bir dosya açılamazsa uyarıyı geç\n" -#: src/pr.c:2820 -#, fuzzy +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -7759,30 +7219,23 @@ msgid "" " -s[CHAR] turns off line truncation of all 3 column\n" " options (-COLUMN|-a -COLUMN|-m) except -w is set\n" msgstr "" -" -s[KAR], --seperator[=KAR]\n" -" kolonları tek bir karakterle (KAR) ayır, bu seçenek\n" -" kullanılmadığında kolonlar TAB ile ayrılır. Bu seçenek\n" -" diğer hiçbir seçeneğin satırları kısaltmasına\n" -" izin vermez\n" -#: src/pr.c:2828 -#, fuzzy +#: src/pr.c:2802 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" -" kolonları DIZI ile ayır. DIZI'yi \"\" isaretleri\n" -" arasında yazmayın. DIZI belirtilmediğinde kolonları \n" -" birbirinden ayırmaz\n" -" bu seçenek diğer kolon seçeneklerini etkilemez\n" -" -t, --omit-header sayfalara başlık ve bitiş koymaz\n" -#: src/pr.c:2835 -#, fuzzy +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7796,22 +7249,17 @@ msgid "" "(72)\n" msgstr "" " -T, --omit-pagination\n" -" dosyaları sayfalandırmaz, başlık ve bitiş koymaz\n" +" sayfa başlıklarını ve alt bilgilerini atla, giriş " +"dosyalarında form \n" +" alan tarafından ayarlanan herhangi sayfalandırmaya ele\n" " -v, --show-nonprinting\n" -" sekizli terskesik notasyonunu kullanarak ekranda\n" -" normalde gözükmeyecek karakterleri de yazar\n" -" -w SAYFA_GENISLIGI, --width=SAYFA_GENISLIGI\n" -" sayfa genişliğini birden fazla kolon olan çıktılar için\n" -" SAYFA_GENISLIGI yapar. Sayfa genişliği -w kullanıl-\n" -" madığında 72 dir. -s[KAR] seçeneği kullanıldığında " -"sayfa\n" -" genişliği otomatik olarak 72 olmaz. Hem -s seçeneğini\n" -" kullanmak hem de sayfa genişliğinin ayarlı olmasını " -"istiyor-\n" -" sanız -w seçeneğini mutlaka kullanın\n" - -#: src/pr.c:2845 -#, fuzzy +" sekizli sola eğik çizgiyi kullan\n" +" -w, --width=PAGE_WIDTH\n" +" sayfa genişliğini PAGE_WIDTH (72) karakter olarak " +"ayarla.\n" +" çoklu yazı sütun çıkışı sadece -s[char] (72) kapatır\n" + +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7819,43 +7267,24 @@ msgid "" "interference\n" " with -S or -s\n" msgstr "" -" -W SAYFA_GENISLIGI, --page-width=SAYFA_GENISLIGI\n" -" sayfa genişliğini her çeşit çıktı için SAYFA_GENISLIGI\n" -" yapar( -W kullanılmadığında sayfa genişliği 72'dir ). -" -"J \n" -" seçeneği belirtilmedikçe uzun satırları keser. Bu " -"seçenek\n" -" ve -s ,-S seçenekleri birbirlerini etkilemezler\n" - -#: src/pr.c:2853 -#, fuzzy -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"DOSYA verilmemişse veya DOSYA - ise, standart girdi okunur.\n" +" -W, --page-width=PAGE_WIDTH\n" +" sayfa genişliğini PAGE_WIDTH (72) karakter daima,\n" +" satırları daima -J seçeneği hariç kes. -S veya -s " +"engeli\n" +" yok\n" #: src/printenv.c:62 -#, fuzzy, c-format +#, 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 "" -"Kullanımı: %s [DEĞİŞKEN]...\n" -" veya: %s SEÇENEK\n" -"Çevre DEĞİŞKENi verilmezse tümünü listeler.\n" -"\n" #: src/printenv.c:69 -#, fuzzy msgid " -0, --null end each output line with NUL, not newline\n" msgstr "" -" -z, --zero-terminated satırları satır-sonu karakteri (\\n) \n" -" yerine 0'la (0 baytı) bitirir\n" #: src/printf.c:79 #, c-format @@ -7873,44 +7302,30 @@ msgstr "" " veya: %s SEÇENEK\n" #: src/printf.c:93 -#, fuzzy msgid "" "Print ARGUMENT(s) according to FORMAT, or execute according to OPTION:\n" "\n" msgstr "" -"ARGÜMAN(lar)ı BİÇEM'e göre gösterir.\n" +"BİÇİMe göre KANIT(lar)ı yazdır ya da İŞLEMe göre yürüt:\n" "\n" #: src/printf.c:99 -#, fuzzy msgid "" "\n" "FORMAT controls the output as in C printf. Interpreted sequences are:\n" "\n" " \\\" double quote\n" msgstr "" -"\n" -"BİÇEM çıktıyı, C printf işlevindeki gibi biçemler. Yorumlanan işlemimleri:\n" -"\n" -" \\\" çift tırnak karakterini gösterir\n" -" \\NNN Sekizlik değeri NNN olan karakteri gösterir (3 haneye kadar)\n" -" \\\\ tersbölü karakterini gösterir\n" #: src/printf.c:117 -#, fuzzy 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 "" -" \\xHH onaltılık değeri HH olan bayt (2 haneye kadar)\n" -" \\uHHHH onaltılık değeri HHHH olan Unicode (ISO/IEC 10646) karakteri (4 " -"haneli)\n" -" \\UHHHHHHHH onaltılık değeri HHHHHHHH olan Unicode karakteri (8 hane)\n" #: src/printf.c:123 -#, fuzzy msgid "" " %% a single %\n" " %b ARGUMENT as a string with '\\' escapes interpreted,\n" @@ -7919,12 +7334,6 @@ 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 "" -" %% tek bir % işaretini gösterir\n" -" %b ARGÜMAN `\\' öncelemeli bir dizge olarak yorumlanır\n" -"\n" -"ve ARGÜMANlar önce uygun bir türe dönüştürülerek diouxXfeEgGcs\n" -"karakterlerinden biri ile biten tüm C biçem tanımlamaları kullanılır.\n" -"Değişken genişlikler de desteklenmiştir.\n" #: src/printf.c:148 #, c-format @@ -7962,9 +7371,9 @@ msgid "%.*s: invalid conversion specification" msgstr "%.*s: geçersiz çevrim tanımı" #: src/printf.c:692 -#, fuzzy, c-format +#, c-format msgid "warning: ignoring excess arguments, starting with %s" -msgstr "uyarı: `%s'den başlayarak fazladan argümanlar yoksayıldı" +msgstr "uyarı: `%s'den başlayarak fazladan bağımsız değişkenler yoksayıldı" #. TRANSLATORS: Please translate "F. Pinard" to "François Pinard" #. if "ç" (c-with-cedilla) is available in the translation's character @@ -7975,9 +7384,9 @@ msgid "F. Pinard" msgstr "F. Pinard" #: src/ptx.c:420 -#, fuzzy, c-format +#, c-format msgid "%s (for regexp %s)" -msgstr "%s (`%s' düzenli ifadesi için)" +msgstr "%s (for regexp %s)" #: src/ptx.c:1820 #, c-format @@ -7989,30 +7398,24 @@ msgstr "" " veya: %s -G [SEÇENEK]... [GİRDİ [ÇIKTI]]\n" #: src/ptx.c:1824 -#, fuzzy msgid "" "Output a permuted index, including context, of the words in the input " "files.\n" msgstr "" -"girdi dosyasındaki kelimelerin (contextleriyle beraber),bir permutasyonunu \n" -" oluşturur.\n" -#: src/ptx.c:1830 -#, fuzzy +#: src/ptx.c:1831 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 Satırbaşlarına referans bilgileri koyar\n" -" -C, --copyright Kopyalama hakkı bilgilerine ve şartlarını\n" -" gösterir\n" -" -G, --traditional System V'deki ptx gibi davranır\n" -" -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:1835 -#, fuzzy +msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" " -O, --format=roff generate output as roff directives\n" @@ -8020,19 +7423,8 @@ msgid "" " -S, --sentence-regexp=REGEXP for end of lines or end of sentences\n" " -T, --format=tex generate output as TeX directives\n" msgstr "" -" -M, --macro-name=DİZGE TeX formatında çıktı oluştururken `xx' " -"yerine\n" -" DİZGE makrosunu kullanır\n" -" -O, --format=roff roff direktifleri formatında çıktı " -"oluşturur\n" -" -R, --right-side-refs -A seçeneğinde oluşturulan referansları \n" -" satırbaşına değil, satırsonuna koyar( -A \n" -" ile beraber kullanımı anlamlı bir seçenek)\n" -" -S, --sentence-regexp=REGEXP satır sonlarını REGEXP'i (REGEXP = regular\n" -" expression (düzenli ifade) ) \n" -" -T, --format=tex TeX formatında çıktı oluştur\n" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8054,7 +7446,7 @@ msgstr "" " -o, --only-file=DOSYA girdide sadece DOSYA'daki kelimeleri\n" " dikkate alır\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8067,20 +7459,16 @@ msgstr "" " -w, --width=SAYI çıktıdaki kolon sayısı SAYI olur \n" " (referans hariç)\n" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"DOSYA verilmemişse veya DOSYA - ise, standart girdi okunur.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "geçersiz boşluk genişliği: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "geçersiz satır genişliği: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8094,6 +7482,8 @@ msgid "" " -L, --logical use PWD from environment, even if it contains symlinks\n" " -P, --physical avoid all symlinks\n" msgstr "" +" -L, --logical PWD'yi simge bağlantıları içeriyor olsa bile kullan\n" +" -P, --physical bütün simge bağlantılarını engelle\n" #: src/pwd.c:67 msgid "" @@ -8106,7 +7496,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "%s dizinine chdir başarısız" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "%s durumlanamadı" @@ -8124,25 +7514,21 @@ msgstr "seçenek olmayan argümanlar yoksayılıyor" #. This is a proper name. See the gettext manual, section Names. #: src/readlink.c:32 msgid "Dmitry V. Levin" -msgstr "" +msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Kullanım: %s [SEÇENEK]... DOSYA...\n" #: src/readlink.c:63 -#, fuzzy msgid "" "Print value of a symbolic link or canonical file name\n" "\n" msgstr "" -"Bir sembolik bağın değerini standart çıktıda gösterir.\n" -"\n" #: src/readlink.c:65 -#, fuzzy msgid "" " -f, --canonicalize canonicalize by following every symlink in\n" " every component of the given name " @@ -8153,23 +7539,16 @@ msgid "" "recursively,\n" " all components must exist\n" msgstr "" -" -f, --canonicalize verilen yoldaki her bileşende her sembolik\n" -" bağı döngüsel olarak izler;\n" -" en son yol bileşeni haricindeki herşey var\n" -" olmalıdır.\n" -" -e, --canonicalize-existing verilen yoldaki her bileşende her sembolik\n" -" bağı döngüsel olarak izler;\n" -" bütün yol bileşenleri var olmalıdır.\n" -" -m, --canonicalize-missing verilen yoldaki her bileşende her sembolik\n" -" bağı döngüsel olarak izler;\n" -" bileşenlerin var olması gerekmez.\n" -" -n, --no-newline sonlayan yeni satırı yazdırmaz.\n" -" -q, --quiet,\n" -" -s, --silent çoğu hata iletisini bastırır\n" -" -v, --verbose hata iletilerini verir\n" +" -f, --canonicalize Standartlaşma aşağıdaki her simge " +"bağlantıları tarafından\n" +" adı tekrar verilmiş her bileşende;\n" +" fakat son bileşen mevcut olmalı\n" +" -e, --canonicalize-existing Standartlaşma aşağıdaki her simge " +"bağlantıları tarafından\n" +" adı tekrar verilmiş her bileşende,\n" +" bütün bileşenler mevcut olmalı\n" #: src/readlink.c:75 -#, fuzzy msgid "" " -m, --canonicalize-missing canonicalize by following every symlink in\n" " every component of the given name " @@ -8182,18 +7561,11 @@ msgid "" " -v, --verbose report error messages\n" " -z, --zero end each output line with NUL, not newline\n" msgstr "" -" -f, --canonicalize verilen yolun bileşenlerinde yer alan her " -"sembolik\n" -" bağı döngüsel olarak takip eder.\n" -" -n, --no-newline en sonuna yenisatır eklemez.\n" -" -q, --quiet,\n" -" -s, --silent pek çok hata iletisini göstermez.\n" -" -v, --verbose hata iletilerini gösterir.\n" #: src/readlink.c:152 -#, fuzzy, c-format +#, c-format msgid "ignoring --no-newline with multiple arguments" -msgstr "seçenek olmayan argümanlar yoksayılıyor" +msgstr "" #: src/realpath.c:72 msgid "" @@ -8258,12 +7630,12 @@ msgstr "" #: src/remove.c:505 #, c-format msgid "skipping %s, since it's on a different device" -msgstr "" +msgstr "farklı bir aygıt olduğundan beri %s atlıyor" #: src/remove.c:525 -#, fuzzy, c-format +#, c-format msgid "traversal failed: %s" -msgstr "okuma başarısız oldu" +msgstr "" #: src/remove.c:531 #, c-format @@ -8304,9 +7676,11 @@ msgid "" " directory that is on a file system different from\n" " that of the corresponding command line argument\n" msgstr "" +" --one-file-system tekrarlamalı bir sıradüzeni geri alındığında\n" +" uygun komut satır yordamdan farklı\n" +" bir dosya sistemindeki dizine geç\n" #: src/rm.c:154 -#, fuzzy msgid "" " --no-preserve-root do not treat '/' specially\n" " --preserve-root do not remove '/' (default)\n" @@ -8314,10 +7688,6 @@ msgid "" " -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" -" --preserve-root `/' üzerinde döngüsel işlem yapma\n" -" -r, -R, --recursive yinelemeli olarak dizinlerin içlerindekileri siler\n" -" -v, --verbose ne yapıldığını anlatır\n" #: src/rm.c:163 msgid "" @@ -8326,9 +7696,13 @@ msgid "" "option to remove each listed directory, too, along with all of its " "contents.\n" msgstr "" +"\n" +"Normalde rm dizinleri silmez. Listelenen dizinleri, içerikleri ile\n" +"birlikte silmek için --recursive (-r veya -R) parametresini " +"kullanmalısınız.\n" #: src/rm.c:168 -#, fuzzy, c-format +#, c-format msgid "" "\n" "To remove a file whose name starts with a '-', for example '-foo',\n" @@ -8337,37 +7711,26 @@ msgid "" "\n" " %s ./-foo\n" msgstr "" -"\n" -"Adı '-' ile başlayan bir dosyayı silmek için, örneğin '-foo' \n" -"aşağıdaki komutlardan birini kullanın:\n" -" %s -- -foo\n" -"\n" -" %s ./-foo\n" #: src/rm.c:177 -#, fuzzy 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 "" -"\n" -"Not: Eğer bir dosyayı silerken rm kullandıysanız, genelde o dosyanın\n" -"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:342 #, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "" msgstr[1] "" #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: %s %s silinsin mi?" msgstr[1] "%s: %s %s silinsin mi?" @@ -8377,12 +7740,11 @@ msgid "removing directory, %s" msgstr "dizin %s siliniyor" #: src/rmdir.c:148 -#, fuzzy, c-format +#, c-format msgid "failed to remove directory %s" -msgstr "dizin %s silinemiyor" +msgstr "dizin kaldırma başarısız %s" #: src/rmdir.c:165 -#, fuzzy msgid "" "Remove the DIRECTORY(ies), if they are empty.\n" "\n" @@ -8390,29 +7752,24 @@ msgid "" " ignore each failure that is solely because a directory\n" " is non-empty\n" msgstr "" -"DİZİN(ler) boş ise siler.\n" +"Boşsa DİZİN(leri) geri al.\n" "\n" " --ignore-fail-on-non-empty\n" -" yalnızca bir dizinin boş olmamasından kaynaklanan \n" -" hataları dikkate almaz\n" +" her bir hatayı dizinler boş değilse\n" +" ayrı ayrı yoksay\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 DİZİN'i siler, ondan sonra o yolun her bileşenindeki\n" -" dizinleri silmeye çalışır. Örnek: 'rmdir -p a/b/c'\n" -" rmdir a/b/c a/b a' komutuna eşittir.\n" -" -v, --verbose işlenen her dizin için durum çıktılar\n" #: src/rmdir.c:242 -#, fuzzy, c-format +#, c-format msgid "failed to remove %s" -msgstr "%s açılamadı" +msgstr "%s kaldırılamadı" #: src/runcon.c:83 #, c-format @@ -8420,6 +7777,8 @@ msgid "" "Usage: %s CONTEXT COMMAND [args]\n" " or: %s [ -c ] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n" msgstr "" +"Kullanım: %s CONTEXT COMMAND [args]\n" +" veya: %s [ -c ] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n" #: src/runcon.c:87 msgid "" @@ -8441,37 +7800,37 @@ msgstr "" #: src/runcon.c:144 #, c-format msgid "multiple roles" -msgstr "" +msgstr "çoklu roller" #: src/runcon.c:149 #, c-format msgid "multiple types" -msgstr "" +msgstr "çoklu türler" #: src/runcon.c:154 #, c-format msgid "multiple users" -msgstr "" +msgstr "çoklu kullanıcılar" #: src/runcon.c:159 #, c-format msgid "multiple levelranges" -msgstr "" +msgstr "çoklu seviye oranı" #: src/runcon.c:177 src/runcon.c:213 -#, fuzzy, c-format +#, c-format msgid "failed to get current context" -msgstr "%s'nın öznitelikleri alınamadı" +msgstr "geçerli bağlamı alma başarısız" #: src/runcon.c:187 #, c-format msgid "you must specify -c, -t, -u, -l, -r, or context" -msgstr "" +msgstr "-c, -t, -u, -l, -r ya da bağlam belirtmelisiniz" #: src/runcon.c:195 -#, fuzzy, c-format +#, c-format msgid "no command specified" -msgstr "süreç kimliği belirtilmemiş" +msgstr "komut belirtilmemiş" #: src/runcon.c:200 #, c-format @@ -8479,39 +7838,39 @@ msgid "%s may be used only on a SELinux kernel" msgstr "" #: src/runcon.c:226 -#, fuzzy, c-format +#, c-format msgid "failed to compute a new context" -msgstr "%s açılamadı" +msgstr "yeni bir hesaplama başarısız" #: src/runcon.c:240 -#, fuzzy, c-format +#, c-format msgid "failed to set new user %s" -msgstr "%s durumlanamadı" +msgstr "yeni kullanıcı %s ayarlama başarısız" #: src/runcon.c:242 -#, fuzzy, c-format +#, c-format msgid "failed to set new type %s" -msgstr "%s durumlanamadı" +msgstr "yeni tür %s ayarlama başarısız" #: src/runcon.c:244 -#, fuzzy, c-format +#, c-format msgid "failed to set new range %s" -msgstr "%s durumlanamadı" +msgstr "yeni aralık %s ayarlamada başarısız" #: src/runcon.c:246 -#, fuzzy, c-format +#, c-format msgid "failed to set new role %s" -msgstr "%s durumlanamadı" +msgstr "yeni rol %s ayarlama başarısız" #: src/runcon.c:254 -#, fuzzy, c-format +#, c-format msgid "unable to set security context %s" -msgstr "%s'in izinleri eski haline getirilemedi" +msgstr "güvenlik bağlamı %s ayarlanamıyor" #: src/selinux.c:127 src/selinux.c:300 -#, fuzzy, c-format +#, c-format msgid "error canonicalizing %s" -msgstr "%s'i okunurken hata" +msgstr "" #: src/seq.c:68 #, c-format @@ -8529,22 +7888,13 @@ msgid "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" msgstr "" #: src/seq.c:79 -#, fuzzy msgid "" " -f, --format=FORMAT use printf style floating-point FORMAT\n" " -s, --separator=STRING use STRING to separate numbers (default: \\n)\n" " -w, --equal-width equalize width by padding with leading zeroes\n" msgstr "" -"İLK'ten SON'a kadar rakamları, ARTIŞ atlayarak yazar.\n" -"\n" -" -f, --format=BİÇEM printf tarzı gerçel sayı BİÇEMi kullanır " -"(öntanımlı: %g)\n" -" -s, --separator=DİZGE rakamları DİZGE ile ayırır (öntanımlı:\\n)\n" -" -w, --equal-width rakamları sıfırla yastıklayarak eşit genişliğe " -"getirir\n" #: src/seq.c:86 -#, fuzzy msgid "" "\n" "If FIRST or INCREMENT is omitted, it defaults to 1. That is, an\n" @@ -8555,14 +7905,6 @@ msgid "" "INCREMENT is usually positive if FIRST is smaller than LAST, and\n" "INCREMENT is usually negative if FIRST is greater than LAST.\n" msgstr "" -"\n" -"İLK ve ARTIŞ belirtilmemişse öntanımlı olarak 1 kabul edilir.\n" -"Eğer ARTIŞ verilmemiş ise, SON, İLK'den küçük dahi olsa, 1 olarak kabul " -"edilir.\n" -"İLK, ARTIŞ ve SON gerçel sayılar olarak yorumlanır.\n" -"İLK SONdan küçükse ARTIŞ pozitif, aksi takdirde negatif olmalıdır.\n" -"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:96 msgid "" @@ -8576,12 +7918,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "gerçel sayı argüman geçersiz: %s" -#: src/seq.c:234 -#, fuzzy, c-format +#: src/seq.c:248 +#, c-format msgid "format %s has unknown %%%c directive" -msgstr "%s bilinmeyen dosya türüne sahip" +msgstr "%s biçimi bilinmeyen %%%c talimatına sahip" -#: src/seq.c:557 +#: src/seq.c:603 #, 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" @@ -8589,35 +7931,37 @@ msgstr "eş genişlikli dizgeler için biçem dizgesi belirtilmeyebilir" #. This is a proper name. See the gettext manual, section Names. #: src/shred.c:74 msgid "Colin Plumb" -msgstr "" +msgstr "Colin Plumb" #: src/shred.c:170 -#, fuzzy msgid "" "Overwrite the specified FILE(s) repeatedly, in order to make it harder\n" "for even very expensive hardware probing to recover the data.\n" msgstr "" -"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" + +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" "\n" +"DOSYA verilmemişse veya DOSYA - ise, standart girdi tekrar kopyalanır.\n" -#: src/shred.c:177 -#, fuzzy, c-format +#: src/shred.c:181 +#, 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 "" -" -f, --force eğer gerekli olursa yazma izni verir\n" -" -n, --iterations=N Öntanımlı (%d) defa üzerine yazma yerine N defa " -"üzerine\n" -" yazar\n" -" -s, --size=N N sayıda baytı bu işlemden geçirir\n" -" (k, M, G gibi sonekler kabul edilir)\n" +" -f, --force eğer gerekirse yazmaya onay vermek için izinleri değiştir\n" +" -n, --iterations=N var olan (%d) yerine N kere üzerine yaz \n" +" --random-source=FILE FILE'den rastgele bayt al\n" +" -s, --size=N bunu çok bayta böl (K, M, G gibi erişilmiş son ekler)\n" -#: src/shred.c:183 -#, fuzzy +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -8625,19 +7969,10 @@ 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 üzerine yazdıktan sonra dosyayı sıfırlar ve siler\n" -" -v, --verbose ilerlemeyi gösterir\n" -" -x, --exact dosya boyutunu sonraki tam bloğa yuvarlamaz\n" -" bu işlem, normal dosya olmayan dosyalar için öntanımlıdır\n" -" -z, --zero işlemi gizlemek için en son olarak üzerine sıfırlarla " -"yazar\n" -#: src/shred.c:192 -#, fuzzy +#: src/shred.c:196 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.\n" @@ -8648,19 +7983,8 @@ msgid "" "The default mode is 'wipesync', but note it can be expensive.\n" "\n" msgstr "" -"\n" -"Eğer DOSYA - ise, standart çıktıyı bu işleme tabi tutar\n" -"\n" -"Eğer --remove (-u) belirtilmişse DOSYA(ları) siler. Öntanımlı değer " -"dosyaları\n" -"silmez çünkü bu komut genelde /dev/hda gibi aygıt dosyaları üzerinde \n" -"çalıştırılır ve o dosyalar genelde silinmemelidir. Normal dosyalar " -"üzerinde\n" -"çalıştırıldığı zaman genelde --remove seçeneği kullanılır.\n" -"\n" -#: src/shred.c:206 -#, fuzzy +#: src/shred.c:208 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" @@ -8670,14 +7994,16 @@ msgid "" "modes:\n" "\n" msgstr "" -"DİKKAT: shred komutu dosya sisteminin datayı yerinde \n" -"üzerine yazdığı varsayımına dayanır. Bu genelde yapılan işlemdir, \n" -"fakat pek çok modern dosya sistemi bu varsayıma uymaz. Aşağıda shred\n" -"komutunun işe yaramadığı dosya sistemleri örneklenmiştir:\n" +"UYARI: Parçanın çok önemli bir varsayıma dayandığına dikkat et:\n" +"Bu, dosya sistemi yerdeki verilerin üzerine yazar. Bu, şeyleri yapmak \n" +"için geleneksel yoldur. Fakat birçok modern dosya sistemi bu varsayımı \n" +"karşılamayacak şekilde tasarlanır. Aşağıdakiler etkin olmayan parçalarda " +"veya \n" +"bütün dosya sistem modellerindeki etkileri garanti edilmeyen dosya sistemine " +"örnektir:\n" "\n" -#: src/shred.c:214 -#, fuzzy +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8688,19 +8014,19 @@ msgid "" "* file systems that make snapshots, such as Network Appliance's NFS server\n" "\n" msgstr "" -"* AIX ve Solaris ile gelen (ve JFS, ReiserFS, XFS vs.) gibi kayıt düzenli " -"veya\n" -" jurnalli dosya sistemleri\n" +"* AIX, Solaris, JFS, ReiserFS, XFS, Ext3, vb gibi olay biçimli veya günlük " +"dosya sistemleri)\n" +"\n" +"* gereksiz veri yazan dosya sistemleri ve RAID-tabanlı dosya sistemleri " +"gibi\n" +"bazı hatalar yazılsa bile devam et\n" "\n" -"* RAID gibi çoklu data yazan ve bazı yazma işlemleri başarısız olsa bile " -"devam\n" -" edebilen dosya sistemleri\n" "\n" -"* Network Appliance'ın NFS sunucusu gibi dosya sisteminin bir görüntüsünü \n" -" kaydeden dosya sistemleri\n" +"* file systems tsatır make snapshots, such as Network Appliance's NFS " +"server\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8708,8 +8034,13 @@ msgid "" "* compressed file systems\n" "\n" msgstr "" +"* geçici konumdaki ön bellek dosya sistemleri NFS\n" +"versiyon 3 kullanıcılar gibi\n" +"\n" +"* sıkıştırılmış dosya sistemleri\n" +"\n" -#: src/shred.c:231 +#: src/shred.c:233 msgid "" "In the case of ext3 file systems, the above disclaimer applies\n" "(and shred is thus of limited effectiveness) only in data=journal mode,\n" @@ -8720,159 +8051,161 @@ msgid "" "as documented in the mount man page (man mount).\n" "\n" msgstr "" +"ext3 dosya sistemlerinde yukardaki feragat uygulamaları\n" +"ve sınırlı geçerliliğe sahip olan parça sadece üst veriye eklenen\n" +"veri=günlük mod'daki günlük dosya verileridir. veri=düzenli (mevcut)\n" +"ve veri=geri yazım modlarındaki parçalar olağan çalışır.\n" +"Ext3 gündelik modları veri=bazışey seçeneği /etc/fstab dosyasındaki\n" +"düzenli bir dosya sistemi için düzenleme seçeneklerine\n" +" eklenerek değiştirilebilir.\n" +"\n" -#: src/shred.c:241 -#, fuzzy +#: src/shred.c:243 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 "" -"* geçici yerlerde arabellek oluşturan dosya sistemleri (NFS sürüm 3 \n" -" istemcileri gibi)\n" -"\n" -"* sıkıştırılmış dosya sistemleri\n" -"\n" -"Buna ek olarak, dosyasistem yedekleri ve uzak yansılar dosyanın\n" -"silinemeyen kopyalarını taşıyabilir ve bu shred işleminden geçirilmiş\n" -"bir dosyanın tekrar oluşturulabilmesini sağlayabilir.\n" +"Ekte dosya sistemi yedekleri ve uzak yansılar geri alınamayan dosyanın\n" +"kopyalarını içerebilir. Bu parçalanmış dosyayı sonradan düzenlemeye\n" +"imkan verecek.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync başarısız" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync başarısız" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: geri gelinemiyor" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: geçiş %lu/%lu (%s)" -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" -msgstr "%s %s göreli konumunda yazdırma hatası" +msgstr "%s %s göreli konumunda yazdırma hata" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: arama (lseek) başarısız" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: dosya çok büyük" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: geçiş %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: geçiş %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat başarısız" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: geçersiz dosya tipi" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: dosya büyüklüğü negatif" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: kısaltmada hata" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl başarısız" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: yalnızca eklenebilir kipte dosya belirteçine shred uygulanamaz" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: siliniyor" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: %s olarak yeniden adlandırıldı" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: silinemedi" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: silindi" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: kapatılamadı" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: yazmak için açılamadı" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s geçersiz sayıda geçiş" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 -#, fuzzy, c-format +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 +#, c-format msgid "multiple random sources specified" -msgstr "birden fazla çıktı dosyası belirtilmiş" +msgstr "çoklu rastgele kaynaklar belirlendi" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: geçersiz dosya büyüklüğü" -#: src/shuf.c:61 -#, fuzzy, c-format +#: src/shuf.c:62 +#, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" " or: %s -e [OPTION]... [ARG]...\n" " or: %s -i LO-HI [OPTION]...\n" msgstr "" -"Kullanımı: %s [SEÇENEK]... SON\n" -" veya: %s [SEÇENEK]... İLK SON\n" -" ya da: %s [SEÇENEK]... İLK ARTIŞ SON\n" +"Kullanım: %s [SEÇENEK]... [DOSYA]\n" +" ya da: %s -e [SEÇENEK]... [ARG]...\n" +" ya da: %s -i LO-HI [SEÇENEK]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -8883,43 +8216,43 @@ msgid "" " -r, --repeat output lines can be repeated\n" msgstr "" -#: src/shuf.c:228 -#, fuzzy, c-format +#: src/shuf.c:226 +#, c-format msgid "too many input lines" -msgstr "çok fazla tekrar eden satır" +msgstr "" -#: src/shuf.c:431 -#, fuzzy, c-format +#: src/shuf.c:428 +#, c-format msgid "multiple -i options specified" -msgstr "birden fazla -l veya -t seçeneği belirtilmiş" +msgstr "çoklu -i seçenekleri belirlendi" -#: src/shuf.c:452 -#, fuzzy, c-format -msgid "invalid input range %s" -msgstr "geçersiz girdi bayrağı: %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" +msgstr "geçersiz girdi genişliği %s" -#: src/shuf.c:465 +#: src/shuf.c:459 #, fuzzy, c-format -msgid "invalid line count %s" -msgstr "geçersiz satır genişliği: %s" +msgid "invalid line count: %s" +msgstr "geçersiz satır sayısı %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "birden fazla çıktı dosyası belirtilmiş" -#: src/shuf.c:502 -#, fuzzy, c-format +#: src/shuf.c:496 +#, c-format msgid "cannot combine -e and -i options" -msgstr "kip ve --reference seçenekleri birleştirilemez" +msgstr "-e ve -i seçenekleri birleştirilemez" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" #: src/sleep.c:44 -#, fuzzy, c-format +#, c-format msgid "" "Usage: %s NUMBER[SUFFIX]...\n" " or: %s OPTION\n" @@ -8931,122 +8264,67 @@ msgid "" "specified by the sum of their values.\n" "\n" msgstr "" -"Kullanımı: %s SAYI[SONEK]...\n" -" veya: %s SEÇENEK\n" -"SAYI saniye kadar bekletir.\n" -"SONEK saniye için `s' (öntanımlı), dakika için `m', saat için `h' ve \n" -"gün için `d' olabilir. Birçok benzerinde SAYI için bir tamsayı\n" -"değer gerekirken, burada SAYI bir gerçel sayı olabilir.\n" -"\n" -#: src/sleep.c:135 src/timeout.c:323 -#, fuzzy, c-format +#: src/sleep.c:135 src/timeout.c:325 +#, c-format msgid "invalid time interval %s" -msgstr "`%s' zaman aralığı geçersiz" +msgstr "geçersiz zaman aralığı %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "gerçekzaman saati okunamıyor" #: src/sort.c:427 -#, fuzzy 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" -"yapar. Baktığı bölüme sıralama anahtarı denir. Bu anahtarı aşağıdaki\n" -"seçenekleri kullanarak belirtebilirsiniz. Seçeneklerden sonra anahtarların\n" -"nasıl oluşturulduğuyla ilgili bilgi bulabilirsiniz.\n" -"\n" -"Sıralama seçenekleri:\n" -"\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" msgstr "" +"Sıralama seçenekleri:\n" +"\n" -#: src/sort.c:437 -#, fuzzy +#: src/sort.c:438 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 sıralanacak alanlarda ve sıralama \n" -" anahtarlarından önce gelen boşlukları " -"dikkate \n" -" almaz\n" -" -d, --dictionary-order anahtarlarda sadece [a-zA-Z0-9] " -"karakterlerini\n" -" dikkate alır\n" -" -f, --ignore-case sıralarken büyük/küçük harf farklılıklarını \n" -" dikkate almaz \n" - -#: src/sort.c:443 -#, fuzzy +" -b, --ignore-leading-blanks başlangıç boşlukları reddet\n" +" -d, --dictionary-order sadece boşlukları ve alfanumerik karakterleri " +"değerlendir\n" +" -f, --ignore-case alt durumları üst durum karakterlerine katla\n" + +#: src/sort.c:444 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 sayısal değere bakarak sıralar, -n seçeneğini " -"de\n" -" de verilmiş kabul eder \n" -" ( -n seçeneğinden farkı : 1.e-3 gibi \n" -" sayıları da okuyabilir. -n seçeneğinden çok \n" -" daha yavaş çalışır, gerekmedikçe bu seçeneği \n" -" kullanmayın)\n" -" -i, --ignore-nonprinting anahtarlarda sadece yazılabilir yazılabilir =\n" -" printable, Örnekler: a ? < , ...) \n" -" karakterleri dikkate alır\n" -" -M, --month-sort anahtarın ilk üç harfini alır, bir ay ismi\n" -" nin kısaltmasıysa, ayların sırasına göre\n" -" sıralar. Ay isimlerinin kısa yazılış-\n" -" larını LC_TIME çevre değiskeninin\n" -" belirttigi locale dosyasından bakar\n" -" (çevre değişkeni = environment variable)\n" -" -n, --numeric-sort sayısal değerlere göre sıralar\n" -" -r, --reverse tersine sıralar\n" -"\n" - -#: src/sort.c:448 + +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 -#, fuzzy +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" " --random-source=FILE get random bytes from FILE\n" " -r, --reverse reverse the result of comparisons\n" msgstr "" -" -g, --general-numeric-sort sayısal değere bakarak sıralar, -n seçeneğini " -"de\n" -" de verilmiş kabul eder \n" -" ( -n seçeneğinden farkı : 1.e-3 gibi \n" -" sayıları da okuyabilir. -n seçeneğinden çok \n" -" daha yavaş çalışır, gerekmedikçe bu seçeneği \n" -" kullanmayın)\n" -" -i, --ignore-nonprinting anahtarlarda sadece yazılabilir yazılabilir =\n" -" printable, Örnekler: a ? < , ...) \n" -" karakterleri dikkate alır\n" -" -M, --month-sort anahtarın ilk üç harfini alır, bir ay ismi\n" -" nin kısaltmasıysa, ayların sırasına göre\n" -" sıralar. Ay isimlerinin kısa yazılış-\n" -" larını LC_TIME çevre değiskeninin\n" -" belirttigi locale dosyasından bakar\n" -" (çevre değişkeni = environment variable)\n" -" -n, --numeric-sort sayısal değerlere göre sıralar\n" -" -r, --reverse tersine sıralar\n" -"\n" - -#: src/sort.c:457 +" -n, --numeric-sort sayısal değer koşuluyla uygun olarak " +"karşılaştır\n" +" -R, --random-sort anahtarları rastgele sırala\n" +" --random-source=FILE FILE'den rastgele bayt al\n" +" -r, --reverse karşılaştırma sonuçlarını ters çevir\n" + +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9056,19 +8334,23 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" msgstr "" +"Diğer seçenekler:\n" +"\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" +" --batch-size=NMERGE daha çok kullanılan geçici dosyaların\n" +" ilk önce çoğu NMERGE girişlerini birleştir\n" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -9077,7 +8359,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9086,40 +8368,26 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 -#, fuzzy +#: src/sort.c:492 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 "" -"Diger seçenekler:\n" -"\n" -" -c, --check dosyalar sıralı mı kontrol eder; sıralamaz\n" -" -k, --key=POS1[,POS2] Sıralama anahtarı belirtmek için kullanılan \n" -" seçenek:\n" -" POS1 de başlayan POS2 de biten bir anahtar \n" -" belirler (alan numarasını ve karakterin\n" -" kelime içindeki yerini 1'den başlayarak sayar)\n" -" -m, --merge sıralama yapma; daha önceden sıralanmış \n" -" dosyaları birleştirir\n" -" -o, --output=DOSYA sonucu DOSYA'ya yazar\n" -" -s, --stable Eğer tüm satırlar karşılaştırıldıklarında eşit\n" -" gözüküyorlarsa dosyayı aynı bırakır\n" -" (bu seçenek kullanılmadığında sort yukarda \n" -" belirtilen durumla karşılaştığında satırları \n" -" 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:497 -#, fuzzy, c-format +" -o, --output=FILE standart çıkış yerine sonucu FILE'ye yaz\n" +" -s, --stable son rapor karşılaştırmayı devre dışı bırakarak " +"sıraları sağlamlaştır\n" +" -S, --buffer-size=SIZE ana hafıza için SIZE kullan\n" + +#: src/sort.c:498 +#, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " "transition\n" @@ -9132,18 +8400,8 @@ msgid "" " without -c, output only the first of an equal " "run\n" msgstr "" -" -t, --field-seperator=SEP kelimeleri boşluk yerine SEP ile ayrılmış \n" -" kabul eder\n" -" -T, --temporary-directory=DIR geçici dizin olarak $TMPDIR veya %s " -"yerine \n" -" DIR'ı kullanır. \n" -" -u, --unique -c ile kullanıldığında girdide her satırın \n" -" özgün olup olmadığını da kontrol eder. -c ile\n" -" kullanılmadığında sıralama yaparken aynı olan \n" -" satırlardan sadece birini yazar \n" - -#: src/sort.c:511 -#, fuzzy + +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9161,25 +8419,12 @@ msgid "" "\n" "SIZE may be followed by the following multiplicative suffixes:\n" msgstr "" -"\n" -"Sıralama anahtarları POS1, POS2 argümanları F[.C][SEC] ile belirtilir.\n" -"Burda F alan numarası C de karakterin alandaki yeridir.-k seçeneği " -"verildiğinde\n" -"alan numarası ve karakterine alandaki yeri 1'den başlanarak sayılır (eski \n" -"kullanım şeklinde 0'dan başlanarak sayılır). SEC ise yukarda belirtilen\n" -"sıralama seçeneklerinden oluşur. (Hem en başta hem POS1 veya POS2 nin \n" -"içinde sıralama seçeneği belirtilmişse POS1, POS2 nin içindekiler " -"kullanır).\n" -"Anahtar belirtilmemişse sort bütün satırı anahtar olarak kullanır.\n" -"\n" -"SAYI'dan sonra aşağıdaki soneklerden biri gelebilir:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -9195,482 +8440,473 @@ 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:725 -#, fuzzy, c-format +#: src/sort.c:724 +#, c-format msgid "waiting for %s [-d]" -msgstr "%s'e yazılıyor" +msgstr "%s [-d] için bekliyor" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" -msgstr "" +msgstr "%s [-d] anormal şekilde sonlandırıldı" -#: src/sort.c:884 -#, fuzzy, c-format +#: src/sort.c:883 +#, c-format msgid "cannot create temporary file in %s" -msgstr "geçici dosya %s oluşturulamadı" +msgstr "%s içinde geçici dosya oluşturulamıyor" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "açma işlemi başarısız" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "fflush başarısız" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "kapatma işlemi başarısız" -#: src/sort.c:1140 -#, fuzzy +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "geçici dosya oluşturulamadı" -#: src/sort.c:1179 -#, fuzzy, c-format +#: src/sort.c:1178 +#, c-format msgid "couldn't create process for %s -d" -msgstr "%s dizini oluşturulamıyor" +msgstr "%s için işlem oluşturulamadı -d" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "uyarı: %s silinemedi" -#: src/sort.c:1338 -#, fuzzy, c-format +#: src/sort.c:1337 +#, c-format msgid "invalid --%s argument %s" -msgstr "%s argümanı geçersiz" +msgstr "--%s geçersiz %s yordamı" -#: src/sort.c:1341 -#, fuzzy, c-format +#: src/sort.c:1340 +#, c-format msgid "minimum --%s argument is %s" -msgstr "%s argümanı `%s' için belirsiz" +msgstr "--%s minimum, yordam %s" -#: src/sort.c:1356 -#, fuzzy, c-format +#: src/sort.c:1355 +#, c-format msgid "--%s argument %s too large" -msgstr "%s: `%.*s' sayımı fazla büyük" +msgstr "--%s yordamı, %s çok büyük" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" -msgstr "" +msgstr "--%s yordamı maxsimum, mevcut rlimit %s'dir" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "stat başarısız" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "okuma başarısız oldu" -# -#: src/sort.c:2076 -#, fuzzy, c-format +#: src/sort.c:2075 +#, c-format msgid "string transformation failed" -msgstr "dizge karşılaştırması başarısız" +msgstr "metin dönüşümü hatası" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" -msgstr "" +msgstr "dönüştürülmemiş dizgi %s'ti" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 -#, fuzzy, c-format +#: src/sort.c:2483 +#, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" -msgstr[0] "%s: `-W %s' seçeneği belirsiz\n" -msgstr[1] "%s: `-W %s' seçeneği belirsiz\n" +msgstr[0] "" +msgstr[1] "" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "yazma başarısız oldu" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: sırasız: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "standart hata" -#: src/sort.c:3738 -#, fuzzy +#: src/sort.c:3737 msgid "cannot read" -msgstr "%s: geri gelinemiyor" +msgstr "okunamıyor" -#: src/sort.c:4017 -#, fuzzy, c-format +#: src/sort.c:4016 +#, c-format msgid "%s: invalid field specification %s" -msgstr "%s: geçersiz alan tanımı `%s'" +msgstr "%s: geçersiz alan belirlenimi %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "" -#: src/sort.c:4079 -#, fuzzy, c-format +#: src/sort.c:4078 +#, c-format msgid "%s: invalid count at start of %s" -msgstr "%s: `%s' başlangıcında geçersiz sayım" +msgstr "%s: %s'den başlayan geçersiz sayma" -#: src/sort.c:4336 -#, fuzzy +#: src/sort.c:4335 msgid "invalid number after '-'" -msgstr "`-' den sonra geçersiz sayı" +msgstr "" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 -#, fuzzy +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" -msgstr "`.' dan sonra geçersiz sayı" +msgstr "" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "alan tanımında fazla harf" -#: src/sort.c:4403 -#, fuzzy, c-format +#: src/sort.c:4402 +#, c-format msgid "multiple compress programs specified" -msgstr "birden fazla hedef dizin belirtilmiş" +msgstr "çoklu sıkıştırma programları belirlendi" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "alan başlangıcında geçersiz sayı" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "alan numarası sıfır" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "sıralama anahtarında belirtilen karakter yeri sıfır" -#: src/sort.c:4448 -#, fuzzy +#: src/sort.c:4447 msgid "invalid number after ','" -msgstr "`,' den sonra geçersiz sayı" +msgstr "" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "boş sekme" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "%s'den dosya adları okunamadı" -#: src/sort.c:4613 -#, fuzzy, c-format +#: src/sort.c:4612 +#, c-format msgid "%s:%lu: invalid zero-length file name" -msgstr "geçersiz sıfır uzunluklu dosya adı" +msgstr "%s:%lu: geçersiz sıfır-uzunluklu dosya adı" -#: src/sort.c:4619 -#, fuzzy, c-format +#: src/sort.c:4618 +#, c-format msgid "no input from %s" -msgstr "girdi dosyası %s kapatılıyor" +msgstr "%s'ten girdi yok" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 -#, fuzzy, c-format +#: src/sort.c:4698 +#, c-format msgid "extra operand %s not allowed with -%c" -msgstr "-c seçeneği ile ekstra işlenen %s kullanılamaz" +msgstr "fazlalık terim %s, -%c ile kabul edilmedi" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 +#: src/split.c:224 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" -msgstr "Kullanım: %s [SEÇENEK] [GİRDİ [ÖNEK]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" +msgstr "Kullanım: %s [SEÇENEK]... [GİRDİ [ÖNEK]]\n" -#: src/split.c:207 -#, fuzzy +#: src/split.c:228 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\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:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 -#, fuzzy +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr "" -" --verbose her parçayı dosyasına koymadan önce \n" -" ne yaptığına dair bilgi verir (bilgi standart " -"hata'ya\n" -" yazılır)\n" +" --verbose sadece açık olan her bir çıkış dosyasından önce\n" +" bir tanılama yaz\n" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 -#, fuzzy, c-format +#: src/split.c:407 +#, c-format msgid "output file suffixes exhausted" -msgstr "kullanacak parça ismi kalmadı" +msgstr "çıktı dosyası son ekleri bitmiş" -#: src/split.c:365 -#, fuzzy, c-format +#: src/split.c:419 +#, c-format msgid "creating file %s\n" -msgstr "`%s' dosyası oluşturuluyor\n" +msgstr "%s dosyası oluşturuluyor\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 -#, fuzzy, c-format +#: src/split.c:444 +#, c-format msgid "failed to set FILE environment variable" -msgstr "çevre değişkeni LS_COLORS'da taranamaz değer" +msgstr "" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 -#, fuzzy, c-format +#: src/split.c:448 +#, c-format msgid "failed to create pipe" -msgstr "%s durumlanamadı" +msgstr "" -#: src/split.c:408 -#, fuzzy, c-format +#: src/split.c:462 +#, c-format msgid "closing prior pipe" -msgstr "%s dizini kapatılıyor" +msgstr "" -#: src/split.c:410 -#, fuzzy, c-format +#: src/split.c:464 +#, c-format msgid "closing output pipe" -msgstr "çıktı dosyası %s kapatılıyor" +msgstr "" -#: src/split.c:414 -#, fuzzy, c-format +#: src/split.c:468 +#, c-format msgid "moving input pipe" -msgstr "girdi dosyası %s kapatılıyor" +msgstr "" -#: src/split.c:416 -#, fuzzy, c-format +#: src/split.c:470 +#, c-format msgid "closing input pipe" -msgstr "girdi dosyası %s kapatılıyor" +msgstr "" -#: src/split.c:421 -#, fuzzy, c-format +#: src/split.c:475 +#, c-format msgid "failed to run command: \"%s -c %s\"" -msgstr "%s komutu çalıştırılamadı" +msgstr "" -#: src/split.c:427 -#, fuzzy, c-format +#: src/split.c:481 +#, c-format msgid "failed to close input pipe" -msgstr "%s: kapatılamadı" +msgstr "" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "-C -l -b seçenekleri beraber kullanılmaz" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" -msgstr "%s: geçersiz saniye sayısı" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" +msgstr "geçersiz satır sayısı" -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" -msgstr "%s: geçersiz sayı" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" +msgstr "geçersiz sayı" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: -a seçeneğine verilen arguman geçersiz" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: geçersiz bayt sayısı" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: geçersiz satır sayısı" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "çoklu-karakter sekmesi %s" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "çoklanmış karakter özel dosyası" -#: src/split.c:1286 +#: src/split.c:1383 #, 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:1298 -#, fuzzy, c-format +#: src/split.c:1395 +#, c-format msgid "%s: invalid start value for numerical suffix" -msgstr "geçersiz başlangıç satır numarası: %s" +msgstr "" -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" -msgstr "%s: geçersiz dosya büyüklüğü" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" +msgstr "geçersiz sekme boyutu: %s" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 -#, fuzzy, c-format +#: src/split.c:1528 +#, c-format msgid "%s: cannot determine file size" -msgstr "makina ismi saptanamadı" +msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:178 +#: src/stat.c:179 msgid "Michael Meskes" -msgstr "" +msgstr "Michael Meskes" -#: src/stat.c:887 -#, fuzzy, c-format +#: src/stat.c:890 +#, c-format msgid "failed to canonicalize %s" -msgstr "%s açılamadı" +msgstr "" -#: src/stat.c:1129 -#, fuzzy, c-format +#: src/stat.c:1132 +#, c-format msgid "warning: unrecognized escape '\\%c'" -msgstr "%s: `%c%s' seçeneği bilinmiyor\n" +msgstr "" -#: src/stat.c:1184 -#, fuzzy, c-format +#: src/stat.c:1187 +#, c-format msgid "%s: invalid directive" -msgstr "%%%c: yönerge geçersiz" +msgstr "%s: geçersiz yönerge" -#: src/stat.c:1231 -#, fuzzy, c-format +#: src/stat.c:1234 +#, c-format msgid "warning: backslash at end of format" -msgstr "dizge sonunda geçersiz terskesik gösterimi" +msgstr "uyarı: biçimlendirmenin sonunda ters eğik çizgi" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "%s için dosyasistem bilgisi okunamadı" -# -#: src/stat.c:1290 -#, fuzzy, c-format +#: src/stat.c:1293 +#, c-format msgid "cannot stat standard input" -msgstr "standart girdi kapatılıyor" +msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' with --file-system, and NOT from printf. -#: src/stat.c:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9681,7 +8917,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9689,30 +8925,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9720,17 +8956,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9740,8 +8976,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1433 -#, fuzzy +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -9752,16 +8987,8 @@ msgid "" " %B the size in bytes of each block reported by %b\n" " %C SELinux security context string\n" msgstr "" -"\n" -"Dosyalar için geçerli sözdizimler (--file-system seçeneği olmaksızın)\n" -"\n" -" %A İnsan tarafından okunabilir biçemde erişim hakları\n" -" %a Sekizlik değer halinde erişim hakları\n" -" %B `%b' ile verilen her bloğun bayt cinsinden boyu\n" -" %b Ayrılan blok sayısı (bkz. %B)\n" -#: src/stat.c:1442 -#, fuzzy +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -9770,15 +8997,8 @@ msgid "" " %g group ID of owner\n" " %G group name of owner\n" msgstr "" -" %D Onaltılık düzende aygıt numarası\n" -" %d Onluk düzende aygıt numarası\n" -" %F Dosya türü\n" -" %f Onaltılık düzende ham (raw) kip\n" -" %G Sahibin grup adı\n" -" %g Sahibin grup kimlik no'su\n" -#: src/stat.c:1450 -#, fuzzy +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -9790,17 +9010,8 @@ msgid "" " %t major device type in hex, for character/block device special files\n" " %T minor device type in hex, for character/block device special files\n" msgstr "" -" %h Sabit bağ sayısı\n" -" %i Idüğüm sayısı\n" -" %N Eğer sembolik bağ ise çözümlenmiş ve tırnak içine alınmış dosya adı\n" -" %n Dosya adı\n" -" %o IO blok büyüklüğü\n" -" %s Bayt cinsinden toplam büyüklük\n" -" %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:1461 -#, fuzzy +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -9814,18 +9025,8 @@ msgid "" " %Z time of last status change, seconds since Epoch\n" "\n" msgstr "" -" %U Sahibin kullanıcı adı\n" -" %u Sahibin kimlik no\n" -" %X Başlangıçtan beri saniye cinsinden son erişim zamanı\n" -" %x Son erişim zamanı\n" -" %Y Başlangıçtan beri saniye cinsinden son değişim zamanı\n" -" %y Son değişim zamanı\n" -" %Z Başlangıçtan beri saniye cinsinden son dosya değişim zamanı\n" -" %z Son dosya değişim zamanı\n" -"\n" -#: src/stat.c:1475 -#, fuzzy +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -9835,16 +9036,8 @@ msgid "" " %d free file nodes in file system\n" " %f free blocks in file system\n" msgstr "" -"Dosya sistemleri için geçerli biçem dizileri:\n" -"\n" -" %a Normal kullanıcıya izin verilen boş bloklar\n" -" %b Dosya sistemindeki toplam veri blokları\n" -" %c Dosya sistemindeki toplam dosya düğümleri\n" -" %d Dosya sisteminde boş dosya düğümleri\n" -" %f Dosya sisteminde boş bloklar\n" -#: src/stat.c:1484 -#, fuzzy +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -9854,17 +9047,11 @@ msgid "" " %t file system type in hex\n" " %T file system type in human readable form\n" msgstr "" -" %i Dosya sistem kimlik no (onaltılık)\n" -" %l Dosya isimlerinin maksimum uzunluğu\n" -" %n Dosya ismi\n" -" %s Optimal transfer blok büyüklüğü\n" -" %T İnsan okuyabilir şekilde tür\n" -" %t Onaltılık düzende tür\n" #: src/stdbuf.c:90 -#, fuzzy, c-format +#, c-format msgid "Usage: %s OPTION... COMMAND\n" -msgstr "Kullanım: %s [SEÇENEK]...\n" +msgstr "Kullanım: %s SEÇENEK... KOMUT\n" #: src/stdbuf.c:91 msgid "" @@ -9905,16 +9092,15 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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:241 -#, fuzzy, c-format +#, c-format msgid "failed to find %s" -msgstr "%s açılamadı" +msgstr "" #: src/stdbuf.c:265 src/stdbuf.c:299 #, c-format @@ -9931,35 +9117,29 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "" -#: src/stty.c:516 -#, fuzzy, c-format +#: src/stty.c:524 +#, 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 "" -"Kullanımı: %s [-F AYGIT] [--file=AYGIT] [AYAR]...\n" -" veya: %s [-F AYGIT] [--file=AYGIT] [-a|--all]\n" -" ya da: %s [-F AYGIT] [--file=AYGIT] [-g|--save]\n" +"Kullanim: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" +" veya: %s [-F DEVICE | --file=DEVICE] [-a|--all]\n" +" veya: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 -#, fuzzy +#: src/stty.c:536 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 "" -"Terminal karakteristiklerini değiştirir ve gösterir.\n" -"\n" -" -a, --all tüm ayarları okunabilir biçimde gösterir\n" -" -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:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9969,11 +9149,24 @@ 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:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -9983,9 +9176,13 @@ 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -9995,65 +9192,104 @@ msgstr "" " intr KRKT KRKT bir kesme (SIGINT) sinyali gönderecektir\n" " kill KRKT KRKT bulunulan satırı silecektir\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" msgstr "" -"* lnext KRKT KRKT izleyen özel karakterin yorumlanmasını engelleyecektir\n" -" quit KRKT KRKT bir çıkış (SIGQUIT) sinyali gönderecektir\n" -"* 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:559 +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 KRKT KRKT çıktıyı durduracaktır\n" " susp KRKT KRKT bir terminal dur (SIGSTOP) sinyali gönderecektir\n" "* swtch KRKT KRKT başka bir kabuk katmanına geçecektir\n" "* werase KRKT KRKT son sözcüğü silecektir\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 #, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Özel ayarlar:\n" +" N giriş ve çıkış hızını N bauda ayarla\n" +" * cols N çekirdeğe uçbirimin N sütun olduğunu söyle\n" +" * columns N N sütunsay gibi\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" "\n" "Özel ayarlar:\n" -" N girdi/çıktı hızlarını N bit/s olarak ayarlar\n" -" * cols N çekirdeğe terminal genişliğini N karakter olarak bildirir\n" -"* columns N cols N ile aynı\n" +" N giriş ve çıkış hızını N bauda ayarla\n" +" * cols N çekirdeğe uçbirimin N sütun olduğunu söyle\n" +" * columns N N sütunsay gibi\n" + +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" -#: src/stty.c:572 +#: src/stty.c:627 +#, fuzzy 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 "" " ispeed N girdi hızını N olarak ayarlar\n" -"* line N terminal hat disiplinini N yapar\n" +"* line N terminal satır disiplinini N yapar\n" " min N -icanon ile okumanın tamamlanması için gereken en az " "karakter\n" " sayısını N yapar\n" " ospeed N çıktı hızını N olarak ayarlar\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +"* rows N çekirdeğe terminal satır sayısını N olarak bildirir\n" +"* size çekirdeğe uygun satır ve sütun sayısını gösterir\n" +" 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:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -10062,26 +9298,27 @@ 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:584 -#, fuzzy +#: src/stty.c:641 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" -"Denetim ayarları:\n" -" [-]clocal modem denetim sinyallerini geçersiz kılar\n" -" [-]cread girdi alımına izin verir\n" -"* [-]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:593 -#, fuzzy +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -10089,17 +9326,14 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" -" [-]cstopb her karakter için iki durma biti kullanılır (`-' ile bir)\n" -" [-]hup son işlem tty'yi kapatırken kapatma (SIGHUP) sinyali " -"gönderilir\n" -" [-]hupcl [-]hup ile aynı\n" -" [-]parenb çıktı için eşlik biti üretilir, girdi için eşlik biti " -"beklenir\n" -" [-]parodd tek eşlik biti kullanılır (`-' ile çift)\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -10107,6 +9341,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Girdi ayarları:\n" @@ -10116,10 +9351,14 @@ msgstr "" " [-]ignbrk kırma karakterlerini yoksayar\n" " [-]igncr satır başı karakterlerini yoksayar\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -10131,14 +9370,23 @@ msgstr "" " [-]inpck girdi eşlik denetimini etkinleştirir\n" " [-]istrip girdi karakterlerinin yüksek (8.) bitini temizler\n" -#: src/stty.c:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 girdi karakterlerinin UTF-8 kodlu olduğunu varsayar\n" -#: src/stty.c:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr " * [-]iutf8 girdi karakterlerinin UTF-8 kodlu olduğunu varsayar\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -10152,61 +9400,83 @@ msgstr "" " [-]parmrk eşlik hatalarını imler (255-0-karakter sıralamasıyla)\n" " [-]tandem [-]ixoff ile aynı\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Çıktı ayarları:\n" -"* bsN geri silme tarzı gecikme, N [0..1] arasında\n" -"* crN satır başı tarzı gecikme, N [0..3] arasında\n" -"* 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:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" -msgstr "" -"* [-]ocrnl satır başını alt satıra geçiş olarak yorumlar\n" -"* [-]ofdel 0 karakteri yerine dolgu için silme karakterini kullanır\n" -"* [-]ofill gecikmeler için zamanlama yapmak yerine dolgu\n" -" karakterlerini kullanır\n" -"* [-]olcuc küçük harfleri büyük harf olarak yorumlar\n" -"* [-]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:643 -msgid "" -" * [-]onocr do not print carriage returns in the first column\n" -" [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 +msgid "" " * 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 "" -"* [-]onocr satır başı karakterini ilk karakter olarak basmaz\n" -" [-]opost işlem sonrası çıktı\n" -"* tabN yatay sekme tarzı gecikme, N [0..3] arasında\n" -"* tabs tab0 ile aynı\n" -"* -tabs tab3 ile aynı\n" -"* vtN düşey sekme tarzı gecikme, N [0..1] arasında\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10217,61 +9487,83 @@ 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 #, fuzzy +msgid " [-]echo echo input characters\n" +msgstr " * [-]iutf8 girdi karakterlerinin UTF-8 kodlu olduğunu varsayar\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -"* [-]ctlecho denetim karakterlerini şapkalı gösterim (`^c') ile yansılar\n" -" [-]echo girdi karakterlerini yansılar\n" -"* [-]echoctl [-]ctlecho ile aynı\n" -" [-]echoe [-]crterase ile aynı\n" -" [-]echok karakteri sildikten sonra bir alt satıra geçiş yansılar\n" -#: src/stty.c:665 -#, fuzzy +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -"* [-]echoke [-]crtkill ile\n" -" [-]echonl diğer karakterler yansılanmamış olsa bile\n" -" alt satıra geçişi yansılar\n" -"* [-]echoprt geriye doğru silinmiş karakterleri `\\' ve '/'\n" -" arasında yansılar\n" -" [-]icanon karakter, satır, sözcük silmeleri ve satır yenileme özel\n" -" karakterlerini etkinleştirir\n" -" [-]iexten POSIX olmayan özel karakterleri etkinleştirir\n" -#: src/stty.c:672 -#, fuzzy +#: src/stty.c:843 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" +msgstr "" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -" [-]isig kesme, çıkış ve dondurma özel karakterlerini etkinleştirir\n" -" [-]noflsh kesme ve çıkış özel karakterlerinden sonra güncellemeyi\n" -" geçersiz kılar\n" -"* [-]prterase [-]echoprt ile aynı\n" -"* [-]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:679 +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -10281,12 +9573,12 @@ msgstr "" " cbreak -icanon ile aynı\n" " -cbreak icanon ile aynı\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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 brkint ignpar istrip icrnl ixon opost isig icanon eof ve " "eol\n" @@ -10294,38 +9586,48 @@ msgstr "" " -cooked raw ile aynı\n" " crt echoe echoctl echoke ile aynı\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -" dec echoe echoctl echoke -ixany intr ^c erase 0177\n" -" kill ^u ile aynı\n" -"* [-]decctlq [-]ixany ile aynı\n" -" ek karakter ve satır silme karakterlerinin öntanımlı\n" -" değerleriyle aynı\n" -" evenp parenb -parodd cs7 ile aynı\n" -#: src/stty.c:699 +#: src/stty.c:919 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 "" -" -evenp -parenb cs8 ile aynı\n" -"* [-]lcase xcase iuclc olcuc ile aynı\n" -" litout -parenb -istrip -opost cs8 ile aynı\n" -" -litout parenb istrip opost cs7 ile aynı\n" -" nl -icrnl -onlcr ile aynı\n" -" -nl icrnl -inlcr -igncr onlcr -ocrnl -onlret ile aynı\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +" -g -l gibi, fakat sahiblerin adları listelenmez\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10339,11 +9641,12 @@ msgstr "" " pass8 -parenb -istrip cs8 ile aynı\n" " -pass8 parenb istrip cs7 ile aynı\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw -ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" @@ -10351,24 +9654,24 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0 ile aynı\n" " -raw cooked ile aynı\n" -#: src/stty.c:720 -#, fuzzy +#: src/stty.c:969 +#, fuzzy, c-format msgid "" -" sane same as cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" +msgstr "" +" sane 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 "" -" sane 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, tüm özel\n" -" karakterlerin öntanımlı değerleriyle aynı.\n" +" -xcase -tostop -echoprt echoctl echoke gibi bütün özel\n" +" karakterler onların var olan değerleri ile aynı\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10377,19 +9680,19 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" "\n" -"Standart girdiye bağlı olan tty hattını yönetir. Argümansız\n" -"çalıştırıldığında iletişim hızını, hat disiplinini, stty sane ayarından\n" +"Standart girdiye bağlı olan tty satırtını yönetir. Argümansız\n" +"çalıştırıldığında iletişim hızını, satır disiplinini, stty sane ayarından\n" "farklı ayarları gösterir. Ayarlarda KRKT yazıldığı gibi ya da ^c, 0x37, " "0177\n" "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:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "sadee tek aygıt belirtilebilir" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10398,82 +9701,125 @@ msgstr "" "ayrıntılı çıktı seçenekleri ile stty-okuyabilir tarzı çıktı\n" "seçenekleri birlikte kullanılamaz" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "bir çıktı tarzı belirtildiğinde kipler ayarlanamaz" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: bloklamayan kip sıfırlanamadı" -#: src/stty.c:896 src/stty.c:1006 -#, fuzzy, c-format +#: src/stty.c:1226 src/stty.c:1350 +#, c-format msgid "invalid argument %s" -msgstr "%s argümanı geçersiz" +msgstr "%s bağımsız değişkeni geçersiz" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 -#, fuzzy, c-format +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 +#, c-format msgid "missing argument to %s" -msgstr "`%s'de argüman kayıp" +msgstr "%s bağımsız değişkeni eksik" -#: src/stty.c:987 +#: src/stty.c:1283 #, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: kısaltmada hata" + +#: src/stty.c:1331 +#, c-format msgid "invalid line discipline %s" -msgstr "geçersiz satır belirleyicisi `%s'" +msgstr "geçersiz satır denetimi %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: istenen işlemlerin tümü yapılamıyor" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: bu aygıt için boyut bilgileri yok" -#: src/stty.c:1924 -#, fuzzy, c-format -msgid "invalid integer argument %s" -msgstr "tamsayı argüman olarak `%s' geçersiz" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" +msgstr "geçersiz tamsayı argümanı %s" #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 -#, fuzzy msgid "Kayvan Aghaiepour" -msgstr "Kayvan Aghaiepour ve David MacKenzie" +msgstr "Kayvan Aghaiepour" #: src/sum.c:62 #, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Her DOSYA'nın CRC sağlama toplamlarını ve bayt sayılarını yazdırır.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" msgstr "" -"Her DOSYA'nın sağlama toplamını ve blok sayısını yazar.\n" +"Her DOSYA'nın sağlama toplamlarını ve blok sayaçlarını yaz.\n" "\n" -" -r BSD toplama algoritmasını kullanır, blok genişliğini 1K " -"alır\n" -" -s, --sysv System V toplama algoritmasını kullanır, blok genişliğini\n" -" 512 bayt alır\n" +" -r BSD toplam algoritmasını kullan, 1K blok kullan\n" +" -s, --sysv Sistem V toplam algoritmasını kullan, 512 bayt blok " +"kullan\n" + +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Kullanım: %s [SEÇENEK] [DOSYA]...\n" -#: src/sync.c:41 +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Değişen blokları diske yazılmaya zorlar ve süper bloğu günceller.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "%s okunurken hata" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: bloklamayan kip sıfırlanamadı" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "%s okunurken hata" -#: src/sync.c:69 +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "argümanların tamamı yoksayılıyor" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10481,26 +9827,35 @@ msgid "" "the version described here. Please refer to your shell's documentation\n" "for details about the options it supports.\n" msgstr "" +"\n" +"NOT: kullanıdığınız kabuk %s programının kendine ait sürümünü içerebilir.\n" +"Bu durumda burada anlatılanlar geçerli değildir. Desteklenen seçenekleri " +"görmek\n" +"için lütfen kullandığınız kabuğun belgelerine başvurun.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help bu yardımı gösterir ve çıkar\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version sürüm bilgisini gösterir ve çıkar\n" -# -#: src/system.h:543 -#, fuzzy +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"DOSYA verilmemişse veya DOSYA - ise, standart girdi okunur.\n" + +#: src/system.h:544 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:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10508,7 +9863,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10517,7 +9872,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -10528,22 +9883,29 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" +"%s çeviri hatalarını " +"adresine rapor edin.\n" -#: src/system.h:584 +#: src/system.h:604 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "Full documentation at: <%s%s>\n" msgstr "" -#: src/system.h:591 -#, fuzzy, c-format +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "" + +#: src/system.h:613 +#, c-format msgid "Try '%s --help' for more information.\n" -msgstr "Daha fazla bilgi için `%s --help' yazın.\n" +msgstr "" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10561,17 +9923,11 @@ msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/tac.c:58 msgid "Jay Lepreau" -msgstr "" +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" +msgid "Write each FILE to standard output, last line first.\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:144 msgid "" @@ -10584,88 +9940,74 @@ msgstr "" " (regex = regular expression (düzenli ifade))\n" " -s, --seperator=AYRAC satırları `\\n' yerine AYRAC ile ayır\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: arama (seek) başarısız" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "kayıt çok büyük" -#: src/tac.c:450 -#, fuzzy, c-format +#: src/tac.c:459 +#, c-format msgid "failed to create temporary file in %s" -msgstr "geçici dosya %s oluşturulamadı" +msgstr "" -#: src/tac.c:458 -#, fuzzy, c-format +#: src/tac.c:467 +#, c-format msgid "failed to open %s for writing" -msgstr "%s: yazmak için açılamadı" +msgstr "" -#: src/tac.c:475 -#, fuzzy, c-format +#: src/tac.c:484 +#, c-format msgid "failed to rewind stream for %s" -msgstr "%s'in zaman damgaları korunamadı" +msgstr "" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: yazma hatası" -#: src/tac.c:571 -#, fuzzy, c-format +#: src/tac.c:587 +#, c-format msgid "failed to open %s for reading" -msgstr "%s okumak için açılamadı" +msgstr "" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "-s 'ten sonra AYRAC belirtilmeli" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" -msgstr "" +msgstr "Ian Lance Taylor" -#: src/tail.c:262 -#, fuzzy, c-format +#: src/tail.c:257 +#, 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 "" -"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:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 -#, fuzzy +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" " an absent option argument means 'descriptor'\n" " -F same as --follow=name --retry\n" msgstr "" -" -f, --follow[={name|descriptor}]\n" -" dosyayı sürekli izler, yeni satırlar\n" -" eklendikçe onları da çıktıya yazar. --" -"follow=name\n" -" dosya ismini kullanarak izler,--" -"follow=descriptor\n" -" dosya açıldığında sistemin döndüğü dosya\n" -" descriptor'ını kullanarak izler.\n" -" -F --follow=name --retry 'ın aynısı \n" - -#: src/tail.c:280 -#, fuzzy, c-format + +#: src/tail.c:275 +#, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" " or use -n +K to output starting with the Kth\n" @@ -10676,35 +10018,15 @@ msgid "" " (this is the usual case of rotated log files);\n" " with inotify, this option is rarely useful\n" msgstr "" -" -n, --lines=SAYI son %d satır yerine son SAYI satırı yazar\n" -" --max-unchanged-stats=N\n" -" --follow=name seçeneği kullanıldığında N " -"denemeden\n" -" sonra DOSYA'da bir değisiklik gözlemlememişse\n" -" silinip silinmediğini veya isminin değistiril-\n" -" mediğinden emin olmak için DOSYA'yı tekrar açar\n" -" (bu seçenek kullanılmadığında %d defa bu işi " -"yapar)\n" -# -#: src/tail.c:293 -#, fuzzy +#: src/tail.c:288 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 if it is inaccessible\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:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -10713,8 +10035,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 -#, fuzzy +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -10724,15 +10045,8 @@ msgid "" "GB 1000*1000*1000, G 1024*1024*1024, and so on for T, P, E, Z, Y.\n" "\n" msgstr "" -"\n" -"SAYI'nin (bayt veya satır sayısı) ilk karakteri `+' ise, \n" -"SAYI'ncı satır veya bayttan itibaren dosyanın içeriğini yazar, aksi halde\n" -"dosyadaki son SAYI girdiyi yazar. SAYI, çarpım soneki alabilir:\n" -"b = 512, k = 1024, m = 1024*1024.\n" -"\n" -#: src/tail.c:316 -#, fuzzy +#: src/tail.c:311 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" @@ -10741,175 +10055,171 @@ 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 "" -"Bazı durumlarda belli bir dosya adını\n" -"izlemek istiyor olabilirsiniz, o zaman --follow=name seçeneğini kullanın\n" -"(örneğin `tail --follow=name deneme' dediğinizde, deneme dosyası arada\n" -"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:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "%s kapatılıyor (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, 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:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 -#, fuzzy, c-format +#: src/tail.c:958 +#, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" -msgstr "`%s' ismi artık izlenemeyecek bir dosyaya ait" +msgstr "" -#: src/tail.c:980 -#, fuzzy, c-format +#: src/tail.c:973 +#, c-format msgid "%s has become inaccessible" -msgstr "`%s' dosyası okunamaz hale geldi" +msgstr "%s ulaşılamaz olmuş" -#: src/tail.c:997 -#, fuzzy, c-format +#: src/tail.c:990 +#, 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" +msgstr "" +"%s bir sonu gösterilemez dosya ile yer değiştirildi. Bu isim bırakılıyor" -#: src/tail.c:1006 -#, fuzzy, c-format +#: src/tail.c:999 +#, 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" +msgstr "" -#: src/tail.c:1027 -#, fuzzy, c-format +#: src/tail.c:1020 +#, c-format msgid "%s has become accessible" -msgstr "`%s' dosyası tekrar okunabilir hale geldi" +msgstr "%s dosyası yeniden erişilebilir hale geldi" -#: src/tail.c:1035 +#: src/tail.c:1032 #, fuzzy, c-format -msgid "%s has appeared; following end of new file" -msgstr "`%s' ortaya çıktı; yeni dosyanın sonu takip ediliyor" +msgid "%s has appeared; following new file" +msgstr "%s göründü; yeni dosyanın sonu takip ediliyor" -#: src/tail.c:1046 +#: src/tail.c:1042 #, fuzzy, c-format -msgid "%s has been replaced; following end of new file" -msgstr "`%s' tekrar okunabilir hale geldi; yeni dosyayı izlemeye devam" +msgid "%s has been replaced; following new file" +msgstr "`%s' değiştirildi; yeni dosyanın sonu izlemeye devam ediliyor" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: bloklamayan kip değiştirilemedi" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: dosya kısaldı" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "üzerinde çalışabilecek dosya kalmadı" -#: src/tail.c:1424 -#, fuzzy, c-format +#: src/tail.c:1440 +#, c-format msgid "cannot watch parent directory of %s" -msgstr "şimdiki dizin durumlanamadı (şimdi %s)" +msgstr "" -#: src/tail.c:1427 src/tail.c:1442 -#, fuzzy, c-format +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 +#, c-format msgid "inotify resources exhausted" -msgstr "bellek tükendi" +msgstr "" -#: src/tail.c:1445 src/tail.c:1577 -#, fuzzy, c-format +#: src/tail.c:1464 src/tail.c:1636 +#, c-format msgid "cannot watch %s" -msgstr "`touch' %s yapılamadı" +msgstr "" + +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: %s'un üzerine yazılsın mı?" -#: src/tail.c:1529 +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1549 -#, fuzzy, c-format +#: src/tail.c:1597 +#, c-format msgid "error reading inotify event" -msgstr "%s'i okunurken hata" +msgstr "" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "%s: tail bu çeşit dosyayı takip edemez" -#: src/tail.c:1961 -#, fuzzy, c-format -msgid "number in %s is too large" -msgstr "`%s' içindeki sayı çok büyük" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "%s:--max-unchanged-stats seçeneğiyle verilen argüman geçersiz" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: geçersiz PID" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: geçersiz saniye sayısı" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "sütunlarda bilinmeyen numara: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" -msgstr "" +msgstr "seçenek geçersiz bağlamda kullanıldı --%c" -#: src/tail.c:2096 -#, fuzzy, c-format +#: src/tail.c:2135 +#, c-format msgid "warning: --retry ignored; --retry is useful only when following" -msgstr "uyarı: --pid=PID sadece -f seçeneğiyle kullanıldığında bir anlam taşır" +msgstr "" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "uyarı: --pid=PID sadece -f seçeneğiyle kullanıldığında bir anlam taşır" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "uyarı: --pid=PID bu sistemde desteklenmiyor" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "%s adı ile takip edilemiyor" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "uyarı: standart girdiyi sonsuza dek takip etmek verimli değildir" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -10921,66 +10231,72 @@ msgstr "" " -a, --append DOSYAların üzerine yazmaz sonuna ekler\n" " -i, --ignore-interrupts kesme sinyallerini yoksayar\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"DOSYA verilmemişse veya DOSYA - ise, standart girdi tekrar kopyalanır.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "%s sonrasında eksik argüman" -#: src/test.c:159 -#, fuzzy, c-format +#: src/test.c:161 +#, c-format msgid "invalid integer %s" -msgstr "geçersiz sayı %s" +msgstr "geçersiz tam sayı %s" -#: src/test.c:241 -#, fuzzy +#: src/test.c:243 msgid "')' expected" -msgstr "')' gerekli\n" +msgstr "')' hariç" -#: src/test.c:244 -#, fuzzy, c-format +#: src/test.c:246 +#, c-format msgid "')' expected, found %s" -msgstr "')' gerekirken, %s bulundu\n" +msgstr "')' hariç %s bulundu" -#: src/test.c:260 src/test.c:618 -#, fuzzy, c-format +#: src/test.c:262 src/test.c:620 +#, c-format msgid "%s: unary operator expected" -msgstr "%s: bir terimli işlemimi olabilir\n" +msgstr "%s: tek terimli işlemci bekledi" -#: src/test.c:329 -#, fuzzy +#: src/test.c:331 msgid "-nt does not accept -l" -msgstr "-nt -l ile kullanılmaz\n" +msgstr "-nt, -l'yi kabul etmiyor" -#: src/test.c:342 -#, fuzzy +#: src/test.c:344 msgid "-ef does not accept -l" -msgstr "-ef -l ile kullanılmaz\n" +msgstr "-ef, -l'yi kabul etmiyor" -#: src/test.c:358 -#, fuzzy +#: src/test.c:360 msgid "-ot does not accept -l" -msgstr "-ot -l ile kullanılmaz\n" +msgstr "-ot -l'yi kabul etmiyor" -#: src/test.c:367 -#, fuzzy +#: src/test.c:369 msgid "unknown binary operator" -msgstr "bilinmeyen ikilik işlemimi\n" +msgstr "bilinmeyen ikili işleç" -#: src/test.c:646 -#, fuzzy, c-format +#: src/test.c:648 +#, c-format msgid "%s: binary operator expected" -msgstr "%s: iki terimli işlemimi olabilir\n" +msgstr "%s: iki terimli işlemci bekledi" -#: src/test.c:704 -#, fuzzy +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -10988,15 +10304,13 @@ msgid "" " or: [ ]\n" " or: [ OPTION\n" msgstr "" -"Kullanımı: test İFADE\n" -" veya: test\n" -" veya: [ İFADE ]\n" -" veya: [ ]\n" -" ya da: [ SEÇENEK\n" -"İFADE ile belirtilen durum ile çıkar.\n" -"\n" +"Kullanım: EXPRESSION test et\n" +" veya: test et\n" +" veya: [ EXPRESSION ]\n" +" veya: [ ]\n" +" ya da: [ OPTION\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11004,7 +10318,7 @@ msgstr "" "İFADEye göre üretilen durum kodu ile çıkar.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11015,7 +10329,7 @@ msgstr "" "İFADEnin sonucunun doğru ya da yanlış olmasına göre aşağıdaki\n" "çıkış durumlarından biri belirlenir:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11029,7 +10343,7 @@ msgstr "" " İFADE1 -a İFADE2 İFADE1 ve İFADE2 her ikisi de doğrudur\n" " İFADE1 -o İFADE2 ya İFADE1 ya da İFADE2 doğrudur\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11045,7 +10359,7 @@ msgstr "" " DİZGE1 = DİZGE2 DİZGEler eşittir\n" " DİZGE1 != DİZGE2 DİZGEler farklıdır\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11063,7 +10377,7 @@ msgstr "" " TAMSAYI1 -lt TAMSAYI2 TAMSAYI1 TAMSAYI2den küçüktür\n" " TAMSAYI1 -ne TAMSAYI2 TAMSAYI1 TAMSAYI2den farklıdır\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11075,7 +10389,7 @@ msgstr "" " DOSYA1 -nt DOSYA2 DOSYA1 DOSYA2den daha yenidir\n" " DOSYA1 -ot DOSYA2 DOSYA1 DOSYA2den daha eskidir\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11089,7 +10403,7 @@ msgstr "" " -d DOSYA DOSYA vardır ve bir dizindir\n" " -e DOSYA DOSYA vardır\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11103,7 +10417,7 @@ msgstr "" " -h DOSYA DOSYA vardır ve sembolik bağdır (-L ile aynı)\n" " -k DOSYA DOSYA vardır ve kalıcı biti ayarlıdır\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11117,7 +10431,7 @@ msgstr "" " -r DOSYA DOSYA vardır ve okunabilirdir\n" " -s DOSYA DOSYA vardır ve uzunluğu sıfırdan büyüktür\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11132,7 +10446,7 @@ msgstr "" " -w DOSYA DOSYA vardır ve yazılabilirdir\n" " -x DOSYA DOSYA vardır ve çalıştırılma (veya arama) izni verilmiştir\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11145,35 +10459,35 @@ msgstr "" "Parantezlerin kabukta öncelem (örn. tersbölü ile) gerektirdiğini unutmayın.\n" "TAMSAYI yerine DİZGE uzunluğuna karşılık olarak -l DİZGE kullanılabilir.\n" -#: src/test.c:786 +#: src/test.c:788 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 "" +"\n" +"NOT: [ --help ve --version seçenekleri kabul eder, fakat test etmez.\n" +"test bunların herbirine boş olmayan STRING gibi davranır.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" -msgstr "" +msgstr "sına ve/veya [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 -#, fuzzy +#: src/test.c:805 msgid "Kevin Braunsdorf" -msgstr "Kevin Braunsdorf ve Matthew Bradburn" +msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 -#, fuzzy +#: src/test.c:806 msgid "Matthew Bradburn" -msgstr "Kevin Braunsdorf ve Matthew Bradburn" +msgstr "Matthew Bradburn" -#: src/test.c:858 -#, fuzzy +#: src/test.c:860 msgid "missing ']'" -msgstr "`]' eksik\n" +msgstr "" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "%s argümanı fazla" @@ -11193,20 +10507,18 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 -#, fuzzy, c-format +#: src/timeout.c:230 +#, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" " or: %s [OPTION]\n" msgstr "" -"Kullanımı: %s BİÇEM [ARGÜMAN]...\n" -" veya: %s SEÇENEK\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11224,7 +10536,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11232,7 +10544,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -11243,30 +10555,35 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" #: src/timeout.c:474 -#, fuzzy, c-format +#, c-format msgid "error waiting for command" -msgstr "%s'e yazarken hata" +msgstr "" #: src/timeout.c:485 #, c-format msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" -msgstr "" +msgstr "Jim Kingdon" #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:45 msgid "Randy Smith" -msgstr "" +msgstr "Randy Smith" #: src/touch.c:115 src/touch.c:309 #, c-format @@ -11295,21 +10612,14 @@ msgid "" msgstr "" #: src/touch.c:225 -#, fuzzy 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 yalnız erişim zamanını günceller\n" -" -c, --no-create dosya oluşturmaz\n" -" -d, --date=DİZGİ DİZGİyi tarar ve şimdiki zaman yerine kullanır\n" -" -f (yoksayılıyor)\n" -" -m yalnız değişim tarihini günceller\n" #: src/touch.c:231 -#, fuzzy msgid "" " -h, --no-dereference affect each symbolic link instead of any " "referenced\n" @@ -11317,13 +10627,8 @@ msgid "" " timestamps of a symlink)\n" " -m change only the modification time\n" msgstr "" -" -h, --no-dereference her sembolik bağın kendisini etkiler, bağın " -"imlediği\n" -" dosyayı değil. (yalnızca sembolik bağ sahibiyetini\n" -" değiştirebilen sistemlerde bulunur.\n" #: src/touch.c:237 -#, fuzzy msgid "" " -r, --reference=FILE use this file's times instead of current time\n" " -t STAMP use [[CC]YY]MMDDhhmm[.ss] instead of current time\n" @@ -11331,15 +10636,6 @@ msgid "" " WORD is access, atime, or use: equivalent to -a\n" " WORD is modify or mtime: equivalent to -m\n" msgstr "" -" -r, --reference=DOSYA şimdiki zaman yerine bu DOSYAnın zaman damgalarını\n" -" kullanır\n" -" -t DAMGA şimdiki zaman yerine [[YY]YY]AAGGssdd[ss] değerini\n" -" kullanır\n" -" --time=SÖZCÜK SÖZCÜKle belirtilen zaman damgasını değiştirir:\n" -" access (erişim) atime (erişim) use (kullanım, -a " -"ile\n" -" aynı) modify (değişim) mtime (değişim, -m ile " -"aynı)\n" #: src/touch.c:246 msgid "" @@ -11355,13 +10651,10 @@ msgid "cannot specify times from more than one source" msgstr "zaman birden fazla kaynaktan belirtilemez" #: src/touch.c:409 -#, fuzzy, c-format +#, c-format msgid "" "warning: 'touch %s' is obsolete; use 'touch -t %04ld%02d%02d%02d%02d.%02d'" msgstr "" -"uyarı: `touch %s' artık kullanılmıyor; `touch -t %04ld%02d%02d%02d%02d." -"%02d'\n" -" kullanılmalı" #: src/tr.c:286 #, c-format @@ -11369,7 +10662,6 @@ msgid "Usage: %s [OPTION]... SET1 [SET2]\n" msgstr "Kullanım: %s [SEÇENEK]... KÜME1 [KÜME2]\n" #: src/tr.c:290 -#, fuzzy msgid "" "Translate, squeeze, and/or delete characters from standard input,\n" "writing to standard output.\n" @@ -11382,15 +10674,6 @@ msgid "" " of that character\n" " -t, --truncate-set1 first truncate SET1 to length of SET2\n" msgstr "" -"Standart girdiden okuduğu karakterleri çevirerek, sıkıştırarak ve/veya\n" -"silerek standart çıktıya yazar\n" -"\n" -" -c, -C, --complement KUME1'in tümleyicisi\n" -" -d, --delete KUME1'deki karakterleri siler, çeviri yapmaz\n" -" -s, --squeeze-repeats aynı karakterden oluşmus sırayi siler yerine \n" -" o karakterden bir tane koyar\n" -" -t, --truncate-set1 ilk önce KUME1'i, KUME2'nin boyuna eşit olacak \n" -" şekilde kısaltır\n" #: src/tr.c:303 msgid "" @@ -11477,45 +10760,54 @@ msgid "" "translating nor deleting; else squeezing uses SET2 and occurs after\n" "translation or deletion.\n" msgstr "" +"\n" +"Çeviri eğer -d verilmez ve hem SET1 hem de SET2 ortaya çıkarsa oluşur.\n" +"-t sadece çevirildiğinde kullanılabilir. SET2, gerektiğinde son karakteri\n" +"tekrarlanırsa SET1'in genişlince uzatılır. SET2'nin artık karakterleri\n" +"göz ardı edilir. Sadece [:alt:] ve [:üst:] artan sıralamada\n" +"genişletmek için güvenceye alınır. SET2'de çevrilirken sadece çiftler\n" +"özel durum değişimlerinde kullanılır. -s eğer hem SET1 çevrilirken\n" +"hem de silinirken kullanılır. Aksi durumda sıkıştırma SET2'de kullanılır\n" +"ve çeviri ve silme işlemlerinden sonra meydana gelir.\n" #: src/tr.c:509 -#, fuzzy, c-format +#, c-format msgid "" "warning: the ambiguous octal escape \\%c%c%c is being\n" "\tinterpreted as the 2-byte sequence \\0%c%c, %c" msgstr "" -"uyarı: net olmayan \\%c%c%c sekizlik ters kesik gösteririmi \n" -"\t \\0%c%c,`%c' sırası olarak algılanıyor " +"uyarı: belirsiz sekizli çıkış \\%c%c%c \t \n" +"2'lik bayt sıralaması \\0%c%c, %c şeklinde yorumlanıyor" #: src/tr.c:518 -#, fuzzy, c-format +#, c-format msgid "warning: an unescaped backslash at end of string is not portable" -msgstr "%s: uyarı: sembolik bağa sabit bağ oluşturmak taşınabilirliği bozar" +msgstr "uyarı: koşulun sonundaki sola eğik çıkışsız bir çizgi (\\) taşınamaz" #: src/tr.c:673 -#, fuzzy, c-format +#, c-format msgid "range-endpoints of '%s-%s' are in reverse collating sequence order" -msgstr "alan sınırları '%s-%s' ters sıralılar" +msgstr "" #: src/tr.c:829 -#, fuzzy, c-format +#, c-format msgid "invalid repeat count %s in [c*n] construct" -msgstr "'%s' de geçersiz [c*n] tekrar yapısı" +msgstr "[c*n] içerisinde geçersiz '%s' yeniden sayısı" #: src/tr.c:910 -#, fuzzy, c-format +#, c-format msgid "missing character class name '[::]'" -msgstr "`[:' ile `:]' arasında bir eşitlik sınıfı belirtilmeli" +msgstr "" #: src/tr.c:913 -#, fuzzy, c-format +#, c-format msgid "missing equivalence class character '[==]'" -msgstr "`[=' ile `=]' arasında bir eşitlik sınıfı belirtilmeli" +msgstr "" #: src/tr.c:928 -#, fuzzy, c-format +#, c-format msgid "invalid character class %s" -msgstr "geçersiz karakter sınıfı `%s'" +msgstr "geçersiz karakter sınıfı %s" #: src/tr.c:947 #, c-format @@ -11556,13 +10848,11 @@ msgid "[=c=] expressions may not appear in string2 when translating" msgstr "KUME2'de çeviri yaparken [=c=] ifadeleri yer alamaz" #: 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 "" -"çeviri yaparken, KUME2'de kullanılabilecek karakter sınıfları:\n" -" upper, lower" #: src/tr.c:1520 #, c-format @@ -11584,11 +10874,9 @@ msgid "the [c*] construct may appear in string2 only when translating" msgstr "[c*] ifadesi KUME2'de sadece çeviri yaparken kullanılabilir" #: src/tr.c:1788 -#, fuzzy msgid "Two strings must be given when both deleting and squeezing repeats." msgstr "" -"tekrar edilen karakterler bire indirgeme ve silme beraber yapılılrken\n" -" iki KUME verilmeli" +"Hem silme hem de sıkıştırma işlemi tekrarlandığında iki dizge verilmelidir." #: src/tr.c:1790 msgid "Two strings must be given when translating." @@ -11601,28 +10889,28 @@ msgstr "" "sadece bir dizge verilmeli." #: src/true.c:38 -#, fuzzy, c-format +#, c-format msgid "" "Usage: %s [ignored command line arguments]\n" " or: %s OPTION\n" msgstr "" -"Kullanımı: %s İSİM\n" -" veya: %s SEÇENEK\n" +"Kullanım: %s [yoksayılan komut satır argümanları]\n" +" veya: %s OPTION\n" #: src/true.c:45 msgid "Exit with a status code indicating success." -msgstr "" +msgstr "Başarıyı belirten durum koduyla çıkış yap." #: src/true.c:46 msgid "Exit with a status code indicating failure." -msgstr "" +msgstr "Hatayı belirten bir durum kodu ile çık." -#: src/truncate.c:96 -#, fuzzy, c-format +#: src/truncate.c:69 +#, c-format msgid "Usage: %s OPTION... FILE...\n" -msgstr "Kullanım: %s [SEÇENEK]... DOSYA...\n" +msgstr "Kullanım: %s SEÇENEK... DOSYA...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -11633,22 +10921,22 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" -msgstr "" +msgstr " -c, --no-create hiçbir dosya oluşturma\n" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -11656,57 +10944,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" -msgstr "" +msgstr "% * % baytlı bloklarda taşma (dosya %s için)" -#: src/truncate.c:173 -#, fuzzy, c-format +#: src/truncate.c:146 +#, c-format msgid "%s has unusable, apparently negative size" -msgstr "%s: dosya büyüklüğü negatif" +msgstr "%s faydasız, muhtemelen negatif boyut" -#: src/truncate.c:183 src/truncate.c:384 -#, fuzzy, c-format +#: src/truncate.c:156 src/truncate.c:358 +#, c-format msgid "cannot get the size of %s" -msgstr "günün zamanı belirlenemedi" +msgstr "%s boyutundan kurtulunamıyor" -#: src/truncate.c:205 -#, fuzzy, c-format +#: src/truncate.c:178 +#, c-format msgid "overflow rounding up size of file %s" -msgstr "%s dosya okunurken görece taşması" +msgstr "%s dosyasının boyutunda yukarı yuvarlama taşması" -#: src/truncate.c:215 -#, fuzzy, c-format +#: src/truncate.c:188 +#, c-format msgid "overflow extending size of file %s" -msgstr "%s dosya okunurken görece taşması" +msgstr "%s dosyasının boyut taşmasında genişleme" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "" -#: src/truncate.c:303 -#, fuzzy, c-format +#: src/truncate.c:276 +#, c-format msgid "multiple relative modifiers specified" -msgstr "birden fazla hedef dizin belirtilmiş" +msgstr "göreceli çarpım değiştiriciler belirtildi" -#: src/truncate.c:333 -#, fuzzy, c-format +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "geçersiz sayı" + +#: src/truncate.c:307 +#, c-format msgid "you must specify either %s or %s" -msgstr "bayt, karakter ya da alan listesi belirtilmelidir" +msgstr "" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" -msgstr "" +msgstr "%s belirtildi, fakat %s değil" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "%s yazmak için açılamadı" @@ -11714,15 +11007,13 @@ msgstr "%s yazmak için açılamadı" #. This is a proper name. See the gettext manual, section Names. #: src/tsort.c:40 msgid "Mark Kettenis" -msgstr "" +msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "Kullanım: %s [SECENEK] [DOSYA] \n" "DOSYA'daki kısmi sıralamayı (kısmi sıralama=partial ordering, \n" @@ -11731,12 +11022,17 @@ msgstr "" "(tsort = topological sort, topolojik sıralama)\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: girdide tek sayılı andaç var" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: girdide bir döngü (döngü=loop, Graph Teorideki anlamında) var" @@ -11757,7 +11053,6 @@ msgid "not a tty" msgstr "bir tty değil" #: src/uname.c:124 -#, fuzzy msgid "" "Print certain system information. With no OPTION, same as -s.\n" "\n" @@ -11767,15 +11062,15 @@ msgid "" " -n, --nodename print the network node hostname\n" " -r, --kernel-release print the kernel release\n" msgstr "" -"Sistem hakkında bazı bilgiler gösterir. SEÇENEKsiz -s ile aynıdır.\n" +"Belirli sistem bilgilerini yaz. SEÇENEK olmadan -s ile aynı.\n" "\n" -" -a, --all tüm bilgileri gösterir\n" -" -m, --machine makina türünü (donanımı) gösterir\n" -" -n, --nodename makinanın ağ ismini gösterir\n" -" -r, --release işletim sisteminin dağıtım numarasını gösterir\n" +" -a, --all sıralamaya uyarak tüm bilgileri yaz,\n" +" eğer bilinmiyorsa -p ve -i atlama hariç:\n" +" -s, --kernel-name çekirdek adını yaz\n" +" -n, --nodename ana ağ bilgisayarının adını yaz\n" +" -r, --kernel-release çekirdek sürümünü yaz\n" #: src/uname.c:133 -#, fuzzy msgid "" " -v, --kernel-version print the kernel version\n" " -m, --machine print the machine hardware name\n" @@ -11783,16 +11078,20 @@ msgid "" " -i, --hardware-platform print the hardware platform or \"unknown\"\n" " -o, --operating-system print the operating system\n" msgstr "" -" -v, --kernel-version çekirdek sürümünü gösterir\n" -" -p, --processor makinanın işlemci türünü gösterir\n" -" -i, --hardware-platform makinanın donanım türünü gösterir\n" -" -o, --operating-system işletim sistemi türünü gösterir\n" +" -v, --kernel-version çekirdek sürümünü yazdırır\n" +" -m, --machine donanım ismini yazdırır\n" +" -p, --processor işlemci tipini veya \"bilinmeyen\" yazdırır\n" +" -i, --hardware-platform donanım platformunu veya \"bilinmeyen\" " +"yazdırır\n" +" -o, --operating-system işletim sistemini yazdırır\n" #: src/uname.c:143 msgid "" "Print machine architecture.\n" "\n" msgstr "" +"Makine mimarisini yazdır\n" +"\n" #: src/uname.c:286 #, c-format @@ -11801,31 +11100,25 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\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" +"DOSYA verilmemişse veya DOSYA - ise, standart girdi tekrar kopyalanır.\n" #: src/unexpand.c:124 -#, fuzzy msgid "" " -a, --all convert all blanks, instead of just initial blanks\n" " --first-only convert only leading sequences of blanks (overrides -a)\n" " -t, --tabs=N have tabs N characters apart instead of 8 (enables -a)\n" " -t, --tabs=LIST use comma separated LIST of tab positions (enables -a)\n" msgstr "" -" -a, --all tüm boşlukları dikkate alır, yalnızca baştaki " -"boşlukları\n" -" değil\n" -" --first-only yalnızca baştaki boşlukları çevirir\n" -" (-a'yı etkisizleştirir)\n" -" -t, --tabs=SAYI sekme genişliğini 8 değil SAYI olarak alır (-a'yı \n" -" etkinleştirir)\n" -" -t, --tabs=LİSTE virgüllerle ayrılmış sekme pozisyonları LİSTEsini\n" -" kullanır (-a'yı etkinleştirir)\n" +" -a, --all ilk boşluklar yerine tüm boşlukları dönüştür\n" +" -first-only sadece ilk diziyi oluşturan boşlukları dönüştür (-a 'yı " +"geçersiz kılar)\n" +" -t, --tabs=N etiketler 8 yerine N kadar karaktere sahiptir (-a geçerli " +"olur)\n" +" -t, --tabs=LIST virgülle ayrılmış liste şeklinde etiket konumları (-a " +"geçerli olur)\n" #: src/unexpand.c:152 #, c-format @@ -11833,9 +11126,9 @@ msgid "tabs are too far apart" msgstr "sekmeler fazla aralı" #: src/unexpand.c:504 -#, fuzzy, c-format +#, c-format msgid "tab stop value is too large" -msgstr "sekme boyu %s çok büyük" +msgstr "etiket durdurma değeri fazla büyük" #: src/uniq.c:170 #, c-format @@ -11851,18 +11144,15 @@ msgid "" msgstr "" #: src/uniq.c:183 -#, fuzzy msgid "" " -c, --count prefix lines by the number of occurrences\n" " -d, --repeated only print duplicate lines, one for each group\n" msgstr "" -" -c, --count her satır başına tekrar sayısını yazar\n" -" -d, --repeated sadece aynısından iki tane olan satırları gösterir\n" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -11873,7 +11163,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -11890,15 +11180,14 @@ msgstr "" " -w, --check-chars=N her satırda N'den fazla karakter karşılaştırmaz\n" #: src/uniq.c:212 -#, fuzzy 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" -"Aralıksız devam eden boşluklara alan denir\n" -"-s ve -f seçenekleri kullanıldığında alanlar karakterlerden önce atlanır.\n" +"Alan genellikle space ve/veya SEKME boşluklarının çalışmasıdır, sonra " +"boşluksuz karakterler. Alanlar karakterlerden önce atlanır.\n" #: src/uniq.c:217 msgid "" @@ -11931,11 +11220,9 @@ msgid "--group is mutually exclusive with -c/-d/-D/-u" msgstr "" #: src/uniq.c:652 -#, fuzzy, c-format +#, c-format msgid "grouping and printing repeat counts is meaningless" -msgstr "" -"hem aynı olan satırların yazılmasına izin vermek hem de aynı\n" -" olan satırların sayısını yazdırmak anlamsız" +msgstr "tekrar sayılarını gruplama ve yazdırma anlamsız" #: src/uniq.c:659 #, c-format @@ -11969,29 +11256,29 @@ msgstr "sistemin başlama zamanı alınamadı" #. TRANSLATORS: This prints the current clock time. #: src/uptime.c:136 msgid " %H:%M%P " -msgstr "" +msgstr " %H:%M%P " #: src/uptime.c:138 -#, fuzzy, c-format +#, c-format msgid " ??:???? " -msgstr " ??:???? yukarı " +msgstr " ??:???? " #: src/uptime.c:140 -#, fuzzy, c-format +#, c-format msgid "up ???? days ??:??, " -msgstr "???? gün ??:??, " +msgstr "açık: ???? gün ??:??, " #: src/uptime.c:144 #, c-format msgid "up %ld day %2d:%02d, " msgid_plural "up %ld days %2d:%02d, " -msgstr[0] "" -msgstr[1] "" +msgstr[0] "açık: %ld gün %2d:%02d, " +msgstr[1] "açık: %ld gün %2d:%02d, " #: src/uptime.c:149 -#, fuzzy, c-format +#, c-format msgid "up %2d:%02d, " -msgstr "Şu an %2d:%02d%s, " +msgstr "açık: %2d:%02d, " #: src/uptime.c:151 #, c-format @@ -12003,21 +11290,18 @@ msgstr[1] "%lu kullanıcı" #: src/uptime.c:161 #, c-format msgid ", load average: %.2f" -msgstr " çalışıyor, yük ortalaması: %.2f" +msgstr ", yük ortalaması: %.2f" #: src/uptime.c:199 -#, fuzzy, c-format +#, 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 "" -"Şimdiki zamanı, sistemin çalışır durumda olduğu süreyi, sistemdeki " -"kullanıcı\n" -"sayısını, ve son 1, 5 ve 15 dakika içerisinde kuyruktaki ortalama iş\n" -"sayısını gösterir.\n" -"DOSYA belirtilmezse %s kullanılır. Dosya olarak %s kullanımı yaygındır.\n" -"\n" +"Şu anki zamanı, sistemin biten zamanı olarak yaz,\n" +"çalışan dizide son 1, 5 ve 15 dakika içinde\n" +"sistemdeki kullanıcı sayısı ve ortalama iş sayısı" #: src/uptime.c:208 #, c-format @@ -12025,20 +11309,16 @@ msgid "" " Processes in\n" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" - -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "" +" Kesilemez\n" +"bir uyku durumunda ortalama yüke hizmet veren süreçler.\n" #: src/uptime.c:214 -#, fuzzy, c-format +#, c-format msgid "" "If FILE is not specified, use %s. %s as FILE is common.\n" "\n" msgstr "" -"DOSYAya göre çalışmakta olan kullanıcıları gösterir.\n" -"DOSYA verilmezse %s kullanılır. DOSYA olarak %s kullanımı yaygındır.\n" +"Eğer DOSYA belirtilmemişse, %s kullan. DOSYA olarak %s ortaktır.\n" "\n" #: src/users.c:106 @@ -12052,34 +11332,37 @@ msgstr "" "DOSYA verilmezse %s kullanılır. DOSYA olarak %s kullanımı yaygındır.\n" "\n" -#: src/wc.c:117 -#, fuzzy +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +msgid "" +"\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 "" -"Her DOSYA için satır, kelime ve bayt sayılarını, ve birden fazla DOSYA \n" -"verilmişse toplam değerlerini yazar. Eğer hiç DOSYA ismi verilmemiş veya \n" -"DOSYA - ise standart girdiden okur.\n" -" -c, --bytes bayt sayısını yazar\n" -" -m, --chars karakter sayısını yazar\n" -" -l, --lines satır sayısını (\\n sayısı) yazar\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" +" --files0-from=F F dosyasındaki girişi NUL bekleme adları\n" +" tarafından belirtilmiş dosyadan oku;\n" +" Eğer F - ise adları standart girişten oku\n" +" -L, --max-line-length en uzun satırın uzunluğunu yaz\n" +" -w, --words kelime sayaçlarını yaz\n" #: src/who.c:210 msgid " old " @@ -12087,7 +11370,7 @@ msgstr " eski " #: src/who.c:440 msgid "system boot" -msgstr "" +msgstr "sistem önyükleme" #: src/who.c:447 src/who.c:449 msgid "id=" @@ -12103,7 +11386,7 @@ msgstr "çıkış=" #: src/who.c:485 msgid "LOGIN" -msgstr "" +msgstr "OTURUM" #: src/who.c:505 msgid "clock change" @@ -12132,7 +11415,7 @@ msgstr "İSİM" #: src/who.c:559 msgid "LINE" -msgstr "HAT" +msgstr "SATIR" #: src/who.c:559 msgid "TIME" @@ -12140,7 +11423,7 @@ msgstr "SAAT" #: src/who.c:559 msgid "IDLE" -msgstr "ATIL " +msgstr "BOŞTA" #: src/who.c:560 msgid "PID" @@ -12148,7 +11431,7 @@ msgstr "PID" #: src/who.c:560 msgid "COMMENT" -msgstr "AÇIKLAMA" +msgstr "YORUM" #: src/who.c:560 msgid "EXIT" @@ -12161,7 +11444,7 @@ msgstr "Kullanımı: %s [SEÇENEK]... [ DOSYA | ARG1 ARG2 ]\n" #: src/who.c:641 msgid "Print information about users who are currently logged in.\n" -msgstr "" +msgstr "Şu anda oturum açmış kullanıcılar hakkında bilgi yazdır.\n" #: src/who.c:644 msgid "" @@ -12179,7 +11462,7 @@ msgstr "" #: src/who.c:651 msgid " -l, --login print system login processes\n" -msgstr "" +msgstr " -l, --login sistem giriş süreçlerini yazdır\n" #: src/who.c:654 msgid "" @@ -12217,31 +11500,27 @@ msgstr "" " --writable -T ile aynı\n" #: src/who.c:673 -#, fuzzy, c-format +#, c-format msgid "" "\n" "If FILE is not specified, use %s. %s as FILE is common.\n" "If ARG1 ARG2 given, -m presumed: 'am i' or 'mom likes' are usual.\n" msgstr "" -"\n" -"DOSYA belirtilmezse %s kullanılır. DOSYA olarak %s kullanımı yaygındır.\n" -"ARG1 ARG2 verilmişse, -m varsayılır: `who am i' (ben kimim) ya da\n" -"`who mom likes' (annem kimi sever) gibi kullanımlar mümkündür.\n" #: src/whoami.c:45 -#, fuzzy msgid "" "Print the user name associated with the current effective user ID.\n" "Same as id -un.\n" "\n" msgstr "" -"Geçerli olan etkin kullanıcı kimliğine karşılık gelen ismi yazar.\n" -"`id -un' ile aynıdır.\n" +"Geçerli etkin kullanıcı kimliği ile ilişkili kullanıcı adını yazdır.\n" +"id -un ile olduğu gibi.\n" +"\n" -#: src/whoami.c:91 +#: src/whoami.c:87 #, fuzzy, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%u kullanıcı kimliğinin ismi bulunamıyor" +msgid "cannot find name for user ID %lu" +msgstr "%s: %lu kullanıcı kimliğinin ismi bulunamıyor.\n" #: src/yes.c:41 #, c-format @@ -12253,12 +11532,121 @@ msgstr "" " veya: %s SEÇENEK\n" #: src/yes.c:47 -#, fuzzy msgid "" "Repeatedly output a line with all specified STRING(s), or 'y'.\n" "\n" msgstr "" -"Belirtilmişse DİZGE(ler)den, yoksa `y'den oluşan satırları sürekli üretir.\n" + +#~ msgid "failed to %s supplemental groups" +#~ msgstr "tümleyici grupları %s başarısız" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: geçersiz sayı" + +#~ msgid "invalid number %s" +#~ msgstr "geçersiz sayı %s" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s bu bilgisayarda kullanılamayacak kadar büyük bir sayı" + +#~ msgid "number of lines" +#~ msgstr "satır sayısı" + +#~ msgid "number of bytes" +#~ msgstr "bayt sayısı" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: geçersiz bayt sayısı" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: geçersiz satır sayısı" + +#~ 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 KRKT KRKT izleyen özel karakterin yorumlanmasını " +#~ "engelleyecektir\n" +#~ " quit KRKT KRKT bir çıkış (SIGQUIT) sinyali gönderecektir\n" +#~ "* rprnt KRKT KRKT bulunulan satırı yeniden yazacaktır\n" +#~ " start KRKT KRKT durdurulduktan sonra çıktıyı yeniden başlatacaktır\n" + +#~ 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 "" +#~ "\n" +#~ "Çıktı ayarları:\n" +#~ "* bsN geri silme tarzı gecikme, N [0..1] arasında\n" +#~ "* crN satır başı tarzı gecikme, N [0..3] arasında\n" +#~ "* 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" + +#~ 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 "" +#~ "* [-]onocr satır başı karakterini ilk karakter olarak basmaz\n" +#~ " [-]opost işlem sonrası çıktı\n" +#~ "* tabN yatay sekme tarzı gecikme, N [0..3] arasında\n" +#~ "* tabs tab0 ile aynı\n" +#~ "* -tabs tab3 ile aynı\n" +#~ "* vtN düşey sekme tarzı gecikme, N [0..1] arasında\n" + +#~ 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 "" +#~ " dec echoe echoctl echoke -ixany intr ^c erase 0177\n" +#~ " kill ^u ile aynı\n" +#~ "* [-]decctlq [-]ixany ile aynı\n" +#~ " ek karakter ve satır silme karakterlerinin öntanımlı\n" +#~ " değerleriyle aynı\n" +#~ " evenp parenb -parodd cs7 ile aynı\n" + +#~ 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 "" +#~ " -evenp -parenb cs8 ile aynı\n" +#~ "* [-]lcase xcase iuclc olcuc ile aynı\n" +#~ " litout -parenb -istrip -opost cs8 ile aynı\n" +#~ " -litout parenb istrip opost cs7 ile aynı\n" +#~ " nl -icrnl -onlcr ile aynı\n" +#~ " -nl icrnl -inlcr -igncr onlcr -ocrnl -onlret ile aynı\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Değişen blokları diske yazılmaya zorlar ve süper bloğu günceller.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "argümanların tamamı yoksayılıyor" + +#~ msgid "number in %s is too large" +#~ msgstr "%s içindeki numara çok büyük" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: geçersiz saniye sayısı" #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: kuraldışı seçenek -- %c\n" @@ -12290,9 +11678,6 @@ msgstr "" #~ "Hiçbir garantisi yoktur; hatta SATILABİLİRLİĞİ veya HERHANGİ BİR AMACA\n" #~ "UYGUNLUĞU için bile garanti verilmez.\n" -#~ msgid "Usage: %s [OPTION] [FILE]...\n" -#~ msgstr "Kullanım: %s [SEÇENEK] [DOSYA]...\n" - # #~ msgid "closing standard output" #~ msgstr "standart çıktı kapatılıyor" @@ -13646,9 +13031,6 @@ msgstr "" #~ " -c, --bytes=SAYI ilk SAYI baytı gösterir\n" #~ " -n, --lines=N ilk 10 yerine ilk N satırı gösterir\n" -#~ msgid "invalid number" -#~ msgstr "geçersiz sayı" - #~ msgid "%s is larger than the maximum file size on this system" #~ msgstr "%s bu sistemdeki maksimum dosya boyundan daha büyük" diff --git a/po/uk.gmo b/po/uk.gmo index 9f4f60b6..5b8e9e64 100644 Binary files a/po/uk.gmo and b/po/uk.gmo differ diff --git a/po/uk.po b/po/uk.po index 3336dc7f..c6bf57c9 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4,13 +4,14 @@ # # Maxim Dziumanenko , 2007-2009. # sevenfourk , 2009. -# Yuri Chornoivan , 2011, 2012, 2013, 2014. +# Yuri Chornoivan , 2011, 2012, 2013, 2014, 2015. +#: src/stty.c:941 msgid "" msgstr "" -"Project-Id-Version: coreutils 8.23-pre1\n" +"Project-Id-Version: coreutils 8.24-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" -"PO-Revision-Date: 2014-07-14 12:19+0300\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" +"PO-Revision-Date: 2015-06-28 16:50+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -39,18 +40,18 @@ msgstr "Допустимі аргументи:" msgid "error closing file" msgstr "помилка при закритті файла" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "помилка запису" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "збереження прав доступу для %s" @@ -93,7 +94,7 @@ msgstr "об'єкт типізованої пам'яті" #: lib/file-type.c:66 msgid "block special file" -msgstr "файл блочного пристрою" +msgstr "файл блокового пристрою" #: lib/file-type.c:69 msgid "character special file" @@ -231,57 +232,62 @@ msgstr "Неправильно закодований рядок парамет msgid "Unknown error" msgstr "Невідома помилка" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s: неоднозначний параметр «%s»; можливі варіанти:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: параметр «%s» не є однозначним\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: додавання аргументів до параметра «--%s» не передбачено\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: додавання аргументів до параметра «%c%s» не передбачено\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: до параметра «--%s» слід додати аргумент\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: невідомий параметр «--%s»\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: невідомий параметр «%c%s»\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: некоректний параметр — «%c»\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: до параметра слід додати аргумент — «%c»\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: параметр «-W %s» не є однозначним\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: додавання аргументів до параметра «-W %s» не передбачено\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: до параметра «-W %s» слід додати аргумент\n" @@ -291,13 +297,13 @@ msgstr "%s: до параметра «-W %s» слід додати аргуме msgid "cannot change permissions of %s" msgstr "Не вдалося змінити права доступу до %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "Не вдалося створити каталог %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "пам'ять вичерпано" @@ -347,6 +353,12 @@ msgstr "»" msgid "%s: end of file" msgstr "%s: кінець файла" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: помилка читання" + #: lib/regcomp.c:131 msgid "Success" msgstr "Виконано" @@ -455,7 +467,7 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "встановлення прав доступу для %s" @@ -889,7 +901,7 @@ msgstr "" "Кодування чи декодування файла чи стандартного потоку вводу у форматі\n" "Base64, і запис у стандартний потік виводу.\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -905,16 +917,7 @@ msgstr "" " 0 вимикає перенесення рядків.\n" "\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"Якщо вхідний файл не вказаний, або якщо вказано символ -,\n" -"використовується стандартний ввід.\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -928,51 +931,51 @@ msgstr "" "формального алфавіту base64. Вказуйте ключ --ignore-garbage, щоб\n" "спробувати ігнорувати неалфавітні знаки в закодованому потоці.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "помилка читання" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "неправильні вхідні дані" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "неправильна величина переносу: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "зайвий операнд %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, 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:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1024,38 +1027,41 @@ msgstr "" " %s -a any/str1 any/str2 -> «str1», потім «str2»\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "відсутній операнд" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Використання: %s [КЛЮЧ]... [ФАЙЛ]...\n" #: src/cat.c:92 +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "Сполучити ФАЙЛ(и) і вивести дані до стандартного виведення.\n" + +#: src/cat.c:98 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" @@ -1064,7 +1070,6 @@ msgid "" " -n, --number number all output lines\n" " -s, --squeeze-blank suppress repeated empty output lines\n" msgstr "" -"Конкатенація файлів чи стандартного вводу до стандартного потоку виводу.\n" "\n" " -A, --show-all еквівалент -vET\n" " -b, --number-nonblank кількість непорожніх рядків виводу\n" @@ -1073,7 +1078,7 @@ msgstr "" " -n, --number кількість усіх рядків виводу\n" " -s, --squeeze-blank не більше ніж один порожній рядок\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1086,7 +1091,7 @@ msgstr "" " -v, --show-nonprinting використовувати нотацію ^ та M-, за винятком\n" " переведення рядка та табуляції\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1099,17 +1104,18 @@ msgstr "" " %s f - g Виводить вміст f, потім стандартний потік вводу, потім вміст g.\n" " %s Копіює дані зі стандартного потоку вводу у стандартний вивід.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "помилка ioctl на %s" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "стандартний вивід" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: вхідний файл є файлом виводу" @@ -1121,10 +1127,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1138,8 +1144,8 @@ msgstr "не вдалося створити контексту безпеки: msgid "failed to set %s security context component to %s" msgstr "не вдалося встановити %s контекст безпеки компоненту %s" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "не вдалося встановити контекст безпеки %s" @@ -1154,13 +1160,13 @@ msgstr "не вдалося застосувати частковий конте msgid "failed to change context of %s to %s" msgstr "не вдалося змінити контекст %s на %s" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "не вдалося отримати доступ до %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "не вдалося прочитати каталог %s" @@ -1176,7 +1182,7 @@ msgstr "зміна контексту безпеки для %s\n" msgid "fts_read failed" msgstr "помилка при операції fts_read" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1294,7 +1300,7 @@ msgid "-R -h requires -P" msgstr "при вказуванні -R -h потрібно вказати -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1311,9 +1317,8 @@ msgid "conflicting security context specifiers given" msgstr "вказано конфліктні специфікатори контексту безпеки" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "помилка отримання атрибутів %s" @@ -1625,17 +1630,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "неправильна група %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "некоректний список груп %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1644,7 +1649,7 @@ msgstr "" "Використання: %s [ПАРАМЕТР] НОВИЙКОРІНЬ [КОМАНДА [АРГУМЕНТ]...]\n" " або: %s ПАРАМЕТР\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1652,15 +1657,21 @@ msgstr "" "Виконує КОМАНДУ з вказаним кореневим каталогом.\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" msgstr "" -" --userspec=КОР:ГРУПА вказати користувача і групу (ід. або назву)\n" " --groups=СПИСОК_ГРУП вказати додаткові групи у форматі гр1,гр2,…,грN\n" -#: src/chroot.c:203 +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" +msgstr " --userspec=КОР:ГРУПА вказати користувача і групу (ід. або назву)\n" + +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr " --skip-chdir не змінювати робочий каталог на %s\n" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" @@ -1668,42 +1679,49 @@ msgstr "" "\n" "Якщо команду не вказано, виконати «${SHELL} -i» (типово «/bin/sh -i»).\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" +"параметром --skip-chdir можна користуватися, лише якщо НОВИЙКОРІНЬ є старим " +"%s" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "не вдалося змінити кореневий каталог на %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "не вдалося перейти до кореневого каталогу" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "не вказано групи для невідомого UID: %d" -#: src/chroot.c:383 +#: src/chroot.c:400 #, c-format msgid "failed to get supplemental groups" msgstr "не вдалося отримати список додаткових груп" -#: src/chroot.c:395 +#: src/chroot.c:412 #, c-format -msgid "failed to %s supplemental groups" -msgstr "не вдалося %s список додаткових груп" +msgid "failed to set supplemental groups" +msgstr "не вдалося встановити список додаткових груп" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "не вдалося встановити ідентифікатор групи" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "не вдалося встановити ідентифікатор користувача" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "не вдалося виконати команду %s" @@ -1744,7 +1762,16 @@ msgstr "Використання: %s [КЛЮЧ]... ФАЙЛ1 ФАЙЛ2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "Порівнює сортовані файли ФАЙЛ1 та ФАЙЛ2 по рядках.\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"Якщо ФАЙЛ1 або ФАЙЛ2 (але не обидва) мають значення -, читати\n" +"зі стандартного джерела вхідних даних.\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1756,7 +1783,7 @@ msgstr "" "стовпчик містить рядки, унікальні для ФАЙЛА1, другий -- унікальні для\n" "ФАЙЛА2, а третій -- спільні для обох файлів рядки.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1768,7 +1795,7 @@ msgstr "" " -2 не виводити стовпчик 2 (рядки, які є лише у ФАЙЛ2)\n" " -3 не виводити стовпчик 3 (рядки, які є у обох файлах)\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1780,11 +1807,11 @@ msgstr "" " якщо усі вхідні рядки утворюють пари\n" " --nocheck-order не перевіряти, що вхідний потік коректно сортований\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=РЯД розділяти стовпчику вставляючи РЯД\n" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" @@ -1792,7 +1819,7 @@ msgstr "" "\n" "Зауважте, що під час порівняння використовуються правила LC_COLLATE.\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1806,312 +1833,326 @@ msgstr "" "файл2.\n" " %s -3 файл1 файл2 Вивести рядки у файл1, яких немає у файл2, і навпаки.\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "файл %d не сортований" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "задано декілька розділювачів" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "порожній рядок %s є неприпустимим" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 -#, c-format -msgid "error reading %s" -msgstr "помилка читання %s" - -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:181 src/copy.c:452 #, c-format msgid "cannot lseek %s" msgstr "не вдалося виконати lseek для %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:191 src/copy.c:554 +#, c-format +msgid "error deallocating %s" +msgstr "помилка під час спроби скасування розміщення %s" + +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 +#, c-format +msgid "error reading %s" +msgstr "помилка читання %s" + +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "помилка запису %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, c-format +msgid "overflow reading %s" +msgstr "переповнення під час читання %s" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s: не вдалося отримати дані щодо розширень" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: помилка під час спроби запису" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "не вдалося розширити %s" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "очищення прав доступу для %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "не вдалося зберегти власника %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "не вдалося найти файл %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "не вдалося зберегти автора %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "помилка встановлення типового контексту для створення файлів %s" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "помилка встановлення типового контексту для створення файлів %s" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "не вдалося встановити контекст захисту %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "не вдалося відкрити %s для читання" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "не вдалося виконати fstat для %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "пропущено файл %s, оскільки він був замінений під час копіювання" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "не вдалося вилучити %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "вилучено %s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "запис через через висяче символьне посилання %s не виконується" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "не вдалося створити звичайний файл %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "не вдалося клонувати %s з %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "збереження відмітки про час %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "не вдалося закрити %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: замінити %s, незважаючи на права доступу %04lo (%s)? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "%s: непридатний до запису %s (режим %04lo, %s); спробувати пори це? " -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: переписати %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (резервна копія: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "помилка при відновленні типового контексту при створенні файла" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "не вдалося створити жорстке посилання %s на %s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "не вдалося виконати stat для %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "пропуск каталогу %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "попередження: вхідний файл %s вказаний більше одного разу" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s та %s - один і той самий файл" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "не можна перезаписати файл %s, що не є каталогом, каталогом %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "не переписується щойно створений %s %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "не можна перезаписувати каталог %s файлом, що не є каталогом" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "не можна перейменувати каталог на файл, що не є каталогом: %s -> %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "збереження запасної копії %s знищить оригінал; %s не перенесений" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "збереження запасної копії %s знищить оригінал; %s не скопійовано" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "не вдалося створити резервну копію для %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "не буде копіюватися %s через щойно створене символьне посилання %s" -#: src/copy.c:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "не вдалося скопіювати каталог, %s, у самого себе, %s" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, c-format +msgid "warning: source directory %s specified more than once" +msgstr "попередження: каталог вхідних даних %s вказано декілька разів" + +#: src/copy.c:2294 #, c-format msgid "will not create hard link %s to directory %s" msgstr "жорстке посилання %s на каталог %s не буде створено" -#: src/copy.c:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "не вдалося перенести %s у свій власний підкаталог, %s" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "не вдалося перемістити %s у %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "помилка при переміщенні з пристрою %s на пристрій %s: не вдалося вилучити " "цільовий файл" -#: src/copy.c:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "не вдалося скопіювати циклічне символьне посилання %s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "" "%s: відносні символьні посилання можна створювати лише у поточному каталозі" -#: src/copy.c:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "не вдалося створити символьне посилання %s на %s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "не вдалося створити чергу %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "не вдалося створити спеціальній файл %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "не вдалося прочитати символьне посилання %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "не вдалося створити символьне посилання %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s має невідомий тип файла" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "не вдалося відновити %s з резервної копії" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (відновлення)\n" @@ -2121,12 +2162,12 @@ msgstr "%s -> %s (відновлення)\n" msgid "Alex Deymo" msgstr "Alex Deymo" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "Користування: %s --coreutils-prog=НАЗВА_ПРОГРАМИ [ПАРАМЕТРИ]... \n" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" @@ -2135,7 +2176,7 @@ msgstr "" "ПАРАМЕТРИ.\n" "\n" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" @@ -2145,7 +2186,7 @@ msgstr "" "Користування: «%s --coreutils-prog=НАЗВА_ПРОГРАМИ --help» для отримання " "довідки із вказаної програми.\n" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, c-format msgid "unknown program %s" msgstr "невідома програма, %s" @@ -2418,8 +2459,8 @@ msgstr "%s існує, але не є каталогом" msgid "failed to access %s" msgstr "не вдалося отримати доступ до %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "пропущений операнд, що вказує файл" @@ -2495,131 +2536,130 @@ msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "не вдалося зберегти розширені атрибути, cp зібрано без підтримки xattr" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "ввід став недоступний" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: номер рядка поза допустимими межами" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: номер рядка поза допустимими межами" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " при повторі %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: відповідність не знайдено" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "помилка пошуку регулярного виразу" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "помилка запису для %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: після розділювача очікується ціле число" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: при вказуванні числа повторів слід додати «}»" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s: між «{» та «}» має бути вказано ціле число" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: пропущено кінцевий роздільник «%c»" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s: неприпустимий регулярний вираз: %s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: неприпустимий шаблон" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: номер рядка повинен бути більше нуля" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "номер рядка %s менше номеру попереднього рядка, %s" -#: src/csplit.c:1200 +#: src/csplit.c:1201 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "попередження: номер рядка %s дорівнює попередньому номеру рядка" -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "пропущений специфікатор перетворення у суфіксі" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "неправильний специфікатор перетворення у суфіксі: %c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "неправильний специфікатор перетворення у суфіксі: \\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "некоректні прапорці у специфікації перетворення: %%%c%c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "надто багато описів перетворення (%%) у суфіксі" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "пропущено опис перетворення (%%) у суфіксі" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: неприпустимий число" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +msgid "invalid number" +msgstr "некоректне число" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Використання: %s [КЛЮЧ]... ФАЙЛ ШАБЛОН...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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" @@ -2627,7 +2667,15 @@ msgstr "" "Виводить частини ФАЙЛА, розділені ШАБЛОНОМ (ШАБЛОНАМИ), до файлів 'xx00',\n" "'xx01', ... та виводить число байт у кожній частині на стандартний вивід.\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"Якщо ФАЙЛ вказано як -, читає стандартне введення.\n" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2639,12 +2687,12 @@ msgstr "" " -f, --prefix=ПРЕФІКС використовувати ПРЕФІКС замість 'xx'\n" " -k, --keep-files не вилучати файли виводу при помилках\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" " -m, --suppress-matched не виводити рядки, що відповідають зразку\n" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2654,18 +2702,10 @@ msgstr "" " -s, --quiet, --silent не виводити розміри вихідних файлів\n" " -z, --elide-empty-files вилучати порожні файли виводу\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"Якщо ФАЙЛ вказаний як -, читає стандартний ввід. ШАБЛОН вказується\n" -"наступним чином:\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 msgid "" "\n" +"Each PATTERN may be:\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" @@ -2675,6 +2715,8 @@ msgid "" "A line OFFSET is a required '+' or '-' followed by a positive integer.\n" msgstr "" "\n" +"\n" +"Варіанти параметра ШАБЛОН:\n" " ЦІЛЕ копіювати до рядка з вказаним номером, але не включно\n" " /REGEXP/[ЗСУВ] копіювати до відповідного рядка, але не включно\n" " %%REGEXP%%[ЗСУВ] пропустити до відповідного рядка, але не включно\n" @@ -2699,7 +2741,7 @@ msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "" "Виводить вибрані частини рядків з кожного ФАЙЛА на стандартний вивід.\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2710,7 +2752,7 @@ msgstr "" " -d, --delimiter=РОЗДІЛЮВАЧ використовувати РОЗДІЛЮВАЧ для розділення\n" " полів замість табуляції\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2722,7 +2764,7 @@ msgstr "" " якщо не вказаний ключ -s\n" " -n (ігнорується)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2730,7 +2772,7 @@ msgstr "" " --complement доповнити множину вибраних байтів, знаків " "або полів.\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2742,7 +2784,7 @@ msgstr "" " при виводі, типово використовується\n" " розділювач для вводу\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2755,7 +2797,7 @@ msgstr "" "Вибрані частини вхідного файла виводяться у тому порядку, у якому вони,\n" "з'являються на вході, та виводяться рівно один раз.\n" -#: src/cut.c:210 +#: src/cut.c:211 msgid "" "Each range is one of:\n" "\n" @@ -2763,62 +2805,59 @@ msgid "" " 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 "" -"Діапазони вказуються наступним чином:\n" -"\n" -" Н Н-ний байт, знак або поле; рахуючи від 1\n" -" Н- від Н-го байту, знаку або поля до кінця рядка\n" -" Н-М від Н-го до М-го (включно) байту, знаку або поля\n" -" -М від першого до М-го (включно) байту, знаку або поля\n" +"Варіанти діапазонів:\n" "\n" -"Якщо ФАЙЛ не вказаний або вказаний як -, читає стандартний ввід.\n" +" Н Н-ний байт, знак або поле; відлік ведеться від 1\n" +" Н- від Н-го байта, знаку або поля до кінця рядка\n" +" Н-М від Н-го до М-го (включно) байта, знаку або поля\n" +" -М від першого до М-го (включно) байта, знаку або поля\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "некоректний байт, символ або список полів" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "поля та позиції нумеруються з 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "неправильний діапазон без кінцевого значення: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "неприпустимий спадаючий діапазон" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "байтовий зсув %s надто великий" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "номер поля %s надто великий" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "можна вказати лише один тип списку" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "розділювач повинен бути одним символом" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "треба вказати список байт, символів або полів" -#: src/cut.c:790 +#: src/cut.c:789 msgid "an input delimiter may be specified only when operating on fields" msgstr "розділювач для вхідних даних можна вказувати лише при обробці полів" -#: src/cut.c:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2826,11 +2865,11 @@ msgstr "" "заборона виводу рядків, що не містять розділювачів,\n" "має сенс лише при роботі з полями" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "відсутній список полів" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "відсутній список позицій" @@ -2850,50 +2889,66 @@ 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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" msgstr "" -" -d, --date=РЯДОК показати час, описаний РЯДКОМ, а не теперішній.\n" +" -d, --date=РЯДОК показати час, описаний РЯДКОМ, а не поточний.\n" " -f, --file=ФАЙЛ_ДАТИ подібний до --date для кожного з рядків " "ФАЙЛ_ДАТИ\n" + +#: src/date.c:138 +msgid "" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" +msgstr "" " -I[СПЕЦЧАСУ], --iso-8601[=СПЕЦЧАСУ] вивести дату і час у форматі ISO " "8601.\n" " СПЕЦЧАСУ='date' визначає лише дату (типово),\n" " 'hours', 'minutes', 'seconds' і 'ns' -- дата і\n" -" час з відповідною точністю.\n" +" час із відповідною точністю.\n" +" Приклад: 2006-08-14T02:34:56-0600\n" -#: src/date.c:142 +#: src/date.c:145 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" -" -r, --reference=ФАЙЛ показати час останньої зміни ФАЙЛу\n" " -R, --rfc-2822 виводити час відповідно до RFC-2822\n" -" Приклад: Mon, 07 Aug 2006 12:34:56 -0600\n" +" Приклад: Mon, 14 Aug 2006 02:34:56 -0600\n" + +#: src/date.c:149 +msgid "" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" +msgstr "" +" --rfc-3339[=СПЕЦ] вивести дату/час у форматі RFC 3339\n" +" СПЕЦ='date', 'seconds' або 'ns' для " +"отримання\n" +" дати та часу з вказаною точністю.\n" +" Приклад: 2006-08-14 02:34:56-06:00\n" + +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr " -r, --reference=ФАЙЛ показати час останньої зміни ФАЙЛа\n" -#: src/date.c:147 +#: src/date.c:158 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 (UTC)\n" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" msgstr "" -" --rfc-3339[=СПЕЦ] вивести дату/час у форматі RFC 3339\n" -" СПЕЦ='date', 'seconds' або 'ns' для отримання\n" -" дати та часу з вказаною точністю.\n" " -s, --set=РЯДОК встановити час, що описується РЯДКОМ\n" " -u, --utc, --universal показати або встановити універсальний\n" " координований час (UTC)\n" -#: src/date.c:158 +#: src/date.c:164 msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" @@ -2907,7 +2962,7 @@ msgstr "" " %% знак %\n" " %a місцева скорочена назва дня тижня (напр., нед)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2919,7 +2974,7 @@ msgstr "" " %B місцева повна назва місяця (напр., січень)\n" " %c місцевий час та дата (напр., Чтв 3 Мар 23:05:25 2005)\n" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2931,7 +2986,7 @@ msgstr "" " %D дата; те саме, що і %m/%d/%y\n" " %e день місяця, доповнений пробілами; те саме, що і %_d\n" -#: src/date.c:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2941,7 +2996,7 @@ msgstr "" " %g останні дві цифри року для номера тижня ISO (см. %G)\n" " %G рік для номера тижня ISO (см. %V); звичайно буває корисно лише з %V\n" -#: src/date.c:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2953,7 +3008,7 @@ msgstr "" " %I час (01..12)\n" " %j номер дня у році (001..366)\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2965,7 +3020,7 @@ msgstr "" " %m місяць (01..12)\n" " %M хвилини (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2984,7 +3039,7 @@ msgstr "" "%M\n" " %s число секунд, що минули з 1970-01-01 00:00:00 UTC\n" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2996,7 +3051,7 @@ msgstr "" " %T час, аналог %H:%M:%S\n" " %u день тижня (1..7); 1 означає понеділок\n" -#: src/date.c:209 +#: src/date.c:215 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" @@ -3008,7 +3063,7 @@ msgstr "" " %w день тижня (0..6), 0 означає неділю\n" " %W номер тижня у році, якщо перший день тижня -- понеділок (00..53)\n" -#: src/date.c:215 +#: src/date.c:221 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 +3075,7 @@ msgstr "" " %y останні дві цифри року (00..99)\n" " %Y рік\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3040,7 +3095,7 @@ msgstr "" "\n" "Типово date доповнює числові поля нулями.\n" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3058,7 +3113,7 @@ msgstr "" " ^ використовувати верхній регістр, якщо можливо\n" " # використовувати протилежний регістр, якщо можливо\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3073,7 +3128,7 @@ msgstr "" "E -- якщо можливо, вживати альтернативне представлення для поточної локалі\n" "O -- якщо можливо, використовувати альтернативні числові символи локалі.\n" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3097,37 +3152,37 @@ msgstr "" "Показати локальний час для 9:00 наступної п'ятниці у Києві\n" " $ date --date='TZ=\"Europe/Kiev\" 09:00 next Fri'\n" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "стандартний ввід" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "неправильна дата %s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "задано декілька вихідних форматів" -#: src/date.c:430 +#: src/date.c:436 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "ключі для виводу дати взаємно виключають друг друга" -#: src/date.c:437 +#: src/date.c:443 #, c-format msgid "the options to print and set the time may not be used together" msgstr "" "ключі для встановлення та для відображення часу не можуть застосовуватись " "разом" -#: src/date.c:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3138,23 +3193,23 @@ msgstr "" "При вказуванні дати, кожен аргумент, що не є ключем, повинен мати\n" "символьний формат та починатись зі знаку '+'." -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "не вдалося встановити дату" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3163,7 +3218,7 @@ msgstr "" "Використання: %s [ОПЕРАНД]...\n" " або: %s КЛЮЧ\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3182,7 +3237,7 @@ msgstr "" " count=ЧИСЛО копіювати лише вказане ЧИСЛО вхідних блоків\n" " ibs=ЧИСЛО читати вказане ЧИСЛО байт за раз (типово 512)\n" -#: src/dd.c:541 +#: src/dd.c:570 msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3191,23 +3246,26 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=ФАЙЛ читати ФАЙЛ, а не стандартне введення\n" " iflag=СПИСОК читати відповідно до СПИСКУ символів,\n" -" елементи слід розділяти комами\n" +" пункти слід відокремлювати комами\n" " obs=ЧИСЛО записувати вказане ЧИСЛО байт за раз (типово 512)\n" " of=ФАЙЛ записувати у ФАЙЛ, а не у стандартне виведення\n" " oflag=СПИСОК записувати відповідно до списку символів,\n" -" елементи слід розділяти комами\n" +" пункти слід відокремлювати комами\n" " seek=N пропустити з початку виводу N блоків розміром obs\n" " skip=N пропустити з початку вводу N блоків розміром ibs\n" " status=РЕЖИМ РЕЖИМ придушення виведення даних до stderr;\n" " «noxfer» — придушити виведення статистики передавання,\n" -" «none» — придушити виведення будь-яких даних\n" +" «none» — придушити виведення будь-яких даних,\n" +" «progress» — періодично показувати статистику роботи\n" -#: src/dd.c:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3225,7 +3283,7 @@ msgstr "" "Кожен елемент СПИСКУ для conv може бути:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3255,7 +3313,7 @@ msgstr "" " sync доповнювати кожен вхідний блок нулями до розміру ibs; якщо\n" " вживається разом з block або unblock, доповнювати пробілами\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3271,7 +3329,7 @@ msgstr "" " fdatasync фізично записати файл виводу перед завершенням\n" " fsync аналогічно, але записати також метадані\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3285,138 +3343,111 @@ msgstr "" " append режим додавання (має сенс для виводу; рекомендується " "conv=notrunc)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio використовувати конкурентне введення-виведення для дати\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct використовувати прямий ввід/вивід для даних\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory помилка, якщо не є каталогом\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync використовувати синхронізований ввід/вивід для даних\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync те саме, але також для метаданих\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock акумулювати повні блоки вводу (лише iflag)\n" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock використовувати ввід/вивід без блокування\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime не оновлювати час останнього доступу\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nocache відкинути кешовані дані\n" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty не призначати керівний термінал з файла\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow не слідувати за символьним посиланням\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks помилка, якщо знайдено декілька посилань\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary використовувати двійковий ввід/вивід для даних\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text використовувати текстовий ввід/вивід для даних\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" " count_bytes вважати «count=N» визначенням кількості байтів (лише для " "iflag)\n" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" " skip_bytes вважати «skip=N» визначенням кількості байтів (лише для " "iflag)\n" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" " seek_bytes вважати «seek=N» визначенням кількості байтів (лише для " "oflag)\n" -#: src/dd.c:631 +#: src/dd.c:661 #, 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 "" "\n" -"Якщо надіслати запущеному процесу 'dd' сигнал %s, він виведе на\n" -"стандартний потік помилок статистику вводу/виводу та продовжить\n" -"копіювання.\n" +"Надсилання сигналу %s до запущеного процесу «dd» призводить до\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" -" 9387674624 байта (9.4 GB) скопійовано, 34.6279 секунди, 271 Мб/с\n" +"Параметри:\n" "\n" -"Ключі:\n" -"\n" - -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" -msgstr "пам'ять вичерпано буфером введення даних розміром у %zu байтів (%s)" - -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" -msgstr "пам'ять вичерпано буфером виведення даних розміром у %zu байтів (%s)" -#: src/dd.c:748 +#: src/dd.c:699 #, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -"%+% записів прочитано\n" -"%+% записів записано\n" +"пам'ять вичерпано буфером введення даних розміром у % байтів (%s)" -#: src/dd.c:754 +#: src/dd.c:721 #, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% обрізаний запис\n" -msgstr[1] "% обрізані записи\n" -msgstr[2] "% обрізаних записів\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" +msgstr "" +"пам'ять вичерпано буфером виведення даних розміром у % байтів (%s)" -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" @@ -3424,7 +3455,7 @@ msgstr[0] " скопійовано % байт (%s)" msgstr[1] " скопійовано % байти (%s)" msgstr[2] " скопійовано % байтів (%s)" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "Нескінченість" @@ -3438,83 +3469,100 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g с, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, c-format +msgid ", %.6f s, %s/s" +msgstr ", %.6f с, %s/с" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"%+% записів прочитано\n" +"%+% записів записано\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% обрізаний запис\n" +msgstr[1] "% обрізані записи\n" +msgstr[2] "% обрізаних записів\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "закриття вхідного файла %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "закриття файла виводу %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "не вдалося вимкнути O_DIRECT: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "запис у %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "операнд %s не розпізнаний" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "неприпустиме перетворення" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "неприпустима ознака входу" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "неприпустимий ознака виводу" -#: src/dd.c:1294 -msgid "invalid status flag" -msgstr "неприпустимий ознака статусу" - -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "неправильний номер %s" +#: src/dd.c:1385 +msgid "invalid status level" +msgstr "некоректний рівень стану" -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "не можна одночасно використовувати будь-які два з {ascii,ebcdic,ibm}" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "не можна одночасно використовувати block та unblock" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "не можна одночасно використовувати lcase та ucase" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "не можна одночасно використовувати excl та nocreat" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "не можна одночасно використовувати direct і nocache" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3523,62 +3571,62 @@ msgstr "" "попередження: обходиться помилка lseek у ядрі для файла (%s)\n" " mt_type=0x%0lx -- см. для списку типів" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: не вдалося пропустити" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: не вдалося зсунути вказівник файла" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "переповнення зсуву при читанні файла %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "попередження: некоректний зсув файла після помилки читання" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "не вдалося обійти помилку ядра" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "встановлення ознак для %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: не вдалося перемістити вказівник позиції на вказану кількість" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "не вдалося обрізати до % у файлі виведення даних %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "операція fdatasync для %s завершилась помилкою" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "операція fsync для %s завершилась помилкою" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "не вдалося відкрити %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3587,19 +3635,19 @@ msgstr "" "зсув надто великий: не вдалося обрізати до величини seek=% (%lu-" "байтних) блоків" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "не вдалося обрізати до % у файлі виведення даних %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "помилка під час відкидання кешу для %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3680,12 +3728,12 @@ msgstr "Всього" msgid "%s-%s" msgstr "%s-%s" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "не вдалося отримати доступ до %s: повторно змонтовано іншим пристроєм" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3695,29 +3743,28 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -" -a, --all включати віртуальні файлові системи\n" +" -a, --all включати несправжні, дубльовані, недоступні файлові " +"системи\n" " -B, --block-size=РОЗМІР використовувати блоки вказаного РОЗМІРУ. Приклад:\n" " «-BM» виводить розміри у одиницях у 1.048.576 " "байтів.\n" " Формат РОЗМІР описано нижче.\n" -"\n" -" --total виводити підсумок\n" " -h, --human-readable виводити розміри у зручному для людини вигляді\n" " (наприклад, 1023M)\n" " -H, --si те саме, але використовувати степені 1000 " "(наприклад, 1.1G)\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3733,17 +3780,13 @@ msgstr "" " --no-sync не викликати sync перед отриманням інформації про\n" " використання блоків (типово)\n" -#: src/df.c:1409 +#: src/df.c:1429 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 "" " --output[=СПИСОК_ПОЛІВ] використовувати формат виведення, визначений " "СПИСКОМ_ПОЛІВ,\n" @@ -3752,12 +3795,29 @@ msgstr "" " -P, --portability виводити у форматі POSIX\n" " --sync викликати sync перед отриманням інформації про\n" " використання блоків\n" + +#: src/df.c:1435 +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --total пропустити усі записи, які не пов’язано із доступним " +"місцем,\n" +" і вивести загальні підсумки\n" + +#: src/df.c:1439 +msgid "" +" -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 "" " -t, --type=ТИП перерахувати лише файлові системи вказаного ТИПУ\n" " -T, --print-type виводити тип файлової системи\n" " -x, --exclude-type=ТИП виключати файлові системи вказаного ТИПУ\n" " -v (ігнорується)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3770,25 +3830,25 @@ msgstr "" "'ipcent',\n" "'size', 'used', 'avail', 'pcent', 'file' і 'target' (див. сторінку info).\n" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "параметри %s і %s не можна використовувати одночасно" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "файлова система типа %s і вибрана, і виключена" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Попередження: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "%помилка при читані змонтованих файлових систем" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "не вказана жодна файлова система" @@ -3905,7 +3965,7 @@ msgstr "" " %s dir1/str dir2/str -> «dir1», потім «dir2»\n" " %s stdio.h -> «.»\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3915,8 +3975,11 @@ msgstr "" " або: %s [КЛЮЧ]... --files0-from=Ф\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" -msgstr "Сумарне використання дискового простору кожного ФАЙЛА, з каталогами.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" +msgstr "" +"Сумарне використання дискового простору набору ФАЙЛів, рекурсивно для " +"каталогів.\n" #: src/du.c:291 msgid "" @@ -4053,62 +4116,56 @@ msgstr "" msgid "Infinity" msgstr "Нескінченість" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "помилка fts_read: %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "неприпустима максимальна глибина %s" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "некоректний аргумент --threshold «-0»" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "не можна одночасно підбивати зведення та виводити всі елементи" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "попередження: підбиття зведення це те ж саме, що й --max-depth=0" -#: src/du.c:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "попередження: підбиття зведення конфліктує з --max-depth=%lu" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" "попередження: параметри --apparent-size і -b не працюватимуть з --inodes" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "операнди-файли не можна використовувати разом з --files0-from" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: помилка читання" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "при читанні імен файлів з stdin, не допускаються назви файлів %s" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "неправильна назва файла нульової довжини" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "загалом" @@ -4252,13 +4309,10 @@ msgid "cannot specify --null (-0) with command" msgstr "не можна вказувати --null (-0) з командою" #: 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" -"Перетворює знаки табуляції у кожному ФАЙЛІ на пробіли та виводить на\n" -"стандартний вивід. Якщо ФАЙЛ не вказаний або вказаний як -, читає.\n" -"стандартний ввід\n" +"Перетворити табуляції у кожному з ФАЙЛів на пробіли, записати до\n" +"стандартного виведення.\n" #: src/expand.c:114 msgid "" @@ -4302,7 +4356,7 @@ msgid "input line is too long" msgstr "вхідний рядок надто великий" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4457,12 +4511,12 @@ msgstr "помилка у механізмі відповідності регу msgid "non-integer argument" msgstr "не цілочисловий аргумент" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "ділення на нуль" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "Щоб обійти цю проблему, встановіть LC_ALL='C'" @@ -4473,31 +4527,31 @@ msgid "the strings compared were %s and %s" msgstr "рядки, що порівнювались %s та %s." #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "Niels Moller" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "Не вдалося перевірити простоту за тестом Люка. Цього не мало статися." -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "переповнення черги squfof" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s не є правильним цілим додатнім числом" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s надто велике" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4506,7 +4560,7 @@ msgstr "" "Використання: %s [ЧИСЛО]...\n" " або: %s КЛЮЧ\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -4550,7 +4604,7 @@ msgstr "" "Переформатує кожен абзац у ФАЙЛІ(ах) та виводить на стандартне виведення.\n" "Параметр -ШИРИНА є скороченою формою --width=ЧИСЛО.\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4562,7 +4616,7 @@ msgstr "" " зберігаючи при цьому префікс рядків\n" " -s, --split-only розбивати довгі рядки, але не заповнювати\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4575,7 +4629,7 @@ msgstr "" " -w, --width=ЧИСЛО максимальна довжина рядка (типово 75 позицій)\n" " -g, --goal=ДОВЖИНА остаточна довжина (типово 93% довжини)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4584,20 +4638,17 @@ msgstr "" "неправильний ключ -- %c; -ШИРИНА розпізнається, лише якщо це перший\n" "аргумент, у іншому випадку вказуйте -w N" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" -msgstr "неприпустима довжина: %s" +#: src/fmt.c:400 src/fmt.c:407 +msgid "invalid width" +msgstr "некоректна ширина" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" -"Розбиває рядки у ФАЙЛІ(ах) (типово читає стандартний ввід) та виводить\n" -"на стандартний вивід.\n" +"Розбиває рядки у ФАЙЛІ(ах) та виводить результат до стандартного\n" +"виведення.\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4607,10 +4658,9 @@ msgstr "" " -s, --spaces розбивати лише на пробілах\n" " -w, --width=ЧИСЛО використовувати вказане ЧИСЛО стовпчиків, а не 80\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" -msgstr "неправильне число стовпчиків: %s" +#: src/fold.c:283 src/pr.c:831 +msgid "invalid number of columns" +msgstr "некоректна кількість стовпчиків" #. This is a proper name. See the gettext manual, section Names. #: src/getlimits.c:30 src/realpath.c:33 src/stdbuf.c:37 src/timeout.c:78 @@ -4684,17 +4734,16 @@ msgstr "не вдалося встановити справжній GID" msgid "%s: no such user" msgstr "%s: такого користувача не існує" -#: src/head.c:109 +#: src/head.c:110 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 "" -"Виводити перші 10 рядків кожного ФАЙЛА на стандартний вивід.\n" -"Якщо задано декілька ФАЙЛІВ, спочатку виводити заголовок з назвою файла.\n" -"Якщо ФАЙЛ не вказаний або вказаний як -, читає стандартний ввід.\n" +"Виводить перші 10 рядків кожного з ФАЙЛІВ до стандартного виведення.\n" +"Якщо задано декілька ФАЙЛІВ, спочатку виводить перед даними заголовок із " +"назвою файла.\n" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4710,7 +4759,7 @@ msgstr "" " якщо перед K стоїть «-», вивести всі, крім K\n" " останніх рядків кожного файла\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4718,7 +4767,7 @@ msgstr "" " -q, --quiet, --silent не виводити заголовки з назвами файлів\n" " -v, --verbose завжди виводити заголовки з назвами файлів\n" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4730,48 +4779,36 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: файл надто скоротився" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: число байт надто великий" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: не вдалося перейти до позиції %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: не вдалося перемістити вказівник позиції на %s" -#: src/head.c:886 +#: src/head.c:267 #, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "%s: %s настільки великий, що його неможливо машинно представити" - -#: src/head.c:887 -msgid "number of lines" -msgstr "число рядків" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "число байт" +msgid "%s: number of bytes is too large" +msgstr "%s: число байт надто великий" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "неправильна кількість рядків" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "неправильна кількість байт" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "неправильний завершальний ключ -- '%c'" @@ -4959,7 +4996,7 @@ msgstr "не вдалося змінити власника %s" msgid "cannot set time stamps for %s" msgstr "не вдалося встановити мітки часу для %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "системний виклик fork завершився помилкою" @@ -5119,7 +5156,7 @@ msgstr "при встановленні каталогу не можна вжи msgid "target directory not allowed when installing a directory" msgstr "при встановленні каталогу не можна вказувати цільовий каталог" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "неправильний режим %s" @@ -5160,23 +5197,26 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" +"Для кожної пари вхідних рядків з однаковими полями виводить рядок\n" +"до стандартного виведення. Типово спільне поле вважається першим, поля\n" +"розділюються знаками пробілів.\n" + +#: src/join.c:204 +msgid "" "\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 "" -"Для кожної пари вхідних рядків з однаковими полями виводить рядок\n" -"до стандартного виведення. Типово спільне поле вважається першим, поля\n" -"розділюються знаками пробілів. Якщо один з ФАЙЛІВ вказано як -, читає\n" -"стандартний потік введення.\n" "\n" " -a НОМЕР виводити рядки що не мають пари з файла з вказаним\n" " номером (1 або 2)\n" " -e РЯДОК замінювати при виводі порожні рядки вказаним РЯДКОМ\n" -#: src/join.c:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5188,7 +5228,7 @@ msgstr "" " -o ФОРМАТ виводити відповідно до ФОРМАТУ\n" " -t ЗНАК використовувати ЗНАК розділення полів вводу та виводу\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5208,13 +5248,13 @@ msgstr "" " --header вважати перший рядок кожного файла заголовками полів,\n" " вивести їх без спроб знайти для них пари\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated завершувати рядки нульовим байтом, а не символом " "нового рядка\n" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5250,47 +5290,47 @@ msgstr "" "якісь з рядків не може бути об'єднано, буде показано повідомлення\n" "з попередженням про це.\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:%: не впорядковано: %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "неправильний номер поля: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "неправильна специфікація поля: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "неправильний номер файла у специфікації поля: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "поля об'єднання %lu, %lu несумісні" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "конфліктуючі рядки заміни для порожнього поля" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "багатознакова табуляція %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "несумісна табуляція" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "замість обох файлів не можна вказувати одночасно стандартний ввід" @@ -5367,17 +5407,17 @@ msgstr "не можна об'єднувати сигнал з -l або -t" msgid "no process ID specified" msgstr "не вказаний ідентифікатор процесу" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "не вдалося розмістити буфер stdio у % байтів\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "некоректний режим буферизації %s для %s\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "не вдалося змінити режим буферизації %s у значення %s\n" @@ -5576,7 +5616,7 @@ msgstr "не можна виконувати --relative без --symbolic" msgid "FIXME: unknown" msgstr "FIXME: невідомо" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Використання: %s [КЛЮЧ]\n" @@ -5589,7 +5629,7 @@ msgstr "" "Виводить ім'я поточного користувача.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "реєстраційне ім'я відсутнє" @@ -5599,7 +5639,7 @@ msgstr "реєстраційне ім'я відсутнє" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -5608,95 +5648,93 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "проігноровано неправильне значення змінної оточення QUOTING_STYLE: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "проігноровано неправильну довжину змінної середовища COLUMNS: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "" "проігноровано неправильний розмір табуляції змінної оточення TABSIZE: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" -msgstr "неправильна довжина рядка: %s" +#: src/ls.c:1747 +msgid "invalid line width" +msgstr "некоректна довжина рядка" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" -msgstr "неправильний розмір табуляції: %s" +#: src/ls.c:1815 +msgid "invalid tab size" +msgstr "некоректний розмір табуляції" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "неправильний формат часу %s" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "Коректні аргументи:\n" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr " - +ФОРМАТ (наприклад +%H:%M) для формату у стилі 'date'\n" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "помилка під час ініціалізації рядків місяців" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "не розпізнаний префікс: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "незрозуміле значення змінної оточення LS_COLORS" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "проігноровано неправильне значення змінної оточення QUOTING_STYLE: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "не вдалося відкрити каталог %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "не вдалося визначити пристрій та inode для %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: пропущено вже перелічений каталогу" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "читання каталогу %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "закриття каталогу %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "не вдалося порівняти назви файлів %s та %s" -#: src/ls.c:4781 +#: src/ls.c:4775 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" @@ -5705,7 +5743,7 @@ msgstr "" "Впорядковує у алфавітному порядку, якщо не вказано ні --sort, ні один з\n" "параметрів -cftuSUX.\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5719,7 +5757,7 @@ msgstr "" " -b, --escape виводити вісімкові керівні послідовності\n" " замість неграфічних знаків\n" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5745,12 +5783,13 @@ msgstr "" " у іншому випадку впорядкувати за часом зміни,\n" " найновіші — перші\n" -#: src/ls.c:4804 +#: src/ls.c:4798 msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5758,12 +5797,12 @@ msgstr "" " -C виводити список у декілька колонок\n" " --color[=КОЛИ] вказує, чи позначати типи файлів кольором.\n" " КОЛИ може бути «never», «auto» або\n" -" «always» (типовий)\n" +" «always» (типовий, якщо не вказано)\n" " -d, --directory виводити назви каталогів, а не їх зміст, а\n" " також не слідувати за символічним посиланням\n" " -D, --dired створити виведені дані у режимі Emacs dired\n" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5779,11 +5818,11 @@ msgstr "" " single-column -1, verbose -l, vertical -C\n" " --full-time виводити повну дату та час\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr " -g як і -l, але не виводити власника\n" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5797,7 +5836,7 @@ msgstr "" " але використання --sort=none (-U) вимикає\n" " групування\n" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5810,7 +5849,7 @@ msgstr "" " (наприклад, 1K 234M 2G)\n" " -H, --si те саме, але виводити ступені 1000, а не 1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5832,7 +5871,7 @@ msgstr "" " --hide=ШАБЛОН не виводити файли, що відповідають ШАБЛОНУ\n" " оболонки (скасовується ключами -a або -A)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5850,7 +5889,7 @@ msgstr "" " -I, --ignore=ШАБЛОН не виводити файли, що відповідають ШАБЛОНУ\n" " -k, --kibibytes використовувати 1024-байтові блоки\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5865,7 +5904,7 @@ msgstr "" " посилається посилання\n" " -m виводити список на всю ширину через кому\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5881,7 +5920,7 @@ msgstr "" " -o як -l, але не виводити інформацію про групу\n" " -p, --indicator-style=slash додавати індикатор / до каталогів\n" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -5900,7 +5939,7 @@ msgstr "" " --quoting-style=СЛОВО використовувати вид оточення дужками СЛОВО:\n" " literal, shell, shell-always, c, escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5911,21 +5950,22 @@ msgstr "" " -R, --recursive рекурсивно виводити каталоги\n" " -s, --size виводити розмір кожного файла, у блоках\n" -#: src/ls.c:4886 +#: src/ls.c:4881 msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" -" -S сортувати за розміром файла\n" -" --sort=СЛОВО режиму упорядковування (замість «за назвою»):\n" +" -S сортувати за розміром файла, найбільші " +"спочатку\n" +" --sort=СЛОВО режим упорядковування (замість «за назвою»):\n" " none (-U), size (-S), time (-t),\n" " version (-v), extension (-X)\n" " --time=СЛОВО з -l, виводити замість часу зміни час,\n" @@ -5933,9 +5973,10 @@ msgstr "" "ctime або\n" " status (-c); якщо --sort=time, " "використовувати\n" -" вказаний час як ключ сортування\n" +" вказаний час як ключ сортування (найновіші " +"спочатку)\n" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -5957,7 +5998,7 @@ msgstr "" "префікс\n" " 'posix-', то він діє лише не у POSIX локалі\n" -#: src/ls.c:4908 +#: src/ls.c:4904 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -5966,39 +6007,42 @@ msgstr "" "спочатку\n" " -T, --tabsize=ЧИСЛО крок табуляції дорівнює ЧИСЛУ замість 8\n" -#: src/ls.c:4912 +#: src/ls.c:4908 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" " -u з -lt: сортувати та виводити час доступу\n" " з -l: виводити час доступу та впорядкувати\n" " за назвою\n" -" інакше: впорядкувати за часом доступу\n" +" інакше: впорядкувати за часом доступу, " +"найновіші спочатку\n" " -U не впорядковувати; виводити відповідно до\n" " фізичного розташування\n" " -v впорядкувати за номерами (версією) у " "текстовому\n" " форматі\n" -#: src/ls.c:4919 +#: src/ls.c:4915 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 security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=ЧИСЛО задає ширину екрана замість поточного значення\n" " -x вивід списку рядками, а не стовпчиками\n" " -X сортувати за розширенням у алфавітному порядку\n" " -Z, --context виводити контекст безпеки для кожного файла\n" -" -1 виводити по одному файлу у рядку\n" +" -1 виводити по одному файлу у рядку. Прибрати \\n\n" +" можна за допомогою -q або -b\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6013,7 +6057,7 @@ msgstr "" "Змінити параметри можна за допомогою змінної середовища LS_COLORS.\n" "Для встановлення цієї змінної скористайтеся командою dircolors.\n" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6049,47 +6093,49 @@ msgstr "David Madore" 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 "" -"Використання: %s [ПАРАМЕТР] [ФАЙЛ]...\n" -"Виводить або перевіряє контрольні суми %s (%d-бітові).\n" -"Якщо ФАЙЛ не вказано або вказано як «-», читає стандартне джерело даних.\n" -"\n" +"Користування: %s [ПАРАМЕТР]... [ФАЙЛ]...\n" +"Вивести або перевірити %s (%d-бітові) контрольні суми.\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" +"\n" " -b, --binary читати у двійковому режимі (типово, якщо\n" " читається не термінальне введення)\n" -#: src/md5sum.c:178 -msgid " -b, --binary read in binary mode\n" -msgstr " -b, --binary читати у двійковому режимі\n" +#: src/md5sum.c:180 +msgid "" +"\n" +" -b, --binary read in binary mode\n" +msgstr "" +"\n" +" -b, --binary читати у двійковому режимі\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr " -c, --check читати суми %s з ФАЙЛІВ та порівняти їх\n" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr " --tag створити контрольну суму у форматі BSD\n" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" " -t, --text читати у текстовому режимі (типово, якщо\n" " читається термінальний ввід)\n" -#: src/md5sum.c:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text читати у текстовому режимі (типово)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -6115,50 +6161,52 @@ msgstr "" " списку контрольних сум\n" "\n" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "Метод обчислення контрольних сум описано у %s. Вхідними даними при\n" "перевірці мають бути отримані раніше дані виводу цієї програми.\n" -"Типово виводить рядок з контрольною сумою, символ, що вказує на\n" -"тип файла («*» для двійкових, « » для текстових), та назву кожного ФАЙЛа.\n" +"Типово виводить рядок з контрольною сумою, пробіл, символ, що вказує на\n" +"тип файла («*» для двійкових, « » для текстових або тих, де двійкові\n" +"дані є несуттєвими) та назву кожного ФАЙЛа.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: надто багато рядків контрольних сум" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: неправильно складений рядок контрольної суми %s" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: не вдалося відкрити або прочитати\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "ПОМИЛКА" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "Гаразд" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s: не знайдено правильно складених рядків контрольних сум %s" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" @@ -6166,7 +6214,7 @@ msgstr[0] "ПОПЕРЕДЖЕННЯ: % рядок має помилко msgstr[1] "ПОПЕРЕДЖЕННЯ: % рядки мають помилкове форматування" msgstr[2] "ПОПЕРЕДЖЕННЯ: % рядків мають помилкове форматування" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" @@ -6174,7 +6222,7 @@ msgstr[0] "ПОПЕРЕДЖЕННЯ: не вдалося прочитати % вказані файли" msgstr[2] "ПОПЕРЕДЖЕННЯ: не вдалося прочитати % вказаних файлів" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" @@ -6182,38 +6230,38 @@ msgstr[0] "ПОПЕРЕДЖЕННЯ: НЕ збіглась % обчис msgstr[1] "ПОПЕРЕДЖЕННЯ: НЕ збіглись % обчислені контрольні суми" msgstr[2] "ПОПЕРЕДЖЕННЯ: НЕ збіглись % обчислених контрольних сум" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "підтримки --tag у режимі --text не передбачено" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "ключ --tag не має сенсу під час перевірки контрольних сум" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "ключі --binary та --text не мають сенсу при перевірці контрольних сум" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "ключ --status має сенс лише при перевірці контрольних сум" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "ключ --warn має сенс лише при перевірці контрольних сум" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "ключ --quiet має сенс лише при перевірці контрольних сум" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "ключ --strict має сенс лише при перевірці контрольних сум" @@ -6254,22 +6302,22 @@ msgstr "" " SELinux або SMACK відповідно до вказаного значення\n" " контексту CTX\n" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "помилка встановлення типового контексту для створення %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" msgstr "не вдалося зберегти мітки часу для %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "створений каталог %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6351,7 +6399,7 @@ msgid "" " p create a FIFO\n" msgstr "" "\n" -" b створити файл блочного пристрою (буферизований)\n" +" b створити файл блокового пристрою (буферизований)\n" " c, u створити файл символьного пристрою (не буферизований)\n" " p створити іменований канал\n" @@ -6368,7 +6416,7 @@ msgstr "У файлів-черг немає основного та другор #: src/mknod.c:210 #, c-format msgid "block special files not supported" -msgstr "блочні спеціальні файли не підтримуються" +msgstr "блокові спеціальні файли не підтримуються" #: src/mknod.c:219 #, c-format @@ -6486,7 +6534,7 @@ msgstr "надто багато шаблонів" msgid "with --suffix, template %s must end in X" msgstr "у разі визначення --suffix, шаблон %s має завершувати на X" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "некоректний шаблон, %s, містить символ розділення каталогів" @@ -6624,12 +6672,9 @@ msgid "Scott Bartram" msgstr "Scott Bartram" #: 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" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" -"Виводить кожен ФАЙЛ на стандартний вивід, додаючи номери рядків.\n" -"Якщо ФАЙЛ не вказаний або вказаний як -, читається стандартний ввід.\n" +"Вивести кожне ФАЙЛ до стандартного виведення із додаванням номерів рядків.\n" #: src/nl.c:186 msgid "" @@ -6738,27 +6783,23 @@ msgstr "неправильний стиль нумерації тіла: %s" msgid "invalid footer numbering style: %s" msgstr "неправильний стиль нумерації нижнього колонтитула: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" -msgstr "неправильний номер початкового рядка: %s" +#: src/nl.c:501 +msgid "invalid starting line number" +msgstr "неправильний номер початкового рядка" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" -msgstr "неправильний приріст номеру рядка: %s" +#: src/nl.c:506 +msgid "invalid line number increment" +msgstr "неправильний приріст номера рядка" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" -msgstr "неправильна кількість порожніх рядків: %s" +#: src/nl.c:513 +msgid "invalid line number of blank lines" +msgstr "неправильна кількість порожніх рядків" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" -msgstr "неправильна ширина поля для номера рядка: %s" +#: src/nl.c:520 +msgid "invalid line number field width" +msgstr "неправильна ширина поля для номера рядка" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "неправильний формат нумерації рядків: %s" @@ -6784,20 +6825,21 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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 "" "\n" -"Якщо стандартний ввід відбувається з терміналу, перенаправте його з /dev/" -"null.\n" -"Якщо стандартний вивід відбувається на термінал, якщо можливо, додайте\n" -" 'ohup.out' або '$HOME/nohup.out'.\n" -"Якщо стандартний потік помилок виводиться на екран, перенаправте його у\n" -"стандартний потік виводу. Щоб зберегти вивід до ФАЙЛа, вкажіть '%s КОМАНДА > " -"ФАЙЛ'.\n" +"Якщо стандартне введення відбувається з термінала, перенаправте його з " +"непридатного до читання файла.\n" +"Якщо стандартний вивід відбувається до термінала, якщо можливо, допишіть\n" +"виведене до 'ohup.out' або '$HOME/nohup.out', якщо першим варіантом не можна " +"скористатися.\n" +"Якщо стандартний потік помилок виводиться на екран, перенаправте його до\n" +"стандартного потоку виведення. Щоб зберегти виведене до ФАЙЛа, скористайтеся " +"командою «%s КОМАНДА > ФАЙЛ».\n" #: src/nohup.c:127 #, c-format @@ -6805,45 +6847,45 @@ msgid "failed to render standard input unusable" msgstr "" "не вдалося обробити, не вдалося використати стандартне джерело введення" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "всі аргументи проігноровані" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "вивід додається у %s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "виведення додається до %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" "не вдалося зробити так, щоб копія стандартного потоку помилок закрилась на " "початку виконання" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "ігнорується ввід та перенаправлення stderr на stdout" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "переспрямування stderr до stdout" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" msgstr "не вдалося перенаправити стандартний потік помилок" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -6870,59 +6912,54 @@ msgstr "" " --all вивести кількість встановлених процесорів\n" " --ignore=N якщо можна, виключити N модулів обробки\n" -#: 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "Assaf Gordon" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "значення є надто великим для перетворення: %s" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, c-format msgid "invalid number: %s" msgstr "некоректне число: %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" "відкидаємо суфікс %s у вхідних даних (варто використовувати --from для його " "збереження)" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" msgstr "некоректний суфікс у вхідних даних: %s" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "у вхідних даних не вистачає суфікса «i»: %s (наприклад Ki/Mi/Gi)" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "не вдалося приготувати значення «%Lf» для виводу" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, c-format msgid "invalid unit size: %s" msgstr "некоректна одиниця розміру: %s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Користування: %s [ПАРАМЕТР]... [ЧИСЛО]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" @@ -6930,26 +6967,29 @@ msgstr "" "Виконати переформатування числа ЧИСЛО або чисел зі стандартного джерела " "даних, якщо ЧИСЛО не вказано.\n" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" " --debug виводити попередження щодо некоректних вхідних даних\n" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" " -d, --delimiter=X використовувати X замість пробілу для відокремлення " "полів\n" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -" --field=N замісити число у полі N вхідних даних (типове поле -- " -"1)\n" +" --field=ПОЛЯ замінити номери у вказаних полях вхідних даних " +"(типово=1)\n" +" див. ПОЛЯ нижче\n" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" @@ -6957,7 +6997,7 @@ msgstr "" " --format=ФОРМАТ використовувати форматування у стилі printf;\n" " див. докладний опис форматів нижче\n" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" @@ -6967,7 +7007,7 @@ msgstr "" "типове значення -- 'none';\n" " див. опис одиниць нижче\n" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" @@ -6975,7 +7015,7 @@ msgstr "" " --from-unit=N вказати розмірність одиниці у вхідних даних (замість " "типової 1)\n" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6986,7 +7026,7 @@ msgstr "" "наприклад 1.000.000\n" " (не працюватиме у локалі C/POSIX)\n" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" @@ -6994,7 +7034,7 @@ msgstr "" " --header[=N] вивести (без перетворення) перші N рядків заголовка;\n" " якщо не вказано, типовим значенням є 1\n" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" @@ -7004,7 +7044,7 @@ msgstr "" "помилками),\n" " warn (попередити), ignore (ігнорувати).\n" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -7022,7 +7062,7 @@ msgstr "" "доповнення,\n" " якщо буде виявлено пробіли.\n" -#: src/numfmt.c:860 +#: src/numfmt.c:927 msgid "" " --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" " up, down, from-zero (default), towards-zero, " @@ -7035,7 +7075,7 @@ msgstr "" "нуля),\n" " nearest (до найближчого цілого\n" -#: src/numfmt.c:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" @@ -7044,21 +7084,21 @@ msgstr "" "СУФІКС\n" " у вхідних даних.\n" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" " --to=ОДИНИЦЯ автоматично масштабувати виведені числа за ОДИНИЦЕЮ; " "див. опис одиниць нижче\n" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" " --to-unit=N розмірність одиниці у виведених даних (замість " "типової 1)\n" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" @@ -7066,13 +7106,13 @@ msgstr "" "\n" "Параметри одиниць:\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" " none без автоматичного масштабування; використання суфіксів призведе " "до повідомлення про помилку\n" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -7086,7 +7126,7 @@ msgstr "" " 1M = 1000000,\n" " 1Mi = 1048576,\n" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -7098,7 +7138,7 @@ msgstr "" " 1M = 1000000,\n" " ...\n" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7110,7 +7150,7 @@ msgstr "" " 1M = 1048576,\n" " ...\n" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7122,7 +7162,27 @@ msgstr "" " 1Mi = 1048576,\n" " ...\n" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"\n" +"У значенні ПОЛЯ передбачено підтримку стилю cut(1) діапазонів полів:\n" +" N N-те поле, відлік від 1\n" +" N- з поля N до кінця рядка\n" +" N-M з поля N до поля M (включно)\n" +" -M від першого поля до поля M (включно)\n" +" - усі поля\n" +"Можна вказати декілька полів/діапазонів, відокремивши їх комами\n" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -7131,6 +7191,7 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" "\n" "ФОРМАТ має відповідати виведенню одного аргументу з рухомою крапкою -- " @@ -7138,11 +7199,13 @@ msgstr "" "Використання лапки (%'f) увімкне параметр --grouping (якщо він підтримується " "поточною локаллю).\n" "Додаткове визначення довжини (%10f) призведе до доповнення виведених даних.\n" -"Додаткова нульова дожина (%010f) призведе до нульового доповнення числа. " +"Додаткова нульова довжина (%010f) призведе до нульового доповнення числа. " "Додаткові від'ємні\n" "значення довжини (%-10f) вирівнюватимуть виведення ліворуч.\n" +"Додатковий параметр точності (%.1f) перевизначає точність, визначену " +"вхідними даними.\n" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7164,7 +7227,7 @@ msgstr "" "буде 0. Якщо буде вказано --invalid='ignore', про помилки перетворення не\n" "повідомлятиметься, а станом виходу буде 0.\n" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -7179,8 +7242,8 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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 "" @@ -7196,123 +7259,135 @@ msgstr "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "формат %s не містить директиву %%" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "некоректний формат %s (переповнення ширини)" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "--format доповнення перевизначає --padding" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "формат %s закінчується у %%" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, c-format +msgid "invalid precision in format %s" +msgstr "некоректна точність у форматуванні %s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" -msgstr "некоректний формат %s, інструкцією має бути %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" +msgstr "некоректний формат %s, інструкцією має бути %%[0]['][-][N][.][N]f" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "формат %s має надто багато директив %%" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, c-format msgid "invalid suffix in input %s: %s" msgstr "некоректний суфікс у вхідних даних %s: %s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" +"значення або точність є надто великим для виведення: «%Lg/%» (варто " +"скористатися --to)" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" "значення є надто великим для виведення: «%Lg» (варто скористатися --to)" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" "значення є надто великим для виведення: «%Lg» (обробка значень більше 999Y " "неможлива)" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "занадто велике вхідне значення, %s, можлива втрата точності" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" -"надто короткий рядок вхідних даних, у полі %ld не виявлено чисел для " -"форматування" +msgid "invalid field value %s" +msgstr "некоректне значення поля, %s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, c-format msgid "invalid padding value %s" msgstr "некоректне значення доповнення %s" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, c-format -msgid "invalid field value %s" -msgstr "некоректне значення поля, %s" +msgid "multiple field specifications" +msgstr "специфікація використання декількох полів" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, c-format msgid "invalid header value %s" msgstr "некоректне значення заголовка, %s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "--grouping не можна використовувати разом з --format" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "не вказано параметра перетворення" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "grouping не можна використовувати разом з --to" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "групування не діє у цій локалі" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" "--header проігноровано, оскільки вхідні дані надходять з командного рядка" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "помилка під час спроби читання вхідних даних" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "не вдалося перетворити деякі з вхідних чисел" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7325,23 +7400,23 @@ msgstr "" " або: %s --traditional [КЛЮЧ]... [ФАЙЛ] [[+]ЗСУВ[.][b] [+][МІТКА][.]" "[b]]\n" -#: src/od.c:326 +#: src/od.c:327 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" "Виводить однозначне (типово байтове вісімкове) представлення ФАЙЛА\n" -"на стандартний вивід. Якщо ФАЙЛ не вказаний або вказаний як -, читається\n" -"стандартний ввід.\n" +"на стандартне виведення. Якщо вказано декілька аргументів ФАЙЛ,\n" +"сполучає їх до одного фрагмента даних у вказаному порядку для\n" +"формування результатів.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 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" @@ -7349,6 +7424,7 @@ msgid "" "For OFFSET and LABEL, a 0x or 0X prefix indicates hexadecimal;\n" "suffixes may be . for octal and b for multiply by 512.\n" msgstr "" +"\n" "Якщо застосовуються й перша, й друга форми виклику, вважається друга\n" "форма, якщо останній операнд починається на + або (якщо вказані два\n" "операнда) на цифру. Операнд ЗСУВ означає -j ЗСУВ. МІТКА --\n" @@ -7357,7 +7433,7 @@ msgstr "" "шістнадцяткові числа, суфікс . -- як вісімкові, а суфікс b\n" "помножує на 512.\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7374,7 +7450,7 @@ msgstr "" " --endian={big|little} встановити вказаний порядок байтів\n" " -j, --skip-bytes=Н пропустить перші Н байт\n" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -7396,7 +7472,7 @@ msgstr "" " Якщо N не вказано, буде використано 32\n" " --traditional приймати аргументи у традиційній формі\n" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -7415,7 +7491,7 @@ msgstr "" "'\\'\n" " -d синонім -t u2, беззнакові десяткові двобайтові одиниці\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7431,7 +7507,7 @@ msgstr "" " -s синонім -t d2, десяткові двобайтові одиниці\n" " -x синонім -t x2, шістнадцяткові двобайтові одиниці\n" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -7445,7 +7521,7 @@ msgstr "" " a іменований знак\n" " c придатний до показу символ або керівна послідовність з '\\'\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7459,7 +7535,7 @@ msgstr "" " u[ЧИСЛО] беззнакове десяткове ціле розміром вказане ЧИСЛО байт\n" " x[ЧИСЛО] шістнадцяткове ціле розміром вказане ЧИСЛО байт\n" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -7473,7 +7549,7 @@ msgstr "" "I (int) або L (long), якщо ТИП дорівнює f, ЧИСЛО може бути F (float),\n" "D (double) або L (long double).\n" -#: src/od.c:401 +#: src/od.c:404 msgid "" "\n" "Adding a z suffix to any type displays printable characters at the end of\n" @@ -7484,7 +7560,7 @@ msgstr "" "символів\n" "наприкінці кожного рядка виведених даних.\n" -#: src/od.c:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -7506,12 +7582,12 @@ msgstr "" " M 1024*1024\n" "тощо для G, T, P, E, Z, Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "неправильний рядок типу %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7520,7 +7596,7 @@ msgstr "" "неправильно вказаний рядок типу %s;\n" "ця система не підтримує %lu-байтове цілого типу" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7529,38 +7605,38 @@ msgstr "" "неправильно вказаний тип %s;\n" "ця система не підтримує %lu-байтове типу з плаваючою комою" -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" msgstr "неправильний знак '%c' у рядку типу %s" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "неможливо перейти за межу останнього вхідного файла" -#: src/od.c:1650 +#: src/od.c:1658 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "" "неправильно вказана основа системи числення '%c', повинна бути одним з " "символів [doxn]" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "при дампі рядків не можна вказувати тип" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "у режимі сумісності підтримується не більше одного файла." -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "значення skip-bytes + read-bytes надто велике" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "попередження: неправильна ширина %lu; буде використана %d" @@ -7579,11 +7655,9 @@ msgstr "стандартний ввід закритий" msgid "" "Write lines consisting of the sequentially corresponding lines from\n" "each FILE, separated by TABs, to standard output.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" -"Виводить на стандартний вивід рядки, складені з відповідних рядків\n" -"вхідних ФАЙЛІВ, що розділяються табуляцією.\n" -"Якщо ФАЙЛ не вказаний або вказаний як -, читається стандартний ввід.\n" +"Вивести рядки, що складаються з послідовності відповідних рядків із\n" +"кожного ФАЙЛа, відокремлені табуляціями, до стандартного виведення.\n" #: src/paste.c:447 msgid "" @@ -7723,12 +7797,12 @@ msgstr "Коли" msgid "Where" msgstr "Де" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Використання: %s [КЛЮЧ]... [КОРИСТУВАЧ]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7747,7 +7821,7 @@ msgstr "" " користувача\n" " -s короткий формат виводу, типово використовується\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7762,7 +7836,7 @@ msgstr "" " -q опустити у короткому форматі повне ім'я користувача,\n" " назву віддаленої машини та час неактивності\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -7773,7 +7847,7 @@ msgstr "" "Спрощена програма 'finger'; виводить відомості про користувача.\n" "У складі файла utmp буде використовуватися %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7781,92 +7855,87 @@ msgstr "" "одне" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "'--pages=ПЕРША_СТОР[:ОСТАННЯ_СТОР]' пропущений аргумент" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "некоректний діапазон сторінок %s" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" -msgstr "'-l ДОВЖИНА_СТОРІНКИ' неправильна кількість рядків: %s" +#: src/pr.c:967 +msgid "'-l PAGE_LENGTH' invalid number of lines" +msgstr "«-l ДОВЖИНА_СТОРІНКИ» — неправильна кількість рядків" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" -msgstr "'-N НОМЕР' неправильний номер початкового рядка: %s" +#: src/pr.c:982 +msgid "'-N NUMBER' invalid starting line number" +msgstr "«-N НОМЕР» — неправильний номер початкового рядка" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" -msgstr "'-o ПОЛЕ' неправильний зсув: %s" +#: src/pr.c:986 +msgid "'-o MARGIN' invalid line offset" +msgstr "«-o ПОЛЕ» — неправильний зсув" -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" -msgstr "«-w ШИРИНА_СТОРІНКИ» неправильна кількість знаків: %s" +#: src/pr.c:1023 +msgid "'-w PAGE_WIDTH' invalid number of characters" +msgstr "«-w ШИРИНА_СТОРІНКИ» неправильна кількість знаків" -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" -msgstr "«-W ШИРИНА_СТОРІНКИ» неправильна кількість знаків: %s" +#: src/pr.c:1032 +msgid "'-W PAGE_WIDTH' invalid number of characters" +msgstr "«-W ШИРИНА_СТОРІНКИ» неправильна кількість знаків" -#: src/pr.c:1096 +#: src/pr.c:1059 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "неможливо вказати кількість позицій під час паралельного друку" -#: src/pr.c:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "не можна одночасно вказувати друк вздовж і паралельно." -#: src/pr.c:1196 +#: src/pr.c:1166 #, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "'-%c' зайві знаки або неправильне число у аргументі: %s" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "сторінка надто вузька" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" "номер початкової сторінки % перевищує загальну кількість сторінок " "%" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "переповнення номеру сторінок" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Сторінка %" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "Розбиває ФАЙЛ(и) на сторінки або колонки під час виведення.\n" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7883,7 +7952,7 @@ msgstr "" " лише коли не вказаний ключ -a. Балансувати кількість\n" " рядків у колонці на кожній сторінці.\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7900,7 +7969,7 @@ msgstr "" " -d, --double-space\n" " вставляти порожній рядок після кожного виведеного рядка\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7922,7 +7991,7 @@ msgstr "" " ключ -F, та п'ятирядковим заголовком та кінцівкою, якщо\n" " ключ -F не вказаний)\n" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7944,21 +8013,27 @@ msgstr "" " не вирівнювати колонки, --sep-string[=РЯДОК]\n" " задає розділювачі\n" -#: src/pr.c:2798 +#: src/pr.c:2769 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" msgstr "" " -l, --length=ДОВЖИНА_СТОРІНКИ\n" " встановити ДОВЖИНУ_СТОРІНКИ (66)\n" -" (типово кількість рядків тексту рівно 56, а з -F 63)\n" -" -m, --merge виводити всі файли паралельно, по одному у стовпчику,\n" -" урізати рядка, але з'єднувати повні рядки при -J\n" +" (типово кількість рядків тексту рівно 56, а з -F 63).\n" +" Використовує -t, якщо ДОВЖИНА_СТОРІНКИ <= 10\n" -#: src/pr.c:2805 +#: src/pr.c:2775 +msgid "" +" -m, --merge print all files in parallel, one in each column,\n" +" truncate lines, but join lines of full length with -J\n" +msgstr "" +" -m, --merge виводити всі файли паралельно, по одному у стовпчику,\n" +" урізати рядка, але з'єднувати повні рядки при -J\n" + +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7975,7 +8050,7 @@ msgstr "" " почати нумерацію з НОМЕРА з першого рядка першої\n" " сторінки, що виводиться (дивіться +ПЕРША_СТОРІНКА)\n" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7989,7 +8064,7 @@ msgstr "" " -r, --no-file-warnings\n" " не попереджати про неможливість відкриття файла\n" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -8006,24 +8081,30 @@ msgstr "" " для колонок (-ЧИСЛО |-a -ЧИСЛО|-m), якщо немає ключа -" "w.\n" -#: src/pr.c:2828 +#: src/pr.c:2802 msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -S[РЯДОК], --sep-string[=РЯДОК]\n" -" розділяти колонки необов'язковим РЯДКОМ;\n" +" розділяти колонки РЯДКОМ;\n" " без -S: розділювач — табуляція, якщо вказано\n" " ключ -J, інакше пробіл (те саме, що -S\" \"); не " "впливає\n" -" на ключі для колонок\n" -" -t, --omit-header не виводити заголовки\n" +" на параметри для колонок\n" + +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" +" -t, --omit-header пропускати заголовки і кінцівки сторінок;\n" +" використовується, якщо ДОВЖИНА_СТОРІНКИ <= 10\n" -#: src/pr.c:2835 +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -8045,7 +8126,7 @@ msgstr "" " встановити ШИРИНУ_СТОРІНКИ (72) у стовпчиках для\n" " виводу у декілька колонок, -s[знак] вимикає (72)\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -8058,16 +8139,6 @@ msgstr "" " якщо не вказаний ключ -J; не змінюється ключами -S чи -" "s\n" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"додається -t, якщо PAGE_LENGTH <= 10. Якщо ФАЙЛ не вказано\n" -"або вказаний як -, читає стандартне джерело введення.\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -8224,19 +8295,25 @@ msgstr "" "Виводить переставлений алфавітний вказівник слів вхідних файлів, включаючи " "контекст.\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 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 виводити автоматично згенеровані посилання\n" -" -G, --traditional увімкнути режим сумісності з System V\n" -" -F, --flag-truncation=РЯДОК використовувати РЯДОК для позначення " -"обрізаних рядків\n" +" -G, --traditional увімкнути режим сумісності з System V " +"(ptx)\n" #: src/ptx.c:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" +" -F, --flag-truncation=РЯДОК використовувати РЯДОК для позначення\n" +" обрізаних рядків. Типовим є «/».\n" + +#: src/ptx.c:1839 +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" @@ -8250,7 +8327,7 @@ msgstr "" " -S, --sentence-regexp=REGEXP для кінця рядків або кінця речень\n" " -T, --format=tex генерувати вивід у вигляді директив TeX\n" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8269,7 +8346,7 @@ msgstr "" " -o, --only-file=ФАЙЛ лише прочитати список слів з заданого " "ФАЙЛА\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8281,20 +8358,16 @@ msgstr "" " -w, --width=ЧИСЛО ширина виводу у стовпчиках, без урахування " "посилань\n" -#: src/ptx.c:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Якщо вхідний файл не вказаний, або якщо вказано символ -,\n" -"використовується стандартне джерело вхідних даних. Типовим є «-F /».\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "неправильна ширина інтервалу: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "неправильна довжина рядка: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8325,7 +8398,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "помилка зміни каталогу на %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "помилка отримання атрибутів %s" @@ -8345,8 +8418,8 @@ msgstr "аргументи, що не є ключами проігнорован msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Використання: %s [КЛЮЧ]... ФАЙЛ...\n" @@ -8608,19 +8681,19 @@ msgstr "" #: src/rm.c:342 #, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " -msgstr[0] "%s: вилучити %zu аргумент рекурсивно? " -msgstr[1] "%s: вилучити %zu аргументи рекурсивно? " -msgstr[2] "%s: вилучити %zu аргументів рекурсивно? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " +msgstr[0] "%s: вилучити % аргумент рекурсивно? " +msgstr[1] "%s: вилучити % аргументи рекурсивно? " +msgstr[2] "%s: вилучити % аргументів рекурсивно? " #: src/rm.c:345 #, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " -msgstr[0] "%s: вилучити %zu аргумент? " -msgstr[1] "%s: вилучити %zu аргументи? " -msgstr[2] "%s: вилучити %zu аргументів? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " +msgstr[0] "%s: вилучити % аргумент? " +msgstr[1] "%s: вилучити % аргументи? " +msgstr[2] "%s: вилучити % аргументів? " #: src/rmdir.c:134 src/rmdir.c:233 #, c-format @@ -8835,12 +8908,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "неправильний аргумент з плаваючою комою: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "формат містить %s невідому директиву %%%c" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "при виводі рядків однакової ширини формат можна не вказувати" @@ -8858,7 +8931,15 @@ msgstr "" "Перезаписує декілька раз вказані файли, щоб ускладнити відновлення\n" "навіть з використанням дуже коштовного обладнання.\n" -#: src/shred.c:177 +#: src/shred.c:174 +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Якщо ФАЙЛ вказано як -, розрізати стандартне виведення.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8871,7 +8952,7 @@ msgstr "" " --random-source=ФАЙЛ брати випадкові дані з ФАЙЛа\n" " -s, --size=N очистити N байт (можливі суфікси, подібні до K, M, G)\n" -#: src/shred.c:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -8885,11 +8966,9 @@ msgstr "" " типово для незвичних файлів\n" " -z, --zero перезаписати у конці нулями, щоб сховати змішування\n" -#: src/shred.c:192 +#: src/shred.c:196 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.\n" @@ -8901,8 +8980,6 @@ msgid "" "\n" msgstr "" "\n" -"Якщо ФАЙЛ вказаний як -, змішувати стандартний вивід.\n" -"\n" "Вилучає ФАЙЛИ, якщо вказано --remove (-u). Типово файли не\n" "вилучаються, оскільки часто обробляються файли-пристрої, подібні до\n" "/dev/hda, а такі файли не треба вилучати.\n" @@ -8917,7 +8994,7 @@ msgstr "" "вимогливим до ресурсів комп'ютера.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8935,7 +9012,7 @@ msgstr "" "режимах файлової системи:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8957,7 +9034,7 @@ msgstr "" " NFS-сервер від Network Appliance\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8971,7 +9048,7 @@ msgstr "" "* стиснені файлові системи\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -8991,7 +9068,7 @@ msgstr "" "конкретної файлової системи у файлі /etc/fstab, згідно документації на\n" "сторінці man для mount (man mount).\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -9001,127 +9078,125 @@ msgstr "" "містити копії файла, які не можна вилучити, і які пізніше надають змогу\n" "відновити знищений файл.\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: операція fdatasync завершилась невдало" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: операція fsync завершилась невдало" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: не вдалося відкотитись" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: прохід %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: помилка записи за зсувом %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: операція lseek завершилась помилкою" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: файл надто великий" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: прохід %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: прохід %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: операція fstat завершилась помилкою" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: неправильний тип файла" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: файл має від'ємний розмір" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: помилка при скороченні" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: операція fcntl завершилась помилкою" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: не вдалося нарізати файловий дескриптор з лише з правом додавання" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: вилучення" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: перейменований на %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: не вдалося вилучити" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: вилучено" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: не вдалося закрити" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: не вдалося відкрити для читання" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" -msgstr "%s: неправильна кількість проходів" +msgid "invalid number of passes" +msgstr "некоректна кількість проходів" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "вказано декілька форматів виводу" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" -msgstr "%s: неправильний розмір файла" +#: src/shred.c:1255 +msgid "invalid file size" +msgstr "некоректний розмір файла" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -9132,11 +9207,11 @@ msgstr "" " або: %s -e [КЛЮЧ]... [АРГУМЕНТ]...\n" " або: %s -i НИЖ-ВИЩ [КЛЮЧ]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "Виводить випадково переставлені вхідні рядки на стандартний вивід.\n" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -9154,37 +9229,36 @@ msgstr "" " --random-source=ФАЙЛ випадкові дані з ФАЙЛа\n" " -r, --repeat рядки у виведених даних можуть повторюватися\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "занадто багато рядків вхідних даних" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "задано декілька ключів -i" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" -msgstr "неприпустимий вхідний діапазон %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +msgid "invalid input range" +msgstr "некоректний діапазон вхідних даних" -#: src/shuf.c:465 +#: src/shuf.c:459 #, c-format -msgid "invalid line count %s" -msgstr "неправильна кількість рядків %s" +msgid "invalid line count: %s" +msgstr "некоректна кількість рядків: %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "задано декілька файлів для виводу" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "не можна одночасно використовувати ключі -e та -i" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "немає рядків для повторення" @@ -9211,12 +9285,12 @@ msgstr "" "може бути довільним числом з плаваючою комою.\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "неправильний інтервал часу %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "не вдалося прочитати значення таймеру реального часу" @@ -9225,7 +9299,7 @@ msgstr "не вдалося прочитати значення таймеру msgid "Write sorted concatenation of all FILE(s) to standard output.\n" msgstr "Вивести сортоване сполучення усіх ФАЙЛ(ів) на стандартний вивід.\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -9233,7 +9307,7 @@ msgstr "" "Ключі, що вказують порядок:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9244,7 +9318,7 @@ msgstr "" " -d, --dictionary-order розглядати лише пропуски, літери та цифри\n" " -f, --ignore-case ігнорувати регістр літер\n" -#: src/sort.c:443 +#: src/sort.c:444 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -9254,14 +9328,14 @@ msgstr "" " -i, --ignore-nonprinting розглядати лише друковані знаки\n" " -M, --month-sort порівнювати (невідомо) < 'JAN' < ... < 'DEC'\n" -#: src/sort.c:448 +#: src/sort.c:449 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:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9273,7 +9347,7 @@ msgstr "" " --random-source=ФАЙЛ випадкові дані з ФАЙЛА\n" " -r, --reverse зворотний порядок порівняння\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9289,7 +9363,7 @@ msgstr "" " -V, --version-sort сортувати за номером версії\n" "\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -9297,7 +9371,7 @@ msgstr "" "Інші параметри:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9306,7 +9380,7 @@ msgstr "" "одразу;\n" " для решти використовувати тимчасові файли\n" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -9321,7 +9395,7 @@ msgstr "" " --compress-program=ПРОГ стискати тимчасові файли командою ПРОГ;\n" " розпаковувати командою ПРОГ -d\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9339,7 +9413,7 @@ msgstr "" "джерела\n" " вхідних даних\n" -#: src/sort.c:487 +#: src/sort.c:488 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -9349,7 +9423,7 @@ msgstr "" " -m, --merge об'єднати вже впорядковані файли; не " "впорядковувати\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9362,7 +9436,7 @@ msgstr "" " -S, --buffer-size=РОЗМІР\n" " використовувати в пам'яті буфер вказаного РОЗМІРУ\n" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9387,7 +9461,7 @@ msgstr "" " -u, --unique з -c, суворо перевіряти порядок;\n" " без -c, виводити лише перше з кількох рівних\n" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9418,12 +9492,10 @@ msgstr "" "\n" "Після РОЗМІРУ можна вказувати такі суфікси-мультиплікатори:\n" -#: src/sort.c:524 +#: src/sort.c:525 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" @@ -9431,124 +9503,122 @@ msgid "" msgstr "" "% 1% пам'яті, b 1, k 1024 (типово), та так далі для M, G, T, P, E, Z, Y.\n" "\n" -"Якщо ФАЙЛ не вказаний або вказаний як -, читає стандартний ввід.\n" -"\n" "*** ПОПЕРЕДЖЕННЯ ***\n" "Встановлена в середовищі локаль впливає на порядок сортування.\n" "Щоб отримати традиційний порядок, що використовує системні значення байт,\n" "встановіть LC_ALL=C.\n" -#: src/sort.c:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "очікування %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] аварійно завершений" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "не вдалося створити тимчасовий файл у %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "операція відкриття завершилась помилкою" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "операція fflush завершилась помилкою" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "помилка закриття" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "не вдалося створити тимчасовий файл" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "неможливо створити процес для %s -d" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "попередження, не вдалося вилучити: %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "некоректний аргумент --%s %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "мінімальним аргументом --%s є %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "аргумент --%s %s є занадто великим" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "максимум --%s аргумент з поточним rlimit що дорівнює %s" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "кількість паралельних впорядкувань має бути ненульовою" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "операція stat завершилась помилкою" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "помилка читання" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "помилка перетворення рядків" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "Рядок до перетворення %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "^ не знайдено збігів з ключем\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "використано застарілий ключ «%s»; вам варто скористатися ключем «%s»" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "ключ %lu має нульову ширину, його буде проігноровано" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "початкові пробіли у ключі %lu буде враховано; варто також вказати «b»" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "ключ %lu є числовим, він охоплює декілька полів" -#: src/sort.c:2484 +#: src/sort.c:2483 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" @@ -9556,152 +9626,153 @@ msgstr[0] "параметр «-%s» проігноровано" msgstr[1] "параметри «-%s» проігноровано" msgstr[2] "параметри «-%s» проігноровано" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "параметр «-r» застосовується лише у разі, якщо збігів не виявлено" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "запис завершився помилкою" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: неправильний порядок: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "стандартна помилка" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "не вдалося прочитати" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: неправильна специфікація поля %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "несумісні параметри '-%s'" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: неправильний лічильник на початку %s" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "неправильне число після '-'" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "неправильне число після '.'" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "зайвий знак у специфікації поля" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "вказано декілька програм стискання" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "неправильне число на початку поля" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "нульовий номер поля" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "нульовий знаковий зсув" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" msgstr "неправильне число після ','" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "порожня табуляція" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "не вдалося прочитати назви файлів з %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: некоректна нульова довжина назви файла" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "немає вхідних даних з %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "використовуються правила впорядковування %s" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "використовується просте порівняння байтів" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "додатковий операнд %s не припустимий з -%c" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" -msgstr "довжина суфікса не повинна бути меншою за %zu" +msgid "the suffix length needs to be at least %" +msgstr "довжина суфікса не повинна бути меншою за %" -#: src/split.c:203 +#: src/split.c:224 #, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" -msgstr "Використання: %s [ПАРАМЕТР]... [ВХІДНІ_ДАНІ [ПРЕФІКС]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" +msgstr "Користування: %s [ПАРАМЕТР]... [ФАЙЛ [ПРЕФІКС]]\n" -#: src/split.c:207 +#: src/split.c:228 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" -"Виводить фіксовані за розміром частини ВХІДНІ_ДАНІ до файлів ПРЕФІКСaa,\n" -"ПРЕФІКСab, ...; типово розмір частини дорівнює 1000 рядків, а ПРЕФІКС\n" -"дорівнює 'x'. Якщо ВХІДНІ_ДАНІ не вказано або вказано як -, читає\n" -"дані зі стандартного джерела даних.\n" +"Вивести шматки ФАЙЛа до ПРЕФІКСaa, ПРЕФІКСab, ...;\n" +"Типовий розмір шматка — 1000 рядків, а типовий ПРЕФІКС — «x».\n" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -" -a, --suffix-length=Н використовувати суфікси довжини Н (типово %d)\n" -" -b, --bytes=ЧИСЛО записувати у кожен файл виводу вказане ЧИСЛО байт\n" +" -a, --suffix-length=N використовувати суфікси довжини N (типово %d)\n" +" --additional-suffix=СУФІКС дописувати СУФІКС до назв файлів\n" +" -b, --bytes=ЧИСЛО записувати у кожен файл виводу вказане ЧИСЛО " +"байтів\n" " -C, --line-bytes=ЧИСЛО записувати не більше вказаного ЧИСЛА байт з рядка\n" " -d, --numeric-suffixes використовувати числові, а не алфавітні суфікси\n" " -e, --elide-empty-files do not generate empty output files with '-n'\n" @@ -9711,10 +9782,13 @@ msgstr "" "рядків\n" " -n, --number=КІЛЬКІСТЬ створити КІЛЬКІСТЬ фрагментів виведення. Див. " "нижче.\n" +" -t, --separator=РОЗД використовувати роздільник РОЗД замість розриву\n" +" рядка для відокремлення записів;\n" +" '\\0' (нуль) визначає символ NUL\n" " -u, --unbuffered копіювати вхідні дані безпосередньо до виведення з " "«-n r/...»\n" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9722,212 +9796,213 @@ msgstr "" " --verbose виводити діагностичні повідомлення\n" " перед відкриттям кожного файла виводу\n" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" "\n" "ФРАГМЕНТИ можна задавати у форматі:\n" "N розділити на N файлів на основі розміру вхідних даних\n" "K/N вивести K-ий з N до stdout\n" -"l/N розділити на N файлів без поділу на рядки\n" -"l/K/N вивести K-ий з N до stdout без поділу на рядки\n" +"l/N розділити на N файлів без поділу на рядки або записи\n" +"l/K/N вивести K-ий з N до stdout без поділу на рядки або записи\n" "r/N подібно до «l», але з використанням циклічного перебирання\n" "r/K/N те саме, але вивести лише K-ий з N до stdout\n" -#: src/split.c:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "вичерпано суфікси для вихідних файлів" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "створюється файл %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "%s перепише вхідні дані; перериваємо роботу" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "не вдалося встановити змінну середовища FILE" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "виконання з FILE=%s\n" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "не вдалося створити канал" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "закриття попереднього каналу" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "закриття каналу виведення" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "пересування каналу введення" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "закриття каналу введення" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "не вдалося виконати команду: «%s -c %s»" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "не вдалося закрити канал вхідних даних" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "очікування на дочірній процес" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "при FILE=%s, сигнал %s від команди: %s" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "при FILE=%s, код виходу %d від команди: %s" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "невідомий стан від команди (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "не можна розбивати одразу кількома методами" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" -msgstr "%s: некоректна кількість фрагментів" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +msgid "invalid number of chunks" +msgstr "некоректна кількість фрагментів" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" -msgstr "%s: некоректний номер фрагмента" +#: src/split.c:1212 +msgid "invalid chunk number" +msgstr "некоректний номер фрагмента" + +#: src/split.c:1259 +msgid "invalid suffix length" +msgstr "некоректна довжина суфікса" -#: src/split.c:1169 +#: src/split.c:1333 #, c-format -msgid "%s: invalid suffix length" -msgstr "%s: неправильна довжина суфіксу" +msgid "empty record separator" +msgstr "порожній роздільник записів" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1344 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: неправильна кількість байт" +msgid "multi-character separator %s" +msgstr "багатосимвольний роздільник %s" -#: src/split.c:1213 src/split.c:1360 +#: src/split.c:1352 #, c-format -msgid "%s: invalid number of lines" -msgstr "%s: неправильна кількість рядків" +msgid "multiple separator characters specified" +msgstr "вказано декілька символів-роздільників" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "ключ кількості рядків -%s%c... надто великий" -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: некоректне початкове значення у числовому суфіксі" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" -msgstr "%s: некоректний розмір блоку введення-виведення" +#: src/split.c:1419 +msgid "invalid IO block size" +msgstr "некоректний розмір блоку введення-виведення" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "--filter не обробляє фрагменти, видобуті до stdout" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" "початкове значення числового суфікса є занадто великим для довжини суфікса" -#: src/split.c:1419 +#: src/split.c:1528 #, c-format msgid "%s: cannot determine file size" msgstr "%s: не вдалося визначити розмір файла" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "не вдалося перетворити у канонічну форму %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "попередження: керівна послідовність '\\%c' не розпізнана" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: неправильна директива" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "попередження: зворотна похила риска наприкінці формату" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" "використання %s для позначення стандартного введення не працює у режимі " "файлової системи" -#: src/stat.c:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "не вдалося прочитати інформацію файлової системи для %s" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9943,7 +10018,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9953,30 +10028,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "Контекст: %C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9988,11 +10063,11 @@ msgstr "" " Зміна: %z\n" "Створ.: %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "Показати файл або стан файлової системи.\n" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" @@ -10000,7 +10075,7 @@ msgstr "" " -L, --dereference слідувати за посиланням\n" " -f, --file-system показати стан файлової системи, а не файла\n" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -10018,7 +10093,7 @@ msgstr "" "\\n.\n" " -t, --terse виводити дані у компактній формі\n" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -10038,7 +10113,7 @@ msgstr "" " %B розмір блоку, що повідомляється %b, у байтах\n" " %C рядок з контекстом безпеки SELinux\n" -#: src/stat.c:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -10054,7 +10129,7 @@ msgstr "" " %g ідентифікатор групи-власника\n" " %G назва групи-власника\n" -#: src/stat.c:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -10078,7 +10153,7 @@ msgstr "" " %T другорядний тип пристрою, шістнадцятковий, для спеціальних файлів " "символьних або блокових пристроїв\n" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -10105,7 +10180,7 @@ msgstr "" " %Z час останньої зміни у секундах з початку Епохи\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -10123,7 +10198,7 @@ msgstr "" " %d кількість вільних файлових вузлів у файловій системі\n" " %f кількість вільних блоків у файловій системі\n" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -10202,8 +10277,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -10233,7 +10307,7 @@ msgstr "рядкова буферизація stdin не має сенсу" msgid "you must specify a buffering mode option" msgstr "вам слід вказати параметр режиму буферизації" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10244,11 +10318,11 @@ msgstr "" " або %s [-F ПРИСТРІЙ] [--file=ПРИСТРІЙ] [-a|--all]\n" " або %s [-F ПРИСТРІЙ] [--file=ПРИСТРІЙ] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "Виводить або змінює характеристики термінала.\n" -#: src/stty.c:528 +#: src/stty.c:536 msgid "" " -a, --all print all current settings in human-readable form\n" " -g, --save print all current settings in a stty-readable form\n" @@ -10261,7 +10335,7 @@ msgstr "" " відкрити та використовувати вказаний пристрій замість\n" " стандартного вводу\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10272,120 +10346,165 @@ msgstr "" "позначені параметри, не описані у стандарті POSIX. Доступність того чи\n" "іншого параметру визначається системою, що використовується.\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" +"\n" +"Спеціальні символи:\n" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr " * discard СИМВОЛ СИМВОЛ перемикатиме відкидання виведення\n" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" +" * dsusp СИМВОЛ СИМВОЛ надсилатиме сигнал зупинки термінала, щойно " +"введення\n" +" буде завершено\n" + +#: src/stty.c:561 +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" -"\n" -"Спеціальні символи:\n" -"* dsusp СИМВОЛ СИМВОЛ буде надсилати терміналу сигнал зупинки при\n" -" завершенні вводу\n" -" eof СИМВОЛ СИМВОЛ буде означати кінець файла (припинення вводу)\n" +" eof СИМВОЛ СИМВОЛ буде означати кінець файла (припинення введення)\n" " eol СИМВОЛ СИМВОЛ буде означати кінець рядка\n" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr " * eol2 СИМВОЛ заміняти СИМВОЛ на кінець рядка\n" + +#: src/stty.c:570 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 СИМВОЛ інший СИМВОЛ для кінця рядка\n" " erase СИМВОЛ СИМВОЛ буде стирати останній введений до нього\n" " intr СИМВОЛ СИМВОЛ буде надсилати сигнал переривання\n" " kill СИМВОЛ СИМВОЛ буде стирати поточний рядок\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" -msgstr "" -"* lnext СИМВОЛ СИМВОЛ буде вводити наступний символ, скасовуючи його\n" -" спеціальну дію\n" -" quit СИМВОЛ СИМВОЛ буде надсилати сигнал виходу\n" -"* rprnt СИМВОЛ СИМВОЛ буде перерисовувати поточний рядок\n" -" start СИМВОЛ СИМВОЛ буде відновлювати ввід\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr " * lnext СИМВОЛ СИМВОЛ вводитиме наступний символ у лапках\n" -#: src/stty.c:559 +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr " * status СИМВОЛ СИМВОЛ надсилатиме сигнал info\n" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr " quit СИМВОЛ СИМВОЛ надсилатиме сигнал виходу\n" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr " * rprnt СИМВОЛ СИМВОЛ перемальовуватиме поточний рядок\n" + +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 СИМВОЛ СИМВОЛ буде призупиняти ввід\n" -" susp СИМВОЛ СИМВОЛ буде надсилати терміналу сигнал зупинки\n" -"* swtch СИМВОЛ СИМВОЛ буде перемикати рівень складності оболонки\n" -"* werase СИМВОЛ СИМВОЛ буде стирати останнє введене слово\n" +" start СИМВОЛ СИМВОЛ перезапускатиме виведення після його зупинення\n" +" stop СИМВОЛ СИМВОЛ буде призупиняти ввід\n" +" susp СИМВОЛ СИМВОЛ буде надсилати терміналу сигнал зупинки\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr " * swtch СИМВОЛ СИМВОЛ перемикатиме на інший шар оболонки\n" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "* werase СИМВОЛ СИМВОЛ буде стирати останнє введене слово\n" + +#: src/stty.c:608 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 "" "\n" "Спеціальні параметри:\n" -"\n" -" Н встановити швидкість введення та виведення у Н бод\n" -"* cols Н повідомити ядру, що термінал має Н стовпчиків\n" -"* columns Н синонім cols\n" +" N встановити швидкість введення та виведення у N бод\n" + +#: src/stty.c:614 +msgid "" +" * cols N tell the kernel that the terminal has N columns\n" +" * columns N same as cols N\n" +msgstr "" +"* cols N повідомити ядру, що термінал має N позицій у рядку\n" +"* columns N те саме, що і cols N\n" + +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr " ispeed N встановити швидкість надходження вхідних даних N\n" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" +" * line N використовувати порядок передавання лінією зв’язку N\n" -#: src/stty.c:572 +#: src/stty.c:627 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 "" -" ispeed Н встановити швидкість вводу\n" -"* line Н використовувати протокол лінії Н\n" -" min Н використовується з -icanon, встановити Н мінімальним числом\n" -" символів для завершення операції читання\n" -" ospeed Н встановити швидкість виводу\n" +" min N використовується з -icanon, встановити Н мінімальним " +"числом\n" +" символів для завершення операції читання\n" +" ospeed N встановити швидкість виводу N\n" -#: src/stty.c:578 +#: src/stty.c:632 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" +msgstr "" +"* rows N повідомити ядру, що термінал має N рядків\n" +"* size вивести числа стовпчиків та рядків, відомі ядру\n" + +#: src/stty.c:637 +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -"* rows Н повідомити ядру, що термінал має Н рядків\n" -"* size вивести числа стовпчиків та рядків, відомі ядру\n" -" speed вивести швидкість терміналу\n" -" time Н використовується з -icanon, встановити часову межу для\n" -" операції читання рівним Н десятим секунди\n" +" speed вивести швидкість термінала\n" +" time N використовується з -icanon, встановити часову межу для\n" +" операції читання рівним N десятим секунди\n" -#: src/stty.c:584 +#: src/stty.c:641 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 дозволити керування потоком RTS/CTS\n" -" * [-]cdtrdsr дозволити керування потоком DTR/DSR\n" -" csН встановити розмір символу рівним Н біт, Н від 5 до 8\n" +" [-]clocal вимкнути сигнали керування модемом\n" +" [-]cread дозволити отримання вхідних даних\n" -#: src/stty.c:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr " * [-]crtscts увімкнути узгодження RTS/CTS\n" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr " * [-]cdtrdsr увімкнути узгодження DTR/DSR\n" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" +" csN встановити розмір символу у N бітів, N — число у діапазоні " +"[5..8]\n" + +#: src/stty.c:660 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -10393,7 +10512,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb два біти розділення у символі (один, якщо з '-')\n" " [-]hup надсилати сигнал обриву термінальної лінії, коли останній\n" @@ -10404,10 +10522,14 @@ msgstr "" " на вводі\n" " [-]parodd встановити перевірку на непарність (або парність, якщо з " "'-')\n" -" * [-]cmspar використовувати парність за прилипанням (позначкою або " -"пробілом)\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" +" * [-]cmspar використовувати «жорстку» (із позначками і пробілами) " +"парність\n" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -10415,217 +10537,327 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Параметри вводу:\n" -" [-]brkint символ break буде викликати сигнал переривання\n" -" [-]icrnl перетворювати переведення каретки у переведення рядка\n" -" [-]ignbrk ігнорувати символи переривання\n" -" [-]igncr ігнорувати символи переведення каретки\n" +" [-]brkint символ break буде викликати сигнал переривання\n" +" [-]icrnl перетворювати переведення каретки у переведення рядка\n" +" [-]ignbrk ігнорувати символи переривання\n" +" [-]igncr ігнорувати символи переведення каретки\n" +" [-]ignpar ігнорувати символи із порушенням парності\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" +" * [-]imaxbel видавати гудок і не спорожнювати повний буфер введення у " +"відповідь на символ\n" + +#: src/stty.c:686 +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" msgstr "" -" [-]ignpar ігнорувати символи з помилками парності\n" -"* [-]imaxbel при переповненні буферу вводу подавати звуковий сигнал та\n" -" не скидати буфер, ігноруючи подальший ввід\n" " [-]inlcr перетворювати переведення рядка у переведення каретки\n" " [-]inpck використовувати перевірку парності вводу\n" " [-]istrip очищати старший (восьмий) біт символів, що вводяться\n" -#: src/stty.c:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 вважати, що вхідні знаки у кодуванні UTF-8\n" -#: src/stty.c:619 +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" +" * [-]iuclc перетворювати літери у верхньому регістрі на літери у " +"нижньому регістрі\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" +" * [-]ixany дозволити будь-якому символу перезапускати виведення, не " +"лише початковому символу\n" + +#: src/stty.c:706 +msgid "" " [-]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 "" -"* [-]iuclc перетворювати великі літери на малі\n" -"* [-]ixany дозволити будь-якому символу відновити ввід\n" " [-]ixoff дозволити надсилання символів призупинення/відновлення\n" " [-]ixon дозволити керування потоком даних\n" -" [-]parmrk відмічати помилки парності (послідовністю з 255 нулів)\n" +" [-]parmrk позначати помилки парності (послідовністю з 255 нуль-" +"символів)\n" " [-]tandem синонім [-]xioff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" "\n" -"Параметри виводу:\n" -"* bsН пауза після забою, діапазон Н [0..1]\n" -"* crН пауза після переведення каретки, діапазон Н [0..3]\n" -"* ffН пауза після переведення сторінки, діапазон Н [0..1]\n" -"* nlН пауза після нового рядка, діапазон Н [0..1]\n" +"Параметри виведення:\n" + +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" +" * bsN стиль затримки backspace, N — число у діапазоні [0..1]\n" -#: src/stty.c:635 +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" +" * crN стиль затримки повернень каретки, N — число у діапазоні " +"[0..3]\n" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" +" * ffN стиль затримки посування сторінки, N — число у діапазоні " +"[0..1]\n" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" +" * nlN стиль затримки розриву рядка, N — число у діапазоні [0..1]\n" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr " * [-]ocrnl перетворювати повернення каретки на розрив рядка\n" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" +" * [-]ofdel використовувати для заповнення символи вилучення, а не " +"символи NUL\n" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" -msgstr "" -"* [-]ocrnl перетворювати переведення каретки у переведення рядка\n" -"* [-]ofdel заповнювати символами затирання замість нулів\n" -"* [-]ofill використовувати символи заповнення для затримок\n" -"* [-]olcuc перетворювати маленькі літери на великі\n" -"* [-]onlcr перетворювати переведення рядка у переведення каретки-розрив " -"рядка\n" -"* [-]onlret переведення рядка призводить до переведення каретки\n" +msgstr "" +" * [-]ofill використовувати символи заповнення замість таймера для " +"затримок\n" + +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" +" * [-]olcuc перетворювати літери у нижньому регістрі на літери у " +"верхньому регістрі\n" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" +" * [-]onlcr перетворювати розриви рядка на комбінації повернення " +"каретки і розриву рядка\n" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr " * [-]onlret розрив рядка призводить до повернення каретки\n" -#: src/stty.c:643 +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr " * [-]onocr не виводити повернення каретки у першу позицію\n" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr " [-]opost додатково виконувати завершальну обробку виведеного\n" + +#: src/stty.c:775 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 "" -"* [-]onocr не виводити переведення каретки у першому стовпчику\n" -" [-]opost форматувати вивід\n" -"* tabН значення паузи після горизонтальної табуляції,\n" -" допустимі Н [0..3]\n" -"* tabs синонім tab0\n" -"* -tabs синонім tab3\n" -"* vtН пауза після вертикальної табуляції, діапазон Н [0..1]\n" +" * tabN стиль затримки горизонтальної табуляції, N — число у " +"діапазоні [0..3]\n" +" * tabs те саме, що і tab0\n" +" * -tabs те саме, що і tab3\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" +" * vtN стиль затримки вертикальної табуляції, N — число у " +"діапазоні [0..1]\n" + +#: src/stty.c:786 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 "" "\n" "Локальні параметри:\n" -" [-]crterase стирати символи як забиття-пробіл-забиття\n" +" [-]crterase виводити символи erase як backspace-пробіл-backspace\n" + +#: src/stty.c:792 +msgid "" +" * 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 "" "* crtkill стирати весь рядок, згідно з параметрами echoprt та echoe\n" "* -crtkill стирати весь рядок, згідно з параметрами echoctl та echok\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr " * [-]ctlecho виводити керівні символи з каре («^c»)\n" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr " [-]echo виводити введені символи\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr " * [-]echoctl те саме, що і [-]ctlecho\n" + +#: src/stty.c:810 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 "" -"* [-]ctlecho відображати керівні символи з шапкою ('^c')\n" -" [-]echo відображати символи, що вводяться\n" -"* [-]echoctl синонім [-]ctlecho\n" -" [-]echoe синонім [-]crterase\n" -" [-]echok відображати переведення рядка після символу знищення\n" +" [-]echoe те саме, що і [-]crterase\n" +" [-]echok виводити розрив рядка після символу знищення\n" + +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr " * [-]echoke те саме, що і [-]crtkill\n" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" +" [-]echonl виводити розрив рядка, навіть якщо не копіюються інші " +"символи\n" -#: src/stty.c:665 +#: src/stty.c:823 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" +msgstr " * [-]echoprt виводити вилучені символи за курсор, між «\\» і «/»\n" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" +" * [-]extproc увімкнути «лінійний режим»; корисно для посилань із високою " +"латентністю\n" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -"* [-]echoke синонім [-]crtkill\n" -" [-]echonl відображати переведення рядка, навіть якщо інші символи не\n" -" відображаються\n" -"* [-]echoprt виводити стерті символи у зворотному порядку, між '\\' та " -"'/'\n" -" [-]icanon використовувати спецсимволи erase, kill, werase, та rprnt\n" -" [-]iexten використовувати спецсимволи, не описані у стандарті POSIX\n" +" [-]icanon уможливити спеціальні символи: %s\n" +" [-]iexten уможливити спеціальні символи не з POSIX\n" -#: src/stty.c:672 +#: src/stty.c:843 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 "" " [-]isig використовувати спецсимволи interrupt, quit, та suspend\n" -" [-]noflsh заборонити скидання буферу після прийому спецсимволів\n" +" [-]noflsh заборонити скидання буфера після переривання спецсимволами\n" " interrupt та quit\n" -"* [-]prterase синонім [-]echoprt\n" -"* [-]tostop призупиняти фонові програми, що намагаються виконати запис\n" -" на термінал\n" -"* [-]xcase відображати '\\' для великих літер, вживається з icanon\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr " * [-]prterase те саме, що [-]echoprt\n" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" +" * [-]tostop зупинити фонові завдання, які намагаються виконати запис до " +"термінала\n" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" +" * [-]xcase з icanon, екранування «\\» символів у верхньому регістрі\n" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" +"\n" +"Параметри поєднання:\n" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr " * [-]LCASE те саме, що [-]lcase\n" + +#: src/stty.c:871 +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" -"\n" -"Об'єднані параметри:\n" -"* [-]LCASE синонім [-]lcase\n" -" cbreak синонім -icanon\n" -" -cbreak синонім icanon\n" +" cbreak те саме, що -icanon\n" +" -cbreak те саме, що icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 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 синонім brkint ignpar istrip icrnl ixon opost isig icanon,\n" -" символи eof та eol мають типове значення\n" -" -cooked синонім raw\n" -" crt синонім echoe echoctl echoke\n" +" cooked те саме, що brkint ignpar istrip icrnl ixon opost isig,\n" +" символи icanon, eof та eol мають типове значення\n" +" -cooked те саме, що raw\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr " crt те саме, що %s\n" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s 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 "" -" dec синонім echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec те саме, що %s intr ^c erase 0177\n" " kill ^u\n" -"* [-]decctlq синонім [-]ixany\n" -" ek встановити типові значення для символів erase та kill\n" -" evenp синонім parenb -parodd cs7\n" -#: src/stty.c:699 +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr " * [-]decctlq те саме, що [-]ixany\n" + +#: src/stty.c:909 msgid "" +" ek erase and kill characters to their default values\n" +" evenp same as parenb -parodd cs7\n" " -evenp same as -parenb cs8\n" -" * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" +" ek зводити символи erase і kill до типових значень\n" +" evenp те саме, що і parenb -parodd cs7\n" +" -evenp те саме, що і -parenb cs8\n" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr " * [-]lcase те саме, що xcase iuclc olcuc\n" + +#: src/stty.c:919 +msgid "" " 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 "" -" -evenp синонім -parenb cs8\n" -"* [-]lcase синонім xcase iuclc olcuc\n" -" litout синонім -parenb -istrip -opost cs8\n" -" -litout синонім parenb istrip opost cs7\n" -" nl синонім -icrnl -onlcr\n" -" -nl синонім icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" +" litout те саме, що -parenb -istrip -opost cs8\n" +" -litout те саме, що parenb istrip opost cs7\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +" nl те саме, що %s\n" +" -nl те саме, що %s\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10639,35 +10871,38 @@ msgstr "" " pass8 синонім -parenb -istrip cs8\n" " -pass8 синонім parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" -" raw синонім -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 синонім cooked\n" +" raw те саме, що і -ignbrk -brkint -ignpar -parmrk -inpck -" +"istrip\n" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" +" -raw те саме, що і cooked\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -" sane синонім 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" -" мають типове значення\n" +" sane те саме, що і cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" усі спеціальні символи мають типові значення\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10682,12 +10917,12 @@ msgstr "" "буквально або вказуються у як ^c, 0x37, 0177 або 127; для скасування\n" "спеціальних символів служать значення ^- та undef.\n" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "можна вказати лише одне пристрій" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10696,46 +10931,50 @@ msgstr "" "ключі для виводу у текстовому та виводі, зрозумілому програмі stty,\n" "виключають один одного" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "при вказуванні стилю виводу не можна встановлювати режим" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s: не вдалося переініціалізувати неблокуючий режим" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "неправильний аргумент %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "пропущений аргумент для %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, c-format +msgid "%s: error setting %s" +msgstr "%s: помилка під час встановлення %s" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "неправильна line discipline %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s: не вдалося виконати всі запитані дії" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s: для цього пристрою немає відомостей про розмір" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" -msgstr "неправильний цілий аргумент %s" +#: src/stty.c:2279 +msgid "invalid integer argument" +msgstr "некоректний цілий аргумент" #. This is a proper name. See the gettext manual, section Names. #: src/sum.c:37 @@ -10743,13 +10982,17 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"Виводить контрольну суму і кількість блоків для кожного ФАЙЛА.\n" +"\n" + +#: src/sum.c:68 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 "" -"Виводить контрольну суму і кількість блоків для кожного ФАЙЛа.\n" "\n" " -r використовувати метод обчислення контрольних сум BSD,\n" " розмір блоку 1 кБ\n" @@ -10757,20 +11000,62 @@ msgstr "" "V,\n" " розмір блоку 512 байт\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Використання: %s [ПАРАМЕТР] [ФАЙЛ]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" +"\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" msgstr "" -"Записує змінені блоки на диск, оновлює суперблок\n" +"Синхронізувати кешований запис на носій постійного зберігання\n" +"\n" +"Якщо вказано один або декілька файлів, синхронізувати лише ці файли\n" +"або файлові системи, які їх містять.\n" "\n" -#: src/sync.c:69 +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" +" -d, --data синхронізувати лише дані файла, без непотрібних " +"метаданих\n" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" +" -f, --file-system синхронізувати файлові системи, що містять файли\n" + +#: src/sync.c:114 #, c-format -msgid "ignoring all arguments" -msgstr "всі аргументи проігноровані" +msgid "error opening %s" +msgstr "помилка під час відкриття %s" -#: src/system.h:343 +#: src/sync.c:124 +#, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "не вдалося переініціалізувати режим без блокування %s" + +#: src/sync.c:154 +#, c-format +msgid "error syncing %s" +msgstr "помилка під час синхронізації %s" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "не можна одночасно використовувати параметри --data і --file-system" + +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "--data слід передати принаймні один аргумент" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10784,17 +11069,26 @@ msgstr "" "документації з вашої оболонки, щоб дізнатись, які ключі вона\n" "підтримує.\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help показати цю довідку та вийти\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr "" " --version показати інформацію про версію та вийти\n" "\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"Якщо вхідний файл не вказаний, або якщо вказано символ -,\n" +"використовується стандартний ввід.\n" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -10803,7 +11097,7 @@ msgstr "" "Обов'язкові аргументи для довгих форм запису параметрів є обов'язковими і " "для скорочених форм.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10816,7 +11110,7 @@ msgstr "" "Одиницями можуть бути K, M, G, T, P, E, Z, Y (степені 1024) або KB, MB... " "(степені 1000).\n" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10830,7 +11124,7 @@ msgstr "" "Якщо розмір не буде знайдено, типовою одиницею буде 1024 байтів\n" "(або 512, якщо встановлено POSIXLY_CORRECT).\n" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -10843,26 +11137,29 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" "Повідомте %s про помилку у перекладі на \n" -#: src/system.h:584 +#: src/system.h:604 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" -msgstr "" -"Ознайомитися з повною документацією можна за допомогою команди info " -"coreutils '%s invocation'\n" +msgid "Full documentation at: <%s%s>\n" +msgstr "Документація повністю: <%s%s>\n" + +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "вона ж доступна локально: info '(coreutils) %s%s'\n" -#: src/system.h:591 +#: src/system.h:613 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Спробуйте '%s --help' для одержання додаткової інформації.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10883,12 +11180,8 @@ msgid "Jay Lepreau" msgstr "Jay Lepreau" #: 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 "" -"Виводить ФАЙЛИ на стандартний вивід, починаючи з останньої рядка.\n" -"Якщо ФАЙЛ не вказано або вказано як -, читає стандартний ввід.\n" +msgid "Write each FILE to standard output, last line first.\n" +msgstr "Вивести кожен ФАЙЛ до стандартного виведення, останній рядок першим.\n" #: src/tac.c:144 msgid "" @@ -10900,63 +11193,62 @@ msgstr "" " -r, --regex сприймати розділювач як регулярний вираз\n" " -s, --separator=РЯДОК вказати розділювачем РЯДОК, а не знак '\\n'\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: помилка переміщення по файла" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "запис надто великий" -#: src/tac.c:450 +#: src/tac.c:459 #, c-format msgid "failed to create temporary file in %s" msgstr "не вдалося створити тимчасовий файл у %s" -#: src/tac.c:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" msgstr "не вдалося відкрити %s для читання" -#: src/tac.c:475 +#: src/tac.c:484 #, c-format msgid "failed to rewind stream for %s" msgstr "не вдалося повернутися до початку потоку даних для %s" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: помилка запису" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "помилка при спробі відкрити %s для читання" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "розділювач не може бути порожнім" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 +#: src/tail.c:257 #, 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 "" -"Виводить останні %d рядків кожного з ФАЙЛІВ на стандартний вивід.\n" -"Якщо задано декілька ФАЙЛІВ, спочатку виводить заголовок з назвою файла.\n" -"Якщо ФАЙЛ не вказано або вказано як -, читає стандартний ввід.\n" +"Виводить останні %d рядків кожного з ФАЙЛІВ до стандартного виведення.\n" +"Якщо задано декілька ФАЙЛІВ, спочатку виводить перед даними заголовок із " +"назвою файла.\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" @@ -10965,7 +11257,7 @@ msgstr "" " щоб виведення було розпочато з Н-го байта кожного " "з файлів\n" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10978,7 +11270,7 @@ msgstr "" " -f, --follow та --follow=descriptor еквівалентні\n" " -F еквівалент --follow=name --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -11001,7 +11293,7 @@ msgstr "" " ротації системних протокольних файлів)\n" " З inotify цей параметр малокорисний.\n" -#: src/tail.c:293 +#: src/tail.c:288 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -11013,7 +11305,7 @@ msgstr "" " --retry повторювати спроби відкрити файл, навіть якщо\n" " доступ до нього буде втрачено\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -11027,7 +11319,7 @@ msgstr "" " процес P принаймні кожні Н секунд.\n" " -v, --verbose завжди виводити заголовки з назвами файлів\n" -#: src/tail.c:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -11045,7 +11337,7 @@ msgstr "" "GB 1000*1000*1000, G 1024*1024*1024 тощо для T, P, E, Z, Y.\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" "means that even if a tail'ed file is renamed, tail will continue to track\n" @@ -11064,23 +11356,23 @@ msgstr "" "уваги\n" "його перейменування, вилучення або створення.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "закриття %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: не вдалося перемістити вказівник позиції на %s відносно кінця" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" "не вдалося визначити розташування %s. Повертаємося до способу опитування" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -11089,154 +11381,151 @@ msgstr "" "Нерозпізнаний тип файлової системи 0x%08lx для %s. Будь ласка, повідомте про " "нього до %s. Повертаємося до простого опитування." -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "%s було замінено символічним посиланням. Кінець виводу для цієї назви" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s став недоступний" -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "" "%s був замінений файлом, для якого tail незастосовний; кінець виводу для " "цієї назви" -#: src/tail.c:1006 +#: src/tail.c:999 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "%s було замінено віддаленим файлом. Кінець виводу для цієї назви" -#: src/tail.c:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s став доступний" -#: src/tail.c:1035 +#: src/tail.c:1032 #, c-format -msgid "%s has appeared; following end of new file" -msgstr "%s з'явився; початий вивід для нового файла" +msgid "%s has appeared; following new file" +msgstr "З’явилося %s; виводимо новий файл" -#: src/tail.c:1046 +#: src/tail.c:1042 #, c-format -msgid "%s has been replaced; following end of new file" -msgstr "%s був заміщений; вивід продовжується для нового файла" +msgid "%s has been replaced; following new file" +msgstr "Замінено %s; виводимо новий файл" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: не вдалося змінити неблокуючий режим" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: файл обрізаний" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "більше немає файлів" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "не вдалося виконати спостереження за батьківським каталогом %s" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "вичерпано ресурси inotify" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "не вдалося виконати спостереження за %s" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, c-format +msgid "%s was replaced" +msgstr "Замінено %s" + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "помилка під час стеження за подією inotify" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "помилка під час спроби читання події inotify" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "" "%s: не можна стежити за кінцем файла такого типу; вивід продовжується для " "нового файла" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "число у %s надто велике" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" -msgstr "" -"%s: неправильна максимальна кількість не змінених параметрів між відкриттями" +#: src/tail.c:2083 +msgid "invalid maximum number of unchanged stats between opens" +msgstr "некоректна максимальна кількість незмінених параметрів між відкриттями" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" -msgstr "%s: неправильний PID" +#: src/tail.c:2091 +msgid "invalid PID" +msgstr "некоректний PID" -#: src/tail.c:2068 +#: src/tail.c:2107 #, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: неправильне число секунд" +msgid "invalid number of seconds: %s" +msgstr "некоректна кількість секунд: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "параметр використовує неправильний контекст -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "" "попередження: --retry проігноровано; --retry корисний лише при слідуванні" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "попередження: --retry працюватиме лише для початкового відкриття" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "" "попередження: PID ігнорований; ключ --pid=PID корисний лише при слідуванні" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "попередження: --pid=PID не підтримується на цій системі" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "не вдалося слідувати за %s за назвою" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "попередження: нескінченне стеження за стандартним вводом неефективне" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "не можна використовувати inotify, повертаємося до способу опитування" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -11248,60 +11537,88 @@ msgstr "" " -a, --append дописати у вказані ФАЙЛИ\n" " -i, --ignore-interrupts ігнорувати сигнали переривання\n" -#: src/tee.c:71 +#: src/tee.c:93 +msgid "" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" +msgstr "" +" -p, --output-error[=РЕЖИМ] поведінка при помилці запису. Див. докладніше " +"про РЕЖИМ нижче\n" + +#: src/tee.c:98 msgid "" "\n" -"If a FILE is -, copy again to standard output.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" msgstr "" "\n" -"Якщо ФАЙЛ вказаний як -, копіює знову у стандартний вивід.\n" +"РЕЖИМ визначає поведінку у відповідь на помилки запису виведених даних:\n" +" 'warn' діагностувати помилки запису до будь-якого виведення\n" +" 'warn-nopipe' діагностувати помилки запису до будь-якого виведення, окрім " +"каналу обробки\n" +" 'exit' виходити при помилках запису до будь-якого виведення\n" +" 'exit-nopipe' виходити при помилках запису до будь-якого виведення, окрім " +"каналу обробки\n" +"Типовим значенням параметра РЕЖИМ для параметра -p є 'warn-nopipe'.\n" +"Типовою дією у відповідь, якщо не вказано --output-error, є негайне " +"завершення обробки,\n" +"якщо виявлено помилку запису до каналу обробки, та діагностування помилок " +"запису,\n" +"якщо запис виконувався не до каналу обробки.\n" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "пропущений аргумент після %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "неправильне ціле число %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "очікується ')'" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "очікується ')', виявлено %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: очікується унарний оператор" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt не допускає -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef не допускає -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot не допускає -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "невідомий двійковий оператор" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: очікується двійковий оператор" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11315,13 +11632,13 @@ msgstr "" " або: [ ]\n" " або: [ КЛЮЧ\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" msgstr "Вихідний статус визначається ВИРАЗОМ.\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11332,7 +11649,7 @@ msgstr "" "ВИРАЗ може бути істинним або хибним; він встановлює статус\n" "завершення програми. Код завершення визначається наступним образом:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11346,7 +11663,7 @@ msgstr "" " ВИРАЗ1 -a ВИРАЗ2 ВИРАЗ1 та ВИРАЗ2 обидва істинні\n" " ВИРАЗ1 -o ВИРАЗ2 ВИРАЗ1 або ВИРАЗ2 істинний\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11362,7 +11679,7 @@ msgstr "" " РЯДОК1 = РЯДОК2 рядки еквівалентні\n" " РЯДОК1 != РЯДОК2 рядки не еквівалентні\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11380,7 +11697,7 @@ msgstr "" " ЦІЛЕ1 -lt ЦІЛЕ2 ЦІЛЕ1 менше ЦІЛОГО2\n" " ЦІЛЕ1 -ne ЦІЛЕ2 ЦІЛЕ1 відмінне від ЦІЛОГО2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11392,7 +11709,7 @@ msgstr "" " ФАЙЛ1 -nt ФАЙЛ2 ФАЙЛ1 змінювався пізніше ніж ФАЙЛ2\n" " ФАЙЛ1 -ot ФАЙЛ2 ФАЙЛ1 створений пізніше ніж ФАЙЛ2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11401,12 +11718,12 @@ msgid "" " -e FILE FILE exists\n" msgstr "" "\n" -" -b ФАЙЛ ФАЙЛ існує та є спеціальним з блочним доступом\n" +" -b ФАЙЛ ФАЙЛ існує та є спеціальним з блоковим доступом\n" " -c ФАЙЛ ФАЙЛ існує та є спеціальним з символьним доступом\n" " -d ФАЙЛ ФАЙЛ існує та є каталогом\n" " -e ФАЙЛ ФАЙЛ існує\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11420,7 +11737,7 @@ msgstr "" " -h ФАЙЛ ФАЙЛ існує та є символьним посиланням (еквівалент -L)\n" " -k ФАЙЛ ФАЙЛ існує та має ознака sticky\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -11434,7 +11751,7 @@ msgstr "" " -r ФАЙЛ ФАЙЛ існує доступний для читання\n" " -s ФАЙЛ ФАЙЛ існує та має ненульовий розмір\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11448,7 +11765,7 @@ msgstr "" " -w ФАЙЛ ФАЙЛ існує та доступний для запису\n" " -x ФАЙЛ ФАЙЛ існує та є виконуваним\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11463,7 +11780,7 @@ msgstr "" "знаку '\\'). ЦІЛЕ може також бути вказане як \"-l РЯДОК\", при цьому\n" "воно приймає значення довжини РЯДКА.\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11474,25 +11791,25 @@ msgstr "" "ні.\n" "інтерпретує кожен з цих параметрів як будь-який непорожній рядок.\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test та/або [" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "пропущено ']'" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "зайвий аргумент %s" @@ -11512,7 +11829,7 @@ msgstr "попередження: timer_settime" msgid "warning: timer_create" msgstr "попередження: timer_create" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11521,13 +11838,13 @@ msgstr "" "Використання: %s [ПАРАМЕТР] ТРИВАЛІСТЬ КОМАНДА [АРГУМЕНТ]...\n" " або: %s [ПАРАМЕТР]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" "Запустити КОМАНДУ і завершити її роботу, якщо її не буде завершено протягом " "часу ТРИВАЛІСТЬ.\n" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11566,7 +11883,7 @@ msgstr "" " Переглянути список сигналів можна за допомогою команди\n" " «kill -l»\n" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11577,7 +11894,7 @@ msgstr "" "ТРИВАЛІСТЬ — число з плаваючою крапкою з додатковим суфіксом:\n" "«s» — секунди (типовий), «m» — хвилини, «h» — години або «d» — дні.\n" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -11597,7 +11914,7 @@ msgstr "" "бути перехоплено. Якщо надіслано сигнал KILL (9), станом виходу буде\n" "128+9, а не 124.\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "попередження: спроба вимикання дампів ядра завершилася невдало" @@ -11614,6 +11931,11 @@ msgstr "" "команда, за якою виконувалося спостереження, завершила роботу критичною " "помилкою" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "невідомий стан завершення від команди (%d)" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -11983,12 +12305,12 @@ msgstr "Завершення з успішним статусом." msgid "Exit with a status code indicating failure." msgstr "Завершення роботи з кодом стану, що відповідає невдалому виконанню." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Використання: %s ПАРАМЕТР... ФАЙЛ...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -12006,18 +12328,18 @@ msgstr "" "Якщо розмір ФАЙЛа буде меншим, його буде збільшено. Додаткову частину\n" "буде заповнено нульовими байтами.\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create не створювати файлів\n" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" " -o, --io-blocks вважати РОЗМІР кількістю блоків введення-вивадення, " "а не байтів\n" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" @@ -12026,7 +12348,7 @@ msgstr "" " -s, --size=РОЗМІР встановити або змінити розмір файла, відповідно до " "РОЗМІР\n" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -12038,57 +12360,61 @@ msgstr "" "«+» — розширити, «-» — звузити, «<» — не більше, «>» — не менше,\n" "«/» — зменшити до кратного, «%» — збільшити до кратного.\n" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "переповнення у % * % байтових блоків для файла %s" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s має непридатний, ймовірно від'ємний розмір" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "не вдалося визначити розмір %s" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "переповнення під час округлення розміру файла %s у бік збільшення" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "переповнення під час розширення розміру файла %s" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "не вдалося обрізати %s до % байтів" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "вказано декілька відносних модифікаторів" -#: src/truncate.c:333 +#: src/truncate.c:285 +msgid "Invalid number" +msgstr "Некоректне число" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "можна визначити лише щось одне: %s або %s" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "вам слід вказати відносний %s з %s" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "вказано %s, але без %s" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "не вдалося відкрити %s для запису" @@ -12103,21 +12429,22 @@ msgstr "Mark Kettenis" 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 "" -"Використання: %s [КЛЮЧ] [ФАЙЛ]\n" -"Виводити повністю сортований список, що відповідає частковому сортуванню\n" -"у заданому ФАЙЛІ. Якщо ФАЙЛ не вказаний або вказаний як -, читається\n" -"стандартний ввід.\n" -"\n" +"Користування: %s [ПАРАМЕТР] [ФАЙЛ]\n" +"Вивести повністю упорядкований список, узгоджений із частковим " +"упорядковуванням у ФАЙЛі.\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: на вході міститься непарна кількість лексем" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: на вході міститься цикл:" @@ -12183,13 +12510,10 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" -"Перетворює пробіли у ФАЙЛАХ у знаки табуляції та виводить на\n" -"стандартний вивід. Якщо ФАЙЛ не вказано або вказано як -, читаються\n" -"дані зі стандартного джерела вхідних даних.\n" +"Перетворити пробіли у кожному ФАЙЛі на табуляції, вивести результат до " +"стандартного виведення.\n" #: src/unexpand.c:124 msgid "" @@ -12244,12 +12568,12 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" -" -D, --all-repeated[=МЕТОД] вивести усі рядки-дублікати\n" -" групи можна відокремлювати порожнім рядком\n" +" -D, --all-repeated[=МЕТОД] вивести усі рядки-дублікати;\n" +" групи можна відокремлювати порожнім рядком;\n" " МЕТОД={none(типовий),prepend,separate}\n" #: src/uniq.c:192 @@ -12259,11 +12583,11 @@ msgstr " -f, --skip-fields=N уникати порівняння перших #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" " --group[=МЕТОД] показати усі запис, відокремивши групи порожніми " -"рядками\n" +"рядками;\n" " МЕТОД={separate(типовий),prepend,append,both}\n" #: src/uniq.c:199 @@ -12419,11 +12743,6 @@ msgstr "" " Процеси у\n" "стані неперервного сну також впливають на середнє завантаження.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -12446,22 +12765,28 @@ msgstr "" "вказують %s.\n" "\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" +"Вивести дані щодо кількості розривів рядків, слів та байтів для кожного з " +"ФАЙЛів і\n" +"рядок сумарних даних, якщо вказано декілька файлів. Словом вважається " +"ненульової\n" +"довжини послідовність символів символів обмежена пробілами.\n" + +#: src/wc.c:126 +msgid "" +"\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 "" -"Виводить кількість розривів рядків, слів та байт для кожного ФАЙЛа\n" -"та сумарний рядок. Якщо не було вказано ФАЙЛ, або вказано ФАЙЛ «-»,\n" -"читає дані зі стандартного джерел введення. Словом вважається\n" -"ненульова послідовність символів, обмежених пробілами.\n" +"\n" "За допомогою вказаних нижче параметрів можна вибрати дані, які\n" "буде виведено. Порядок буде завжди таким: розриви рядків,\n" "слова, символи, байти, максимальна довжина рядка.\n" @@ -12469,19 +12794,19 @@ msgstr "" " -m, --chars вивести кількість знаків\n" " -l, --lines вивести кількість розривів рядків\n" -#: src/wc.c:128 +#: src/wc.c:134 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=F читати вхідні дані з файлів, вказаних\n" " назвами зі списку, розділеного символами\n" " NUL у файлі F. Якщо F дорівнює «-», назви\n" " буде прочитано зі стандартного джерела даних\n" -" -L, --max-line-length вивести довжину найбільшого рядка\n" +" -L, --max-line-length вивести максимальну ширину виведення\n" " -w, --words вивести кількість слів\n" #: src/who.c:210 @@ -12641,10 +12966,10 @@ msgstr "" "користувача. Аналогічно виклику id -un.\n" "\n" -#: src/whoami.c:91 +#: src/whoami.c:87 #, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: не вдалося визначити ім'я користувача для ID %lu\n" +msgid "cannot find name for user ID %lu" +msgstr "не вдалося визначити назву для ідентифікатора користувача %lu" #: src/yes.c:41 #, c-format @@ -12664,6 +12989,244 @@ msgstr "" "'y'.\n" "\n" +#~ msgid "failed to %s supplemental groups" +#~ msgstr "не вдалося %s список додаткових груп" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: неприпустимий число" + +#~ 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 "" +#~ "\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" +#~ " 9387674624 байта (9.4 GB) скопійовано, 34.6279 секунди, 271 Мб/с\n" +#~ "\n" +#~ "Ключі:\n" +#~ "\n" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s: %s настільки великий, що його неможливо машинно представити" + +#~ msgid "number of lines" +#~ msgstr "число рядків" + +#~ msgid "number of bytes" +#~ msgstr "число байт" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: некоректне число для виключення" + +#~ msgid "input line is too short, no numbers found to convert in field %ld" +#~ msgstr "" +#~ "надто короткий рядок вхідних даних, у полі %ld не виявлено чисел для " +#~ "форматування" + +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "додається -t, якщо PAGE_LENGTH <= 10. Якщо ФАЙЛ не вказано\n" +#~ "або вказаний як -, читає стандартне джерело введення.\n" + +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Якщо вхідний файл не вказаний, або якщо вказано символ -,\n" +#~ "використовується стандартне джерело вхідних даних. Типовим є «-F /».\n" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: неправильна кількість байт" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: неправильна кількість рядків" + +#~ 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 СИМВОЛ СИМВОЛ буде вводити наступний символ, скасовуючи його\n" +#~ " спеціальну дію\n" +#~ " quit СИМВОЛ СИМВОЛ буде надсилати сигнал виходу\n" +#~ "* rprnt СИМВОЛ СИМВОЛ буде перерисовувати поточний рядок\n" +#~ " start СИМВОЛ СИМВОЛ буде відновлювати ввід\n" + +#~ 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 дозволити керування потоком RTS/CTS\n" +#~ " * [-]cdtrdsr дозволити керування потоком DTR/DSR\n" +#~ " csН встановити розмір символу рівним Н біт, Н від 5 до 8\n" + +#~ 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 "" +#~ "\n" +#~ "Параметри виводу:\n" +#~ "* bsН пауза після забою, діапазон Н [0..1]\n" +#~ "* crН пауза після переведення каретки, діапазон Н [0..3]\n" +#~ "* ffН пауза після переведення сторінки, діапазон Н [0..1]\n" +#~ "* nlН пауза після нового рядка, діапазон Н [0..1]\n" + +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ "* [-]ocrnl перетворювати переведення каретки у переведення рядка\n" +#~ "* [-]ofdel заповнювати символами затирання замість нулів\n" +#~ "* [-]ofill використовувати символи заповнення для затримок\n" +#~ "* [-]olcuc перетворювати маленькі літери на великі\n" +#~ "* [-]onlcr перетворювати переведення рядка у переведення каретки-" +#~ "розрив рядка\n" +#~ "* [-]onlret переведення рядка призводить до переведення каретки\n" + +#~ 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 "" +#~ "* [-]onocr не виводити переведення каретки у першому стовпчику\n" +#~ " [-]opost форматувати вивід\n" +#~ "* tabН значення паузи після горизонтальної табуляції,\n" +#~ " допустимі Н [0..3]\n" +#~ "* tabs синонім tab0\n" +#~ "* -tabs синонім tab3\n" +#~ "* vtН пауза після вертикальної табуляції, діапазон Н [0..1]\n" + +#~ 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 "" +#~ "* [-]ctlecho відображати керівні символи з шапкою ('^c')\n" +#~ " [-]echo відображати символи, що вводяться\n" +#~ "* [-]echoctl синонім [-]ctlecho\n" +#~ " [-]echoe синонім [-]crterase\n" +#~ " [-]echok відображати переведення рядка після символу знищення\n" + +#~ 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 "" +#~ "* [-]echoke синонім [-]crtkill\n" +#~ " [-]echonl відображати переведення рядка, навіть якщо інші символи " +#~ "не\n" +#~ " відображаються\n" +#~ "* [-]echoprt виводити стерті символи у зворотному порядку, між '\\' та " +#~ "'/'\n" +#~ " [-]icanon використовувати спецсимволи erase, kill, werase, та " +#~ "rprnt\n" +#~ " [-]iexten використовувати спецсимволи, не описані у стандарті " +#~ "POSIX\n" + +#~ 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 "" +#~ " dec синонім echoe echoctl echoke -ixany intr ^c erase 0177\n" +#~ " kill ^u\n" +#~ "* [-]decctlq синонім [-]ixany\n" +#~ " ek встановити типові значення для символів erase та kill\n" +#~ " evenp синонім parenb -parodd cs7\n" + +#~ 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 "" +#~ " -evenp синонім -parenb cs8\n" +#~ "* [-]lcase синонім xcase iuclc olcuc\n" +#~ " litout синонім -parenb -istrip -opost cs8\n" +#~ " -litout синонім parenb istrip opost cs7\n" +#~ " nl синонім -icrnl -onlcr\n" +#~ " -nl синонім icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Записує змінені блоки на диск, оновлює суперблок\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "всі аргументи проігноровані" + +#~ msgid "For complete documentation, run: info coreutils '%s invocation'\n" +#~ msgstr "" +#~ "Ознайомитися з повною документацією можна за допомогою команди info " +#~ "coreutils '%s invocation'\n" + +#~ msgid "number in %s is too large" +#~ msgstr "число у %s надто велике" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: неправильне число секунд" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: не вдалося визначити ім'я користувача для ID %lu\n" + #~ msgid "cannot create pipe" #~ msgstr "не вдалося створити канал" @@ -13340,20 +13903,6 @@ msgstr "" #~ " -v, --verbose виводити діагностичні повідомлення для кожного " #~ "файла\n" -#~ msgid "" -#~ "Display the current time in the given FORMAT, or set the system date.\n" -#~ "\n" -#~ " -d, --date=STRING display time described by STRING, not `now'\n" -#~ " -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -#~ msgstr "" -#~ "Виводить поточний час у заданому ФОРМАТІ, або встановлює системний час.\n" -#~ "\n" -#~ " -d, --date=РЯДОК показати не поточний час, а час, що " -#~ "описується\n" -#~ " вказаним РЯДКОМ\n" -#~ " -f, --file=ФАЙЛ відповідає застосуванню --date для кожного\n" -#~ " рядка ФАЙЛУ\n" - #~ msgid "" #~ "\n" #~ "SIZE may be (or may be an integer optionally followed by) one of " diff --git a/po/vi.gmo b/po/vi.gmo index 6e1d3509..8ec1dc3f 100644 Binary files a/po/vi.gmo and b/po/vi.gmo differ diff --git a/po/vi.po b/po/vi.po index 01c038a3..f71d38f7 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,11 +8,12 @@ # Trần Ngọc Quân , 2012-2014. # Nguyễn Thái Ngọc Duy , 2012. # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils-8.23-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2014-07-17 07:25+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -43,18 +44,18 @@ msgstr "Những đối số hợp lệ:" msgid "error closing file" msgstr "lỗi đóng tập tin" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "lỗi ghi" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "giữ nguyên quyền hạn cho %s" @@ -235,57 +236,62 @@ msgstr "Chuỗi tham số sai mã hoá" msgid "Unknown error" msgstr "Lỗi lạ" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, 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à:" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s: tùy chọn “-W %s” không rõ ràng\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: tùy chọn “--%s” không cần đối số\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, 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 một đối số\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: tùy chọn “--%s” cần một đối số\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: không nhận ra tùy chọn “--%s”\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%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 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%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 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: tùy chọn cần một đối số -- “%c”\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: tùy chọn “-W %s” không rõ ràng\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, 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 có đối số\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: tùy chọn “-W %s” cần một đối số\n" @@ -295,13 +301,13 @@ msgstr "%s: tùy chọn “-W %s” cần một đối số\n" msgid "cannot change permissions of %s" msgstr "không thay đổi được quyền hạn của %s" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "không tạo được thư mục %s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "hết bộ nhớ" @@ -350,6 +356,12 @@ msgstr "”" msgid "%s: end of file" msgstr "%s: gặp kết thúc tập tin" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s: lỗi đọc" + #: lib/regcomp.c:131 msgid "Success" msgstr "Thành công" @@ -457,7 +469,7 @@ msgstr "^[yYcC]" msgid "^[nN]" msgstr "^[nNkK]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "đang cài đặt quyền hạn cho %s" @@ -892,7 +904,7 @@ msgstr "" "Cách dùng: %s [TÙY_CHỌN]... [TẬP_TIN]\n" "Mã hoá/giải mã Base64 TẬP_TIN hoặc đầu vào chuẩn ra đầu ra chuẩn.\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -908,16 +920,7 @@ msgstr "" " Giá trị 0 thì tắt chức năng ngắt dòng\n" "\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\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:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -932,51 +935,51 @@ msgstr "" "”--ignore-garbage” để thử phục hồi khi luồng đã mã hoá chứa byte khác chữ " "cái.\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "lỗi đọc" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "đầu vào sai" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "sai kích cỡ ngắt dòng: %s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 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:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, c-format msgid "closing standard input" msgstr "đang đóng đầu vào tiêu chuẩn" #. This is a proper name. See the gettext manual, section Names. #: src/basename.c:29 src/chgrp.c:37 src/chmod.c:39 src/chown.c:36 -#: src/comm.c:38 src/cp.c:57 src/csplit.c:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 msgid "David MacKenzie" msgstr "David MacKenzie" @@ -1027,38 +1030,43 @@ msgstr "" " %s -a any/str1 any/str2 -> “str1” theo sau là “str2”\n" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "thiếu toán hạng" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "Cách dùng: %s [TÙY_CHỌN]... [TẬP_TIN]...\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate 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" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1076,7 +1084,7 @@ msgstr "" " -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 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1088,7 +1096,7 @@ msgstr "" " -u (bị bỏ qua)\n" " -v, --show-nonprinting dùng ký hiệu “^” và “M-”, trừ cho LFD và TAB\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1102,17 +1110,18 @@ msgstr "" "dung của g.\n" " %s Sao chép đầu từ đầu vào tiêu chuẩn sang đầu ra tiêu chuẩn.\n" -#: src/cat.c:326 +#: src/cat.c:327 #, 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:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "đầu ra chuẩn" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s: tập tin đầu vào là tập tin đầu ra" @@ -1124,10 +1133,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1141,8 +1150,8 @@ msgstr "gặp lỗi khi tạo ngữ cảnh bảo mật: %s" msgid "failed to set %s security context component to %s" msgstr "gặp lỗi khi đặt thành phần ngữ cảnh bảo mật %s thành %s" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "gặp lỗi khi lấy ngữ cảnh bảo mật của %s" @@ -1157,13 +1166,13 @@ msgstr "không thể áp dụng ngữ cảnh đặc thù cho tập tin không c msgid "failed to change context of %s to %s" msgstr "gặp lỗi khi thay đổi ngữ cảnh của %s thành %s" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "không thể truy cập %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "không đọc được thư mục %s" @@ -1179,7 +1188,7 @@ msgstr "đang thay đổi ngữ cảnh bảo mật của %s\n" msgid "fts_read failed" msgstr "fts_read bị lỗi" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1299,7 +1308,7 @@ msgid "-R -h requires -P" msgstr "-R -h cần -P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1316,9 +1325,8 @@ 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:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "gặp lỗi khi lấy thuộc tính của %s" @@ -1631,17 +1639,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "nhóm không hợp lệ %s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "danh sách nhóm không hợp lệ %s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1650,23 +1658,36 @@ msgstr "" "Cách dùng: %s [TÙY_CHỌN] GỐC_MỚI [LỆNH [Đ.SỐ]...]\n" " hoặc: %s TÙY_CHỌN\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" msgstr "Chạy câu LỆNH với thư mục gốc (root) đặt là GỐC_MỚI.\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" +" --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:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" " --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:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" @@ -1675,42 +1696,47 @@ msgstr "" "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:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "không chuyển đổi được thư mục gốc thành %s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "không chuyển được sang thư mục gốc" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "chưa chỉ ra nhóm cho mã số người dùng chưa biết: %d" -#: src/chroot.c:383 +#: src/chroot.c:400 #, c-format msgid "failed to get supplemental groups" msgstr "gặp lỗi khi lấy các nhóm phụ" -#: src/chroot.c:395 -#, c-format -msgid "failed to %s supplemental groups" -msgstr "gặp lỗi khi %s (các) nhóm phụ" +#: src/chroot.c:412 +#, fuzzy, c-format +msgid "failed to set supplemental groups" +msgstr "gặp lỗi khi lấy các nhóm phụ" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "gặp lỗi khi đặt mã số nhóm (GID)" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "gặp lỗi khi đặt mã số người dùng (UID)" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "gặp lỗi khi chạy câu lệnh %s" @@ -1751,7 +1777,17 @@ msgstr "Cách dùng: %s [TÙY_CHỌN]... TẬP_TIN1 TẬP_TIN2\n" 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" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\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/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1763,7 +1799,7 @@ msgstr "" "những dòng chỉ có trong TẬP_TIN1, cột thứ hai chứa những dòng chỉ\n" "có trong TẬP_TIN2, và cột thứ ba chứa những dòng có chung trong chúng.\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1775,7 +1811,7 @@ msgstr "" " -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" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1787,11 +1823,11 @@ msgstr "" " nếu mọi dòng đầu vào đều có thể kết đôi được\n" " --nocheck-order không kiểm tra xem đầu vào đã xắp xếp đúng chưa\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=CHUỖI phân cách các cột bằng chuỗi này\n" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" @@ -1799,7 +1835,7 @@ msgstr "" "\n" "Chú ý là so sánh tuân theo quy tắc quy định bởi “LC_COLLATE”.\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1813,310 +1849,324 @@ msgstr "" " %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 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "tập tin %d không sắp đúng thứ tự" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "xác định nhiều hơn một dấu cách" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "không cho phép %s trống" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "không lseek được %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "lỗi đọc %s" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "không lseek được %s" +msgid "error reading %s" +msgstr "lỗi đọc %s" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "lỗi ghi %s" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "lỗi đọc %s" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s: lỗi lấy ngữ cảnh hiện thời" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s: lỗi ghi" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "gặp lỗi khi mở rộng %s" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "đang gột quyền hạn cho %s" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "gặp lỗi khi giữ lại quyền sở hữu của %s" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "gặp lỗi khi tìm kiếm tập tin %s" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "gặp lỗi khi bảo tồn nguồn tác giả của %s" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "gặp lỗi khi đặt ngữ cảnh tạo tập tin mặc định thành %s" -#: src/copy.c:820 +#: src/copy.c:922 #, c-format msgid "failed to set default file creation context for %s" msgstr "gặp lỗi khi đặt ngữ cảnh tạo tập tin mặc định thành %s" -#: src/copy.c:846 +#: src/copy.c:948 #, c-format msgid "failed to set the security context of %s" msgstr "gặp lỗi khi đặt ngữ cảnh bảo mật của %s" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "không mở được %s để đọc" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "không fstat được %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "bỏ qua tập tin %s, vì nó bị thay thế trong khi sao chép" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "không gỡ bỏ được %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "đã xóa %s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "không phải ghi qua liên kết mềm theo sát %s" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "không tạo được tập tin thông thường %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, c-format msgid "failed to clone %s from %s" msgstr "gặp lỗi khi nhân bản %s từ %s" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "bảo tồn các giá trị thời gian cho %s" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, c-format msgid "failed to close %s" msgstr "gặp lỗi khi đóng %s" -#: src/copy.c:1580 +#: src/copy.c:1669 #, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s: thay thế %s, đè lên chế độ %04lo (%s)? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "%s: không thể ghi %s (chế độ %04lo, %s); vẫn thử? " -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s: ghi đè %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (sao lưu: %s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "gặp lỗi khi phục hồi ngữ cảnh tạo tập tin mặc định" -#: src/copy.c:1706 +#: src/copy.c:1795 #, 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:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "không thể stat %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "bỏ qua thư mục %s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "cảnh báo: tập tin nguồn %s được chỉ ra nhiều hơn một lần" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s và %s là cùng một tập tin" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "không thể ghi đè %s (không phải thư mục) bằng thư mục %s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "sẽ không ghi đè %s vừa mới tạo bằng %s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "không thể ghi đè thư mục %s bằng cái không phải thư mục" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "không thể chuyển thư mục vào cái không phải thư mục: %s -> %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "sao lưu %s sẽ phá hủy nguồn; không di chuyển %s" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "sao lưu %s sẽ phá hủy nguồn; không sao chép %s" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "không sao lưu được %s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, 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:2184 +#: src/copy.c:2264 #, 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:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "cảnh báo: tập tin nguồn %s được chỉ ra nhiều hơn một lần" + +#: src/copy.c:2294 #, 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:2258 +#: src/copy.c:2351 #, 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:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "không di chuyển được %s vào %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "" "gặp lỗi khi di chuyển giữa các thiết bị: %s tới %s; không xóa được đích" -#: src/copy.c:2357 +#: src/copy.c:2450 #, 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:2477 +#: src/copy.c:2570 #, 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:2484 +#: src/copy.c:2577 #, 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:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "không tạo được fifo %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "không tạo được tập tin đặc biệt %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "không đọc được liên kết mềm %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "không tạo được liên kết mềm %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s có kiểu tập tin chưa lạ" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "không thể hủy sao lưu %s" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (hủy sao lưu)\n" @@ -2126,12 +2176,12 @@ msgstr "%s -> %s (hủy sao lưu)\n" msgid "Alex Deymo" msgstr "Alex Deymo" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "Cách dùng: %s --coreutils-prog=TÊN_CHƯƠNG_TRÌNH [CÁC_ĐỐI_SỐ]... \n" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" @@ -2139,7 +2189,7 @@ msgstr "" "Thực thi chương trình dựng sẵn CHƯƠNG_TRÌNH với CÁC_ĐỐI_SỐ đã cho.\n" "\n" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" @@ -2149,7 +2199,7 @@ msgstr "" "Gõ lệnh: “%s --coreutils-prog=TÊN_CHƯƠNG_TRÌNH --help” để xem trợ giúp về " "từng chương trình cụ thể.\n" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, c-format msgid "unknown program %s" msgstr "không hiểu chương trình %s" @@ -2427,8 +2477,8 @@ msgstr "%s có nhưng không phải là thư mục" msgid "failed to access %s" msgstr "gặp lỗi khi truy cập %s" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "thiếu toán hạng tập tin" @@ -2502,131 +2552,131 @@ msgstr "" "không thể bảo tồn thuộc tính mở rộng vì cp được tạo không có hỗ trợ xattr" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "đầu vào đã biến mất" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s: số dòng vượt quá giới hạn" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s: %s: số dòng vượt quá giới hạn" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " khi lặp lại %s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s: %s: không tìm thấy" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, 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:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "lỗi ghi cho %s" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s: cần số nguyên sau dấu phân cách" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, c-format msgid "%s: '}' is required in repeat count" msgstr "%s: cần “}” trong số lượng lặp lại" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}: cần số nguyên giữa “{” và “}”" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s: thiếu dấu phân cách đóng “%c”" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, 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:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s: mẫu sai" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s: số thứ tự dòng phải lớn hơn không" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "số thứ tự dòng %s nhỏ hơn số thứ tự dòng đứng trước, %s" -#: src/csplit.c:1200 +#: src/csplit.c:1201 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "cảnh bảo: số thứ tự dòng %s trùng với số thứ tự dòng đứng trước" -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "hậu tố thiếu sự xác định chuyển đổi" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, 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:1287 +#: src/csplit.c:1288 #, 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:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "Cờ sai trong chỉ định hoán đổi: %%%c%c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, 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:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "hậu tố thiếu sự xác định chuyển đổi %%" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s: số sai" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "số không hợp lệ %s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "Cách dùng: %s [TÙY_CHỌN]... TẬP_TIN MẪU...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 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" @@ -2635,7 +2685,16 @@ msgstr "" "“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" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\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" + +#: src/csplit.c:1492 #, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2646,11 +2705,11 @@ msgstr "" " -f, --prefix=TIỀN_TỐ dùng TIỀN_TỐ thay cho “xx”\n" " -k, --keep-files không xóa tập tin xuất khi có lỗi\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr " -m, --suppress-matched cấm các dòng khớp MẪU\n" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2660,17 +2719,11 @@ msgstr "" " -s, --quiet, --silent không in ra kích thước của mỗi tập tin xuất\n" " -z, --elide-empty-files xóa tập tin xuất rỗng\n" -#: src/csplit.c:1505 -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" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 +#, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2706,7 +2759,7 @@ msgstr "Cách dùng: %s TÙY_CHỌN... [TẬP_TIN]...\n" 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" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2717,7 +2770,7 @@ msgstr "" " -d, --delimiter=DẤU sử dụng DẤU này thay cho TAB, để phân cách các " "trường\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2729,7 +2782,7 @@ msgstr "" " ra tùy chọn “-s”\n" " -n (bị bỏ qua)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" @@ -2737,7 +2790,7 @@ msgstr "" " --complement bổ sung tập hợp các byte, ký tự hoặc trường đã " "chọn\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2748,7 +2801,7 @@ msgstr "" " kết quả in ra. Mặc định là ký tự phân cách đầu " "vào.\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2761,7 +2814,8 @@ msgstr "" "bằng dấu phẩy. Đầu vào đã chọn được ghi theo cùng một thứ tự\n" "với việc đọc; nó được ghi chỉ một lần.\n" -#: src/cut.c:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2769,8 +2823,6 @@ msgid "" " 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 "" "Mỗi phạm vi là một trong:\n" "\n" @@ -2781,50 +2833,51 @@ msgstr "" "\n" "Khi không có TẬP_TIN, hoặc khi TẬP_TIN là “-”, đọc đầu vào tiêu chuẩn.\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 msgid "invalid byte, character or field list" msgstr "sai byte, ký tự hoặc danh sách trường" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "các trường và vị trí đều đánh số từ 1" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "phạm vi sai không có điểm cuối: -" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "phạm vi giảm dần sai" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "offset theo byte %s là quá lớn" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "số trường %s là quá lớn" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 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:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, 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:787 +#: src/cut.c:786 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:790 +#: src/cut.c:789 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:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" @@ -2832,11 +2885,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:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "thiếu danh sách các trường" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "thiếu danh sách các vị trí" @@ -2859,13 +2912,27 @@ msgstr "" "thống.\n" #: src/date.c:134 +#, fuzzy +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" +"Hiển thị thời gian hiện thời trong ĐỊNH_DẠNG đưa ra, hoặc đặt ngày của hệ " +"thống.\n" +"\n" +" -d, --date=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 " +"TẬP_TIN_NGÀY\n" + +#: src/date.c:138 +#, fuzzy msgid "" -" -d, --date=STRING display time described by STRING, not 'now'\n" -" -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -" -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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" " -d, --date=STRING hiển thị thời gian theo STRING, không phải " "“now”\n" @@ -2876,25 +2943,24 @@ msgstr "" "ngày và\n" " thời gian với độ chính xác đã cho.\n" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" 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" -#: src/date.c:147 +#: src/date.c:149 +#, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=ĐẶC_TẢ_GIỜ đưa ra ngày và giờ dạng tương thích RFC 3339.\n" " ĐẶC_TẢ_GIỜ xác định độ chính xác “date”\n" @@ -2906,8 +2972,19 @@ msgstr "" " -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ế (UTC)\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2920,7 +2997,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:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2935,7 +3012,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:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2948,7 +3025,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:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2958,7 +3035,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:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2970,7 +3047,7 @@ msgstr "" " %I giờ (01..12)\n" " %j ngày của năm (001..366)\n" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2982,7 +3059,7 @@ msgstr "" " %m tháng (01..12)\n" " %M phút (00..59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -3001,7 +3078,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:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -3013,7 +3090,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:209 +#: src/date.c:215 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 +3102,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:215 +#: src/date.c:221 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 +3114,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:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -3057,7 +3134,7 @@ msgstr "" "\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:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -3075,7 +3152,7 @@ msgstr "" " ^ in ra chữ hoa nếu có thể\n" " # in ra chữ đối diện nếu có thể\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -3090,7 +3167,7 @@ msgstr "" "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" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3114,35 +3191,35 @@ msgstr "" "Hiện thời gian địa phương lúc 9AM ngày thứ 6 sắp tới ở bờ Tây nước Mỹ\n" " $ date --date=\"TZ=\"America/Los_Angeles\" 09:00 next Fri”\n" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "đầu vào chuẩn" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "ngày sai %s”" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "đã chỉ ra nhiều định dạng kết quả" -#: src/date.c:430 +#: src/date.c:436 #, 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:437 +#: src/date.c:443 #, 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:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3153,23 +3230,23 @@ msgstr "" "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:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "không đặt được ngày" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, c-format msgid "time %s is out of range" msgstr "thời gian %s vượt ra ngoài giới hạn" #. 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 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3178,7 +3255,7 @@ msgstr "" "Cách dùng: %s [TOÁN_HẠNG]...\n" " hoặc: %s TÙY_CHỌN\n" -#: src/dd.c:532 +#: src/dd.c:561 msgid "" "Copy a file, converting and formatting according to the operands.\n" "\n" @@ -3197,7 +3274,8 @@ msgstr "" " count=SỐ chỉ sao chép SỐ khối đầu vào\n" " ibs=BYTES đọc BYTES byte mỗi lần (mặc định: 512)\n" -#: src/dd.c:541 +#: src/dd.c:570 +#, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" " iflag=FLAGS read as per the comma separated symbol list\n" @@ -3206,8 +3284,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\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" @@ -3219,7 +3299,7 @@ msgstr "" " 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:552 +#: src/dd.c:583 msgid "" "\n" "N and BYTES may be followed by the following multiplicative suffixes:\n" @@ -3246,7 +3326,7 @@ msgstr "" "Mỗi ký hiệu CONV có thể là:\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 msgid "" " ascii from EBCDIC to ASCII\n" " ebcdic from ASCII to EBCDIC\n" @@ -3274,7 +3354,7 @@ msgstr "" " sử dụng với block hoặc unblock, thêm bằng khoảng trắng thay vì " "NUL\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3290,7 +3370,7 @@ msgstr "" " fdatasync ghi vật lý dữ liệu tập tin kết quả lên đĩa trước khi thoát\n" " fsync như trên, nhưng đồng thời ghi cả siêu dữ liệu\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3304,135 +3384,102 @@ msgstr "" " append chế độ nối thêm\n" " (chỉ có ích cho đầu ra; cũng đề nghị “conv=notrunc”)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio dùng I/O đồng quy cho dữ liệu\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct sử dụng I/O trực tiếp cho dữ liệu\n" -#: src/dd.c:593 +#: src/dd.c:624 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:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync dùng I/O đã đồng bộ cho dữ liệu\n" -#: src/dd.c:597 +#: src/dd.c:628 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:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock tích luỹ các khối đầy đủ dữ liệu đầu vào (chỉ iflag)\n" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock sử dụng I/O không đặt khối\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime không cập nhật giờ truy cập\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nochace bỏ qua dữ liệu tạm lưu\n" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty không ấn định thiết bị cuối điều khiển từ tập tin\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow không đi theo liên kết mềm\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks lỗi nếu có nhiều liên kết\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary sử dụng I/O nhị phân cho dữ liệu\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text sử dụng I/O văn bản cho dữ liệu\n" -#: src/dd.c:620 +#: src/dd.c:651 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" -#: src/dd.c:623 +#: src/dd.c:654 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" -#: src/dd.c:626 +#: src/dd.c:657 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" -#: src/dd.c:631 +#: src/dd.c:661 #, 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 "" -"\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" -" đọc vào 18335302+0\n" -" ghi ra 18335302+0\n" -" đã sao chép 9387674624 byte (9.4 GB), 34.6279 giây, 271 MB/giây\n" -"\n" -"Tùy chọn:\n" -"\n" -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +#: src/dd.c:699 +#, fuzzy, c-format +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "thiếu bộ nhớ vì vùng nhớ đệm đầu vào có cỡ %zu byte (%s)" -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +#: src/dd.c:721 +#, fuzzy, c-format +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "thiếu bộ nhớ vì vùng nhớ đệm ra có cỡ %zu byte (%s)" -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" -"đọc vào %+%\n" -"ghi ra %+%\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% mục ghi bị cắt ngắn\n" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "đã chép % byte (%s)" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "B vô cùng" @@ -3446,83 +3493,99 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr ", %g s, %s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr ", %g s, %s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"đọc vào %+%\n" +"ghi ra %+%\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% mục ghi bị cắt ngắn\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "đóng tập tin vào %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "đóng tập tin ra %s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "gặp lỗi khi tắt O_DIRECT: %s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "đang ghi vào %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "toán hạng không nhận ra %s" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "sai chuyển đổi" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "cờ đầu vào không hợp lệ" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "cờ đầu ra không hợp lệ" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "cờ trạng thái không hợp lệ" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "số không hợp lệ %s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, 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:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "không thể kết hợp block và unblock" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "không thể kết hợp lcase (chữ thường) và ucase (chữ HOA)" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "không thể kết hợp excl và nocreat" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "không thể kết hợp direct và nocache" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3531,62 +3594,62 @@ msgstr "" "cảnh báo: đang gỡ rối lỗi nhân lseek cho tập tin (%s)\n" " có mt_type=0x%0lx -- xem để biết danh sách các kiểu" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s: không thể bỏ qua" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s: không thể di chuyển vị trí đọc" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "offset bị tràn khi đọc tập tin %s" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "cảnh báo: offset tập tin không hợp lệ sau lỗi đọc" -#: src/dd.c:1760 +#: src/dd.c:1863 #, 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:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "đang cài đặt cờ cho %s" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s: không thể nhảy đến tới offset đưa ra" -#: src/dd.c:2172 +#: src/dd.c:2288 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "gặp lỗi khi cắt ngắn ở % byte trong tập tin kết xuất %s" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "fdatasync bị lỗi cho %s" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "fsync bị lỗi cho %s" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "gặp lỗi khi mở %s" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " @@ -3595,19 +3658,19 @@ msgstr "" "độ lệch quá lớn: không thể cắt ngắn thành chiều dài seek=% (%lu-" "byte) khối" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "gặp lỗi khi cắt ngắn ở % byte trong tập tin kết quả %s" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "không thể bỏ qua cache: %s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3688,12 +3751,12 @@ msgstr "Dung lượng" msgid "%s-%s" msgstr "%2$s-%1$s" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "không thể truy cập %s: over-mounted bởi thiết bị khác" -#: src/df.c:1384 +#: src/df.c:1405 msgid "" "Show information about the file system on which each FILE resides,\n" "or all file systems by default.\n" @@ -3703,13 +3766,14 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 +#, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3721,7 +3785,7 @@ msgstr "" " -h, --human-readable hiển thị kích cỡ theo dạng mũ 1024 (v.d. 1023M)\n" " -H, --si hiển thị kích cỡ theo dạng mũ 1000 (v.d. 1.1G)\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3735,13 +3799,39 @@ msgstr "" " --no-sync không gọi sync trước khi lấy thông tin sử dụng (mặc " "định)\n" -#: src/df.c:1409 +#: src/df.c:1429 +#, 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" +msgstr "" +" --output[=D.SÁCH_TRƯỜNG] dùng định dạng kết xuất được định nghĩa bởi D." +"SÁCH_TRƯỜNG,\n" +" hay hiển thị tất cả các trường nếu D.SÁCH_TRƯỜNG " +"để trống.\n" +" -P, --portability sử dụng định dạng kết quả POSIX\n" +" --sync gọi sync trước khi lấy thông tin\n" +" -t, --type=KIỂU chỉ liệt kê các hệ thống tập tin KIỂU\n" +" -T, --print-type in ra kiểu hệ thống tập tin\n" +" -x, --exclude-type=KIỂU giới hạn liệt kê các hệ thống tập tin không phải " +"KIỂU\n" +" -v (bị bỏ qua)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr "" +" --verbose in thông tin chẩn đoán đúng trước\n" +" khi mở mỗi tập tin kết xuất\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3759,7 +3849,7 @@ msgstr "" "KIỂU\n" " -v (bị bỏ qua)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3773,25 +3863,25 @@ msgstr "" "“ipcent”,\n" "“size”, “used”, “avail”, “pcent”, “file” và “target” (xem trang info).\n" -#: src/df.c:1460 +#: src/df.c:1486 #, c-format msgid "options %s and %s are mutually exclusive" msgstr "hai tùy chọn “%s” và “%s” loại từ lẫn nhau" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "dạng hệ thống tập tin %s đã được cả chọn và loại bỏ" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "Cảnh báo: " -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "không đọc được bảng các hệ thống tập tin đã gắn" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "không có hệ thống tập tin được xử lý" @@ -3904,7 +3994,7 @@ msgstr "" " %s dir1/str dir2/str -> “dir1” theo sau bởi “dir2”\n" " %s stdio.h -> “.”.\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3914,7 +4004,9 @@ msgstr "" " hoặc: %s [TÙY_CHỌN]... --files0-from=F\n" #: src/du.c:285 -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +#, fuzzy +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "Tính tổng không gian đĩa cho từng TẬP_TIN sử dụng, một cách đệ quy trong thư " "mục.\n" @@ -4057,63 +4149,57 @@ msgstr "" msgid "Infinity" msgstr "Vô hạn" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "fts_read gặp lỗi: %s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "độ sâu tối đa “%s” không hợp lệ" -#: src/du.c:816 +#: src/du.c:837 #, c-format msgid "invalid --threshold argument '-0'" msgstr "tham số --threshold không hợp lệ “-0”" -#: src/du.c:898 +#: src/du.c:919 #, 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:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "cảnh báo: tóm tắt là giống với sử dụng “--max-depth=0”" -#: src/du.c:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "cảnh báo: tóm tắt xung đột với “--max-depth=%lu”" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" "cảnh báo: tùy chọn --apparent-size và -b không có tác dụng gì với --inodes" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "toán hạng tập tin không thể kết hợp với “--file0-from”" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s: lỗi đọc" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" "đọc các tên tập tin từ đầu vào tiêu chuẩn thì không cho phép tên tập tin %s" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "sai tên tập tin chiều dài bằng không" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "tổng" @@ -4254,9 +4340,8 @@ msgid "cannot specify --null (-0) with command" msgstr "không thể xác định --null (0) với câu lệnh" #: src/expand.c:107 -msgid "" -"Convert tabs in each FILE to spaces, writing to standard output.\n" -"With no FILE, or when FILE is -, read standard input.\n" +#, fuzzy +msgid "Convert tabs in each FILE to spaces, writing to standard output.\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" @@ -4303,7 +4388,7 @@ msgid "input line is too long" msgstr "dòng đầu vào quá dài" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4462,12 +4547,12 @@ 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:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "chia cho không" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "đặt “LC_ALL=”C”” để tránh vấn đề" @@ -4478,31 +4563,31 @@ msgid "the strings compared were %s and %s" msgstr "đã so sánh hai chuỗi %s và %s" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "Niels Moller" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, 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:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "tràn hàng đợi squfof" -#: src/factor.c:2403 +#: src/factor.c:2492 #, 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:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s là quá lớn" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4511,7 +4596,7 @@ msgstr "" "Cách dùng: %s [SỐ]...\n" " hoặc: %s TÙY_CHỌN\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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" @@ -4554,7 +4639,7 @@ msgstr "" "Định dạng lại mỗi đoạn văn trong (các) TẬP_TIN, ghi ra đầu ra tiêu chuẩn.\n" "Tùy chọn “-RỘNG” là dạng viết tắt của tùy chọn “--width=CHỮ_SỐ”.\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4567,7 +4652,7 @@ 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:287 +#: src/fmt.c:288 #, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4582,7 +4667,7 @@ msgstr "" " -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:359 +#: src/fmt.c:356 #, c-format msgid "" "invalid option -- %c; -WIDTH is recognized only when it is the first\n" @@ -4591,20 +4676,19 @@ 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ế" -#: src/fmt.c:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "chiều rộng sai: %s" -#: src/fold.c:70 -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +#: src/fold.c:69 +#, fuzzy +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "Ngắt dòng cho từng TẬP_TIN (đầu vào tiêu chuẩn theo mặc định),\n" "ghi ra đầu ra tiêu chuẩn.\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4614,9 +4698,9 @@ 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:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "sai số cột: %s" #. This is a proper name. See the gettext manual, section Names. @@ -4689,17 +4773,17 @@ msgstr "không thể lấy GID thực" msgid "%s: no such user" msgstr "%s: không có người dùng này" -#: src/head.c:109 +#: src/head.c:110 +#, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "In 10 dòng đầu tiên của mỗi TẬP_TIN ra đầu ra tiêu chuẩn. Khi có nhiều\n" "hơn một TẬP_TIN, treo thêm trước bằng một phần đầu cho biết tên tập tin.\n" "Khi không có TẬP_TIN, hoặc khi TẬP_TIN là “-”, đọc từ đầu vào tiêu chuẩn.\n" -#: src/head.c:117 +#: src/head.c:118 msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" " with the leading '-', print all but the last\n" @@ -4715,7 +4799,7 @@ msgstr "" " 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:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4723,7 +4807,7 @@ 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" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4735,48 +4819,36 @@ msgstr "" "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n" "GB 1000*1000*1000, G 1024*1024*1024, và tương tự với T, P, E, Z, Y.\n" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s: tập tin đã rút ngắt quá nhiều" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s: số byte quá lớn" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s: không thể tìm tới offset %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s: không thể di chuyển tới offset tương đối %s" -#: src/head.c:886 +#: src/head.c:267 #, 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:887 -msgid "number of lines" -msgstr "số dòng" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "số byte" +msgid "%s: number of bytes is too large" +msgstr "%s: số byte quá lớn" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "sai số dòng" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "sai số byte" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "sai tùy chọn theo sau “-- %c”" @@ -4965,7 +5037,7 @@ msgstr "không thay đổi được quyền sở hữu của %s" msgid "cannot set time stamps for %s" msgstr "không đặt được nhãn thời gian cho %s" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, 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" @@ -5124,7 +5196,7 @@ msgstr "không được dùng tùy chọn strip khi cài đặt thư mục" msgid "target directory not allowed when installing a directory" msgstr "không cho phép dùng thư mục đích khi cài đặt thư mục" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "chế độ sai %s" @@ -5162,8 +5234,13 @@ msgstr "Mike Haertel" #: src/join.c:195 msgid "" "For each pair of input lines with identical join fields, write a line to\n" -"standard output. The default join field is the first, delimited\n" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -5179,7 +5256,7 @@ msgstr "" "FILENUM2\n" " -e EMPTY thay thế các trường nhập thiếu bằng EMPTY\n" -#: src/join.c:204 +#: src/join.c:210 msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" " -j FIELD equivalent to '-1 FIELD -2 FIELD'\n" @@ -5193,7 +5270,7 @@ msgstr "" " -t KÝ_TỰ dùng KÝ_TỰ làm ký tự phân chia trường đưa vào và kết quả " "ra\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5215,12 +5292,12 @@ msgstr "" " --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:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated kết thúc dòng bằng NUL, thay cho ký tự dòng mới\n" -#: src/join.c:225 +#: src/join.c:231 msgid "" "\n" "Unless -t CHAR is given, leading blanks separate fields and are ignored,\n" @@ -5257,47 +5334,47 @@ msgstr "" "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:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "%s:%: chưa được sắp xếp: %.*s" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "số thứ tự trường sai: %s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "sự xác định trường sai: %s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "sai số thứ tự tập tin trong sự xác định trường: %s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "không tương thích nối lại hai trường %lu, %lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "xung đột các chuỗi thay thế trường rỗng" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "khoảng tab đa ký tự %s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "các khoảng tab không tương thích với nhau" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "cả hai tập tin không thể là đầu vào chuẩn" @@ -5374,17 +5451,17 @@ msgstr "không thể kết hợp tín hiệu với “-l” hoặc “-t”" msgid "no process ID specified" msgstr "chưa chỉ định ID tiến trình" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "gặp lỗi khi cấp phát một vùng đệm I/O tiêu chuẩn % byte\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "sai đặt chế độ chuyển hoán đệm %s cho %s\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "không đặt được việc chuyển hoán đệm %s thành chế độ %s\n" @@ -5577,7 +5654,7 @@ msgstr "không thực hiện tùy chọn --relative mà không có --symbolic" msgid "FIXME: unknown" msgstr "FIXME: không hiểu" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "Cách dùng: %s [TÙY_CHỌN]\n" @@ -5590,7 +5667,7 @@ msgstr "" "In ra tên của người dùng hiện thời.\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "không có tên đăng nhập" @@ -5600,7 +5677,7 @@ msgstr "không có tên đăng nhập" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%e %b %Y" @@ -5609,97 +5686,97 @@ msgstr "%e %b %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%H:%M %e %b" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "" -"đang bỏ qua giá trị sai của biến môi trường kiểu dáng trích dẫn " -"QUOTING_STYLE: %s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "đang bỏ qua bề rộng sai trong biến môi trường cột COLUMNS: %s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "đang bỏ qua kích cỡ tab sai trong biến môi trường TABSIZE: %s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "sai bề rộng dòng: %s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "sai kích cỡ tab: %s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "sai định dạng kiểu thời gian %s" -#: src/ls.c:2067 +#: src/ls.c:2045 msgid "Valid arguments are:\n" msgstr "Đối số không hợp lệ là:\n" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr " - +FORMAT (e.g., +%H:%M) cho định dạng “date”-style\n" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "lỗi khởi tạo các chuỗi tháng" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "không hiểu tiền tố: %s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "" "giá trị không thể phân tích cho biến môi trường đặc tả màu sắc LS_COLORS" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "" +"đang bỏ qua giá trị sai của biến môi trường kiểu dáng trích dẫn " +"QUOTING_STYLE: %s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "không mở được thư mục %s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "không nhận ra thiết bị và inode của %s" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s: không liệt kê thư mục đã liệt kê" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "đang đọc thư mục %s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "đang đóng thư mục %s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "không so sánh được tên tập tin %s và %s" -#: src/ls.c:4781 +#: src/ls.c:4775 msgid "" "List information about the FILEs (the current directory by default).\n" "Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n" @@ -5708,7 +5785,7 @@ msgstr "" "Sắp xếp các mục theo bảng chữ cái nếu không có “-cftuvSUX” cũng không “--" "sort”.\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5722,7 +5799,7 @@ msgstr "" " -b, --escape in ra thoát chuỗi kiểu-C cho ký tự không thể\n" " hiển thị\n" -#: src/ls.c:4794 +#: src/ls.c:4788 msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." "g.,\n" @@ -5750,12 +5827,14 @@ msgstr "" "nếu\n" " không: sắp xếp theo ctime, sớm hơn xếp trước\n" -#: src/ls.c:4804 +#: src/ls.c:4798 +#, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5771,7 +5850,7 @@ msgstr "" " -D, --dired tạo kết xuất thích hợp với chế độ dired của " "Emacs\n" -#: src/ls.c:4812 +#: src/ls.c:4807 msgid "" " -f do not sort, enable -aU, disable -ls --color\n" " -F, --classify append indicator (one of */=>@|) to entries\n" @@ -5794,12 +5873,12 @@ msgstr "" " * vertical -C thẳng đứng\n" " --full-time giống “-l --time-style=full-iso”\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" " -g giống “-l”, nhưng không liệt kê người sở hữu\n" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5813,7 +5892,7 @@ msgstr "" " nhưng bất cứ lần nào dùng “--sort=none” (-U)\n" " sẽ tắt chức năng nhóm lại.\n" -#: src/ls.c:4829 +#: src/ls.c:4824 msgid "" " -G, --no-group in a long listing, don't print group names\n" " -h, --human-readable with -l and/or -s, print human readable sizes\n" @@ -5826,7 +5905,7 @@ msgstr "" " --si giống trên, nhưng dùng hệ số mũ 1000, không " "phải 1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 msgid "" " -H, --dereference-command-line\n" " follow symbolic links listed on the command " @@ -5847,7 +5926,7 @@ msgstr "" "shell\n" " (bị ghi đè bởi “-a” hoặc “-A”)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 msgid "" " --indicator-style=WORD append indicator with style WORD to entry " "names:\n" @@ -5869,7 +5948,7 @@ msgstr "" " -k, --kibibytes mặc định dùng khối 1024-byte cho dung lượng đĩa " "đã dùng\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5886,7 +5965,7 @@ msgstr "" " -m liệt kê liền nhau các mục, cách nhau bởi dấu " "phẩy\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5904,7 +5983,7 @@ msgstr "" " -p, --indicator-style=slash\n" " nối thêm vào thư mục chỉ thị “/”\n" -#: src/ls.c:4871 +#: src/ls.c:4866 msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" " --show-control-chars show nongraphic characters as-is (the default,\n" @@ -5930,7 +6009,7 @@ msgstr "" " * c\n" " * escape thoát\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5942,18 +6021,19 @@ msgstr "" " -s, --size in kích cỡ đã cấp phát của mỗi tập tin, theo " "khối\n" -#: src/ls.c:4886 +#: src/ls.c:4881 +#, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S sắp xếp theo kích cỡ tập tin\n" " --sort=TỪ sắp xếp theo TỪ thay cho tên:\n" @@ -5973,7 +6053,7 @@ msgstr "" " đồng thời dùng thời gian chỉ ra làm tiêu\n" " chuẩn sắp xếp nếu “--sort=time”\n" -#: src/ls.c:4896 +#: src/ls.c:4892 msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" " full-iso, long-iso, iso, locale, or +FORMAT;\n" @@ -6004,7 +6084,7 @@ msgstr "" " chỉ có tác động bên ngoài miền địa phương " "POSIX.\n" -#: src/ls.c:4908 +#: src/ls.c:4904 msgid "" " -t sort by modification time, newest first\n" " -T, --tabsize=COLS assume tab stops at each COLS instead of 8\n" @@ -6012,11 +6092,12 @@ 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:4912 +#: src/ls.c:4908 +#, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -6030,13 +6111,15 @@ msgstr "" " -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:4919 +#: src/ls.c:4915 +#, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=CỘT coi chiều rộng màn hình là giá trị này thay cho " "giá trị hiện thời\n" @@ -6046,7 +6129,7 @@ msgstr "" "tập tin\n" " -1 liệt kê một tập tin trên mỗi dòng\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -6063,7 +6146,7 @@ msgstr "" "cũng có khả năng sửa đổi cài đặt này. Hãy sử dụng lệnh “dircolors” để đặt " "nó.\n" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -6093,51 +6176,54 @@ msgid "David Madore" msgstr "David Madore" #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" "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" -#: src/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -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" -#: src/md5sum.c:178 -msgid " -b, --binary read in binary mode\n" +#: src/md5sum.c:180 +#, fuzzy +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary đọc ở chế độ nhị phân \n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr " --tag tạo tổng kiểm tra kiểu-BSD\n" -#: src/md5sum.c:188 +#: src/md5sum.c:191 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" -#: src/md5sum.c:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text đọc ở chế độ văn bản (mặc định) \n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 msgid "" "\n" "The following four options are useful only when verifying checksums:\n" @@ -6158,14 +6244,15 @@ msgstr "" "sai\n" "\n" -#: src/md5sum.c:206 -#, c-format +#: src/md5sum.c:209 +#, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" 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" @@ -6173,84 +6260,84 @@ msgstr "" "một dòng ghi tổng kiểm tra, một ký tự chỉ dạng (”*” cho nhị phân,\n" "”dấu cách” cho văn bản), và tên cho mỗi FILE.\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s: quá nhiều dòng tổng kiểm tra" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s: %: dòng tổng kiểm tra %s có định dạng không đúng" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s: mở hoặc đọc BỊ LỖI\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "BỊ LỖI" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "OK" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, 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:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "%: dòng tổng kiểm tra có định dạng không đúng" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "CẢNH BÁO: không đọc được %" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "CẢNH BÁO: % đã kiểm tra KHÔNG tương ứng" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "--tag không hỗ trợ chế độ --text" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, 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:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "các tùy chọn “--binary” và “--text” mất ý nghĩa khi tính tổng kiểm tra" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "tùy chọn “--status” chỉ có ý nghĩa khi tính tổng kiểm tra" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "tùy chọn “--warn” chỉ có ý nghĩa khi tính tổng kiểm tra" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "tùy chọn “--quiet” chỉ có ý nghĩa khi tính tổng kiểm tra" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, 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" @@ -6291,22 +6378,22 @@ msgstr "" " đặt ngữ cảnh an ninh SELinux hay SMACK thành " "NGỮ_CẢNH\n" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, c-format msgid "failed to set default creation context for %s" msgstr "gặp lỗi khi đặt ngữ cảnh tạo tập tin mặc định thành %s" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, c-format msgid "failed to restore context for %s" msgstr "gặp lỗi khi bảo tồn ngữ cảnh cho %s" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "đã tạo thư mục %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6522,7 +6609,7 @@ msgstr "quá nhiều mẫu" msgid "with --suffix, template %s must end in X" msgstr "dùng “--suffix” (hậu tố) thì mẫu %s phải kết thúc bằng chữ X" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, 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" @@ -6661,9 +6748,8 @@ msgid "Scott Bartram" msgstr "Scott Bartram" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "In từng TẬP_TIN ra đầu ra tiêu chuẩn, có số thứ tự của các dòng ở đầu.\n" "Khi không có TẬP_TIN, hoặc khi TẬP_TIN là “-”, đọc đầu vào tiêu chuẩn.\n" @@ -6771,27 +6857,27 @@ msgstr "sai dạng đánh số vào phần thân: %s" msgid "invalid footer numbering style: %s" msgstr "sai dạng đánh số vài phần chân: %s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "sai số của dòng bắt đầu: %s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "sai độ tăng số của dòng: %s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "sai số dòng trắng: %s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "sai chiều dài trường số của dòng: %s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "sai định dạng đánh số dòng: %s" @@ -6814,10 +6900,10 @@ msgstr "" "\n" #: src/nohup.c:65 -#, c-format +#, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6836,46 +6922,46 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "gặp lỗi khi vô hiệu hoá đầu vào tiêu chuẩn" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "đang bỏ qua dữ liệu vào" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" 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 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "nối thêm kết xuất vào %s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" 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 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" "đ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 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "" "đang chuyển hướng đầu lỗi tiêu chuẩn (stderr) tới đầu ra tiêu chuẩn (stdout)" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" 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:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -6902,57 +6988,52 @@ msgstr "" " --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: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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "Assaf Gordon" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "giá trị là quá lớn nên không thể chuyển đổi: “%s”" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, c-format msgid "invalid number: %s" msgstr "số không hợp lệ: %s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "chối từ hậu tố ở đầu vào: “%s” (coi như sử dụng --from)" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, c-format msgid "invalid suffix in input: %s" msgstr "gặp hậu tố không hợp lệ trong đầu vào: “%s”" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "thiếu hậu tố “i” trong đầu vào: “%s” (ví dụ: Ki/Mi/Gi)" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "gặp lỗi khi chuẩn bị giá trị “%Lf” để in ấn" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, c-format msgid "invalid unit size: %s" msgstr "kích thước đơn vị không hợp lệ: “%s”" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "Cách dùng: %s [TÙY-CHỌN]... [SỐ]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" @@ -6960,23 +7041,26 @@ msgstr "" "Định dạng lại SỐ, hoặc con số từ đầu vào tiêu chuẩn nếu không chỉ ra cái " "nào.\n" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr " --debug hiển thị các cảnh báo đầu vào không hợp lệ\n" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" " -d, --delimiter=X dùng X thay vì khoảng trắng để phân tách các trường\n" -#: src/numfmt.c:827 +#: src/numfmt.c:893 +#, fuzzy msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" " --field=N thay thế con số trong trường N (mặc định là 1)\n" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" @@ -6985,7 +7069,7 @@ msgstr "" " xem ĐỊNH-DẠNG ở phía dưới để có thêm thông tin chi " "tiết\n" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" @@ -6995,7 +7079,7 @@ msgstr "" "“none”.\n" " xem UNIT ở dưới đây\n" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" @@ -7003,7 +7087,7 @@ msgstr "" " --from-unit=N chỉ ra kích thước đơn vị đầu vào (thay vì giá trị 1 " "theo mặc định)\n" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -7015,7 +7099,7 @@ msgstr "" " (có nghĩa là không chịu ảnh hưởng vùng địa phương C/" "POSIX)\n" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" @@ -7023,7 +7107,7 @@ msgstr "" " --header[=N] in ra (mà không chuyển đổi) N dòng đầu tiên;\n" " N mặc định là 1 nếu không chỉ định rõ ràng\n" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" @@ -7031,7 +7115,7 @@ msgstr "" " --invalid=MODE chế độ sai: nó có thể là:\n" " abort (mặc định), fail, warn, ignore\n" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -7047,7 +7131,7 @@ msgstr "" " mặc định là tự động đệm thêm nếu khoảng trắng\n" " được tìm thấy\n" -#: src/numfmt.c:860 +#: src/numfmt.c:927 msgid "" " --round=METHOD use METHOD for rounding when scaling; METHOD can be:\n" " up, down, from-zero (default), towards-zero, " @@ -7058,7 +7142,7 @@ msgstr "" " up, down, from-zero (mặc định), towards-zero, " "nearest\n" -#: src/numfmt.c:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" @@ -7066,21 +7150,21 @@ msgstr "" " --suffix=HẬU-TỐ thêm HẬU-TỐ cho con số đầu ra, và chấp nhận\n" " HẬU-TỐ tùy chọn trong con số đầu vào\n" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" " --to=UNIT con số cho biến đổi tỷ lệ tự động áp dụng cho UNIT; " "xem UNIT bên dưới\n" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" " --to-unit=N kích thước đơn vị kết xuất (thay cho giá trị mặc định " "là 1)\n" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" @@ -7088,12 +7172,12 @@ msgstr "" "\n" "Các tùy chọn về ĐƠN-VỊ (UNIT):\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" " none không áp dụng biến đổi tỷ lệ tự động; các hậu tố sẽ coi lỗi\n" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -7107,7 +7191,7 @@ msgstr "" " 1M = 1000000,\n" " 1Mi = 1048576,\n" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -7119,7 +7203,7 @@ msgstr "" " 1M = 1000000,\n" " ...\n" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -7131,7 +7215,7 @@ msgstr "" " 1M = 1048576,\n" " ...\n" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -7143,8 +7227,29 @@ msgstr "" " 1Mi = 1048576,\n" " ...\n" -#: src/numfmt.c:906 -#, c-format +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"Mỗi phạm vi là một trong:\n" +"\n" +" N Byte, ký tự hoặc trường thứ N đếm từ 1\n" +" N- Từ byte, ký tự hoặc trường thứ N đến cuối dòng\n" +" 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" + +#: src/numfmt.c:983 +#, fuzzy, c-format msgid "" "\n" "FORMAT must be suitable for printing one floating-point argument '%f'.\n" @@ -7152,6 +7257,7 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" "\n" "ĐỊNH-DẠNG phải phù hợp cho việc hiển thị tham số dấu chấm động “%f”.\n" @@ -7160,7 +7266,7 @@ msgstr "" "Tùy chọn độ rộng với số không (%010f) sẽ đệm bằng số không.\n" "Tùy chọn độ rộng với giá trị âm (%-10f) sẽ căn lề trái.\n" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -7183,8 +7289,8 @@ msgstr "" "chuyển đổi\n" "không được chuẩn đoán và thoát với trạng thái là 0.\n" -#: src/numfmt.c:922 -#, c-format +#: src/numfmt.c:1000 +#, fuzzy, c-format msgid "" "\n" "Examples:\n" @@ -7198,8 +7304,8 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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 "" @@ -7220,115 +7326,126 @@ msgstr "" " $ ls -lh | %s --header --field 5 --from=iec --padding=10\n" " $ ls -lh | %s --header --field 5 --from=iec --format %%10f\n" -#: src/numfmt.c:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "định dạng %s không có chỉ thị %%" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, c-format msgid "invalid format %s (width overflow)" msgstr "định dạng không hợp lệ %s (độ rộng bị tràn)" -#: src/numfmt.c:1008 -#, c-format -msgid "--format padding overridding --padding" +#: src/numfmt.c:1085 +#, fuzzy, c-format +msgid "--format padding overriding --padding" msgstr "--format padding đè lên --padding" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "định dạng %s kết thúc bằng %%" -#: src/numfmt.c:1030 -#, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "sai độ chính xác: %s" + +#: src/numfmt.c:1126 +#, fuzzy, c-format +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "định dạng %s không hợp lệ, chỉ dẫn phải là %%[0]['][-][N]f" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "định dạng %s có quá nhiều chỉ thị %%" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, c-format msgid "invalid suffix in input %s: %s" msgstr "gặp hậu tố không hợp lệ trong đầu vào %s: “%s”" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, fuzzy, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" +"giá trị quá lớn để có thể in: “%Lg” (hãy cân nhắc sử dụng tùy chọn --to)" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" "giá trị quá lớn để có thể in: “%Lg” (hãy cân nhắc sử dụng tùy chọn --to)" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "giá trị quá lớn để có thể in: “%Lg” (không thể xử lý giá trị > 999Y)" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "giá trị đầu vào lớn “%s”: gần như chắc chắn là độ chính xác bị giảm" -#: src/numfmt.c:1308 +#: src/numfmt.c:1386 src/numfmt.c:1399 #, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" -"dòng đầu vào quá ngắn, không tìm thấy con số nào để chuyển đổi trong trường " -"%ld" +msgid "invalid field value %s" +msgstr "giá trị không hợp lệ cho trường “%s”" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, c-format msgid "invalid padding value %s" msgstr "giá trị đệm không hợp lệ “%s”" -#: src/numfmt.c:1417 -#, c-format -msgid "invalid field value %s" -msgstr "giá trị không hợp lệ cho trường “%s”" +#: src/numfmt.c:1646 +#, fuzzy, c-format +msgid "multiple field specifications" +msgstr "%s: sai xác định trường %s" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, c-format msgid "invalid header value %s" msgstr "giá trị phần đầu không hợp lệ “%s”" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, c-format msgid "--grouping cannot be combined with --format" msgstr "--grouping không thể được tổ hợp cùng với --format" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, c-format msgid "no conversion option specified" msgstr "chưa chỉ ra các tùy chọn chuyển đổi" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, c-format msgid "grouping cannot be combined with --to" msgstr "việc nhóm không thể được tổ hợp cùng với --to" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "việc nhóm các chữ số không ảnh hưởng đến vùng địa phương này" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "--header bị bỏ qua với đầu vào dòng-lệnh" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, c-format msgid "error reading input" msgstr "lỗi khi đọc đầu vào" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "gặp lỗi khi chuyển đổi một số con số đầu vào" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -7341,14 +7458,13 @@ msgstr "" " hoặc: %s --traditional [TÙY_CHỌN]... [TẬP_TIN] [[+]HIỆU[.][b] [+][NHÃN]" "[.][b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "Ghi TẬP_TIN dạng rõ ràng vào đầu ra tiêu chuẩn, theo byte bát phân theo mặc " @@ -7358,8 +7474,10 @@ msgstr "" "Khi không có TẬP_TIN, hoặc khi TẬP_TIN là “-”, đọc đầu vào tiêu chuẩn.\n" "\n" -#: src/od.c:333 +#: src/od.c:335 +#, 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" @@ -7375,7 +7493,7 @@ msgstr "" "HIỆU và NHÃN, một tiền tố “0x” hoặc “0X” cho biết nó là dạng thập lục;\n" "hậu tố đuôi có thể là “.” đối với bát phân và “b” để nhân lên 512.\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -7394,7 +7512,7 @@ msgstr "" " --endian={big|little} tráo đổi thứ tự byte tuân theo thứ tự đã cho\n" " -j, --skip-bytes=SỐ bỏ qua SỐ byte đầu tiên từ đầu vào\n" -#: src/od.c:350 +#: src/od.c:353 msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" " -S BYTES, --strings[=BYTES] output strings of at least BYTES graphic " @@ -7417,7 +7535,7 @@ msgstr "" " 32 là mặc định khi không chỉ ra BYTE\n" " --traditional chấp nhận đối số ở dạng thứ ba ở trên\n" -#: src/od.c:363 +#: src/od.c:366 msgid "" "\n" "\n" @@ -7436,7 +7554,7 @@ msgstr "" " -c -t c ký tự ASCII hoặc ký tự thoát gạch ngược\n" " -d -t u2 đơn vị hai byte thập phân không dấu\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7453,7 +7571,7 @@ msgstr "" " -s -t d2 đơn vị 2 byte thập phân\n" " -x -t x2 đơn vị 2 byte thập lục\n" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -7467,7 +7585,7 @@ msgstr "" " a ký tự có tên, lờ đi bit bậc cao\n" " c ký tự ASCII hoặc thoát chuỗi gạch ngược\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7482,7 +7600,7 @@ msgstr "" " u[CỠ] số thập phân không dấu\n" " x[CỠ] số thập lục\n" -#: src/od.c:394 +#: src/od.c:397 msgid "" "\n" "SIZE is a number. For TYPE in [doux], SIZE may also be C for\n" @@ -7501,7 +7619,7 @@ msgstr "" " D sizeof(double) kích cỡ chính\n" " L sizeof(long double) kích cỡ chính đôi dài\n" -#: src/od.c:401 +#: src/od.c:404 msgid "" "\n" "Adding a z suffix to any type displays printable characters at the end of\n" @@ -7511,7 +7629,7 @@ msgstr "" "Thêm hậu tố z vào mọi ký tự có thể hiển thị được tại cuối của\n" "từng dòng kết xuất.\n" -#: src/od.c:406 +#: src/od.c:409 msgid "" "\n" "\n" @@ -7534,12 +7652,12 @@ msgstr "" " M 1024*1024\n" "và tương tự với G, T, P, E, Z, Y.\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "sai chuỗi kiểu %s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7548,7 +7666,7 @@ msgstr "" "sai chuỗi kiểu %s;\n" "hệ thống này không cung cấp kiểu tích phân %lu byte" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7557,36 +7675,36 @@ msgstr "" "sai chuỗi kiểu %s;\n" "hệ thống này không cung cấp kiểu dấu chấm động %lu byte" -#: src/od.c:869 +#: src/od.c:872 #, c-format msgid "invalid character '%c' in type string %s" msgstr "sai ký tự “%c” trong chuỗi kiểu %s" -#: src/od.c:1094 +#: src/od.c:1105 #, 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:1650 +#: src/od.c:1658 #, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "sai cơ số địa chỉ kết xuất “%c”; nó phải là một ký tự trong [doxn]" -#: src/od.c:1788 +#: src/od.c:1796 #, 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:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "chế độ tương thích hỗ trợ nhiều nhất một tập tin" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "skip-bytes + read-bytes là quá lớn" -#: src/od.c:1927 +#: src/od.c:1935 #, 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ế" @@ -7602,10 +7720,10 @@ msgid "standard input is closed" msgstr "đầu vào tiêu chuẩn bị đóng" #: src/paste.c:439 +#, fuzzy msgid "" "Write lines consisting of the sequentially corresponding lines from\n" "each FILE, separated by TABs, to standard output.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "Viết các dòng bao gồm chuỗi các dòng tương ứng từ từng TẬP_TIN,\n" "phân cách nhau bởi TAB, ra đầu ra tiêu chuẩn.\n" @@ -7750,12 +7868,12 @@ msgstr "Lúc" msgid "Where" msgstr "Tại" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "Cách dùng: %s [TÙY_CHỌN]... [NGƯỜI_DÙNG]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7772,7 +7890,7 @@ msgstr "" " -p bỏ đi tập tin kế hoạch của người dùng trong dạng dài\n" " -s xuất dạng ngắn, đây là mặc định\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7788,7 +7906,7 @@ msgstr "" "nghỉ\n" " trong dạng ngắn\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -7799,7 +7917,7 @@ msgstr "" "Một chương trình “finger” nhẹ; in ra thông tin về người dùng.\n" "Tập tin “utmp” sẽ là %s.\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "" @@ -7807,90 +7925,90 @@ msgstr "" "l”" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "thiếu tham số “--pages=TRANG_ĐẦU[:TRANG_CUỐI]”" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "sai phạm vi trang %s" -#: src/pr.c:975 -#, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "”-l CHIỀU_DÀI_TRANG” sai số của dòng: %s" -#: src/pr.c:999 -#, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "”-N SỐ” sai số dòng bắt đầu: %s" -#: src/pr.c:1011 -#, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "”-o LỀ” sai vị trí tương đối dòng: %s" -#: src/pr.c:1052 -#, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "”-w CHIỀU_RỘNG_TRANG” sai số ký tự: %s" -#: src/pr.c:1066 -#, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "”-W CHIỀU_RỘNG_TRANG” sai số ký tự: %s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "không chỉ ra được số cột khi in ra song song" -#: src/pr.c:1100 +#: src/pr.c:1063 #, 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:1196 +#: src/pr.c:1166 #, 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" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "chiều rộng trang quá hẹp" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "số trang bắt đầu % vượt quá số đếm trang %" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "tràn số thứ tự trang" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "Trang %" -#: src/pr.c:2757 +#: src/pr.c:2727 msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "Đánh số trang hoặc dàn cột (các) TẬP_TIN để in.\n" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7906,7 +8024,7 @@ msgstr "" " 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:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7922,7 +8040,7 @@ msgstr "" " -d, --double-space\n" " nhân đôi khoảng trắng trong kết quả\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7943,7 +8061,7 @@ msgstr "" " (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:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7966,11 +8084,25 @@ msgstr "" " không sắp hàng các cột,\n" " alignment, --sep-string[=CHUỖI] đặt ký tự phân chia\n" -#: src/pr.c:2798 +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +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 " +"cột\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:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -7982,7 +8114,7 @@ msgstr "" " 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:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -8000,7 +8132,7 @@ msgstr "" " 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" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -8015,7 +8147,7 @@ msgstr "" " -r, --no-file-warnings\n" " bỏ đi cảnh báo khi không mở được một tập tin\n" -#: src/pr.c:2820 +#: src/pr.c:2794 msgid "" " -s[CHAR], --separator[=CHAR]\n" " separate columns by a single character, default for " @@ -8033,14 +8165,14 @@ msgstr "" "cột\n" " (-CỘT|-a -CỘT|-m) trừ khi đặt “-w”\n" -#: src/pr.c:2828 +#: src/pr.c:2802 +#, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" " separate columns by STRING,\n" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -S[CHUỖI], --sep-string[=CHUỖI]\n" " phân chia các cột bằng CHUỖI,\n" @@ -8049,7 +8181,13 @@ msgstr "" " không ảnh hưởng đến các tùy chọn cột\n" " -t, --omit-header bỏ đi phần đầu và phần đi theo của các trang\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -8071,7 +8209,7 @@ msgstr "" " đặt chiều rộng trang thành chiều RỘNG_TRANG (72) ký tự\n" " chỉ cho kết quả đa cột văn bản, “-s[ký_tự]” tắt đi (72)\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -8085,16 +8223,6 @@ msgstr "" " cắt ngắn các dòng, trừ khi đặt tùy chọn “-J”,\n" " không can thiệp với “-S” hoặc “-s”\n" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"”-t” 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 msgid "" @@ -8250,11 +8378,11 @@ msgstr "" "Đưa ra một chỉ mục đã hoán vị, bao gồm ngữ cảnh, của những từ trong các tập " "tin đầu vào.\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 +#, fuzzy 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" @@ -8262,6 +8390,12 @@ msgstr "" #: src/ptx.c:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -8276,7 +8410,7 @@ msgstr "" " (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:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -8294,7 +8428,7 @@ msgstr "" " -i, --ignore-file=TẬP_TIN đọc danh sách từ bỏ qua từ TẬP_TIN\n" " -o, --only-file=TẬP_TIN chỉ đọc danh sách từ từ TẬP_TIN này\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -8307,20 +8441,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:1857 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"Không chỉ ra TẬP_TIN, hoặc khi TẬP_TIN là “-”, thì đọc từ đầu vào tiêu " -"chuẩn. Mặc định là “-F /”.\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "chiều rộng chỗ trống sai: %s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "sai bề rộng dòng: %s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -8350,7 +8480,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "gặp lỗi khi chdir (chuyển đổi thư mục) sang %s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "gặp lỗi khi stat (lấy trạng thái về) %s" @@ -8370,8 +8500,8 @@ msgstr "đang bỏ qua các đối số không-phải-tùy-chọn" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Cách dùng: %s [TÙY_CHỌN]... TẬP_TIN...\n" @@ -8636,15 +8766,15 @@ msgstr "" "Để đảm bảo rằng nội dung không phục hồi được, hãy sử dụng lệnh “shred”.\n" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s: xóa đệ quy %zu đối số không? " #: src/rm.c:345 -#, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +#, fuzzy, c-format +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s: xóa %zu đối số không? " #: src/rmdir.c:134 src/rmdir.c:233 @@ -8859,12 +8989,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "sai đối số dấu chấm động: %s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "không hiểu định dạng %s có chỉ thị %%%c" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "" @@ -8883,7 +9013,16 @@ 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" "bằng các thiết bị đắt tiền cũng khó khăn.\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"Nếu TẬP_TIN là “-”, sao chép trở lại đầu ra tiêu chuẩn.\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8897,7 +9036,7 @@ msgstr "" " -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:183 +#: src/shred.c:187 msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" " -v, --verbose show progress\n" @@ -8912,11 +9051,10 @@ msgstr "" " -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:192 +#: src/shred.c:196 +#, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -8940,7 +9078,7 @@ msgstr "" "Chế độ mặc định là “wipesync”. nhưng nó có thể hơi xoa hoa.\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8958,7 +9096,7 @@ msgstr "" "thực hiện đúng trên chúng ở mọi chế độ của hệ thống tập tin:\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8979,7 +9117,7 @@ msgstr "" " NFS Network Appliance\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8993,7 +9131,7 @@ msgstr "" "* hệ thống tập tin đã nén\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -9015,7 +9153,7 @@ msgstr "" "mount (man mount).\n" "\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -9025,127 +9163,127 @@ msgstr "" "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:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s: fdatasync bị lỗi" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s: fsync bị lỗi" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s: không thể tua lại" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s: thực hiện %lu/%lu (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s: lỗi ghi tại hiệu %s" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s: lseek bị lỗi" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s: tập tin quá lớn" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s: lần %lu/%lu (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s: lần %lu/%lu (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s: fstat bị lỗi" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s: sai dạng tập tin" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s: tập tin có kích cỡ âm" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s: lỗi cắt ngắn" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s: fcntl bị lỗi" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s: không thể shred mô tả tập tin chỉ cho phép nối thêm vào" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s: đang xóa" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s: đã đổi tên thành %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s: lỗi xóa" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s: đã xóa" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s: lỗi đóng" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s: lỗi mở để ghi" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s: sai số lần thực hiện" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "đã chỉ ra nhiều nguồn ngẫu nhiên" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s: sai kích cỡ tập tin" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -9156,12 +9294,12 @@ msgstr "" " hoặc: %s -e [TÙY_CHỌN]... [Đ.SỐ]...\n" " hoặc: %s -i LO-HI [TÙY_CHỌN]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 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ác dòng đầu vào.\n" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -9180,37 +9318,37 @@ msgstr "" " --random-source=TẬP_TIN lấy các byte ngẫu nhiên từ tập tin này\n" " -r, --repeat các dòng xuất có thể được lặp lại\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, c-format msgid "too many input lines" msgstr "quá nhiều dòng đầu vào" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "đã chỉ ra nhiều tùy chọn “-i”" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "vùng đầu vào %s không hợp lệ" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "sai đếm dòng %s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "đã chỉ ra nhiều tập tin kết quả" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "không thể kết hợp hai tùy chọn “-e” và “-i”" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "không có dòng nào để lặp" @@ -9241,12 +9379,12 @@ msgstr "" "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:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "sai khoảng thời gian %s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "không đọc được đồng hồ thời gian thực" @@ -9255,7 +9393,7 @@ msgstr "không đọc được đồng hồ thời gian thực" 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" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -9263,7 +9401,7 @@ msgstr "" "Tùy chọn sắp xếp:\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -9274,7 +9412,7 @@ msgstr "" " -d, --dictionary-order tính chỉ các dấu cách và các ký tự chữ-cái/số\n" " -f, --ignore-case tính chữ thường là chữ hoa\n" -#: src/sort.c:443 +#: src/sort.c:444 msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" " -i, --ignore-nonprinting consider only printable characters\n" @@ -9284,13 +9422,13 @@ msgstr "" " -i, --ignore-nonprinting tính chỉ các ký tự có thể in được\n" " -M, --month-sort so sánh (không hiểu) < “Th1” < ... < “Th12”\n" -#: src/sort.c:448 +#: src/sort.c:449 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:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -9302,7 +9440,7 @@ msgstr "" " --random-source=TẬP_TIN lấy các byte ngẫu nhiên từ tập tin này\n" " -r, --reverse đảo ngược kết quả so sánh\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -9322,7 +9460,7 @@ msgstr "" "nhiên bên trong văn bản\n" "\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -9330,7 +9468,7 @@ msgstr "" "Tùy chọn khác:\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -9338,7 +9476,7 @@ msgstr "" " --batch-size=SỐ gộp lại đồng thời nhiều nhất SỐ đầu vào;\n" " nếu cần hơn, hãy sử dụng các tập tin tạm thời\n" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -9355,7 +9493,7 @@ msgstr "" " nén các đồ tạm thời bằng chương trình này;\n" " để giải nén cũng đặt “-d”\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -9373,7 +9511,7 @@ msgstr "" " Nếu F là - thì đọc các tên này từ đầu vào tiêu " "chuẩn\n" -#: src/sort.c:487 +#: src/sort.c:488 msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" " -m, --merge merge already sorted files; do not sort\n" @@ -9382,7 +9520,7 @@ msgstr "" " -m, --merge hòa trộn các tập tin đã sắp xếp rồi; chứ không\n" " sắp xếp\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -9395,7 +9533,7 @@ msgstr "" "lại cuối cùng\n" " -S, --buffer-size=CỠ dùng CỠ cho bộ nhớ đệm chính\n" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -9418,7 +9556,7 @@ msgstr "" " -u, --unique nếu có “-c”, kiểm tra có thứ tự chặt chẽ;\n" " khi không có “-c”, chỉ xuất kết quả chạy đầu tiên\n" -#: src/sort.c:511 +#: src/sort.c:512 msgid "" "\n" "KEYDEF is F[.C][OPTS][,F[.C][OPTS]] for start and stop position, where F is " @@ -9450,12 +9588,11 @@ msgstr "" "\n" "CỠ có thể theo bởi hậu tố là bội số của:\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -9470,264 +9607,266 @@ msgstr "" "Biến môi trường địa phương ảnh hưởng đến thứ tự sắp xếp.\n" "Đặt “LC_ALL=C” để dùng thứ tự sắp xếp truyền thống theo giá trị byte gốc.\n" -#: src/sort.c:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "đang đợi %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] đã chấm dứt bất thường" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "không tạo được tập tin tạm thời trong %s" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "gặp lỗi khi mở" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "fflush bị lỗi" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "gặp lỗi khi đóng" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "không tạo được tập tin tạm thời" -#: src/sort.c:1179 +#: src/sort.c:1178 #, 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:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "cảnh báo: không xóa được: %s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "sai đối số “--%s” %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "đối số “--%s” tối thiểu là %s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "tùy chọn --%s nhận đối số %s quá lớn" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "đối số “--%s” tối đa theo giới hạn rlimit hiện thời là %s" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "số song song không thể là không" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "gặp lỗi khi lấy trạng thái về tập tin" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "gặp lỗi khi đọc" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "gặp lỗi khi chuyển dạng chuỗi" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "chuỗi chưa được chuyển dạng là %s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "^ không có kết quả khớp\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "đang dùng khóa cũ “%s”; hãy dùng khóa mới “%s” để thay thế" -#: src/sort.c:2428 +#: src/sort.c:2427 #, 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:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "có dấu cách ở đầu là quan trọng trong khóa %lu; hãy chỉ định “b”" -#: src/sort.c:2452 +#: src/sort.c:2451 #, 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:2484 +#: src/sort.c:2483 #, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "các tùy chọn “-%s” bị bỏ qua" -#: src/sort.c:2490 +#: src/sort.c:2489 #, 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" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "gặp lỗi khi ghi" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s: %s:%s: sai thứ tự: " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "lỗi tiêu chuẩn" -#: src/sort.c:3738 +#: src/sort.c:3737 msgid "cannot read" msgstr "không thể đọc" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s: sai xác định trường %s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "các tùy chọn “-%s” không tương thích với nhau" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s: sai số đếm tại đầu của %s" -#: src/sort.c:4336 +#: src/sort.c:4335 msgid "invalid number after '-'" msgstr "số sai nằm sau “-”" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 msgid "invalid number after '.'" msgstr "số sai nằm sau “.”" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "ký tự rác trong lời xác định trường" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "đã chỉ ra nhiều chương trình nén" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "số sai tại đầu trường" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "số của trường là không" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "hiệu ký tự là không" -#: src/sort.c:4448 +#: src/sort.c:4447 msgid "invalid number after ','" msgstr "số sai ở sau “,”" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "khoảng tab trống" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "không đọc được tên tập tin từ %s" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s:%lu: sai tên tập tin chiều dài không" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "không có dữ liệu đầu vào từ %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "dùng luật sắp xếp %s" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "dùng so sánh byte đơn giản" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "không cho phép toán hạng thêm %s với “-%c”" -#: src/split.c:186 -#, c-format -msgid "the suffix length needs to be at least %zu" +#: src/split.c:207 +#, fuzzy, c-format +msgid "the suffix length needs to be at least %" msgstr "chiều dài hậu tố tổi thiểu là %zu" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "Cách dùng: %s [TÙY_CHỌN]... [ĐẦU_VÀO [TIỀN_TỐ]]\n" -#: src/split.c:207 +#: src/split.c:228 +#, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\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" "đọc đầu vào tiêu chuẩn.\n" -#: src/split.c:215 -#, c-format +#: src/split.c:236 +#, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file names\n" " -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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" " -a, --suffix-length=N sử dụng các hậu tố với chiều dài N (mặc định %d)\n" @@ -9744,7 +9883,7 @@ msgstr "" " -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:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" @@ -9752,16 +9891,17 @@ msgstr "" " --verbose in thông tin chẩn đoán đúng trước\n" " khi mở mỗi tập tin kết xuất\n" -#: src/split.c:235 +#: src/split.c:258 +#, fuzzy 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" "\n" "CHUNKS có thể là:\n" @@ -9772,191 +9912,196 @@ msgstr "" "r/N tương tự “l” nhưng dùng phân phối round-robin\n" "r/K/N tương tự nhưng chỉ xuất xuất phần thứ K trên N ra stdout\n" -#: src/split.c:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "cạn các đuôi (hậu tố) kết xuất" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "đang tạo tập tin %s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "%s muốn ghi đè kết xuất; đang bỏ qua" -#: src/split.c:390 +#: src/split.c:444 #, c-format msgid "failed to set FILE environment variable" msgstr "Không đặt được biến môi trường FILE" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "thực thi với FILE=%s\n" -#: src/split.c:394 +#: src/split.c:448 #, c-format msgid "failed to create pipe" msgstr "không tạo được pipe" -#: src/split.c:408 +#: src/split.c:462 #, c-format msgid "closing prior pipe" msgstr "đóng pipe trước" -#: src/split.c:410 +#: src/split.c:464 #, c-format msgid "closing output pipe" msgstr "đóng pipe xuất ra" -#: src/split.c:414 +#: src/split.c:468 #, c-format msgid "moving input pipe" msgstr "di chuyển pipe đầu vào" -#: src/split.c:416 +#: src/split.c:470 #, c-format msgid "closing input pipe" msgstr "đóng pipe đầu vào" -#: src/split.c:421 +#: src/split.c:475 #, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "gặp lỗi khi chạy câu lệnh: “%s -c %s”" -#: src/split.c:427 +#: src/split.c:481 #, c-format msgid "failed to close input pipe" msgstr "không thể đóng pipe đầu vào" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "đợi tiến trình con" -#: src/split.c:473 +#: src/split.c:527 #, 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:481 +#: src/split.c:535 #, 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:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "trạng thái chưa được biết đến từ câu lệnh (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "không thể chia theo vài cách" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s: sai số gói" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s: sai số mảnh" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s: sai chiều dài hậu tố" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s: số byte sai" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s: số dòng sai" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "khoảng tab đa ký tự %s" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "tập tin đặc biệt ký tự đa phức hợp" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "tùy chọn số đếm dòng “-%s%c...” là quá lớn" -#: src/split.c:1298 +#: src/split.c:1395 #, c-format msgid "%s: invalid start value for numerical suffix" msgstr "%s: sai giá trị bắt đầu cho hậu tố dạng số" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s: cỡ khối IO không hợp lệ" -#: src/split.c:1347 +#: src/split.c:1437 #, 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:1384 +#: src/split.c:1477 #, 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:1419 +#: src/split.c:1528 #, c-format msgid "%s: cannot determine file size" msgstr "%s: không thể xác định cỡ tập tin" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "không thể chuẩn hóa %s" -#: src/stat.c:1129 +#: src/stat.c:1132 #, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "cảnh báo: không nhận ra dãy thoát “\\%c”" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s: sai chỉ thị" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "cảnh báo: định dạng kết thúc bằng gạch ngược" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" "sử dụng %s để đại diện đầu vào tiêu chuẩn cũng không hoạt động trong chế độ " "hệ thống tập tin" -#: src/stat.c:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "không đọc được thông tin hệ thống tập tin cho %s" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9972,7 +10117,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9982,31 +10127,31 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 msgid "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" msgstr "" "Truy cập: (%04a/%10.10A) Mã người dùng: (%5u/%8U) Mã nhóm: (%5g/%8G)\n" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "Ngữ cảnh: %C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -10018,11 +10163,11 @@ msgstr "" "Thay đổi: %z\n" "Ngày tạo: %w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "Hiển thị trạng thái của tập tin hay hệ thống tập tin.\n" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" @@ -10031,7 +10176,7 @@ msgstr "" " -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:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -10050,7 +10195,7 @@ msgstr "" "ĐỊNH_DẠNG.\n" " -t, --terse in ra thông tin dưới dạng ngắn\n" -#: src/stat.c:1433 +#: src/stat.c:1436 msgid "" "\n" "The valid format sequences for files (without --file-system):\n" @@ -10070,7 +10215,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:1442 +#: src/stat.c:1445 msgid "" " %d device number in decimal\n" " %D device number in hex\n" @@ -10086,7 +10231,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:1450 +#: src/stat.c:1453 msgid "" " %h number of hard links\n" " %i inode number\n" @@ -10110,7 +10255,7 @@ msgstr "" " %T kiểu thiết bị nhỏ theo dạng thập lục,\n" " cho các tập tin ký-tự/khối đặc biệt\n" -#: src/stat.c:1461 +#: src/stat.c:1464 msgid "" " %u user ID of owner\n" " %U user name of owner\n" @@ -10136,7 +10281,7 @@ msgstr "" " %Z thời gian thay đổi trạng thái cuối cùng, theo giây kể từ Epoch\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 msgid "" "Valid format sequences for file systems:\n" "\n" @@ -10154,7 +10299,7 @@ msgstr "" " %d số nút tập tin còn trống trong hệ thống tập tin\n" " %f số khối còn trống trong hệ thống tập tin\n" -#: src/stat.c:1484 +#: src/stat.c:1487 msgid "" " %i file system ID in hex\n" " %l maximum length of filenames\n" @@ -10231,11 +10376,11 @@ msgstr "" "với kích cỡ vùng đệm được đặt thành CHẾ_ĐỘ byte.\n" #: src/stdbuf.c:116 +#, fuzzy 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" +"for example) then that will override corresponding changes 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 "" @@ -10266,7 +10411,7 @@ msgstr "vô ích khi chuyển hoán đệm theo dòng đầu vào tiêu chuẩn" msgid "you must specify a buffering mode option" msgstr "bạn phải chỉ định tùy chọn chế độ đệm" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -10277,11 +10422,11 @@ msgstr "" " 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:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "Hiển thị hoặc thay đổi đặc tính thiết bị cuối.\n" -#: src/stty.c:528 +#: src/stty.c:536 msgid "" " -a, --all print all current settings in human-readable form\n" " -g, --save print all current settings in a stty-readable form\n" @@ -10291,7 +10436,7 @@ msgstr "" " -g, --save in mọi cài đặt hiện thời ở dạng stty có thể đọc\n" " -F, --file=THIẾT_BỊ mở và dùng THIẾT_BỊ thay cho đầu vào tiêu chuẩn\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -10302,11 +10447,24 @@ msgstr "" "Một “*” đánh dấu cài đặt không phải POSIX.\n" "Hệ thống nằm dưới định nghĩa các cài đặt có thể.\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -10317,9 +10475,13 @@ msgstr "" " eof KÝ_TỰ KÝ_TỰ sẽ gửi một kết thúc tập tin (dừng đầu vào)\n" " eol KÝ_TỰ KÝ_TỰ sẽ kết thúc dòng\n" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -10329,35 +10491,58 @@ msgstr "" " intr KÝ_TỰ KÝ_TỰ sẽ gửi một tín hiệu gián đoạn\n" " kill KÝ_TỰ KÝ_TỰ sẽ xóa dòng hiện thời\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\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" -#: src/stty.c:559 +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 shell khác\n" " * werase KÝ_TỰ KÝ_TỰ sẽ xóa từ đã gõ cuối cùng\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 +#, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"Cài đặt đặc biệt:\n" +" N đặt tốc độ đầu vào và kết xuất thành N baud\n" +" * cols N cho hạt nhân biết thiết bị cuối có N cột\n" +" * columns N giống như “cols N”\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -10367,10 +10552,17 @@ msgstr "" " * 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:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -10380,11 +10572,22 @@ msgstr "" " 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:578 +#: src/stty.c:632 +#, fuzzy 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" +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" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -10394,25 +10597,28 @@ msgstr "" " time N với “-icanon”, đặt thời gian chờ đọc\n" " thành N phần mười của một giây\n" -#: src/stty.c:584 +#: src/stty.c:641 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" -"Cài đặt điều khiển:\n" -" [-]clocal bỏ tín hiệu điều khiển bộ điều giải\n" -" [-]cread cho phép nhận dữ liệu vào\n" -" * [-]crtscts bật dùng tiến trình bắt tay RTS/CTS\n" -" * [-]cdtrdsr bật dùng tiến trình bắt tay DTR/DSR\n" -" csN đặt kích cỡ ký tự thành N bit, N nằm trong [5..8]\n" -#: src/stty.c:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 +#, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -10420,7 +10626,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb dùng hai bit dừng cho mỗi ký tự (một với “-”)\n" " [-]hup gửi tín hiệu treo khi tiến trình cuối cùng đóng tty\n" @@ -10430,7 +10635,12 @@ msgstr "" " [-]parodd đặt tính chẵn lẻ kiểu là lẻ (hoặc đặt “-” thì chẵn)\n" " * [-]cmspar dùng \"stick\" chẵn lẻ (mark/space)\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -10438,6 +10648,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "Cài đặt đầu vào:\n" @@ -10446,10 +10657,14 @@ msgstr "" " [-]ignbrk bỏ qua ký tự ngắt\n" " [-]igncr bỏ qua return\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -10461,14 +10676,23 @@ msgstr "" " [-]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ự đầu vào\n" -#: src/stty.c:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8 coi như các ký tự đưa vào được mã hóa UTF-8\n" -#: src/stty.c:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr " * [-]iutf8 coi như các ký tự đưa vào được mã hóa UTF-8\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -10482,60 +10706,83 @@ msgstr "" " [-]parmrk đánh dấu lỗi tính chẵn lẻ (với một dãy 255-0 ký tự)\n" " [-]tandem giống như “[-]ixoff”\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"Cài đặt đầu ra:\n" -" * bsN kiểu trì hoãn của xóa lùi, N nằm trong [0..1]\n" -" * crN kiểu trì hoãn của return, N nằm trong [0..3]\n" -" * ffN kiểu trì hoãn của thụt dòng, N nằm trong [0..1]\n" -" * nlN kiểu trì hoãn của dòng mới, N nằm trong [0..1]\n" -#: src/stty.c:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" -" * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" -msgstr "" -" * [-]ocrnl chuyển return thành dòng mới\n" -" * [-]ofdel dùng các ký tự xóa để làm đầy thay cho các ký tự NUL\n" -" * [-]ofill dùng các ký tự làm đầy (độn thêm) thay cho thời gian trì " -"hoãn\n" -" * [-]olcuc chuyển ký tự viết thường thành viết HOA\n" -" * [-]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:643 -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 "" -" * [-]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:651 +#: src/stty.c:747 +msgid "" +" * [-]ofill use fill (padding) characters instead of timing for delays\n" +msgstr "" + +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 +msgid "" +" * tabN horizontal tab delay style, N in [0..3]\n" +" * tabs same as tab0\n" +" * -tabs same as tab3\n" +msgstr "" + +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10545,42 +10792,60 @@ msgstr "" " * crtkill diệt toàn dòng theo cài đặt echoprt và echoe\n" " * -crtkill diệt toàn dòng theo cài đặt echoctl và echok\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +#, fuzzy +msgid " [-]echo echo input characters\n" +msgstr " * [-]iutf8 coi như các ký tự đưa vào được mã hóa UTF-8\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]ctlecho đưa ra ký tự control ở dạng mũ (“^c”)\n" -" [-]echo đưa ra ký tự đầu vào\n" -" * [-]echoctl giống như “[-]ctlecho”\n" -" [-]echoe giống như “[-]crterase”\n" -" [-]echok đưa ra một dòng mới sau một ký tự diệt\n" -#: src/stty.c:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, fuzzy, c-format +msgid "" +" [-]icanon enable special characters: %s\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" +" [-]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:672 +#: src/stty.c:843 +#, fuzzy 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 "" " [-]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" @@ -10588,11 +10853,33 @@ msgstr "" " * [-]tostop dừng các công việc nền mà thử ghi vào thiết bị cuối\n" " * [-]xcase với “icanon”, thoát với “\\” cho các ký tự viết hoa\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -10602,12 +10889,12 @@ msgstr "" " cbreak giống như “-icanon”\n" " -cbreak giống như “icanon”\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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" @@ -10615,28 +10902,38 @@ msgstr "" " -cooked giống như “raw”\n" " crt giống như “echoe echoctl echoke”\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\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" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 +#, fuzzy 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 "" " -evenp giống như “-parenb cs8”\n" " * [-]lcase giống như “xcase iuclc olcuc”\n" @@ -10645,7 +10942,19 @@ msgstr "" " nl giống như “-icrnl -onlcr”\n" " -nl giống như “icrnl -inlcr -igncr onlcr -ocrnl -onlret”\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" +"\n" +"Cài đặt tổ hợp:\n" +" * [-]LCASE giống như “[-]lcase”\n" +" cbreak giống như “-icanon”\n" +" -cbreak giống như “icanon”\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10659,11 +10968,12 @@ msgstr "" " pass8 giống như “-parenb -istrip cs8”\n" " -pass8 giống như “parenb istrip cs7”\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw giống như\n" @@ -10672,14 +10982,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0”\n" " -raw giống như “cooked”\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane giống như:\n" " “cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" @@ -10689,7 +11000,7 @@ msgstr "" " -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:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10704,12 +11015,12 @@ msgstr "" "Trong cài đặt KÝ_TỰ là các chữ cái hoặc mã hoá như ^c, 0x37, 0177 hoặc 127,\n" "giá trị đặc biệt “^-” hoặc “undef” dùng để tắt bỏ các ký tự đặc biệt.\n" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "chỉ có thể đưa ra một thiết bị" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" @@ -10718,45 +11029,50 @@ 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:836 +#: src/stty.c:1160 #, 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:851 +#: src/stty.c:1175 #, 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:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "đối số sai %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "thiếu đối số cho %s" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s: lỗi cắt ngắn" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "sai kỷ luật của dòng %s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, 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:1403 +#: src/stty.c:1747 #, 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:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "sai đối số kiểu số nguyên %s" #. This is a proper name. See the gettext manual, section Names. @@ -10765,8 +11081,15 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"In ra tổng kiểm tra CRC và số byte của mỗi TẬP_TIN.\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -10777,20 +11100,54 @@ msgstr "" " -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 +#: src/sync.c:64 +#, fuzzy, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... [TẬP_TIN]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"Bắt buộc ghi vào đĩa các khối đã thay đổi, cập nhật siêu khối.\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "lỗi đọc %s" + +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s: không đặt lại được chế độ non-blocking (không chặn)" -#: src/sync.c:69 +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "lỗi đọc %s" + +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "đang bỏ qua mọi đối số" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10804,15 +11161,24 @@ msgstr "" "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:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help hiển thị trợ giúp này rồi thoát\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version đưa ra thông tin phiên bản rồi thoát\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\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/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -10821,7 +11187,7 @@ msgstr "" "Mọi đối số bắt buộc phải có khi dùng tùy chọn dài thì tùy chọn ngắn cũng " "vậy.\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10833,7 +11199,7 @@ msgstr "" "Các đơn vị là K, M, G, T, P, E, Z, Y (số mũ của 1024) hay KB, MB, ... (số mũ " "của 1000).\n" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10846,7 +11212,7 @@ msgstr "" "và các biến đổi môi trường %s_BLOCK_SIZE, BLOCK_SIZE và BLOCKSIZE.\n" "Không thì đơn vị mặc định là 1024 byte (hoặc 512 nếu đặt POSIXLY_CORRECT).\n" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -10859,25 +11225,29 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" "Hãy thông báo lỗi dịch “%s” cho \n" -#: src/system.h:584 +#: src/system.h:604 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "Full documentation at: <%s%s>\n" msgstr "" -"Để xem tài liệu hướng dẫn đầy đủ, hãy đọc: info coreutils \"%s invocation\"\n" -#: src/system.h:591 +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "" + +#: src/system.h:613 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "Hãy thử lệnh “%s --help” (trợ giúp) để biết thêm thông tin.\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10898,9 +11268,8 @@ msgid "Jay Lepreau" msgstr "Jay Lepreau" #: 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" +#, fuzzy +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "Ghi mỗi TẬP_TIN ra đầu ra tiêu chuẩn, dòng cuối cùng được hiển thị đầu " "tiên.\n" @@ -10917,64 +11286,63 @@ msgstr "" "quy\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:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s: di chuyển vị trí để đọc gặp lỗi" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "mục ghi quá lớn" -#: src/tac.c:450 +#: src/tac.c:459 #, c-format msgid "failed to create temporary file in %s" msgstr "gặp lỗi khi tạo tập tin tạm trong %s" -#: src/tac.c:458 +#: src/tac.c:467 #, c-format msgid "failed to open %s for writing" msgstr "mở %s để ghi gặp lỗi" -#: src/tac.c:475 +#: src/tac.c:484 #, 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:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s: lỗi ghi nhớ" -#: src/tac.c:571 +#: src/tac.c:587 #, c-format msgid "failed to open %s for reading" msgstr "mở %s để đọc gặp lỗi" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" 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 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 -#, c-format +#: src/tail.c:257 +#, 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" 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à -, thì đọc đầu vào tiêu chuẩn.\n" "\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" @@ -10983,7 +11351,7 @@ msgstr "" " các byte bắt đầu với byte thứ K của từng tập " "tin\n" -#: src/tail.c:274 +#: src/tail.c:269 msgid "" " -f, --follow[={name|descriptor}]\n" " output appended data as the file grows;\n" @@ -10996,7 +11364,7 @@ msgstr "" " nếu vắng mặt đối số nghĩa là “descriptor”\n" " -F giống như “--follow=tên --retry”\n" -#: src/tail.c:280 +#: src/tail.c:275 #, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -11022,7 +11390,7 @@ msgstr "" " quay vòng). Khi đã có inotify, chức năng này trở\n" " nên ít hữu dụng.\n" -#: src/tail.c:293 +#: src/tail.c:288 msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" " -q, --quiet, --silent never output headers giving file names\n" @@ -11032,7 +11400,7 @@ msgstr "" " -q, --quiet, --silent không bao giờ xuất phần đầu chỉ ra tên tập tin\n" " --retry cố thử mở tập tin ngay cả khi không thể truy cập\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -11047,7 +11415,7 @@ msgstr "" " í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:307 +#: src/tail.c:302 msgid "" "\n" "If the first character of K (the number of bytes or lines) is a '+',\n" @@ -11066,7 +11434,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:316 +#: src/tail.c:311 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" @@ -11085,22 +11453,22 @@ msgstr "" "Nó khiến tail theo dõi tập tin có tên đưa ra\n" "bằng một cách làm cho thích nghi việc thay tên, gỡ bỏ và tạo.\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "đang đóng %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s: không thể di chuyển vị trí đọc tới offset đối với cuối %s" -#: src/tail.c:898 +#: src/tail.c:893 #, 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:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " @@ -11109,149 +11477,149 @@ msgstr "" "không nhận ra hệ thống tập tin kiểu 0x%08lx cho %s. xin hãy báo cáo điều này " "cho %s. trở lại để polling" -#: src/tail.c:965 +#: src/tail.c:958 #, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "%s bị thay thế bằng một liên kết mềm nên chịu thua tên này" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s đã trở thành không thể truy cập" -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "%s bị thay thế bởi tập tin không thể tail nên đầu hàng với tên này" -#: src/tail.c:1006 +#: src/tail.c:999 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "%s bị thay thế bằng một tập tin từ xa thì chịu thua về tên này" -#: src/tail.c:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s đã trở thành có thể truy cập" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s đã xuất hiện; đi theo cuối của tập tin mới" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s bị thay thế; đi theo cuối của tập tin mới" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s: không thay đổi được chế độ không chặn" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s: tập tin đã bị cắt ngắn" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "không còn tập tin nào" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "không thể theo dõi thư mục mẹ của %s" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "Dùng hết tài nguyên inotify" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "không thể theo dõi %s" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s: thay thế %s không? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "gặp lỗi khi theo dõi sự kiện inotify" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "gặp lỗi khi đọc sự kiện inotify" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "%s: không thể đi theo cuối của kiểu tập tin này; đầu hàng với tên này" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "%s chứa một con số quá lớn" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "%s: sai số trạng thái không thay đổi tối đa giữa các lần mở" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s: sai PID" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s: sai số giây" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "sai số cột: %s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "tùy chọn dùng theo ngữ cảnh sai -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "cảnh báo: “--retry” bị bỏ qua; “--retry” chỉ có ích khi theo sau" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "cảnh báo: --retry chỉ có tác động đến việc mở khởi tạo" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "cảnh báo: PID bị bỏ qua; “--pid=PID” chỉ có ích khi theo sau" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "cảnh báo: không hỗ trợ “--pid=PID” trên hệ thống này" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "không thể theo sau %s theo tên" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" "cảnh báo: không hiệu quả khi theo sau đầu vào tiêu chuẩn một cách không giới " "hạn" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "inotify không dùng được thì phục hồi việc trưng cầu" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -11264,60 +11632,72 @@ msgstr "" " -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 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"Nếu TẬP_TIN là “-”, sao chép trở lại đầu ra tiêu chuẩn.\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "thiếu đối số ở sau %s" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "sai số nguyên %s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "cần “)”" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "cần “)”, tìm thấy %s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: cần toán tử một ngôi" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt không chấp nhận -l" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef không chấp nhận -l" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot không chấp nhận -l" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "toán tử hai ngôi lạ" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: cần toán tử hai ngôi" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -11331,7 +11711,7 @@ msgstr "" " hoặc: [ ]\n" " hoặc: [ TÙY_CHỌN\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -11339,7 +11719,7 @@ msgstr "" "Thoát với trạng thái xác định bởi BIỂU_THỨC.\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -11350,7 +11730,7 @@ msgstr "" "Không thì BIỂU_THỨC là đúng (true) hoặc sai (false)\n" "và đặt giá trị thoát. Nó là một trong số:\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -11365,7 +11745,7 @@ msgstr "" "(true)\n" " BIỂU_THỨC1 -o BIỂU_THỨC2 BIỂU_THỨC1 hoặc BIỂU_THỨC2 là đúng (true)\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -11381,7 +11761,7 @@ msgstr "" " CHUỖI1 = CHUỖI2 các chuỗi bằng nhau\n" " CHUỖI1 != CHUỖI2 các chuỗi khác nhau\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -11399,7 +11779,7 @@ msgstr "" " 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 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -11411,7 +11791,7 @@ msgstr "" " 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 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -11425,7 +11805,7 @@ msgstr "" " -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 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -11439,7 +11819,7 @@ msgstr "" " -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 +#: src/test.c:768 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" @@ -11453,7 +11833,7 @@ msgstr "" " -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 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -11467,7 +11847,7 @@ msgstr "" " -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 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -11481,7 +11861,7 @@ msgstr "" "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 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -11492,25 +11872,25 @@ msgstr "" "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 +#: src/test.c:793 msgid "test and/or [" msgstr "thử và/hoặc “[”" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "thiếu “]”" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "tham số thêm %s" @@ -11530,7 +11910,7 @@ msgstr "cảnh báo: timer_settime" msgid "warning: timer_create" msgstr "cảnh báo: timer_create" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -11539,11 +11919,11 @@ msgstr "" "Cách dùng: %s [TÙY_CHỌN] THỜI_LƯỢNG LỆNH [Đ.SỐ]...]\n" " or: %s [TÙY_CHỌN]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 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" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -11578,7 +11958,7 @@ msgstr "" " hoặc một con số.\n" " Xem “kill -l” để thấy một danh sách các tín hiệu.\n" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -11589,7 +11969,7 @@ msgstr "" "DURATION là một số thực chấm động với hậu số tùy chọn:\n" "“s” cho giây (mặc định), “m” cho phút, “h” cho giờ và “d” cho ngày.\n" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -11607,7 +11987,7 @@ msgstr "" "Nó là cần thiết để sử dụng tín hiệu KILL (9) vì không thể bắt tín hiệu đó,\n" "trong trường hợp đó trạng thái thoát sẽ là 128+9 thay vì 124.\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "cảnh báo: tắt core dump gặp lỗi" @@ -11622,6 +12002,11 @@ msgstr "gặp lỗi khi đợi câu lệnh" msgid "the monitored command dumped core" msgstr "lệnh theo dõi đã đổ lõi" +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "trạng thái chưa được biết đến từ câu lệnh (0x%X)" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -11998,12 +12383,12 @@ msgstr "Thoát với mã trạng thái thành công." msgid "Exit with a status code indicating failure." msgstr "Thoát với mã trạng thái thất bại." -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "Cách dùng: %s TÙY_CHỌN... TẬP_TIN...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -12021,17 +12406,17 @@ msgstr "" "Nếu TẬP_TIN nhỏ hơn thì nó được mở rộng\n" "và phần mở rộng (lỗ) được điền đầy bằng số không\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create không tạo tập tin nào\n" -#: src/truncate.c:112 +#: src/truncate.c:85 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ố khối VR thay cho các byte\n" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" @@ -12039,7 +12424,7 @@ msgstr "" " -r, --reference=TẬP-TIN-TC dựa trên cỡ của tập tin dùng để tham chiếu\n" " -s, --size=CỠ đặt hoặc điều chỉnh cỡ tập tin theo CỠ này\n" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -12051,57 +12436,62 @@ msgstr "" "”+” tăng theo, “-” giảm theo, “<” nhiều nhất, “>” ít nhất\n" "”/” làm tròn xuống bội số cho, “ %” làm tròn lên bội số cho\n" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "tràn các khối byte % * % cho tập tin %s" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s vô ích, kích cỡ có vẻ là âm" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "không lấy được cỡ của %s" -#: src/truncate.c:205 +#: src/truncate.c:178 #, 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" -#: src/truncate.c:215 +#: src/truncate.c:188 #, 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" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "không cắt được %s ở byte thứ %" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "đã chỉ ra nhiều ký tự sửa đổi tương ứng" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "số không hợp lệ %s" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "bạn phải chỉ định %s hoặc %s" -#: src/truncate.c:340 +#: src/truncate.c:314 #, 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:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "%s đưa ra còn %s không phải" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "không mở được %s để ghi" @@ -12112,12 +12502,10 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "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" @@ -12125,12 +12513,17 @@ msgstr "" "Khi không có TẬP_TIN, hoặc khi TẬP_TIN là “-”, đọc đầu vào tiêu chuẩn.\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s: dữ liệu vào chứa một số lẻ các hiệu bài" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s: dữ liệu vào chứa một vòng lặp:" @@ -12195,9 +12588,8 @@ msgid "cannot get system name" msgstr "không lấy được tên hệ thống" #: 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" +#, fuzzy +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "Chuyển khoảng trắng trong mỗi TẬP_TIN thành tab, ghi ra đầu ra tiêu chuẩn.\n" "Khi không có TẬP_TIN hoặc khi TẬP_TIN là \"-\", thì đọc từ đầu vào tiêu " @@ -12256,9 +12648,10 @@ msgstr "" " -d, --repeated chỉ in những dòng lặp lại, một lần cho mỗi nhóm\n" #: src/uniq.c:187 +#, fuzzy msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" " -D, --all-repeated[=phương_pháp_định_giới]\n" @@ -12274,9 +12667,10 @@ msgid " -f, --skip-fields=N avoid comparing the first N fields\n" msgstr " -f, --skip-fields=N không so sánh N trường đầu tiên\n" #: src/uniq.c:195 +#, fuzzy msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" " --group[=PHƯƠNG THỨC] hiện mọi mục, ngăn cách nhóm bằng dòng trống\n" @@ -12435,11 +12829,6 @@ msgstr "" " Các tiến trình đang ngủ\n" "không gián đoạn được thì cũng được tính trong trọng tải trung bình.\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -12462,12 +12851,17 @@ msgstr "" "%s là TẬP_TIN chung.\n" "\n" -#: src/wc.c:117 +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -12486,12 +12880,13 @@ msgstr "" " -m, --chars in số đếm ký tự\n" " -l, --lines in số đếm dòng mới\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\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" @@ -12657,10 +13052,10 @@ msgstr "" "Giống như “id -un”.\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s: không tìm thấy tên cho ID người dùng %lu\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "không tìm thấy tên cho ID %s" #: src/yes.c:41 #, c-format @@ -12679,6 +13074,223 @@ msgstr "" "In lặp lại một dòng với tất cả CHUỖI chỉ ra, hoặc “y”.\n" "\n" +#~ msgid "input line is too short, no numbers found to convert in field %ld" +#~ msgstr "" +#~ "dòng đầu vào quá ngắn, không tìm thấy con số nào để chuyển đổi trong " +#~ "trường %ld" + +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\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" + +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "Không chỉ ra TẬP_TIN, hoặc khi TẬP_TIN là “-”, thì đọc từ đầu vào tiêu " +#~ "chuẩn. Mặc định là “-F /”.\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "Bắt buộc ghi vào đĩa các khối đã thay đổi, cập nhật siêu khối.\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "đang bỏ qua mọi đối số" + +#~ msgid "%s: invalid number" +#~ msgstr "%s: số sai" + +#~ 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" + +#~ msgid "number of lines" +#~ msgstr "số dòng" + +#~ msgid "number of bytes" +#~ msgstr "số byte" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s: con số không hợp lệ cần bỏ qua" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s: số byte sai" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s: số dòng sai" + +#~ msgid "number in %s is too large" +#~ msgstr "%s chứa một con số quá lớn" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s: sai số giây" + +#~ msgid "failed to %s supplemental groups" +#~ msgstr "gặp lỗi khi %s (các) nhóm phụ" + +#~ 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 "" +#~ "\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" +#~ " đọc vào 18335302+0\n" +#~ " ghi ra 18335302+0\n" +#~ " đã sao chép 9387674624 byte (9.4 GB), 34.6279 giây, 271 MB/giây\n" +#~ "\n" +#~ "Tùy chọn:\n" +#~ "\n" + +#~ 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" + +#~ 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" +#~ "Cài đặt điều khiển:\n" +#~ " [-]clocal bỏ tín hiệu điều khiển bộ điều giải\n" +#~ " [-]cread cho phép nhận dữ liệu vào\n" +#~ " * [-]crtscts bật dùng tiến trình bắt tay RTS/CTS\n" +#~ " * [-]cdtrdsr bật dùng tiến trình bắt tay DTR/DSR\n" +#~ " csN đặt kích cỡ ký tự thành N bit, N nằm trong [5..8]\n" + +#~ 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 "" +#~ "\n" +#~ "Cài đặt đầu ra:\n" +#~ " * bsN kiểu trì hoãn của xóa lùi, N nằm trong [0..1]\n" +#~ " * crN kiểu trì hoãn của return, N nằm trong [0..3]\n" +#~ " * ffN kiểu trì hoãn của thụt dòng, N nằm trong [0..1]\n" +#~ " * nlN kiểu trì hoãn của dòng mới, N nằm trong [0..1]\n" + +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl chuyển return thành dòng mới\n" +#~ " * [-]ofdel dùng các ký tự xóa để làm đầy thay cho các ký tự NUL\n" +#~ " * [-]ofill dùng các ký tự làm đầy (độn thêm) thay cho thời gian trì " +#~ "hoãn\n" +#~ " * [-]olcuc chuyển ký tự viết thường thành viết HOA\n" +#~ " * [-]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" + +#~ 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 "" +#~ " * [-]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" + +#~ 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 "" +#~ " * [-]ctlecho đưa ra ký tự control ở dạng mũ (“^c”)\n" +#~ " [-]echo đưa ra ký tự đầu vào\n" +#~ " * [-]echoctl giống như “[-]ctlecho”\n" +#~ " [-]echoe giống như “[-]crterase”\n" +#~ " [-]echok đưa ra một dòng mới sau một ký tự diệt\n" + +#~ 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 "" +#~ " * [-]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" + +#~ 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 "" +#~ " 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" + +#~ msgid "For complete documentation, run: info coreutils '%s invocation'\n" +#~ msgstr "" +#~ "Để xem tài liệu hướng dẫn đầy đủ, hãy đọc: info coreutils \"%s invocation" +#~ "\"\n" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: không tìm thấy tên cho ID người dùng %lu\n" + #~ msgid "cannot create pipe" #~ msgstr "không thể tạo ống dẫn" @@ -13181,20 +13793,6 @@ msgstr "" #~ " -v, --verbose đưa ra thông tin chuẩn đoán cho mọi tập tin được " #~ "xử lý\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 "" -#~ "Hiển thị thời gian hiện thời trong ĐỊNH_DẠNG đưa ra, hoặc đặt ngày của hệ " -#~ "thống.\n" -#~ "\n" -#~ " -d, --date=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 " -#~ "TẬP_TIN_NGÀY\n" - #~ msgid "" #~ "\n" #~ "SIZE may be (or may be an integer optionally followed by) one of " diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index e29fcf02..1bc4f3c4 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 998157b7..9c71a9b9 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,14 +6,15 @@ # Anthony Fok , 2002. # Funda Wang , 2004, 2005. # Ji ZhengYu , 2009. -# Aron Xu , 2009, 2010, 2011. +# Aron Xu , 2009, 2010, 2011, 2015. # +#: src/stty.c:941 msgid "" msgstr "" -"Project-Id-Version: coreutils 8.11-pre1\n" +"Project-Id-Version: coreutils 8.23-pre1\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" -"PO-Revision-Date: 2011-03-28 00:26+0800\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" +"PO-Revision-Date: 2015-02-20 23:59+0800\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" @@ -40,18 +41,18 @@ msgstr "有效的参数为：" msgid "error closing file" msgstr "关闭文件时出错" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "写入错误" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, c-format msgid "preserving permissions for %s" msgstr "%s 的保留权限" @@ -113,19 +114,16 @@ msgid "door" msgstr "" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "块特殊文件" +msgstr "复用块特殊文件" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "字符特殊文件" +msgstr "复用字符特殊文件" #: lib/file-type.c:87 -#, fuzzy msgid "multiplexed file" -msgstr "多角色" +msgstr "复用文件" #: lib/file-type.c:90 #, fuzzy @@ -133,9 +131,8 @@ msgid "named file" msgstr "古怪文件" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "块特殊文件" +msgstr "网络特殊文件" #: lib/file-type.c:96 msgid "migrated file with data" @@ -147,7 +144,7 @@ msgstr "" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "端口" #: lib/file-type.c:105 msgid "socket" @@ -237,57 +234,62 @@ msgstr "参数字符串编码不正确" msgid "Unknown error" msgstr "未知错误" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s：选项\"%s\"歧义\n" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s：选项\"-W %s\"歧义\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s：选项\"--%s\"不允许带参数\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s：选项\"%c%s\"不允许带参数\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s：选项\"--%s\"必需带参数\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s：无法识别的选项\"--%s\"\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s：无法识别的选项\"%c%s\"\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s：无效选项 -- %c\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s：选项必需带参数 -- \"%c\"\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s：选项\"-W %s\"歧义\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s：选项\"-W %s\"不允许带参数\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s：选项\"-W %s\"必需带参数\n" @@ -297,13 +299,13 @@ msgstr "%s：选项\"-W %s\"必需带参数\n" msgid "cannot change permissions of %s" msgstr "无法更改%s 的权限" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "无法创建目录%s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "内存耗尽" @@ -352,6 +354,12 @@ msgstr "\"" msgid "%s: end of file" msgstr "%s：文件结束" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s：读取出错" + #: lib/regcomp.c:131 msgid "Success" msgstr "成功" @@ -459,7 +467,7 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "设置%s 的权限" @@ -864,17 +872,17 @@ msgid "cannot perform formatted output" msgstr "不能执行格式化输出" #: lib/xstrtol-error.c:63 -#, fuzzy, c-format +#, c-format msgid "invalid %s%s argument '%s'" msgstr "非法的%s%s 参数\"%s\"" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format +#, c-format msgid "invalid suffix in %s%s argument '%s'" msgstr "非法的后缀在%s%s 参数\"%s\"" #: lib/xstrtol-error.c:72 -#, fuzzy, c-format +#, c-format msgid "%s%s argument '%s' too large" msgstr "%s%s 参数\"%s\"太大" @@ -893,7 +901,7 @@ msgstr "" "使用 Base64 编码/解码文件或标准输入输出。\n" "\n" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -907,15 +915,7 @@ msgstr "" " -w, --wrap=字符数\t在指定的字符数后自动换行(默认为76)，0 为禁用自动换行\n" "\n" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"如果没有指定文件，或者文件为\"-\"，则从标准输入读取。\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -928,57 +928,57 @@ msgstr "" "包含一些非有效 Base64 字符的新行字符。可以尝试用 --ignore-garbage 选项来恢复" "加密流中任何非 base64 字符。\n" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "读取错误" -#: src/base64.c:231 +#: src/base64.c:229 #, c-format msgid "invalid input" msgstr "输入无效" -#: src/base64.c:268 +#: src/base64.c:266 #, c-format msgid "invalid wrap size: %s" msgstr "无效的换行字符数：%s" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "额外的操作数 %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, 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:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: 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" @@ -1015,38 +1015,45 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "缺少操作数" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 msgid "Richard M. Stallman" msgstr "Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "用法：%s [选项]... [文件]...\n" #: src/cat.c:92 +#, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"串联排序所有指定文件并将结果写到标准输出。\n" +"\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1064,7 +1071,7 @@ msgstr "" " -n, --number 对输出的所有行编号\n" " -s, --squeeze-blank 不输出多行空行\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1076,7 +1083,7 @@ msgstr "" " -u (被忽略)\n" " -v, --show-nonprinting 使用^ 和M- 引用，除了LFD和 TAB 之外\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1089,17 +1096,18 @@ msgstr "" " %s f - g 先输出f 的内容，然后输出标准输入的内容，最后输出g 的内容。\n" " %s 将标准输入的内容复制到标准输出。\n" -#: src/cat.c:326 +#: src/cat.c:327 #, c-format msgid "cannot do ioctl on %s" msgstr "无法在 %s 上执行 ioctrl" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "标准输出" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s：输入文件是输出文件" @@ -1111,10 +1119,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "Jim Meyering" @@ -1128,8 +1136,8 @@ msgstr "创建安全环境失败：%s" msgid "failed to set %s security context component to %s" msgstr "设置%s 安全环境组件到%s 失败" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, c-format msgid "failed to get security context of %s" msgstr "无法取得%s 的安全环境" @@ -1144,13 +1152,13 @@ msgstr "部分关联无法应用于文件%s" msgid "failed to change context of %s to %s" msgstr "改变%s 的环境到%s 失败" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "无法访问%s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "无法读取目录%s" @@ -1166,7 +1174,7 @@ msgstr "正在更改%s 的安全环境\n" msgid "fts_read failed" msgstr "fts_read 失败" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, c-format msgid "fts_close failed" @@ -1279,7 +1287,7 @@ msgid "-R -h requires -P" msgstr "-R -h 需要-P" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1296,9 +1304,8 @@ msgid "conflicting security context specifiers given" msgstr "给出的安全环境说明冲突" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "无法取得%s 的属性" @@ -1594,17 +1601,17 @@ msgstr "" msgid "Roland McGrath" msgstr "Roland McGrath" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "无效的组%s" -#: src/chroot.c:150 +#: src/chroot.c:152 #, c-format msgid "invalid group list %s" msgstr "无效的组列表%s" -#: src/chroot.c:186 +#: src/chroot.c:185 #, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1613,7 +1620,7 @@ msgstr "" "用法：%s [选项] 新根 [命令 [参数]...]\n" "　或：%s 选项\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1621,15 +1628,26 @@ msgstr "" "以指定的新根为运行指定命令时的的根目录。\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +#, fuzzy +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" +" --userspec=用户:组 指定所用的用户及用户组(可使用\"数字\"或\"名字\")\n" +" --groups=组列表 指定可供选择的用户组列表，形如组1，组2，组3...\n" + +#: src/chroot.c:198 +#, fuzzy +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" " --userspec=用户:组 指定所用的用户及用户组(可使用\"数字\"或\"名字\")\n" " --groups=组列表 指定可供选择的用户组列表，形如组1，组2，组3...\n" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 #, fuzzy msgid "" "\n" @@ -1638,42 +1656,47 @@ msgstr "" "\n" "如果没有指定命令，则运行\"${SHELL} -i\" (默认：/bin/sh)。\n" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "无法进入目录%s" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "无法切换到根目录" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" -msgstr "" +msgstr "没有为未知 UID 指定组：%d" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "设置附加组失败" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" +msgid "failed to set supplemental groups" msgstr "设置附加组失败" -#: src/chroot.c:402 +#: src/chroot.c:418 #, c-format msgid "failed to set group-ID" msgstr "设置组ID 失败" -#: src/chroot.c:405 +#: src/chroot.c:421 #, c-format msgid "failed to set user-ID" msgstr "设置用户ID 失败" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, c-format msgid "failed to run command %s" msgstr "无法运行命令%s" @@ -1714,7 +1737,16 @@ msgstr "用法：%s [选项]... 文件1 文件2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "逐行比较已排序的文件文件1 和文件2。\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"如果没有指定文件，或者文件为\"-\"，则从标准输入读取。\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1725,7 +1757,7 @@ msgstr "" "如果不附带选项，程序会生成三列输出。第一列包含文件1 特有的行，第二列包含 文件" "2 特有的行，而第三列包含两个文件共有的行。\n" -#: src/comm.c:116 +#: src/comm.c:120 msgid "" "\n" " -1 suppress column 1 (lines unique to FILE1)\n" @@ -1737,7 +1769,7 @@ msgstr "" " -2\t\t不输出文件2 特有的行\n" " -3\t\t不输出两个文件共有的行\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1748,11 +1780,11 @@ msgstr "" " --check-order\t\t\t检查输入是否被正确排序，即使所有输入行均成对\n" " --nocheck-order\t\t不检查输入是否被正确排序\n" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr " --output-delimiter=STR\t依照STR 分列\n" -#: src/comm.c:133 +#: src/comm.c:137 #, fuzzy msgid "" "\n" @@ -1761,7 +1793,7 @@ msgstr "" "\n" "注意，比较操作遵从\"LC_CPLLATE\"所定义的规则。\n" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1774,309 +1806,323 @@ msgstr "" " %s -12 文件1 文件2 只打印在文件1 和文件2 中都有的行\n" " %s -3 文件1 文件2 打印在文件1 中有，而文件2 中没有的行。反之亦然。\n" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "文件%d 没有被正确排序" -#: src/comm.c:407 +#: src/comm.c:411 #, c-format msgid "multiple delimiters specified" msgstr "已定义多重分隔符" -#: src/comm.c:411 +#: src/comm.c:415 #, c-format msgid "empty %s not allowed" msgstr "不允许空的%s" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "无法lseek %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "读取%s 时出错" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "无法lseek %s" +msgid "error reading %s" +msgstr "读取%s 时出错" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "写入%s 出错" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "读取%s 时出错" + +#: src/copy.c:419 #, c-format msgid "%s: failed to get extents info" msgstr "%s：无法获得 extent 信息" -#: src/copy.c:383 +#: src/copy.c:478 #, c-format msgid "%s: write failed" msgstr "%s：写入失败" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, c-format msgid "failed to extend %s" msgstr "扩展%s 失败" -#: src/copy.c:687 +#: src/copy.c:789 #, c-format msgid "clearing permissions for %s" msgstr "清除%s 的权限" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "无法保留%s 的所有者" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "查阅文件%s 失败" -#: src/copy.c:753 +#: src/copy.c:855 #, c-format msgid "failed to preserve authorship for %s" msgstr "保留%s 的作者失败" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, c-format msgid "failed to set default file creation context to %s" msgstr "无法取得%s 的创建环境" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "无法取得%s 的创建环境" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "设置%s 的安全环境为%s 失败" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "无法打开%s 读取数据" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "无法获取%s 的文件状态(fstat)" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "跳过文件%s，因为在准备复制时它已被其它文件取代" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "无法删除%s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "已删除%s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "无法通过符号链接%s 进行操作" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "无法创建普通文件%s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" msgstr "克隆%s 失败" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "正在保留 %s 的时间" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "克隆%s 失败" -#: src/copy.c:1580 +#: src/copy.c:1669 #, fuzzy, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " -msgstr "%s：是否覆盖%s，而不理会权限模式%04lo (%s)？ " +msgstr "%s：是否覆盖%s，而不理会权限%04lo (%s)？ " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " -msgstr "" +msgstr "%s：%s 不可写(权限%04lo，%s)；依然尝试？ " -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s：是否覆盖%s？ " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (备份：%s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "恢复默认文件创建环境失败" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "无法创建指向%2$s 的硬链接%1$s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "无法获取%s 的文件状态(stat)" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "略过目录%s" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "警告：指定来源文件%s 多于一次" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s 与%s 为同一文件" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "无法以目录%2$s 来覆盖非目录%1$s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "不会以%2$s 覆盖刚创建的%1$s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "无法以非目录来覆盖目录%s" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "无法将目录移动至非目录：%s -> %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "备份%s 会破坏源文件；未移动%s" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "备份%s 会破坏源文件；未复制%s" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "无法备份%s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, c-format msgid "will not copy %s through just-created symlink %s" msgstr "不会以%s 覆盖刚创建的%s" -#: src/copy.c:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "无法将目录%s 复制到自己%s" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "警告：指定来源文件%s 多于一次" + +#: src/copy.c:2294 #, c-format msgid "will not create hard link %s to directory %s" msgstr "不会创建指向目录%2$s 的硬链接%1$s" -#: src/copy.c:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "无法将目录%s 移动至自身的子目录%s 下" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "无法将%s 移动至%s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "无法进行跨设备的移动：%s 至%s；无法删除目标" -#: src/copy.c:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "无法复制循环的符号链接%s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s：只能于当前目录中创建相对的符号链接" -#: src/copy.c:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "无法创建指向%2$s 的符号链接%1$s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "无法创建先进先出文件%s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "无法创建特殊文件%s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "无法读取符号链接%s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "无法创建符号链接%s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s 的文件类型不详" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "无法将%s 的备份还原" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (还原备份)\n" @@ -2086,25 +2132,25 @@ msgstr "%s -> %s (还原备份)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, fuzzy, c-format msgid "unknown program %s" msgstr "未知流" @@ -2354,8 +2400,8 @@ msgstr "%s 存在但并非目录" msgid "failed to access %s" msgstr "克隆%s 失败" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "缺少了文件操作数" @@ -2427,131 +2473,131 @@ msgid "cannot preserve extended attributes, cp is built without xattr support" msgstr "无法保留扩展属性，当前使用的 cp 副本编译时没有启用 xattr 支持" #. This is a proper name. See the gettext manual, section Names. -#: src/csplit.c:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "Stuart Kemp" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "输入消失" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s：行数超出范围" -#: src/csplit.c:713 +#: src/csplit.c:714 #, c-format msgid "%s: %s: line number out of range" msgstr "%s：%s：行数超出范围" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr " 在循环位%s\n" -#: src/csplit.c:766 +#: src/csplit.c:767 #, c-format msgid "%s: %s: match not found" msgstr "%s：%s：无匹配" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "正则表达式搜索时出错" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, c-format msgid "write error for %s" msgstr "写入%s 时出错" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s：分界符后应该跟随整数" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s：在重复计数中需要\"}\"字符" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}：在\"{\"和\"}\"之间需要一个整数声明" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s：闭合定义符\"%c\"缺失" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s：无效的正则表达式：%s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s：无效的模式" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s：行号必须大于0" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "行号%s 比先前的行号%s 更小" -#: src/csplit.c:1200 +#: src/csplit.c:1201 #, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "警告：行号%s 比先前的行号更小" -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "下标中丢失了转换规格" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "下标中出现无效的转换规格：%c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "下标中出现无效的转换规格：\\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "无效的转换声明%%%c%c" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "下标中出现过多的%% 转换规格字符" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "下标中丢失了%% 转换规格字符" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s：无效数字" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +#, fuzzy +msgid "invalid number" +msgstr "无效的数字%s" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "用法：%s [选项]... 文件 格式...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 #, fuzzy msgid "" "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n" @@ -2561,7 +2607,16 @@ msgstr "" "同时每个分块文件的字节数也将被输出到标准输出。\n" "\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"如果文件为\"-\"，则读取标准输入。每个\"格式\"可以是：\n" + +#: src/csplit.c:1492 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2572,11 +2627,11 @@ msgstr "" " -f, --prefix=前缀\t\t使用指定前缀代替\"xx\"\n" " -k, --keep-files\t\t不移除错误的输出文件\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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,18 +2641,11 @@ msgstr "" " -s, --quiet, --silent\t不显示输出文件的尺寸计数\n" " -z, --elide-empty-files\t删除空的输出文件\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"如果文件为\"-\"，则读取标准输入。每个\"格式\"可以是：\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 #, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2632,7 +2680,7 @@ msgstr "" "从每个文件中输出指定部分到标准输出。\n" "\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2642,7 +2690,7 @@ msgstr "" " -c, --characters=列表\t\t只选中指定的这些字符\n" " -d, --delimiter=分界符\t使用指定分界符代替制表符作为区域分界\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2653,13 +2701,13 @@ msgstr "" "\t\t\t\t行，除非-s 选项被指定\n" " -n\t\t\t\t(忽略)\n" -#: src/cut.c:193 +#: src/cut.c:194 msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr " --complement\t\t补全选中的字节、字符或域\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2670,7 +2718,7 @@ msgstr "" "入\n" "\t\t\t\t的分界符\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2682,7 +2730,8 @@ msgstr "" "用逗号隔\n" "开要同时显示的不同类别。您的输入顺序将作为读取顺序，每个仅能输入一次。\n" -#: src/cut.c:210 +#: src/cut.c:211 +#, fuzzy msgid "" "Each range is one of:\n" "\n" @@ -2690,8 +2739,6 @@ msgid "" " 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 "" "每种参数格式表示范围如下：\n" " N\t从第1 个开始数的第N 个字节、字符或域\n" @@ -2701,63 +2748,64 @@ msgstr "" "\n" "当没有文件参数，或者文件不存在时，从标准输入读取\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "无效的字节或域列表" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "序号从1 开始计数" -#: src/cut.c:320 +#: src/cut.c:319 msgid "invalid range with no endpoint: -" msgstr "无终点的无效的范围：-" -#: src/cut.c:334 +#: src/cut.c:333 src/numfmt.c:1417 +#, c-format msgid "invalid decreasing range" msgstr "无效的缩小的范围" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "字节偏移量%s 过大" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "域编号%s 过大" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "只能指定列表中的一种类型" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "分界符必须是单个字符" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "您必须指定一组字节、字符或域的列表" -#: src/cut.c:790 +#: src/cut.c:789 msgid "an input delimiter may be specified only when operating on fields" msgstr "只有当操作域时才可以指定输入分界符" -#: src/cut.c:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" msgstr "" -"清除没有分界符的行只有在\n" +"清除没有分界符的行仅在\n" "\t操作域时才有意义" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "缺少域列表" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "缺少位置列表" @@ -2775,35 +2823,44 @@ msgid "Display the current time in the given FORMAT, or set the system date.\n" msgstr "" #: src/date.c:134 +#, fuzzy +msgid "" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" +msgstr "" +"以给定的格式显示当前时间，或是设置系统日期。\n" +"\n" +" -d,--date=字符串\t\t显示指定字符串所描述的时间，而非当前时间\n" +" -f,--file=日期文件\t\t类似--date，从日期文件中按行读入时间描述\n" + +#: src/date.c:138 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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" -#: src/date.c:142 +#: src/date.c:145 +#, fuzzy 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" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" msgstr "" " -r, --reference=文件\t\t显示文件指定文件的最后修改时间\n" " -R, --rfc-2822\t\t以RFC 2822格式输出日期和时间\n" "\t\t\t\t例如：2006年8月7日，星期一 12:34:56 -0600\n" -#: src/date.c:147 +#: src/date.c:149 #, fuzzy 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 (UTC)\n" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" msgstr "" " --rfc-3339=TIMESPEC\t以RFC 3339 格式输出日期和时间。\n" "\t\t\t\tTIMESPEC=`date'，`seconds'，或 `ns' \n" @@ -2813,8 +2870,19 @@ msgstr "" " -s, --set=字符串 \t设置指定字符串来分开时间\n" " -u, --utc, --universal\t输出或者设置协调的通用时间\n" +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" +msgstr "" + #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2827,7 +2895,7 @@ msgstr "" " %%\t一个文字的 %\n" " %a\t当前locale 的星期名缩写(例如： 日，代表星期日)\n" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2839,7 +2907,7 @@ msgstr "" " %B\t当前locale 的月名全称 (如：一月)\n" " %c\t当前locale 的日期和时间 (如：2005年3月3日 星期四 23:05:25)\n" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2851,7 +2919,7 @@ msgstr "" " %D\t按月计的日期；等于%m/%d/%y\n" " %e\t按月计的日期，添加空格，等于%_d\n" -#: src/date.c:177 +#: src/date.c:183 msgid "" " %F full date; same as %Y-%m-%d\n" " %g last two digits of year of ISO week number (see %G)\n" @@ -2861,7 +2929,7 @@ msgstr "" " %g\tISO-8601 格式年份的最后两位 (参见%G)\n" " %G\tISO-8601 格式年份 (参见%V)，一般只和 %V 结合使用\n" -#: src/date.c:182 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2873,7 +2941,7 @@ msgstr "" " %I\t小时(00-12)\n" " %j\t按年计的日期(001-366)\n" -#: src/date.c:188 +#: src/date.c:194 #, fuzzy msgid "" " %k hour, space padded ( 0..23); same as %_H\n" @@ -2886,7 +2954,7 @@ msgstr "" " %m\t月份(01-12)\n" " %M\t分(00-59)\n" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2904,7 +2972,7 @@ msgstr "" " %R\t24 小时时间的时和分，等价于 %H:%M\n" " %s\t自UTC 时间 1970-01-01 00:00:00 以来所经过的秒数\n" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2916,7 +2984,7 @@ msgstr "" " %T\t时间，等于%H:%M:%S\n" " %u\t星期，1 代表星期一\n" -#: src/date.c:209 +#: src/date.c:215 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 +2996,7 @@ msgstr "" " %w\t一星期中的第几日(0-6)，0 代表周一\n" " %W\t一年中的第几周，以周一为每星期第一天(00-53)\n" -#: src/date.c:215 +#: src/date.c:221 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 +3008,7 @@ msgstr "" " %y\t年份最后两位数位 (00-99)\n" " %Y\t年份\n" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2959,7 +3027,7 @@ msgstr "" "\n" "默认情况下，日期的数字区域以0 填充。\n" -#: src/date.c:230 +#: src/date.c:236 #, fuzzy msgid "" "The following optional flags may follow '%':\n" @@ -2978,7 +3046,7 @@ msgstr "" " ^ 如果可能，使用大写字母\n" " # 如果可能，使用相反的大小写\n" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2991,7 +3059,7 @@ msgstr "" "作为一个可选的修饰声明，它可以是E，在可能的情况下使用本地环境关联的\n" "表示方式；或者是O，在可能的情况下使用本地环境关联的数字符号。\n" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -3005,35 +3073,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "标准输入" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, c-format msgid "invalid date %s" msgstr "无效的日期%s" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, c-format msgid "multiple output formats specified" msgstr "指定了多种输出格式" -#: src/date.c:430 +#: src/date.c:436 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "被指定的这几种日期显示选项是相互抵触的" -#: src/date.c:437 +#: src/date.c:443 #, c-format msgid "the options to print and set the time may not be used together" msgstr "显示与设置时间的选项不能同时使用" -#: src/date.c:458 +#: src/date.c:464 #, fuzzy, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -3043,23 +3111,23 @@ msgstr "" "参数%s 缺少前导的\"+\"；\n" "当使用选项来描述日期是，任何非选项参数都必须以\"+\"所引导的字符串出现" -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "无法设置日期" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "Paul Rubin" -#: src/dd.c:527 +#: src/dd.c:556 #, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -3068,7 +3136,7 @@ msgstr "" "用法：%s [操作数] ...\n" "　或：%s 选项\n" -#: src/dd.c:532 +#: src/dd.c:561 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -3087,7 +3155,7 @@ msgstr "" " count=块数\t只将指定个块数复制到块\n" " ibs=比特数\t一次读取的比特数(默认：512)\n" -#: src/dd.c:541 +#: src/dd.c:570 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -3097,8 +3165,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=文件\t从指定文件中读取\n" " iflag=符号\t按照以逗号分隔的符号列表指定的方式读取\n" @@ -3109,7 +3179,7 @@ msgstr "" " skip=块数\t在输入开始处跳过指定的块数\n" " status=noxfer\t禁止传输统计\n" -#: src/dd.c:552 +#: src/dd.c:583 #, fuzzy msgid "" "\n" @@ -3128,7 +3198,7 @@ msgstr "" "每个 CONV 符号可能为：\n" "\n" -#: src/dd.c:561 +#: src/dd.c:592 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3154,7 +3224,7 @@ msgstr "" " sync\t\t将每个输入数据块以NUL 字符填满至ibs 的大小；当配合block\n" "\t\t或unblock 时，会以空格代替NUL 字符填充\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3170,7 +3240,7 @@ msgstr "" " fdatasync\t结束前将输出文件数据写入磁盘\n" " fsync\t类似上面，但是元数据也一同写入\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3183,135 +3253,102 @@ msgstr "" "\n" " append\t追加模式(仅对输出有意义；隐含了conv=notrunc)\n" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr " cio\t使用并行I/O 存取模式\n" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr " direct\t使用直接I/O 存取模式\n" -#: src/dd.c:593 +#: src/dd.c:624 msgid " directory fail unless a directory\n" msgstr " directory\t除非是目录，否则 directory 失败\n" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr " dsync\t\t使用同步I/O 存取模式\n" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr " sync\t\t与上者类似，但同时也对元数据生效\n" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr " fullblock\t为输入积累完整块(仅iflag)\n" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr " nonblock\t使用无阻塞I/O 存取模式\n" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr " noatime\t不更新存取时间\n" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr " nocache\t丢弃缓存数据\n" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr " noctty\t不根据文件指派控制终端\n" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr " nofollow\t不跟随链接文件\n" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr " nolinks\t如果有多重链接，则nolinks 失败\n" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr " binary\t使用二进制I/O 存取模式\n" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr " text\t使用文本I/O 存取模式\n" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 -#, fuzzy, c-format +#: src/dd.c:661 +#, 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 "" -"\n" -"对运行中的\"dd\"进程发送一个%s 信号会使得\n" -"I/O 的统计信息被打印到标准错误设备然后恢复复制操作。\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" -"可用选项有：\n" -"\n" -#: src/dd.c:676 -#, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +#: src/dd.c:699 +#, fuzzy, c-format +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "%zu 字节的输入缓冲导致内存耗尽(%s)" -#: src/dd.c:698 -#, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" +#: src/dd.c:721 +#, fuzzy, c-format +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "%zu 字节的输出缓冲导致内存耗尽(%s)" -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" -msgstr "" -"记录了%+% 的读入\n" -"记录了%+% 的写出\n" - -#: src/dd.c:754 -#, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "% 个被截断了的块\n" - -#: src/dd.c:766 +#: src/dd.c:774 #, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "%字节(%s)已复制" -#: src/dd.c:785 +#: src/dd.c:794 msgid "Infinity B" msgstr "无穷量 B" @@ -3325,83 +3362,99 @@ 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:798 +#: src/dd.c:807 #, c-format msgid ", %g s, %s/s\n" msgstr "，%g 秒，%s/秒\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr "，%g 秒，%s/秒\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" +"记录了%+% 的读入\n" +"记录了%+% 的写出\n" + +#: src/dd.c:834 +#, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "% 个被截断了的块\n" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "正在关闭输入文件%s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "正在关闭输出文件%s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "无法关闭O_DIRECT：%s" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "正在写入%s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "无法识别的操作数%s" -#: src/dd.c:1285 +#: src/dd.c:1376 msgid "invalid conversion" msgstr "转换无效" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 msgid "invalid input flag" msgstr "输入标志无效" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 msgid "invalid output flag" msgstr "输出标志无效" -#: src/dd.c:1294 -msgid "invalid status flag" +#: src/dd.c:1385 +#, fuzzy +msgid "invalid status level" msgstr "状态标志无效" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "无效的数字%s" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "不可将{ascii、ebcdic、idm}中的任意两个结合使用" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "不可将block 和unblock 结合使用" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "不可将lcase 和ucase 结合使用" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "不可将excl 和nocreat 结合使用" -#: src/dd.c:1424 +#: src/dd.c:1527 #, c-format msgid "cannot combine direct and nocache" msgstr "不可将direct 和nocreat 结合使用" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3410,81 +3463,81 @@ msgstr "" "警告：暂时避免有关文件%s 的lseek 内核错误\n" " 错误地址在mt_type=0x%0lx -- 有关mt_type 类型的列表请参考" -#: src/dd.c:1670 +#: src/dd.c:1773 #, c-format msgid "%s: cannot skip" msgstr "%s：无法跳过" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s：无法搜索" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "读入文件%s 时偏移量溢出" -#: src/dd.c:1756 +#: src/dd.c:1859 #, c-format msgid "warning: invalid file offset after failed read" msgstr "警告：文件读取失败后偏移错误" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "无法避免内核的错误" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "正在设置%s 的标记" -#: src/dd.c:1957 +#: src/dd.c:2060 #, c-format msgid "%s: cannot skip to specified offset" msgstr "%s：无法跳至指定偏移量" -#: src/dd.c:2172 +#: src/dd.c:2288 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "无法针对输出文件%2$s 的%1$ 字节处实施截断" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "%s 的fdatasync 失败" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "%s 的fsync 失败" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, c-format msgid "failed to open %s" msgstr "打开%s 失败" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "偏移量过大：无法在seek=% (%lu-字节) 块的长度上实施截断" -#: src/dd.c:2306 +#: src/dd.c:2422 #, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "无法针对输出文件%2$s 的%1$ 字节处实施截断" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, c-format msgid "failed to discard cache for: %s" msgstr "无法丢弃缓存：%s" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "Paul Eggert" @@ -3535,7 +3588,7 @@ msgstr "挂载点" #: src/df.c:207 msgid "File" -msgstr "" +msgstr "文件" #: src/df.c:387 #, fuzzy, c-format @@ -3564,14 +3617,14 @@ msgstr "配额" #: src/df.c:550 src/df.c:559 #, c-format msgid "%s-%s" -msgstr "" +msgstr "%s-%s" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 #, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" @@ -3582,14 +3635,14 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 #, fuzzy msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" @@ -3599,7 +3652,7 @@ msgstr "" " -h, --human-readable\t以可读性较好的格式显示尺寸(例如：1K 234M 2G)\n" " -H, --si\t\t计算时使用1000 为基底而非1024\n" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3612,7 +3665,7 @@ msgstr "" " -l, --local\t\t只显示本机的文件系统\n" " --no-sync\t\t取得使用量数据前不进行同步动作(默认)\n" -#: src/df.c:1409 +#: src/df.c:1429 #, fuzzy msgid "" " --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" @@ -3620,6 +3673,24 @@ msgid "" "omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" +msgstr "" +" -P, --portability\t使用POSIX 兼容的输出格式\n" +" --sync\t\t取得使用量数据前先进行同步动作\n" +" -t, --type=类型\t只显示指定文件系统为指定类型的信息\n" +" -T, --print-type\t显示文件系统类型\n" +" -x, --exclude-type=类型\t只显示文件系统不是指定类型信息\n" +" -v\t\t\t(忽略)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr " --verbose\t\t在每个输出文件打开前输出文件特征\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3632,7 +3703,7 @@ msgstr "" " -x, --exclude-type=类型\t只显示文件系统不是指定类型信息\n" " -v\t\t\t(忽略)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3640,25 +3711,25 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, fuzzy, c-format msgid "options %s and %s are mutually exclusive" msgstr "选项--compare (-C) 和--strip 是互斥的" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "不能同时选择和排除文件系统类型%s" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "警告：" -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 msgid "cannot read table of mounted file systems" msgstr "%s 无法读取已挂载上的文件系统的目录" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "未处理文件系统" @@ -3770,7 +3841,7 @@ msgstr "" " %s /usr/bin/\t输出\"/usr\"。\n" " %s stdio.h\t\t输出\".\"。\n" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3781,7 +3852,8 @@ msgstr "" #: src/du.c:285 #, fuzzy -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "计算每个文件的磁盘用量，目录则取总用量。\n" "\n" @@ -3901,61 +3973,55 @@ msgstr "" msgid "Infinity" msgstr "无穷量 B" -#: src/du.c:636 +#: src/du.c:657 #, c-format msgid "fts_read failed: %s" msgstr "fts_read 失败：%s" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "目录最大深度%s 无效" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "无效的 --%s 参数%s" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "不能既显示总用量，同时又显示每个项目" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "警告：显示总用量等价于使用--max-depth=0" -#: src/du.c:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "警告：显示总用量的选项和--max-depth=%lu 互斥" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 msgid "file operands cannot be combined with --files0-from" msgstr "文件操作数不能于--files0-from 参数一起使用" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s：读取出错" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "当从标准输入读取时，不允许指定文件名%s" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "无效的零长度文件名" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "总用量" @@ -4098,9 +4164,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "将每个文件中的制表符转换为空格，写到标准输出。\n" "如果不指定文件，或者文件为\"-\"，程序将从标准输入读取数据。\n" @@ -4145,7 +4209,7 @@ msgid "input line is too long" msgstr "输入行太长" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "Mike Parker" @@ -4296,12 +4360,12 @@ msgstr "正则表达式匹配器出错" msgid "non-integer argument" msgstr "非整数参数" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "除以零" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "请设置LC_ALL='C' 以避免出现问题。" @@ -4312,31 +4376,31 @@ msgid "the strings compared were %s and %s" msgstr "已比较的字符串为%s 和%s" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, c-format msgid "%s is not a valid positive integer" msgstr "%s 不是有效的正整数" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s 太大" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4345,7 +4409,7 @@ msgstr "" "用法：%s [数字]...\n" "　或：%s 选项\n" -#: src/factor.c:2443 +#: src/factor.c:2533 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,7 +4452,7 @@ msgstr "" "选项 \"-宽度\" 是\"--width=数字\" 的缩写。\n" "\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4400,7 +4464,7 @@ msgstr "" "\t\t\t\t将前缀重新附着到被重新格式化的行上\n" " -s, --split-only\t\t分割过长的行，但不自动补足\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, fuzzy, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4412,29 +4476,27 @@ msgstr "" " -u, --uniform-spacing\t\t每两个单词间保留一个空格，每句之后保留两个空格\n" " -w, --width=宽度\t\t最大行宽(默认为75 列宽度)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, 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:405 src/fmt.c:416 -#, c-format -msgid "invalid width: %s" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "无效的宽度：%s" -#: src/fold.c:70 +#: src/fold.c:69 #, fuzzy -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "对每个指定的文件(默认由标准输入读取)设置自动换行，并将重新排版后的结果输出到" "标准输出。\n" "\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4444,9 +4506,9 @@ msgstr "" " -s, --spaces\t\t在空格处断行\n" " -w, --width=宽度\t使用指定的列宽度代替默认的80\n" -#: src/fold.c:288 src/pr.c:832 -#, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "无效的列数：%s" #. This is a proper name. See the gettext manual, section Names. @@ -4518,19 +4580,18 @@ msgstr "无法设置用户ID" msgid "%s: no such user" msgstr "%s：无此用户" -#: src/head.c:109 +#: src/head.c:110 #, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "将每个指定文件的头10 行显示到标准输出。\n" "如果指定了多于一个文件，在每一段输出前会给出文件名作为文件头。\n" "如果不指定文件，或者文件为\"-\"，则从标准输入读取数据。\n" "\n" -#: src/head.c:117 +#: src/head.c:118 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4547,7 +4608,7 @@ msgstr "" "\t\t\t如果附加\"-\"参数，则除了每个文件的最后K 行外显示\n" "\t\t\t剩余全部内容\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4555,7 +4616,7 @@ msgstr "" " -q, --quiet, --silent\t不显示包含给定文件名的文件头\n" " -v, --verbose\t\t总是显示包含给定文件名的文件头\n" -#: src/head.c:131 +#: src/head.c:132 msgid "" "\n" "K may have a multiplier suffix:\n" @@ -4567,48 +4628,36 @@ 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:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "%s：文件被过度收缩" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s：字节数过大" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s：无法检索到偏移量%s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s：无法检索相对偏移量 %s" -#: src/head.c:886 +#: src/head.c:267 #, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "%s：%s 过大以至于无法表示" - -#: src/head.c:887 -msgid "number of lines" -msgstr "参数数目错误" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "字节数" +msgid "%s: number of bytes is too large" +msgstr "%s：字节数过大" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "无效的号码%s" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "无效的号码%s" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, c-format msgid "invalid trailing option -- %c" msgstr "无效的加附选项 -- %c" @@ -4794,7 +4843,7 @@ msgstr "无法更改%s 的所有权" msgid "cannot set time stamps for %s" msgstr "无法设置%s 的时间戳" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "创建系统进程(fork)出错" @@ -4940,7 +4989,7 @@ msgstr "安装目录时不能用strip 选项" msgid "target directory not allowed when installing a directory" msgstr "安装目录时不能用目标目录选项" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "无效模式%s" @@ -4973,11 +5022,15 @@ msgid "Mike Haertel" msgstr "Mike Haertel" #: src/join.c:195 -#, 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" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -4991,7 +5044,7 @@ msgstr "" " \t此选项用于根据指定文件编号输出不成对的行目。\n" " -e 字符 \t\t将缺失的输入区块替换为指定字符\n" -#: src/join.c:204 +#: src/join.c:210 #, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" @@ -5004,7 +5057,7 @@ msgstr "" " -o 格式 \t\t按照指定格式构造输出行\n" " -t 字符 \t\t使用指定字符作为输入和输出的分隔符\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -5022,12 +5075,12 @@ msgstr "" " --nocheck-order \t不检查输入是否正确排序\n" " --header \t将首行视作域的头部，直接输出而不对其进行匹配\n" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 #, fuzzy msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr " -z, --zero-terminated\t以0 字节而非新行作为行尾标志\n" -#: src/join.c:225 +#: src/join.c:231 #, fuzzy msgid "" "\n" @@ -5058,47 +5111,47 @@ msgstr "" "注意，所进行的比较遵从\"LC_COLLATE\"所指定的的规则。\n" "如果输入没有被排序并导致某些行无法合并，将会显示警告信息。\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "无效的区块编号%s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, c-format msgid "invalid field specifier: %s" msgstr "无效的区块定义符：%s" -#: src/join.c:884 +#: src/join.c:890 #, c-format msgid "invalid file number in field spec: %s" msgstr "在区块定义中出现无效的文件编号：%s" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "不兼容的连接区块%lu，%lu" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "有冲突的空区块替换字符串" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, c-format msgid "multi-character tab %s" msgstr "多字符标签%s" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "不兼容的标签" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "不能从标准输入同时读取两个文件" @@ -5178,17 +5231,17 @@ msgstr "无法将-l 或-t 选项结合使用" msgid "no process ID specified" msgstr "未指定进程号" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "分配 % 字节标准输入输出(stdio)缓冲区失败\n" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, c-format msgid "invalid buffering mode %s for %s\n" msgstr "%2$s 的缓冲模式%1$s 无效\n" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "无法将%2$s 的缓冲模式设置为%1$s\n" @@ -5370,7 +5423,7 @@ msgstr "无法创建符号链接%s" msgid "FIXME: unknown" msgstr "FIXME：未知" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, c-format msgid "Usage: %s [OPTION]\n" msgstr "用法：%s [选项]\n" @@ -5383,7 +5436,7 @@ msgstr "" "显示当前用户的名称。\n" "\n" -#: src/logname.c:84 +#: src/logname.c:79 #, c-format msgid "no login name" msgstr "无登录名" @@ -5393,7 +5446,7 @@ msgstr "无登录名" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 msgid "%b %e %Y" msgstr "%b %e %Y" @@ -5402,95 +5455,94 @@ msgstr "%b %e %Y" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 msgid "%b %e %H:%M" msgstr "%b %e %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "忽略无效的环境变量QUOTING_STYLE 的键值：%s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "忽略无效的环境变量 COLUMNS 所示的宽度值：%s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "忽略无效的环境变量 TABSIZE 所示的制表符尺寸值：%s" -#: src/ls.c:1760 src/ptx.c:1978 -#, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "无效的行宽：%s" -#: src/ls.c:1834 -#, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "无效的制表符尺寸：%s" -#: src/ls.c:2043 +#: src/ls.c:2021 #, c-format msgid "invalid time style format %s" msgstr "无效的日期时间格式%s" -#: src/ls.c:2067 -#, fuzzy +#: src/ls.c:2045 msgid "Valid arguments are:\n" -msgstr "有效的参数为：" +msgstr "有效的参数为：\n" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "初始化月份字符串出错" -#: src/ls.c:2450 +#: src/ls.c:2428 #, c-format msgid "unrecognized prefix: %s" msgstr "无法识别的前缀：%s" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "LS_COLORS 环境变量中存在无法解些的值" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "忽略无效的环境变量QUOTING_STYLE 的键值：%s" + +#: src/ls.c:2554 src/pwd.c:164 #, c-format msgid "cannot open directory %s" msgstr "无法打开目录%s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, c-format msgid "cannot determine device and inode of %s" msgstr "无法决定%s 所在的设备及inode" -#: src/ls.c:2581 +#: src/ls.c:2578 #, c-format msgid "%s: not listing already-listed directory" msgstr "%s：不会再列出已经列出的目录" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, c-format msgid "reading directory %s" msgstr "正在读取目录%s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, c-format msgid "closing directory %s" msgstr "关闭目录%s" -#: src/ls.c:3362 +#: src/ls.c:3355 #, c-format msgid "cannot compare file names %s and %s" msgstr "无法比较文件名%s 和 %s" -#: src/ls.c:4781 +#: src/ls.c:4775 #, fuzzy msgid "" "List information about the FILEs (the current directory by default).\n" @@ -5500,7 +5552,7 @@ msgstr "" "如果不指定-cftuvSUX 或--sort 选项，则根据字母大小排序。\n" "\n" -#: src/ls.c:4788 +#: src/ls.c:4782 msgid "" " -a, --all do not ignore entries starting with .\n" " -A, --almost-all do not list implied . and ..\n" @@ -5513,7 +5565,7 @@ msgstr "" " --author\t\t\t与-l 同时使用时列出每个文件的作者\n" " -b, --escape\t\t\t以八进制溢出序列表示不可打印的字符\n" -#: src/ls.c:4794 +#: src/ls.c:4788 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." @@ -5534,13 +5586,14 @@ msgstr "" "\t\t\t\t状态最后更改的时间)\n" "\t\t\t\t配合-l：显示ctime 但根据名称排序\t\t\t\t其他情况：按ctime 排序\n" -#: src/ls.c:4804 +#: src/ls.c:4798 #, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5551,7 +5604,7 @@ msgstr "" " -d, --directory\t\t当遇到目录时列出目录本身而非目录内的文件\n" " -D, --dired\t\t\t产生适合Emacs 的dired 模式使用的结果\n" -#: src/ls.c:4812 +#: src/ls.c:4807 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5567,11 +5620,11 @@ msgstr "" "\t\t\t\t单栏-1，详细-l，垂直-C\n" " --full-time\t\t即-l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr " -g\t\t\t\t类似-l，但不列出所有者\n" -#: src/ls.c:4823 +#: src/ls.c:4818 #, fuzzy msgid "" " --group-directories-first\n" @@ -5584,7 +5637,7 @@ msgstr "" "\t\t\t在文件前分组目录。此选项可与--sort 一起使用，\n" "\t\t\t但是一旦使用--sort=none (-U)将禁用分组\n" -#: src/ls.c:4829 +#: src/ls.c:4824 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5597,7 +5650,7 @@ msgstr "" "\t\t\t\t(例如 1K 234M 2G)\n" " --si\t\t\t同上面类似，但是使用1000 为基底而非1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 #, fuzzy msgid "" " -H, --dereference-command-line\n" @@ -5617,7 +5670,7 @@ msgstr "" " --hide=PATTERN \t隐藏符合PATTERN 模式的项目\n" "\t\t\t\t(-a 或 -A 将覆盖此选项)\n" -#: src/ls.c:4845 +#: src/ls.c:4840 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5635,7 +5688,7 @@ msgstr "" " -I, --ignore=PATTERN\t\t不显示任何符合指定shell PATTERN 的项目\n" " -k\t\t\t\t即--block-size=1K\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5649,7 +5702,7 @@ msgstr "" "\t\t\t\t的对象而并非符号链接本身的信息\n" " -m\t\t\t\t所有项目以逗号分隔，并填满整行行宽\n" -#: src/ls.c:4863 +#: src/ls.c:4858 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. " @@ -5664,7 +5717,7 @@ msgstr "" " -o\t\t\t\t类似 -l，但不列出有关组的信息\n" " -p, --indicator-style=slash\t对目录加上表示符号\"/\"\n" -#: src/ls.c:4871 +#: src/ls.c:4866 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" @@ -5683,7 +5736,7 @@ msgstr "" " --quoting-style=方式\t使用指定的quoting 方式显示条目的名称：\n" "\t\t\t\tliteral、locale、shell、shell-always、c、escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 msgid "" " -r, --reverse reverse order while sorting\n" " -R, --recursive list subdirectories recursively\n" @@ -5694,19 +5747,19 @@ msgstr "" " -R, --recursive\t\t递归显示子目录\n" " -s, --size\t\t\t以块数形式显示每个文件分配的尺寸\n" -#: src/ls.c:4886 +#: src/ls.c:4881 #, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S\t\t\t\t根据文件大小排序\n" " --sort=WORD\t\t以下是可选用的WORD 和它们代表的相应选项：\n" @@ -5719,7 +5772,7 @@ msgstr "" "\t\t\t\t间：atime、access、use、ctime 或status；加上\n" "\t\t\t\t--sort=time 选项时会以指定时间作为排序关键字\n" -#: src/ls.c:4896 +#: src/ls.c:4892 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5743,7 +5796,7 @@ msgstr "" " -t\t\t\t\t根据修改时间排序\n" " -T, --tabsize=宽度\t指定制表符(Tab)的宽度，而非8 个字符\n" -#: src/ls.c:4908 +#: src/ls.c:4904 #, fuzzy msgid "" " -t sort by modification time, newest first\n" @@ -5752,12 +5805,12 @@ msgstr "" " -t\t\t\t按修改时间排序\n" " -T, --tabsize=COLS\t指定制表符(Tab)的宽度，而非8个字符\n" -#: src/ls.c:4912 +#: src/ls.c:4908 #, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -5767,21 +5820,22 @@ msgstr "" " -U\t\t\t不进行排序；按照目录顺序列出项目\n" " -v\t\t\t在文本中进行数字(版本)的自然排序\n" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -w, --width=COLS\t自行指定萤幕宽度而不使用目前的数值\n" " -x\t\t\t逐行列出项目而不是逐栏列出\n" " -X\t\t\t根据扩展名排序\n" " -1\t\t\t每行只列出一个文件\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5796,7 +5850,7 @@ msgstr "" "LS_COLORS 环境变量可改变此设置，可使用 dircolors 命令来设置。\n" "\n" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5826,47 +5880,50 @@ msgid "David Madore" msgstr "David Madore" #: src/md5sum.c:164 -#, c-format +#, fuzzy, 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 "" "用法：%s [选项]... [文件]...\n" "显示或检查 %s(%d-bit) 校验和。\n" "若没有文件选项，或者文件处为\"-\"，则从标准输入读取。\n" "\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr " -b, --binary\t\t以二进制模式读取(除非从tty 标准输入读取否则为默认)\n" -#: src/md5sum.c:178 -msgid " -b, --binary read in binary mode\n" +#: src/md5sum.c:180 +#, fuzzy +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr " -b, --binary\t\t以二进制模式读取\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, 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:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr " -t, --text\t\t以纯文本模式读取(从tty 标准输入读取时为默认)\n" -#: src/md5sum.c:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr " -t, --text\t\t以纯文本模式读取(默认)\n" -#: src/md5sum.c:195 +#: src/md5sum.c:198 #, fuzzy msgid "" "\n" @@ -5885,98 +5942,99 @@ msgstr "" " -w, --warn\t\t对格式不准确的校验和行进行警告\n" "\n" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "校验和会按照%s 规范生成。当进行检查时，给出的输入格式应该和程序的输出\n" "样板格式相同。默认的输出模式时输出一行校验和的校验结果，并有一个字符来\n" "表示文件类型(\"*\"代表二进制，\" \"代表纯文本)，并同时显示每个文件的名称。\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, c-format msgid "%s: too many checksum lines" msgstr "%s：校验和的行数过多" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s：%：%s 的校验和行目格式不适当" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s：打开或读取失败\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "失败" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" -msgstr "确定" +msgstr "成功" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s：找不到格式适用的%s 校验和" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "警告：% 行的格式不适当" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % listed files could not be read" msgstr[0] "警告：% 个列出的文件无法读取" -#: src/md5sum.c:645 +#: src/md5sum.c:648 #, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "警告：% 个校验和不匹配" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" -msgstr "" +msgstr "--tag 不支持--text 模式" -#: src/md5sum.c:770 -#, fuzzy, c-format +#: src/md5sum.c:773 +#, c-format msgid "the --tag option is meaningless when verifying checksums" -msgstr "只有在校验时--status 选项才有意义" +msgstr "在校验时--tag 选项无意义" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" -msgstr "在校验时--binary 和--text 选项是无意义的" +msgstr "在校验时--binary 和--text 选项无意义" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" -msgstr "只有在校验时--status 选项才有意义" +msgstr "仅在校验时--status 选项有意义" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" -msgstr "只有在校验时--warn 选项才有意义" +msgstr "仅在校验时--warn 选项才有意义" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "只有在校验时--quiet 选项才有意义" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "只有在校验时--status 选项才有意义" @@ -6015,22 +6073,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "无法取得%s 的创建环境" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "无法保留%s 的时间" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, c-format msgid "created directory %s" msgstr "已创建目录 %s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, fuzzy, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -6236,7 +6294,7 @@ msgstr "模板过多" msgid "with --suffix, template %s must end in X" msgstr "使用 --suffix，模板 %s 必须以 X 结尾" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "无效后缀 %s，含有目录分隔符" @@ -6371,9 +6429,7 @@ msgstr "Scott Bartram" #: src/nl.c:179 #, fuzzy -msgid "" -"Write each FILE to standard output, with line numbers added.\n" -"With no FILE, or when FILE is -, read standard input.\n" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "将指定的各个文件添加行号标注后写到标准输出。\n" "如果不指定文件或指定文件为\"-\" ，程序将从标准输入读取数据。\n" @@ -6476,27 +6532,27 @@ msgstr "无效的正文号样式：%s" msgid "invalid footer numbering style: %s" msgstr "无效的页脚号样式：%s" -#: src/nl.c:503 -#, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "无效的起始行号：%s" -#: src/nl.c:512 -#, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "无效的行号递增值：%s" -#: src/nl.c:524 -#, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "无效的空行数：%s" -#: src/nl.c:538 -#, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "无效的行宽数值：%s" -#: src/nl.c:557 +#: src/nl.c:531 #, c-format msgid "invalid line numbering format: %s" msgstr "无效的编号格式：%s" @@ -6522,7 +6578,7 @@ msgstr "" #, fuzzy, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6540,43 +6596,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "标准输入不可用，无法重定向" -#: src/nohup.c:131 +#: src/nohup.c:129 #, c-format msgid "ignoring input" msgstr "忽略输入" -#: src/nohup.c:175 +#: src/nohup.c:173 #, c-format msgid "ignoring input and appending output to %s" msgstr "忽略输入并把输出追加到%s" -#: src/nohup.c:176 +#: src/nohup.c:174 #, c-format msgid "appending output to %s" msgstr "把输出追加到%s" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "执行时关闭标准错误失败" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "忽略输入重定向错误到标准输出端" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "重定向标准错误到标准输出" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" msgstr "重定向标准错误失败" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "Giuseppe Scrivano" @@ -6603,96 +6659,93 @@ msgstr "" " --all 打印所拥有的处理器数目\n" " --ignore=N 如果有可能，忽略 N 个处理器\n" -#: 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:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, fuzzy, c-format msgid "value too large to be converted: %s" msgstr "%s：给定值不能完全转换" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "无效的数字%s" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "非法的后缀在%s%s 参数\"%s\"" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "%s：无法以写模式打开" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "无效的制表符尺寸：%s" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "用法: %s [选项]... [用户]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6700,19 +6753,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -6722,30 +6775,30 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 #, fuzzy msgid "" "\n" @@ -6754,11 +6807,11 @@ msgstr "" "其他选项：\n" "\n" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6767,7 +6820,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -6775,7 +6828,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -6783,7 +6836,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -6791,7 +6844,27 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"每种参数格式表示范围如下：\n" +" N\t从第1 个开始数的第N 个字节、字符或域\n" +" N-\t从第N 个开始到所在行结束的所有字符、字节或域\n" +" N-M\t从第N 个开始到第M 个之间(包括第M 个)的所有字符、字节或域\n" +" -M\t从第1 个开始到第M 个之间(包括第M 个)的所有字符、字节或域\n" +"\n" +"当没有文件参数，或者文件不存在时，从标准输入读取\n" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -6800,9 +6873,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -6814,7 +6888,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -6829,118 +6903,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, c-format msgid "format %s has no %% directive" msgstr "格式%s 没有%% 指令" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "无效的格式宽度" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "格式%s 以%% 结束" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "无效的精度：%s" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "格式%s 中%% 指令过多" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "非法的后缀在%s%s 参数\"%s\"" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 +#, c-format +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" +msgstr "" + +#: src/numfmt.c:1210 #, c-format msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1219 #, c-format msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1305 #, c-format msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1308 -#, c-format -msgid "input line is too short, no numbers found to convert in field %ld" -msgstr "" +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "无效的区块编号%s" -#: src/numfmt.c:1403 +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "页码范围%s 无效" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "无效的区块编号%s" +msgid "multiple field specifications" +msgstr "%s：无效的区块规格%s" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "无效的日期%s" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, fuzzy, c-format msgid "--grouping cannot be combined with --format" msgstr "文件操作数不能于--files0-from 参数一起使用" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "指定了多个-i 选项" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, fuzzy, c-format msgid "grouping cannot be combined with --to" msgstr "文件操作数不能于--files0-from 参数一起使用" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "读取%s 时出错" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, fuzzy, c-format msgid "failed to convert some of the input numbers" msgstr "标准输入不可用，无法重定向" -#: src/od.c:320 +#: src/od.c:321 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6952,14 +7038,13 @@ msgstr "" "　或：%s [-abcdfilosx]... [文件] [[+]偏移量[.][b]]\n" "　或：%s --traditional [选项]... [文件] [[+]偏移量[.][b] [+][标签][.][b]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "将指定文件以八进制形式(默认)转储到标准输出。如果指定了多于一个的文件\n" @@ -6967,9 +7052,10 @@ msgstr "" "如果没有指定文件，或指定文件为\"-\"，程序从标准输入读取数据。\n" "\n" -#: src/od.c:333 +#: src/od.c:335 #, 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" @@ -6984,7 +7070,7 @@ msgstr "" "随着累积过程递增。偏移量和标签如果冠以\"0x\"或\"0X\"前缀则\n" "表示十六进制数；后缀\".\"代表八进制数，后缀\"b\"表示乘以 512。\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -6993,7 +7079,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 #, fuzzy msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" @@ -7013,7 +7099,7 @@ msgstr "" " -w, --width[=字节数]\t\t每一行只输出指定的字节数\n" " --traditional\t\t接受传统形式提交的参数\n" -#: src/od.c:363 +#: src/od.c:366 #, fuzzy msgid "" "\n" @@ -7031,7 +7117,7 @@ msgstr "" " -c\t即 -t c， 使用ASCII 字符，或者反斜杠正名的特殊字符\n" " -d\t即 -t u2，使用无符号十进制双字节字符\n" -#: src/od.c:372 +#: src/od.c:375 msgid "" " -f same as -t fF, select floats\n" " -i same as -t dI, select decimal ints\n" @@ -7047,7 +7133,7 @@ msgstr "" " -s\t即 -t d2，指定双字节单位十进制数的对照输出格式\n" " -x\t即 -t x2，指定双字节单位十六进制数的对照输出格式\n" -#: src/od.c:380 +#: src/od.c:383 #, fuzzy msgid "" "\n" @@ -7062,7 +7148,7 @@ msgstr "" " a\t\t重定义字符，忽略高位字节\n" " c\t\tASCII 码字符或者是反斜线字串(如\\n)\n" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -7076,7 +7162,7 @@ msgstr "" " u[尺寸]\t无符号十进制数，每个整形数占指定尺寸的字节\n" " x[尺寸]\t十六进制数，每个整形数占指定尺寸的字节\n" -#: src/od.c:394 +#: src/od.c:397 #, fuzzy msgid "" "\n" @@ -7093,14 +7179,14 @@ msgstr "" "F 代表 sizeof(float)、D 代表sizeof(double)，或 L 代表\n" "sizeof(long double)。\n" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 #, fuzzy msgid "" "\n" @@ -7118,12 +7204,12 @@ msgstr "" "b 512, kB 1000, K 1024, MB 1000*1000, M 1024*1024,\n" "GB 1000*1000*1000, G 1024*1024*1024, 对于T, P, E, Z, Y 同样适用。\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, c-format msgid "invalid type string %s" msgstr "无效类型的字符串%s" -#: src/od.c:690 +#: src/od.c:693 #, c-format msgid "" "invalid type string %s;\n" @@ -7132,7 +7218,7 @@ msgstr "" "无效的类型字符串%s；\n" "系统无法提供对%lu-字节整形类型数值的支持" -#: src/od.c:811 +#: src/od.c:814 #, c-format msgid "" "invalid type string %s;\n" @@ -7141,36 +7227,36 @@ msgstr "" "无效的类型字符串%s；\n" "系统无法提供对%lu-字节浮点类型数值的支持" -#: src/od.c:869 +#: src/od.c:872 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "无效字符\"%c\"出现在类型字符串%s 中" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "无法略过输入内容的报尾" -#: src/od.c:1650 +#: src/od.c:1658 #, fuzzy, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "无效的输出地址基数\"%c\"，它必须是 [doxn] 四个字符中的一个" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "在转储字符串时不能指定类型" -#: src/od.c:1863 +#: src/od.c:1871 msgid "compatibility mode supports at most one file" msgstr "兼容模式最多支持一个文件" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "略过字节数+ 读入字节数的值过大" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "警告：无效的宽度值%lu，已使用%d 代替" @@ -7190,7 +7276,6 @@ msgstr "标准输入已关闭" msgid "" "Write lines consisting of the sequentially corresponding lines from\n" "each FILE, separated by TABs, to standard output.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "将每个指定文件里的每一行整合到对应一行里写到标准输出，之间用制表符分隔。\n" "如果没有指定文件，或指定文件为\"-\"，程序将从标准输入读取数据。\n" @@ -7332,12 +7417,12 @@ msgstr "从" msgid "Where" msgstr "来自" -#: src/pinky.c:495 +#: src/pinky.c:494 #, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "用法: %s [选项]... [用户]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7353,7 +7438,7 @@ msgstr "" " -p\t在长格式中省略用户的计划文件\n" " -s\t输出短格式信息(默认)\n" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7366,7 +7451,7 @@ msgstr "" " -i\t在短格式中省略用户全名以及远程主机\n" " -q\t在短格式中省略用户全名、远程主机以及空闲时间\n" -#: src/pinky.c:513 +#: src/pinky.c:512 #, fuzzy, c-format msgid "" "\n" @@ -7377,99 +7462,99 @@ msgstr "" "一个轻量级的\"finger\"程序，用于显示用户信息。\n" "用到的utmp 文件为%s。\n" -#: src/pinky.c:597 +#: src/pinky.c:596 #, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "没有指定用户名，当使用-l 选项时至少需要指定一个" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "Pete TerMaat" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "Roland Huebner" -#: src/pr.c:908 +#: src/pr.c:905 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "\"--pages=首页[:末页]\"缺失参数" -#: src/pr.c:910 +#: src/pr.c:907 #, c-format msgid "invalid page range %s" msgstr "页码范围%s 无效" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "\"-l 页长\"中含有无效的行号：%s" -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "\"-N 编号\"中含有无效的起始行号：%s" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "\"-o 页边距\"中含有无效的行偏移量：%s" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "\"-w \"中含有无效的字符数：%s" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "\"-w \"中含有无效的字符数：%s" -#: src/pr.c:1096 +#: src/pr.c:1059 #, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "在平行输出参数时不能指定栏数" -#: src/pr.c:1100 +#: src/pr.c:1063 #, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "无法同时指定相交输出和平行输出参数" -#: src/pr.c:1196 +#: src/pr.c:1166 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "有多余字符\"-%c\"或无效数字出现在参数%s 中" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "过窄" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "起始页码% 超出了最大页数%" -#: src/pr.c:2380 +#: src/pr.c:2350 #, c-format msgid "page number overflow" msgstr "页码溢出" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "第 % 页" -#: src/pr.c:2757 +#: src/pr.c:2727 #, fuzzy msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "对指定文件附注打印所需的页码或聚焦。\n" "\n" -#: src/pr.c:2763 +#: src/pr.c:2734 msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" " begin [stop] printing with page FIRST_[LAST_]PAGE\n" @@ -7484,7 +7569,7 @@ msgstr "" "\t\t\t输出指定的列数。如果指定了-a 选项，则从上到下列印。\n" "\t\t\t程序会自动在每一页均衡每列占用的行数。\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7498,7 +7583,7 @@ msgstr "" "\t\t\t使用头标(^G)和八进制反斜杠标记\n" " -d, --double-space\t加倍输出空白区域\n" -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7516,7 +7601,7 @@ msgstr "" " -F, -f, --form-feed\t使用出纸页页标代替新行作为页面间的分隔符\n" "\t\t\t(使用-F 选项时报头为3 行,不使用时为5 行)\n" -#: src/pr.c:2789 +#: src/pr.c:2760 msgid "" " -h, --header=HEADER\n" " use a centered HEADER instead of filename in page " @@ -7535,11 +7620,23 @@ msgstr "" " -J, --join-lines\t合并整个行，关闭-W 选项的行截断，不使用栏调整，使用\n" "\t\t\t\t--sep-string[=字符串] 设置分隔符\n" -#: src/pr.c:2798 +#: src/pr.c:2769 +#, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l, --length=页长\n" +"\t\t\t使用指定页长的行数(默认66)\n" +"\t\t\t(默认文本行数为56，当启用-F 时为 63)\n" +" -m, --merge\t\t在同一行显示所有文件，每个文件占用一栏，分割行，但是当\n" +"\t\t\t使用-J 时将行合并到完整长度\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -7549,7 +7646,7 @@ msgstr "" " -m, --merge\t\t在同一行显示所有文件，每个文件占用一栏，分割行，但是当\n" "\t\t\t使用-J 时将行合并到完整长度\n" -#: src/pr.c:2805 +#: src/pr.c:2779 msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" " number lines, use DIGITS (5) digits, then SEP (TAB),\n" @@ -7564,7 +7661,7 @@ msgstr "" " -N, --first-line-number=数字\n" "\t\t\t从首页的首行以指定数字开始计数(参看\"+首页\")\n" -#: src/pr.c:2813 +#: src/pr.c:2787 msgid "" " -o, --indent=MARGIN\n" " offset each line with MARGIN (zero) spaces, do not\n" @@ -7578,7 +7675,7 @@ msgstr "" " -r, --no-file-warnings\n" "\t\t\t当文件无法打开时忽略警告\n" -#: src/pr.c:2820 +#: src/pr.c:2794 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -7594,7 +7691,7 @@ msgstr "" "\t\t\t另外除非-w 选项被指定，否则\"-s[CHAR]\"会屏蔽三个列相关\n" "\t\t\t的截行选项(-COLUMN|-a -COLUMN|-m)\n" -#: src/pr.c:2828 +#: src/pr.c:2802 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7602,7 +7699,6 @@ msgid "" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " -S字符串, --sep-string[=字符串]\n" "\t\t\t使用指定的字符串分栏，不使用-S 则使用默认的制表符\n" @@ -7610,7 +7706,13 @@ msgstr "" "\t\t\t分栏选项无影响\n" " -t, --omit-header\t忽略页眉和页脚\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 msgid "" " -T, --omit-pagination\n" " omit page headers and trailers, eliminate any " @@ -7631,7 +7733,7 @@ msgstr "" "\t\t\t为多栏页面输出将设置为指定的字符数(默认72)，\n" "\t\t\t仅当-s[char] 选项不启用时有效(即保持默认值 72)。\n" -#: src/pr.c:2845 +#: src/pr.c:2822 msgid "" " -W, --page-width=PAGE_WIDTH\n" " set page width to PAGE_WIDTH (72) characters always,\n" @@ -7643,16 +7745,6 @@ msgstr "" "\t\t\t总是将页宽设置为指定的(默认72)字符数，\n" "\t\t\t除非-J 选项启用总是截断行，此参数与-S 或-s 冲突\n" -#: src/pr.c:2853 -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"如果页长<=10 则使用-t 选项。如果FILE 没有定义，\n" -"或者FILE 是\"-\"，则从标准输入读入。\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -7806,18 +7898,23 @@ msgstr "" "输出一串预排的文件索引信息，包括输入文件中各单词的环境。\n" "\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 #, fuzzy 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\t\t输出自动生成的引用\n" " -G,--traditional\t\t行为类似System V 的\"ptx\"\n" " -F,--flag-trunctaion=字符串\t使用指定字符串来标识行的截断\n" #: src/ptx.c:1835 +msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 #, fuzzy msgid "" " -M, --macro-name=STRING macro name to use instead of 'xx'\n" @@ -7832,7 +7929,7 @@ msgstr "" " -S, --sentence-regexp=正则表达式\t用于匹配行末或句末\n" " -T, --format=tex\t\t生成TeX 格式输出\n" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7848,7 +7945,7 @@ msgstr "" " -i, --ignore-file=文件\t从指定文件中读取忽略单词的列表\n" " -o, --only-file=文件\t\t只从指定文件中读取单词列表\n" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7859,20 +7956,16 @@ msgstr "" " -t, --typeset-mode\t\t -- 此功能尚未实现 --\n" " -w, --width=数值\t\t每列的输出宽度，不计关联引用\n" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"如果没有指定文件，或者文件为\"-\"，则从标准输入读取。\n" - #: src/ptx.c:1951 #, c-format msgid "invalid gap width: %s" msgstr "无效的间隙宽度：%s" +#: src/ptx.c:1978 +#, c-format +msgid "invalid line width: %s" +msgstr "无效的行宽：%s" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -7900,7 +7993,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "无法切换到目录%s" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, c-format msgid "failed to stat %s" msgstr "获取%s 的文件状态失败(stat)" @@ -7920,8 +8013,8 @@ msgstr "忽略不是选项的参数" msgid "Dmitry V. Levin" msgstr "Dmitry V. Levin" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "用法：%s [选项]... 文件...\n" @@ -8153,14 +8246,14 @@ msgstr "" #: src/rm.c:342 #, fuzzy, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " msgstr[0] "%s：递归删除所有参数？" #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s：删除所有参数？" #: src/rmdir.c:134 src/rmdir.c:233 @@ -8375,12 +8468,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "无效的浮点参数：%s" -#: src/seq.c:234 +#: src/seq.c:248 #, c-format msgid "format %s has unknown %%%c directive" msgstr "格式%s 中包含未知%%%c 指令" -#: src/seq.c:557 +#: src/seq.c:603 #, c-format msgid "format string may not be specified when printing equal width strings" msgstr "当输出等宽字符串时不应再指定格式字符串" @@ -8399,7 +8492,16 @@ msgstr "" "多次覆盖文件，使得即使是昂贵的硬件探测仪器也难以将数据复原。\n" "\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"如果文件指定为\"-\"，则将输入内容复制到标准输出。\n" + +#: src/shred.c:181 #, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8412,7 +8514,7 @@ msgstr "" " --random-source=文件\t从指定文件中取出随机字节\n" " -s, --size=N\t\t粉碎数据为指定字节的碎片(可使用K、M 和G 作为单位)\n" -#: src/shred.c:183 +#: src/shred.c:187 #, fuzzy msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" @@ -8426,12 +8528,10 @@ msgstr "" " -x, --exact\t\t不将文件大小增加至最接近的块大小\n" " -z, --zero \t\t最后一次使用0 进行覆盖以隐藏覆盖动作\n" -#: src/shred.c:192 +#: src/shred.c:196 #, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -8450,7 +8550,7 @@ msgstr "" "一般文件时，绝大多数人都会使用--remove 选项。\n" "\n" -#: src/shred.c:206 +#: src/shred.c:208 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" @@ -8466,7 +8566,7 @@ msgstr "" "例子：\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 msgid "" "* log-structured or journaled file systems, such as those supplied with\n" "AIX and Solaris (and JFS, ReiserFS, XFS, Ext3, etc.)\n" @@ -8486,7 +8586,7 @@ msgstr "" "* 会不时进行快照记录的文件系统，像Network Applicance 的NFS 服务器\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8499,7 +8599,7 @@ msgstr "" "* 压缩文件系统\n" "\n" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -8517,7 +8617,7 @@ msgstr "" "您可以查看mount 的man 页面以获得详细信息。\n" "\n" -#: src/shred.c:241 +#: src/shred.c:243 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" @@ -8527,127 +8627,127 @@ msgstr "" "包含不能被删除的文件副本，这将会\n" "允许碎片文件被恢复。\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s：fadatsync 失败" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s：fsync 失败" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s：无法反绕操作" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%s：第%lu 次，共%lu 次 (%s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s：在位置%s 写入时出现错误" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s：lseek 失败" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s：文件过大" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%s：第%lu 次，共%lu 次 (%s)...%s" -#: src/shred.c:601 +#: src/shred.c:603 #, c-format msgid "%s: pass %lu/%lu (%s)...%s/%s %d%%" msgstr "%s：第%lu 次，共%lu 次 (%s)...%s/%s %d%%" -#: src/shred.c:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s：获取文件状态失败(fstat)" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s：无效的文件类型" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s：文件的大小为负数" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s：截断文件时出错" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s：文件控制操作失败(fcntl)" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s：不能对只可追加数据的文件描述符(file descriptor) 进行粉碎" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s：正在删除" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s：名称已更改为 %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s：删除失败" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s：已删除" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s：无法关闭" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s：无法以写模式打开" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" +#, fuzzy +msgid "invalid number of passes" msgstr "%s：覆盖次数无效" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, c-format msgid "multiple random sources specified" msgstr "指定了多个随机源" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" msgstr "%s：文件大小无效" -#: src/shuf.c:61 +#: src/shuf.c:62 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -8658,14 +8758,14 @@ msgstr "" "　或者: %s -e [选项]... [参数]...\n" "　或者: %s -i LO-HI [选项]...\n" -#: src/shuf.c:67 +#: src/shuf.c:68 #, fuzzy msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" "把输入行按随机顺序输出到标准输出。\n" "\n" -#: src/shuf.c:73 +#: src/shuf.c:75 #, fuzzy msgid "" " -e, --echo treat each ARG as an input line\n" @@ -8683,37 +8783,37 @@ msgstr "" " --random-source=文件\t从指定文件获得随机比特\n" " -z, --zero-terminated\t以0 结束行而非新行\n" -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "重复行过多" -#: src/shuf.c:431 +#: src/shuf.c:428 #, c-format msgid "multiple -i options specified" msgstr "指定了多个-i 选项" -#: src/shuf.c:452 -#, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "无效的输入范围：%s" -#: src/shuf.c:465 -#, c-format -msgid "invalid line count %s" +#: src/shuf.c:459 +#, fuzzy, c-format +msgid "invalid line count: %s" msgstr "无效的行数%s" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, c-format msgid "multiple output files specified" msgstr "指定了多个输出文件" -#: src/shuf.c:502 +#: src/shuf.c:496 #, c-format msgid "cannot combine -e and -i options" msgstr "不能同时指定-e 和-i 选项" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -8738,12 +8838,12 @@ msgstr "" "如果参数个数超过2 个，暂停的总时间为各个参数的值的和。\n" "\n" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, c-format msgid "invalid time interval %s" msgstr "无效的时间间隔%s" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, c-format msgid "cannot read realtime clock" msgstr "无法读取实时时钟" @@ -8755,7 +8855,7 @@ msgstr "" "串联排序所有指定文件并将结果写到标准输出。\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" @@ -8763,7 +8863,7 @@ msgstr "" "排序选项：\n" "\n" -#: src/sort.c:437 +#: src/sort.c:438 msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" " -d, --dictionary-order consider only blanks and alphanumeric " @@ -8774,7 +8874,7 @@ msgstr "" " -d, --dictionary-order\t只考虑空白区域和字母字符\n" " -f, --ignore-case\t\t忽略字母大小写\n" -#: src/sort.c:443 +#: src/sort.c:444 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -8786,12 +8886,12 @@ msgstr "" " -M, --month-sort\t\t比较 (未知) < \"一月\" < ... < \"十二月\"\n" "\t\t\t\t在LC_ALL=C 时为(unknown) < `JAN' < ... < `DEC'\n" -#: src/sort.c:448 +#: src/sort.c:449 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:451 +#: src/sort.c:452 msgid "" " -n, --numeric-sort compare according to string numerical value\n" " -R, --random-sort sort by random hash of keys\n" @@ -8803,7 +8903,7 @@ msgstr "" " --random-source=文件\t从指定文件中获得随机字节\n" " -r, --reverse\t\t\t逆序输出排序结果\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8818,7 +8918,7 @@ msgstr "" " -V, --version-sort\t\t在文本内进行自然版本排序\n" "\n" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" @@ -8826,7 +8926,7 @@ msgstr "" "其他选项：\n" "\n" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" @@ -8834,7 +8934,7 @@ msgstr "" " --batch-size=NMERGE\t一次最多合并NMERGE 个输入；如果输入更多\n" "\t\t\t\t\t则使用临时文件\n" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -8848,7 +8948,7 @@ msgstr "" " --compress-program=程序\t使用指定程序压缩临时文件；使用该程序\n" "\t\t\t\t\t的-d 参数解压缩文件\n" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8861,7 +8961,7 @@ msgstr "" " --files0-from=文件\t从指定文件读取以NUL 终止的名称，如果该文件被\n" "\t\t\t\t\t指定为\"-\"则从标准输入读文件名\n" -#: src/sort.c:487 +#: src/sort.c:488 #, fuzzy msgid "" " -k, --key=KEYDEF sort via a key; KEYDEF gives location and type\n" @@ -8871,7 +8971,7 @@ msgstr "" "\t\t\t\t参看POS 语法。\n" " -m, --merge\t\t\t合并已排序的文件，不再进行排序\n" -#: src/sort.c:491 +#: src/sort.c:492 msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" " -s, --stable stabilize sort by disabling last-resort " @@ -8882,7 +8982,7 @@ msgstr "" " -s, --stable\t\t\t禁用last-resort 比较以稳定比较算法\n" " -S, --buffer-size=大小\t指定主内存缓存大小\n" -#: src/sort.c:497 +#: src/sort.c:498 #, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8902,7 +9002,7 @@ msgstr "" " --parallel=N\t\t将同时运行的排序数改变为N\n" " -u, --unique\t\t配合-c，严格校验排序；不配合-c，则只输出一次排序结果\n" -#: src/sort.c:511 +#: src/sort.c:512 #, fuzzy msgid "" "\n" @@ -8930,12 +9030,11 @@ msgstr "" "\n" "指定的大小可以使用以下单位之一：\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -8949,269 +9048,270 @@ msgstr "" "本地环境变量会影响排序结果。\n" "如果希望以字节的自然值获得最传统的排序结果，请设置LC_ALL=C。\n" -#: src/sort.c:725 +#: src/sort.c:724 #, c-format msgid "waiting for %s [-d]" msgstr "等待 %s [-d]" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "%s [-d] 不正常结束" -#: src/sort.c:884 +#: src/sort.c:883 #, c-format msgid "cannot create temporary file in %s" msgstr "无法在%s 创建临时文件" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "打开失败" -#: src/sort.c:998 +#: src/sort.c:997 msgid "fflush failed" msgstr "冲洗流失败(fflush)" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "关闭失败" -#: src/sort.c:1140 +#: src/sort.c:1139 msgid "couldn't create temporary file" msgstr "无法创建临时文件" -#: src/sort.c:1179 +#: src/sort.c:1178 #, c-format msgid "couldn't create process for %s -d" msgstr "无法创建进程%s -d" -#: src/sort.c:1252 +#: src/sort.c:1251 #, c-format msgid "warning: cannot remove: %s" msgstr "警告：无法删除：%s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, c-format msgid "invalid --%s argument %s" msgstr "无效的 --%s 参数%s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, c-format msgid "minimum --%s argument is %s" msgstr "最小 --%s 参数是%s" -#: src/sort.c:1356 +#: src/sort.c:1355 #, c-format msgid "--%s argument %s too large" msgstr "--%s 参数%s 太长" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "最大 --%s 参数在当前资源限制(rlimit)设置下是%s" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "单个的数字必须不为零" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "获取文件状态失败(stat)" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "读取失败" -#: src/sort.c:2076 +#: src/sort.c:2075 #, c-format msgid "string transformation failed" msgstr "字符串转换失败" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "未转换的字符串为%s" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "^ 没有匹配项\n" -#: src/sort.c:2422 +#: src/sort.c:2421 #, fuzzy, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "使用了旧的值%s，考虑转为使用%s" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "值%lu 宽度为零，忽略" -#: src/sort.c:2439 +#: src/sort.c:2438 #, fuzzy, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "值%lu 开头有大量空格，考虑同时指定\"b\"" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "值%lu 为数字且跨多个域" -#: src/sort.c:2484 +#: src/sort.c:2483 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "选项\"-%s\"被忽略" -#: src/sort.c:2490 +#: src/sort.c:2489 #, fuzzy, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "选项\"-r\" 仅用于last-resort 比较" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "写入失败" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s：%s:%s：无序： " -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "标准错误" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "%s：无法反绕操作" -#: src/sort.c:4017 +#: src/sort.c:4016 #, c-format msgid "%s: invalid field specification %s" msgstr "%s：无效的区块规格%s" -#: src/sort.c:4028 +#: src/sort.c:4027 #, fuzzy, c-format msgid "options '-%s' are incompatible" msgstr "选项\"-%s\"不兼容" -#: src/sort.c:4079 +#: src/sort.c:4078 #, c-format msgid "%s: invalid count at start of %s" msgstr "%s：在%s 处的计数无效" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "在\"-\"后的编号无效" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "在\".\"后的编号无效" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "区块中有孤立字符" -#: src/sort.c:4403 +#: src/sort.c:4402 #, c-format msgid "multiple compress programs specified" msgstr "指定了多个压缩程序" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "区块起始处的编号无效" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "区块编号为零" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "字符偏移量为零" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "在\",\"后的编号无效" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "空标签" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "无法从%s 中读取文件名" -#: src/sort.c:4613 +#: src/sort.c:4612 #, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "%s：%lu：无效的 0 长度文件名" -#: src/sort.c:4619 +#: src/sort.c:4618 #, c-format msgid "no input from %s" msgstr "没有来自%s 的输入" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "使用%s 排序规则" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "使用简单字节比较" -#: src/sort.c:4699 +#: src/sort.c:4698 #, c-format msgid "extra operand %s not allowed with -%c" msgstr "不允许额外的操作数%s 与-%c 一起使用" -#: src/split.c:186 -#, c-format -msgid "the suffix length needs to be at least %zu" +#: src/split.c:207 +#, fuzzy, c-format +msgid "the suffix length needs to be at least %" msgstr "后缀长度至少应为%zu" -#: src/split.c:203 -#, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +#: src/split.c:224 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "用法：%s [选项]... [输入 [前缀]]\n" -#: src/split.c:207 +#: src/split.c:228 #, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" "将输入内容拆分为固定大小的分片并输出到\"前缀aa\"、\"前缀ab\",...；\n" "默认以 1000 行为拆分单位，默认前缀为\"x\"。如果不指定文件，或\n" "者文件为\"-\"，则从标准输入读取数据。\n" "\n" -#: src/split.c:215 +#: src/split.c:236 #, fuzzy, c-format msgid "" " -a, --suffix-length=N generate suffixes of length N (default %d)\n" " --additional-suffix=SUFFIX append an additional SUFFIX to file names\n" " -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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" " -a, --suffix-length=N\t指定后缀长度为N (默认为%d)\n" @@ -9223,23 +9323,23 @@ msgstr "" " -n, --number=块数\t\t生成块数输出文件。参看下面的说明。\n" " -u, --unbuffered\t\t立即使用-n r/... 复制输入到输出\n" -#: src/split.c:228 +#: src/split.c:251 msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr " --verbose\t\t在每个输出文件打开前输出文件特征\n" -#: src/split.c:235 +#: src/split.c:258 #, fuzzy 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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 "" "\n" "块数可能为：\n" @@ -9250,189 +9350,194 @@ msgstr "" "r/N\t类似l 但使用轮询分配\n" "r/K/N\t类似r/N 但尽将N 个文件中的第K 个输出到标准输出\n" -#: src/split.c:353 +#: src/split.c:407 #, c-format msgid "output file suffixes exhausted" msgstr "已排除输出文件后缀" -#: src/split.c:365 +#: src/split.c:419 #, c-format msgid "creating file %s\n" msgstr "正在创建文件%s\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "更新%s 的环境失败" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "无法创建硬链接%s" -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" msgstr "关闭目录%s" -#: src/split.c:410 +#: src/split.c:464 #, fuzzy, c-format msgid "closing output pipe" msgstr "正在关闭输出文件%s" -#: src/split.c:414 +#: src/split.c:468 #, fuzzy, c-format msgid "moving input pipe" msgstr "正在关闭输入文件%s" -#: src/split.c:416 +#: src/split.c:470 #, fuzzy, c-format msgid "closing input pipe" msgstr "正在关闭输入文件%s" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "无法运行命令%s" -#: src/split.c:427 +#: src/split.c:481 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "关闭目录 %s 失败" -#: src/split.c:463 +#: src/split.c:517 #, fuzzy, c-format msgid "waiting for child process" msgstr "等待拆解" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "来自命令的未知状态 (0x%X)" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "无法以多于一种的方式切分输入" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s：无效的块数" -#: src/split.c:1119 -#, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s：无效块数" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s：文件类型无效" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s：无效的字节数" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s：无效的行数" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "多字符标签%s" + +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "复用字符特殊文件" -#: src/split.c:1286 +#: src/split.c:1383 #, c-format msgid "line count option -%s%c... is too large" msgstr "行数选项-%s%c... 过大" -#: src/split.c:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "无效的起始行号：%s" -#: src/split.c:1326 -#, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s：无效的IO 块大小" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, c-format msgid "%s: cannot determine file size" msgstr "%s：无法确定文件大小" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "Michael Meskes" -#: src/stat.c:887 +#: src/stat.c:890 #, c-format msgid "failed to canonicalize %s" msgstr "标准化%s 失败" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "警告：无法识别的转义字符\"\\%c\"" -#: src/stat.c:1184 +#: src/stat.c:1187 #, c-format msgid "%s: invalid directive" msgstr "%s：无效指令" -#: src/stat.c:1231 +#: src/stat.c:1234 #, c-format msgid "warning: backslash at end of format" msgstr "警告：格式末尾出现反斜杠" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "用 %s 进行标准输入在文件系统模式下无法工作" -#: src/stat.c:1269 +#: src/stat.c:1272 #, c-format msgid "cannot read file system information for %s" msgstr "无法为 %s 读取文件系统信息" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9448,7 +9553,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9458,30 +9563,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "环境：%C\n" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9493,11 +9598,11 @@ msgstr "" "最近改动：%z\n" "创建时间：%w\n" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 #, fuzzy msgid "" " -L, --dereference follow links\n" @@ -9508,7 +9613,7 @@ msgstr "" " -L, --dereference\t跟随链接\n" " -f, --file-system\t显示文件系统状态而非文件状态\n" -#: src/stat.c:1422 +#: src/stat.c:1425 #, fuzzy msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" @@ -9524,7 +9629,7 @@ msgstr "" "\t\t\t\t加入\"\\n\"\n" " -t, --terse\t\t使用简洁格式输出\n" -#: src/stat.c:1433 +#: src/stat.c:1436 #, fuzzy msgid "" "\n" @@ -9545,7 +9650,7 @@ msgstr "" " %B 以字节为单位输出%b 所报告的每个块的大小\n" " %C SELinux 安全环境字符串\n" -#: src/stat.c:1442 +#: src/stat.c:1445 #, fuzzy msgid "" " %d device number in decimal\n" @@ -9562,7 +9667,7 @@ msgstr "" " %g\t文件的属组ID\n" " %G\t文件的属组组名\n" -#: src/stat.c:1450 +#: src/stat.c:1453 #, fuzzy msgid "" " %h number of hard links\n" @@ -9585,7 +9690,7 @@ msgstr "" " %t\t十六进制主设备类型\n" " %T\t十六进制子设备类型\n" -#: src/stat.c:1461 +#: src/stat.c:1464 #, fuzzy msgid "" " %u user ID of owner\n" @@ -9612,7 +9717,7 @@ msgstr "" " %Z\t从UNIX 元年起以秒计的上次更改时间\n" "\n" -#: src/stat.c:1475 +#: src/stat.c:1478 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -9631,7 +9736,7 @@ msgstr "" " %d\t文件系统中空闲文件节点数\n" " %f\t文件系统中空闲块数\n" -#: src/stat.c:1484 +#: src/stat.c:1487 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -9713,8 +9818,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -9744,7 +9848,7 @@ msgstr "对标准输入进行行缓冲无意义" msgid "you must specify a buffering mode option" msgstr "您必须为%2$s 中指定一个相关的%1$s" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9755,11 +9859,11 @@ msgstr "" "　或：%s [-F 设备 | --file=设备] [-a|--all]\n" "　或：%s [-F 设备 | --file=设备] [-g|--save]\n" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 #, fuzzy msgid "" " -a, --all print all current settings in human-readable form\n" @@ -9772,7 +9876,7 @@ msgstr "" " -g, --save\t\t以stty 可读取的格式输出当前全部设置\n" " -F, --file=设备\t打开并使用指定设备代替标准输入\n" -#: src/stty.c:535 +#: src/stty.c:543 msgid "" "\n" "Optional - before SETTING indicates negation. An * marks non-POSIX\n" @@ -9782,11 +9886,24 @@ msgstr "" "可选- 在设置前的指示中，* 标记出了非POSIX 标准的设置。以下系\n" "统定义象征了哪些设置是有效的。\n" -#: src/stty.c:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +#, fuzzy +msgid "" " eof CHAR CHAR will send an end of file (terminate the input)\n" " eol CHAR CHAR will end the line\n" msgstr "" @@ -9796,9 +9913,13 @@ msgstr "" " eof\t字符\t表示文件末尾而发送的字符(用于终止输入)\n" " eol\t字符\t为表示行尾而发送的字符\n" -#: src/stty.c:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 +#, fuzzy 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" @@ -9808,35 +9929,58 @@ msgstr "" " intr 字符\t用于发送中断信号的字符\n" " kill 字符\t用于擦除当前终端行的字符\n" -#: src/stty.c:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" +msgstr "" + +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" msgstr "" -" * lnext 字符\t用于输入下一个引用文字的字符\n" -" quit 字符\t用于发送退出信号的字符\n" -" * rprnt 字符\t用于重绘当前行的字符\n" -" start 字符\t在停止后重新开启输出的字符\n" -#: src/stty.c:559 +#: src/stty.c:593 +#, fuzzy msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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 字符\t停止输出的字符\n" " susp 字符\t发送终端阻断信号的字符\n" " * swtch 字符\t在不同的shell 层次间切换的字符\n" " * werase 字符\t擦除前一个输入的单词的字符\n" -#: src/stty.c:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 +#, fuzzy msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" +"\n" +"特殊设置：\n" +" N\t\t设置输入输出速度为N 波特\n" +" * cols N\t统治内核终端上有N 栏\n" +" * columns N\t等于cols N\n" + +#: src/stty.c:614 +#, fuzzy +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" @@ -9846,10 +9990,17 @@ msgstr "" " * cols N\t统治内核终端上有N 栏\n" " * columns N\t等于cols N\n" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 +#, fuzzy 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" @@ -9859,11 +10010,21 @@ msgstr "" " min N\t和 -icanon 配合使用，设置每次一完整读入的最小字符数为\n" " ospeed N\t设置输出速度为N 波特\n" -#: src/stty.c:578 +#: src/stty.c:632 +#, fuzzy 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" +msgstr "" +" * rows N\t向内核通告此终端有N 行\n" +" * size\t根据内核信息输出当前终端的行数和列数\n" +" speed\t输出终端速度(单位为波特)\n" +" time N\t和-icanon 配合使用，设置读取超时为N 个十分之一秒\n" + +#: src/stty.c:637 +#, fuzzy +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" @@ -9872,25 +10033,27 @@ msgstr "" " speed\t输出终端速度(单位为波特)\n" " time N\t和-icanon 配合使用，设置读取超时为N 个十分之一秒\n" -#: src/stty.c:584 -#, fuzzy +#: src/stty.c:641 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\t禁用调制解调器控制信号\n" -" [-]cread\t允许接收输入\n" -" * [-]crtscts\t启用RTS/CTS 握手\n" -" csN\t\t设置字符大小为N 位，N 的范围为5 到8\n" -#: src/stty.c:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 #, fuzzy msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" @@ -9899,7 +10062,6 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" " [-]cstopb\t每个字符使用2 位停止位 (要恢复成1 位配合\"-\"即可)\n" " [-]hup\t当最后一个进程关闭标准终端后发送挂起信号\n" @@ -9907,7 +10069,12 @@ msgstr "" " [-]parenb\t对输出生成奇偶校验位并等待输入的奇偶校验位\n" " [-]parodd\t设置校验位为奇数 (配合\"-\"则为偶数)\n" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 +#, fuzzy msgid "" "\n" "Input settings:\n" @@ -9915,6 +10082,7 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" "\n" "输入设置：\n" @@ -9923,10 +10091,14 @@ msgstr "" " [-]ignbrk\t忽略中断字符\n" " [-]igncr\t忽略回车\n" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +#, fuzzy +msgid "" " [-]inlcr translate newline to carriage return\n" " [-]inpck enable input parity checking\n" " [-]istrip clear high (8th) bit of input characters\n" @@ -9937,14 +10109,23 @@ msgstr "" " [-]inpck\t启用输入奇偶性校验\n" " [-]istrip\t剥除输入字符的高8 位比特\n" -#: src/stty.c:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr " * [-]iutf8\t假定输入字符都是UTF-8 编码\n" -#: src/stty.c:619 +#: src/stty.c:697 +#, fuzzy +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr " * [-]iutf8\t假定输入字符都是UTF-8 编码\n" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +#, fuzzy +msgid "" " [-]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" @@ -9957,60 +10138,83 @@ msgstr "" " [-]parmrk\t标记奇偶校验错误 (结合255-0 字符序列)\n" " [-]tandem\t等于[-]ixoff\n" -#: src/stty.c:627 +#: src/stty.c:712 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 "" -"\n" -"输出设置：\n" -" * bsN\t\t退格延迟的风格，N 的值为0 至1\n" -" * crN\t\t回车延迟的风格，N 的值为0 至3\n" -" * ffN\t\t换页延迟的风格，N 的值为0 至1\n" -" * nlN\t\t换行延迟的风格，N 的值为0 至1\n" -#: src/stty.c:635 -#, fuzzy +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]ofill use fill (padding) characters instead of timing for delays\n" -" * [-]olcuc translate lowercase characters to uppercase\n" -" * [-]onlcr translate newline to carriage return-newline\n" -" * [-]onlret newline performs a carriage return\n" msgstr "" -" * [-]ocrnl\t将回车转换为换行符\n" -" * [-]ofdel\t使用删除字符代替空字符作填充\n" -" * [-]ofill\t延迟时使用字符填充代替定时器同步\n" -" * [-]olcuc\t转换小写字母为大写\n" -" * [-]onlcr\t将换行符转换为回车\n" -" * [-]onlret\t使得换行符的行为表现和回车相同\n" -#: src/stty.c:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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 "" -" * [-]onocr\t不在第一列输出回车\n" -" [-]opost\t后续进程输出\n" -" * tabN\t水平制表符延迟的风格，N 的值为0 至3\n" -" * tabs\t等于tab0\n" -" * -tabs\t等于tab3\n" -" * vtN\t\t垂直制表符延迟的风格，N 的值为0 至1\n" -#: src/stty.c:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +#, fuzzy +msgid "" " * 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 "" @@ -10020,45 +10224,55 @@ msgstr "" " * crtkill\t依照echoprt 和echoe 的设置清除所有行\n" " * -crtkill\t依照echoctl 和echol 的设置清除所有行\n" -#: src/stty.c:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 #, fuzzy +msgid " [-]echo echo input characters\n" +msgstr " * [-]iutf8\t假定输入字符都是UTF-8 编码\n" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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 "" -" * [-]ctlecho\t在头字符中输出控制符号(\"^c\")\n" -" [-]echo\t回显输入字符\n" -" * [-]echoctl\t等于[-]ctlecho\n" -" [-]echoe 等于[-]crterase\n" -" [-]echok\t在每清除一个字符后输出一次换行\n" -#: src/stty.c:665 -#, fuzzy +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -" * [-]echoke\t等于[-]crtkill 意义相同\n" -" [-]echonl\t即使没有回显任何其它字符也输出换行\n" -" * [-]echoprt\t在\"\\\"和\"/\"之间向后显示擦除的字符\n" -" [-]icanon\t启用erase、kill、werase 和rprnt 等特殊字符\n" -" [-]iexten\t允许POSIX 标准以外的特殊字符\n" -#: src/stty.c:672 +#: src/stty.c:843 #, fuzzy 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 "" " [-]isig\t启用interrupt、quit和suspend 等特殊字符\n" " [-]noflsh\t在interrupt 和 quit 特殊字符后禁止刷新\n" @@ -10066,11 +10280,33 @@ msgstr "" " * [-]tostop\t中止尝试向终端写入数据的后台任务\n" " * [-]xcase\t和icanon 配合使用，用转义符\"\\\"退出大写状态\n" -#: src/stty.c:679 +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" +" * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" +" * [-]xcase with icanon, escape with '\\' for uppercase characters\n" +msgstr "" + +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +#, fuzzy +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" @@ -10080,48 +10316,59 @@ msgstr "" " cbreak\t等于-icanon\n" " -cbreak\t等于icanon\n" -#: src/stty.c:686 +#: src/stty.c:875 +#, fuzzy 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\t等于brkint ignpar istrip icrnl ixon opost isig icanon eof \t\t" "\teol 等的默认值\n" " -cooked\t等于-raw\n" " crt\t\t等于echoe echoctl echoke\n" -#: src/stty.c:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" msgstr "" -" dec\t\t等于echoe echoctl echoke -ixany intr ^c erase 0177 kill ^u\n" -" * [-]decctlq\t等于[-]ixany\n" -" ek\t\t清除所有字符，将它们回溯为默认值\n" -" evenp\t等于parenb -parodd cs7\n" -#: src/stty.c:699 +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" +msgstr "" + +#: src/stty.c:919 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 "" -" -evenp\t等于-parenb cs8\n" -" * [-]lcase\t等于xcase iuclc olcuc\n" -" litout\t等于-parenb -istrip -opost cs8\n" -" -litout\t等于parenb istrip opost cs7\n" -" nl\t\t等于-icrnl -onlcr\n" -" -nl\t\t等于icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" -#: src/stty.c:707 +#: src/stty.c:923 +#, fuzzy, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr " -g\t\t\t\t类似-l，但不列出所有者\n" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -10135,11 +10382,12 @@ msgstr "" " pass8\t等于-parenb -istrip cs8\n" " -pass8\t等于parenb istrip cs7\n" -#: src/stty.c:714 +#: src/stty.c:950 +#, fuzzy, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" " raw\t\t等于-ignbrk -brkint -ignpar -parmrk -inpck -istrip\n" @@ -10147,14 +10395,15 @@ msgstr "" " -imaxbel -opost -isig -icanon -xcase min 1 time 0\n" " -raw\t等于cooked\n" -#: src/stty.c:720 +#: src/stty.c:969 +#, fuzzy, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" " sane\t等于cread -ignbrk brkint -inlcr -igncr icrnl -iutf8\n" "\t\t-ixoff -iuclc -ixany imaxbel opost -olcuc -ocrnl onlcr\n" @@ -10163,7 +10412,7 @@ msgstr "" "\t\t-xcase -tostop -echoprt echoctl echoke，所有特殊字符均\n" "\t\t使用默认值\n" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -10177,57 +10426,62 @@ msgstr "" "规则以及与标准stty 设置间的偏差。在设置中，字符会被逐字读取或是被编码为^c、\n" "0x37、0177 或127 这样的字符，其中有特殊值^- 或undef 被用于禁止特殊字符。\n" -#: src/stty.c:800 +#: src/stty.c:1124 #, c-format msgid "only one device may be specified" msgstr "只能指定一个设备" -#: src/stty.c:830 +#: src/stty.c:1154 #, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "verbose 和 stty-readable 两种输入风格的选项是互相抵触的" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "当指定了输出风格时，模式不能再被设置" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "%s：无法重置非阻塞模式" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, c-format msgid "invalid argument %s" msgstr "无效的参数 %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, c-format msgid "missing argument to %s" msgstr "缺少%s 的参数" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s：截断文件时出错" + +#: src/stty.c:1331 #, c-format msgid "invalid line discipline %s" msgstr "无效的行约束%s" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "%s：无法执行所有请求的操作" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "%s：此设备没有大小信息" -#: src/stty.c:1924 -#, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "无效的整数参数%s" #. This is a proper name. See the gettext manual, section Names. @@ -10236,8 +10490,15 @@ msgid "Kayvan Aghaiepour" msgstr "Kayvan Aghaiepour" #: src/sum.c:62 +#, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"输出每个文件的 CRC 校验值和字节统计。\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -10247,20 +10508,54 @@ msgstr "" " -r\t\t使用BSD 加和算法，以1 KB 为一个块\n" " -s, --sysv\t使用System V 加和算法，以51双字节为一个块\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "用法：%s [选项] [文件]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"强迫将已更改的数据写入磁盘，并更新超级块。\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" + +#: src/sync.c:114 +#, fuzzy, c-format +msgid "error opening %s" +msgstr "读取%s 时出错" -#: src/sync.c:69 +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "%s：无法重置非阻塞模式" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "读取%s 时出错" + +#: src/sync.c:212 #, c-format -msgid "ignoring all arguments" -msgstr "忽略任何参数" +msgid "cannot specify both --data and --file-system" +msgstr "" -#: src/system.h:343 +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -10269,25 +10564,34 @@ msgid "" "for details about the options it supports.\n" msgstr "" "\n" -"注意：您的shell 内含自己的%s 程序版本，它会覆盖这里所提及的相应\n" +"注意：您的shell 可能内置了自己的%s 程序版本，它会覆盖这里所提及的相应\n" "版本。请查阅您的shell 文档获知它所支持的选项。\n" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help\t\t显示此帮助信息并退出\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version\t\t显示版本信息并退出\n" -#: src/system.h:543 -#, fuzzy +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"如果没有指定文件，或者文件为\"-\"，则从标准输入读取。\n" + +#: src/system.h:544 msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "长选项必须使用的参数对于短选项时也是必需使用的。\n" +msgstr "" +"\n" +"必选参数对长短选项同时适用。\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -10295,7 +10599,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -10308,7 +10612,7 @@ msgstr "" "及 BLOCKSIZE 环境变量中第一个可用的 SIZE 单位。\n" "否则，默认单位是 1024 字节(或是 512，若设定 POSIXLY_CORRECT 的话)。\n" -#: src/system.h:570 +#: src/system.h:590 #, fuzzy, c-format msgid "" "\n" @@ -10319,23 +10623,28 @@ msgstr "%s 的主页：<%s>\n" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" "请向 报告%s 的翻译错误\n" -#: src/system.h:584 +#: src/system.h:604 +#, c-format +msgid "Full documentation at: <%s%s>\n" +msgstr "" + +#: src/system.h:606 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" -msgstr "要获取完整文档，请运行：info coreutils '%s invocation'\n" +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "" -#: src/system.h:591 +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "请尝试执行\"%s --help\"来获取更多信息。\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -10357,9 +10666,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "将每个指定文件按行倒置并写到标准输出。\n" "如果不指定文件，或文件为\"-\"，则从标准输入读取数据。\n" @@ -10375,64 +10682,63 @@ msgstr "" " -r, --regex\t\t\t将分隔标志视作正则表达式来解析\n" " -s, --separator=字符串\t使用指定字符串代替换行作为分隔标志\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, c-format msgid "%s: seek failed" msgstr "%s：检索失败" -#: src/tac.c:263 +#: src/tac.c:277 #, c-format msgid "record too large" msgstr "记录数据过大" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "无法在%s 创建临时文件" -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s：无法以写模式打开" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "无法保留%s 的时间" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, c-format msgid "%s: write error" msgstr "%s：写入出错" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "无法打开%s 读取数据" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "分隔符不能为空" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "Ian Lance Taylor" -#: src/tail.c:262 +#: src/tail.c:257 #, 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" msgstr "" "显示每个指定文件的最后%d 行到标准输出。\n" "若指定了多于一个文件，程序会在每段输出的开始添加相应文件名作为头。\n" "如果不指定文件或文件为\"-\" ，则从标准输入读取数据。\n" "\n" -#: src/tail.c:270 +#: src/tail.c:265 #, fuzzy msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" @@ -10441,7 +10747,7 @@ msgstr "" " -c, --bytes=K\t\t输出最后K 字节；另外，使用-c +K 从每个文件的\n" "\t\t\t第K 字节输出\n" -#: src/tail.c:274 +#: src/tail.c:269 #, fuzzy msgid "" " -f, --follow[={name|descriptor}]\n" @@ -10454,7 +10760,7 @@ msgstr "" "\t\t\t-f, --follow 等于--follow=descriptor \n" " -F\t\t即--follow=name --retry\n" -#: src/tail.c:280 +#: src/tail.c:275 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -10474,7 +10780,7 @@ msgstr "" "\t\t\t\t接或重命名(这是循环日志文件的通常情况)。\n" "\t\t\t\t由于有inotify，这个选项很少使用。\n" -#: src/tail.c:293 +#: src/tail.c:288 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -10486,7 +10792,7 @@ msgstr "" " --retry\t\t即使目标文件不可访问依然试图打开；在与参数\n" "\t\t\t--follow=name 同时使用时常常有用。\n" -#: src/tail.c:298 +#: src/tail.c:293 #, fuzzy msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" @@ -10499,7 +10805,7 @@ msgstr "" "\t\t\t\t(默认1.0 秒)\n" " -v, --verbose\t\t总是输出给出文件名的头\n" -#: src/tail.c:307 +#: src/tail.c:302 #, fuzzy msgid "" "\n" @@ -10518,7 +10824,7 @@ msgstr "" "GB 1000*1000*1000，G 1024*1024*1024，以及T，P，E，Z，Y。\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 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" @@ -10532,169 +10838,169 @@ msgstr "" "tail 定期追踪打开给定名称的文件，以确认它是否被删除或被其它某些程序重新创建" "过。\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "正在关闭 %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s：无法检索相对偏移量的末尾 %s" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "无法定位 %s 的位置，回归为 polling 机制" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, fuzzy, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "%s 已被替换为一个远程文件，放弃跟踪" -#: src/tail.c:980 +#: src/tail.c:973 #, c-format msgid "%s has become inaccessible" msgstr "%s 已不可访问" -#: src/tail.c:997 +#: src/tail.c:990 #, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "%s 已被替换为tail 无法处理的文件，放弃跟踪" -#: src/tail.c:1006 +#: src/tail.c:999 #, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "%s 已被替换为一个远程文件，放弃跟踪" -#: src/tail.c:1027 +#: src/tail.c:1020 #, c-format msgid "%s has become accessible" msgstr "%s 已经可以访问" -#: src/tail.c:1035 -#, c-format -msgid "%s has appeared; following end of new file" +#: src/tail.c:1032 +#, fuzzy, c-format +msgid "%s has appeared; following new file" msgstr "%s 已被建立，正在跟随新文件的末尾" -#: src/tail.c:1046 -#, c-format -msgid "%s has been replaced; following end of new file" +#: src/tail.c:1042 +#, fuzzy, c-format +msgid "%s has been replaced; following new file" msgstr "%s 已被替换，正在跟随新文件的末尾" -#: src/tail.c:1163 +#: src/tail.c:1159 #, c-format msgid "%s: cannot change nonblocking mode" msgstr "%s：无法更改非阻塞模式" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s：文件已截断" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "没有剩余文件" -#: src/tail.c:1424 +#: src/tail.c:1440 #, c-format msgid "cannot watch parent directory of %s" msgstr "无法监视%s 的上级目录" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, c-format msgid "inotify resources exhausted" msgstr "inotify 资源耗尽" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, c-format msgid "cannot watch %s" msgstr "无法监视%s" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s：是否替换%s？ " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "监视inotify 事件出错" -#: src/tail.c:1549 +#: src/tail.c:1597 #, c-format msgid "error reading inotify event" msgstr "读取inotify 事件出错" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "%s：无法跟随此类型文件的末尾，已放弃" -#: src/tail.c:1961 -#, c-format -msgid "number in %s is too large" -msgstr "%s 中的数字过大" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "%s：两次打开的间隔因过大而无效" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s：无效的进程号" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s：无效的秒数" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "无效的列数：%s" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "在未定义环境中的无效选项 -- %c" -#: src/tail.c:2096 +#: src/tail.c:2135 #, fuzzy, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "警告：已忽略进程号，只有在跟随模式下--pid=PID 选项才是有用的" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "警告：已忽略进程号，只有在跟随模式下--pid=PID 选项才是有用的" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "警告：此系统不支持--pid=PID" -#: src/tail.c:2209 +#: src/tail.c:2250 #, c-format msgid "cannot follow %s by name" msgstr "无法按名称跟随%s" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "警告：无限期跟随标准输入是无用的" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "无法使用 inotify 机制，回归为 polling 机制" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -10706,60 +11012,72 @@ msgstr "" " -a, --append\t\t内容追加到给定的文件而非覆盖\n" " -i, --ignore-interrupts\t忽略中断信号\n" -#: src/tee.c:71 +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"如果文件指定为\"-\"，则将输入内容复制到标准输出。\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, c-format msgid "missing argument after %s" msgstr "%s 后缺少参数" -#: src/test.c:159 +#: src/test.c:161 #, c-format msgid "invalid integer %s" msgstr "无效的整数%s" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "预期为')'" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "预期为 ')'，实际为%s" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, c-format msgid "%s: unary operator expected" msgstr "%s: 预期为单目运算符" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "-nt 不能与-l 同时使用" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "-ef 不能与-l 同时使用" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "-ot 不能于-l 同时使用" -#: src/test.c:367 +#: src/test.c:369 msgid "unknown binary operator" msgstr "未知双目运算符" -#: src/test.c:646 +#: src/test.c:648 #, c-format msgid "%s: binary operator expected" msgstr "%s: 预期为双目运算符" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -10773,7 +11091,7 @@ msgstr "" "　或：[ ]\n" "　或：[ 选项\n" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" @@ -10781,7 +11099,7 @@ msgstr "" "退出状态值取决于表达式。\n" "\n" -#: src/test.c:717 +#: src/test.c:719 msgid "" "\n" "An omitted EXPRESSION defaults to false. Otherwise,\n" @@ -10791,7 +11109,7 @@ msgstr "" "被省略的表达式的值默认为假，否则可能为真也可能为假，\n" "并会被设为退出状态值。有效的表达式应属于下列之一：\n" -#: src/test.c:722 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -10805,7 +11123,7 @@ msgstr "" " 表达式1 -a 表达式2\t两个表达式的值都为真时结果为真(与)\n" " 表达式1 -o 表达式2\t两个表达式中任一的值为真时结果为真(或)\n" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -10821,7 +11139,7 @@ msgstr "" " 字符串1 = 字符串2\t两个字符串相等\n" " 字符串1 != 字符串2\t两个字符串不等\n" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -10839,7 +11157,7 @@ msgstr "" " 整数1 -lt 整数2\t整数1 小于 整数2\n" " 整数1 -ne 整数2\t整数1 不等于整数2\n" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -10851,7 +11169,7 @@ msgstr "" " 文件1 -nt 文件2\t文件1 的上次修改时间新于文件2\n" " 文件1 -ot 文件2\t文件1 的上次修改时间旧于文件2\n" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -10865,7 +11183,7 @@ msgstr "" " -d 文件\t\t指定文件存在且为目录\n" " -e 文件\t\t指定文件存在\n" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -10879,7 +11197,7 @@ msgstr "" " -h 文件\t\t指定文件存在且为符号链接 (等价于 -L)\n" " -k 文件\t\t指定文件存在且设置了粘附位\n" -#: src/test.c:766 +#: src/test.c:768 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" @@ -10893,7 +11211,7 @@ msgstr "" " -r 文件\t\t指定文件存在且具备读取权限\n" " -s 文件\t\t指定文件存在且其大小大于0\n" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -10907,7 +11225,7 @@ msgstr "" " -w 文件\t\t指定文件存在且具备写入权限\n" " -x 文件\t\t指定文件存在且具备执行或搜索(针对目录)权限\n" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -10920,7 +11238,7 @@ msgstr "" "请留心您在必要时需由shell 转义圆括号字符(例如使用反斜杠)。\n" "指定整数也可用\"-l 字符串\"表示，这会估算相应字符串的长度。\n" -#: src/test.c:786 +#: src/test.c:788 msgid "" "\n" "NOTE: [ honors the --help and --version options, but test does not.\n" @@ -10930,26 +11248,26 @@ msgstr "" "注意：[ 服从 --help 和 --version 选项但 test 不同。\n" "test 将其和其他非空字符串同能对待。\n" -#: src/test.c:791 +#: src/test.c:793 msgid "test and/or [" msgstr "test 和/或[" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "Kevin Braunsdorf" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "Matthew Bradburn" -#: src/test.c:858 +#: src/test.c:860 #, fuzzy msgid "missing ']'" msgstr "缺少\"]\"" -#: src/test.c:872 +#: src/test.c:874 #, c-format msgid "extra argument %s" msgstr "多余的参数%s" @@ -10969,7 +11287,7 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -10978,15 +11296,11 @@ msgstr "" "用法：%s [选项] 停留时间 命令 [参数]...\n" "　或：%s 选项\n" -#: src/timeout.c:232 -#, fuzzy +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" -msgstr "" -"运行指定命令，在指定的停留时间后若该命令仍在运行则将其中止。\n" -"\n" -"长选项必须使用的参数对于短选项时也是必需使用的。\n" +msgstr "运行指定命令，在指定的停留时间后若该命令仍在运行则将其中止。\n" -#: src/timeout.c:238 +#: src/timeout.c:240 #, fuzzy msgid "" " --preserve-status\n" @@ -11010,7 +11324,7 @@ msgstr "" "\t\t指定在超时时发送的信号。信号可以是类似\"HUP\"的信号名或是信号数。\n" "\t\t查看\"kill -l\"以获得信号列表\n" -#: src/timeout.c:257 +#: src/timeout.c:259 #, fuzzy msgid "" "\n" @@ -11023,7 +11337,7 @@ msgstr "" "\"s\"代表秒(默认值)，\"m\"代表分，\"h\"代表小时，\"d\"代表天。\n" "\n" -#: src/timeout.c:262 +#: src/timeout.c:264 #, fuzzy msgid "" "\n" @@ -11040,7 +11354,7 @@ msgstr "" "程。\n" "对于另一些进程可能需要使用KILL (9)信号，当然此信号不能被捕获。\n" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -11055,6 +11369,11 @@ msgstr "等待命令出错" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, fuzzy, c-format +msgid "unknown status from command (%d)" +msgstr "来自命令的未知状态 (0x%X)" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -11402,12 +11721,12 @@ msgstr "以表示成功的状态值退出" msgid "Exit with a status code indicating failure." msgstr "以表示失败的状态值退出" -#: src/truncate.c:96 +#: src/truncate.c:69 #, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "用法：%s 选项... 文件...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 #, fuzzy msgid "" "Shrink or extend the size of each FILE to the specified size\n" @@ -11426,16 +11745,16 @@ msgstr "" "如果指定文件小于指定大小则用0 补足。\n" "\n" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr " -c, --no-create\t不创建文件\n" -#: src/truncate.c:112 +#: src/truncate.c:85 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:115 +#: src/truncate.c:88 #, fuzzy msgid "" " -r, --reference=RFILE base size on RFILE\n" @@ -11444,7 +11763,7 @@ msgstr "" " -r, --reference=文件 使用此文件的大小\n" " -s, --size=大小\t使用此大小\n" -#: src/truncate.c:121 +#: src/truncate.c:94 #, fuzzy msgid "" "\n" @@ -11461,57 +11780,62 @@ msgstr "" "\"/\" 运算的数学计算式为 m / n * n；\n" "\"%\" 运算的数学计算式为( m + n - 1 ) / n * n\n" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "在文件%3$s 的%1$ * %2$ 字节块中溢出" -#: src/truncate.c:173 +#: src/truncate.c:146 #, c-format msgid "%s has unusable, apparently negative size" msgstr "%s 的文件大小为负数，无法使用" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, c-format msgid "cannot get the size of %s" msgstr "无法获得%s 的大小" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "处理大于等于文件%s 的指定大小的最大倍数时溢出" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "扩展文件%s 大小时溢出" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "在%2$ 字节处截断%1$s 失败" -#: src/truncate.c:303 +#: src/truncate.c:276 #, c-format msgid "multiple relative modifiers specified" msgstr "指定了多个相关修饰符" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "无效的数字%s" + +#: src/truncate.c:307 #, c-format msgid "you must specify either %s or %s" msgstr "您必须在%s 或%s 中指定一个" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "您必须为%2$s 中指定一个相关的%1$s" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "已指定%s 但未指定%s" -#: src/truncate.c:404 +#: src/truncate.c:378 #, c-format msgid "cannot open %s for writing" msgstr "无法打开%s 读取数据" @@ -11522,24 +11846,27 @@ msgid "Mark Kettenis" msgstr "Mark Kettenis" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "用法：%s [选项] [文件]\n" "对不完全排序的文件实行完整的列表排序。\n" "如果不指定文件，或者文件为\"-\"，则从标准输入读取数据。\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "\n" + +#: src/tsort.c:475 #, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s：输入内容的行数为奇数" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s：输入内容中含有循环段落：" @@ -11605,9 +11932,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "将每个指定文件中的空白字符转换为制表符并写到标准输出。\n" "如果不指定文件，或者文件为\"-\"，则从标准输入读取数据。\n" @@ -11664,8 +11989,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -11676,7 +12001,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -11822,11 +12147,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr " 处于不可中断睡眠状态的程序同样影响系统平均负载。\n" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "\n" - #: src/uptime.c:214 #, c-format msgid "" @@ -11847,13 +12167,17 @@ msgstr "" "如果文件未予指定，则使用%s，%s 是通用的相关文件。\n" "\n" -#: src/wc.c:117 -#, fuzzy +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -11867,12 +12191,13 @@ msgstr "" " -m, --chars\t\t输出字符数统计\n" " -l, --lines\t\t输出行数统计\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" " --files0-from=文件\t从指定文件读取以NUL 终止的名称，如果该文件被\n" @@ -12035,10 +12360,10 @@ msgstr "" "与id -un 相同。\n" "\n" -#: src/whoami.c:91 -#, c-format -msgid "%s: cannot find name for user ID %lu\n" -msgstr "%s：无法找到用户ID 为%lu 的用户名\n" +#: src/whoami.c:87 +#, fuzzy, c-format +msgid "cannot find name for user ID %lu" +msgstr "无法找到ID 为%lu 的用户的名称" #: src/yes.c:41 #, c-format @@ -12058,6 +12383,278 @@ msgstr "" "重复输出一行指定的字符串，或者重复输出\"y\"。\n" "\n" +#, fuzzy +#~| msgid "failed to set supplemental group(s)" +#~ msgid "failed to %s supplemental groups" +#~ msgstr "设置附加组失败" + +#~ msgid "%s: invalid number" +#~ msgstr "%s：无效数字" + +#, fuzzy +#~| 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" +#~ 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 "" +#~ "\n" +#~ "对运行中的\"dd\"进程发送一个%s 信号会使得\n" +#~ "I/O 的统计信息被打印到标准错误设备然后恢复复制操作。\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" +#~ "可用选项有：\n" +#~ "\n" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s：%s 过大以至于无法表示" + +#~ msgid "number of lines" +#~ msgstr "参数数目错误" + +#~ msgid "number of bytes" +#~ msgstr "字节数" + +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s：无效的忽略数" + +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "如果页长<=10 则使用-t 选项。如果FILE 没有定义，\n" +#~ "或者FILE 是\"-\"，则从标准输入读入。\n" + +#, fuzzy +#~| msgid "" +#~| "\n" +#~| "With no FILE, or when FILE is -, read standard input.\n" +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "如果没有指定文件，或者文件为\"-\"，则从标准输入读取。\n" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s：无效的字节数" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s：无效的行数" + +#~ 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 字符\t用于输入下一个引用文字的字符\n" +#~ " quit 字符\t用于发送退出信号的字符\n" +#~ " * rprnt 字符\t用于重绘当前行的字符\n" +#~ " start 字符\t在停止后重新开启输出的字符\n" + +#, 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" +#~| " csN set character size to N bits, N in [5..8]\n" +#~ 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\t禁用调制解调器控制信号\n" +#~ " [-]cread\t允许接收输入\n" +#~ " * [-]crtscts\t启用RTS/CTS 握手\n" +#~ " csN\t\t设置字符大小为N 位，N 的范围为5 到8\n" + +#~ 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 "" +#~ "\n" +#~ "输出设置：\n" +#~ " * bsN\t\t退格延迟的风格，N 的值为0 至1\n" +#~ " * crN\t\t回车延迟的风格，N 的值为0 至3\n" +#~ " * ffN\t\t换页延迟的风格，N 的值为0 至1\n" +#~ " * nlN\t\t换行延迟的风格，N 的值为0 至1\n" + +#, fuzzy +#~| 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" +#~ msgid "" +#~ " * [-]ocrnl translate carriage return to newline\n" +#~ " * [-]ofdel use delete characters for fill instead of NUL " +#~ "characters\n" +#~ " * [-]ofill use fill (padding) characters instead of timing for " +#~ "delays\n" +#~ " * [-]olcuc translate lowercase characters to uppercase\n" +#~ " * [-]onlcr translate newline to carriage return-newline\n" +#~ " * [-]onlret newline performs a carriage return\n" +#~ msgstr "" +#~ " * [-]ocrnl\t将回车转换为换行符\n" +#~ " * [-]ofdel\t使用删除字符代替空字符作填充\n" +#~ " * [-]ofill\t延迟时使用字符填充代替定时器同步\n" +#~ " * [-]olcuc\t转换小写字母为大写\n" +#~ " * [-]onlcr\t将换行符转换为回车\n" +#~ " * [-]onlret\t使得换行符的行为表现和回车相同\n" + +#~ 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 "" +#~ " * [-]onocr\t不在第一列输出回车\n" +#~ " [-]opost\t后续进程输出\n" +#~ " * tabN\t水平制表符延迟的风格，N 的值为0 至3\n" +#~ " * tabs\t等于tab0\n" +#~ " * -tabs\t等于tab3\n" +#~ " * vtN\t\t垂直制表符延迟的风格，N 的值为0 至1\n" + +#, fuzzy +#~| 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" +#~ 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 "" +#~ " * [-]ctlecho\t在头字符中输出控制符号(\"^c\")\n" +#~ " [-]echo\t回显输入字符\n" +#~ " * [-]echoctl\t等于[-]ctlecho\n" +#~ " [-]echoe 等于[-]crterase\n" +#~ " [-]echok\t在每清除一个字符后输出一次换行\n" + +#, fuzzy +#~| 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" +#~ 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 "" +#~ " * [-]echoke\t等于[-]crtkill 意义相同\n" +#~ " [-]echonl\t即使没有回显任何其它字符也输出换行\n" +#~ " * [-]echoprt\t在\"\\\"和\"/\"之间向后显示擦除的字符\n" +#~ " [-]icanon\t启用erase、kill、werase 和rprnt 等特殊字符\n" +#~ " [-]iexten\t允许POSIX 标准以外的特殊字符\n" + +#~ 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 "" +#~ " dec\t\t等于echoe echoctl echoke -ixany intr ^c erase 0177 kill ^u\n" +#~ " * [-]decctlq\t等于[-]ixany\n" +#~ " ek\t\t清除所有字符，将它们回溯为默认值\n" +#~ " evenp\t等于parenb -parodd cs7\n" + +#~ 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 "" +#~ " -evenp\t等于-parenb cs8\n" +#~ " * [-]lcase\t等于xcase iuclc olcuc\n" +#~ " litout\t等于-parenb -istrip -opost cs8\n" +#~ " -litout\t等于parenb istrip opost cs7\n" +#~ " nl\t\t等于-icrnl -onlcr\n" +#~ " -nl\t\t等于icrnl -inlcr -igncr onlcr -ocrnl -onlret\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "强迫将已更改的数据写入磁盘，并更新超级块。\n" +#~ "\n" + +#~ msgid "ignoring all arguments" +#~ msgstr "忽略任何参数" + +#~ msgid "For complete documentation, run: info coreutils '%s invocation'\n" +#~ msgstr "要获取完整文档，请运行：info coreutils '%s invocation'\n" + +#~ msgid "number in %s is too large" +#~ msgstr "%s 中的数字过大" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s：无效的秒数" + +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s：无法找到用户ID 为%lu 的用户名\n" + #~ msgid "" #~ "\n" #~ "Examples:\n" @@ -12183,17 +12780,6 @@ msgstr "" #~ msgid "accessing %s" #~ msgstr "正在访问%s" -#~ msgid "" -#~ "Display the current time in the given FORMAT, or set the system date.\n" -#~ "\n" -#~ " -d, --date=STRING display time described by STRING, not `now'\n" -#~ " -f, --file=DATEFILE like --date once for each line of DATEFILE\n" -#~ msgstr "" -#~ "以给定的格式显示当前时间，或是设置系统日期。\n" -#~ "\n" -#~ " -d,--date=字符串\t\t显示指定字符串所描述的时间，而非当前时间\n" -#~ " -f,--file=日期文件\t\t类似--date，从日期文件中按行读入时间描述\n" - #~ msgid "opening %s" #~ msgstr "正在打开%s" @@ -12833,9 +13419,6 @@ msgstr "" #~ msgid "cannot run strip" #~ msgstr "无法执行 strip 命令" -#~ msgid "Usage: %s [OPTION] [FILE]...\n" -#~ msgstr "用法：%s [选项] [文件]...\n" - #~ msgid "" #~ " -x, --one-file-system skip directories on different file systems\n" #~ " -X FILE, --exclude-from=FILE Exclude files that match any pattern in " diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo index af3ace4e..4083ff3a 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 45a63902..8f488684 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,11 +9,12 @@ # # Abel Cheung , 2005. # +#: src/stty.c:941 msgid "" msgstr "" "Project-Id-Version: coreutils 5.3.0\n" "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n" -"POT-Creation-Date: 2014-07-18 20:17+0100\n" +"POT-Creation-Date: 2015-07-03 22:03+0100\n" "PO-Revision-Date: 2005-07-02 04:13+0800\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (traditional) \n" @@ -42,18 +43,18 @@ msgstr "有效的參數為：" msgid "error closing file" msgstr "正在關閉輸入檔 %s" -#: lib/closeout.c:112 src/base64.c:113 src/base64.c:125 src/base64.c:131 -#: src/base64.c:172 src/base64.c:228 src/cat.c:186 src/cat.c:202 src/cat.c:286 -#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/mktemp.c:338 -#: src/od.c:966 src/paste.c:160 src/shuf.c:606 src/split.c:793 -#: src/split.c:1028 src/split.c:1033 src/tail.c:1234 src/tail.c:1362 -#: src/tail.c:2286 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 +#: lib/closeout.c:112 src/base64.c:111 src/base64.c:123 src/base64.c:129 +#: src/base64.c:170 src/base64.c:226 src/cat.c:187 src/cat.c:203 src/cat.c:287 +#: src/cksum.c:251 src/expand.c:329 src/expand.c:354 src/factor.c:2360 +#: src/mktemp.c:338 src/od.c:969 src/paste.c:160 src/shuf.c:600 +#: src/split.c:872 src/split.c:1121 src/split.c:1126 src/tail.c:1233 +#: src/tail.c:1365 src/tail.c:2332 src/tr.c:1620 src/tr.c:1845 src/tr.c:1939 #: src/unexpand.c:426 src/unexpand.c:442 #, c-format msgid "write error" msgstr "寫入時發生錯誤" -#: lib/copy-acl.c:54 src/copy.c:1271 src/copy.c:2751 +#: lib/copy-acl.c:54 src/copy.c:1377 src/copy.c:2844 #, fuzzy, c-format msgid "preserving permissions for %s" msgstr "正在更改 %s 的權限" @@ -244,57 +245,62 @@ msgstr "" msgid "Unknown error" msgstr "不明的系統錯誤" -#: lib/getopt.c:547 lib/getopt.c:576 +#: lib/getopt.c:575 lib/getopt.c:604 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "%s：選項‘%s’不明確\n" -#: lib/getopt.c:624 lib/getopt.c:628 +#: lib/getopt.c:619 +#, fuzzy, c-format +msgid "%s: option '%s' is ambiguous\n" +msgstr "%s：選項‘-W %s’不明確\n" + +#: lib/getopt.c:654 lib/getopt.c:658 #, fuzzy, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s：選項‘--%s’不可配合參數使用\n" -#: lib/getopt.c:637 lib/getopt.c:642 +#: lib/getopt.c:667 lib/getopt.c:672 #, fuzzy, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s：選項‘%c%s’不可配合參數使用\n" -#: lib/getopt.c:685 lib/getopt.c:704 +#: lib/getopt.c:715 lib/getopt.c:734 #, fuzzy, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s：選項‘%s’需要參數\n" -#: lib/getopt.c:742 lib/getopt.c:745 +#: lib/getopt.c:772 lib/getopt.c:775 #, fuzzy, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s：無法識別的選項‘--%s’\n" -#: lib/getopt.c:753 lib/getopt.c:756 +#: lib/getopt.c:783 lib/getopt.c:786 #, fuzzy, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s：無法識別的選項‘%c%s’\n" -#: lib/getopt.c:805 lib/getopt.c:808 +#: lib/getopt.c:835 lib/getopt.c:838 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s：無效的選項 ─ %c\n" -#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s：選項需要參數 ─ %c\n" -#: lib/getopt.c:934 lib/getopt.c:950 +#: lib/getopt.c:964 lib/getopt.c:980 #, fuzzy, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s：選項‘-W %s’不明確\n" -#: lib/getopt.c:974 lib/getopt.c:992 +#: lib/getopt.c:1004 lib/getopt.c:1022 #, fuzzy, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s：選項‘-W %s’不可配合參數使用\n" -#: lib/getopt.c:1013 lib/getopt.c:1031 +#: lib/getopt.c:1043 lib/getopt.c:1061 #, fuzzy, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s：選項‘%s’需要參數\n" @@ -304,13 +310,13 @@ msgstr "%s：選項‘%s’需要參數\n" msgid "cannot change permissions of %s" msgstr "無法更改%s的權限" -#: lib/mkdir-p.c:191 src/copy.c:2377 src/install.c:722 src/install.c:735 +#: lib/mkdir-p.c:191 src/copy.c:2470 src/install.c:722 src/install.c:735 #, c-format msgid "cannot create directory %s" msgstr "無法建立目錄%s" -#: lib/obstack.c:416 lib/obstack.c:418 lib/xalloc-die.c:34 src/csplit.c:231 -#: src/tac.c:434 +#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/csplit.c:232 +#: src/tac.c:443 #, c-format msgid "memory exhausted" msgstr "記憶體耗盡" @@ -359,6 +365,12 @@ msgstr "’" msgid "%s: end of file" msgstr "關閉時發生錯誤" +#: lib/randread.c:128 src/du.c:1068 src/md5sum.c:609 src/od.c:953 +#: src/tac.c:252 src/tac.c:358 src/tac.c:515 src/tac.c:601 src/wc.c:767 +#, c-format +msgid "%s: read error" +msgstr "%s：讀取時發生錯誤" + #: lib/regcomp.c:131 msgid "Success" msgstr "" @@ -474,7 +486,7 @@ msgstr "^[yY]" msgid "^[nN]" msgstr "^[nN]" -#: lib/set-acl.c:46 src/copy.c:2400 src/cp.c:523 +#: lib/set-acl.c:46 src/copy.c:2493 src/cp.c:523 #, c-format msgid "setting permissions for %s" msgstr "正在更改 %s 的權限" @@ -908,7 +920,7 @@ msgid "" "Base64 encode or decode FILE, or standard input, to standard output.\n" msgstr "" -#: src/base64.c:67 +#: src/base64.c:68 msgid "" " -d, --decode decode data\n" " -i, --ignore-garbage when decoding, ignore non-alphabet characters\n" @@ -918,15 +930,7 @@ msgid "" "\n" msgstr "" -#: src/base64.c:76 src/cat.c:110 src/fmt.c:295 src/shuf.c:86 src/sum.c:70 -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input.\n" -msgstr "" -"\n" -"如果沒有指定<檔案>或<檔案>是 -，則由標準輸入讀取資料。\n" - -#: src/base64.c:79 +#: src/base64.c:77 msgid "" "\n" "The data are encoded as described for the base64 alphabet in RFC 3548.\n" @@ -935,51 +939,51 @@ msgid "" "from any other non-alphabet bytes in the encoded stream.\n" msgstr "" -#: src/base64.c:175 src/base64.c:212 src/csplit.c:275 src/csplit.c:1465 -#: src/join.c:458 src/shuf.c:235 src/shuf.c:284 src/shuf.c:570 -#: src/tac-pipe.c:74 src/tee.c:204 src/tr.c:1644 +#: src/base64.c:173 src/base64.c:210 src/csplit.c:276 src/csplit.c:1463 +#: src/join.c:464 src/shuf.c:233 src/shuf.c:282 src/shuf.c:564 +#: src/tac-pipe.c:74 src/tee.c:268 src/tr.c:1644 #, c-format msgid "read error" msgstr "讀取時發生錯誤" -#: src/base64.c:231 +#: src/base64.c:229 #, fuzzy, c-format msgid "invalid input" msgstr "輸入旗標無效：%s" -#: src/base64.c:268 +#: src/base64.c:266 #, fuzzy, c-format msgid "invalid wrap size: %s" msgstr "無效的類型‘%s’" -#: src/base64.c:287 src/basename.c:175 src/comm.c:435 src/cp.c:612 -#: src/date.c:445 src/dircolors.c:447 src/du.c:985 src/hostid.c:74 -#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:968 +#: src/base64.c:285 src/basename.c:175 src/comm.c:439 src/cp.c:612 +#: src/date.c:451 src/dircolors.c:447 src/du.c:1006 src/hostid.c:74 +#: src/hostname.c:111 src/id.c:189 src/install.c:972 src/join.c:974 #: src/link.c:85 src/ln.c:580 src/logname.c:71 src/mknod.c:181 src/mv.c:463 -#: src/nproc.c:119 src/od.c:1861 src/ptx.c:2088 src/seq.c:548 src/shuf.c:507 -#: src/sort.c:4572 src/split.c:1376 src/tr.c:1797 src/tsort.c:554 +#: src/nproc.c:115 src/od.c:1869 src/ptx.c:2088 src/seq.c:594 src/shuf.c:501 +#: src/sort.c:4571 src/split.c:1469 src/tr.c:1797 src/tsort.c:558 #: src/tty.c:112 src/uname.c:251 src/uniq.c:524 src/uniq.c:541 src/unlink.c:81 -#: src/uptime.c:252 src/users.c:146 src/wc.c:666 src/who.c:827 src/whoami.c:79 +#: src/uptime.c:252 src/users.c:146 src/wc.c:700 src/who.c:827 src/whoami.c:79 #, c-format msgid "extra operand %s" msgstr "出現多餘的參數 %s" -#: src/base64.c:319 src/cat.c:781 +#: src/base64.c:317 src/cat.c:765 #, 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:43 src/cut.c:45 src/date.c:39 -#: src/dd.c:45 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 -#: src/expand.c:49 src/fold.c:36 src/groups.c:35 src/head.c:46 src/id.c:41 -#: src/install.c:50 src/ln.c:42 src/ls.c:126 src/mkdir.c:38 src/mkfifo.c:35 +#: src/comm.c:38 src/cp.c:57 src/csplit.c:44 src/cut.c:45 src/date.c:39 +#: src/dd.c:46 src/df.c:43 src/dirname.c:32 src/du.c:54 src/env.c:33 +#: src/expand.c:49 src/fold.c:35 src/groups.c:35 src/head.c:47 src/id.c:41 +#: src/install.c:50 src/ln.c:42 src/ls.c:127 src/mkdir.c:38 src/mkfifo.c:35 #: src/mknod.c:36 src/mv.c:42 src/nice.c:39 src/nl.c:41 src/paste.c:53 #: src/pathchk.c:33 src/pinky.c:37 src/printenv.c:44 src/printf.c:63 -#: src/rm.c:42 src/rmdir.c:38 src/stty.c:66 src/sum.c:38 src/tac.c:59 -#: src/tail.c:70 src/tee.c:36 src/touch.c:44 src/tty.c:43 src/uname.c:60 -#: src/unexpand.c:50 src/uniq.c:42 src/uptime.c:46 src/users.c:36 src/wc.c:51 +#: src/rm.c:42 src/rmdir.c:38 src/stty.c:67 src/sum.c:38 src/tac.c:59 +#: src/tail.c:72 src/tee.c:37 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:52 #: src/who.c:49 src/yes.c:32 #, fuzzy msgid "David MacKenzie" @@ -1022,40 +1026,48 @@ msgid "" msgstr "" #: src/basename.c:169 src/chcon.c:535 src/chgrp.c:277 src/chmod.c:529 -#: src/chown.c:279 src/chroot.c:268 src/comm.c:427 src/csplit.c:1399 -#: src/dirname.c:116 src/expr.c:318 src/join.c:1158 src/link.c:77 -#: src/mkdir.c:262 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 +#: src/chown.c:279 src/chroot.c:277 src/comm.c:431 src/csplit.c:1397 +#: src/dirname.c:116 src/expr.c:318 src/join.c:1164 src/link.c:77 +#: src/mkdir.c:251 src/mkfifo.c:129 src/mknod.c:170 src/nohup.c:111 #: src/pathchk.c:148 src/printf.c:674 src/readlink.c:145 src/realpath.c:236 -#: src/rm.c:321 src/rmdir.c:223 src/seq.c:542 src/sleep.c:119 src/stat.c:1561 +#: src/rm.c:321 src/rmdir.c:223 src/seq.c:588 src/sleep.c:119 src/stat.c:1564 #: src/stdbuf.c:370 src/tr.c:1782 src/unlink.c:75 #, c-format msgid "missing operand" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:110 +#: src/cat.c:48 src/cp.c:56 src/df.c:42 src/du.c:53 src/factor.c:111 #: src/split.c:48 msgid "Torbjorn Granlund" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cat.c:49 src/comm.c:37 src/ls.c:125 src/rm.c:43 src/split.c:49 -#: src/tee.c:35 src/uniq.c:41 +#: src/cat.c:49 src/comm.c:37 src/ls.c:126 src/rm.c:43 src/split.c:49 +#: src/tee.c:36 src/uniq.c:41 #, fuzzy msgid "Richard M. Stallman" msgstr "Torbjorn Granlund 及 Richard M. Stallman" -#: src/cat.c:88 src/df.c:1383 src/expand.c:103 src/fold.c:66 src/head.c:105 -#: src/ls.c:4780 src/nl.c:175 src/paste.c:435 src/pr.c:2752 src/sum.c:58 -#: src/tac.c:133 src/tail.c:258 src/tee.c:62 src/unexpand.c:113 +#: src/cat.c:88 src/df.c:1404 src/expand.c:103 src/fold.c:65 src/head.c:106 +#: src/ls.c:4774 src/nl.c:175 src/paste.c:435 src/pr.c:2722 src/rm.c:135 +#: src/sum.c:58 src/tac.c:133 src/tail.c:253 src/tee.c:86 src/unexpand.c:113 #, c-format msgid "Usage: %s [OPTION]... [FILE]...\n" msgstr "用法：%s [選項]... [檔案]...\n" #: src/cat.c:92 #, fuzzy +msgid "Concatenate FILE(s) to standard output.\n" +msgstr "" +"將所有 <檔案> 內容合併和排序，並在標準輸出顯示結果。\n" +"\n" +"排序選項：\n" +"\n" + +#: src/cat.c:98 +#, fuzzy 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" @@ -1073,7 +1085,7 @@ msgstr "" " -n, --number 輸出時加上行號\n" " -s, --squeeze-blank 不連續輸出超過一行空行\n" -#: src/cat.c:102 +#: src/cat.c:107 msgid "" " -t equivalent to -vT\n" " -T, --show-tabs display TAB characters as ^I\n" @@ -1086,7 +1098,7 @@ msgstr "" " -v, --show-nonprinting 除了換行及 TAB 字元外，使用 ^ 及 M- 表示法顯示字" "元\n" -#: src/cat.c:114 +#: src/cat.c:115 #, c-format msgid "" "\n" @@ -1095,17 +1107,18 @@ msgid "" " %s Copy standard input to standard output.\n" msgstr "" -#: src/cat.c:326 +#: src/cat.c:327 #, fuzzy, c-format msgid "cannot do ioctl on %s" msgstr "無法對‘%s’執行輸出入控制 (ioctl)" -#: src/cat.c:637 src/dd.c:2256 src/sort.c:411 src/tee.c:165 src/yes.c:86 +#: src/cat.c:638 src/dd.c:2372 src/sort.c:411 src/tee.c:212 src/yes.c:111 +#: src/yes.c:123 src/yes.c:130 #, c-format msgid "standard output" msgstr "標準輸出" -#: src/cat.c:716 +#: src/cat.c:700 #, c-format msgid "%s: input file is output file" msgstr "%s：輸出和輸入檔案是相同的" @@ -1117,10 +1130,10 @@ 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:47 src/hostid.c:33 -#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:37 -#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:31 -#: src/tail.c:72 src/tr.c:37 src/true.c:33 +#: src/cut.c:46 src/dirname.c:33 src/du.c:56 src/head.c:48 src/hostid.c:33 +#: src/hostname.c:33 src/mktemp.c:35 src/mv.c:43 src/nohup.c:37 src/od.c:38 +#: src/pathchk.c:34 src/pwd.c:31 src/rm.c:44 src/sleep.c:34 src/sync.c:33 +#: src/tail.c:74 src/tr.c:37 src/true.c:33 msgid "Jim Meyering" msgstr "" @@ -1134,8 +1147,8 @@ msgstr "無法更改 %s 的擁有者\n" msgid "failed to set %s security context component to %s" msgstr "" -#: src/chcon.c:156 src/chcon.c:546 src/copy.c:805 src/runcon.c:221 -#: src/stat.c:730 +#: src/chcon.c:156 src/chcon.c:546 src/copy.c:907 src/runcon.c:221 +#: src/stat.c:733 #, fuzzy, c-format msgid "failed to get security context of %s" msgstr "無法取得 %s 的屬性" @@ -1150,13 +1163,13 @@ msgstr "" msgid "failed to change context of %s to %s" msgstr "無法將 %s 的擁有者更改為 %s\n" -#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:606 -#: src/du.c:472 src/ls.c:3036 +#: src/chcon.c:255 src/chmod.c:218 src/chown-core.c:325 src/copy.c:708 +#: src/du.c:493 src/ls.c:3029 #, c-format msgid "cannot access %s" msgstr "無法存取 %s" -#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:452 +#: src/chcon.c:265 src/chmod.c:231 src/chown-core.c:338 src/du.c:473 #, c-format msgid "cannot read directory %s" msgstr "無法讀取目錄 %s 的內容" @@ -1172,7 +1185,7 @@ msgstr "正在更改 %s 的權限" msgid "fts_read failed" msgstr "fts_read 失敗" -#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:654 +#: src/chcon.c:337 src/chmod.c:360 src/chown-core.c:551 src/du.c:675 #: src/remove.c:581 src/selinux.c:334 #, fuzzy, c-format msgid "fts_close failed" @@ -1267,7 +1280,7 @@ msgid "-R -h requires -P" msgstr "同時使用 -R -h 時還需要 -P 選項" #: src/chcon.c:537 src/chgrp.c:279 src/chmod.c:531 src/chown.c:281 -#: src/comm.c:429 src/csplit.c:1401 src/join.c:1160 src/link.c:79 +#: src/comm.c:433 src/csplit.c:1399 src/join.c:1166 src/link.c:79 #: src/mknod.c:172 src/tr.c:1785 #, c-format msgid "missing operand after %s" @@ -1284,9 +1297,8 @@ msgid "conflicting security context specifiers given" msgstr "" #: src/chcon.c:575 src/chgrp.c:287 src/chgrp.c:305 src/chmod.c:539 -#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/chroot.c:168 -#: src/chroot.c:173 src/cp.c:438 src/cp.c:498 src/mv.c:98 src/pwd.c:276 -#: src/rm.c:331 src/touch.c:347 +#: src/chmod.c:558 src/chown.c:289 src/chown.c:318 src/cp.c:438 src/cp.c:498 +#: src/mv.c:98 src/pwd.c:276 src/rm.c:331 src/touch.c:347 #, c-format msgid "failed to get attributes of %s" msgstr "無法取得 %s 的屬性" @@ -1562,17 +1574,17 @@ msgstr "" msgid "Roland McGrath" msgstr "" -#: src/chroot.c:135 src/install.c:583 +#: src/chroot.c:137 src/install.c:583 #, c-format msgid "invalid group %s" msgstr "群組 %s 無效" -#: src/chroot.c:150 +#: src/chroot.c:152 #, fuzzy, c-format msgid "invalid group list %s" msgstr "群組 %s 無效" -#: src/chroot.c:186 +#: src/chroot.c:185 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] NEWROOT [COMMAND [ARG]...]\n" @@ -1581,7 +1593,7 @@ msgstr "" "用法：%s 根目錄 [指令...]\n" " 或：%s 選項\n" -#: src/chroot.c:191 +#: src/chroot.c:190 msgid "" "Run COMMAND with root directory set to NEWROOT.\n" "\n" @@ -1589,54 +1601,66 @@ msgstr "" "以新的目錄作為 <根目錄> 並執行 <指令>。\n" "\n" -#: src/chroot.c:196 -msgid "" -" --userspec=USER:GROUP specify user and group (ID or name) to use\n" -" --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +#: src/chroot.c:195 +msgid " --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n" +msgstr "" + +#: src/chroot.c:198 +msgid " --userspec=USER:GROUP specify user and group (ID or name) to use\n" msgstr "" -#: src/chroot.c:203 +#: src/chroot.c:201 +#, c-format +msgid " --skip-chdir do not change working directory to %s\n" +msgstr "" + +#: src/chroot.c:207 msgid "" "\n" "If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n" msgstr "" -#: src/chroot.c:311 +#: src/chroot.c:286 +#, c-format +msgid "option --skip-chdir only permitted if NEWROOT is old %s" +msgstr "" + +#: src/chroot.c:329 #, c-format msgid "cannot change root directory to %s" msgstr "無法以 %s 作為根目錄" -#: src/chroot.c:315 +#: src/chroot.c:333 #, c-format msgid "cannot chdir to root directory" msgstr "" -#: src/chroot.c:358 +#: src/chroot.c:375 #, c-format msgid "no group specified for unknown uid: %d" msgstr "" -#: src/chroot.c:383 +#: src/chroot.c:400 #, fuzzy, c-format msgid "failed to get supplemental groups" msgstr "無法改變所屬群組至沒有名稱的群組" -#: src/chroot.c:395 +#: src/chroot.c:412 #, fuzzy, c-format -msgid "failed to %s supplemental groups" +msgid "failed to set supplemental groups" msgstr "無法改變所屬群組至沒有名稱的群組" -#: src/chroot.c:402 +#: src/chroot.c:418 #, fuzzy, c-format msgid "failed to set group-ID" msgstr "無法取得%s的屬性" -#: src/chroot.c:405 +#: src/chroot.c:421 #, fuzzy, c-format msgid "failed to set user-ID" msgstr "無法取得%s的屬性" -#: src/chroot.c:412 src/nohup.c:236 src/stdbuf.c:392 src/timeout.c:457 +#: src/chroot.c:427 src/nohup.c:230 src/stdbuf.c:391 src/timeout.c:457 #, fuzzy, c-format msgid "failed to run command %s" msgstr "無法執行 %s 指令" @@ -1677,7 +1701,16 @@ msgstr "用法：%s [選項]... 檔案1 檔案2\n" msgid "Compare sorted files FILE1 and FILE2 line by line.\n" msgstr "逐行比較兩個已排序的 <檔案1> 及 <檔案2>。\n" -#: src/comm.c:110 +#: src/comm.c:110 src/join.c:200 +#, fuzzy +msgid "" +"\n" +"When FILE1 or FILE2 (not both) is -, read standard input.\n" +msgstr "" +"\n" +"如果沒有指定<檔案>或<檔案>是 -，則由標準輸入讀取資料。\n" + +#: src/comm.c:114 msgid "" "\n" "With no options, produce three-column output. Column one contains\n" @@ -1688,7 +1721,7 @@ msgstr "" "不加選項的話，程式會產生三欄內容。第一欄的內容只在 <檔案1> 出現，\n" "第二欄的只在 <檔案2> 出現，第三欄的則同時在兩個檔案內出現。\n" -#: src/comm.c:116 +#: src/comm.c:120 #, fuzzy msgid "" "\n" @@ -1701,7 +1734,7 @@ msgstr "" " -2 不顯示任何一行只在 FILE2 出現過的資料\n" " -3 不顯示兩個檔案中同時出現的任何一行\n" -#: src/comm.c:122 +#: src/comm.c:126 msgid "" "\n" " --check-order check that the input is correctly sorted, even\n" @@ -1709,17 +1742,17 @@ msgid "" " --nocheck-order do not check that the input is correctly sorted\n" msgstr "" -#: src/comm.c:128 +#: src/comm.c:132 msgid " --output-delimiter=STR separate columns with STR\n" msgstr "" -#: src/comm.c:133 +#: src/comm.c:137 msgid "" "\n" "Note, comparisons honor the rules specified by 'LC_COLLATE'.\n" msgstr "" -#: src/comm.c:137 +#: src/comm.c:141 #, c-format msgid "" "\n" @@ -1728,309 +1761,323 @@ msgid "" " %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n" msgstr "" -#: src/comm.c:222 +#: src/comm.c:226 #, c-format msgid "file %d is not in sorted order" msgstr "" -#: src/comm.c:407 +#: src/comm.c:411 #, fuzzy, c-format msgid "multiple delimiters specified" msgstr "正在關閉輸出檔%s" -#: src/comm.c:411 +#: src/comm.c:415 #, fuzzy, c-format msgid "empty %s not allowed" msgstr "使用 -c 時不允許指定額外的參數‘%s’" -#: src/copy.c:178 src/dd.c:1698 src/dd.c:2022 src/du.c:1106 src/head.c:148 -#: src/head.c:271 src/head.c:349 src/head.c:553 src/head.c:630 src/head.c:699 -#: src/head.c:748 src/head.c:771 src/tail.c:415 src/tail.c:503 src/tail.c:552 -#: src/tail.c:645 src/tail.c:773 src/tail.c:821 src/tail.c:858 src/tail.c:1840 -#: src/tail.c:1870 src/uniq.c:464 +#: src/copy.c:181 src/copy.c:452 #, c-format -msgid "error reading %s" +msgid "cannot lseek %s" +msgstr "無法 lseek %s" + +#: src/copy.c:191 src/copy.c:554 +#, fuzzy, c-format +msgid "error deallocating %s" msgstr "讀取 %s 時發生錯誤" -#: src/copy.c:205 src/copy.c:356 src/copy.c:367 +#: src/copy.c:229 src/dd.c:1801 src/dd.c:2138 src/du.c:1127 src/head.c:149 +#: src/head.c:300 src/head.c:382 src/head.c:578 src/head.c:660 src/head.c:729 +#: src/head.c:779 src/head.c:802 src/tail.c:410 src/tail.c:498 src/tail.c:547 +#: src/tail.c:640 src/tail.c:768 src/tail.c:816 src/tail.c:853 src/tail.c:1898 +#: src/tail.c:1928 src/uniq.c:464 #, c-format -msgid "cannot lseek %s" -msgstr "無法 lseek %s" +msgid "error reading %s" +msgstr "讀取 %s 時發生錯誤" -#: src/copy.c:216 src/dd.c:2086 src/dd.c:2149 src/head.c:176 src/tail.c:390 +#: src/copy.c:272 src/dd.c:2202 src/dd.c:2265 src/head.c:177 src/tail.c:385 #, c-format msgid "error writing %s" msgstr "寫入 %s 時發生錯誤" -#: src/copy.c:323 +#: src/copy.c:302 +#, fuzzy, c-format +msgid "overflow reading %s" +msgstr "讀取 %s 時發生錯誤" + +#: src/copy.c:419 #, fuzzy, c-format msgid "%s: failed to get extents info" msgstr "%s：無法移除" -#: src/copy.c:383 +#: src/copy.c:478 #, fuzzy, c-format msgid "%s: write failed" msgstr "寫入時發生錯誤" -#: src/copy.c:452 src/copy.c:1189 +#: src/copy.c:547 src/copy.c:1295 #, fuzzy, c-format msgid "failed to extend %s" msgstr "無法保留%s的時間" -#: src/copy.c:687 +#: src/copy.c:789 #, fuzzy, c-format msgid "clearing permissions for %s" msgstr "正在更改 %s 的權限" -#: src/copy.c:722 src/copy.c:2600 src/cp.c:336 +#: src/copy.c:824 src/copy.c:2693 src/cp.c:336 #, c-format msgid "failed to preserve ownership for %s" msgstr "無法保留%s的擁有者及所屬群組" -#: src/copy.c:748 +#: src/copy.c:850 #, c-format msgid "failed to lookup file %s" msgstr "" -#: src/copy.c:753 +#: src/copy.c:855 #, fuzzy, c-format msgid "failed to preserve authorship for %s" msgstr "無法保留%s的著作者" -#: src/copy.c:790 src/cp.c:1201 src/install.c:948 src/mkdir.c:279 +#: src/copy.c:892 src/cp.c:1201 src/install.c:948 src/mkdir.c:268 #: src/mkfifo.c:143 src/mknod.c:199 #, fuzzy, c-format msgid "failed to set default file creation context to %s" msgstr "無法取得 %s 的屬性" -#: src/copy.c:820 +#: src/copy.c:922 #, fuzzy, c-format msgid "failed to set default file creation context for %s" msgstr "無法取得 %s 的屬性" -#: src/copy.c:846 +#: src/copy.c:948 #, fuzzy, c-format msgid "failed to set the security context of %s" msgstr "無法取得 %s 的屬性" -#: src/copy.c:919 src/csplit.c:653 src/du.c:992 src/fmt.c:451 src/head.c:855 -#: src/sort.c:4584 src/split.c:1392 src/tail.c:1814 src/wc.c:678 +#: src/copy.c:1021 src/csplit.c:654 src/du.c:1013 src/fmt.c:440 src/head.c:882 +#: src/sort.c:4583 src/split.c:1485 src/tail.c:1872 src/wc.c:712 #, c-format msgid "cannot open %s for reading" msgstr "無法開啟 %s 來讀取資料" -#: src/copy.c:925 src/copy.c:1078 src/dd.c:1623 src/dd.c:2161 src/dd.c:2300 -#: src/head.c:811 src/tail.c:1650 src/tail.c:1716 src/truncate.c:140 +#: src/copy.c:1027 src/copy.c:1180 src/dd.c:1726 src/dd.c:2277 src/dd.c:2416 +#: src/head.c:840 src/tail.c:1718 src/tail.c:1774 src/truncate.c:113 #, c-format msgid "cannot fstat %s" msgstr "無法 fstat %s" -#: src/copy.c:935 +#: src/copy.c:1037 #, c-format msgid "skipping file %s, as it was replaced while being copied" msgstr "略過檔案 %s，因為準備複製時它已被其它檔案取代" -#: src/copy.c:975 src/copy.c:1695 src/copy.c:1911 src/copy.c:2068 src/ln.c:330 +#: src/copy.c:1077 src/copy.c:1784 src/copy.c:2148 src/ln.c:330 #: src/remove.c:263 src/remove.c:280 src/remove.c:406 src/remove.c:432 #, c-format msgid "cannot remove %s" msgstr "無法移除 %s" -#: src/copy.c:980 src/copy.c:1699 src/copy.c:1906 src/copy.c:2073 -#: src/remove.c:376 +#: src/copy.c:1082 src/copy.c:1788 src/copy.c:2153 src/remove.c:376 #, c-format msgid "removed %s\n" msgstr "已移除%s\n" -#: src/copy.c:1032 +#: src/copy.c:1134 #, c-format msgid "not writing through dangling symlink %s" msgstr "" -#: src/copy.c:1070 +#: src/copy.c:1172 #, c-format msgid "cannot create regular file %s" msgstr "無法建立普通檔案 %s" -#: src/copy.c:1091 +#: src/copy.c:1193 #, fuzzy, c-format msgid "failed to clone %s from %s" msgstr "無法保留%s的時間" -#: src/copy.c:1204 src/copy.c:2674 +#: src/copy.c:1310 src/copy.c:2767 #, c-format msgid "preserving times for %s" msgstr "保留%s的時間" -#: src/copy.c:1281 src/copy.c:1287 src/head.c:863 src/touch.c:172 -#: src/truncate.c:417 +#: src/copy.c:1387 src/copy.c:1393 src/head.c:890 src/sync.c:161 +#: src/touch.c:172 src/truncate.c:391 #, fuzzy, c-format msgid "failed to close %s" msgstr "無法保留%s的時間" -#: src/copy.c:1580 +#: src/copy.c:1669 #, fuzzy, c-format msgid "%s: replace %s, overriding mode %04lo (%s)? " msgstr "%s：是否覆寫 %s，而不理會權限模式 %04lo? " -#: src/copy.c:1581 +#: src/copy.c:1670 #, c-format msgid "%s: unwritable %s (mode %04lo, %s); try anyway? " msgstr "" -#: src/copy.c:1588 +#: src/copy.c:1677 #, c-format msgid "%s: overwrite %s? " msgstr "%s：是否覆寫 %s? " -#: src/copy.c:1658 +#: src/copy.c:1747 #, c-format msgid " (backup: %s)" msgstr " (備份：%s)" -#: src/copy.c:1668 +#: src/copy.c:1757 #, c-format msgid "failed to restore the default file creation context" msgstr "" -#: src/copy.c:1706 +#: src/copy.c:1795 #, c-format msgid "cannot create hard link %s to %s" msgstr "不可以建立連至 %2$s 的實際鏈結 (hard link) %1$s" -#: src/copy.c:1769 src/copy.c:1823 src/copy.c:2388 src/copy.c:2738 +#: src/copy.c:1858 src/copy.c:1912 src/copy.c:2481 src/copy.c:2831 #: src/find-mount-point.c:84 src/install.c:687 src/realpath.c:145 -#: src/stat.c:1301 src/truncate.c:363 +#: src/stat.c:1304 src/truncate.c:337 #, c-format msgid "cannot stat %s" msgstr "無法 stat %s" -#: src/copy.c:1777 +#: src/copy.c:1866 #, c-format msgid "omitting directory %s" msgstr "略過 %s 目錄" -#: src/copy.c:1791 +#: src/copy.c:1880 #, c-format msgid "warning: source file %s specified more than once" msgstr "警告：指定了來源檔 %s 多於一次" -#: src/copy.c:1841 src/ln.c:262 +#: src/copy.c:1929 src/ln.c:262 #, c-format msgid "%s and %s are the same file" msgstr "%s 及 %s 為同一檔案" -#: src/copy.c:1939 +#: src/copy.c:2019 #, c-format msgid "cannot overwrite non-directory %s with directory %s" msgstr "不可以將目錄 %2$s 覆寫非目錄 %1$s" -#: src/copy.c:1957 src/ln.c:230 +#: src/copy.c:2037 src/ln.c:230 #, c-format msgid "will not overwrite just-created %s with %s" msgstr "不會以 %2$s 覆寫剛建立的 %1$s" -#: src/copy.c:1975 +#: src/copy.c:2055 #, c-format msgid "cannot overwrite directory %s with non-directory" msgstr "不可以將目錄 %s 覆寫成非目錄" -#: src/copy.c:1989 +#: src/copy.c:2069 #, c-format msgid "cannot move directory onto non-directory: %s -> %s" msgstr "移動目錄時目的地不可以不是目錄：%s -> %s" -#: src/copy.c:2019 +#: src/copy.c:2099 #, c-format msgid "backing up %s would destroy source; %s not moved" msgstr "將 %s 備份會破壞來源檔，因此不移動 %s。" -#: src/copy.c:2020 +#: src/copy.c:2100 #, c-format msgid "backing up %s would destroy source; %s not copied" msgstr "將 %s 備份會破壞來源檔，因此不複製 %s。" -#: src/copy.c:2043 src/ln.c:292 +#: src/copy.c:2123 src/ln.c:292 #, c-format msgid "cannot backup %s" msgstr "無法備份%s" -#: src/copy.c:2107 +#: src/copy.c:2187 #, fuzzy, c-format msgid "will not copy %s through just-created symlink %s" msgstr "不會以 %2$s 覆寫剛建立的 %1$s" -#: src/copy.c:2184 +#: src/copy.c:2264 #, c-format msgid "cannot copy a directory, %s, into itself, %s" msgstr "不可以將目錄 %s 複製成為自身 (%s)" -#: src/copy.c:2201 +#: src/copy.c:2272 +#, fuzzy, c-format +msgid "warning: source directory %s specified more than once" +msgstr "警告：指定了來源檔 %s 多於一次" + +#: src/copy.c:2294 #, c-format msgid "will not create hard link %s to directory %s" msgstr "不會建立連至目錄 %2$s 的實際鏈結 (hard link) %1$s" -#: src/copy.c:2258 +#: src/copy.c:2351 #, c-format msgid "cannot move %s to a subdirectory of itself, %s" msgstr "不可以將目錄 %s 複製至自身的子目錄 (%s)" -#: src/copy.c:2301 +#: src/copy.c:2394 #, c-format msgid "cannot move %s to %s" msgstr "無法將 %s 移動至 %s" -#: src/copy.c:2317 +#: src/copy.c:2410 #, c-format msgid "inter-device move failed: %s to %s; unable to remove target" msgstr "無法進行跨裝置的移動 (%s至%s)；無法移除目標檔案或目錄" -#: src/copy.c:2357 +#: src/copy.c:2450 #, c-format msgid "cannot copy cyclic symbolic link %s" msgstr "無法複製循環的符號鏈結%s" -#: src/copy.c:2477 +#: src/copy.c:2570 #, c-format msgid "%s: can make relative symbolic links only in current directory" msgstr "%s：只能於目前的目錄中建立相對符號鏈結" -#: src/copy.c:2484 +#: src/copy.c:2577 #, c-format msgid "cannot create symbolic link %s to %s" msgstr "不可以建立連至 %2$s 的符號鏈結 %1$s" -#: src/copy.c:2536 src/mkfifo.c:169 +#: src/copy.c:2629 src/mkfifo.c:169 #, c-format msgid "cannot create fifo %s" msgstr "無法建立 FIFO %s" -#: src/copy.c:2545 +#: src/copy.c:2638 #, c-format msgid "cannot create special file %s" msgstr "無法建立特殊檔案 %s" -#: src/copy.c:2556 src/ls.c:3245 src/stat.c:983 +#: src/copy.c:2649 src/ls.c:3238 src/stat.c:986 #, c-format msgid "cannot read symbolic link %s" msgstr "無法讀取符號鏈結 %s" -#: src/copy.c:2583 +#: src/copy.c:2676 #, c-format msgid "cannot create symbolic link %s" msgstr "無法建立符號鏈結 %s" -#: src/copy.c:2615 +#: src/copy.c:2708 #, c-format msgid "%s has unknown file type" msgstr "%s的檔案類型不詳" -#: src/copy.c:2778 src/ln.c:375 +#: src/copy.c:2871 src/ln.c:375 #, c-format msgid "cannot un-backup %s" msgstr "無法將 %s 的備份還原" -#: src/copy.c:2782 +#: src/copy.c:2875 #, c-format msgid "%s -> %s (unbackup)\n" msgstr "%s -> %s (還原備份)\n" @@ -2040,25 +2087,25 @@ msgstr "%s -> %s (還原備份)\n" msgid "Alex Deymo" msgstr "" -#: src/coreutils.c:67 +#: src/coreutils.c:64 #, c-format msgid "Usage: %s --coreutils-prog=PROGRAM_NAME [PARAMETERS]... \n" msgstr "" -#: src/coreutils.c:70 +#: src/coreutils.c:67 msgid "" "Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n" "\n" msgstr "" -#: src/coreutils.c:86 +#: src/coreutils.c:85 #, c-format msgid "" "\n" "Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n" msgstr "" -#: src/coreutils.c:178 src/coreutils.c:202 +#: src/coreutils.c:177 src/coreutils.c:201 #, c-format msgid "unknown program %s" msgstr "" @@ -2307,8 +2354,8 @@ msgstr "%s已存在但不是目錄" msgid "failed to access %s" msgstr "無法保留%s的時間" -#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1297 -#: src/touch.c:429 src/truncate.c:354 +#: src/cp.c:597 src/install.c:957 src/ln.c:563 src/mv.c:448 src/shred.c:1284 +#: src/touch.c:429 src/truncate.c:328 #, c-format msgid "missing file operand" msgstr "缺少了檔案作為參數" @@ -2380,131 +2427,130 @@ 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:42 src/dd.c:46 +#: src/csplit.c:43 src/dd.c:47 msgid "Stuart Kemp" msgstr "" -#: src/csplit.c:543 +#: src/csplit.c:544 #, c-format msgid "input disappeared" msgstr "輸入資料消失了" -#: src/csplit.c:673 src/csplit.c:684 +#: src/csplit.c:674 src/csplit.c:685 #, c-format msgid "%s: line number out of range" msgstr "%s：行號超出範圍以外" -#: src/csplit.c:713 +#: src/csplit.c:714 #, fuzzy, c-format msgid "%s: %s: line number out of range" msgstr "%s：‘%s’：行號超出範圍以外" -#: src/csplit.c:716 src/csplit.c:772 +#: src/csplit.c:717 src/csplit.c:773 #, c-format msgid " on repetition %s\n" msgstr "" -#: src/csplit.c:766 +#: src/csplit.c:767 #, fuzzy, c-format msgid "%s: %s: match not found" msgstr "%s：‘%s’：找不到符合的字串" -#: src/csplit.c:833 src/csplit.c:873 src/nl.c:351 src/tac.c:273 +#: src/csplit.c:834 src/csplit.c:874 src/nl.c:351 src/tac.c:287 #, c-format msgid "error in regular expression search" msgstr "在正規運算式搜尋時發生錯誤" -#: src/csplit.c:1006 +#: src/csplit.c:1007 #, fuzzy, c-format msgid "write error for %s" msgstr "寫入‘%s’時發生錯誤" -#: src/csplit.c:1082 +#: src/csplit.c:1083 #, c-format msgid "%s: integer expected after delimiter" msgstr "%s：分隔符號後應該是整數" -#: src/csplit.c:1098 +#: src/csplit.c:1099 #, fuzzy, c-format msgid "%s: '}' is required in repeat count" msgstr "%s：重複的數目後應該是 ‘}’ 字元" -#: src/csplit.c:1108 +#: src/csplit.c:1109 #, fuzzy, c-format msgid "%s}: integer required between '{' and '}'" msgstr "%s}：‘{’ 和 ‘}’ 之間必須是整數" -#: src/csplit.c:1135 +#: src/csplit.c:1136 #, fuzzy, c-format msgid "%s: closing delimiter '%c' missing" msgstr "%s：缺少了封閉分隔符號 ‘%c’" -#: src/csplit.c:1152 +#: src/csplit.c:1153 #, c-format msgid "%s: invalid regular expression: %s" msgstr "%s：無效的正規表示式：%s" -#: src/csplit.c:1185 +#: src/csplit.c:1186 #, c-format msgid "%s: invalid pattern" msgstr "%s：無效的樣式" -#: src/csplit.c:1188 +#: src/csplit.c:1189 #, c-format msgid "%s: line number must be greater than zero" msgstr "%s：行號必須大於零" -#: src/csplit.c:1194 +#: src/csplit.c:1195 #, fuzzy, c-format msgid "line number %s is smaller than preceding line number, %s" msgstr "行號 ‘%s’ 小於之前的行號 ‘%s’" -#: src/csplit.c:1200 +#: src/csplit.c:1201 #, fuzzy, c-format msgid "warning: line number %s is the same as preceding line number" msgstr "警告：行號 ‘%s’ 和之前的行號一樣" -#: src/csplit.c:1278 +#: src/csplit.c:1279 #, c-format msgid "missing conversion specifier in suffix" msgstr "後置字串缺少了字串轉換字符" -#: src/csplit.c:1284 +#: src/csplit.c:1285 #, c-format msgid "invalid conversion specifier in suffix: %c" msgstr "後置字串的字串轉換字符無效：%c" -#: src/csplit.c:1287 +#: src/csplit.c:1288 #, c-format msgid "invalid conversion specifier in suffix: \\%.3o" msgstr "後置字串的字串轉換字符無效：\\%.3o" -#: src/csplit.c:1292 +#: src/csplit.c:1293 #, fuzzy, c-format msgid "invalid flags in conversion specification: %%%c%c" msgstr "%s：無效的欄位規格‘%s’" -#: src/csplit.c:1309 +#: src/csplit.c:1310 #, c-format msgid "too many %% conversion specifications in suffix" msgstr "後置字串含有過多的 %% 字串轉換規格" -#: src/csplit.c:1323 +#: src/csplit.c:1324 #, c-format msgid "missing %% conversion specification in suffix" msgstr "後置字串缺少了 %% 字串轉換規格" -#: src/csplit.c:1371 -#, c-format -msgid "%s: invalid number" -msgstr "%s：無效的號碼" +#: src/csplit.c:1370 src/dd.c:1436 src/nproc.c:105 src/tail.c:2020 +msgid "invalid number" +msgstr "無效的數字" -#: src/csplit.c:1479 +#: src/csplit.c:1477 #, c-format msgid "Usage: %s [OPTION]... FILE PATTERN...\n" msgstr "用法：%s [選項]... 檔案 樣式...\n" -#: src/csplit.c:1483 +#: src/csplit.c:1481 #, fuzzy msgid "" "Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ...,\n" @@ -2513,7 +2559,16 @@ msgstr "" "根據 <樣式> 分割 <檔案>，並將之輸出至 ‘xx01’、‘xx02’ 等等的檔案，\n" "同時在標準輸出顯示每個分割部份的位元組數目。\n" -#: src/csplit.c:1490 +#: src/csplit.c:1485 +#, fuzzy +msgid "" +"\n" +"Read standard input if FILE is -\n" +msgstr "" +"\n" +"若 <檔案> 是 - 則由標準輸入讀取資料。每一個 <樣式> 可以是：\n" + +#: src/csplit.c:1492 #, fuzzy, c-format msgid "" " -b, --suffix-format=FORMAT use sprintf FORMAT instead of %02d\n" @@ -2524,11 +2579,11 @@ msgstr "" " -f, --prefix=前置字串 以 <前置字串> 代替 ‘xx’\n" " -k, --keep-files 遇到錯誤時不移除輸出檔\n" -#: src/csplit.c:1495 +#: src/csplit.c:1497 msgid " -m, --suppress-matched suppress the lines matching PATTERN\n" msgstr "" -#: src/csplit.c:1498 +#: src/csplit.c:1500 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" @@ -2538,18 +2593,11 @@ msgstr "" " -s, --quiet, --silent 不印出輸出檔的大小\n" " -z, --elide-empty-files 移除空白的輸出檔\n" -#: src/csplit.c:1505 -msgid "" -"\n" -"Read standard input if FILE is -. Each PATTERN may be:\n" -msgstr "" -"\n" -"若 <檔案> 是 - 則由標準輸入讀取資料。每一個 <樣式> 可以是：\n" - -#: src/csplit.c:1509 +#: src/csplit.c:1507 #, fuzzy msgid "" "\n" +"Each PATTERN may be:\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" @@ -2582,7 +2630,7 @@ msgstr "用法：%s [選項]... [檔案]...\n" msgid "Print selected parts of lines from each FILE to standard output.\n" msgstr "在標準輸出中顯示每個 <檔案> 每一行中指定的部份。\n" -#: src/cut.c:182 +#: src/cut.c:183 msgid "" " -b, --bytes=LIST select only these bytes\n" " -c, --characters=LIST select only these characters\n" @@ -2592,7 +2640,7 @@ msgstr "" " -c, --characters=LIST 只顯示指定的字元\n" " -d, --delimiter=DELIM 以 DELIM 字元代替 TAB 作為欄位的分隔符號\n" -#: src/cut.c:187 +#: src/cut.c:188 msgid "" " -f, --fields=LIST select only these fields; also print any line\n" " that contains no delimiter character, unless\n" @@ -2603,14 +2651,14 @@ msgstr "" " 每一行，除非配合 -s 選項一起使用\n" " -n (不會作任何處理)\n" -#: src/cut.c:193 +#: src/cut.c:194 #, fuzzy msgid "" " --complement complement the set of selected bytes, characters\n" " or fields\n" msgstr " --verbose 開啟每個輸出檔之前都在標準錯誤輸出顯示訊息\n" -#: src/cut.c:197 +#: src/cut.c:198 msgid "" " -s, --only-delimited do not print lines not containing delimiters\n" " --output-delimiter=STRING use STRING as the output delimiter\n" @@ -2620,7 +2668,7 @@ msgstr "" " --output-delimiter=字串 以 <字串> 作為輸出資料的分隔符號\n" " 預設是使用輸入資料的分隔符號\n" -#: src/cut.c:204 +#: src/cut.c:205 msgid "" "\n" "Use one, and only one of -b, -c or -f. Each LIST is made up of one\n" @@ -2628,7 +2676,7 @@ msgid "" "in the same order that it is read, and is written exactly once.\n" msgstr "" -#: src/cut.c:210 +#: src/cut.c:211 #, fuzzy msgid "" "Each range is one of:\n" @@ -2637,8 +2685,6 @@ msgid "" " 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 "" "\n" "必須恰好指定 -b、-c 或 -f 其中一個選項。每個 LIST 是由一個範圍或\n" @@ -2652,63 +2698,63 @@ msgstr "" "\n" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" -#: src/cut.c:300 src/cut.c:394 +#: src/cut.c:299 src/cut.c:393 #, fuzzy msgid "invalid byte, character or field list" msgstr "無效的位元組或欄位選項" -#: src/cut.c:305 src/cut.c:345 +#: src/cut.c:304 src/cut.c:344 msgid "fields and positions are numbered from 1" msgstr "" -#: src/cut.c:320 +#: src/cut.c:319 #, fuzzy msgid "invalid range with no endpoint: -" msgstr "無效的寬度選項：‘%s’" -#: src/cut.c:334 -#, fuzzy +#: src/cut.c:333 src/numfmt.c:1417 +#, fuzzy, c-format msgid "invalid decreasing range" msgstr "無效的類型‘%s’" -#: src/cut.c:383 +#: src/cut.c:382 #, c-format msgid "byte offset %s is too large" msgstr "位元組位置 %s 過大" -#: src/cut.c:386 +#: src/cut.c:385 #, c-format msgid "field number %s is too large" msgstr "欄位數目 %s 過大" -#: src/cut.c:735 src/cut.c:743 +#: src/cut.c:734 src/cut.c:742 msgid "only one type of list may be specified" msgstr "指定位置時只能使用一種格式" -#: src/cut.c:752 src/numfmt.c:1425 +#: src/cut.c:751 src/numfmt.c:1655 #, c-format msgid "the delimiter must be a single character" msgstr "分隔符號必須是恰好一個字元" -#: src/cut.c:787 +#: src/cut.c:786 msgid "you must specify a list of bytes, characters, or fields" msgstr "必須指定一系列的位元組、字元或欄位" -#: src/cut.c:790 +#: src/cut.c:789 msgid "an input delimiter may be specified only when operating on fields" msgstr "只有在處理欄位時才能指定分隔符號" -#: src/cut.c:794 +#: src/cut.c:793 msgid "" "suppressing non-delimited lines makes sense\n" "\tonly when operating on fields" msgstr "只有在處理欄位時才可以去除沒有分隔符號的每一行" -#: src/cut.c:800 +#: src/cut.c:799 msgid "missing list of fields" msgstr "缺少了欄位數值" -#: src/cut.c:802 +#: src/cut.c:801 msgid "missing list of positions" msgstr "缺少了表示位置的數值" @@ -2725,34 +2771,48 @@ 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" +" -d, --date=STRING display time described by STRING, not 'now'\n" +" -f, --file=DATEFILE like --date; once for each line of DATEFILE\n" msgstr "" -#: src/date.c:142 +#: src/date.c:138 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" +" -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n" +" FMT='date' for date only (the default),\n" +" 'hours', 'minutes', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14T02:34:56-0600\n" msgstr "" -#: src/date.c:147 +#: src/date.c:145 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 (UTC)\n" +" -R, --rfc-2822 output date and time in RFC 2822 format.\n" +" Example: Mon, 14 Aug 2006 02:34:56 -0600\n" +msgstr "" + +#: src/date.c:149 +msgid "" +" --rfc-3339=FMT output date/time in RFC 3339 format.\n" +" FMT='date', 'seconds', or 'ns'\n" +" for date and time to the indicated " +"precision.\n" +" Example: 2006-08-14 02:34:56-06:00\n" +msgstr "" + +#: src/date.c:155 +msgid "" +" -r, --reference=FILE display the last modification time of FILE\n" msgstr "" #: src/date.c:158 msgid "" +" -s, --set=STRING set time described by STRING\n" +" -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n" +msgstr "" + +#: src/date.c:164 +msgid "" "\n" "FORMAT controls the output. Interpreted sequences are:\n" "\n" @@ -2760,7 +2820,7 @@ msgid "" " %a locale's abbreviated weekday name (e.g., Sun)\n" msgstr "" -#: src/date.c:165 +#: src/date.c:171 msgid "" " %A locale's full weekday name (e.g., Sunday)\n" " %b locale's abbreviated month name (e.g., Jan)\n" @@ -2768,7 +2828,7 @@ msgid "" " %c locale's date and time (e.g., Thu Mar 3 23:05:25 2005)\n" msgstr "" -#: src/date.c:171 +#: src/date.c:177 msgid "" " %C century; like %Y, except omit last two digits (e.g., 20)\n" " %d day of month (e.g., 01)\n" @@ -2776,14 +2836,14 @@ msgid "" " %e day of month, space padded; same as %_d\n" msgstr "" -#: src/date.c:177 +#: src/date.c:183 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 +#: src/date.c:188 msgid "" " %h same as %b\n" " %H hour (00..23)\n" @@ -2791,7 +2851,7 @@ msgid "" " %j day of year (001..366)\n" msgstr "" -#: src/date.c:188 +#: src/date.c:194 msgid "" " %k hour, space padded ( 0..23); same as %_H\n" " %l hour, space padded ( 1..12); same as %_I\n" @@ -2799,7 +2859,7 @@ msgid "" " %M minute (00..59)\n" msgstr "" -#: src/date.c:194 +#: src/date.c:200 msgid "" " %n a newline\n" " %N nanoseconds (000000000..999999999)\n" @@ -2810,7 +2870,7 @@ msgid "" " %s seconds since 1970-01-01 00:00:00 UTC\n" msgstr "" -#: src/date.c:203 +#: src/date.c:209 msgid "" " %S second (00..60)\n" " %t a tab\n" @@ -2818,7 +2878,7 @@ msgid "" " %u day of week (1..7); 1 is Monday\n" msgstr "" -#: src/date.c:209 +#: src/date.c:215 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" @@ -2826,7 +2886,7 @@ msgid "" " %W week number of year, with Monday as first day of week (00..53)\n" msgstr "" -#: src/date.c:215 +#: src/date.c:221 msgid "" " %x locale's date representation (e.g., 12/31/99)\n" " %X locale's time representation (e.g., 23:13:48)\n" @@ -2834,7 +2894,7 @@ msgid "" " %Y year\n" msgstr "" -#: src/date.c:221 +#: src/date.c:227 msgid "" " %z +hhmm numeric time zone (e.g., -0400)\n" " %:z +hh:mm numeric time zone (e.g., -04:00)\n" @@ -2846,7 +2906,7 @@ msgid "" "By default, date pads numeric fields with zeroes.\n" msgstr "" -#: src/date.c:230 +#: src/date.c:236 msgid "" "The following optional flags may follow '%':\n" "\n" @@ -2857,7 +2917,7 @@ msgid "" " # use opposite case if possible\n" msgstr "" -#: src/date.c:239 +#: src/date.c:245 msgid "" "\n" "After any flags comes an optional field width, as a decimal number;\n" @@ -2866,7 +2926,7 @@ msgid "" "O to use the locale's alternate numeric symbols if available.\n" msgstr "" -#: src/date.c:246 +#: src/date.c:252 msgid "" "\n" "Examples:\n" @@ -2880,35 +2940,35 @@ msgid "" " $ date --date='TZ=\"America/Los_Angeles\" 09:00 next Fri'\n" msgstr "" -#: src/date.c:279 src/dd.c:2240 src/head.c:846 src/md5sum.c:496 -#: src/md5sum.c:875 src/od.c:910 src/od.c:1973 src/pr.c:1172 src/pr.c:1362 -#: src/pr.c:1484 src/stty.c:855 src/tac.c:562 src/tail.c:339 src/tee.c:126 -#: src/tr.c:1945 src/tsort.c:529 src/wc.c:196 +#: src/date.c:285 src/dd.c:2356 src/head.c:873 src/md5sum.c:499 +#: src/md5sum.c:878 src/od.c:913 src/od.c:1982 src/pr.c:1135 src/pr.c:1332 +#: src/pr.c:1454 src/stty.c:1179 src/tac.c:578 src/tail.c:334 src/tee.c:172 +#: src/tr.c:1945 src/tsort.c:533 src/wc.c:203 #, c-format msgid "standard input" msgstr "標準輸出" -#: src/date.c:307 src/date.c:527 +#: src/date.c:313 src/date.c:533 #, fuzzy, c-format msgid "invalid date %s" msgstr "日期無效：‘%s’" -#: src/date.c:418 src/date.c:452 +#: src/date.c:424 src/date.c:458 #, fuzzy, c-format msgid "multiple output formats specified" msgstr "正在關閉輸出檔%s" -#: src/date.c:430 +#: src/date.c:436 #, c-format msgid "the options to specify dates for printing are mutually exclusive" msgstr "印出日期所用的選項是互相矛盾的" -#: src/date.c:437 +#: src/date.c:443 #, c-format msgid "the options to print and set the time may not be used together" msgstr "印出日期和設定日期的選項不可以同時使用" -#: src/date.c:458 +#: src/date.c:464 #, c-format msgid "" "the argument %s lacks a leading '+';\n" @@ -2916,23 +2976,23 @@ msgid "" "argument must be a format string beginning with '+'" msgstr "" -#: src/date.c:535 +#: src/date.c:541 #, c-format msgid "cannot set date" msgstr "無法設定時間" -#: src/date.c:558 src/du.c:383 +#: src/date.c:564 src/du.c:383 #, 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:109 src/rm.c:41 src/tail.c:69 src/touch.c:41 -#: src/wc.c:50 +#: src/dd.c:45 src/factor.c:110 src/rm.c:41 src/tail.c:71 src/touch.c:41 +#: src/wc.c:51 msgid "Paul Rubin" msgstr "" -#: src/dd.c:527 +#: src/dd.c:556 #, fuzzy, c-format msgid "" "Usage: %s [OPERAND]...\n" @@ -2941,7 +3001,7 @@ msgstr "" "用法：%s [檔案]...\n" " 或：%s [選項]\n" -#: src/dd.c:532 +#: src/dd.c:561 #, fuzzy msgid "" "Copy a file, converting and formatting according to the operands.\n" @@ -2960,7 +3020,7 @@ msgstr "" " count=區段數目 只複製指定 <區段數目> 的輸入資料\n" " ibs=位元組 每次讀取指定的 <位元組>\n" -#: src/dd.c:541 +#: src/dd.c:570 #, fuzzy msgid "" " if=FILE read from FILE instead of stdin\n" @@ -2970,8 +3030,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n" -" 'noxfer' suppresses transfer stats, 'none' suppresses all\n" +" status=LEVEL The LEVEL of information to print to stderr;\n" +" 'none' suppresses everything but error messages,\n" +" 'noxfer' suppresses the final transfer statistics,\n" +" 'progress' shows periodic transfer statistics\n" msgstr "" " if=檔案 讀取 <檔案> 內容而非標準輸入的資料\n" " obs=位元組 每次寫入指定的 <位元組>\n" @@ -2980,7 +3042,7 @@ msgstr "" " skip=區段數目 先略過以 ibs 為單位的指定 <區段數目> 的輸入資料\n" " status=noxfer 不顯示輸入/輸出結果\n" -#: src/dd.c:552 +#: src/dd.c:583 #, fuzzy msgid "" "\n" @@ -2997,7 +3059,7 @@ msgstr "" "GB=1000*1000*1000，G=1024*1024*1024，還有 T/P/E/Z/Y 如此類推。\n" "每個 <關鍵字> 可以是：\n" -#: src/dd.c:561 +#: src/dd.c:592 #, fuzzy msgid "" " ascii from EBCDIC to ASCII\n" @@ -3025,7 +3087,7 @@ msgstr "" " sync 將每個輸入資料區段以 NUL 字元填滿至 ibs 的大小；\n" " 當配合 block 或 unblock 時，會以空格代替 NUL 字元填充\n" -#: src/dd.c:574 +#: src/dd.c:605 msgid "" " excl fail if the output file already exists\n" " nocreat do not create the output file\n" @@ -3041,7 +3103,7 @@ msgstr "" " fdatasync 真正將資料寫入磁碟後才結束程式\n" " fsync 類似 fdatasync，並寫入元資料\n" -#: src/dd.c:582 +#: src/dd.c:613 msgid "" "\n" "Each FLAG symbol may be:\n" @@ -3050,134 +3112,103 @@ msgid "" "suggested)\n" msgstr "" -#: src/dd.c:589 +#: src/dd.c:620 msgid " cio use concurrent I/O for data\n" msgstr "" -#: src/dd.c:591 +#: src/dd.c:622 msgid " direct use direct I/O for data\n" msgstr "" -#: src/dd.c:593 +#: src/dd.c:624 #, fuzzy msgid " directory fail unless a directory\n" msgstr "建立目錄時不能指定目的地目錄" -#: src/dd.c:595 +#: src/dd.c:626 msgid " dsync use synchronized I/O for data\n" msgstr "" -#: src/dd.c:597 +#: src/dd.c:628 msgid " sync likewise, but also for metadata\n" msgstr "" -#: src/dd.c:598 +#: src/dd.c:629 msgid " fullblock accumulate full blocks of input (iflag only)\n" msgstr "" -#: src/dd.c:601 +#: src/dd.c:632 msgid " nonblock use non-blocking I/O\n" msgstr "" -#: src/dd.c:603 +#: src/dd.c:634 msgid " noatime do not update access time\n" msgstr "" -#: src/dd.c:606 +#: src/dd.c:637 msgid " nocache discard cached data\n" msgstr "" -#: src/dd.c:609 +#: src/dd.c:640 msgid " noctty do not assign controlling terminal from file\n" msgstr "" -#: src/dd.c:612 +#: src/dd.c:643 msgid " nofollow do not follow symlinks\n" msgstr "" -#: src/dd.c:614 +#: src/dd.c:645 msgid " nolinks fail if multiply-linked\n" msgstr "" -#: src/dd.c:616 +#: src/dd.c:647 msgid " binary use binary I/O for data\n" msgstr "" -#: src/dd.c:618 +#: src/dd.c:649 msgid " text use text I/O for data\n" msgstr "" -#: src/dd.c:620 +#: src/dd.c:651 msgid " count_bytes treat 'count=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:623 +#: src/dd.c:654 msgid " skip_bytes treat 'skip=N' as a byte count (iflag only)\n" msgstr "" -#: src/dd.c:626 +#: src/dd.c:657 msgid " seek_bytes treat 'seek=N' as a byte count (oflag only)\n" msgstr "" -#: src/dd.c:631 -#, fuzzy, c-format +#: src/dd.c:661 +#, 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 "" -"\n" -"將 SIGUSR1 訊號送至執行中的 ‘dd’ 進程時，會在標準錯誤顯示 I/O 統計資料，\n" -"然後繼續執行程式。\n" -"\n" -" $ dd if=/dev/zero of=/dev/null& pid=$!\n" -" $ kill -USR1 $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" -"選項包括：\n" -"\n" -#: src/dd.c:676 +#: src/dd.c:699 #, c-format -msgid "memory exhausted by input buffer of size %zu bytes (%s)" +msgid "memory exhausted by input buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:698 +#: src/dd.c:721 #, c-format -msgid "memory exhausted by output buffer of size %zu bytes (%s)" -msgstr "" - -#: src/dd.c:748 -#, c-format -msgid "" -"%+% records in\n" -"%+% records out\n" +msgid "memory exhausted by output buffer of size % bytes (%s)" msgstr "" -#: src/dd.c:754 -#, fuzzy, c-format -msgid "% truncated record\n" -msgid_plural "% truncated records\n" -msgstr[0] "個被截斷了的區段" - -#: src/dd.c:766 +#: src/dd.c:774 #, fuzzy, c-format msgid "% byte (%s) copied" msgid_plural "% bytes (%s) copied" msgstr[0] "複製了 %s 位元組 (%s)" -#: src/dd.c:785 +#: src/dd.c:794 #, fuzzy msgid "Infinity B" msgstr "無限" @@ -3192,87 +3223,100 @@ 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:798 +#: src/dd.c:807 #, fuzzy, c-format msgid ", %g s, %s/s\n" msgstr "，%g 秒，%s/s\n" -#: src/dd.c:877 +#: src/dd.c:809 +#, fuzzy, c-format +msgid ", %.6f s, %s/s" +msgstr "，%g 秒，%s/s\n" + +#: src/dd.c:828 +#, c-format +msgid "" +"%+% records in\n" +"%+% records out\n" +msgstr "" + +#: src/dd.c:834 +#, fuzzy, c-format +msgid "% truncated record\n" +msgid_plural "% truncated records\n" +msgstr[0] "個被截斷了的區段" + +#: src/dd.c:920 #, c-format msgid "closing input file %s" msgstr "正在關閉輸入檔 %s" -#: src/dd.c:884 +#: src/dd.c:927 #, c-format msgid "closing output file %s" msgstr "正在關閉輸出檔%s" -#: src/dd.c:1089 +#: src/dd.c:1142 #, fuzzy, c-format msgid "failed to turn off O_DIRECT: %s" msgstr "無法更改%s的所屬群組為 %s\n" -#: src/dd.c:1160 src/dd.c:1976 +#: src/dd.c:1213 src/dd.c:2079 #, c-format msgid "writing to %s" msgstr "正在寫入 %s" -#: src/dd.c:1274 src/dd.c:1328 +#: src/dd.c:1365 src/dd.c:1425 #, c-format msgid "unrecognized operand %s" msgstr "無法識別參數 %s" -#: src/dd.c:1285 +#: src/dd.c:1376 #, fuzzy msgid "invalid conversion" msgstr "轉換用的關鍵字無效：%s" -#: src/dd.c:1288 src/dd.c:1364 +#: src/dd.c:1379 src/dd.c:1467 #, fuzzy msgid "invalid input flag" msgstr "輸入旗標無效：%s" -#: src/dd.c:1291 src/dd.c:1358 src/dd.c:1370 +#: src/dd.c:1382 src/dd.c:1461 src/dd.c:1473 #, fuzzy msgid "invalid output flag" msgstr "輸出旗標無效：%s" -#: src/dd.c:1294 +#: src/dd.c:1385 #, fuzzy -msgid "invalid status flag" +msgid "invalid status level" msgstr "狀態旗標無效：%s" -#: src/dd.c:1333 src/truncate.c:310 -#, c-format -msgid "invalid number %s" -msgstr "數字 %s 無效" - -#: src/dd.c:1415 +#: src/dd.c:1518 #, c-format msgid "cannot combine any two of {ascii,ebcdic,ibm}" msgstr "不可同時使用 ascii, ebcdic, ibm 中的任何二個" -#: src/dd.c:1417 +#: src/dd.c:1520 #, c-format msgid "cannot combine block and unblock" msgstr "不可同時使用 block 和 unblock" -#: src/dd.c:1419 +#: src/dd.c:1522 #, c-format msgid "cannot combine lcase and ucase" msgstr "不可同時使用 lcase 和 ucase" -#: src/dd.c:1421 +#: src/dd.c:1524 #, c-format msgid "cannot combine excl and nocreat" msgstr "不可同時使用 excl 和 nocreat" -#: src/dd.c:1424 +#: src/dd.c:1527 #, fuzzy, c-format msgid "cannot combine direct and nocache" msgstr "不可同時使用 excl 和 nocreat" -#: src/dd.c:1582 +#: src/dd.c:1685 #, c-format msgid "" "warning: working around lseek kernel bug for file (%s)\n" @@ -3281,81 +3325,81 @@ msgstr "" "警告：暫時避免有關檔案 (%s) 的 lseek 核心錯誤，檔案的 mt_type=0x%0lx ─\n" " 有關 mt_type 類型的清單請參考 " -#: src/dd.c:1670 +#: src/dd.c:1773 #, fuzzy, c-format msgid "%s: cannot skip" msgstr "%s：無法搜尋" -#: src/dd.c:1672 src/dd.c:1703 src/dd.c:1764 +#: src/dd.c:1775 src/dd.c:1806 src/dd.c:1867 #, c-format msgid "%s: cannot seek" msgstr "%s：無法搜尋" -#: src/dd.c:1744 +#: src/dd.c:1847 #, c-format msgid "offset overflow while reading file %s" msgstr "" -#: src/dd.c:1756 +#: src/dd.c:1859 #, fuzzy, c-format msgid "warning: invalid file offset after failed read" msgstr "警告：寬度 %lu 是無效的；以 %d 代替" -#: src/dd.c:1760 +#: src/dd.c:1863 #, c-format msgid "cannot work around kernel bug after all" msgstr "無法避開系統核心的錯誤" -#: src/dd.c:1903 +#: src/dd.c:2006 #, c-format msgid "setting flags for %s" msgstr "" -#: src/dd.c:1957 +#: src/dd.c:2060 #, fuzzy, c-format msgid "%s: cannot skip to specified offset" msgstr "%s：無法搜尋至相對位置 %s%s" -#: src/dd.c:2172 +#: src/dd.c:2288 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "略過輸出檔%2$s的最初 %1$s 個位元組" -#: src/dd.c:2185 +#: src/dd.c:2301 #, c-format msgid "fdatasync failed for %s" msgstr "%s 的 fdatasync 失敗" -#: src/dd.c:2195 +#: src/dd.c:2311 #, c-format msgid "fsync failed for %s" msgstr "%s 的 fsync 失敗" -#: src/dd.c:2246 src/dd.c:2275 src/nohup.c:163 src/nohup.c:165 +#: src/dd.c:2362 src/dd.c:2391 src/nohup.c:161 src/nohup.c:163 #, fuzzy, c-format msgid "failed to open %s" msgstr "無法保留%s的時間" -#: src/dd.c:2285 +#: src/dd.c:2401 #, c-format msgid "" "offset too large: cannot truncate to a length of seek=% (%lu-byte) " "blocks" msgstr "" -#: src/dd.c:2306 +#: src/dd.c:2422 #, fuzzy, c-format msgid "failed to truncate to % bytes in output file %s" msgstr "略過輸出檔%2$s的最初 %1$s 個位元組" -#: src/dd.c:2322 src/dd.c:2328 +#: src/dd.c:2438 src/dd.c:2444 #, fuzzy, c-format msgid "failed to discard cache for: %s" msgstr "無法更改%s的所屬群組為 %s\n" #. This is a proper name. See the gettext manual, section Names. #: src/df.c:44 src/du.c:55 src/expr.c:152 src/kill.c:33 src/pathchk.c:32 -#: src/shuf.c:40 src/sleep.c:35 src/sort.c:67 +#: src/shuf.c:41 src/sleep.c:35 src/sort.c:67 msgid "Paul Eggert" msgstr "" @@ -3436,12 +3480,12 @@ msgstr "容量" msgid "%s-%s" msgstr "" -#: src/df.c:1215 +#: src/df.c:1236 #, c-format msgid "cannot access %s: over-mounted by another device" msgstr "" -#: src/df.c:1384 +#: src/df.c:1405 #, fuzzy msgid "" "Show information about the file system on which each FILE resides,\n" @@ -3452,18 +3496,18 @@ msgstr "" #. TRANSLATORS: The thousands and decimal separators are best #. adjusted to an appropriate default for your locale. -#: src/df.c:1393 +#: src/df.c:1414 msgid "" -" -a, --all include dummy file systems\n" +" -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n" " -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n" msgstr "" -#: src/df.c:1402 +#: src/df.c:1422 msgid "" " -i, --inodes list inode information instead of block usage\n" " -k like --block-size=1K\n" @@ -3476,7 +3520,7 @@ msgstr "" " -l, --local 只顯示本機的檔案系統\n" " --no-sync 取得使用量資料前不進行 sync 動作 (預設)\n" -#: src/df.c:1409 +#: src/df.c:1429 #, fuzzy msgid "" " --output[=FIELD_LIST] use the output format defined by FIELD_LIST,\n" @@ -3484,6 +3528,24 @@ msgid "" "omitted.\n" " -P, --portability use the POSIX output format\n" " --sync invoke sync before getting usage info\n" +msgstr "" +" -P, --portability 使用 POSIX 輸出格式\n" +" --sync 取得使用量資料前先進行 sync 動作\n" +" -t, --type=類型 只印出指定 <類型> 的檔案系統資訊\n" +" -T, --print-type 印出檔案系統類型\n" +" -x, --exclude-type=類型 只印出不是指定 <類型> 的檔案系統資訊\n" +" -v (此選項不作處理)\n" + +#: src/df.c:1435 +#, fuzzy +msgid "" +" --total elide all entries insignificant to available space,\n" +" and produce a grand total\n" +msgstr " --verbose 開啟每個輸出檔之前都在標準錯誤輸出顯示訊息\n" + +#: src/df.c:1439 +#, fuzzy +msgid "" " -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" @@ -3496,7 +3558,7 @@ msgstr "" " -x, --exclude-type=類型 只印出不是指定 <類型> 的檔案系統資訊\n" " -v (此選項不作處理)\n" -#: src/df.c:1423 +#: src/df.c:1449 msgid "" "\n" "FIELD_LIST is a comma-separated list of columns to be included. Valid\n" @@ -3504,26 +3566,26 @@ msgid "" "'size', 'used', 'avail', 'pcent', 'file' and 'target' (see info page).\n" msgstr "" -#: src/df.c:1460 +#: src/df.c:1486 #, fuzzy, c-format msgid "options %s and %s are mutually exclusive" msgstr "不能同時使用 --string 及 --check 選項" -#: src/df.c:1610 +#: src/df.c:1636 #, c-format msgid "file system type %s both selected and excluded" msgstr "不能同時選擇和排除檔案系統類型 %s" -#: src/df.c:1668 +#: src/df.c:1694 msgid "Warning: " msgstr "警告：" -#: src/df.c:1670 src/stat.c:842 +#: src/df.c:1696 src/stat.c:845 #, fuzzy msgid "cannot read table of mounted file systems" msgstr "%s 無法讀取已掛載的檔案系統的名單" -#: src/df.c:1707 +#: src/df.c:1735 #, c-format msgid "no file systems processed" msgstr "" @@ -3632,7 +3694,7 @@ msgid "" " %s stdio.h -> \".\"\n" msgstr "" -#: src/du.c:281 src/sort.c:422 src/wc.c:112 +#: src/du.c:281 src/sort.c:422 src/wc.c:113 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -3643,7 +3705,8 @@ msgstr "" #: src/du.c:285 #, fuzzy -msgid "Summarize disk usage of each FILE, recursively for directories.\n" +msgid "" +"Summarize disk usage of the set of FILEs, recursively for directories.\n" msgstr "" "總結每個 <檔案> 的磁碟用量，目錄則取總用量。\n" "\n" @@ -3761,62 +3824,56 @@ msgstr "" msgid "Infinity" msgstr "無限" -#: src/du.c:636 +#: src/du.c:657 #, fuzzy, c-format msgid "fts_read failed: %s" msgstr "fts_read 失敗" -#: src/du.c:787 +#: src/du.c:808 #, c-format msgid "invalid maximum depth %s" msgstr "最大深度 %s 無效" -#: src/du.c:816 +#: src/du.c:837 #, fuzzy, c-format msgid "invalid --threshold argument '-0'" msgstr "無效的行號增加值：‘%s’" -#: src/du.c:898 +#: src/du.c:919 #, c-format msgid "cannot both summarize and show all entries" msgstr "不能只顯示總用量，同時又顯示每個項目" -#: src/du.c:905 +#: src/du.c:926 #, c-format msgid "warning: summarizing is the same as using --max-depth=0" msgstr "警告：顯示總用量等於使用 --max-depth=0" -#: src/du.c:911 +#: src/du.c:932 #, c-format msgid "warning: summarizing conflicts with --max-depth=%lu" msgstr "警告：顯示總用量的選項和 --max-depth=%lu 互相抵觸" -#: src/du.c:922 +#: src/du.c:943 #, c-format msgid "warning: options --apparent-size and -b are ineffective with --inodes" msgstr "" -#: src/du.c:987 src/sort.c:4574 src/wc.c:668 +#: src/du.c:1008 src/sort.c:4573 src/wc.c:702 #, fuzzy msgid "file operands cannot be combined with --files0-from" msgstr "有檔案作為參數時不可和 --files0-from 一起使用。" -#: src/du.c:1047 src/md5sum.c:606 src/od.c:950 src/tac.c:238 src/tac.c:349 -#: src/tac.c:505 src/tac.c:585 src/wc.c:733 -#, c-format -msgid "%s: read error" -msgstr "%s：讀取時發生錯誤" - -#: src/du.c:1061 src/sort.c:4603 src/wc.c:747 +#: src/du.c:1082 src/sort.c:4602 src/wc.c:781 #, c-format msgid "when reading file names from stdin, no file name of %s allowed" msgstr "" -#: src/du.c:1078 src/du.c:1086 src/wc.c:760 src/wc.c:768 +#: src/du.c:1099 src/du.c:1107 src/wc.c:794 src/wc.c:802 msgid "invalid zero-length file name" msgstr "檔案名稱無效 (長度為零)" -#: src/du.c:1109 src/ls.c:2692 src/wc.c:791 +#: src/du.c:1130 src/ls.c:2689 src/wc.c:825 msgid "total" msgstr "總計" @@ -3945,9 +4002,7 @@ 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" +msgid "Convert tabs in each FILE to spaces, writing to standard output.\n" msgstr "" "將每個 <檔案> 中的 tab 轉換為空格，並在標準輸出顯示。\n" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" @@ -3991,7 +4046,7 @@ msgid "input line is too long" msgstr "輸入內容過長" #. This is a proper name. See the gettext manual, section Names. -#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:34 +#: src/expr.c:150 src/ln.c:41 src/mv.c:41 src/tee.c:35 msgid "Mike Parker" msgstr "" @@ -4099,12 +4154,12 @@ msgstr "在正規運算式搜尋時發生錯誤" msgid "non-integer argument" msgstr "參數結果不是數字" -#: src/expr.c:785 src/truncate.c:314 +#: src/expr.c:785 src/truncate.c:288 #, c-format msgid "division by zero" msgstr "被 0 整除" -#: src/expr.c:879 src/sort.c:2077 +#: src/expr.c:879 src/sort.c:2076 #, fuzzy, c-format msgid "set LC_ALL='C' to work around the problem" msgstr "請設定 LC_ALL='C' 避免問題出現。" @@ -4115,31 +4170,31 @@ msgid "the strings compared were %s and %s" msgstr "要比較的字串為%s及%s。" #. This is a proper name. See the gettext manual, section Names. -#: src/factor.c:111 +#: src/factor.c:112 msgid "Niels Moller" msgstr "" -#: src/factor.c:1267 src/factor.c:1367 src/factor.c:1443 +#: src/factor.c:1268 src/factor.c:1368 src/factor.c:1444 #, c-format msgid "Lucas prime test failure. This should not happen" msgstr "" -#: src/factor.c:2076 +#: src/factor.c:2078 #, c-format msgid "squfof queue overflow" msgstr "" -#: src/factor.c:2403 +#: src/factor.c:2492 #, fuzzy, c-format msgid "%s is not a valid positive integer" msgstr "‘%s’ 不是有效的正整數" -#: src/factor.c:2426 src/od.c:1687 src/od.c:1768 +#: src/factor.c:2516 src/od.c:1695 src/od.c:1776 #, c-format msgid "%s is too large" msgstr "%s 過長" -#: src/factor.c:2438 +#: src/factor.c:2528 #, c-format msgid "" "Usage: %s [NUMBER]...\n" @@ -4148,7 +4203,7 @@ msgstr "" "用法：%s [數字]...\n" " 或：%s 選項\n" -#: src/factor.c:2443 +#: src/factor.c:2533 #, fuzzy msgid "" "Print the prime factors of each specified integer NUMBER. If none\n" @@ -4194,7 +4249,7 @@ msgstr "" "如果沒有指定 <檔案> 或 <檔案> 是‘-’，則由標準輸入讀取資料。\n" "\n" -#: src/fmt.c:278 +#: src/fmt.c:279 msgid "" " -c, --crown-margin preserve indentation of first two lines\n" " -p, --prefix=STRING reformat only lines beginning with STRING,\n" @@ -4206,7 +4261,7 @@ msgstr "" " 的結果重新加上 <字串>\n" " -s, --split-only 只將一行過長的資料分開，而不合併多於一行的資料\n" -#: src/fmt.c:287 +#: src/fmt.c:288 #, fuzzy, no-c-format msgid "" " -t, --tagged-paragraph indentation of first line different from second\n" @@ -4218,28 +4273,26 @@ msgstr "" " -u, --uniform-spacing 每兩個字之間以一個空格分隔，句子後則用兩個空格\n" " -w, --width=數字 最大的行寬 (預設為 75 個字元)\n" -#: src/fmt.c:359 +#: src/fmt.c:356 #, 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" +#: src/fmt.c:400 src/fmt.c:407 +#, fuzzy +msgid "invalid width" msgstr "寬度無效：%s" -#: src/fold.c:70 +#: src/fold.c:69 #, fuzzy -msgid "" -"Wrap input lines in each FILE (standard input by default), writing to\n" -"standard output.\n" +msgid "Wrap input lines in each FILE, writing to standard output.\n" msgstr "" "將 <檔案> (預設為標準輸入) 中的每一行進行自動換行，並在標準輸出顯示結果。\n" "\n" -#: src/fold.c:77 +#: src/fold.c:76 msgid "" " -b, --bytes count bytes rather than columns\n" " -s, --spaces break at spaces\n" @@ -4249,9 +4302,9 @@ msgstr "" " -s, --spaces 只在空格位置斷開\n" " -w, --width=寬度 使用指定的 <寬度> 作為行寬而非 80\n" -#: src/fold.c:288 src/pr.c:832 -#, fuzzy, c-format -msgid "invalid number of columns: %s" +#: src/fold.c:283 src/pr.c:831 +#, fuzzy +msgid "invalid number of columns" msgstr "無效的欄位數目：‘%s’" #. This is a proper name. See the gettext manual, section Names. @@ -4318,18 +4371,17 @@ msgstr "不可同時省略使用者和所屬群組" msgid "%s: no such user" msgstr "%s：此用戶不存在" -#: src/head.c:109 +#: src/head.c:110 #, fuzzy msgid "" "Print the first 10 lines of each FILE to standard output.\n" "With more than one FILE, precede each with a header giving the file name.\n" -"With no FILE, or when FILE is -, read standard input.\n" msgstr "" "在標準輸出顯示每個 <檔案> 的最初 10 行。\n" "當多於一個 <檔案> 時，顯示時會先加上表示檔案名稱的標頭。\n" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" -#: src/head.c:117 +#: src/head.c:118 #, fuzzy msgid "" " -c, --bytes=[-]K print the first K bytes of each file;\n" @@ -4344,7 +4396,7 @@ msgstr "" " -n, --lines=[-]N 顯示每個檔案的最初 N 行；如果附有 ‘-’ 號，\n" " 則顯示整個檔案減去最後 N 行\n" -#: src/head.c:125 +#: src/head.c:126 msgid "" " -q, --quiet, --silent never print headers giving file names\n" " -v, --verbose always print headers giving file names\n" @@ -4352,7 +4404,7 @@ msgstr "" " -q, --quiet, --silent 絕不顯示含有檔案名稱的標頭\n" " -v, --verbose 一定顯示含有檔案名稱的標頭\n" -#: src/head.c:131 +#: src/head.c:132 #, fuzzy msgid "" "\n" @@ -4366,48 +4418,36 @@ msgstr "" "GB=1000*1000*1000，G=1024*1024*1024，還有 T/P/E/Z/Y 如此類推。\n" "每個 <關鍵字> 可以是：\n" -#: src/head.c:151 +#: src/head.c:152 #, c-format msgid "%s: file has shrunk too much" msgstr "" -#: src/head.c:237 src/head.c:1052 -#, c-format -msgid "%s: number of bytes is too large" -msgstr "%s：位元組數目過大" - -#: src/head.c:422 src/tail.c:453 +#: src/head.c:224 src/tail.c:448 #, c-format msgid "%s: cannot seek to offset %s" msgstr "%s：無法搜尋至位置 %s" -#: src/head.c:423 src/tail.c:457 +#: src/head.c:225 src/tail.c:452 #, fuzzy, c-format msgid "%s: cannot seek to relative offset %s" msgstr "%s：無法搜尋至相對位置 %s%s" -#: src/head.c:886 +#: src/head.c:267 #, c-format -msgid "%s: %s is so large that it is not representable" -msgstr "%s：%s過大，因此無法表示" - -#: src/head.c:887 -msgid "number of lines" -msgstr "行數" - -#: src/head.c:887 -msgid "number of bytes" -msgstr "位元組數目" +msgid "%s: number of bytes is too large" +msgstr "%s：位元組數目過大" -#: src/head.c:894 src/tail.c:2005 +#: src/head.c:906 src/split.c:1289 src/split.c:1450 src/tail.c:2061 msgid "invalid number of lines" msgstr "無效的行數" -#: src/head.c:895 src/tail.c:2006 +#: src/head.c:907 src/head.c:1061 src/split.c:1281 src/split.c:1297 +#: src/tail.c:2062 msgid "invalid number of bytes" msgstr "無效的位元組數目" -#: src/head.c:982 src/head.c:1040 +#: src/head.c:991 src/head.c:1049 #, fuzzy, c-format msgid "invalid trailing option -- %c" msgstr "選項無效 ─ %c" @@ -4591,7 +4631,7 @@ msgstr "無法更改 %s 的擁有權" msgid "cannot set time stamps for %s" msgstr "無法設定 %s 的檔案時間" -#: src/install.c:531 src/split.c:425 src/timeout.c:442 +#: src/install.c:531 src/split.c:479 src/timeout.c:444 #, c-format msgid "fork system call failed" msgstr "調用 fork() 系統函式失敗" @@ -4735,7 +4775,7 @@ msgstr "建立目錄時不能用 strip 選項" msgid "target directory not allowed when installing a directory" msgstr "建立目錄時不能指定目的地目錄" -#: src/install.c:989 src/mkdir.c:294 src/stdbuf.c:351 +#: src/install.c:989 src/mkdir.c:283 src/stdbuf.c:351 #, c-format msgid "invalid mode %s" msgstr "權限模式 %s 無效" @@ -4768,11 +4808,15 @@ msgid "Mike Haertel" msgstr "" #: src/join.c:195 -#, 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" -"by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n" +"standard output. The default join field is the first, delimited by " +"whitespace.\n" +msgstr "" + +#: src/join.c:204 +#, fuzzy +msgid "" "\n" " -a FILENUM also print unpairable lines from file FILENUM, where\n" " FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n" @@ -4787,7 +4831,7 @@ msgstr "" "2>\n" " -e 字串 當缺少輸入欄位時，以 <字串> 代替\n" -#: src/join.c:204 +#: src/join.c:210 #, fuzzy msgid "" " -i, --ignore-case ignore differences in case when comparing fields\n" @@ -4800,7 +4844,7 @@ msgstr "" " -o 格式 當輸出時遵從指定 <格式>\n" " -t 字元 以 <字元> 作為輸入和輸出的欄位分隔符號\n" -#: src/join.c:210 +#: src/join.c:216 msgid "" " -v FILENUM like -a FILENUM, but suppress joined output lines\n" " -1 FIELD join on this FIELD of file 1\n" @@ -4812,13 +4856,13 @@ msgid "" " print them without trying to pair them\n" msgstr "" -#: src/join.c:220 src/shuf.c:81 src/sort.c:506 src/uniq.c:204 +#: src/join.c:226 src/shuf.c:83 src/sort.c:507 src/uniq.c:204 #, fuzzy msgid " -z, --zero-terminated line delimiter is NUL, not newline\n" msgstr "" " -z, --zero-terminated 以位元組 0 而非 newline 字元作為每行的結束字元\n" -#: src/join.c:225 +#: src/join.c:231 #, fuzzy msgid "" "\n" @@ -4844,47 +4888,47 @@ msgstr "" "合併的欄位，然後是 <檔案1> 的其它欄位，最後是 <檔案2> 的其它欄位，全部皆以\n" "<字元> 來分隔。\n" -#: src/join.c:410 +#: src/join.c:416 #, c-format msgid "%s:%: is not sorted: %.*s" msgstr "" -#: src/join.c:847 src/join.c:1045 +#: src/join.c:853 src/join.c:1051 #, c-format msgid "invalid field number: %s" msgstr "無效的欄位編號：%s" -#: src/join.c:868 src/join.c:877 +#: src/join.c:874 src/join.c:883 #, fuzzy, c-format msgid "invalid field specifier: %s" msgstr "無效的欄位規格：‘%s’" -#: src/join.c:884 +#: src/join.c:890 #, fuzzy, c-format msgid "invalid file number in field spec: %s" msgstr "欄位規格中含有無效的檔案編號：‘%s’" -#: src/join.c:927 +#: src/join.c:933 #, c-format msgid "incompatible join fields %lu, %lu" msgstr "" -#: src/join.c:1056 +#: src/join.c:1062 #, c-format msgid "conflicting empty-field replacement strings" msgstr "" -#: src/join.c:1108 src/sort.c:4509 +#: src/join.c:1114 src/sort.c:4508 #, fuzzy, c-format msgid "multi-character tab %s" msgstr "分隔欄位字元‘%s’多於一個字元" -#: src/join.c:1112 src/sort.c:4514 +#: src/join.c:1118 src/sort.c:4513 #, c-format msgid "incompatible tabs" msgstr "" -#: src/join.c:1185 +#: src/join.c:1191 #, c-format msgid "both files cannot be standard input" msgstr "兩個檔案不能都是標準輸入" @@ -4948,17 +4992,17 @@ msgstr "使用 -l 或 -t 時不能同時指定訊號" msgid "no process ID specified" msgstr "未指定進程編號" -#: src/libstdbuf.c:109 +#: src/libstdbuf.c:107 #, c-format msgid "failed to allocate a % byte stdio buffer\n" msgstr "" -#: src/libstdbuf.c:116 +#: src/libstdbuf.c:114 #, fuzzy, c-format msgid "invalid buffering mode %s for %s\n" msgstr "%2$s的參數%1$s無效" -#: src/libstdbuf.c:124 +#: src/libstdbuf.c:122 #, c-format msgid "could not set buffering of %s to mode %s\n" msgstr "" @@ -5130,7 +5174,7 @@ msgstr "無法建立符號鏈結 %s" msgid "FIXME: unknown" msgstr "" -#: src/logname.c:39 src/sync.c:40 +#: src/logname.c:39 #, fuzzy, c-format msgid "Usage: %s [OPTION]\n" msgstr "用法：%s [選項] [檔案]...\n" @@ -5141,7 +5185,7 @@ msgid "" "\n" msgstr "" -#: src/logname.c:84 +#: src/logname.c:79 #, fuzzy, c-format msgid "no login name" msgstr "%s：無效的號碼" @@ -5151,7 +5195,7 @@ msgstr "%s：無效的號碼" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:734 +#: src/ls.c:737 #, fuzzy msgid "%b %e %Y" msgstr "%Y-%m-%d %H:%M" @@ -5161,96 +5205,96 @@ msgstr "%Y-%m-%d %H:%M" #. Note %b is handled specially by ls and aligned correctly. #. Note also that specifying a width as in %5b is erroneous as strftime #. will count bytes rather than characters in multibyte locales. -#: src/ls.c:747 +#: src/ls.c:750 #, fuzzy msgid "%b %e %H:%M" msgstr "%Y-%m-%d %H:%M" -#: src/ls.c:1590 -#, c-format -msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" -msgstr "忽略無效的環境變數 QUOTING_STYLE 的變數值：%s" - -#: src/ls.c:1609 +#: src/ls.c:1599 #, c-format msgid "ignoring invalid width in environment variable COLUMNS: %s" msgstr "忽略無效的環境變數 COLUMNS 的寬度數值：%s" -#: src/ls.c:1639 +#: src/ls.c:1629 #, c-format msgid "ignoring invalid tab size in environment variable TABSIZE: %s" msgstr "忽略無效的環境變數 TABSIZE 的 tab 字元定位值：%s" -#: src/ls.c:1760 src/ptx.c:1978 -#, fuzzy, c-format -msgid "invalid line width: %s" +#: src/ls.c:1747 +#, fuzzy +msgid "invalid line width" msgstr "無效的寬度：‘%s’" -#: src/ls.c:1834 -#, fuzzy, c-format -msgid "invalid tab size: %s" +#: src/ls.c:1815 +#, fuzzy +msgid "invalid tab size" msgstr "無效的類型‘%s’" -#: src/ls.c:2043 +#: src/ls.c:2021 #, fuzzy, c-format msgid "invalid time style format %s" msgstr "%2$s的參數%1$s無效" -#: src/ls.c:2067 +#: src/ls.c:2045 #, fuzzy msgid "Valid arguments are:\n" msgstr "有效的參數為：" -#: src/ls.c:2071 +#: src/ls.c:2049 msgid " - +FORMAT (e.g., +%H:%M) for a 'date'-style format\n" msgstr "" -#: src/ls.c:2106 +#: src/ls.c:2084 #, c-format msgid "error initializing month strings" msgstr "" -#: src/ls.c:2450 +#: src/ls.c:2428 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "無法識別的選項‘-%c’" -#: src/ls.c:2480 +#: src/ls.c:2458 #, c-format msgid "unparsable value for LS_COLORS environment variable" msgstr "LS_COLORS 環境變數中存在無法分析的值" -#: src/ls.c:2557 src/pwd.c:164 +#: src/ls.c:2488 +#, c-format +msgid "ignoring invalid value of environment variable QUOTING_STYLE: %s" +msgstr "忽略無效的環境變數 QUOTING_STYLE 的變數值：%s" + +#: src/ls.c:2554 src/pwd.c:164 #, fuzzy, c-format msgid "cannot open directory %s" msgstr "無法建立目錄%s" -#: src/ls.c:2572 +#: src/ls.c:2569 #, fuzzy, c-format msgid "cannot determine device and inode of %s" msgstr "無法將 %s 的檔案指標重新定位" -#: src/ls.c:2581 +#: src/ls.c:2578 #, fuzzy, c-format msgid "%s: not listing already-listed directory" msgstr "無法建立目錄%s" -#: src/ls.c:2658 src/pwd.c:232 +#: src/ls.c:2655 src/pwd.c:232 #, fuzzy, c-format msgid "reading directory %s" msgstr "無法建立目錄%s" -#: src/ls.c:2673 +#: src/ls.c:2670 #, fuzzy, c-format msgid "closing directory %s" msgstr "無法進入%s目錄" -#: src/ls.c:3362 +#: src/ls.c:3355 #, fuzzy, c-format msgid "cannot compare file names %s and %s" msgstr "要比較的字串為%s及%s。" -#: src/ls.c:4781 +#: src/ls.c:4775 #, fuzzy msgid "" "List information about the FILEs (the current directory by default).\n" @@ -5260,7 +5304,7 @@ msgstr "" "如果不指定 -cftuSUX 或 --sort 任何一個選項，則根據字母大小排序。\n" "\n" -#: src/ls.c:4788 +#: src/ls.c:4782 #, fuzzy msgid "" " -a, --all do not ignore entries starting with .\n" @@ -5274,7 +5318,7 @@ msgstr "" " --author 印出每個檔案的著作者\n" " -b, --escape 以八進位溢出序列表示不可列印的字元\n" -#: src/ls.c:4794 +#: src/ls.c:4788 #, fuzzy msgid "" " --block-size=SIZE scale sizes by SIZE before printing them; e." @@ -5295,13 +5339,14 @@ msgstr "" " 配合 -l ：顯示 ctime 但根據名稱排序\n" " 否則 ：根據 ctime 排序\n" -#: src/ls.c:4804 +#: src/ls.c:4798 #, fuzzy msgid "" " -C list entries by columns\n" -" --color[=WHEN] colorize the output; WHEN can be 'never', " -"'auto',\n" -" or 'always' (the default); more info below\n" +" --color[=WHEN] colorize the output; WHEN can be " +"'always' (default\n" +" if omitted), 'auto', or 'never'; more info " +"below\n" " -d, --directory list directories themselves, not their " "contents\n" " -D, --dired generate output designed for Emacs' dired mode\n" @@ -5312,7 +5357,7 @@ msgstr "" " -d, --directory 當遇到目錄時列出目錄本身而非目錄內的檔案\n" " -D, --dired 產生適合 Emacs 的 dired 模式使用的結果\n" -#: src/ls.c:4812 +#: src/ls.c:4807 #, fuzzy msgid "" " -f do not sort, enable -aU, disable -ls --color\n" @@ -5328,11 +5373,11 @@ msgstr "" " single-column -1，verbose -l，vertical -C\n" " --full-time 即 -l --time-style=full-iso\n" -#: src/ls.c:4820 +#: src/ls.c:4815 msgid " -g like -l, but do not list owner\n" msgstr "" -#: src/ls.c:4823 +#: src/ls.c:4818 msgid "" " --group-directories-first\n" " group directories before files;\n" @@ -5341,7 +5386,7 @@ msgid "" " use of --sort=none (-U) disables grouping\n" msgstr "" -#: src/ls.c:4829 +#: src/ls.c:4824 #, fuzzy msgid "" " -G, --no-group in a long listing, don't print group names\n" @@ -5354,7 +5399,7 @@ msgstr "" " -h, --human-readable 以容易理解的格式印出檔案系統大小 (例如 1K 234M 2G)\n" " -H, --si 類似 -h，但以 1000 為單位而不是 1024\n" -#: src/ls.c:4835 +#: src/ls.c:4830 #, fuzzy msgid "" " -H, --dereference-command-line\n" @@ -5373,7 +5418,7 @@ msgstr "" " --si 類似 -h，但取 1000 的次方而不是 1024\n" " -H, --dereference-command-line 使用指令列中的符號鏈結指示的真正目的地\n" -#: src/ls.c:4845 +#: src/ls.c:4840 #, fuzzy msgid "" " --indicator-style=WORD append indicator with style WORD to entry " @@ -5391,7 +5436,7 @@ msgstr "" " -I, --ignore=樣式 不印出任何符合 shell 萬用字元 <樣式> 的項目\n" " -k 即 --block-size=1K\n" -#: src/ls.c:4855 +#: src/ls.c:4850 msgid "" " -l use a long listing format\n" " -L, --dereference when showing file information for a symbolic\n" @@ -5405,7 +5450,7 @@ msgstr "" " 的目標而並非符號鏈結本身的資訊\n" " -m 所有項目以逗號分隔，並填滿整行行寬\n" -#: src/ls.c:4863 +#: src/ls.c:4858 #, fuzzy msgid "" " -n, --numeric-uid-gid like -l, but list numeric user and group IDs\n" @@ -5422,7 +5467,7 @@ msgstr "" " -o 類似 -l，但不列出有關群組的資訊\n" " -p, --file-type 加上檔案類型的指示符號 (/=@| 其中一個)\n" -#: src/ls.c:4871 +#: src/ls.c:4866 #, fuzzy msgid "" " -q, --hide-control-chars print ? instead of nongraphic characters\n" @@ -5442,7 +5487,7 @@ msgstr "" " literal、locale、shell、shell-always、c、" "escape\n" -#: src/ls.c:4881 +#: src/ls.c:4876 #, fuzzy msgid "" " -r, --reverse reverse order while sorting\n" @@ -5454,19 +5499,19 @@ msgstr "" " -R, --recursive 同時列出所有子目錄層\n" " -s, --size 以區段大小為單位列出所有檔案的大小\n" -#: src/ls.c:4886 +#: src/ls.c:4881 #, fuzzy msgid "" -" -S sort by file size\n" +" -S sort by file size, largest first\n" " --sort=WORD sort by WORD instead of name: none (-U), size (-" "S),\n" " time (-t), version (-v), extension (-X)\n" " --time=WORD with -l, show time as WORD instead of default\n" " modification time: atime or access or use (-" -"u)\n" +"u);\n" " ctime or status (-c); also use specified " "time\n" -" as sort key if --sort=time\n" +" as sort key if --sort=time (newest first)\n" msgstr "" " -S 根據檔案大小排序\n" " --sort=WORD 以下是可選用的 WORD 和它們代表的相應選項：\n" @@ -5479,7 +5524,7 @@ msgstr "" " atime、access、use、ctime 或 status；加上\n" " --sort=time 選項時會以指定時間作為排序索引\n" -#: src/ls.c:4896 +#: src/ls.c:4892 #, fuzzy msgid "" " --time-style=STYLE with -l, show times using style STYLE:\n" @@ -5503,18 +5548,18 @@ msgstr "" " -t 根據修改時間排序\n" " -T, --tabsize=寬度 另行指定 tab 的 <寬度>，而非 8 個字元\n" -#: src/ls.c:4908 +#: src/ls.c:4904 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:4912 +#: src/ls.c:4908 #, fuzzy 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" +" otherwise: sort by access time, newest first\n" " -U do not sort; list entries in directory order\n" " -v natural sort of (version) numbers within text\n" msgstr "" @@ -5524,20 +5569,21 @@ msgstr "" " -U 不進行排序；依檔案系統原有的次序列出項目\n" " -v 根據版本進行排序\n" -#: src/ls.c:4919 +#: src/ls.c:4915 #, fuzzy msgid "" " -w, --width=COLS assume screen width instead of current value\n" " -x list entries by lines instead of by columns\n" " -X sort alphabetically by entry extension\n" " -Z, --context print any security context of each file\n" -" -1 list one file per line\n" +" -1 list one file per line. Avoid '\\n' with -q or " +"-b\n" msgstr "" " -f, --fields=LIST 只顯示指定的欄位；同時也印出不含分隔符號的\n" " 每一行，除非使用了 -s 選項\n" " -n (不會作任何處理)\n" -#: src/ls.c:4929 +#: src/ls.c:4926 msgid "" "\n" "Using color to distinguish file types is disabled both by default and\n" @@ -5546,7 +5592,7 @@ msgid "" "variable can change the settings. Use the dircolors command to set it.\n" msgstr "" -#: src/ls.c:4936 +#: src/ls.c:4933 msgid "" "\n" "Exit status:\n" @@ -5576,47 +5622,52 @@ msgstr "" 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 "" "用法：%s [選項] [檔案]...\n" " 或：%s [選項] --check [檔案]\n" "印出或檢查 %s (%d 位元) 總和檢查值。\n" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" -#: src/md5sum.c:174 +#: src/md5sum.c:175 +#, fuzzy msgid "" +"\n" " -b, --binary read in binary mode (default unless reading tty " "stdin)\n" msgstr "" +"\n" +" -B, --binary (DOS/Windows)以二元碼模式將資料輸出至畫面。\n" +"\n" -#: src/md5sum.c:178 +#: src/md5sum.c:180 #, fuzzy -msgid " -b, --binary read in binary mode\n" +msgid "" +"\n" +" -b, --binary read in binary mode\n" msgstr "" "\n" " -B, --binary (DOS/Windows)以二元碼模式將資料輸出至畫面。\n" "\n" -#: src/md5sum.c:181 +#: src/md5sum.c:184 #, c-format msgid " -c, --check read %s sums from the FILEs and check them\n" msgstr "" -#: src/md5sum.c:184 +#: src/md5sum.c:187 msgid " --tag create a BSD-style checksum\n" msgstr "" -#: src/md5sum.c:188 +#: src/md5sum.c:191 msgid "" " -t, --text read in text mode (default if reading tty stdin)\n" msgstr "" -#: src/md5sum.c:192 +#: src/md5sum.c:195 msgid " -t, --text read in text mode (default)\n" msgstr "" -#: src/md5sum.c:195 +#: src/md5sum.c:198 #, fuzzy msgid "" "\n" @@ -5632,100 +5683,101 @@ msgstr "" " --status 不顯示任何結果，只用回傳值表示是否成功\n" " -w, --warn 對於每一行含有不正確格式的總和檢查值都顯示警告\n" -#: src/md5sum.c:206 +#: src/md5sum.c:209 #, fuzzy, 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" +"should be a former output of this program. The default mode is to print a\n" +"line with checksum, a space, a character indicating input mode ('*' for " +"binary,\n" +"' ' for text or where binary is insignificant), and name for each FILE.\n" msgstr "" "\n" "總和檢查是根據 %s 描述的方法計算出來的。當驗證時，輸入資料必須是此程式以往\n" "的輸出結果。預設模式是印出總和檢查值，一個代表檔案類型的字元 (‘*’表示二元\n" "碼，‘ ’[空格] 表示文字)，及每個 <檔案> 的名稱。\n" -#: src/md5sum.c:521 +#: src/md5sum.c:524 #, fuzzy, c-format msgid "%s: too many checksum lines" msgstr "%s：找不到正確格式的 %s 總和檢查值" -#: src/md5sum.c:545 +#: src/md5sum.c:548 #, fuzzy, c-format msgid "%s: %: improperly formatted %s checksum line" msgstr "%s：%lu：該行的 %s 總和檢查值格式不正確" -#: src/md5sum.c:570 +#: src/md5sum.c:573 #, c-format msgid "%s: FAILED open or read\n" msgstr "%s：開啟或讀取時發生錯誤\n" -#: src/md5sum.c:593 +#: src/md5sum.c:596 msgid "FAILED" msgstr "錯誤" -#: src/md5sum.c:595 +#: src/md5sum.c:598 msgid "OK" msgstr "正確" -#: src/md5sum.c:619 +#: src/md5sum.c:622 #, c-format msgid "%s: no properly formatted %s checksum lines found" msgstr "%s：找不到正確格式的 %s 總和檢查值" -#: src/md5sum.c:629 +#: src/md5sum.c:632 #, fuzzy, c-format msgid "WARNING: % line is improperly formatted" msgid_plural "WARNING: % lines are improperly formatted" msgstr[0] "%s：%lu：該行的 %s 總和檢查值格式不正確" -#: src/md5sum.c:637 +#: src/md5sum.c:640 #, fuzzy, c-format msgid "WARNING: % listed file could not be read" msgid_plural "WARNING: % 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:645 +#: src/md5sum.c:648 #, fuzzy, c-format msgid "WARNING: % computed checksum did NOT match" msgid_plural "WARNING: % computed checksums did NOT match" msgstr[0] "警告：%2$d 個計算出來的%3$s的其中 %1$d 個並不匹配" msgstr[1] "警告：%2$d 個計算出來的%3$s的其中 %1$d 個並不匹配" -#: src/md5sum.c:764 +#: src/md5sum.c:767 #, c-format msgid "--tag does not support --text mode" msgstr "" -#: src/md5sum.c:770 +#: src/md5sum.c:773 #, fuzzy, c-format msgid "the --tag option is meaningless when verifying checksums" msgstr "選項 --status 只有在驗證總和檢查值時才有意義" -#: src/md5sum.c:777 +#: src/md5sum.c:780 #, c-format msgid "" "the --binary and --text options are meaningless when verifying checksums" msgstr "當驗證總和檢查值時，選項 --binary 及 --text 是沒有意義的" -#: src/md5sum.c:785 +#: src/md5sum.c:788 #, c-format msgid "the --status option is meaningful only when verifying checksums" msgstr "選項 --status 只有在驗證總和檢查值時才有意義" -#: src/md5sum.c:792 +#: src/md5sum.c:795 #, c-format msgid "the --warn option is meaningful only when verifying checksums" msgstr "選項 --warn 只有在驗證總和檢查值時才有意義" -#: src/md5sum.c:799 +#: src/md5sum.c:802 #, fuzzy, c-format msgid "the --quiet option is meaningful only when verifying checksums" msgstr "選項 --status 只有在驗證總和檢查值時才有意義" -#: src/md5sum.c:806 +#: src/md5sum.c:809 #, fuzzy, c-format msgid "the --strict option is meaningful only when verifying checksums" msgstr "選項 --status 只有在驗證總和檢查值時才有意義" @@ -5762,22 +5814,22 @@ msgid "" " or SMACK security context to CTX\n" msgstr "" -#: src/mkdir.c:127 src/mkdir.c:172 +#: src/mkdir.c:127 src/mkdir.c:160 #, fuzzy, c-format msgid "failed to set default creation context for %s" msgstr "無法取得 %s 的屬性" -#: src/mkdir.c:191 +#: src/mkdir.c:180 #, fuzzy, c-format msgid "failed to restore context for %s" msgstr "無法保留 %s 的時間" -#: src/mkdir.c:231 +#: src/mkdir.c:220 #, fuzzy, c-format msgid "created directory %s" msgstr "無法建立目錄%s" -#: src/mkdir.c:249 src/mkfifo.c:116 src/mknod.c:133 +#: src/mkdir.c:238 src/mkfifo.c:116 src/mknod.c:133 #, c-format msgid "" "warning: ignoring --context; it requires an SELinux/SMACK-enabled kernel" @@ -5963,7 +6015,7 @@ msgstr "重複的行數過多" msgid "with --suffix, template %s must end in X" msgstr "" -#: src/mktemp.c:255 src/split.c:1180 +#: src/mktemp.c:255 src/split.c:1266 #, c-format msgid "invalid suffix %s, contains directory separator" msgstr "" @@ -6092,9 +6144,7 @@ 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" +msgid "Write each FILE to standard output, with line numbers added.\n" msgstr "" "將每個 <檔案> 的內容在標準輸出顯示，並加上行號。\n" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" @@ -6199,27 +6249,27 @@ msgstr "無效的數字" msgid "invalid footer numbering style: %s" msgstr "欄位規格中含有無效的檔案編號：‘%s’" -#: src/nl.c:503 -#, fuzzy, c-format -msgid "invalid starting line number: %s" +#: src/nl.c:501 +#, fuzzy +msgid "invalid starting line number" msgstr "無效的開始行號：‘%s’" -#: src/nl.c:512 -#, fuzzy, c-format -msgid "invalid line number increment: %s" +#: src/nl.c:506 +#, fuzzy +msgid "invalid line number increment" msgstr "無效的行號增加值：‘%s’" -#: src/nl.c:524 -#, fuzzy, c-format -msgid "invalid number of blank lines: %s" +#: src/nl.c:513 +#, fuzzy +msgid "invalid line number of blank lines" msgstr "無效的空白行數目：‘%s’" -#: src/nl.c:538 -#, fuzzy, c-format -msgid "invalid line number field width: %s" +#: src/nl.c:520 +#, fuzzy +msgid "invalid line number field width" msgstr "無效的行號欄位寬度：‘%s’" -#: src/nl.c:557 +#: src/nl.c:531 #, fuzzy, c-format msgid "invalid line numbering format: %s" msgstr "無效的行號增加值：‘%s’" @@ -6243,7 +6293,7 @@ msgstr "" #, c-format msgid "" "\n" -"If standard input is a terminal, redirect it from /dev/null.\n" +"If standard input is a terminal, redirect it from an unreadable file.\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" @@ -6255,43 +6305,43 @@ msgstr "" msgid "failed to render standard input unusable" msgstr "標準輸出" -#: src/nohup.c:131 +#: src/nohup.c:129 #, fuzzy, c-format msgid "ignoring input" msgstr "參數過多" -#: src/nohup.c:175 +#: src/nohup.c:173 #, fuzzy, c-format msgid "ignoring input and appending output to %s" msgstr "無法更改%s的擁有者和/或所屬群組" -#: src/nohup.c:176 +#: src/nohup.c:174 #, fuzzy, c-format msgid "appending output to %s" msgstr "無法更改%s的擁有者和/或所屬群組" -#: src/nohup.c:193 +#: src/nohup.c:191 #, c-format msgid "failed to set the copy of stderr to close on exec" msgstr "" -#: src/nohup.c:198 +#: src/nohup.c:196 #, c-format msgid "ignoring input and redirecting stderr to stdout" msgstr "" -#: src/nohup.c:199 +#: src/nohup.c:197 #, c-format msgid "redirecting stderr to stdout" msgstr "" -#: src/nohup.c:203 +#: src/nohup.c:201 #, c-format msgid "failed to redirect standard error" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/nproc.c:33 +#: src/nproc.c:33 src/sync.c:34 msgid "Giuseppe Scrivano" msgstr "" @@ -6313,96 +6363,93 @@ msgid "" " --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：無效的行數" - #. This is a proper name. See the gettext manual, section Names. -#: src/numfmt.c:36 +#: src/numfmt.c:42 msgid "Assaf Gordon" msgstr "" -#: src/numfmt.c:659 +#: src/numfmt.c:690 #, c-format msgid "value too large to be converted: %s" msgstr "" -#: src/numfmt.c:663 +#: src/numfmt.c:694 #, fuzzy, c-format msgid "invalid number: %s" msgstr "數字 %s 無效" -#: src/numfmt.c:667 +#: src/numfmt.c:698 #, c-format msgid "rejecting suffix in input: %s (consider using --from)" msgstr "" -#: src/numfmt.c:671 +#: src/numfmt.c:702 #, fuzzy, c-format msgid "invalid suffix in input: %s" msgstr "輸入旗標無效：%s" -#: src/numfmt.c:675 +#: src/numfmt.c:706 #, c-format msgid "missing 'i' suffix in input: %s (e.g Ki/Mi/Gi)" msgstr "" -#: src/numfmt.c:722 src/numfmt.c:768 +#: src/numfmt.c:753 src/numfmt.c:805 #, fuzzy, c-format msgid "failed to prepare value '%Lf' for printing" msgstr "%s：無法開啟來寫入資料" -#: src/numfmt.c:791 +#: src/numfmt.c:854 #, fuzzy, c-format msgid "invalid unit size: %s" msgstr "無效的類型‘%s’" -#: src/numfmt.c:814 +#: src/numfmt.c:880 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [NUMBER]...\n" msgstr "用法：%s [選項]... [檔案]...\n" -#: src/numfmt.c:817 +#: src/numfmt.c:883 msgid "" "Reformat NUMBER(s), or the numbers from standard input if none are " "specified.\n" msgstr "" -#: src/numfmt.c:821 +#: src/numfmt.c:887 msgid " --debug print warnings about invalid input\n" msgstr "" -#: src/numfmt.c:824 +#: src/numfmt.c:890 msgid "" " -d, --delimiter=X use X instead of whitespace for field delimiter\n" msgstr "" -#: src/numfmt.c:827 +#: src/numfmt.c:893 msgid "" -" --field=N replace the number in input field N (default is 1)\n" +" --field=FIELDS replace the numbers in these input fields " +"(default=1)\n" +" see FIELDS below\n" msgstr "" -#: src/numfmt.c:830 +#: src/numfmt.c:897 msgid "" " --format=FORMAT use printf style floating-point FORMAT;\n" " see FORMAT below for details\n" msgstr "" -#: src/numfmt.c:834 +#: src/numfmt.c:901 msgid "" " --from=UNIT auto-scale input numbers to UNITs; default is " "'none';\n" " see UNIT below\n" msgstr "" -#: src/numfmt.c:838 +#: src/numfmt.c:905 msgid "" " --from-unit=N specify the input unit size (instead of the default " "1)\n" msgstr "" -#: src/numfmt.c:841 +#: src/numfmt.c:908 msgid "" " --grouping use locale-defined grouping of digits, e.g. " "1,000,000\n" @@ -6410,19 +6457,19 @@ msgid "" "locale)\n" msgstr "" -#: src/numfmt.c:845 +#: src/numfmt.c:912 msgid "" " --header[=N] print (without converting) the first N header lines;\n" " N defaults to 1 if not specified\n" msgstr "" -#: src/numfmt.c:849 +#: src/numfmt.c:916 msgid "" " --invalid=MODE failure mode for invalid numbers: MODE can be:\n" " abort (default), fail, warn, ignore\n" msgstr "" -#: src/numfmt.c:853 +#: src/numfmt.c:920 msgid "" " --padding=N pad the output to N characters; positive N will\n" " right-align; negative N will left-align;\n" @@ -6432,40 +6479,40 @@ msgid "" " is found\n" msgstr "" -#: src/numfmt.c:860 +#: src/numfmt.c:927 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:864 +#: src/numfmt.c:931 msgid "" " --suffix=SUFFIX add SUFFIX to output numbers, and accept optional\n" " SUFFIX in input numbers\n" msgstr "" -#: src/numfmt.c:868 +#: src/numfmt.c:935 msgid "" " --to=UNIT auto-scale output numbers to UNITs; see UNIT below\n" msgstr "" -#: src/numfmt.c:871 +#: src/numfmt.c:938 msgid "" " --to-unit=N the output unit size (instead of the default 1)\n" msgstr "" -#: src/numfmt.c:878 +#: src/numfmt.c:945 msgid "" "\n" "UNIT options:\n" msgstr "" -#: src/numfmt.c:881 +#: src/numfmt.c:948 msgid " none no auto-scaling is done; suffixes will trigger an error\n" msgstr "" -#: src/numfmt.c:884 +#: src/numfmt.c:951 msgid "" " auto accept optional single/two letter suffix:\n" " 1K = 1000,\n" @@ -6474,7 +6521,7 @@ msgid "" " 1Mi = 1048576,\n" msgstr "" -#: src/numfmt.c:890 +#: src/numfmt.c:957 msgid "" " si accept optional single letter suffix:\n" " 1K = 1000,\n" @@ -6482,7 +6529,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:895 +#: src/numfmt.c:962 msgid "" " iec accept optional single letter suffix:\n" " 1K = 1024,\n" @@ -6490,7 +6537,7 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:900 +#: src/numfmt.c:967 msgid "" " iec-i accept optional two-letter suffix:\n" " 1Ki = 1024,\n" @@ -6498,7 +6545,31 @@ msgid "" " ...\n" msgstr "" -#: src/numfmt.c:906 +#: src/numfmt.c:973 +#, fuzzy +msgid "" +"\n" +"FIELDS supports cut(1) style field ranges:\n" +" N N'th field, counted from 1\n" +" N- from N'th field, to end of line\n" +" N-M from N'th to M'th field (inclusive)\n" +" -M from first to M'th field (inclusive)\n" +" - all fields\n" +"Multiple fields/ranges can be separated with commas\n" +msgstr "" +"\n" +"必須恰好指定 -b、-c 或 -f 其中一個選項。每個 LIST 是由一個範圍或\n" +"多個以逗號分隔的範圍組成的。輸出結果和讀取資料的次序是一樣的，而且只會\n" +"寫一次。每個範圍可以是：\n" +"\n" +" N 由 1 開始計算，只取第 N 個位元組、字元或欄位\n" +" N- 由第 N 個位元組、字元或欄位直至行末\n" +" N-M 由第 N 至第 M（包括在內）個位元組、字元或欄位\n" +" -M 由第 1 至第 M（包括在內）個位元組、字元或欄位\n" +"\n" +"如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" + +#: src/numfmt.c:983 #, c-format msgid "" "\n" @@ -6507,9 +6578,10 @@ msgid "" "locale).\n" "Optional width value (%10f) will pad output. Optional zero (%010f) width\n" "will zero pad the number. Optional negative values (%-10f) will left align.\n" +"Optional precision (%.1f) will override the input determined precision.\n" msgstr "" -#: src/numfmt.c:913 +#: src/numfmt.c:991 #, c-format msgid "" "\n" @@ -6521,7 +6593,7 @@ msgid "" "errors are not diagnosed and the exit status is 0.\n" msgstr "" -#: src/numfmt.c:922 +#: src/numfmt.c:1000 #, c-format msgid "" "\n" @@ -6536,118 +6608,130 @@ msgid "" " -> \"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" +" $ df -B1 | %s --header --field 2-4 --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:976 src/seq.c:214 +#: src/numfmt.c:1053 src/seq.c:228 #, fuzzy, c-format msgid "format %s has no %% directive" msgstr "目的地 %s 不是目錄" -#: src/numfmt.c:1003 +#: src/numfmt.c:1080 #, fuzzy, c-format msgid "invalid format %s (width overflow)" msgstr "%2$s的參數%1$s無效" -#: src/numfmt.c:1008 +#: src/numfmt.c:1085 #, c-format -msgid "--format padding overridding --padding" +msgid "--format padding overriding --padding" msgstr "" -#: src/numfmt.c:1027 src/seq.c:231 +#: src/numfmt.c:1104 src/seq.c:245 #, c-format msgid "format %s ends in %%" msgstr "" -#: src/numfmt.c:1030 +#: src/numfmt.c:1120 +#, fuzzy, c-format +msgid "invalid precision in format %s" +msgstr "無效的寬度選項：‘%s’" + +#: src/numfmt.c:1126 #, c-format -msgid "invalid format %s, directive must be %%[0]['][-][N]f" +msgid "invalid format %s, directive must be %%[0]['][-][N][.][N]f" msgstr "" -#: src/numfmt.c:1038 src/seq.c:238 +#: src/numfmt.c:1134 src/seq.c:252 #, c-format msgid "format %s has too many %% directives" msgstr "" -#: src/numfmt.c:1081 +#: src/numfmt.c:1177 #, fuzzy, c-format msgid "invalid suffix in input %s: %s" msgstr "輸入旗標無效：%s" -#: src/numfmt.c:1103 +#: src/numfmt.c:1206 #, c-format -msgid "value too large to be printed: '%Lg' (consider using --to)" +msgid "" +"value/precision too large to be printed: '%Lg/%' (consider using --" +"to)" msgstr "" -#: src/numfmt.c:1111 +#: src/numfmt.c:1210 #, c-format -msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" +msgid "value too large to be printed: '%Lg' (consider using --to)" msgstr "" -#: src/numfmt.c:1196 +#: src/numfmt.c:1219 #, c-format -msgid "large input value %s: possible precision loss" +msgid "value too large to be printed: '%Lg' (cannot handle values > 999Y)" msgstr "" -#: src/numfmt.c:1308 +#: src/numfmt.c:1305 #, c-format -msgid "input line is too short, no numbers found to convert in field %ld" +msgid "large input value %s: possible precision loss" msgstr "" -#: src/numfmt.c:1403 +#: src/numfmt.c:1386 src/numfmt.c:1399 +#, fuzzy, c-format +msgid "invalid field value %s" +msgstr "無效的欄位編號：%s" + +#: src/numfmt.c:1631 #, fuzzy, c-format msgid "invalid padding value %s" msgstr "日期無效：‘%s’" -#: src/numfmt.c:1417 +#: src/numfmt.c:1646 #, fuzzy, c-format -msgid "invalid field value %s" -msgstr "無效的欄位編號：%s" +msgid "multiple field specifications" +msgstr "%s：無效的欄位規格‘%s’" -#: src/numfmt.c:1447 +#: src/numfmt.c:1677 #, fuzzy, c-format msgid "invalid header value %s" msgstr "無效的欄位號碼：‘%s’" -#: src/numfmt.c:1473 +#: src/numfmt.c:1704 #, fuzzy, c-format msgid "--grouping cannot be combined with --format" msgstr "有檔案作為參數時不可和 --files0-from 一起使用。" -#: src/numfmt.c:1478 +#: src/numfmt.c:1709 #, fuzzy, c-format msgid "no conversion option specified" msgstr "未指定進程編號" -#: src/numfmt.c:1486 +#: src/numfmt.c:1717 #, fuzzy, c-format msgid "grouping cannot be combined with --to" msgstr "有檔案作為參數時不可和 --files0-from 一起使用。" -#: src/numfmt.c:1488 +#: src/numfmt.c:1719 #, c-format msgid "grouping has no effect in this locale" msgstr "" -#: src/numfmt.c:1501 +#: src/numfmt.c:1732 #, c-format msgid "--header ignored with command-line input" msgstr "" -#: src/numfmt.c:1526 +#: src/numfmt.c:1757 #, fuzzy, c-format msgid "error reading input" msgstr "讀取 %s 時發生錯誤" -#: src/numfmt.c:1535 +#: src/numfmt.c:1770 #, c-format msgid "failed to convert some of the input numbers" msgstr "" -#: src/od.c:320 +#: src/od.c:321 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -6658,14 +6742,13 @@ msgstr "" "用法：%s [選項]... [檔案]...\n" " 或：%s --traditional [檔案] [[+]偏移值 [[+]標號]]\n" -#: src/od.c:326 +#: src/od.c:327 +#, fuzzy 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" "以明確方式 (預設為八進位數字) 表示 <檔案> 的內容。當指定多於一個 <檔案> " @@ -6674,9 +6757,10 @@ msgstr "" "輸入讀取資料。\n" "\n" -#: src/od.c:333 +#: src/od.c:335 #, 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" @@ -6695,7 +6779,7 @@ msgstr "" " a ASCII 字元或以 ASCII 字元代表的控制字元\n" " c ASCII 字兀或反斜號溢出序列\n" -#: src/od.c:344 +#: src/od.c:347 msgid "" " -A, --address-radix=RADIX output format for file offsets; RADIX is one\n" " of [doxn], for Decimal, Octal, Hex or None\n" @@ -6704,7 +6788,7 @@ msgid "" " -j, --skip-bytes=BYTES skip BYTES input bytes first\n" msgstr "" -#: src/od.c:350 +#: src/od.c:353 #, fuzzy msgid "" " -N, --read-bytes=BYTES limit dump to BYTES input bytes\n" @@ -6724,7 +6808,7 @@ msgstr "" " -w, --width[=位元組] 每行顯示指定的 <位元組> 數目\n" " --traditional 接受舊式的選項\n" -#: src/od.c:363 +#: src/od.c:366 #, fuzzy msgid "" "\n" @@ -6742,7 +6826,7 @@ msgstr "" " -c 等於 -t c， 顯示 ASCII 字元或反斜號溢出序列\n" " -d 等於 -t u2， 顯示十進位 unsigned short\n" -#: src/od.c:372 +#: src/od.c:375 #, fuzzy msgid "" " -f same as -t fF, select floats\n" @@ -6759,7 +6843,7 @@ msgstr "" " -o 等於 -t o2， 顯示八進位 short integer\n" " -x 等於 -t x2， 顯示十六進位 short integer\n" -#: src/od.c:380 +#: src/od.c:383 msgid "" "\n" "\n" @@ -6768,7 +6852,7 @@ msgid "" " c printable character or backslash escape\n" msgstr "" -#: src/od.c:387 +#: src/od.c:390 msgid "" " d[SIZE] signed decimal, SIZE bytes per integer\n" " f[SIZE] floating point, SIZE bytes per integer\n" @@ -6782,7 +6866,7 @@ msgstr "" " u[大小] 無正負號的十進位數，每個整數佔指定 <大小> 的位元組\n" " x[大小] 十六進位數，每個整數佔指定 <大小> 的位元組\n" -#: src/od.c:394 +#: src/od.c:397 #, fuzzy msgid "" "\n" @@ -6797,14 +6881,14 @@ msgstr "" "表示 sizeof(long) 的 L。如果 <格式> 是 f，<大小> 可以是表示 sizeof(float)\n" "的 F、表示 sizeof(double) 的 D 或表示 sizeof(long double) 的 L。\n" -#: src/od.c:401 +#: src/od.c:404 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:406 +#: src/od.c:409 #, fuzzy msgid "" "\n" @@ -6821,12 +6905,12 @@ msgstr "" "<大小> 可以是以下的單位 (單位前可加上整數)：\n" "kB=1000，K=1024，MB=1000*1000，M=1024*1024，還有 G/T/P/E/Z/Y 如此類推。\n" -#: src/od.c:680 src/od.c:800 +#: src/od.c:683 src/od.c:803 #, fuzzy, c-format msgid "invalid type string %s" msgstr "無效的類型‘%s’" -#: src/od.c:690 +#: src/od.c:693 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6835,7 +6919,7 @@ msgstr "" "‘%s’是無效的類型；\n" "此系統不支援 %lu 位元組的整數" -#: src/od.c:811 +#: src/od.c:814 #, fuzzy, c-format msgid "" "invalid type string %s;\n" @@ -6844,37 +6928,37 @@ msgstr "" "‘%s’是無效的類型；\n" "此系統不支援 %lu 位元組的浮點數" -#: src/od.c:869 +#: src/od.c:872 #, fuzzy, c-format msgid "invalid character '%c' in type string %s" msgstr "類型‘%2$s’中含有無效的字元‘%1$c’。" -#: src/od.c:1094 +#: src/od.c:1105 #, c-format msgid "cannot skip past end of combined input" msgstr "無法移至合併後的輸入資料的末端之後" -#: src/od.c:1650 +#: src/od.c:1658 #, fuzzy, c-format msgid "invalid output address radix '%c'; it must be one character from [doxn]" msgstr "輸出位址的基數‘%c’是無效的；基數必須是 [doxn] 四個字元其中之一" -#: src/od.c:1788 +#: src/od.c:1796 #, c-format msgid "no type may be specified when dumping strings" msgstr "傾印字串時不能指定類型" -#: src/od.c:1863 +#: src/od.c:1871 #, fuzzy msgid "compatibility mode supports at most one file" msgstr "在相容性模式下，最多只能有三個參數" -#: src/od.c:1884 +#: src/od.c:1892 #, c-format msgid "skip-bytes + read-bytes is too large" msgstr "" -#: src/od.c:1927 +#: src/od.c:1935 #, c-format msgid "warning: invalid width %lu; using %d instead" msgstr "警告：寬度 %lu 是無效的；以 %d 代替" @@ -6894,7 +6978,6 @@ msgstr "已關閉標準輸入" 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 "" "將每個 <檔案> 相應的每一行用 TAB 隔開，在標準輸出中並排顯示。\n" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" @@ -7030,12 +7113,12 @@ msgstr "" msgid "Where" msgstr "" -#: src/pinky.c:495 +#: src/pinky.c:494 #, fuzzy, c-format msgid "Usage: %s [OPTION]... [USER]...\n" msgstr "用法：%s [選項]... [檔案]...\n" -#: src/pinky.c:496 +#: src/pinky.c:495 msgid "" "\n" " -l produce long format output for the specified USERs\n" @@ -7045,7 +7128,7 @@ msgid "" " -s do short format output, this is the default\n" msgstr "" -#: src/pinky.c:504 +#: src/pinky.c:503 msgid "" " -f omit the line of column headings in short format\n" " -w omit the user's full name in short format\n" @@ -7054,7 +7137,7 @@ msgid "" " in short format\n" msgstr "" -#: src/pinky.c:513 +#: src/pinky.c:512 #, c-format msgid "" "\n" @@ -7062,99 +7145,99 @@ msgid "" "The utmp file will be %s.\n" msgstr "" -#: src/pinky.c:597 +#: src/pinky.c:596 #, fuzzy, c-format msgid "no username specified; at least one must be specified when using -l" msgstr "使用選項 --string 時不能再指定檔案" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:330 +#: src/pr.c:331 msgid "Pete TerMaat" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/pr.c:331 +#: src/pr.c:332 msgid "Roland Huebner" msgstr "" -#: src/pr.c:908 +#: src/pr.c:905 #, fuzzy, c-format msgid "'--pages=FIRST_PAGE[:LAST_PAGE]' missing argument" msgstr "‘--pages=開始頁碼[:結束頁碼]’缺少了參數" -#: src/pr.c:910 +#: src/pr.c:907 #, fuzzy, c-format msgid "invalid page range %s" msgstr "無效的類型‘%s’" -#: src/pr.c:975 -#, fuzzy, c-format -msgid "'-l PAGE_LENGTH' invalid number of lines: %s" +#: src/pr.c:967 +#, fuzzy +msgid "'-l PAGE_LENGTH' invalid number of lines" msgstr "‘-l 每頁行數’的行數無效：‘%s’" -#: src/pr.c:999 -#, fuzzy, c-format -msgid "'-N NUMBER' invalid starting line number: %s" +#: src/pr.c:982 +#, fuzzy +msgid "'-N NUMBER' invalid starting line number" msgstr "‘-N 行號’的開始行號無效：‘%s’" -#: src/pr.c:1011 -#, fuzzy, c-format -msgid "'-o MARGIN' invalid line offset: %s" +#: src/pr.c:986 +#, fuzzy +msgid "'-o MARGIN' invalid line offset" msgstr "‘-o 邊界’的字元偏移值無效：‘%s’" -#: src/pr.c:1052 -#, fuzzy, c-format -msgid "'-w PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1023 +#, fuzzy +msgid "'-w PAGE_WIDTH' invalid number of characters" msgstr "‘-w 頁寬’的字元數目無效：‘%s’" -#: src/pr.c:1066 -#, fuzzy, c-format -msgid "'-W PAGE_WIDTH' invalid number of characters: %s" +#: src/pr.c:1032 +#, fuzzy +msgid "'-W PAGE_WIDTH' invalid number of characters" msgstr "‘-W 頁寬’的字元數目無效：‘%s’" -#: src/pr.c:1096 +#: src/pr.c:1059 #, fuzzy, c-format msgid "cannot specify number of columns when printing in parallel" msgstr "並排列印時不能同時指定欄位數目。" -#: src/pr.c:1100 +#: src/pr.c:1063 #, fuzzy, c-format msgid "cannot specify both printing across and printing in parallel" msgstr "不能同時指定橫向列印與並排列印。" -#: src/pr.c:1196 +#: src/pr.c:1166 #, fuzzy, c-format msgid "'-%c' extra characters or invalid number in the argument: %s" msgstr "參數‘%2$s’含有多餘的字元‘-%1$c’或無效的數字" -#: src/pr.c:1293 +#: src/pr.c:1263 #, c-format msgid "page width too narrow" msgstr "頁面太窄" -#: src/pr.c:2353 +#: src/pr.c:2323 #, c-format msgid "starting page number % exceeds page count %" msgstr "" -#: src/pr.c:2380 +#: src/pr.c:2350 #, fuzzy, c-format msgid "page number overflow" msgstr "欄位是 0" -#: src/pr.c:2385 +#: src/pr.c:2355 #, c-format msgid "Page %" msgstr "" -#: src/pr.c:2757 +#: src/pr.c:2727 #, fuzzy msgid "Paginate or columnate FILE(s) for printing.\n" msgstr "" "將 <檔案> 分頁或分欄以便列印。\n" "\n" -#: src/pr.c:2763 +#: src/pr.c:2734 #, fuzzy msgid "" " +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n" @@ -7170,7 +7253,7 @@ msgstr "" " 將輸出分為指定的 <欄數> 顯示，而每一欄都是向下列印的，\n" " 除非使用 -a 選項。它也會平均分佈每頁中所有欄位的行數。\n" -#: src/pr.c:2771 +#: src/pr.c:2742 msgid "" " -a, --across print columns across rather than down, used together\n" " with -COLUMN\n" @@ -7187,7 +7270,7 @@ msgstr "" " 隔行顯示結果\n" # -F and -f are just the same, help text is ambiguous -- maddog -#: src/pr.c:2779 +#: src/pr.c:2750 msgid "" " -D, --date-format=FORMAT\n" " use FORMAT for the header date\n" @@ -7207,7 +7290,7 @@ msgstr "" " 使用 form feed 而不是 newline 字元來分頁 (使用此選項\n" " 時只會印出三行標頭，否則會印出五行標頭再加註腳)\n" -#: src/pr.c:2789 +#: src/pr.c:2760 #, fuzzy msgid "" " -h, --header=HEADER\n" @@ -7228,12 +7311,23 @@ msgstr "" " -J, --join-lines 將每行資料完整地合併；會關閉 -W 選項將每行截斷的效果；\n" " 不將每欄對齊；--sep-string[=字串] 選項可設定分隔字串\n" -#: src/pr.c:2798 +#: src/pr.c:2769 #, fuzzy 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" +" (default number of lines of text 56, and with -F 63).\n" +" implies -t if PAGE_LENGTH <= 10\n" +msgstr "" +" -l 每頁行數, --length=每頁行數\n" +" 設定每頁的總行數 (預設為 66)\n" +" (預設可顯示資料內容的行數為 56，使用 -F 選項時為 63)\n" +" -m, --merge 並排顯示所有檔案 (每欄一個檔案)；會將資料截短至符合\n" +" 欄寬，但使用 -J 選項則不會截短任何一行\n" + +#: src/pr.c:2775 +#, fuzzy +msgid "" " -m, --merge print all files in parallel, one in each column,\n" " truncate lines, but join lines of full length with -J\n" msgstr "" @@ -7243,7 +7337,7 @@ msgstr "" " -m, --merge 並排顯示所有檔案 (每欄一個檔案)；會將資料截短至符合\n" " 欄寬，但使用 -J 選項則不會截短任何一行\n" -#: src/pr.c:2805 +#: src/pr.c:2779 #, fuzzy msgid "" " -n[SEP[DIGITS]], --number-lines[=SEP[DIGITS]]\n" @@ -7259,7 +7353,7 @@ msgstr "" " -N 行號, --first-line-number=行號\n" " 指定每個檔案第一行的 <行號> (請參考 +開始頁碼 的說明)\n" -#: src/pr.c:2813 +#: src/pr.c:2787 #, fuzzy msgid "" " -o, --indent=MARGIN\n" @@ -7274,7 +7368,7 @@ msgstr "" " -r, --no-file-warnings\n" " 無法開啟檔案時不會印出警告訊息\n" -#: src/pr.c:2820 +#: src/pr.c:2794 #, fuzzy msgid "" " -s[CHAR], --separator[=CHAR]\n" @@ -7292,7 +7386,7 @@ msgstr "" " 和欄位有關的選項截斷每行的資料： -欄位、-a -欄位、\n" " -m\n" -#: src/pr.c:2828 +#: src/pr.c:2802 #, fuzzy msgid "" " -S[STRING], --sep-string[=STRING]\n" @@ -7300,7 +7394,6 @@ msgid "" " without -S: Default separator with -J and \n" " otherwise (same as -S\" \"), no effect on column " "options\n" -" -t, --omit-header omit page headers and trailers\n" msgstr "" " 以 <字串> 分隔欄位。\n" " 不使用 -S 選項時，預設的分隔字串為：使用 -J 選項時是\n" @@ -7308,7 +7401,13 @@ msgstr "" " 欄位有關的選項\n" " -t, --omit-header 不印出標頭和註腳\n" -#: src/pr.c:2835 +#: src/pr.c:2808 +msgid "" +" -t, --omit-header omit page headers and trailers;\n" +" implied if PAGE_LENGTH <= 10\n" +msgstr "" + +#: src/pr.c:2812 #, fuzzy msgid "" " -T, --omit-pagination\n" @@ -7332,7 +7431,7 @@ msgstr "" "元]\n" " 會關閉此效果\n" -#: src/pr.c:2845 +#: src/pr.c:2822 #, fuzzy msgid "" " -W, --page-width=PAGE_WIDTH\n" @@ -7346,16 +7445,6 @@ msgstr "" " 強行截短至符合頁寬，除非同時使用 -J 選項；不會影響 -S\n" " 或 -s 選項\n" -#: src/pr.c:2853 -#, fuzzy -msgid "" -"\n" -"-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n" -"standard input.\n" -msgstr "" -"\n" -"如果沒有指定<檔案>或<檔案>是 -，則由標準輸入讀取資料。\n" - #: src/printenv.c:62 #, c-format msgid "" @@ -7489,15 +7578,20 @@ msgstr "" "顯示輸入檔中所有字詞排列後的索引，並包括該字詞前後的文字。\n" "\n" -#: src/ptx.c:1830 +#: src/ptx.c:1831 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:1835 msgid "" +" -F, --flag-truncation=STRING use STRING for flagging line truncations.\n" +" The default is '/'\n" +msgstr "" + +#: src/ptx.c:1839 +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" @@ -7505,7 +7599,7 @@ msgid "" " -T, --format=tex generate output as TeX directives\n" msgstr "" -#: src/ptx.c:1842 +#: src/ptx.c:1846 msgid "" " -W, --word-regexp=REGEXP use REGEXP to match each keyword\n" " -b, --break-file=FILE word break characters in this FILE\n" @@ -7515,7 +7609,7 @@ msgid "" " -o, --only-file=FILE read only word list from this FILE\n" msgstr "" -#: src/ptx.c:1850 +#: src/ptx.c:1854 msgid "" " -r, --references first field of each line is a reference\n" " -t, --typeset-mode - not implemented -\n" @@ -7523,20 +7617,16 @@ msgid "" "excluded\n" msgstr "" -#: src/ptx.c:1857 -#, fuzzy -msgid "" -"\n" -"With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n" -msgstr "" -"\n" -"如果沒有指定<檔案>或<檔案>是 -，則由標準輸入讀取資料。\n" - #: src/ptx.c:1951 #, fuzzy, c-format msgid "invalid gap width: %s" msgstr "無效的寬度：‘%s’" +#: src/ptx.c:1978 +#, fuzzy, c-format +msgid "invalid line width: %s" +msgstr "無效的寬度：‘%s’" + #: src/pwd.c:57 msgid "" "Print the full filename of the current working directory.\n" @@ -7560,7 +7650,7 @@ msgstr "" msgid "failed to chdir to %s" msgstr "無法更改%s的所屬群組為 %s\n" -#: src/pwd.c:173 src/pwd.c:280 src/split.c:372 +#: src/pwd.c:173 src/pwd.c:280 src/split.c:426 #, fuzzy, c-format msgid "failed to stat %s" msgstr "無法取得%s的屬性" @@ -7580,8 +7670,8 @@ msgstr "非選項的參數過多" msgid "Dmitry V. Levin" msgstr "" -#: src/readlink.c:62 src/realpath.c:71 src/rm.c:135 src/shred.c:169 -#: src/stat.c:1411 src/touch.c:212 +#: src/readlink.c:62 src/realpath.c:71 src/shred.c:169 src/stat.c:1414 +#: src/touch.c:212 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "用法：%s [選項]... [檔案]...\n" @@ -7787,15 +7877,15 @@ msgstr "" "該檔案的內容無法還原，請考慮使用 shred。\n" #: src/rm.c:342 -#, c-format -msgid "%s: remove %zu argument recursively? " -msgid_plural "%s: remove %zu arguments recursively? " -msgstr[0] "" +#, fuzzy, c-format +msgid "%s: remove % argument recursively? " +msgid_plural "%s: remove % arguments recursively? " +msgstr[0] "%s：是否移除%s%s? " #: src/rm.c:345 #, fuzzy, c-format -msgid "%s: remove %zu argument? " -msgid_plural "%s: remove %zu arguments? " +msgid "%s: remove % argument? " +msgid_plural "%s: remove % arguments? " msgstr[0] "%s：是否移除%s%s? " #: src/rmdir.c:134 src/rmdir.c:233 @@ -7983,12 +8073,12 @@ msgstr "" msgid "invalid floating point argument: %s" msgstr "無效的開始行號：‘%s’" -#: src/seq.c:234 +#: src/seq.c:248 #, fuzzy, c-format msgid "format %s has unknown %%%c directive" msgstr "%s的檔案類型不詳" -#: src/seq.c:557 +#: src/seq.c:603 #, fuzzy, c-format msgid "format string may not be specified when printing equal width strings" msgstr "傾印字串時不能指定類型" @@ -8005,7 +8095,16 @@ msgid "" "for even very expensive hardware probing to recover the data.\n" msgstr "重複覆寫 <檔案>，使得即使是昂貴的硬體偵測儀器也難以將資料復原。\n" -#: src/shred.c:177 +#: src/shred.c:174 +#, fuzzy +msgid "" +"\n" +"If FILE is -, shred standard output.\n" +msgstr "" +"\n" +"如果沒有指定<檔案>或<檔案>是 -，則由標準輸入讀取資料。\n" + +#: src/shred.c:181 #, fuzzy, c-format msgid "" " -f, --force change permissions to allow writing if necessary\n" @@ -8017,7 +8116,7 @@ msgstr "" " -n, --iterations=N 自行指定重複覆寫的次數 (預設為 %d 次)\n" " -s, --size=N 覆寫指定的位元組數目 (可接受 K、M、G 等等的單位)\n" -#: src/shred.c:183 +#: src/shred.c:187 #, fuzzy msgid "" " -u, --remove[=HOW] truncate and remove file after overwriting; See below\n" @@ -8032,12 +8131,10 @@ msgstr "" " 預設會使用這種模式\n" " -z, --zero 最後一次會使用 0 位元組進行覆寫來隱藏覆寫動作\n" -#: src/shred.c:192 +#: src/shred.c:196 #, fuzzy msgid "" "\n" -"If FILE is -, shred standard output.\n" -"\n" "Delete FILE(s) if --remove (-u) is specified. The default is not to remove\n" "the files because it is common to operate on device files like /dev/hda,\n" "and those files usually should not be removed.\n" @@ -8055,7 +8152,7 @@ msgstr "" "因為覆寫像 /dev/hda 等的裝置檔案是很普遍的，而這些檔案通常不應移除。\n" "當覆寫普通檔案時，絕大多數人都應該使用 --remove 選項。\n" -#: src/shred.c:206 +#: src/shred.c:208 #, fuzzy msgid "" "CAUTION: Note that shred relies on a very important assumption:\n" @@ -8071,7 +8168,7 @@ msgstr "" "的檔案系統都不符合條件。以下是會令 shred 無效的檔案系統的例子：\n" "\n" -#: src/shred.c:214 +#: src/shred.c:216 #, fuzzy msgid "" "* log-structured or journaled file systems, such as those supplied with\n" @@ -8092,7 +8189,7 @@ msgstr "" "● 會不時進行快照紀錄的檔案系統，例如 Network Applicance 的 NFS 伺服器\n" "\n" -#: src/shred.c:224 +#: src/shred.c:226 msgid "" "* file systems that cache in temporary locations, such as NFS\n" "version 3 clients\n" @@ -8101,7 +8198,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:231 +#: src/shred.c:233 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" @@ -8113,7 +8210,7 @@ msgid "" "\n" msgstr "" -#: src/shred.c:241 +#: src/shred.c:243 #, fuzzy msgid "" "In addition, file system backups and remote mirrors may contain copies\n" @@ -8127,127 +8224,127 @@ msgstr "" "另外，檔案系統的備份及遠端的 mirror 都可能擁有該檔案的複製本，這些複製本\n" "都是無法移除的，而且可以用來將以 shred 處理過的檔案恢復原狀。\n" -#: src/shred.c:340 +#: src/shred.c:342 #, c-format msgid "%s: fdatasync failed" msgstr "%s：fdatasync 發生錯誤" -#: src/shred.c:351 +#: src/shred.c:353 #, c-format msgid "%s: fsync failed" msgstr "%s：fsync 發生錯誤" -#: src/shred.c:461 +#: src/shred.c:463 #, c-format msgid "%s: cannot rewind" msgstr "%s：無法向後搜尋" -#: src/shred.c:481 +#: src/shred.c:483 #, c-format msgid "%s: pass %lu/%lu (%s)..." msgstr "%1$s：%3$lu 次之第 %2$lu 次 (%4$s)..." -#: src/shred.c:529 +#: src/shred.c:531 #, c-format msgid "%s: error writing at offset %s" msgstr "%s：在 %s 位置寫入資料時發生錯誤" -#: src/shred.c:549 +#: src/shred.c:551 #, c-format msgid "%s: lseek failed" msgstr "%s：lseek 發生錯誤" -#: src/shred.c:561 +#: src/shred.c:563 #, c-format msgid "%s: file too large" msgstr "%s：檔案過大" -#: src/shred.c:585 +#: src/shred.c:587 #, c-format msgid "%s: pass %lu/%lu (%s)...%s" msgstr "%1$s：%3$lu 次之第 %2$lu 次 (%4$s)...%5$s" -#: src/shred.c:601 +#: src/shred.c:603 #, 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:859 +#: src/shred.c:861 #, c-format msgid "%s: fstat failed" msgstr "%s：fstat 發生錯誤" -#: src/shred.c:870 +#: src/shred.c:872 #, c-format msgid "%s: invalid file type" msgstr "%s：檔案類型不正確" -#: src/shred.c:875 +#: src/shred.c:877 #, c-format msgid "%s: file has negative size" msgstr "%s：檔案的大小為負數" -#: src/shred.c:969 src/sort.c:960 src/split.c:377 +#: src/shred.c:971 src/sort.c:959 src/split.c:431 #, c-format msgid "%s: error truncating" msgstr "%s：截斷檔案時發生錯誤" -#: src/shred.c:989 +#: src/shred.c:991 #, c-format msgid "%s: fcntl failed" msgstr "%s：fcntl 發生錯誤" -#: src/shred.c:994 +#: src/shred.c:996 #, c-format msgid "%s: cannot shred append-only file descriptor" msgstr "%s：不能將只可加上資料的檔案描述子 (file descriptor) 進行 shred 動作" -#: src/shred.c:1078 +#: src/shred.c:1080 #, c-format msgid "%s: removing" msgstr "%s：正在移除" -#: src/shred.c:1102 +#: src/shred.c:1104 #, c-format msgid "%s: renamed to %s" msgstr "%s：更改名稱為 %s" -#: src/shred.c:1124 +#: src/shred.c:1126 #, c-format msgid "%s: failed to remove" msgstr "%s：無法移除" -#: src/shred.c:1128 +#: src/shred.c:1130 #, c-format msgid "%s: removed" msgstr "%s：已經移除" -#: src/shred.c:1135 src/shred.c:1178 +#: src/shred.c:1137 src/shred.c:1180 #, c-format msgid "%s: failed to close" msgstr "%s：無法關閉" -#: src/shred.c:1171 +#: src/shred.c:1173 #, c-format msgid "%s: failed to open for writing" msgstr "%s：無法開啟來寫入資料" #: src/shred.c:1236 -#, c-format -msgid "%s: invalid number of passes" -msgstr "" +#, fuzzy +msgid "invalid number of passes" +msgstr "無效的行數" -#: src/shred.c:1245 src/shuf.c:478 src/sort.c:4482 +#: src/shred.c:1241 src/shuf.c:472 src/sort.c:4481 #, fuzzy, c-format msgid "multiple random sources specified" msgstr "正在關閉輸出檔%s" -#: src/shred.c:1264 -#, c-format -msgid "%s: invalid file size" -msgstr "" +#: src/shred.c:1255 +#, fuzzy +msgid "invalid file size" +msgstr "%s：檔案類型不正確" -#: src/shuf.c:61 +#: src/shuf.c:62 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [FILE]\n" @@ -8257,11 +8354,11 @@ msgstr "" "用法：%s [選項]... [輸入]... (沒有 -G)\n" " 或：%s -G [選項]... [輸入 [輸出]]\n" -#: src/shuf.c:67 +#: src/shuf.c:68 msgid "Write a random permutation of the input lines to standard output.\n" msgstr "" -#: src/shuf.c:73 +#: src/shuf.c:75 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 " @@ -8272,37 +8369,37 @@ msgid "" " -r, --repeat output lines can be repeated\n" msgstr "" -#: src/shuf.c:228 +#: src/shuf.c:226 #, fuzzy, c-format msgid "too many input lines" msgstr "重複的行數過多" -#: src/shuf.c:431 +#: src/shuf.c:428 #, fuzzy, c-format msgid "multiple -i options specified" msgstr "-l 或 -t 選項使用了多於一次" -#: src/shuf.c:452 -#, fuzzy, c-format -msgid "invalid input range %s" +#: src/shuf.c:435 src/shuf.c:441 src/shuf.c:446 +#, fuzzy +msgid "invalid input range" msgstr "輸入旗標無效：%s" -#: src/shuf.c:465 +#: src/shuf.c:459 #, fuzzy, c-format -msgid "invalid line count %s" +msgid "invalid line count: %s" msgstr "無效的寬度：‘%s’" -#: src/shuf.c:472 src/sort.c:4476 +#: src/shuf.c:466 src/sort.c:4475 #, fuzzy, c-format msgid "multiple output files specified" msgstr "正在關閉輸出檔%s" -#: src/shuf.c:502 +#: src/shuf.c:496 #, fuzzy, c-format msgid "cannot combine -e and -i options" msgstr "如果自行指定權限，不可同時配合 --reference 選項一起使用" -#: src/shuf.c:586 +#: src/shuf.c:580 #, c-format msgid "no lines to repeat" msgstr "" @@ -8321,12 +8418,12 @@ msgid "" "\n" msgstr "" -#: src/sleep.c:135 src/timeout.c:323 +#: src/sleep.c:135 src/timeout.c:325 #, fuzzy, c-format msgid "invalid time interval %s" msgstr "無效的欄位號碼：‘%s’" -#: src/sleep.c:146 src/tail.c:1252 +#: src/sleep.c:146 src/tail.c:1251 #, fuzzy, c-format msgid "cannot read realtime clock" msgstr "無法建立鏈結%s" @@ -8340,13 +8437,13 @@ msgstr "" "排序選項：\n" "\n" -#: src/sort.c:433 +#: src/sort.c:434 msgid "" "Ordering options:\n" "\n" msgstr "" -#: src/sort.c:437 +#: src/sort.c:438 #, fuzzy msgid "" " -b, --ignore-leading-blanks ignore leading blanks\n" @@ -8358,7 +8455,7 @@ msgstr "" " -d, --dictionary-order 只考慮空白字元、英文字和數字\n" " -f, --ignore-case 排序前先將小寫字元轉換為大寫\n" -#: src/sort.c:443 +#: src/sort.c:444 #, fuzzy msgid "" " -g, --general-numeric-sort compare according to general numerical value\n" @@ -8372,12 +8469,12 @@ msgstr "" " -r, --reverse 以相反的次序排列\n" "\n" -#: src/sort.c:448 +#: src/sort.c:449 msgid "" " -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G)\n" msgstr "" -#: src/sort.c:451 +#: src/sort.c:452 #, fuzzy msgid "" " -n, --numeric-sort compare according to string numerical value\n" @@ -8392,7 +8489,7 @@ msgstr "" " -r, --reverse 以相反的次序排列\n" "\n" -#: src/sort.c:457 +#: src/sort.c:458 msgid "" " --sort=WORD sort according to WORD:\n" " general-numeric -g, human-numeric -h, month -" @@ -8402,19 +8499,19 @@ msgid "" "\n" msgstr "" -#: src/sort.c:465 +#: src/sort.c:466 msgid "" "Other options:\n" "\n" msgstr "" -#: src/sort.c:469 +#: src/sort.c:470 msgid "" " --batch-size=NMERGE merge at most NMERGE inputs at once;\n" " for more use temp files\n" msgstr "" -#: src/sort.c:473 +#: src/sort.c:474 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 " @@ -8423,7 +8520,7 @@ msgid "" " decompress them with PROG -d\n" msgstr "" -#: src/sort.c:480 +#: src/sort.c:481 msgid "" " --debug annotate the part of the line used to sort,\n" " and warn about questionable usage to stderr\n" @@ -8432,13 +8529,13 @@ msgid "" " If F is - then read names from standard input\n" msgstr "" -#: src/sort.c:487 +#: src/sort.c:488 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:491 +#: src/sort.c:492 #, fuzzy msgid "" " -o, --output=FILE write result to FILE instead of standard output\n" @@ -8456,7 +8553,7 @@ msgstr "" " -s, --stable 不進行最後的整行比較排序\n" " -S, --buffer-size=大小 指定記憶緩衝區的 <大小>\n" -#: src/sort.c:497 +#: src/sort.c:498 #, fuzzy, c-format msgid "" " -t, --field-separator=SEP use SEP instead of non-blank to blank " @@ -8476,7 +8573,7 @@ msgstr "" " -u, --unique 配合 -c：嚴格檢查資料是否依次序排列\n" " 沒有 -c：遇到多行相同的資料時只顯示第一行\n" -#: src/sort.c:511 +#: src/sort.c:512 #, fuzzy msgid "" "\n" @@ -8502,12 +8599,11 @@ msgstr "" "\n" "<大小> 可以加上如下的單位：\n" -#: src/sort.c:524 +#: src/sort.c:525 +#, fuzzy 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" @@ -8521,476 +8617,482 @@ msgstr "" "和語系有關的環境變數會影響排序結果。\n" "如果要以位元組數值作為排列次序，請設定環境變數 LC_ALL=C。\n" -#: src/sort.c:725 +#: src/sort.c:724 #, fuzzy, c-format msgid "waiting for %s [-d]" msgstr "正在寫入 %s" -#: src/sort.c:730 +#: src/sort.c:729 #, c-format msgid "%s [-d] terminated abnormally" msgstr "" -#: src/sort.c:884 +#: src/sort.c:883 #, fuzzy, c-format msgid "cannot create temporary file in %s" msgstr "無法建立暫存檔" -#: src/sort.c:978 src/sort.c:2058 src/sort.c:3104 src/sort.c:3753 -#: src/sort.c:3844 src/sort.c:3847 +#: src/sort.c:977 src/sort.c:2057 src/sort.c:3103 src/sort.c:3752 +#: src/sort.c:3843 src/sort.c:3846 msgid "open failed" msgstr "開啟時發生錯誤" -#: src/sort.c:998 +#: src/sort.c:997 #, fuzzy msgid "fflush failed" msgstr "關閉時發生錯誤" -#: src/sort.c:1003 src/sort.c:2061 src/sort.c:4747 +#: src/sort.c:1002 src/sort.c:2060 src/sort.c:4746 msgid "close failed" msgstr "關閉時發生錯誤" -#: src/sort.c:1140 +#: src/sort.c:1139 #, fuzzy msgid "couldn't create temporary file" msgstr "無法建立暫存檔" -#: src/sort.c:1179 +#: src/sort.c:1178 #, fuzzy, c-format msgid "couldn't create process for %s -d" msgstr "無法建立目錄%s" -#: src/sort.c:1252 +#: src/sort.c:1251 #, fuzzy, c-format msgid "warning: cannot remove: %s" msgstr "無法建立目錄%s" -#: src/sort.c:1338 +#: src/sort.c:1337 #, fuzzy, c-format msgid "invalid --%s argument %s" msgstr "參數無效: %s" -#: src/sort.c:1341 +#: src/sort.c:1340 #, fuzzy, c-format msgid "minimum --%s argument is %s" msgstr "%2$s的參數%1$s不明確" -#: src/sort.c:1356 +#: src/sort.c:1355 #, fuzzy, c-format msgid "--%s argument %s too large" msgstr "%s：數字‘%.*s’過大" -#: src/sort.c:1359 +#: src/sort.c:1358 #, c-format msgid "maximum --%s argument with current rlimit is %s" msgstr "" -#: src/sort.c:1441 +#: src/sort.c:1440 #, c-format msgid "number in parallel must be nonzero" msgstr "" -#: src/sort.c:1526 +#: src/sort.c:1525 msgid "stat failed" msgstr "stat 時發生錯誤" -#: src/sort.c:1788 +#: src/sort.c:1787 msgid "read failed" msgstr "讀入時發生錯誤" -#: src/sort.c:2076 +#: src/sort.c:2075 #, fuzzy, c-format msgid "string transformation failed" msgstr "字串比較出現錯誤" -#: src/sort.c:2079 +#: src/sort.c:2078 #, c-format msgid "the untransformed string was %s" msgstr "" -#: src/sort.c:2242 +#: src/sort.c:2241 #, c-format msgid "^ no match for key\n" msgstr "" -#: src/sort.c:2422 +#: src/sort.c:2421 #, c-format msgid "obsolescent key %s used; consider %s instead" msgstr "" -#: src/sort.c:2428 +#: src/sort.c:2427 #, c-format msgid "key %lu has zero width and will be ignored" msgstr "" -#: src/sort.c:2439 +#: src/sort.c:2438 #, c-format msgid "leading blanks are significant in key %lu; consider also specifying 'b'" msgstr "" -#: src/sort.c:2452 +#: src/sort.c:2451 #, c-format msgid "key %lu is numeric and spans multiple fields" msgstr "" -#: src/sort.c:2484 +#: src/sort.c:2483 #, fuzzy, c-format msgid "option '-%s' is ignored" msgid_plural "options '-%s' are ignored" msgstr[0] "%s：選項‘-W %s’不明確\n" -#: src/sort.c:2490 +#: src/sort.c:2489 #, c-format msgid "option '-r' only applies to last-resort comparison" msgstr "" -#: src/sort.c:2764 src/sort.c:2773 +#: src/sort.c:2763 src/sort.c:2772 msgid "write failed" msgstr "寫入時發生錯誤" -#: src/sort.c:2816 +#: src/sort.c:2815 #, c-format msgid "%s: %s:%s: disorder: " msgstr "%s： %s：%s：次序不正確：" -#: src/sort.c:2819 +#: src/sort.c:2818 msgid "standard error" msgstr "標準錯誤輸出" -#: src/sort.c:3738 +#: src/sort.c:3737 #, fuzzy msgid "cannot read" msgstr "%s：無法向後搜尋" -#: src/sort.c:4017 +#: src/sort.c:4016 #, fuzzy, c-format msgid "%s: invalid field specification %s" msgstr "%s：無效的欄位規格‘%s’" -#: src/sort.c:4028 +#: src/sort.c:4027 #, c-format msgid "options '-%s' are incompatible" msgstr "" -#: src/sort.c:4079 +#: src/sort.c:4078 #, fuzzy, c-format msgid "%s: invalid count at start of %s" msgstr "%s：‘%s’開始部份的數字無效" -#: src/sort.c:4336 +#: src/sort.c:4335 #, fuzzy msgid "invalid number after '-'" msgstr "‘-’後的數字無效" -#: src/sort.c:4343 src/sort.c:4429 src/sort.c:4457 +#: src/sort.c:4342 src/sort.c:4428 src/sort.c:4456 #, fuzzy msgid "invalid number after '.'" msgstr "‘.’後的數字無效" -#: src/sort.c:4356 src/sort.c:4462 +#: src/sort.c:4355 src/sort.c:4461 msgid "stray character in field spec" msgstr "欄位規格出現不合法的字元" -#: src/sort.c:4403 +#: src/sort.c:4402 #, fuzzy, c-format msgid "multiple compress programs specified" msgstr "指定了多於一個目的地目錄" -#: src/sort.c:4420 +#: src/sort.c:4419 msgid "invalid number at field start" msgstr "欄位規格開始部份的數字無效" -#: src/sort.c:4424 src/sort.c:4452 +#: src/sort.c:4423 src/sort.c:4451 msgid "field number is zero" msgstr "欄位是 0" -#: src/sort.c:4433 +#: src/sort.c:4432 msgid "character offset is zero" msgstr "字元偏移值是 0" -#: src/sort.c:4448 +#: src/sort.c:4447 #, fuzzy msgid "invalid number after ','" msgstr "‘,’後的數字無效" -#: src/sort.c:4498 +#: src/sort.c:4497 #, c-format msgid "empty tab" msgstr "" -#: src/sort.c:4591 src/wc.c:692 +#: src/sort.c:4590 src/wc.c:726 #, c-format msgid "cannot read file names from %s" msgstr "無法從 %s 讀取檔案名稱" -#: src/sort.c:4613 +#: src/sort.c:4612 #, fuzzy, c-format msgid "%s:%lu: invalid zero-length file name" msgstr "檔案名稱無效 (長度為零)" -#: src/sort.c:4619 +#: src/sort.c:4618 #, fuzzy, c-format msgid "no input from %s" msgstr "正在關閉輸入檔 %s" -#: src/sort.c:4665 +#: src/sort.c:4664 #, c-format msgid "using %s sorting rules" msgstr "" -#: src/sort.c:4668 +#: src/sort.c:4667 #, c-format msgid "using simple byte comparison" msgstr "" -#: src/sort.c:4699 +#: src/sort.c:4698 #, fuzzy, c-format msgid "extra operand %s not allowed with -%c" msgstr "使用 -c 時不允許指定額外的參數‘%s’" -#: src/split.c:186 +#: src/split.c:207 #, c-format -msgid "the suffix length needs to be at least %zu" +msgid "the suffix length needs to be at least %" msgstr "" -#: src/split.c:203 +#: src/split.c:224 #, fuzzy, c-format -msgid "Usage: %s [OPTION]... [INPUT [PREFIX]]\n" +msgid "Usage: %s [OPTION]... [FILE [PREFIX]]\n" msgstr "用法：%s [選項] [輸入 [前置字串]]\n" -#: src/split.c:207 +#: src/split.c:228 #, 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" +"Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n" +"default size is 1000 lines, and default PREFIX is 'x'.\n" msgstr "" "將 <輸入> 資料分割為固定大小的部份，並將結果寫入‘<前置字串>aa’、\n" "‘<前置字串>ab’等等；預設的 <前置字串> 為‘x’。如果沒有指定 <輸入>\n" "或 <輸入> 是 -，則由標準輸入讀入資料。\n" "\n" -#: src/split.c:215 +#: src/split.c:236 #, 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" +" -C, --line-bytes=SIZE put at most SIZE bytes of records 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" +" -l, --lines=NUMBER put NUMBER lines/records per output file\n" " -n, --number=CHUNKS generate CHUNKS output files; see explanation " "below\n" +" -t, --separator=SEP use SEP instead of newline as the record " +"separator;\n" +" '\\0' (zero) specifies the NUL character\n" " -u, --unbuffered immediately copy input to output with '-n r/...'\n" msgstr "" -#: src/split.c:228 +#: src/split.c:251 #, fuzzy msgid "" " --verbose print a diagnostic just before each\n" " output file is opened\n" msgstr " --verbose 開啟每個輸出檔之前都在標準錯誤輸出顯示訊息\n" -#: src/split.c:235 +#: src/split.c:258 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" +" 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/records\n" +" l/K/N output Kth of N to stdout without splitting lines/records\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:353 +#: src/split.c:407 #, fuzzy, c-format msgid "output file suffixes exhausted" msgstr "輸出檔的後置字串已用盡" -#: src/split.c:365 +#: src/split.c:419 #, fuzzy, c-format msgid "creating file %s\n" msgstr "正在建立檔案‘%s’\n" -#: src/split.c:374 +#: src/split.c:428 #, c-format msgid "%s would overwrite input; aborting" msgstr "" -#: src/split.c:390 +#: src/split.c:444 #, fuzzy, c-format msgid "failed to set FILE environment variable" msgstr "LS_COLORS 環境變數中存在無法分析的值" -#: src/split.c:392 +#: src/split.c:446 #, c-format msgid "executing with FILE=%s\n" msgstr "" -#: src/split.c:394 +#: src/split.c:448 #, fuzzy, c-format msgid "failed to create pipe" msgstr "無法取得%s的屬性" -#: src/split.c:408 +#: src/split.c:462 #, fuzzy, c-format msgid "closing prior pipe" msgstr "無法進入%s目錄" -#: src/split.c:410 +#: src/split.c:464 #, fuzzy, c-format msgid "closing output pipe" msgstr "正在關閉輸出檔%s" -#: src/split.c:414 +#: src/split.c:468 #, fuzzy, c-format msgid "moving input pipe" msgstr "正在關閉輸入檔 %s" -#: src/split.c:416 +#: src/split.c:470 #, fuzzy, c-format msgid "closing input pipe" msgstr "正在關閉輸入檔 %s" -#: src/split.c:421 +#: src/split.c:475 #, fuzzy, c-format msgid "failed to run command: \"%s -c %s\"" msgstr "無法執行 %s 指令" -#: src/split.c:427 +#: src/split.c:481 #, fuzzy, c-format msgid "failed to close input pipe" msgstr "%s：無法關閉" -#: src/split.c:463 +#: src/split.c:517 #, c-format msgid "waiting for child process" msgstr "" -#: src/split.c:473 +#: src/split.c:527 #, c-format msgid "with FILE=%s, signal %s from command: %s" msgstr "" -#: src/split.c:481 +#: src/split.c:535 #, c-format msgid "with FILE=%s, exit %d from command: %s" msgstr "" -#: src/split.c:488 src/timeout.c:497 +#: src/split.c:542 #, c-format msgid "unknown status from command (0x%X)" msgstr "" -#: src/split.c:1102 +#: src/split.c:1195 #, c-format msgid "cannot split in more than one way" msgstr "不能用超過一種方式進行分割" -#: src/split.c:1115 src/split.c:1255 src/split.c:1426 -#, fuzzy, c-format -msgid "%s: invalid number of chunks" +#: src/split.c:1207 src/split.c:1322 src/split.c:1535 +#, fuzzy +msgid "invalid number of chunks" msgstr "%s：無效的秒數" -#: src/split.c:1119 -#, fuzzy, c-format -msgid "%s: invalid chunk number" +#: src/split.c:1212 +#, fuzzy +msgid "invalid chunk number" msgstr "%s：無效的號碼" -#: src/split.c:1169 -#, c-format -msgid "%s: invalid suffix length" +#: src/split.c:1259 +#, fuzzy +msgid "invalid suffix length" msgstr "%s：無效的後置字串長度" -#: src/split.c:1194 src/split.c:1202 src/split.c:1225 src/split.c:1230 +#: src/split.c:1333 #, c-format -msgid "%s: invalid number of bytes" -msgstr "%s：無效的位元組數目" +msgid "empty record separator" +msgstr "" -#: src/split.c:1213 src/split.c:1360 -#, c-format -msgid "%s: invalid number of lines" -msgstr "%s：無效的行數" +#: src/split.c:1344 +#, fuzzy, c-format +msgid "multi-character separator %s" +msgstr "分隔欄位字元‘%s’多於一個字元" -#: src/split.c:1286 +#: src/split.c:1352 +#, fuzzy, c-format +msgid "multiple separator characters specified" +msgstr "字元特殊檔案" + +#: src/split.c:1383 #, fuzzy, c-format msgid "line count option -%s%c... is too large" msgstr "%s：數字‘%.*s’過大" -#: src/split.c:1298 +#: src/split.c:1395 #, fuzzy, c-format msgid "%s: invalid start value for numerical suffix" msgstr "無效的開始行號：‘%s’" -#: src/split.c:1326 -#, fuzzy, c-format -msgid "%s: invalid IO block size" +#: src/split.c:1419 +#, fuzzy +msgid "invalid IO block size" msgstr "%s：進程編號無效" -#: src/split.c:1347 +#: src/split.c:1437 #, c-format msgid "--filter does not process a chunk extracted to stdout" msgstr "" -#: src/split.c:1384 +#: src/split.c:1477 #, c-format msgid "numerical suffix start value is too large for the suffix length" msgstr "" -#: src/split.c:1419 +#: src/split.c:1528 #, fuzzy, c-format msgid "%s: cannot determine file size" msgstr "無法決定主機名稱" #. This is a proper name. See the gettext manual, section Names. -#: src/stat.c:178 +#: src/stat.c:179 msgid "Michael Meskes" msgstr "" -#: src/stat.c:887 +#: src/stat.c:890 #, fuzzy, c-format msgid "failed to canonicalize %s" msgstr "無法保留%s的時間" -#: src/stat.c:1129 +#: src/stat.c:1132 #, fuzzy, c-format msgid "warning: unrecognized escape '\\%c'" msgstr "%s：無法識別的選項‘%c%s’\n" -#: src/stat.c:1184 +#: src/stat.c:1187 #, fuzzy, c-format msgid "%s: invalid directive" msgstr "%s：檔案類型不正確" -#: src/stat.c:1231 +#: src/stat.c:1234 #, fuzzy, c-format msgid "warning: backslash at end of format" msgstr "字串末端的反斜號溢出序列無效" -#: src/stat.c:1262 +#: src/stat.c:1265 #, c-format msgid "using %s to denote standard input does not work in file system mode" msgstr "" -#: src/stat.c:1269 +#: src/stat.c:1272 #, fuzzy, c-format msgid "cannot read file system information for %s" msgstr "無法將 %s 的檔案指標重新定位" -#: src/stat.c:1290 +#: src/stat.c:1293 #, 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:1326 +#: src/stat.c:1329 msgid "" " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" @@ -9001,7 +9103,7 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1349 +#: src/stat.c:1352 msgid "" " File: %N\n" " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" @@ -9009,30 +9111,30 @@ msgstr "" #. TRANSLATORS: This string uses format specifiers from #. 'stat --help' without --file-system, and NOT from printf. -#: src/stat.c:1359 +#: src/stat.c:1362 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:1367 +#: src/stat.c:1370 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:1376 +#: src/stat.c:1379 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:1386 +#: src/stat.c:1389 #, c-format msgid "Context: %C\n" msgstr "" -#: src/stat.c:1394 +#: src/stat.c:1397 msgid "" "Access: %x\n" "Modify: %y\n" @@ -9040,17 +9142,17 @@ msgid "" " Birth: %w\n" msgstr "" -#: src/stat.c:1412 +#: src/stat.c:1415 msgid "Display file or file system status.\n" msgstr "" -#: src/stat.c:1418 +#: src/stat.c:1421 msgid "" " -L, --dereference follow links\n" " -f, --file-system display file system status instead of file status\n" msgstr "" -#: src/stat.c:1422 +#: src/stat.c:1425 msgid "" " -c --format=FORMAT use the specified FORMAT instead of the default;\n" " output a newline after each use of FORMAT\n" @@ -9060,7 +9162,7 @@ msgid "" " -t, --terse print the information in terse form\n" msgstr "" -#: src/stat.c:1433 +#: src/stat.c:1436 #, fuzzy msgid "" "\n" @@ -9079,7 +9181,7 @@ msgstr "" " %a - 以八進位數字方式表示存取權限\n" " %b - 佔用的磁碟區段數目\n" -#: src/stat.c:1442 +#: src/stat.c:1445 #, fuzzy msgid "" " %d device number in decimal\n" @@ -9096,7 +9198,7 @@ msgstr "" " %G - 所屬群組的名稱\n" " %g - 所屬群組的號碼\n" -#: src/stat.c:1450 +#: src/stat.c:1453 #, fuzzy msgid "" " %h number of hard links\n" @@ -9118,7 +9220,7 @@ msgstr "" " %T - 特殊檔案或裝置檔案的十六進位 minor 號碼\n" " %t - 特殊檔案或裝置檔案的十六進位 major 號碼\n" -#: src/stat.c:1461 +#: src/stat.c:1464 #, fuzzy msgid "" " %u user ID of owner\n" @@ -9142,7 +9244,7 @@ msgstr "" " %Z - 由 Epoch 時間至最後更改 inode 資訊的時間之間經過的秒數\n" " %z - 最後更改 inode 資訊的時間\n" -#: src/stat.c:1475 +#: src/stat.c:1478 #, fuzzy msgid "" "Valid format sequences for file systems:\n" @@ -9161,7 +9263,7 @@ msgstr "" " %d - 檔案系統剩餘可用的最大檔案數目\n" " %f - 檔案系統的剩餘空間\n" -#: src/stat.c:1484 +#: src/stat.c:1487 #, fuzzy msgid "" " %i file system ID in hex\n" @@ -9223,8 +9325,7 @@ msgstr "" 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" +"for example) then that will override corresponding changes 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 "" @@ -9249,7 +9350,7 @@ msgstr "" msgid "you must specify a buffering mode option" msgstr "" -#: src/stty.c:516 +#: src/stty.c:524 #, c-format msgid "" "Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n" @@ -9257,96 +9358,149 @@ msgid "" " or: %s [-F DEVICE | --file=DEVICE] [-g|--save]\n" msgstr "" -#: src/stty.c:522 +#: src/stty.c:530 msgid "Print or change terminal characteristics.\n" msgstr "" -#: src/stty.c:528 +#: src/stty.c:536 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:535 +#: src/stty.c:543 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:540 +#: src/stty.c:548 msgid "" "\n" "Special characters:\n" +msgstr "" + +#: src/stty.c:552 +msgid " * discard CHAR CHAR will toggle discarding of output\n" +msgstr "" + +#: src/stty.c:557 +msgid "" " * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n" +msgstr "" + +#: src/stty.c:561 +msgid "" " 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:547 +#: src/stty.c:566 +msgid " * eol2 CHAR alternate CHAR for ending the line\n" +msgstr "" + +#: src/stty.c:570 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:553 -msgid "" -" * lnext CHAR CHAR will enter the next character quoted\n" -" quit CHAR CHAR will send a quit signal\n" -" * rprnt CHAR CHAR will redraw the current line\n" -" start CHAR CHAR will restart the output after stopping it\n" +#: src/stty.c:576 +msgid " * lnext CHAR CHAR will enter the next character quoted\n" +msgstr "" + +#: src/stty.c:581 +msgid " * status CHAR CHAR will send an info signal\n" +msgstr "" + +#: src/stty.c:585 +msgid " quit CHAR CHAR will send a quit signal\n" msgstr "" -#: src/stty.c:559 +#: src/stty.c:589 +msgid " * rprnt CHAR CHAR will redraw the current line\n" +msgstr "" + +#: src/stty.c:593 msgid "" +" start CHAR CHAR will restart the output after stopping it\n" " 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:565 +#: src/stty.c:599 +msgid " * swtch CHAR CHAR will switch to a different shell layer\n" +msgstr "" + +#: src/stty.c:604 +msgid " * werase CHAR CHAR will erase the last word typed\n" +msgstr "" + +#: src/stty.c:608 msgid "" "\n" "Special settings:\n" " N set the input and output speeds to N bauds\n" +msgstr "" + +#: src/stty.c:614 +msgid "" " * cols N tell the kernel that the terminal has N columns\n" " * columns N same as cols N\n" msgstr "" -#: src/stty.c:572 +#: src/stty.c:619 +msgid " ispeed N set the input speed to N\n" +msgstr "" + +#: src/stty.c:623 +msgid " * line N use line discipline N\n" +msgstr "" + +#: src/stty.c:627 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:578 +#: src/stty.c:632 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" +msgstr "" + +#: src/stty.c:637 +msgid "" " speed print the terminal speed\n" " time N with -icanon, set read timeout of N tenths of a second\n" msgstr "" -#: src/stty.c:584 +#: src/stty.c:641 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:593 +#: src/stty.c:648 +msgid " * [-]crtscts enable RTS/CTS handshaking\n" +msgstr "" + +#: src/stty.c:653 +msgid " * [-]cdtrdsr enable DTR/DSR handshaking\n" +msgstr "" + +#: src/stty.c:657 +msgid " csN set character size to N bits, N in [5..8]\n" +msgstr "" + +#: src/stty.c:660 msgid "" " [-]cstopb use two stop bits per character (one with '-')\n" " [-]hup send a hangup signal when the last process closes the tty\n" @@ -9354,10 +9508,13 @@ msgid "" " [-]parenb generate parity bit in output and expect parity bit in " "input\n" " [-]parodd set odd parity (or even parity with '-')\n" -" * [-]cmspar use \"stick\" (mark/space) parity\n" msgstr "" -#: src/stty.c:601 +#: src/stty.c:668 +msgid " * [-]cmspar use \"stick\" (mark/space) parity\n" +msgstr "" + +#: src/stty.c:672 msgid "" "\n" "Input settings:\n" @@ -9365,135 +9522,249 @@ msgid "" " [-]icrnl translate carriage return to newline\n" " [-]ignbrk ignore break characters\n" " [-]igncr ignore carriage return\n" +" [-]ignpar ignore characters with parity errors\n" msgstr "" -#: src/stty.c:609 +#: src/stty.c:682 msgid "" -" [-]ignpar ignore characters with parity errors\n" " * [-]imaxbel beep and do not flush a full input buffer on a character\n" +msgstr "" + +#: src/stty.c:686 +msgid "" " [-]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:616 +#: src/stty.c:692 msgid " * [-]iutf8 assume input characters are UTF-8 encoded\n" msgstr "" -#: src/stty.c:619 +#: src/stty.c:697 +msgid " * [-]iuclc translate uppercase characters to lowercase\n" +msgstr "" + +#: src/stty.c:702 msgid "" -" * [-]iuclc translate uppercase characters to lowercase\n" " * [-]ixany let any character restart output, not only start character\n" +msgstr "" + +#: src/stty.c:706 +msgid "" " [-]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:627 +#: src/stty.c:712 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:635 +#: src/stty.c:717 +msgid " * bsN backspace delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:722 +msgid " * crN carriage return delay style, N in [0..3]\n" +msgstr "" + +#: src/stty.c:727 +msgid " * ffN form feed delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:732 +msgid " * nlN newline delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:737 +msgid " * [-]ocrnl translate carriage return to newline\n" +msgstr "" + +#: src/stty.c:742 msgid "" -" * [-]ocrnl translate carriage return to newline\n" " * [-]ofdel use delete characters for fill instead of NUL characters\n" +msgstr "" + +#: src/stty.c:747 +msgid "" " * [-]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:643 +#: src/stty.c:752 +msgid " * [-]olcuc translate lowercase characters to uppercase\n" +msgstr "" + +#: src/stty.c:757 +msgid " * [-]onlcr translate newline to carriage return-newline\n" +msgstr "" + +#: src/stty.c:762 +msgid " * [-]onlret newline performs a carriage return\n" +msgstr "" + +#: src/stty.c:767 +msgid " * [-]onocr do not print carriage returns in the first column\n" +msgstr "" + +#: src/stty.c:771 +msgid " [-]opost postprocess output\n" +msgstr "" + +#: src/stty.c:775 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:651 +#: src/stty.c:782 +msgid " * vtN vertical tab delay style, N in [0..1]\n" +msgstr "" + +#: src/stty.c:786 msgid "" "\n" "Local settings:\n" " [-]crterase echo erase characters as backspace-space-backspace\n" +msgstr "" + +#: src/stty.c:792 +msgid "" " * 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:658 +#: src/stty.c:798 +msgid " * [-]ctlecho echo control characters in hat notation ('^c')\n" +msgstr "" + +#: src/stty.c:802 +msgid " [-]echo echo input characters\n" +msgstr "" + +#: src/stty.c:806 +msgid " * [-]echoctl same as [-]ctlecho\n" +msgstr "" + +#: src/stty.c:810 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:665 +#: src/stty.c:815 +msgid " * [-]echoke same as [-]crtkill\n" +msgstr "" + +#: src/stty.c:819 +msgid " [-]echonl echo newline even if not echoing other characters\n" +msgstr "" + +#: src/stty.c:823 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" +msgstr "" + +#: src/stty.c:828 +msgid " * [-]extproc enable \"LINEMODE\"; useful with high latency links\n" +msgstr "" + +#: src/stty.c:832 +#, c-format +msgid "" +" [-]icanon enable special characters: %s\n" " [-]iexten enable non-POSIX special characters\n" msgstr "" -#: src/stty.c:672 +#: src/stty.c:843 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" +msgstr "" + +#: src/stty.c:848 +msgid " * [-]prterase same as [-]echoprt\n" +msgstr "" + +#: src/stty.c:853 +msgid "" " * [-]tostop stop background jobs that try to write to the terminal\n" +msgstr "" + +#: src/stty.c:858 +msgid "" " * [-]xcase with icanon, escape with '\\' for uppercase characters\n" msgstr "" -#: src/stty.c:679 +#: src/stty.c:862 msgid "" "\n" "Combination settings:\n" -" * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:867 +msgid " * [-]LCASE same as [-]lcase\n" +msgstr "" + +#: src/stty.c:871 +msgid "" " cbreak same as -icanon\n" " -cbreak same as icanon\n" msgstr "" -#: src/stty.c:686 +#: src/stty.c:875 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:692 +#: src/stty.c:880 +#, c-format +msgid " crt same as %s\n" +msgstr "" + +#: src/stty.c:890 +#, c-format msgid "" -" dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n" +" dec same as %s intr ^c erase 0177\n" " kill ^u\n" -" * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:905 +msgid " * [-]decctlq same as [-]ixany\n" +msgstr "" + +#: src/stty.c:909 +msgid "" " ek erase and kill characters to their default values\n" " evenp same as parenb -parodd cs7\n" +" -evenp same as -parenb cs8\n" +msgstr "" + +#: src/stty.c:915 +msgid " * [-]lcase same as xcase iuclc olcuc\n" msgstr "" -#: src/stty.c:699 +#: src/stty.c:919 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:707 +#: src/stty.c:923 +#, c-format +msgid "" +" nl same as %s\n" +" -nl same as %s\n" +msgstr "" + +#: src/stty.c:943 msgid "" " oddp same as parenb parodd cs7\n" " -oddp same as -parenb cs8\n" @@ -9502,25 +9773,27 @@ msgid "" " -pass8 same as parenb istrip cs7\n" msgstr "" -#: src/stty.c:714 +#: src/stty.c:950 +#, c-format 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" +" -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n" +" -isig%s min 1 time 0\n" " -raw same as cooked\n" msgstr "" -#: src/stty.c:720 +#: src/stty.c:969 +#, c-format 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" +" sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n" +" icanon iexten echo echoe echok -echonl -noflsh\n" +" %s\n" +" %s\n" +" %s,\n" +" all special characters to their default values\n" msgstr "" -#: src/stty.c:728 +#: src/stty.c:1052 msgid "" "\n" "Handle the tty line connected to standard input. Without arguments,\n" @@ -9529,57 +9802,62 @@ msgid "" "127; special values ^- or undef used to disable special characters.\n" msgstr "" -#: src/stty.c:800 +#: src/stty.c:1124 #, fuzzy, c-format msgid "only one device may be specified" msgstr "只能指定一個參數" -#: src/stty.c:830 +#: src/stty.c:1154 #, fuzzy, c-format msgid "" "the options for verbose and stty-readable output styles are\n" "mutually exclusive" msgstr "不能同時使用 --string 及 --check 選項" -#: src/stty.c:836 +#: src/stty.c:1160 #, c-format msgid "when specifying an output style, modes may not be set" msgstr "" -#: src/stty.c:851 +#: src/stty.c:1175 #, c-format msgid "%s: couldn't reset non-blocking mode" msgstr "" -#: src/stty.c:896 src/stty.c:1006 +#: src/stty.c:1226 src/stty.c:1350 #, fuzzy, c-format msgid "invalid argument %s" msgstr "參數無效: %s" -#: src/stty.c:907 src/stty.c:924 src/stty.c:936 src/stty.c:949 src/stty.c:961 -#: src/stty.c:981 +#: src/stty.c:1237 src/stty.c:1254 src/stty.c:1266 src/stty.c:1293 +#: src/stty.c:1305 src/stty.c:1325 #, fuzzy, c-format msgid "missing argument to %s" msgstr "%2$s的參數%1$s不明確" -#: src/stty.c:987 +#: src/stty.c:1283 +#, fuzzy, c-format +msgid "%s: error setting %s" +msgstr "%s：截斷檔案時發生錯誤" + +#: src/stty.c:1331 #, fuzzy, c-format msgid "invalid line discipline %s" msgstr "無效的欄位規格：‘%s’" -#: src/stty.c:1057 +#: src/stty.c:1401 #, c-format msgid "%s: unable to perform all requested operations" msgstr "" -#: src/stty.c:1403 +#: src/stty.c:1747 #, c-format msgid "%s: no size information for this device" msgstr "" -#: src/stty.c:1924 -#, fuzzy, c-format -msgid "invalid integer argument %s" +#: src/stty.c:2279 +#, fuzzy +msgid "invalid integer argument" msgstr "無效的行號增加值：‘%s’" #. This is a proper name. See the gettext manual, section Names. @@ -9589,8 +9867,14 @@ msgstr "" #: src/sum.c:62 #, fuzzy +msgid "Print checksum and block counts for each FILE.\n" +msgstr "" +"印出每個 <檔案> 的 CRC 總和檢查值及位元組總數。\n" +"\n" + +#: src/sum.c:68 +#, fuzzy msgid "" -"Print checksum and block counts for each FILE.\n" "\n" " -r use BSD sum algorithm, use 1K blocks\n" " -s, --sysv use System V sum algorithm, use 512 bytes blocks\n" @@ -9600,20 +9884,54 @@ msgstr "" " -r 令 -s 選項無效，使用 BSD 的演算法，用 1K 的區塊大小\n" " -s, --sysv 使用 System V 的演算法，用 512 個位元組的區塊大小\n" -#: src/sync.c:41 +#: src/sync.c:64 +#, c-format +msgid "Usage: %s [OPTION] [FILE]...\n" +msgstr "用法：%s [選項] [檔案]...\n" + +#: src/sync.c:65 msgid "" -"Force changed blocks to disk, update the super block.\n" +"Synchronize cached writes to persistent storage\n" "\n" -msgstr "" -"強迫將已更改的資料寫入磁碟，並更新 super block。\n" +"If one or more files are specified, sync only them,\n" +"or their containing file systems.\n" "\n" +msgstr "" + +#: src/sync.c:73 +msgid " -d, --data sync only file data, no unneeded metadata\n" +msgstr "" + +#: src/sync.c:76 +msgid " -f, --file-system sync the file systems that contain the files\n" +msgstr "" -#: src/sync.c:69 +#: src/sync.c:114 #, fuzzy, c-format -msgid "ignoring all arguments" -msgstr "參數過多" +msgid "error opening %s" +msgstr "讀取 %s 時發生錯誤" -#: src/system.h:343 +#: src/sync.c:124 +#, fuzzy, c-format +msgid "couldn't reset non-blocking mode %s" +msgstr "無法更改%s的擁有者和/或所屬群組" + +#: src/sync.c:154 +#, fuzzy, c-format +msgid "error syncing %s" +msgstr "讀取 %s 時發生錯誤" + +#: src/sync.c:212 +#, c-format +msgid "cannot specify both --data and --file-system" +msgstr "" + +#: src/sync.c:216 +#, c-format +msgid "--data needs at least one argument" +msgstr "" + +#: src/system.h:337 #, c-format msgid "" "\n" @@ -9622,22 +9940,30 @@ msgid "" "for details about the options it supports.\n" msgstr "" -#: src/system.h:349 +#: src/system.h:343 msgid " --help display this help and exit\n" msgstr " --help 顯示此求助說明並離開\n" -#: src/system.h:351 +#: src/system.h:345 msgid " --version output version information and exit\n" msgstr " --version 顯示版本資訊並離開\n" -#: src/system.h:543 +#: src/system.h:537 +msgid "" +"\n" +"With no FILE, or when FILE is -, read standard input.\n" +msgstr "" +"\n" +"如果沒有指定<檔案>或<檔案>是 -，則由標準輸入讀取資料。\n" + +#: src/system.h:544 #, fuzzy msgid "" "\n" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "長選項必須用的參數在使用短選項時也是必須的。\n" -#: src/system.h:551 +#: src/system.h:552 msgid "" "\n" "The SIZE argument is an integer and optional unit (example: 10K is " @@ -9645,7 +9971,7 @@ msgid "" "Units are K,M,G,T,P,E,Z,Y (powers of 1024) or KB,MB,... (powers of 1000).\n" msgstr "" -#: src/system.h:560 +#: src/system.h:561 #, c-format msgid "" "\n" @@ -9654,7 +9980,7 @@ msgid "" "Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n" msgstr "" -#: src/system.h:570 +#: src/system.h:590 #, c-format msgid "" "\n" @@ -9665,22 +9991,27 @@ msgstr "" #. 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:580 +#: src/system.h:601 #, c-format msgid "Report %s translation bugs to \n" msgstr "" -#: src/system.h:584 +#: src/system.h:604 #, c-format -msgid "For complete documentation, run: info coreutils '%s invocation'\n" +msgid "Full documentation at: <%s%s>\n" msgstr "" -#: src/system.h:591 +#: src/system.h:606 +#, c-format +msgid "or available locally via: info '(coreutils) %s%s'\n" +msgstr "" + +#: src/system.h:613 #, fuzzy, c-format msgid "Try '%s --help' for more information.\n" msgstr "請嘗試執行‘%s --help’來獲取更多資訊。\n" -#: src/system.h:633 +#: src/system.h:655 #, c-format msgid "" "WARNING: Circular directory structure.\n" @@ -9702,9 +10033,7 @@ 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" +msgid "Write each FILE to standard output, last line first.\n" msgstr "" "將每個 <檔案> 由最後一行開始在標準輸出顯示出來。\n" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" @@ -9720,70 +10049,69 @@ msgstr "" " -r, --regex 將分隔字串理解為正規表示式\n" " -s, --separator=字串 用 <字串> 作為分隔字串，而不是 newline 字元\n" -#: src/tac.c:234 src/tac.c:335 +#: src/tac.c:224 src/tac.c:234 src/tac.c:344 #, fuzzy, c-format msgid "%s: seek failed" msgstr "關閉時發生錯誤" -#: src/tac.c:263 +#: src/tac.c:277 #, fuzzy, c-format msgid "record too large" msgstr "%s：檔案過大" -#: src/tac.c:450 +#: src/tac.c:459 #, fuzzy, c-format msgid "failed to create temporary file in %s" msgstr "無法建立暫存檔" -#: src/tac.c:458 +#: src/tac.c:467 #, fuzzy, c-format msgid "failed to open %s for writing" msgstr "%s：無法開啟來寫入資料" -#: src/tac.c:475 +#: src/tac.c:484 #, fuzzy, c-format msgid "failed to rewind stream for %s" msgstr "無法保留 %s 的時間" -#: src/tac.c:511 src/tac.c:518 +#: src/tac.c:521 src/tac.c:533 #, fuzzy, c-format msgid "%s: write error" msgstr "寫入時發生錯誤" -#: src/tac.c:571 +#: src/tac.c:587 #, fuzzy, c-format msgid "failed to open %s for reading" msgstr "無法開啟 %s 來讀取資料" -#: src/tac.c:629 +#: src/tac.c:645 #, c-format msgid "separator cannot be empty" msgstr "分隔字串不可以是空的" #. This is a proper name. See the gettext manual, section Names. -#: src/tail.c:71 +#: src/tail.c:73 msgid "Ian Lance Taylor" msgstr "" -#: src/tail.c:262 +#: src/tail.c:257 #, 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" msgstr "" "在標準輸出顯示每個 <檔案> 的最後 %d 行。\n" "當指定多於一個 <檔案> 時，會先印出表示每個檔案名稱的標頭。\n" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" "\n" -#: src/tail.c:270 +#: src/tail.c:265 msgid "" " -c, --bytes=K output the last K bytes; or use -c +K to output\n" " bytes starting with the Kth of each file\n" msgstr "" -#: src/tail.c:274 +#: src/tail.c:269 #, fuzzy msgid "" " -f, --follow[={name|descriptor}]\n" @@ -9797,7 +10125,7 @@ msgstr "" " -F 等於 --follow=name --retry\n" # --max-consecutive-size-changes is undocumented -- maddog -#: src/tail.c:280 +#: src/tail.c:275 #, fuzzy, c-format msgid "" " -n, --lines=K output the last K lines, instead of the last %d;\n" @@ -9819,7 +10147,7 @@ msgstr "" " 配合 --follow=name 時，如果 <檔案> 連續 N 次\n" " 改變大小，則認定此檔案已經被改名。\n" -#: src/tail.c:293 +#: src/tail.c:288 #, fuzzy msgid "" " --pid=PID with -f, terminate after process ID, PID dies\n" @@ -9833,7 +10161,7 @@ msgstr "" " (預設為 1 秒)\n" " -v, --verbose 一定顯示任何標明檔案名稱的標頭\n" -#: src/tail.c:298 +#: src/tail.c:293 msgid "" " -s, --sleep-interval=N with -f, sleep for approximately N seconds\n" " (default 1.0) between iterations;\n" @@ -9842,7 +10170,7 @@ msgid "" " -v, --verbose always output headers giving file names\n" msgstr "" -#: src/tail.c:307 +#: src/tail.c:302 #, fuzzy msgid "" "\n" @@ -9859,7 +10187,7 @@ msgstr "" "m 則是 1048576 (1M)。\n" "\n" -#: src/tail.c:316 +#: src/tail.c:311 #, fuzzy msgid "" "With --follow (-f), tail defaults to following the file descriptor, which\n" @@ -9875,169 +10203,169 @@ msgstr "" "的檔案，方法是重複地開啟檔案，看看它是否已被移除和其它程式會否再產生該\n" "檔案。\n" -#: src/tail.c:368 +#: src/tail.c:363 #, c-format msgid "closing %s (fd=%d)" msgstr "正在關閉 %s (fd=%d)" -#: src/tail.c:461 +#: src/tail.c:456 #, fuzzy, c-format msgid "%s: cannot seek to end-relative offset %s" msgstr "%s：無法搜尋至末端相對位置 %s%s" -#: src/tail.c:898 +#: src/tail.c:893 #, c-format msgid "cannot determine location of %s. reverting to polling" msgstr "" -#: src/tail.c:910 +#: src/tail.c:905 #, c-format msgid "" "unrecognized file system type 0x%08lx for %s. please report this to %s. " "reverting to polling" msgstr "" -#: src/tail.c:965 +#: src/tail.c:958 #, fuzzy, c-format msgid "%s has been replaced with a symbolic link. giving up on this name" msgstr "%s：被一個無法 tail 的檔案取代；不會再檢查此檔案名稱" -#: src/tail.c:980 +#: src/tail.c:973 #, fuzzy, c-format msgid "%s has become inaccessible" msgstr "已無法存取‘%s’" -#: src/tail.c:997 +#: src/tail.c:990 #, fuzzy, c-format msgid "%s has been replaced with an untailable file; giving up on this name" msgstr "%s：被一個無法 tail 的檔案取代；不會再檢查此檔案名稱" -#: src/tail.c:1006 +#: src/tail.c:999 #, fuzzy, c-format msgid "%s has been replaced with a remote file. giving up on this name" msgstr "%s：被一個無法 tail 的檔案取代；不會再檢查此檔案名稱" -#: src/tail.c:1027 +#: src/tail.c:1020 #, fuzzy, c-format msgid "%s has become accessible" msgstr "已經可以存取‘%s’" -#: src/tail.c:1035 +#: src/tail.c:1032 #, fuzzy, c-format -msgid "%s has appeared; following end of new file" +msgid "%s has appeared; following new file" msgstr "‘%s’已出現；正在檢查新檔案的末端" -#: src/tail.c:1046 +#: src/tail.c:1042 #, fuzzy, c-format -msgid "%s has been replaced; following end of new file" +msgid "%s has been replaced; following new file" msgstr "‘%s’已被取代；正在檢查新檔案的末端" -#: src/tail.c:1163 +#: src/tail.c:1159 #, fuzzy, c-format msgid "%s: cannot change nonblocking mode" msgstr "無法更改%s的擁有者和/或所屬群組" -#: src/tail.c:1205 src/tail.c:1342 +#: src/tail.c:1204 src/tail.c:1346 #, c-format msgid "%s: file truncated" msgstr "%s：檔案被截斷了" -#: src/tail.c:1229 src/tail.c:1498 +#: src/tail.c:1228 src/tail.c:1546 #, c-format msgid "no files remaining" msgstr "已沒有任何剩餘的檔案" -#: src/tail.c:1424 +#: src/tail.c:1440 #, fuzzy, c-format msgid "cannot watch parent directory of %s" msgstr "無法 stat 目前的目錄 (現在是 %s)" -#: src/tail.c:1427 src/tail.c:1442 +#: src/tail.c:1443 src/tail.c:1460 src/tail.c:1628 #, fuzzy, c-format msgid "inotify resources exhausted" msgstr "記憶體耗盡" -#: src/tail.c:1445 src/tail.c:1577 +#: src/tail.c:1464 src/tail.c:1636 #, fuzzy, c-format msgid "cannot watch %s" msgstr "無法對‘%s’執行輸出入控制 (ioctl)" -#: src/tail.c:1529 +#: src/tail.c:1513 +#, fuzzy, c-format +msgid "%s was replaced" +msgstr "%s：是否置換 %s? " + +#: src/tail.c:1577 #, c-format msgid "error monitoring inotify event" msgstr "" -#: src/tail.c:1549 +#: src/tail.c:1597 #, fuzzy, c-format msgid "error reading inotify event" msgstr "讀取 %s 時發生錯誤" -#: src/tail.c:1844 +#: src/tail.c:1902 #, c-format msgid "%s: cannot follow end of this type of file; giving up on this name" msgstr "%s：無法檢查此類檔案的末端；不會再檢查此檔案名稱" -#: src/tail.c:1961 -#, fuzzy, c-format -msgid "number in %s is too large" -msgstr "%s 過長" - -#: src/tail.c:2033 -#, c-format -msgid "%s: invalid maximum number of unchanged stats between opens" +#: src/tail.c:2083 +#, fuzzy +msgid "invalid maximum number of unchanged stats between opens" msgstr "%s：開啟檔案前 stat 資料沒有改變的最大次數無效" -#: src/tail.c:2049 -#, c-format -msgid "%s: invalid PID" +#: src/tail.c:2091 +#, fuzzy +msgid "invalid PID" msgstr "%s：無效的 PID" -#: src/tail.c:2068 -#, c-format -msgid "%s: invalid number of seconds" -msgstr "%s：無效的秒數" +#: src/tail.c:2107 +#, fuzzy, c-format +msgid "invalid number of seconds: %s" +msgstr "無效的欄位數目：‘%s’" -#: src/tail.c:2084 +#: src/tail.c:2123 #, c-format msgid "option used in invalid context -- %c" msgstr "" -#: src/tail.c:2096 +#: src/tail.c:2135 #, fuzzy, c-format msgid "warning: --retry ignored; --retry is useful only when following" msgstr "警告：會忽略 PID；--pid=PID 選項只在不斷檢查檔案時才會有效" -#: src/tail.c:2100 +#: src/tail.c:2139 #, c-format msgid "warning: --retry only effective for the initial open" msgstr "" -#: src/tail.c:2105 +#: src/tail.c:2144 #, c-format msgid "warning: PID ignored; --pid=PID is useful only when following" msgstr "警告：會忽略 PID；--pid=PID 選項只在不斷檢查檔案時才會有效" -#: src/tail.c:2108 +#: src/tail.c:2147 #, c-format msgid "warning: --pid=PID is not supported on this system" msgstr "警告：此系統不支援 --pid=PID 選項" -#: src/tail.c:2209 +#: src/tail.c:2250 #, fuzzy, c-format msgid "cannot follow %s by name" msgstr "無法建立暫存檔" -#: src/tail.c:2215 +#: src/tail.c:2256 #, c-format msgid "warning: following standard input indefinitely is ineffective" msgstr "" -#: src/tail.c:2291 +#: src/tail.c:2337 #, c-format msgid "inotify cannot be used, reverting to polling" msgstr "" -#: src/tee.c:63 +#: src/tee.c:87 msgid "" "Copy standard input to each FILE, and also to standard output.\n" "\n" @@ -10045,62 +10373,73 @@ msgid "" " -i, --ignore-interrupts ignore interrupt signals\n" msgstr "" -#: src/tee.c:71 -#, fuzzy +#: src/tee.c:93 msgid "" -"\n" -"If a FILE is -, copy again to standard output.\n" +" -p, --output-error[=MODE] behavior on write error. See MODE details " +"below\n" msgstr "" + +#: src/tee.c:98 +msgid "" "\n" -"如果沒有指定<檔案>或<檔案>是 -，則由標準輸入讀取資料。\n" +"MODE determines behavior with write errors on the outputs:\n" +" 'warn' diagnose errors writing to any output\n" +" 'warn-nopipe' diagnose errors writing to any output not a pipe\n" +" 'exit' exit on error writing to any output\n" +" 'exit-nopipe' exit on error writing to any output not a pipe\n" +"The default MODE for the -p option is 'warn-nopipe'.\n" +"The default operation when --output-error is not specified, is to\n" +"exit immediately on error writing to a pipe, and diagnose errors\n" +"writing to non pipe outputs.\n" +msgstr "" -#: src/test.c:123 +#: src/test.c:125 #, fuzzy, c-format msgid "missing argument after %s" msgstr "%2$s的參數%1$s不明確" -#: src/test.c:159 +#: src/test.c:161 #, fuzzy, c-format msgid "invalid integer %s" msgstr "數字 %s 無效" -#: src/test.c:241 +#: src/test.c:243 msgid "')' expected" msgstr "" -#: src/test.c:244 +#: src/test.c:246 #, c-format msgid "')' expected, found %s" msgstr "" -#: src/test.c:260 src/test.c:618 +#: src/test.c:262 src/test.c:620 #, fuzzy, c-format msgid "%s: unary operator expected" msgstr "%s：無效的正規表示式：%s" -#: src/test.c:329 +#: src/test.c:331 msgid "-nt does not accept -l" msgstr "" -#: src/test.c:342 +#: src/test.c:344 msgid "-ef does not accept -l" msgstr "" -#: src/test.c:358 +#: src/test.c:360 msgid "-ot does not accept -l" msgstr "" -#: src/test.c:367 +#: src/test.c:369 #, fuzzy msgid "unknown binary operator" msgstr "不明的系統錯誤" -#: src/test.c:646 +#: src/test.c:648 #, fuzzy, c-format msgid "%s: binary operator expected" msgstr "%s：無效的正規表示式：%s" -#: src/test.c:704 +#: src/test.c:706 msgid "" "Usage: test EXPRESSION\n" " or: test\n" @@ -10109,20 +10448,20 @@ msgid "" " or: [ OPTION\n" msgstr "" -#: src/test.c:711 +#: src/test.c:713 msgid "" "Exit with the status determined by EXPRESSION.\n" "\n" msgstr "" -#: src/test.c:717 +#: src/test.c:719 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 +#: src/test.c:724 msgid "" "\n" " ( EXPRESSION ) EXPRESSION is true\n" @@ -10131,7 +10470,7 @@ msgid "" " EXPRESSION1 -o EXPRESSION2 either EXPRESSION1 or EXPRESSION2 is true\n" msgstr "" -#: src/test.c:729 +#: src/test.c:731 msgid "" "\n" " -n STRING the length of STRING is nonzero\n" @@ -10141,7 +10480,7 @@ msgid "" " STRING1 != STRING2 the strings are not equal\n" msgstr "" -#: src/test.c:737 +#: src/test.c:739 msgid "" "\n" " INTEGER1 -eq INTEGER2 INTEGER1 is equal to INTEGER2\n" @@ -10152,7 +10491,7 @@ msgid "" " INTEGER1 -ne INTEGER2 INTEGER1 is not equal to INTEGER2\n" msgstr "" -#: src/test.c:746 +#: src/test.c:748 msgid "" "\n" " FILE1 -ef FILE2 FILE1 and FILE2 have the same device and inode numbers\n" @@ -10160,7 +10499,7 @@ msgid "" " FILE1 -ot FILE2 FILE1 is older than FILE2\n" msgstr "" -#: src/test.c:752 +#: src/test.c:754 msgid "" "\n" " -b FILE FILE exists and is block special\n" @@ -10169,7 +10508,7 @@ msgid "" " -e FILE FILE exists\n" msgstr "" -#: src/test.c:759 +#: src/test.c:761 msgid "" " -f FILE FILE exists and is a regular file\n" " -g FILE FILE exists and is set-group-ID\n" @@ -10178,7 +10517,7 @@ msgid "" " -k FILE FILE exists and has its sticky bit set\n" msgstr "" -#: src/test.c:766 +#: src/test.c:768 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" @@ -10187,7 +10526,7 @@ msgid "" " -s FILE FILE exists and has a size greater than zero\n" msgstr "" -#: src/test.c:773 +#: src/test.c:775 msgid "" " -S FILE FILE exists and is a socket\n" " -t FD file descriptor FD is opened on a terminal\n" @@ -10196,7 +10535,7 @@ msgid "" " -x FILE FILE exists and execute (or search) permission is granted\n" msgstr "" -#: src/test.c:780 +#: src/test.c:782 msgid "" "\n" "Except for -h and -L, all FILE-related tests dereference symbolic links.\n" @@ -10205,32 +10544,32 @@ msgid "" "INTEGER may also be -l STRING, which evaluates to the length of STRING.\n" msgstr "" -#: src/test.c:786 +#: src/test.c:788 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 +#: src/test.c:793 msgid "test and/or [" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:803 +#: src/test.c:805 msgid "Kevin Braunsdorf" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/test.c:804 +#: src/test.c:806 msgid "Matthew Bradburn" msgstr "" -#: src/test.c:858 +#: src/test.c:860 msgid "missing ']'" msgstr "" -#: src/test.c:872 +#: src/test.c:874 #, fuzzy, c-format msgid "extra argument %s" msgstr "參數過多" @@ -10250,7 +10589,7 @@ msgstr "" msgid "warning: timer_create" msgstr "" -#: src/timeout.c:228 +#: src/timeout.c:230 #, fuzzy, c-format msgid "" "Usage: %s [OPTION] DURATION COMMAND [ARG]...\n" @@ -10259,11 +10598,11 @@ msgstr "" "用法：%s [檔案]...\n" " 或：%s [選項]\n" -#: src/timeout.c:232 +#: src/timeout.c:234 msgid "Start COMMAND, and kill it if still running after DURATION.\n" msgstr "" -#: src/timeout.c:238 +#: src/timeout.c:240 msgid "" " --preserve-status\n" " exit with the same status as COMMAND, even when the\n" @@ -10281,7 +10620,7 @@ msgid "" " see 'kill -l' for a list of signals\n" msgstr "" -#: src/timeout.c:257 +#: src/timeout.c:259 msgid "" "\n" "DURATION is a floating point number with an optional suffix:\n" @@ -10289,7 +10628,7 @@ msgid "" "days.\n" msgstr "" -#: src/timeout.c:262 +#: src/timeout.c:264 msgid "" "\n" "If the command times out, and --preserve-status is not set, then exit with\n" @@ -10300,7 +10639,7 @@ msgid "" "case the exit status is 128+9 rather than 124.\n" msgstr "" -#: src/timeout.c:366 +#: src/timeout.c:368 #, c-format msgid "warning: disabling core dumps failed" msgstr "" @@ -10315,6 +10654,11 @@ msgstr "寫入 %s 時發生錯誤" msgid "the monitored command dumped core" msgstr "" +#: src/timeout.c:497 +#, c-format +msgid "unknown status from command (%d)" +msgstr "" + #. This is a proper name. See the gettext manual, section Names. #: src/touch.c:43 msgid "Jim Kingdon" @@ -10656,12 +11000,12 @@ msgstr "" msgid "Exit with a status code indicating failure." msgstr "" -#: src/truncate.c:96 +#: src/truncate.c:69 #, fuzzy, c-format msgid "Usage: %s OPTION... FILE...\n" msgstr "用法：%s [選項]... [檔案]...\n" -#: src/truncate.c:97 +#: src/truncate.c:70 msgid "" "Shrink or extend the size of each FILE to the specified size\n" "\n" @@ -10672,22 +11016,22 @@ msgid "" "reads as zero bytes.\n" msgstr "" -#: src/truncate.c:109 +#: src/truncate.c:82 msgid " -c, --no-create do not create any files\n" msgstr "" -#: src/truncate.c:112 +#: src/truncate.c:85 msgid "" " -o, --io-blocks treat SIZE as number of IO blocks instead of bytes\n" msgstr "" -#: src/truncate.c:115 +#: src/truncate.c:88 msgid "" " -r, --reference=RFILE base size on RFILE\n" " -s, --size=SIZE set or adjust the file size by SIZE bytes\n" msgstr "" -#: src/truncate.c:121 +#: src/truncate.c:94 msgid "" "\n" "SIZE may also be prefixed by one of the following modifying characters:\n" @@ -10695,57 +11039,62 @@ msgid "" "'/' round down to multiple of, '%' round up to multiple of.\n" msgstr "" -#: src/truncate.c:149 +#: src/truncate.c:122 #, c-format msgid "overflow in % * % byte blocks for file %s" msgstr "" -#: src/truncate.c:173 +#: src/truncate.c:146 #, fuzzy, c-format msgid "%s has unusable, apparently negative size" msgstr "%s：檔案的大小為負數" -#: src/truncate.c:183 src/truncate.c:384 +#: src/truncate.c:156 src/truncate.c:358 #, fuzzy, c-format msgid "cannot get the size of %s" msgstr "無法讀取時間" -#: src/truncate.c:205 +#: src/truncate.c:178 #, c-format msgid "overflow rounding up size of file %s" msgstr "" -#: src/truncate.c:215 +#: src/truncate.c:188 #, c-format msgid "overflow extending size of file %s" msgstr "" -#: src/truncate.c:230 +#: src/truncate.c:203 #, c-format msgid "failed to truncate %s at % bytes" msgstr "" -#: src/truncate.c:303 +#: src/truncate.c:276 #, fuzzy, c-format msgid "multiple relative modifiers specified" msgstr "指定了多於一個目的地目錄" -#: src/truncate.c:333 +#: src/truncate.c:285 +#, fuzzy +msgid "Invalid number" +msgstr "無效的數字" + +#: src/truncate.c:307 #, fuzzy, c-format msgid "you must specify either %s or %s" msgstr "必須指定一系列的位元組、字元或欄位" -#: src/truncate.c:340 +#: src/truncate.c:314 #, c-format msgid "you must specify a relative %s with %s" msgstr "" -#: src/truncate.c:347 +#: src/truncate.c:321 #, c-format msgid "%s was specified but %s was not" msgstr "" -#: src/truncate.c:404 +#: src/truncate.c:378 #, fuzzy, c-format msgid "cannot open %s for writing" msgstr "無法開啟%s來讀取資料" @@ -10756,12 +11105,10 @@ msgid "Mark Kettenis" msgstr "" #: src/tsort.c:82 -#, c-format +#, fuzzy, 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 "" "用法：%s [選項] [檔案]\n" "將 <檔案> 中所有已進行部份排序的項目聯繫起來，產生新的排列，\n" @@ -10769,12 +11116,17 @@ msgstr "" "<檔案> 是 -，則由標準輸入讀取資料。\n" "\n" -#: src/tsort.c:471 +#: src/tsort.c:89 src/uptime.c:212 +#, c-format +msgid "\n" +msgstr "" + +#: src/tsort.c:475 #, fuzzy, c-format msgid "%s: input contains an odd number of tokens" msgstr "%s：將輸入資料排序時出現迴圈：" -#: src/tsort.c:517 +#: src/tsort.c:521 #, c-format msgid "%s: input contains a loop:" msgstr "%s：將輸入資料排序時出現迴圈：" @@ -10823,9 +11175,7 @@ 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" +msgid "Convert blanks in each FILE to tabs, writing to standard output.\n" msgstr "" "將每個 <檔案> 中的空格轉換為 tab，並在標準輸出顯示結果。\n" "如果沒有指定 <檔案> 或 <檔案> 是 -，則由標準輸入讀取資料。\n" @@ -10878,8 +11228,8 @@ msgstr "" #: src/uniq.c:187 msgid "" -" -D, --all-repeated[=METHOD] print all duplicate lines\n" -" groups can be delimited with an empty line\n" +" -D, --all-repeated[=METHOD] print all duplicate lines;\n" +" groups can be delimited with an empty line;\n" " METHOD={none(default),prepend,separate}\n" msgstr "" @@ -10890,7 +11240,7 @@ msgstr "" #: src/uniq.c:195 msgid "" " --group[=METHOD] show all items, separating groups with an empty " -"line\n" +"line;\n" " METHOD={separate(default),prepend,append,both}\n" msgstr "" @@ -11030,11 +11380,6 @@ msgid "" "an uninterruptible sleep state also contribute to the load average.\n" msgstr "" -#: src/uptime.c:212 -#, c-format -msgid "\n" -msgstr "" - #: src/uptime.c:214 #, fuzzy, c-format msgid "" @@ -11054,13 +11399,17 @@ msgstr "" "根據 <檔案> 的內容，顯示哪些人目然已經登入系統。如果沒有指定，\n" "預設會使用 %s。使用 %s 作為檔案也很普遍。\n" -#: src/wc.c:117 -#, fuzzy +#: src/wc.c:118 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" +"more than one FILE is specified. A word is a non-zero-length sequence of\n" +"characters delimited by white space.\n" +msgstr "" + +#: src/wc.c:126 +#, fuzzy +msgid "" +"\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" @@ -11073,14 +11422,23 @@ msgstr "" " -m, --chars 印出字元數目\n" " -l, --lines 印出行數\n" -#: src/wc.c:128 +#: src/wc.c:134 +#, fuzzy 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" +" -L, --max-line-length print the maximum display width\n" " -w, --words print the word counts\n" msgstr "" +" --files0-from=F 總結檔案 F 中所有檔案名稱的使用量，而且所有檔案名稱\n" +" 都以 NUL 字元作為結尾\n" +" -H 即 --si，但會顯示警告訊息；稍後會將本選項的意義更改\n" +" 為和 --dereference-args (-D) 一樣\n" +" -h, --human-readable 以容易理解的格式印出檔案大小 (例如 1K 234M 2G)\n" +" --si 類似 -h，但取 1000 的次方而不是 1024\n" +" -k 即 --block-size=1K\n" +" -l, --count-links 將所有實際鏈結 (hard link) 的大小也計算在內\n" #: src/who.c:210 msgid " old " @@ -11215,9 +11573,9 @@ msgid "" "\n" msgstr "" -#: src/whoami.c:91 +#: src/whoami.c:87 #, fuzzy, c-format -msgid "%s: cannot find name for user ID %lu\n" +msgid "cannot find name for user ID %lu" msgstr "%s: 找不到 UID 為 %lu 的用戶名稱\n" #: src/yes.c:41 @@ -11238,6 +11596,104 @@ msgstr "" "重複印出同一句指定的 <字串>，如沒有指定則預設為 ‘y’。\n" "\n" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "-t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, " +#~ "read\n" +#~ "standard input.\n" +#~ msgstr "" +#~ "\n" +#~ "如果沒有指定<檔案>或<檔案>是 -，則由標準輸入讀取資料。\n" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "With no FILE, or when FILE is -, read standard input. Default is '-" +#~ "F /'.\n" +#~ msgstr "" +#~ "\n" +#~ "如果沒有指定<檔案>或<檔案>是 -，則由標準輸入讀取資料。\n" + +#~ msgid "" +#~ "Force changed blocks to disk, update the super block.\n" +#~ "\n" +#~ msgstr "" +#~ "強迫將已更改的資料寫入磁碟，並更新 super block。\n" +#~ "\n" + +#, fuzzy +#~ msgid "ignoring all arguments" +#~ msgstr "參數過多" + +#~ msgid "%s: invalid number" +#~ msgstr "%s：無效的號碼" + +#~ msgid "invalid number %s" +#~ msgstr "數字 %s 無效" + +#~ msgid "%s: %s is so large that it is not representable" +#~ msgstr "%s：%s過大，因此無法表示" + +#~ msgid "number of lines" +#~ msgstr "行數" + +#~ msgid "number of bytes" +#~ msgstr "位元組數目" + +#, fuzzy +#~ msgid "%s: invalid number to ignore" +#~ msgstr "%s：無效的行數" + +#~ msgid "%s: invalid number of bytes" +#~ msgstr "%s：無效的位元組數目" + +#~ msgid "%s: invalid number of lines" +#~ msgstr "%s：無效的行數" + +#, fuzzy +#~ msgid "number in %s is too large" +#~ msgstr "%s 過長" + +#~ msgid "%s: invalid number of seconds" +#~ msgstr "%s：無效的秒數" + +#, fuzzy +#~ msgid "failed to %s supplemental groups" +#~ msgstr "無法改變所屬群組至沒有名稱的群組" + +#, fuzzy +#~ 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 "" +#~ "\n" +#~ "將 SIGUSR1 訊號送至執行中的 ‘dd’ 進程時，會在標準錯誤顯示 I/O 統計資料，\n" +#~ "然後繼續執行程式。\n" +#~ "\n" +#~ " $ dd if=/dev/zero of=/dev/null& pid=$!\n" +#~ " $ kill -USR1 $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" +#~ "選項包括：\n" +#~ "\n" + +#, fuzzy +#~ msgid "%s: cannot find name for user ID %lu\n" +#~ msgstr "%s: 找不到 UID 為 %lu 的用戶名稱\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s：不合法的選項 ─ %c\n" @@ -11259,9 +11715,6 @@ msgstr "" #~ "這是自由軟體；請參考原始碼的版權聲明。本軟體不提供任何保證，甚至不會包括\n" #~ "可售性或適用於任何特定目的的保證。\n" -#~ msgid "Usage: %s [OPTION] [FILE]...\n" -#~ msgstr "用法：%s [選項] [檔案]...\n" - #~ msgid "closing standard output" #~ msgstr "關閉標準輸出" @@ -12173,9 +12626,6 @@ msgstr "" #~ msgid "Page %d" #~ msgstr "第 %d 頁" -#~ msgid "invalid number" -#~ msgstr "無效的數字" - #~ msgid "%c: invalid suffix character in obsolescent option" #~ msgstr "%c：在已過時的選項中含有無效的後置字元" diff --git a/src/base64.c b/src/base64.c index b0656043..ec3fe072 100644 --- a/src/base64.c +++ b/src/base64.c @@ -1,5 +1,5 @@ /* Base64 encode/decode strings or files. - Copyright (C) 2004-2014 Free Software Foundation, Inc. + Copyright (C) 2004-2015 Free Software Foundation, Inc. This file is part of Base64. @@ -62,6 +62,7 @@ Usage: %s [OPTION]... [FILE]\n\ Base64 encode or decode FILE, or standard input, to standard output.\n\ "), program_name); + emit_stdin_note (); emit_mandatory_arg_note (); fputs (_("\ @@ -75,15 +76,12 @@ Base64 encode or decode FILE, or standard input, to standard output.\n\ fputs (VERSION_OPTION_DESCRIPTION, stdout); fputs (_("\ \n\ -With no FILE, or when FILE is -, read standard input.\n"), stdout); - fputs (_("\ -\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"), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); @@ -321,5 +319,5 @@ main (int argc, char **argv) error (EXIT_FAILURE, errno, "%s", infile); } - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/basename.c b/src/basename.c index 95215399..71f75582 100644 --- a/src/basename.c +++ b/src/basename.c @@ -1,5 +1,5 @@ /* basename -- strip directory and suffix from file names - Copyright (C) 1990-2014 Free Software Foundation, Inc. + Copyright (C) 1990-2015 Free Software Foundation, Inc. This 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,7 +73,7 @@ Examples:\n\ %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n\ "), program_name, program_name, program_name, program_name); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -185,5 +185,5 @@ main (int argc, char **argv) perform_basename (argv[optind], optind + 2 == argc ? argv[optind + 1] : NULL, use_nuls); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/cat.c b/src/cat.c index 8aef79fa..948f1341 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-2014 Free Software Foundation, Inc. + Copyright (C) 1988-2015 Free Software Foundation, Inc. This 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,12 @@ Usage: %s [OPTION]... [FILE]...\n\ "), program_name); fputs (_("\ -Concatenate FILE(s), or standard input, to standard output.\n\ +Concatenate FILE(s) to standard output.\n\ +"), stdout); + + emit_stdin_note (); + + fputs (_("\ \n\ -A, --show-all equivalent to -vET\n\ -b, --number-nonblank number nonempty output lines, overrides -n\n\ @@ -107,10 +112,6 @@ Concatenate FILE(s), or standard input, to standard output.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - fputs (_("\ -\n\ -With no FILE, or when FILE is -, read standard input.\n\ -"), stdout); printf (_("\ \n\ Examples:\n\ @@ -118,7 +119,7 @@ Examples:\n\ %s Copy standard input to standard output.\n\ "), program_name, program_name); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -239,7 +240,7 @@ cat ( /* Pointer to the next character in the input buffer. */ char *bpin; - /* Pointer to the first non-valid byte in the input buffer, i.e. the + /* Pointer to the first non-valid byte in the input buffer, i.e., the current end of the buffer. */ char *eob; @@ -365,7 +366,7 @@ cat ( /* It was a real (not a sentinel) newline. */ /* Was the last line empty? - (i.e. have two or more consecutive newlines been read?) */ + (i.e., have two or more consecutive newlines been read?) */ if (++newlines > 0) { @@ -422,7 +423,7 @@ cat ( which means that the buffer is empty or that a proper newline has been found. */ - /* If quoting, i.e. at least one of -v, -e, or -t specified, + /* If quoting, i.e., at least one of -v, -e, or -t specified, scan for chars that need conversion. */ if (show_nonprinting) { @@ -527,8 +528,8 @@ main (int argc, char **argv) /* I-node number of the output. */ ino_t out_ino; - /* True if the output file should not be the same as any input file. */ - bool check_redirection = true; + /* True if the output is a regular file. */ + bool out_isreg; /* Nonzero if we have ever read standard input. */ bool have_read_stdin = false; @@ -637,25 +638,9 @@ main (int argc, char **argv) error (EXIT_FAILURE, errno, _("standard output")); outsize = io_blksize (stat_buf); - /* Input file can be output file for non-regular files. - fstat on pipes returns S_IFSOCK on some systems, S_IFIFO - on others, so the checking should not be done for those types, - and to allow things like cat < /dev/tty > /dev/tty, checking - is not done for device files either. */ - - if (S_ISREG (stat_buf.st_mode)) - { - out_dev = stat_buf.st_dev; - out_ino = stat_buf.st_ino; - } - else - { - check_redirection = false; -#ifdef lint /* Suppress 'used before initialized' warning. */ - out_dev = 0; - out_ino = 0; -#endif - } + out_dev = stat_buf.st_dev; + out_ino = stat_buf.st_ino; + out_isreg = S_ISREG (stat_buf.st_mode) != 0; if (! (number || show_ends || squeeze_blank)) { @@ -704,14 +689,13 @@ main (int argc, char **argv) fdadvise (input_desc, 0, 0, FADVISE_SEQUENTIAL); - /* Compare the device and i-node numbers of this input file with - the corresponding values of the (output file associated with) - stdout, and skip this input file if they coincide. Input - files cannot be redirected to themselves. */ + /* Don't copy a nonempty regular file to itself, as that would + merely exhaust the output device. It's better to catch this + error earlier rather than later. */ - if (check_redirection + if (out_isreg && stat_buf.st_dev == out_dev && stat_buf.st_ino == out_ino - && (input_desc != STDIN_FILENO)) + && lseek (input_desc, 0, SEEK_CUR) < stat_buf.st_size) { error (0, 0, _("%s: input file is output file"), infile); ok = false; @@ -780,5 +764,5 @@ main (int argc, char **argv) if (have_read_stdin && close (STDIN_FILENO) < 0) error (EXIT_FAILURE, errno, _("closing standard input")); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/chcon.c b/src/chcon.c index cda06612..bdf61373 100644 --- a/src/chcon.c +++ b/src/chcon.c @@ -1,5 +1,5 @@ /* chcon -- change security context of files - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This 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 @@ one takes effect.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -582,5 +582,5 @@ main (int argc, char **argv) ok = process_files (argv + optind, bit_flags | FTS_NOSTAT); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/chgrp.c b/src/chgrp.c index c7297c81..eb1887e6 100644 --- a/src/chgrp.c +++ b/src/chgrp.c @@ -1,5 +1,5 @@ /* chgrp -- change group ownership of files - Copyright (C) 1989-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -162,7 +162,7 @@ Examples:\n\ %s -hR staff /u Change the group of /u and subfiles to \"staff\".\n\ "), program_name, program_name); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -313,5 +313,5 @@ main (int argc, char **argv) chopt_free (&chopt); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/chmod.c b/src/chmod.c index 756ec5a4..5c6881c4 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -1,5 +1,5 @@ /* chmod -- change permission modes of files - Copyright (C) 1989-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -403,7 +403,7 @@ With --reference, change the mode of each FILE to that of RFILE.\n\ \n\ Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+'.\n\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -566,5 +566,5 @@ main (int argc, char **argv) ok = process_files (argv + optind, FTS_COMFOLLOW | FTS_PHYSICAL | FTS_DEFER_STAT); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/chown-core.c b/src/chown-core.c index cdcd53aa..e8a7d528 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-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This program is free 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 86b33cd2..315be109 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-2014 Free Software Foundation, Inc. + Copyright (C) 2000-2015 Free Software Foundation, Inc. This program is free 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 13a19233..ba1814b4 100644 --- a/src/chown.c +++ b/src/chown.c @@ -1,5 +1,5 @@ /* chown -- change user and group ownership of files - Copyright (C) 1989-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -147,7 +147,7 @@ Examples:\n\ %s -hR root /u Change the owner of /u and subfiles to \"root\".\n\ "), program_name, program_name, program_name); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -326,5 +326,5 @@ main (int argc, char **argv) chopt_free (&chopt); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/chroot.c b/src/chroot.c index fff0b533..42b45017 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-2014 Free Software Foundation, Inc. + Copyright (C) 1995-2015 Free Software Foundation, Inc. This 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,13 +49,15 @@ static inline bool gid_unset (gid_t gid) { return gid == (gid_t) -1; } enum { GROUPS = UCHAR_MAX + 1, - USERSPEC + USERSPEC, + SKIP_CHDIR }; static struct option const long_opts[] = { {"groups", required_argument, NULL, GROUPS}, {"userspec", required_argument, NULL, USERSPEC}, + {"skip-chdir", no_argument, NULL, SKIP_CHDIR}, {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, {NULL, 0, NULL, 0} @@ -160,20 +162,17 @@ parse_additional_groups (char const *groups, GETGROUPS_T **pgids, return ret; } +/* Return whether the passed path is equivalent to "/". + Note we don't compare against get_root_dev_ino() as "/" + could be bind mounted to a separate location. */ + static bool is_root (const char* dir) { - struct dev_ino root_ino; - if (! get_root_dev_ino (&root_ino)) - error (EXIT_CANCELED, errno, _("failed to get attributes of %s"), - quote ("/")); - - struct stat arg_st; - if (stat (dir, &arg_st) == -1) - error (EXIT_CANCELED, errno, _("failed to get attributes of %s"), - quote (dir)); - - return SAME_INODE (root_ino, arg_st); + char *resolved = canonicalize_file_name (dir); + bool is_res_root = resolved && STREQ ("/", resolved); + free (resolved); + return is_res_root; } void @@ -194,9 +193,14 @@ Run COMMAND with root directory set to NEWROOT.\n\ "), stdout); fputs (_("\ - --userspec=USER:GROUP specify user and group (ID or name) to use\n\ --groups=G_LIST specify supplementary groups as g1,g2,..,gN\n\ "), stdout); + fputs (_("\ + --userspec=USER:GROUP specify user and group (ID or name) to use\n\ +"), stdout); + printf (_("\ + --skip-chdir do not change working directory to %s\n\ +"), quote ("/")); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); @@ -204,7 +208,7 @@ Run COMMAND with root directory set to NEWROOT.\n\ \n\ If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -218,6 +222,7 @@ main (int argc, char **argv) char *userspec = NULL; char const *username = NULL; char const *groups = NULL; + bool skip_chdir = false; /* Parsed user and group IDs. */ uid_t uid = -1; @@ -254,6 +259,10 @@ main (int argc, char **argv) groups = optarg; break; + case SKIP_CHDIR: + skip_chdir = true; + break; + case_GETOPT_HELP_CHAR; case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); @@ -269,9 +278,17 @@ main (int argc, char **argv) usage (EXIT_CANCELED); } - /* Only do chroot specific actions if actually changing root. - The main difference here is that we don't change working dir. */ - if (! is_root (argv[optind])) + char const *newroot = argv[optind]; + bool is_oldroot = is_root (newroot); + + if (! is_oldroot && skip_chdir) + { + error (0, 0, _("option --skip-chdir only permitted if NEWROOT is old %s"), + quote ("/")); + usage (EXIT_CANCELED); + } + + if (! is_oldroot) { /* We have to look up users and groups twice. - First, outside the chroot to load potentially necessary passwd/group @@ -306,14 +323,14 @@ main (int argc, char **argv) n_gids = ngroups; } #endif + } - if (chroot (argv[optind]) != 0) - error (EXIT_CANCELED, errno, _("cannot change root directory to %s"), - argv[optind]); + if (chroot (newroot) != 0) + error (EXIT_CANCELED, errno, _("cannot change root directory to %s"), + quote (newroot)); - if (chdir ("/")) - error (EXIT_CANCELED, errno, _("cannot chdir to root directory")); - } + if (! skip_chdir && chdir ("/")) + error (EXIT_CANCELED, errno, _("cannot chdir to root directory")); if (argc == optind + 1) { @@ -366,7 +383,7 @@ main (int argc, char **argv) if (parse_additional_groups (groups, &in_gids, &n_gids, !n_gids) != 0) { if (! n_gids) - exit (EXIT_CANCELED); + return EXIT_CANCELED; /* else look-up outside the chroot worked, then go with those. */ } else @@ -392,8 +409,7 @@ main (int argc, char **argv) #endif if ((uid_set (uid) || groups) && setgroups (n_gids, gids) != 0) - error (EXIT_CANCELED, errno, _("failed to %s supplemental groups"), - gids ? "set" : "clear"); + error (EXIT_CANCELED, errno, _("failed to set supplemental groups")); free (in_gids); free (out_gids); @@ -407,9 +423,7 @@ main (int argc, char **argv) /* Execute the given command. */ execvp (argv[0], argv); - { - int exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE); - error (0, errno, _("failed to run command %s"), quote (argv[0])); - exit (exit_status); - } + int exit_status = errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE; + error (0, errno, _("failed to run command %s"), quote (argv[0])); + return exit_status; } diff --git a/src/cksum.c b/src/cksum.c index 8db39a48..458827b8 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-2014 Free Software Foundation, Inc. + Copyright (C) 1992-2015 Free Software Foundation, Inc. This 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,7 +102,7 @@ main (void) crc_remainder (i * 5 + 5)); } printf ("\n};\n"); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } #else /* !CRCTAB */ @@ -271,7 +271,7 @@ Print CRC checksum and byte counts of each FILE.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -312,7 +312,7 @@ main (int argc, char **argv) if (have_read_stdin && fclose (stdin) == EOF) error (EXIT_FAILURE, errno, "-"); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } #endif /* !CRCTAB */ diff --git a/src/comm.c b/src/comm.c index 5a3eec68..ea7a2841 100644 --- a/src/comm.c +++ b/src/comm.c @@ -1,5 +1,5 @@ /* comm -- compare two sorted files line by line. - Copyright (C) 1986-2014 Free Software Foundation, Inc. + Copyright (C) 1986-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -109,6 +109,10 @@ Compare sorted files FILE1 and FILE2 line by line.\n\ "), stdout); fputs (_("\ \n\ +When FILE1 or FILE2 (not both) is -, read standard input.\n\ +"), stdout); + fputs (_("\ +\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\ @@ -141,7 +145,7 @@ Examples:\n\ %s -3 file1 file2 Print lines in file1 not in file2, and vice versa.\n\ "), program_name, program_name); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -443,7 +447,7 @@ main (int argc, char **argv) compare_files (argv + optind); if (issued_disorder_warning[0] || issued_disorder_warning[1]) - exit (EXIT_FAILURE); + return EXIT_FAILURE; else - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/copy.c b/src/copy.c index 26d5bdd2..5fe69ea3 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-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This 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,6 +70,10 @@ # include "verror.h" #endif +#if HAVE_LINUX_FALLOC_H +# include +#endif + #ifndef HAVE_FCHOWN # define HAVE_FCHOWN false # define fchown(fd, uid, gid) (-1) @@ -100,7 +104,7 @@ rpl_mkfifo (char const *file, mode_t mode) /* LINK_FOLLOWS_SYMLINKS is tri-state; if it is -1, we don't know how link() behaves, so assume we can't hardlink symlinks in that case. */ -#if defined HAVE_LINKAT || ! LINK_FOLLOWS_SYMLINKS +#if (defined HAVE_LINKAT && ! LINKAT_SYMLINK_NOTSUP) || ! LINK_FOLLOWS_SYMLINKS # define CAN_HARDLINK_SYMLINKS 1 #else # define CAN_HARDLINK_SYMLINKS 0 @@ -145,6 +149,53 @@ utimens_symlink (char const *file, struct timespec const *timespec) return err; } +/* Attempt to punch a hole to avoid any permanent + speculative preallocation on file systems such as XFS. + Return values as per fallocate(2) except ENOSYS etc. are ignored. */ + +static int +punch_hole (int fd, off_t offset, off_t length) +{ + int ret = 0; +#if HAVE_FALLOCATE +# if defined FALLOC_FL_PUNCH_HOLE && defined FALLOC_FL_KEEP_SIZE + ret = fallocate (fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, + offset, length); + if (ret < 0 && (is_ENOTSUP (errno) || errno == ENOSYS)) + ret = 0; +# endif +#endif + return ret; +} + +/* Create a hole at the end of a file, + avoiding preallocation if requested. */ + +static bool +create_hole (int fd, char const *name, bool punch_holes, off_t size) +{ + off_t file_end = lseek (fd, size, SEEK_CUR); + + if (file_end < 0) + { + error (0, errno, _("cannot lseek %s"), quote (name)); + return false; + } + + /* Some file systems (like XFS) preallocate when write extending a file. + I.e., a previous write() may have preallocated extra space + that the seek above will not discard. A subsequent write() could + then make this allocation permanent. */ + if (punch_holes && punch_hole (fd, file_end - size, size) < 0) + { + error (0, errno, _("error deallocating %s"), quote (name)); + return false; + } + + return true; +} + + /* Copy the regular file open on SRC_FD/SRC_NAME to DST_FD/DST_NAME, honoring the MAKE_HOLES setting and using the BUF_SIZE-byte buffer BUF for temporary storage. Copy no more than MAX_N_READ bytes. @@ -158,18 +209,18 @@ utimens_symlink (char const *file, struct timespec const *timespec) bytes read. */ static bool sparse_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, - bool make_holes, + size_t hole_size, bool punch_holes, char const *src_name, char const *dst_name, uintmax_t max_n_read, off_t *total_n_read, bool *last_write_made_hole) { *last_write_made_hole = false; *total_n_read = 0; + bool make_hole = false; + off_t psize = 0; while (max_n_read) { - bool make_hole = false; - ssize_t n_read = read (src_fd, buf, MIN (max_n_read, buf_size)); if (n_read < 0) { @@ -183,50 +234,94 @@ sparse_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, max_n_read -= n_read; *total_n_read += n_read; - if (make_holes) + /* Loop over the input buffer in chunks of hole_size. */ + size_t csize = hole_size ? hole_size : buf_size; + char *cbuf = buf; + char *pbuf = buf; + + while (n_read) { - /* Sentinel required by is_nul(). */ - buf[n_read] = '\1'; -#ifdef lint - typedef uintptr_t word; - /* Usually, buf[n_read] is not the byte just before a "word" - (aka uintptr_t) boundary. In that case, the word-oriented - test below (*wp++ == 0) would read some uninitialized bytes - after the sentinel. To avoid false-positive reports about - this condition (e.g., from a tool like valgrind), set the - remaining bytes -- to any value. */ - memset (buf + n_read + 1, 0, sizeof (word) - 1); -#endif + bool prev_hole = make_hole; + csize = MIN (csize, n_read); - if ((make_hole = is_nul (buf, n_read))) + if (hole_size && csize) { - if (lseek (dest_fd, n_read, SEEK_CUR) < 0) + /* Setup sentinel required by is_nul(). */ + typedef uintptr_t word; + word isnul_tmp; + memcpy (&isnul_tmp, cbuf + csize, sizeof (word)); + memset (cbuf + csize, 1, sizeof (word)); + + make_hole = is_nul (cbuf, csize); + + memcpy (cbuf + csize, &isnul_tmp, sizeof (word)); + } + + bool transition = (make_hole != prev_hole) && psize; + bool last_chunk = (n_read == csize && ! make_hole) || ! csize; + + if (transition || last_chunk) + { + if (! transition) + psize += csize; + + if (! prev_hole) { - error (0, errno, _("cannot lseek %s"), quote (dst_name)); - return false; + if (full_write (dest_fd, pbuf, psize) != psize) + { + error (0, errno, _("error writing %s"), quote (dst_name)); + return false; + } + } + else + { + if (! create_hole (dest_fd, dst_name, punch_holes, psize)) + return false; } - } - } - if (!make_hole) - { - size_t n = n_read; - if (full_write (dest_fd, buf, n) != n) + pbuf = cbuf; + psize = csize; + + if (last_chunk) + { + if (! csize) + n_read = 0; /* Finished processing buffer. */ + + if (transition) + csize = 0; /* Loop again to deal with last chunk. */ + else + psize = 0; /* Reset for next read loop. */ + } + } + else /* Coalesce writes/seeks. */ { - error (0, errno, _("error writing %s"), quote (dst_name)); - return false; + if (psize <= OFF_T_MAX - csize) + psize += csize; + else + { + error (0, 0, _("overflow reading %s"), quote (src_name)); + return false; + } } - /* It is tempting to return early here upon a short read from a - regular file. That would save the final read syscall for each - file. Unfortunately that doesn't work for certain files in - /proc with linux kernels from at least 2.6.9 .. 2.6.29. */ + n_read -= csize; + cbuf += csize; } *last_write_made_hole = make_hole; + + /* It's tempting to break early here upon a short read from + a regular file. That would save the final read syscall + for each file. Unfortunately that doesn't work for + certain files in /proc or /sys with linux kernels. */ } - return true; + /* Ensure a trailing hole is created, so that subsequent + calls of sparse_copy() start at the correct offset. */ + if (make_hole && ! create_hole (dest_fd, dst_name, punch_holes, psize)) + return false; + else + return true; } /* Perform the O(1) btrfs clone operation, if possible. @@ -251,7 +346,7 @@ clone_file (int dest_fd, int src_fd) /* Write N_BYTES zero bytes to file descriptor FD. Return true if successful. Upon write failure, set errno and return false. */ static bool -write_zeros (int fd, uint64_t n_bytes) +write_zeros (int fd, off_t n_bytes) { static char *zeros; static size_t nz = IO_BUFSIZE; @@ -272,7 +367,7 @@ write_zeros (int fd, uint64_t n_bytes) while (n_bytes) { - uint64_t n = MIN (nz, n_bytes); + size_t n = MIN (nz, n_bytes); if ((full_write (fd, zeros, n)) != n) return false; n_bytes -= n; @@ -290,13 +385,14 @@ write_zeros (int fd, uint64_t n_bytes) return false. */ static bool extent_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, - off_t src_total_size, enum Sparse_type sparse_mode, + size_t hole_size, off_t src_total_size, + enum Sparse_type sparse_mode, char const *src_name, char const *dst_name, bool *require_normal_copy) { struct extent_scan scan; off_t last_ext_start = 0; - uint64_t last_ext_len = 0; + off_t last_ext_len = 0; /* Keep track of the output position. We may need this at the end, for a final ftruncate. */ @@ -330,8 +426,8 @@ extent_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, for (i = 0; i < scan.ei_count || empty_extent; i++) { off_t ext_start; - uint64_t ext_len; - uint64_t hole_size; + off_t ext_len; + off_t ext_hole_size; if (i < scan.ei_count) { @@ -345,11 +441,11 @@ extent_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, ext_len = 0; } - hole_size = ext_start - last_ext_start - last_ext_len; + ext_hole_size = ext_start - last_ext_start - last_ext_len; wrote_hole_at_eof = false; - if (hole_size) + if (ext_hole_size) { if (lseek (src_fd, ext_start, SEEK_SET) < 0) { @@ -362,11 +458,10 @@ extent_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, if ((empty_extent && sparse_mode == SPARSE_ALWAYS) || (!empty_extent && sparse_mode != SPARSE_NEVER)) { - if (lseek (dest_fd, ext_start, SEEK_SET) < 0) - { - error (0, errno, _("cannot lseek %s"), quote (dst_name)); - goto fail; - } + if (! create_hole (dest_fd, dst_name, + sparse_mode == SPARSE_ALWAYS, + ext_hole_size)) + goto fail; wrote_hole_at_eof = true; } else @@ -374,9 +469,9 @@ extent_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, /* When not inducing holes and when there is a hole between the end of the previous extent and the beginning of the current one, write zeros to the destination file. */ - off_t nzeros = hole_size; + off_t nzeros = ext_hole_size; if (empty_extent) - nzeros = MIN (src_total_size - dest_pos, hole_size); + nzeros = MIN (src_total_size - dest_pos, ext_hole_size); if (! write_zeros (dest_fd, nzeros)) { @@ -391,7 +486,7 @@ extent_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, last_ext_start = ext_start; /* Treat an unwritten but allocated extent much like a hole. - I.E. don't read, but don't convert to a hole in the destination, + I.e., don't read, but don't convert to a hole in the destination, unless SPARSE_ALWAYS. */ /* For now, do not treat FIEMAP_EXTENT_UNWRITTEN specially, because that (in combination with no sync) would lead to data @@ -410,8 +505,8 @@ extent_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, last_ext_len = ext_len; if ( ! sparse_copy (src_fd, dest_fd, buf, buf_size, - sparse_mode == SPARSE_ALWAYS, - src_name, dst_name, ext_len, &n_read, + sparse_mode == SPARSE_ALWAYS ? hole_size: 0, + true, src_name, dst_name, ext_len, &n_read, &wrote_hole_at_eof)) goto fail; @@ -453,6 +548,13 @@ extent_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, return false; } + if (sparse_mode == SPARSE_ALWAYS && dest_pos < src_total_size + && punch_hole (dest_fd, dest_pos, src_total_size - dest_pos) < 0) + { + error (0, errno, _("error deallocating %s"), quote (dst_name)); + return false; + } + return true; } @@ -1105,12 +1207,13 @@ copy_reg (char const *src_name, char const *dst_name, size_t buf_alignment = lcm (getpagesize (), sizeof (word)); size_t buf_alignment_slop = sizeof (word) + buf_alignment - 1; size_t buf_size = io_blksize (sb); + size_t hole_size = ST_BLKSIZE (sb); fdadvise (source_desc, 0, 0, FADVISE_SEQUENTIAL); /* Deal with sparse files. */ bool make_holes = false; - bool sparse_src = false; + bool sparse_src = is_probably_sparse (&src_open_sb); if (S_ISREG (sb.st_mode)) { @@ -1123,7 +1226,6 @@ copy_reg (char const *src_name, char const *dst_name, blocks. If the file has fewer blocks than would normally be needed for a file of its size, then at least one of the blocks in the file is a hole. */ - sparse_src = is_probably_sparse (&src_open_sb); if (x->sparse_mode == SPARSE_AUTO && sparse_src) make_holes = true; } @@ -1164,9 +1266,9 @@ copy_reg (char const *src_name, char const *dst_name, standard copy only if the initial extent scan fails. If the '--sparse=never' option is specified, write all data but use any extents to read more efficiently. */ - if (extent_copy (source_desc, dest_desc, buf, buf_size, + if (extent_copy (source_desc, dest_desc, buf, buf_size, hole_size, src_open_sb.st_size, - S_ISREG (sb.st_mode) ? x->sparse_mode : SPARSE_NEVER, + make_holes ? x->sparse_mode : SPARSE_NEVER, src_name, dst_name, &normal_copy_required)) goto preserve_metadata; @@ -1179,12 +1281,16 @@ copy_reg (char const *src_name, char const *dst_name, off_t n_read; bool wrote_hole_at_eof; - if ( ! sparse_copy (source_desc, dest_desc, buf, buf_size, - make_holes, src_name, dst_name, - UINTMAX_MAX, &n_read, - &wrote_hole_at_eof) - || (wrote_hole_at_eof - && ftruncate (dest_desc, n_read) < 0)) + if (! sparse_copy (source_desc, dest_desc, buf, buf_size, + make_holes ? hole_size : 0, + x->sparse_mode == SPARSE_ALWAYS, src_name, dst_name, + UINTMAX_MAX, &n_read, + &wrote_hole_at_eof)) + { + return_val = false; + goto close_src_and_dst_desc; + } + else if (wrote_hole_at_eof && ftruncate (dest_desc, n_read) < 0) { error (0, errno, _("failed to extend %s"), quote (dst_name)); return_val = false; @@ -1300,20 +1406,12 @@ close_src_desc: copy a regular file onto a symlink that points to it. Try to minimize the cost of this function in the common case. Set *RETURN_NOW if we've determined that the caller has no more - work to do and should return successfully, right away. - - Set *UNLINK_SRC if we've determined that the caller wants to do - 'rename (a, b)' where 'a' and 'b' are distinct hard links to the same - file. In that case, the caller should try to unlink 'a' and then return - successfully. Ideally, we wouldn't have to do that, and we'd be - able to rely on rename to remove the source file. However, POSIX - mistakenly requires that such a rename call do *nothing* and return - successfully. */ + work to do and should return successfully, right away. */ static bool same_file_ok (char const *src_name, struct stat const *src_sb, char const *dst_name, struct stat const *dst_sb, - const struct cp_options *x, bool *return_now, bool *unlink_src) + const struct cp_options *x, bool *return_now) { const struct stat *src_sb_link; const struct stat *dst_sb_link; @@ -1324,7 +1422,6 @@ same_file_ok (char const *src_name, struct stat const *src_sb, bool same = SAME_INODE (*src_sb, *dst_sb); *return_now = false; - *unlink_src = false; /* FIXME: this should (at the very least) be moved into the following if-block. More likely, it should be removed, because it inhibits @@ -1356,14 +1453,11 @@ same_file_ok (char const *src_name, struct stat const *src_sb, /* Here we have two symlinks that are hard-linked together, and we're not making backups. In this unusual case, simply returning true would lead to mv calling "rename(A,B)", - which would do nothing and return 0. I.e., A would - not be removed. Hence, the solution is to tell the - caller that all it must do is unlink A and return. */ + which would do nothing and return 0. */ if (same_link) { - *unlink_src = true; *return_now = true; - return true; + return ! x->move_mode; } } @@ -1431,6 +1525,7 @@ same_file_ok (char const *src_name, struct stat const *src_sb, return true; } + /* FIXME: What about case insensitive file systems ? */ return ! same_name (src_name, dst_name); } @@ -1451,27 +1546,21 @@ same_file_ok (char const *src_name, struct stat const *src_sb, return true; #endif - /* They may refer to the same file if we're in move mode and the - target is a symlink. That is ok, since we remove any existing - destination file before opening it -- via 'rename' if they're on - the same file system, via 'unlink (DST_NAME)' otherwise. - It's also ok if they're distinct hard links to the same file. */ if (x->move_mode || x->unlink_dest_before_opening) { + /* They may refer to the same file if we're in move mode and the + target is a symlink. That is ok, since we remove any existing + destination file before opening it -- via 'rename' if they're on + the same file system, via 'unlink (DST_NAME)' otherwise. */ if (S_ISLNK (dst_sb_link->st_mode)) return true; + /* It's not ok if they're distinct hard links to the same file as + this causes a race condition and we may lose data in this case. */ if (same_link && 1 < dst_sb_link->st_nlink && ! same_name (src_name, dst_name)) - { - if (x->move_mode) - { - *unlink_src = true; - *return_now = true; - } - return true; - } + return ! x->move_mode; } /* If neither is a symlink, then it's ok as long as they aren't @@ -1832,11 +1921,10 @@ copy_internal (char const *src_name, char const *dst_name, { /* Here, we know that dst_name exists, at least to the point that it is stat'able or lstat'able. */ bool return_now; - bool unlink_src; have_dst_lstat = !use_stat; if (! same_file_ok (src_name, &src_sb, dst_name, &dst_sb, - x, &return_now, &unlink_src)) + x, &return_now)) { error (0, 0, _("%s and %s are the same file"), quote_n (0, src_name), quote_n (1, dst_name)); @@ -1895,22 +1983,14 @@ copy_internal (char const *src_name, char const *dst_name, cp and mv treat -i and -f differently. */ if (x->move_mode) { - if (abandon_move (x, dst_name, &dst_sb) - || (unlink_src && unlink (src_name) == 0)) + if (abandon_move (x, dst_name, &dst_sb)) { /* Pretend the rename succeeded, so the caller (mv) doesn't end up removing the source file. */ if (rename_succeeded) *rename_succeeded = true; - if (unlink_src && x->verbose) - printf (_("removed %s\n"), quote (src_name)); return true; } - if (unlink_src) - { - error (0, errno, _("cannot remove %s"), quote (src_name)); - return false; - } } else { @@ -2187,7 +2267,20 @@ copy_internal (char const *src_name, char const *dst_name, *copy_into_self = true; goto un_backup; } - else if (x->dereference == DEREF_ALWAYS) + else if (same_name (dst_name, earlier_file)) + { + error (0, 0, _("warning: source directory %s " + "specified more than once"), + quote (top_level_src_name)); + /* We only do backups in move mode and for non dirs, + and in move mode this won't be the issue as the source will + be missing for subsequent attempts. + There we just warn and return here. */ + return true; + } + else if (x->dereference == DEREF_ALWAYS + || (command_line_arg + && x->dereference == DEREF_COMMAND_LINE_ARGUMENTS)) { /* This happens when e.g., encountering a directory for the second or subsequent time via symlinks when cp is invoked diff --git a/src/copy.h b/src/copy.h index bf194d91..bff5ff83 100644 --- a/src/copy.h +++ b/src/copy.h @@ -1,5 +1,5 @@ /* core functions for copying files and directories - Copyright (C) 1989-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -254,7 +254,7 @@ struct cp_options that was specified on the command line. Use it to avoid clobbering source files in commands like this: rm -rf a b c; mkdir a b c; touch a/f b/f; mv a/f b/f c - For now, it protects only regular files when copying (i.e. not renaming). + For now, it protects only regular files when copying (i.e., not renaming). When renaming, it protects all non-directories. Use dest_info_init to initialize it, or set it to NULL to disable this feature. */ diff --git a/src/coreutils-arch.c b/src/coreutils-arch.c index 899cc937..fa35f261 100644 --- a/src/coreutils-arch.c +++ b/src/coreutils-arch.c @@ -1,5 +1,5 @@ /* arch -- wrapper to uname with the right uname_mode. - Copyright (C) 2014 Free Software Foundation, Inc. + Copyright (C) 2014-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,11 +22,12 @@ #include "uname.h" /* Ensure that the main for uname is declared even if the tool is not being built in this single-binary. */ -int _single_binary_main_uname (int argc, char** argv) ATTRIBUTE_NORETURN; -int _single_binary_main_arch (int argc, char** argv) ATTRIBUTE_NORETURN; +int single_binary_main_uname (int argc, char **argv); +int single_binary_main_arch (int argc, char **argv); -int _single_binary_main_arch (int argc, char** argv) +int +single_binary_main_arch (int argc, char **argv) { uname_mode = UNAME_ARCH; - _single_binary_main_uname (argc, argv); + return single_binary_main_uname (argc, argv); } diff --git a/src/coreutils-dir.c b/src/coreutils-dir.c index 4b488f41..a90aebf8 100644 --- a/src/coreutils-dir.c +++ b/src/coreutils-dir.c @@ -1,5 +1,5 @@ /* dir -- wrapper to ls with the right ls_mode. - Copyright (C) 2014 Free Software Foundation, Inc. + Copyright (C) 2014-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,11 +22,12 @@ #include "ls.h" /* Ensure that the main for ls is declared even if the tool is not being built in this single-binary. */ -int _single_binary_main_ls (int argc, char** argv) ATTRIBUTE_NORETURN; -int _single_binary_main_dir (int argc, char** argv) ATTRIBUTE_NORETURN; +int single_binary_main_ls (int argc, char **argv); +int single_binary_main_dir (int argc, char **argv); -int _single_binary_main_dir (int argc, char** argv) +int +single_binary_main_dir (int argc, char **argv) { ls_mode = LS_MULTI_COL; - _single_binary_main_ls (argc, argv); + return single_binary_main_ls (argc, argv); } diff --git a/src/coreutils-vdir.c b/src/coreutils-vdir.c index 036367f6..393447a7 100644 --- a/src/coreutils-vdir.c +++ b/src/coreutils-vdir.c @@ -1,5 +1,5 @@ /* vdir -- wrapper to ls with the right ls_mode. - Copyright (C) 2014 Free Software Foundation, Inc. + Copyright (C) 2014-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,11 +22,12 @@ #include "ls.h" /* Ensure that the main for ls is declared even if the tool is not being built in this single-binary. */ -int _single_binary_main_ls (int argc, char** argv) ATTRIBUTE_NORETURN; -int _single_binary_main_vdir (int argc, char** argv) ATTRIBUTE_NORETURN; +int single_binary_main_ls (int argc, char **argv); +int single_binary_main_vdir (int argc, char **argv); -int _single_binary_main_vdir (int argc, char** argv) +int +single_binary_main_vdir (int argc, char** argv) { ls_mode = LS_LONG_FORMAT; - _single_binary_main_ls (argc, argv); + return single_binary_main_ls (argc, argv); } diff --git a/src/coreutils.c b/src/coreutils.c index c459b1d6..7f868347 100644 --- a/src/coreutils.c +++ b/src/coreutils.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 Free Software Foundation, Inc. +/* Copyright (C) 2014-2015 Free Software Foundation, Inc. This 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 @@ needs to match the one passed as CFLAGS on single-binary.mk (generated by gen-single-binary.sh). */ # define SINGLE_BINARY_PROGRAM(prog_name_str, main_name) \ - int _single_binary_main_##main_name (int, char**) ATTRIBUTE_NORETURN; + int single_binary_main_##main_name (int, char **); # include "coreutils.h" # undef SINGLE_BINARY_PROGRAM #endif @@ -46,9 +46,6 @@ #define AUTHORS \ proper_name ("Alex Deymo") -void -launch_program (const char *prog_name, int prog_argc, char **prog_argv); - static struct option const long_options[] = { {GETOPT_HELP_OPTION_DECL}, @@ -73,29 +70,31 @@ Execute the PROGRAM_NAME built-in program with the given PARAMETERS.\n\ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - printf ("\n\ -Built-in programs:\n" #ifdef SINGLE_BINARY -/* XXX: Ideally we#d like to present "install" here, not "ginstall". */ +/* XXX: Ideally we'd like to present "install" here, not "ginstall". */ + char const *prog_name_list = # define SINGLE_BINARY_PROGRAM(prog_name_str, main_name) " " prog_name_str # include "coreutils.h" # undef SINGLE_BINARY_PROGRAM + ; + printf ("\n\ +Built-in programs:\n\ +%s\n", prog_name_list); #endif - "\n"); printf (_("\ \n\ Use: '%s --coreutils-prog=PROGRAM_NAME --help' for individual program help.\n"), program_name); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } -void +static void launch_program (const char *prog_name, int prog_argc, char **prog_argv) { - int (*prog_main)(int, char **) = NULL; + int (*prog_main) (int, char **) = NULL; /* Ensure that at least one parameter was passed. */ if (!prog_argc || !prog_argv || !prog_argv[0] || !prog_name) @@ -103,10 +102,10 @@ launch_program (const char *prog_name, int prog_argc, char **prog_argv) #ifdef SINGLE_BINARY if (false); - /* Lookup the right main program. */ + /* Look up the right main program. */ # define SINGLE_BINARY_PROGRAM(prog_name_str, main_name) \ else if (STREQ (prog_name_str, prog_name)) \ - prog_main = _single_binary_main_##main_name; + prog_main = single_binary_main_##main_name; # include "coreutils.h" # undef SINGLE_BINARY_PROGRAM #endif @@ -124,7 +123,7 @@ launch_program (const char *prog_name, int prog_argc, char **prog_argv) prctl (PR_SET_MM_ARG_START, prog_argv[0]); #endif - exit ((*prog_main) (prog_argc, prog_argv)); + exit (prog_main (prog_argc, prog_argv)); } int diff --git a/src/cp-hash.c b/src/cp-hash.c index 258aff76..02a8f557 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-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This program is free 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 99cafa7f..0ffd12d8 100644 --- a/src/cp.c +++ b/src/cp.c @@ -1,5 +1,5 @@ /* cp.c -- file copying (main routines) - Copyright (C) 1989-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -268,7 +268,7 @@ 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\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -1191,7 +1191,7 @@ main (int argc, char **argv) "without an SELinux-enabled kernel")); /* FIXME: This handles new files. But what about existing files? - I.E. if updating a tree, new files would have the specified context, + I.e., if updating a tree, new files would have the specified context, but shouldn't existing files be updated for consistency like this? if (scontext) restorecon (dst_path, 0, true); @@ -1214,7 +1214,9 @@ main (int argc, char **argv) ok = do_copy (argc - optind, argv + optind, target_directory, no_target_directory, &x); +#ifdef lint forget_all (); +#endif - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/csplit.c b/src/csplit.c index a30f09b7..d966df57 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-2014 Free Software Foundation, Inc. + Copyright (C) 1991-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,6 +33,7 @@ #include "quote.h" #include "safe-read.h" #include "stdio--.h" +#include "xdectoint.h" #include "xstrtol.h" /* The official name of this program (e.g., no 'g' prefix). */ @@ -1332,7 +1333,6 @@ int main (int argc, char **argv) { int optc; - unsigned long int val; initialize_main (&argc, &argv); set_program_name (argv[0]); @@ -1366,10 +1366,8 @@ main (int argc, char **argv) break; case 'n': - if (xstrtoul (optarg, NULL, 10, &val, "") != LONGINT_OK - || MIN (INT_MAX, SIZE_MAX) < val) - error (EXIT_FAILURE, 0, _("%s: invalid number"), optarg); - digits = val; + digits = xdectoimax (optarg, 0, MIN (INT_MAX, SIZE_MAX), "", + _("invalid number"), 0); break; case 's': @@ -1466,7 +1464,7 @@ main (int argc, char **argv) cleanup_fatal (); } - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } void @@ -1483,6 +1481,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\ +"), stdout); + fputs (_("\ +\n\ +Read standard input if FILE is -\n\ "), stdout); emit_mandatory_arg_note (); @@ -1504,10 +1506,7 @@ and output byte counts of each piece to standard output.\n\ fputs (VERSION_OPTION_DESCRIPTION, stdout); fputs (_("\ \n\ -Read standard input if FILE is -. Each PATTERN may be:\n\ -"), stdout); - fputs (_("\ -\n\ +Each PATTERN may be:\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\ @@ -1516,7 +1515,7 @@ Read standard input if FILE is -. Each PATTERN may be:\n\ \n\ A line OFFSET is a required '+' or '-' followed by a positive integer.\n\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } diff --git a/src/cut.c b/src/cut.c index 312551f0..4f80ebd4 100644 --- a/src/cut.c +++ b/src/cut.c @@ -1,5 +1,5 @@ /* cut - remove parts of lines of files - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. Copyright (C) 1984 David M. Ihnat This program is free software: you can redistribute it and/or modify @@ -177,6 +177,7 @@ Usage: %s OPTION... [FILE]...\n\ Print selected parts of lines from each FILE to standard output.\n\ "), stdout); + emit_stdin_note (); emit_mandatory_arg_note (); fputs (_("\ @@ -214,10 +215,8 @@ Each range is one of:\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\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -425,7 +424,7 @@ set_fields (const char *fieldstr) return field_found; } -/* Increment *ITEM_IDX (i.e. a field or byte index), +/* Increment *ITEM_IDX (i.e., a field or byte index), and if required CURRENT_RP. */ static inline void @@ -827,5 +826,5 @@ main (int argc, char **argv) ok = false; } - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/date.c b/src/date.c index ef04cb58..eaee8b27 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-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -132,26 +132,32 @@ Display the current time in the given FORMAT, or set the system date.\n\ 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\ - TIMESPEC='date' for date only (the default),\n\ - 'hours', 'minutes', 'seconds', or 'ns' for date\n\ - and time to the indicated precision.\n\ + -d, --date=STRING display time described by STRING, not 'now'\n\ + -f, --file=DATEFILE like --date; once for each line of DATEFILE\n\ "), stdout); fputs (_("\ - -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\ + -I[FMT], --iso-8601[=FMT] output date/time in ISO 8601 format.\n\ + FMT='date' for date only (the default),\n\ + 'hours', 'minutes', 'seconds', or 'ns'\n\ + for date and time to the indicated precision.\n\ + Example: 2006-08-14T02:34:56-0600\n\ "), stdout); fputs (_("\ - --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 (UTC)\n\ + -R, --rfc-2822 output date and time in RFC 2822 format.\n\ + Example: Mon, 14 Aug 2006 02:34:56 -0600\n\ +"), stdout); + fputs (_("\ + --rfc-3339=FMT output date/time in RFC 3339 format.\n\ + FMT='date', 'seconds', or 'ns'\n\ + for date and time to the indicated precision.\n\ + Example: 2006-08-14 02:34:56-06:00\n\ +"), stdout); + fputs (_("\ + -r, --reference=FILE display the last modification time of FILE\n\ +"), stdout); + fputs (_("\ + -s, --set=STRING set time described by STRING\n\ + -u, --utc, --universal print or set Coordinated Universal Time (UTC)\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); @@ -255,7 +261,7 @@ Show the time on the west coast of the US (use tzselect(1) to find TZ)\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\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -540,7 +546,7 @@ main (int argc, char **argv) ok &= show_date (format, when); } - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } /* Display the date and/or time in WHEN according to the format specified diff --git a/src/dcgen b/src/dcgen index a994be4d..b3adc790 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-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # This program is free 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 1e387f3d..e6472947 100644 --- a/src/dd.c +++ b/src/dd.c @@ -1,5 +1,5 @@ /* dd -- convert a file while copying it. - Copyright (C) 1985-2014 Free Software Foundation, Inc. + Copyright (C) 1985-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -34,6 +34,7 @@ #include "long-options.h" #include "quote.h" #include "quotearg.h" +#include "verror.h" #include "xstrtol.h" #include "xtime.h" @@ -132,11 +133,13 @@ enum C_SPARSE = 0200000 }; -/* Status bit masks. */ +/* Status levels. */ enum { - STATUS_NOXFER = 01, - STATUS_NONE = 02 + STATUS_NONE = 1, + STATUS_NOXFER = 2, + STATUS_DEFAULT = 3, + STATUS_PROGRESS = 4 }; /* The name of the input file, or NULL for the standard input. */ @@ -188,7 +191,7 @@ static int input_flags = 0; static int output_flags = 0; /* Status flags for what is printed to stderr. */ -static int status_flags = 0; +static int status_level = STATUS_DEFAULT; /* If nonzero, filter characters through the translation table. */ static bool translation_needed = false; @@ -211,6 +214,12 @@ static uintmax_t w_bytes = 0; /* Time that dd started. */ static xtime_t start_time; +/* Previous time for periodic progress. */ +static xtime_t previous_time; + +/* Whether a '\n' is pending after writing progress. */ +static bool newline_pending; + /* True if input is seekable. */ static bool input_seekable; @@ -373,8 +382,9 @@ static struct symbol_value const flags[] = /* Status, for status="...". */ static struct symbol_value const statuses[] = { - {"noxfer", STATUS_NOXFER}, {"none", STATUS_NONE}, + {"noxfer", STATUS_NOXFER}, + {"progress", STATUS_PROGRESS}, {"", 0} }; @@ -517,6 +527,25 @@ maybe_close_stdout (void) _exit (EXIT_FAILURE); } +/* Like error() but handle any pending newline. */ + +static void _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 4)) +nl_error (int status, int errnum, const char *fmt, ...) +{ + if (newline_pending) + { + fputc ('\n', stderr); + newline_pending = false; + } + + va_list ap; + va_start (ap, fmt); + verror (status, errnum, fmt, ap); + va_end (ap); +} + +#define error nl_error + void usage (int status) { @@ -546,8 +575,10 @@ 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=WHICH WHICH info to suppress outputting to stderr;\n\ - 'noxfer' suppresses transfer stats, 'none' suppresses all\n\ + status=LEVEL The LEVEL of information to print to stderr;\n\ + 'none' suppresses everything but error messages,\n\ + 'noxfer' suppresses the final transfer statistics,\n\ + 'progress' shows periodic transfer statistics\n\ "), stdout); fputs (_("\ \n\ @@ -627,27 +658,19 @@ Each FLAG symbol may be:\n\ "), stdout); { - char const *siginfo_name = (SIGINFO == SIGUSR1 ? "USR1" : "INFO"); printf (_("\ \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\ -"), - siginfo_name, siginfo_name); +"), SIGINFO == SIGUSR1 ? "USR1" : "INFO"); } fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -673,8 +696,8 @@ alloc_ibuf (void) char *real_buf = malloc (input_blocksize + INPUT_BLOCK_SLOP); if (!real_buf) error (EXIT_FAILURE, 0, - _("memory exhausted by input buffer of size %zu bytes (%s)"), - input_blocksize, human_size (input_blocksize)); + _("memory exhausted by input buffer of size %"PRIuMAX" bytes (%s)"), + (uintmax_t) input_blocksize, human_size (input_blocksize)); real_buf += SWAB_ALIGN_OFFSET; /* allow space for swab */ @@ -695,8 +718,9 @@ alloc_obuf (void) char *real_obuf = malloc (output_blocksize + OUTPUT_BLOCK_SLOP); if (!real_obuf) error (EXIT_FAILURE, 0, - _("memory exhausted by output buffer of size %zu bytes (%s)"), - output_blocksize, human_size (output_blocksize)); + _("memory exhausted by output buffer of size %"PRIuMAX + " bytes (%s)"), + (uintmax_t) output_blocksize, human_size (output_blocksize)); obuf = ptr_align (real_obuf, page_size); } else @@ -732,8 +756,7 @@ multiple_bits_set (int i) /* Print transfer statistics. */ static void -print_stats (void) -{ +print_xfer_stats (xtime_t progress_time) { char hbuf[LONGEST_HUMAN_READABLE + 1]; int human_opts = (human_autoscale | human_round_to_nearest @@ -741,23 +764,8 @@ print_stats (void) double delta_s; char const *bytes_per_second; - if (status_flags & STATUS_NONE) - return; - - fprintf (stderr, - _("%"PRIuMAX"+%"PRIuMAX" records in\n" - "%"PRIuMAX"+%"PRIuMAX" records out\n"), - r_full, r_partial, w_full, w_partial); - - if (r_truncate != 0) - fprintf (stderr, - ngettext ("%"PRIuMAX" truncated record\n", - "%"PRIuMAX" truncated records\n", - select_plural (r_truncate)), - r_truncate); - - if (status_flags & STATUS_NOXFER) - return; + if (progress_time) + fputc ('\r', stderr); /* Use integer arithmetic to compute the transfer rate, since that makes it easy to use SI abbreviations. */ @@ -769,7 +777,8 @@ print_stats (void) w_bytes, human_readable (w_bytes, hbuf, human_opts, 1, 1)); - xtime_t now = gethrxtime (); + xtime_t now = progress_time ? progress_time : gethrxtime (); + if (start_time < now) { double XTIME_PRECISIONe0 = XTIME_PRECISION; @@ -795,7 +804,42 @@ print_stats (void) 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. */ - fprintf (stderr, _(", %g s, %s/s\n"), delta_s, bytes_per_second); + char const *time_fmt = _(", %g s, %s/s\n"); + if (progress_time) + time_fmt = _(", %.6f s, %s/s"); /* OK with '\r' as increasing width. */ + fprintf (stderr, time_fmt, delta_s, bytes_per_second); + + newline_pending = !!progress_time; +} + +static void +print_stats (void) +{ + if (status_level == STATUS_NONE) + return; + + if (newline_pending) + { + fputc ('\n', stderr); + newline_pending = false; + } + + fprintf (stderr, + _("%"PRIuMAX"+%"PRIuMAX" records in\n" + "%"PRIuMAX"+%"PRIuMAX" records out\n"), + r_full, r_partial, w_full, w_partial); + + if (r_truncate != 0) + fprintf (stderr, + ngettext ("%"PRIuMAX" truncated record\n", + "%"PRIuMAX" truncated records\n", + select_plural (r_truncate)), + r_truncate); + + if (status_level == STATUS_NOXFER) + return; + + print_xfer_stats (0); } /* An ordinary signal was received; arrange for the program to exit. */ @@ -830,11 +874,7 @@ install_signal_handlers (void) struct sigaction act; sigemptyset (&caught_signals); if (catch_siginfo) - { - sigaction (SIGINFO, NULL, &act); - if (act.sa_handler != SIG_IGN) - sigaddset (&caught_signals, SIGINFO); - } + sigaddset (&caught_signals, SIGINFO); sigaction (SIGINT, NULL, &act); if (act.sa_handler != SIG_IGN) sigaddset (&caught_signals, SIGINT); @@ -843,6 +883,9 @@ install_signal_handlers (void) if (sigismember (&caught_signals, SIGINFO)) { act.sa_handler = siginfo_handler; + /* Note we don't use SA_RESTART here and instead + handle EINTR explicitly in iftruncate() etc. + to avoid blocking on noncommitted read()/write() calls. */ act.sa_flags = 0; sigaction (SIGINFO, &act, NULL); } @@ -856,7 +899,7 @@ install_signal_handlers (void) #else - if (catch_siginfo && signal (SIGINFO, SIG_IGN) != SIG_IGN) + if (catch_siginfo) { signal (SIGINFO, siginfo_handler); siginterrupt (SIGINFO, 1); @@ -917,12 +960,18 @@ process_signals (void) } } -static void ATTRIBUTE_NORETURN -quit (int code) +static void +finish_up (void) { cleanup (); print_stats (); process_signals (); +} + +static void ATTRIBUTE_NORETURN +quit (int code) +{ + finish_up (); exit (code); } @@ -938,7 +987,7 @@ cache_round (int fd, off_t len) if (len) { - off_t c_pending = *pending + len; + uintmax_t c_pending = *pending + len; *pending = c_pending % page_size; if (c_pending > *pending) len = c_pending - *pending; @@ -1027,6 +1076,10 @@ iread (int fd, char *buf, size_t size) } while (nread < 0 && errno == EINTR); + /* Short read may be due to received signal. */ + if (0 < nread && nread < size) + process_signals (); + if (0 < nread && warn_partial_read) { static ssize_t prev_nread; @@ -1034,7 +1087,7 @@ iread (int fd, char *buf, size_t size) if (0 < prev_nread && prev_nread < size) { uintmax_t prev = prev_nread; - if (!(status_flags & STATUS_NONE)) + if (status_level != STATUS_NONE) error (0, 0, ngettext (("warning: partial read (%"PRIuMAX" byte); " "suggest iflag=fullblock"), ("warning: partial read (%"PRIuMAX" bytes); " @@ -1085,7 +1138,7 @@ iwrite (int fd, char const *buf, size_t size) { int old_flags = fcntl (STDOUT_FILENO, F_GETFL); if (fcntl (STDOUT_FILENO, F_SETFL, old_flags & ~O_DIRECT) != 0 - && !(status_flags & STATUS_NONE)) + && status_level != STATUS_NONE) error (0, errno, _("failed to turn off O_DIRECT: %s"), quote (output_file)); @@ -1167,6 +1220,40 @@ write_output (void) oc = 0; } +/* Restart on EINTR from fd_reopen(). */ + +static int +ifd_reopen (int desired_fd, char const *file, int flag, mode_t mode) +{ + int ret; + + do + { + process_signals (); + ret = fd_reopen (desired_fd, file, flag, mode); + } + while (ret < 0 && errno == EINTR); + + return ret; +} + +/* Restart on EINTR from ftruncate(). */ + +static int +iftruncate (int fd, off_t length) +{ + int ret; + + do + { + process_signals (); + ret = ftruncate (fd, length); + } + while (ret < 0 && errno == EINTR); + + return ret; +} + /* Return true if STR is of the form "PATTERN" or "PATTERNDELIM...". */ static bool _GL_ATTRIBUTE_PURE @@ -1184,7 +1271,7 @@ operand_matches (char const *str, char const *pattern, char delim) static int parse_symbols (char const *str, struct symbol_value const *table, - char const *error_msgid) + bool exclusive, char const *error_msgid) { int value = 0; @@ -1206,7 +1293,10 @@ parse_symbols (char const *str, struct symbol_value const *table, } } - value |= entry->value; + if (exclusive) + value = entry->value; + else + value |= entry->value; if (!strcomma) break; str = strcomma + 1; @@ -1217,14 +1307,15 @@ parse_symbols (char const *str, struct symbol_value const *table, /* Return the value of STR, interpreted as a non-negative decimal integer, optionally multiplied by various values. - Set *INVALID if STR does not represent a number in this format. */ + Set *INVALID to a nonzero error value if STR does not represent a + number in this format. */ static uintmax_t -parse_integer (const char *str, bool *invalid) +parse_integer (const char *str, strtol_error *invalid) { uintmax_t n; char *suffix; - enum strtol_error e = xstrtoumax (str, &suffix, 10, &n, "bcEGkKMPTwYZ0"); + strtol_error e = xstrtoumax (str, &suffix, 10, &n, "bcEGkKMPTwYZ0"); if (e == LONGINT_INVALID_SUFFIX_CHAR && *suffix == 'x') { @@ -1232,7 +1323,7 @@ parse_integer (const char *str, bool *invalid) if (multiplier != 0 && n * multiplier / multiplier != n) { - *invalid = true; + *invalid = LONGINT_OVERFLOW; return 0; } @@ -1240,7 +1331,7 @@ parse_integer (const char *str, bool *invalid) } else if (e != LONGINT_OK) { - *invalid = true; + *invalid = e; return 0; } @@ -1281,40 +1372,46 @@ scanargs (int argc, char *const *argv) else if (operand_is (name, "of")) output_file = val; else if (operand_is (name, "conv")) - conversions_mask |= parse_symbols (val, conversions, + conversions_mask |= parse_symbols (val, conversions, false, N_("invalid conversion")); else if (operand_is (name, "iflag")) - input_flags |= parse_symbols (val, flags, + input_flags |= parse_symbols (val, flags, false, N_("invalid input flag")); else if (operand_is (name, "oflag")) - output_flags |= parse_symbols (val, flags, + output_flags |= parse_symbols (val, flags, false, N_("invalid output flag")); else if (operand_is (name, "status")) - status_flags |= parse_symbols (val, statuses, - N_("invalid status flag")); + status_level = parse_symbols (val, statuses, true, + N_("invalid status level")); else { - bool invalid = false; + strtol_error invalid = LONGINT_OK; uintmax_t n = parse_integer (val, &invalid); + uintmax_t n_min = 0; + uintmax_t n_max = UINTMAX_MAX; if (operand_is (name, "ibs")) { - invalid |= ! (0 < n && n <= MAX_BLOCKSIZE (INPUT_BLOCK_SLOP)); + n_min = 1; + n_max = MAX_BLOCKSIZE (INPUT_BLOCK_SLOP); input_blocksize = n; } else if (operand_is (name, "obs")) { - invalid |= ! (0 < n && n <= MAX_BLOCKSIZE (OUTPUT_BLOCK_SLOP)); + n_min = 1; + n_max = MAX_BLOCKSIZE (OUTPUT_BLOCK_SLOP); output_blocksize = n; } else if (operand_is (name, "bs")) { - invalid |= ! (0 < n && n <= MAX_BLOCKSIZE (INPUT_BLOCK_SLOP)); + n_min = 1; + n_max = MAX_BLOCKSIZE (INPUT_BLOCK_SLOP); blocksize = n; } else if (operand_is (name, "cbs")) { - invalid |= ! (0 < n && n <= SIZE_MAX); + n_min = 1; + n_max = SIZE_MAX; conversion_blocksize = n; } else if (operand_is (name, "skip")) @@ -1329,8 +1426,14 @@ scanargs (int argc, char *const *argv) usage (EXIT_FAILURE); } - if (invalid) - error (EXIT_FAILURE, 0, _("invalid number %s"), quote (val)); + if (n < n_min) + invalid = LONGINT_INVALID; + else if (n_max < n) + invalid = LONGINT_OVERFLOW; + + if (invalid != LONGINT_OK) + error (EXIT_FAILURE, invalid == LONGINT_OVERFLOW ? EOVERFLOW : 0, + "%s: %s", _("invalid number"), quote (val)); } } @@ -1578,11 +1681,11 @@ skip_via_lseek (char const *filename, int fdesc, off_t offset, int whence) && ioctl (fdesc, MTIOCGET, &s2) == 0 && MT_SAME_POSITION (s1, s2)) { - if (!(status_flags & STATUS_NONE)) + if (status_level != STATUS_NONE) error (0, 0, _("warning: working around lseek kernel bug for file " "(%s)\n of mt_type=0x%0lx -- " "see for the list of types"), - filename, s2.mt_type); + filename, s2.mt_type + 0Lu); errno = 0; new_position = -1; } @@ -1752,7 +1855,7 @@ advance_input_after_read_error (size_t nbytes) if (offset == input_offset) return true; diff = input_offset - offset; - if (! (0 <= diff && diff <= nbytes) && !(status_flags & STATUS_NONE)) + if (! (0 <= diff && diff <= nbytes) && status_level != STATUS_NONE) error (0, 0, _("warning: invalid file offset after failed read")); if (0 <= skip_via_lseek (input_file, STDIN_FILENO, diff, SEEK_CUR)) return true; @@ -1933,7 +2036,7 @@ dd_copy (void) The page alignment is necessary on any Linux kernel that supports either the SGI raw I/O patch or Steven Tweedies raw I/O patch. - It is necessary when accessing raw (i.e. character special) disk + It is necessary when accessing raw (i.e., character special) disk devices on Unixware or other SVR4-derived system. */ if (skip_records != 0 || skip_bytes != 0) @@ -1951,7 +2054,7 @@ dd_copy (void) 2. pipe has not enough data 3. partial reads */ if ((us_blocks || (!input_offset_overflow && us_bytes)) - && !(status_flags & STATUS_NONE)) + && status_level != STATUS_NONE) { error (0, 0, _("%s: cannot skip to specified offset"), quote (input_file)); @@ -1994,6 +2097,19 @@ dd_copy (void) while (1) { + if (status_level == STATUS_PROGRESS) + { + xtime_t progress_time = gethrxtime (); + uintmax_t delta_xtime = progress_time; + delta_xtime -= previous_time; + double XTIME_PRECISIONe0 = XTIME_PRECISION; + if (delta_xtime / XTIME_PRECISIONe0 > 1) + { + print_xfer_stats (progress_time); + previous_time = progress_time; + } + } + if (r_partial + r_full >= max_records + !!max_bytes) break; @@ -2018,7 +2134,7 @@ dd_copy (void) if (nread < 0) { - if (!(conversions_mask & C_NOERROR) || !(status_flags & STATUS_NONE)) + if (!(conversions_mask & C_NOERROR) || status_level != STATUS_NONE) error (0, errno, _("error reading %s"), quote (input_file)); if (conversions_mask & C_NOERROR) @@ -2164,9 +2280,9 @@ dd_copy (void) if (S_ISREG (stdout_stat.st_mode) || S_TYPEISSHM (&stdout_stat)) { off_t output_offset = lseek (STDOUT_FILENO, 0, SEEK_CUR); - if (output_offset > stdout_stat.st_size) + if (0 <= output_offset && stdout_stat.st_size < output_offset) { - if (ftruncate (STDOUT_FILENO, output_offset) != 0) + if (iftruncate (STDOUT_FILENO, output_offset) != 0) { error (0, errno, _("failed to truncate to %" PRIdMAX " bytes" @@ -2242,7 +2358,7 @@ main (int argc, char **argv) } else { - if (fd_reopen (STDIN_FILENO, input_file, O_RDONLY | input_flags, 0) < 0) + if (ifd_reopen (STDIN_FILENO, input_file, O_RDONLY | input_flags, 0) < 0) error (EXIT_FAILURE, errno, _("failed to open %s"), quote (input_file)); } @@ -2269,8 +2385,8 @@ main (int argc, char **argv) need to read to satisfy a 'seek=' request. If we can't read the file, go ahead with write-only access; it might work. */ if ((! seek_records - || fd_reopen (STDOUT_FILENO, output_file, O_RDWR | opts, perms) < 0) - && (fd_reopen (STDOUT_FILENO, output_file, O_WRONLY | opts, perms) + || ifd_reopen (STDOUT_FILENO, output_file, O_RDWR | opts, perms) < 0) + && (ifd_reopen (STDOUT_FILENO, output_file, O_WRONLY | opts, perms) < 0)) error (EXIT_FAILURE, errno, _("failed to open %s"), quote (output_file)); @@ -2287,7 +2403,7 @@ main (int argc, char **argv) " (%lu-byte) blocks"), seek_records, obs); - if (ftruncate (STDOUT_FILENO, size) != 0) + if (iftruncate (STDOUT_FILENO, size) != 0) { /* Complain only when ftruncate fails on a regular file, a directory, or a shared memory object, as POSIX 1003.1-2004 @@ -2310,7 +2426,7 @@ main (int argc, char **argv) } } - start_time = gethrxtime (); + start_time = previous_time = gethrxtime (); exit_status = dd_copy (); @@ -2340,5 +2456,6 @@ main (int argc, char **argv) invalidate_cache (STDOUT_FILENO, 0); } - quit (exit_status); + finish_up (); + return exit_status; } diff --git a/src/df.c b/src/df.c index 3ef5d33b..2e541b95 100644 --- a/src/df.c +++ b/src/df.c @@ -1,5 +1,5 @@ /* df - summarize free disk space - Copyright (C) 1991-2014 Free Software Foundation, Inc. + Copyright (C) 1991-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -605,7 +605,7 @@ excluded_fstype (const char *fstype) /* Filter mount list by skipping duplicate entries. In the case of duplicates - based on the device number - the mount entry - with a '/' in its me_devname (i.e. not pseudo name like tmpfs) wins. + 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. With DEVICES_ONLY == true (set with df -a), only update the global device_list, rather than filtering the global mount_list. */ @@ -622,13 +622,14 @@ filter_mount_list (bool devices_only) struct devlist *devlist; struct mount_entry *discard_me = NULL; - /* TODO: On Linux we might avoid this stat() and another in get_dev() - by using the device IDs available from /proc/self/mountinfo. - read_file_system_list() could populate me_dev from those - for efficiency and accuracy. */ - if (-1 == stat (me->me_mountdir, &buf)) + /* Avoid stating remote file systems as that may hang. + On Linux we probably have me_dev populated from /proc/self/mountinfo, + however we still stat() in case another device was mounted later. */ + if ((me->me_remote && show_local_fs) + || -1 == stat (me->me_mountdir, &buf)) { - /* Stat failed - add ME to be able to complain about it later. */ + /* If remote, and showing just local, add ME for filtering later. + If stat failed; add ME to be able to complain about it later. */ buf.st_dev = me->me_dev; } else @@ -640,13 +641,28 @@ filter_mount_list (bool devices_only) if (devlist) { - /* ...let the shorter mountdir win. */ - if ((strchr (me->me_devname, '/') - && ! strchr (devlist->me->me_devname, '/')) - || (strlen (devlist->me->me_mountdir) - > strlen (me->me_mountdir)) - /* or one overmounted on a different device. */ - || ! STREQ (devlist->me->me_devname, me->me_devname)) + if (! print_grand_total && me->me_remote && devlist->me->me_remote + && ! STREQ (devlist->me->me_devname, me->me_devname)) + { + /* Don't discard remote entries with different locations, + as these are more likely to be explicitly mounted. + However avoid this when producing a total to give + a more accurate value in that case. */ + } + else if ((strchr (me->me_devname, '/') + /* let "real" devices with '/' in the name win. */ + && ! strchr (devlist->me->me_devname, '/')) + /* let a shorter mountdir win. */ + || (strlen (devlist->me->me_mountdir) + > strlen (me->me_mountdir)) + /* let an entry overmounted on a new device win... */ + || (! STREQ (devlist->me->me_devname, me->me_devname) + /* ... but only when matching an existing mnt point, + to avoid problematic replacement when given + inaccurate mount lists, seen with some chroot + environments for example. */ + && STREQ (me->me_mountdir, + devlist->me->me_mountdir))) { /* Discard mount entry for existing device. */ discard_me = devlist->me; @@ -698,17 +714,17 @@ filter_mount_list (bool devices_only) } /* Search a mount entry list for device id DEV. - Return the corresponding device name if found or NULL if not. */ + Return the corresponding mount entry if found or NULL if not. */ -static char const * _GL_ATTRIBUTE_PURE -devname_for_dev (dev_t dev) +static struct mount_entry const * _GL_ATTRIBUTE_PURE +me_for_dev (dev_t dev) { struct devlist *dl = device_list; while (dl) { if (dl->dev_num == dev) - return dl->me->me_devname; + return dl->me; dl = dl->next; } @@ -910,6 +926,7 @@ get_dev (char const *disk, char const *mount_point, char const* file, return; fstype = "-"; + fsu.fsu_bavail_top_bit_set = false; fsu.fsu_blocksize = fsu.fsu_blocks = fsu.fsu_bfree = fsu.fsu_bavail = fsu.fsu_files = fsu.fsu_ffree = UINTMAX_MAX; } @@ -923,14 +940,18 @@ get_dev (char const *disk, char const *mount_point, char const* file, else if (process_all && show_all_fs) { /* Ensure we don't output incorrect stats for over-mounted directories. - Discard stats when the device name doesn't match. */ + Discard stats when the device name doesn't match. Though don't + discard when used and current mount entries are both remote due + to the possibility of aliased host names or exports. */ struct stat sb; if (stat (stat_file, &sb) == 0) { - char const * devname = devname_for_dev (sb.st_dev); - if (devname && ! STREQ (devname, disk)) + struct mount_entry const * dev_me = me_for_dev (sb.st_dev); + if (dev_me && ! STREQ (dev_me->me_devname, disk) + && (! dev_me->me_remote || ! me_remote)) { fstype = "-"; + fsu.fsu_bavail_top_bit_set = false; fsu.fsu_blocksize = fsu.fsu_blocks = fsu.fsu_bfree = fsu.fsu_bavail = fsu.fsu_files = fsu.fsu_ffree = UINTMAX_MAX; } @@ -1391,11 +1412,10 @@ or all file systems by default.\n\ /* TRANSLATORS: The thousands and decimal separators are best adjusted to an appropriate default for your locale. */ fputs (_("\ - -a, --all include dummy file systems\n\ + -a, --all include pseudo, duplicate, inaccessible 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 powers of 1024 (e.g., 1023M)\n\ -H, --si print sizes in powers of 1000 (e.g., 1.1G)\n\ "), stdout); @@ -1411,6 +1431,12 @@ or all file systems by default.\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\ +"), stdout); + fputs (_("\ + --total elide all entries insignificant to available space,\n\ + and produce a grand total\n\ +"), stdout); + fputs (_("\ -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\ @@ -1425,7 +1451,7 @@ 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', 'file' and 'target' (see info page).\n\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -1615,7 +1641,7 @@ main (int argc, char **argv) } } if (match) - exit (EXIT_FAILURE); + return EXIT_FAILURE; } if (optind < argc) @@ -1686,6 +1712,8 @@ main (int argc, char **argv) for (i = optind; i < argc; ++i) if (argv[i]) get_entry (argv[i], &stats[i - optind]); + + IF_LINT (free (stats)); } else get_all_entries (); @@ -1709,5 +1737,5 @@ main (int argc, char **argv) IF_LINT (free (columns)); - exit (exit_status); + return exit_status; } diff --git a/src/dircolors.c b/src/dircolors.c index 99605367..3a03f1f2 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-2014 Free Software Foundation, Inc. + Copyright (C) 1996-2015 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 @@ -111,7 +111,7 @@ 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\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); @@ -442,7 +442,7 @@ main (int argc, char **argv) usage (EXIT_FAILURE); } - if (!print_database < argc) + if ((!print_database) < argc) { error (0, 0, _("extra operand %s"), quote (argv[!print_database])); if (print_database) @@ -503,5 +503,5 @@ main (int argc, char **argv) } } - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/dircolors.h b/src/dircolors.h index 7b501079..74a4494e 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','4',' ','F','r','e','e',' ','S','o','f','t','w','a','r','e',' ','F','o','u','n','d','a','t','i','o','n',',',' ','I','n','c','.',0, + '#',' ','C','o','p','y','r','i','g','h','t',' ','(','C',')',' ','1','9','9','6','-','2','0','1','5',' ','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, @@ -84,7 +84,8 @@ static char const G_line[] = 'D','O','O','R',' ','0','1',';','3','5',' ','#',' ','d','o','o','r',0, 'B','L','K',' ','4','0',';','3','3',';','0','1',' ','#',' ','b','l','o','c','k',' ','d','e','v','i','c','e',' ','d','r','i','v','e','r',0, 'C','H','R',' ','4','0',';','3','3',';','0','1',' ','#',' ','c','h','a','r','a','c','t','e','r',' ','d','e','v','i','c','e',' ','d','r','i','v','e','r',0, - 'O','R','P','H','A','N',' ','4','0',';','3','1',';','0','1',' ','#',' ','s','y','m','l','i','n','k',' ','t','o',' ','n','o','n','e','x','i','s','t','e','n','t',' ','f','i','l','e',',',' ','o','r',' ','n','o','n','-','s','t','a','t','\'','a','b','l','e',' ','f','i','l','e',0, + 'O','R','P','H','A','N',' ','4','0',';','3','1',';','0','1',' ','#',' ','s','y','m','l','i','n','k',' ','t','o',' ','n','o','n','e','x','i','s','t','e','n','t',' ','f','i','l','e',',',' ','o','r',' ','n','o','n','-','s','t','a','t','\'','a','b','l','e',' ','f','i','l','e',' ','.','.','.',0, + 'M','I','S','S','I','N','G',' ','0','0',' ','#',' ','.','.','.',' ','a','n','d',' ','t','h','e',' ','f','i','l','e','s',' ','t','h','e','y',' ','p','o','i','n','t',' ','t','o',0, 'S','E','T','U','I','D',' ','3','7',';','4','1',' ','#',' ','f','i','l','e',' ','t','h','a','t',' ','i','s',' ','s','e','t','u','i','d',' ','(','u','+','s',')',0, 'S','E','T','G','I','D',' ','3','0',';','4','3',' ','#',' ','f','i','l','e',' ','t','h','a','t',' ','i','s',' ','s','e','t','g','i','d',' ','(','g','+','s',')',0, 'C','A','P','A','B','I','L','I','T','Y',' ','3','0',';','4','1',' ','#',' ','f','i','l','e',' ','w','i','t','h',' ','c','a','p','a','b','i','l','i','t','y',0, @@ -195,8 +196,6 @@ static char const G_line[] = '.','c','g','m',' ','0','1',';','3','5',0, '.','e','m','f',' ','0','1',';','3','5',0, '#',' ','h','t','t','p',':','/','/','w','i','k','i','.','x','i','p','h','.','o','r','g','/','i','n','d','e','x','.','p','h','p','/','M','I','M','E','_','T','y','p','e','s','_','a','n','d','_','F','i','l','e','_','E','x','t','e','n','s','i','o','n','s',0, - '.','a','x','v',' ','0','1',';','3','5',0, - '.','a','n','x',' ','0','1',';','3','5',0, '.','o','g','v',' ','0','1',';','3','5',0, '.','o','g','x',' ','0','1',';','3','5',0, '#',' ','a','u','d','i','o',' ','f','o','r','m','a','t','s',0, @@ -213,8 +212,8 @@ static char const G_line[] = '.','r','a',' ','0','0',';','3','6',0, '.','w','a','v',' ','0','0',';','3','6',0, '#',' ','h','t','t','p',':','/','/','w','i','k','i','.','x','i','p','h','.','o','r','g','/','i','n','d','e','x','.','p','h','p','/','M','I','M','E','_','T','y','p','e','s','_','a','n','d','_','F','i','l','e','_','E','x','t','e','n','s','i','o','n','s',0, - '.','a','x','a',' ','0','0',';','3','6',0, '.','o','g','a',' ','0','0',';','3','6',0, + '.','o','p','u','s',' ','0','0',';','3','6',0, '.','s','p','x',' ','0','0',';','3','6',0, '.','x','s','p','f',' ','0','0',';','3','6',0, }; diff --git a/src/dircolors.hin b/src/dircolors.hin index 89ebf5a1..277711f7 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-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 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. @@ -86,7 +86,8 @@ SOCK 01;35 # socket DOOR 01;35 # door BLK 40;33;01 # block device driver CHR 40;33;01 # character device driver -ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file +ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ... +MISSING 00 # ... and the files they point to SETUID 37;41 # file that is setuid (u+s) SETGID 30;43 # file that is setgid (g+s) CAPABILITY 30;41 # file with capability @@ -203,8 +204,6 @@ EXEC 01;32 .emf 01;35 # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions -.axv 01;35 -.anx 01;35 .ogv 01;35 .ogx 01;35 @@ -223,7 +222,7 @@ EXEC 01;32 .wav 00;36 # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions -.axa 00;36 .oga 00;36 +.opus 00;36 .spx 00;36 .xspf 00;36 diff --git a/src/dirname.c b/src/dirname.c index e0599a36..bdc22302 100644 --- a/src/dirname.c +++ b/src/dirname.c @@ -1,6 +1,6 @@ /* dirname -- strip suffix from file name - Copyright (C) 1990-2014 Free Software Foundation, Inc. + Copyright (C) 1990-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -69,7 +69,7 @@ Examples:\n\ %s stdio.h -> \".\"\n\ "), program_name, program_name, program_name); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -132,5 +132,5 @@ main (int argc, char **argv) putchar (use_nuls ? '\0' :'\n'); } - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/du.c b/src/du.c index 0966326b..86827f80 100644 --- a/src/du.c +++ b/src/du.c @@ -1,5 +1,5 @@ /* du -- summarize disk usage - Copyright (C) 1988-2014 Free Software Foundation, Inc. + Copyright (C) 1988-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -283,7 +283,7 @@ Usage: %s [OPTION]... [FILE]...\n\ or: %s [OPTION]... --files0-from=F\n\ "), program_name, program_name); fputs (_("\ -Summarize disk usage of each FILE, recursively for directories.\n\ +Summarize disk usage of the set of FILEs, recursively for directories.\n\ "), stdout); emit_mandatory_arg_note (); @@ -351,7 +351,7 @@ Summarize disk usage of each FILE, recursively for directories.\n\ fputs (VERSION_OPTION_DESCRIPTION, stdout); emit_blocksize_note ("DU"); emit_size_note (); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -419,6 +419,27 @@ print_size (const struct duinfo *pdui, const char *string) fflush (stdout); } +/* This function checks whether any of the directories in the cycle that + fts detected is a mount point. */ + +static bool +mount_point_in_fts_cycle (FTSENT const *ent) +{ + FTSENT const *cycle_ent = ent->fts_cycle; + + while (ent && ent != cycle_ent) + { + if (di_set_lookup (di_mnt, ent->fts_statp->st_dev, + ent->fts_statp->st_ino) > 0) + { + return true; + } + ent = ent->fts_parent; + } + + return false; +} + /* This function is called once for every file system object that fts encounters. fts does a depth-first traversal. This function knows that and accumulates per-directory totals based on changes in @@ -516,7 +537,7 @@ process_file (FTS *fts, FTSENT *ent) case FTS_DC: /* If not following symlinks and not a (bind) mount point. */ if (cycle_warning_required (fts, ent) - && ! di_set_lookup (di_mnt, sb->st_dev, sb->st_ino)) + && ! mount_point_in_fts_cycle (ent)) { emit_cycle_warning (file); return false; @@ -947,9 +968,9 @@ main (int argc, char **argv) { /* Ignore "posix-" prefix, for compatibility with ls. */ static char const posix_prefix[] = "posix-"; - while (strncmp (time_style, posix_prefix, sizeof posix_prefix - 1) - == 0) - time_style += sizeof posix_prefix - 1; + static const size_t prefix_len = sizeof posix_prefix - 1; + while (STREQ_LEN (time_style, posix_prefix, prefix_len)) + time_style += prefix_len; } } @@ -1108,5 +1129,5 @@ main (int argc, char **argv) if (print_grand_total) print_size (&tot_dui, _("total")); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/echo.c b/src/echo.c index 93f4a820..222b12bf 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-2014 Free Software Foundation, Inc. + Copyright (C) 1987-2015 Free Software Foundation, Inc. This 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,7 @@ If -e is in effect, the following sequences are recognized:\n\ \\xHH byte with hexadecimal value HH (1 to 2 digits)\n\ "), stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -136,7 +136,7 @@ main (int argc, char **argv) { version_etc (stdout, PROGRAM_NAME, PACKAGE_NAME, Version, AUTHORS, (char *) NULL); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } } @@ -204,7 +204,7 @@ just_echo: { case 'a': c = '\a'; break; case 'b': c = '\b'; break; - case 'c': exit (EXIT_SUCCESS); + case 'c': return EXIT_SUCCESS; case 'e': c = '\x1B'; break; case 'f': c = '\f'; break; case 'n': c = '\n'; break; @@ -268,5 +268,5 @@ just_echo: if (display_return) putchar ('\n'); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/env.c b/src/env.c index 2b37d986..270d08e3 100644 --- a/src/env.c +++ b/src/env.c @@ -1,5 +1,5 @@ /* env - run a program in a modified environment - Copyright (C) 1986-2014 Free Software Foundation, Inc. + Copyright (C) 1986-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -69,7 +69,7 @@ Set each NAME to VALUE in the environment and run COMMAND.\n\ \n\ A mere - implies -i. If no COMMAND, print the resulting environment.\n\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -144,7 +144,7 @@ main (int argc, char **argv) char *const *e = environ; while (*e) printf ("%s%c", *e++, opt_nul_terminate_output ? '\0' : '\n'); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } if (opt_nul_terminate_output) @@ -155,9 +155,7 @@ main (int argc, char **argv) execvp (argv[optind], &argv[optind]); - { - int exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE); - error (0, errno, "%s", argv[optind]); - exit (exit_status); - } + int exit_status = errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE; + error (0, errno, "%s", argv[optind]); + return exit_status; } diff --git a/src/expand.c b/src/expand.c index 082b5d4e..0a40a1a8 100644 --- a/src/expand.c +++ b/src/expand.c @@ -1,5 +1,5 @@ /* expand - convert tabs to spaces - Copyright (C) 1989-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This 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,9 +106,9 @@ Usage: %s [OPTION]... [FILE]...\n\ program_name); fputs (_("\ Convert tabs in each FILE to spaces, writing to standard output.\n\ -With no FILE, or when FILE is -, read standard input.\n\ "), stdout); + emit_stdin_note (); emit_mandatory_arg_note (); fputs (_("\ @@ -120,7 +120,7 @@ With no FILE, or when FILE is -, read standard input.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -426,5 +426,5 @@ main (int argc, char **argv) if (have_read_stdin && fclose (stdin) != 0) error (EXIT_FAILURE, errno, "-"); - exit (exit_status); + return exit_status; } diff --git a/src/expr.c b/src/expr.c index a97663a1..b368e237 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1,5 +1,5 @@ /* expr -- evaluate expressions. - Copyright (C) 1986-2014 Free Software Foundation, Inc. + Copyright (C) 1986-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -265,7 +265,7 @@ Pattern matches return the string matched between \\( and \\) or null; if\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\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -326,7 +326,7 @@ main (int argc, char **argv) syntax_error (); printv (v); - exit (null (v)); + return null (v); } /* Return a VALUE for I. */ diff --git a/src/extent-scan.c b/src/extent-scan.c index 805997a7..e0a065e7 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This 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,6 +140,8 @@ extent_scan_read (struct extent_scan *scan) assert (fm_extents[i].fe_logical <= OFF_T_MAX - fm_extents[i].fe_length); + verify (sizeof last_ei->ext_flags >= sizeof fm_extents->fe_flags); + if (si && last_ei->ext_flags == (fm_extents[i].fe_flags & ~FIEMAP_EXTENT_LAST) && (last_ei->ext_logical + last_ei->ext_length diff --git a/src/extent-scan.h b/src/extent-scan.h index fa800343..e91ad433 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This 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,10 +26,10 @@ struct extent_info off_t ext_logical; /* Extent length. */ - uint64_t ext_length; + off_t ext_length; /* Extent flags, use it for FIEMAP only, or set it to zero. */ - uint32_t ext_flags; + unsigned int ext_flags; }; /* Structure used to reserve extent scan information per file. */ @@ -42,10 +42,10 @@ struct extent_scan off_t scan_start; /* Flags to use for scan. */ - uint32_t fm_flags; + unsigned int fm_flags; /* How many extent info returned for a scan. */ - uint32_t ei_count; + size_t ei_count; /* If true, fall back to a normal copy, either set by the failure of ioctl(2) for FIEMAP or lseek(2) with SEEK_DATA. */ diff --git a/src/extract-magic b/src/extract-magic index 5b6f6185..1061dd55 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free 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 63924d54..1d7d7c8d 100644 --- a/src/factor.c +++ b/src/factor.c @@ -1,5 +1,5 @@ /* factor -- print prime factors of n. - Copyright (C) 1986-2014 Free Software Foundation, Inc. + Copyright (C) 1986-2015 Free Software Foundation, Inc. This 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,7 @@ #include "system.h" #include "error.h" +#include "full-write.h" #include "quote.h" #include "readtokens.h" #include "xstrtol.h" @@ -1811,9 +1812,9 @@ isqrt2 (uintmax_t nh, uintmax_t nl) } /* 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 MAGIC64 0x0202021202030213ULL +#define MAGIC63 0x0402483012450293ULL +#define MAGIC65 0x218a019866014613ULL #define MAGIC11 0x23b /* Return the square root if the input is a square, otherwise 0. */ @@ -2055,8 +2056,9 @@ factor_using_squfof (uintmax_t n1, uintmax_t n0, struct factors *factors) div_smallq (q, rem, S+P, Q); P1 = S - rem; /* P1 = q*Q - P */ + IF_LINT (assert (q > 0 && Q > 0)); + #if STAT_SQUFOF - assert (q > 0); q_freq[0]++; q_freq[MIN (q, Q_FREQ_SIZE)]++; #endif @@ -2322,13 +2324,100 @@ strto2uintmax (uintmax_t *hip, uintmax_t *lop, const char *s) return err; } +/* Structure and routines for buffering and outputting full lines, + to support parallel operation efficiently. */ +static struct lbuf_ +{ + char *buf; + char *end; +} lbuf; + +/* 512 is chosen to give good performance, + and also is the max guaranteed size that + consumers can read atomically through pipes. + Also it's big enough to cater for max line length + even with 128 bit uintmax_t. */ +#define FACTOR_PIPE_BUF 512 + +static void +lbuf_alloc (void) +{ + if (lbuf.buf) + return; + + /* Double to ensure enough space for + previous numbers + next number. */ + lbuf.buf = xmalloc (FACTOR_PIPE_BUF * 2); + lbuf.end = lbuf.buf; +} + +/* Write complete LBUF to standard output. */ +static void +lbuf_flush (void) +{ + size_t size = lbuf.end - lbuf.buf; + if (full_write (STDOUT_FILENO, lbuf.buf, size) != size) + error (EXIT_FAILURE, errno, "%s", _("write error")); + lbuf.end = lbuf.buf; +} + +/* Add a character C to LBUF and if it's a newline + and enough bytes are already buffered, + then write atomically to standard output. */ +static void +lbuf_putc (char c) +{ + *lbuf.end++ = c; + + if (c == '\n') + { + size_t buffered = lbuf.end - lbuf.buf; + + if (buffered >= FACTOR_PIPE_BUF) + { + /* Write output in <= PIPE_BUF chunks + so consumers can read atomically. */ + char const *tend = lbuf.end; + + /* Since a umaxint_t's factors must fit in 512 + we're guaranteed to find a newline here. */ + char *tlend = lbuf.buf + FACTOR_PIPE_BUF; + while (*--tlend != '\n'); + tlend++; + + lbuf.end = tlend; + lbuf_flush (); + + /* Buffer the remainder. */ + memcpy (lbuf.buf, tlend, tend - tlend); + lbuf.end = lbuf.buf + (tend - tlend); + } + } +} + +/* Buffer an int to the internal LBUF. */ +static void +lbuf_putint (uintmax_t i, size_t min_width) +{ + char buf[INT_BUFSIZE_BOUND (uintmax_t)]; + char const *umaxstr = umaxtostr (i, buf); + size_t width = sizeof (buf) - (umaxstr - buf) - 1; + size_t z = width; + + for (; z < min_width; z++) + *lbuf.end++ = '0'; + + memcpy (lbuf.end, umaxstr, width); + lbuf.end += width; +} + static void print_uintmaxes (uintmax_t t1, uintmax_t t0) { uintmax_t q, r; if (t1 == 0) - printf ("%"PRIuMAX, t0); + lbuf_putint (t0, 0); else { /* Use very plain code here since it seems hard to write fast code @@ -2337,7 +2426,7 @@ print_uintmaxes (uintmax_t t1, uintmax_t t0) r = t1 % 1000000000; udiv_qrnnd (t0, r, r, t0, 1000000000); print_uintmaxes (q, t0); - printf ("%09u", (int) r); + lbuf_putint (r, 9); } } @@ -2348,24 +2437,24 @@ print_factors_single (uintmax_t t1, uintmax_t t0) struct factors factors; print_uintmaxes (t1, t0); - putchar (':'); + lbuf_putc (':'); factor (t1, t0, &factors); 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); + lbuf_putc (' '); + print_uintmaxes (0, factors.p[j]); } if (factors.plarge[1]) { - putchar (' '); + lbuf_putc (' '); print_uintmaxes (factors.plarge[1], factors.plarge[0]); } - putchar ('\n'); + + lbuf_putc ('\n'); } /* Emit the factors of the indicated number. If we have the option of using @@ -2421,6 +2510,7 @@ print_factors (const char *input) mp_factor_clear (&factors); mpz_clear (t); putchar ('\n'); + fflush (stdout); return true; #else error (0, 0, _("%s is too large"), quote (input)); @@ -2447,7 +2537,7 @@ are specified on the command line, read them from standard input.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -2482,7 +2572,9 @@ main (int argc, char **argv) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); + lbuf_alloc (); atexit (close_stdout); + atexit (lbuf_flush); alg = ALG_POLLARD_RHO; /* Default to Pollard rho */ @@ -2543,5 +2635,5 @@ main (int argc, char **argv) } #endif - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/fiemap.h b/src/fiemap.h index 15ddff9a..88a9fa61 100644 --- a/src/fiemap.h +++ b/src/fiemap.h @@ -95,7 +95,7 @@ struct fiemap /* Multiple files in block. Set EXTENT_NOT_ALIGNED. */ # define FIEMAP_EXTENT_DATA_TAIL 0x00000400 -/* Space allocated, but not data (i.e. zero). */ +/* Space allocated, but not data (i.e., zero). */ # define FIEMAP_EXTENT_UNWRITTEN 0x00000800 /* File does not natively support extents. Result merged for efficiency. */ diff --git a/src/find-mount-point.c b/src/find-mount-point.c index 869d81c6..59a60e27 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free 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 c8a66dd8..195ec902 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-2014 Free Software Foundation, Inc. + Copyright (C) 2010-2015 Free Software Foundation, Inc. This program is free 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 dbd180b4..b12c9b9e 100644 --- a/src/fmt.c +++ b/src/fmt.c @@ -1,5 +1,5 @@ /* GNU fmt -- simple text formatter. - Copyright (C) 1994-2014 Free Software Foundation, Inc. + Copyright (C) 1994-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,7 +30,7 @@ #include "error.h" #include "fadvise.h" #include "quote.h" -#include "xstrtol.h" +#include "xdectoint.h" /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "fmt" @@ -273,6 +273,7 @@ Reformat each paragraph in the FILE(s), writing to standard output.\n\ The option -WIDTH is an abbreviated form of --width=DIGITS.\n\ "), stdout); + emit_stdin_note (); emit_mandatory_arg_note (); fputs (_("\ @@ -292,11 +293,7 @@ The option -WIDTH is an abbreviated form of --width=DIGITS.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - fputs (_("\ -\n\ -With no FILE, or when FILE is -, read standard input.\n"), - stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -399,23 +396,15 @@ main (int argc, char **argv) { /* Limit max_width to MAXCHARS / 2; otherwise, the resulting output can be quite ugly. */ - unsigned long int tmp; - if (! (xstrtoul (max_width_option, NULL, 10, &tmp, "") == LONGINT_OK - && tmp <= MAXCHARS / 2)) - error (EXIT_FAILURE, 0, _("invalid width: %s"), - quote (max_width_option)); - max_width = tmp; + max_width = xdectoumax (max_width_option, 0, MAXCHARS / 2, "", + _("invalid width"), 0); } if (goal_width_option) { /* Limit goal_width to max_width. */ - unsigned long int tmp; - if (! (xstrtoul (goal_width_option, NULL, 10, &tmp, "") == LONGINT_OK - && tmp <= max_width)) - error (EXIT_FAILURE, 0, _("invalid width: %s"), - quote (goal_width_option)); - goal_width = tmp; + goal_width = xdectoumax (goal_width_option, 0, max_width, "", + _("invalid width"), 0); if (max_width_option == NULL) max_width = goal_width + 10; } @@ -456,7 +445,7 @@ main (int argc, char **argv) } } - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } /* Trim space from the front and back of the string P, yielding the prefix, diff --git a/src/fold.c b/src/fold.c index 444dc8b4..0955c09d 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-2014 Free Software Foundation, Inc. + Copyright (C) 1991-2015 Free Software Foundation, Inc. This 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,8 +25,7 @@ #include "system.h" #include "error.h" #include "fadvise.h" -#include "quote.h" -#include "xstrtol.h" +#include "xdectoint.h" #define TAB_WIDTH 8 @@ -68,10 +67,10 @@ Usage: %s [OPTION]... [FILE]...\n\ "), program_name); fputs (_("\ -Wrap input lines in each FILE (standard input by default), writing to\n\ -standard output.\n\ +Wrap input lines in each FILE, writing to standard output.\n\ "), stdout); + emit_stdin_note (); emit_mandatory_arg_note (); fputs (_("\ @@ -81,7 +80,7 @@ standard output.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -280,14 +279,8 @@ main (int argc, char **argv) } /* Fall through. */ case 'w': /* Line width. */ - { - unsigned long int tmp_ulong; - if (! (xstrtoul (optarg, NULL, 10, &tmp_ulong, "") == LONGINT_OK - && 0 < tmp_ulong && tmp_ulong < SIZE_MAX - TAB_WIDTH)) - error (EXIT_FAILURE, 0, - _("invalid number of columns: %s"), quote (optarg)); - width = tmp_ulong; - } + width = xdectoumax (optarg, 1, SIZE_MAX - TAB_WIDTH - 1, "", + _("invalid number of columns"), 0); break; case_GETOPT_HELP_CHAR; @@ -311,5 +304,5 @@ main (int argc, char **argv) if (have_read_stdin && fclose (stdin) == EOF) error (EXIT_FAILURE, errno, "-"); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/fs-is-local.h b/src/fs-is-local.h index 2a7deee0..215f0b8f 100644 --- a/src/fs-is-local.h +++ b/src/fs-is-local.h @@ -50,6 +50,7 @@ is_local_fs_type (unsigned long int magic) case S_MAGIC_HPFS: return 1; case S_MAGIC_HUGETLBFS: return 1; case S_MAGIC_MTD_INODE_FS: return 1; + case S_MAGIC_IBRIX: return 0; case S_MAGIC_INOTIFYFS: return 1; case S_MAGIC_ISOFS: return 1; case S_MAGIC_ISOFS_R_WIN: return 1; diff --git a/src/fs.h b/src/fs.h index 4ed73c60..e1034f4e 100644 --- a/src/fs.h +++ b/src/fs.h @@ -47,6 +47,7 @@ # define S_MAGIC_HPFS 0xF995E849 # define S_MAGIC_HUGETLBFS 0x958458F6 # define S_MAGIC_MTD_INODE_FS 0x11307854 +# define S_MAGIC_IBRIX 0x013111A8 # define S_MAGIC_INOTIFYFS 0x2BAD1DEA # define S_MAGIC_ISOFS 0x9660 # define S_MAGIC_ISOFS_R_WIN 0x4004 diff --git a/src/getlimits.c b/src/getlimits.c index 597efd82..d5af741c 100644 --- a/src/getlimits.c +++ b/src/getlimits.c @@ -1,5 +1,5 @@ /* getlimits - print various platform dependent limits. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This 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,7 +73,7 @@ Output platform dependent limits in a format useful for shell scripts.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -167,4 +167,6 @@ main (int argc, char **argv) print_float (FLT); print_float (DBL); print_float (LDBL); + + return EXIT_SUCCESS; } diff --git a/src/group-list.c b/src/group-list.c index 823384f5..5d7a8f20 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-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This program is free 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.h b/src/group-list.h index 806f78fd..46d6f9f3 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free 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 f19ff0ac..99eafb6c 100644 --- a/src/groups.c +++ b/src/groups.c @@ -1,5 +1,5 @@ /* groups -- print the groups a user is in - Copyright (C) 1989-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -58,7 +58,7 @@ the current process (which may differ if the groups database has changed).\n"), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -136,5 +136,5 @@ main (int argc, char **argv) } } - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/head.c b/src/head.c index 65bd52a1..410cc4f4 100644 --- a/src/head.c +++ b/src/head.c @@ -1,5 +1,5 @@ /* head -- output first part of file(s) - Copyright (C) 1989-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This 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,8 +36,9 @@ #include "quote.h" #include "quotearg.h" #include "safe-read.h" +#include "stat-size.h" #include "xfreopen.h" -#include "xstrtol.h" +#include "xdectoint.h" /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "head" @@ -109,9 +110,9 @@ Usage: %s [OPTION]... [FILE]...\n\ fputs (_("\ 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\ "), stdout); + emit_stdin_note (); emit_mandatory_arg_note (); fputs (_("\ @@ -134,7 +135,7 @@ 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\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -206,13 +207,42 @@ copy_fd (int src_fd, uintmax_t n_bytes) return COPY_FD_OK; } -/* Print all but the last N_ELIDE bytes from the input available via - the non-seekable file descriptor FD. Return true upon success. +/* Call lseek (FD, OFFSET, WHENCE), where file descriptor FD + corresponds to the file FILENAME. WHENCE must be SEEK_SET or + SEEK_CUR. Return the resulting offset. Give a diagnostic and + return -1 if lseek fails. */ + +static off_t +elseek (int fd, off_t offset, int whence, char const *filename) +{ + off_t new_offset = lseek (fd, offset, whence); + char buf[INT_BUFSIZE_BOUND (offset)]; + + if (new_offset < 0) + error (0, errno, + _(whence == SEEK_SET + ? N_("%s: cannot seek to offset %s") + : N_("%s: cannot seek to relative offset %s")), + quotearg_colon (filename), + offtostr (offset, buf)); + + return new_offset; +} + +/* For an input file with name FILENAME and descriptor FD, + output all but the last N_ELIDE_0 bytes. + If CURRENT_POS is nonnegative, assume that the input file is + positioned at CURRENT_POS and that it should be repositioned to + just before the elided bytes before returning. + Return true upon success. Give a diagnostic and return false upon error. */ static bool -elide_tail_bytes_pipe (const char *filename, int fd, uintmax_t n_elide_0) +elide_tail_bytes_pipe (const char *filename, int fd, uintmax_t n_elide_0, + off_t current_pos) { size_t n_elide = n_elide_0; + uintmax_t desired_pos = current_pos; + bool ok = true; #ifndef HEAD_TAIL_PIPE_READ_BUFSIZE # define HEAD_TAIL_PIPE_READ_BUFSIZE BUFSIZ @@ -251,7 +281,6 @@ elide_tail_bytes_pipe (const char *filename, int fd, uintmax_t n_elide_0) if (n_elide <= HEAD_TAIL_PIPE_BYTECOUNT_THRESHOLD) { - bool ok = true; bool first = true; bool eof = false; size_t n_to_read = READ_BUFSIZE + n_elide; @@ -293,22 +322,26 @@ elide_tail_bytes_pipe (const char *filename, int fd, uintmax_t n_elide_0) /* Output any (but maybe just part of the) elided data from the previous round. */ if (! first) - xwrite_stdout (b[!i] + READ_BUFSIZE, n_elide - delta); + { + desired_pos += n_elide - delta; + xwrite_stdout (b[!i] + READ_BUFSIZE, n_elide - delta); + } first = false; if (n_elide < n_read) - xwrite_stdout (b[i], n_read - n_elide); + { + desired_pos += n_read - n_elide; + xwrite_stdout (b[i], n_read - n_elide); + } } free (b[0]); - return ok; } else { /* Read blocks of size READ_BUFSIZE, until we've read at least n_elide bytes. Then, for each new buffer we read, also write an old one. */ - bool ok = true; bool eof = false; size_t n_read; bool buffered_enough; @@ -357,7 +390,10 @@ elide_tail_bytes_pipe (const char *filename, int fd, uintmax_t n_elide_0) buffered_enough = true; if (buffered_enough) - xwrite_stdout (b[i_next], n_read); + { + desired_pos += n_read; + xwrite_stdout (b[i_next], n_read); + } } /* Output any remainder: rem bytes from b[i] + n_read. */ @@ -366,6 +402,7 @@ elide_tail_bytes_pipe (const char *filename, int fd, uintmax_t n_elide_0) if (buffered_enough) { size_t n_bytes_left_in_b_i = READ_BUFSIZE - n_read; + desired_pos += rem; if (rem < n_bytes_left_in_b_i) { xwrite_stdout (b[i] + n_read, rem); @@ -392,6 +429,7 @@ elide_tail_bytes_pipe (const char *filename, int fd, uintmax_t n_elide_0) */ size_t y = READ_BUFSIZE - rem; size_t x = n_read - y; + desired_pos += x; xwrite_stdout (b[i_next], x); } } @@ -400,36 +438,16 @@ elide_tail_bytes_pipe (const char *filename, int fd, uintmax_t n_elide_0) for (i = 0; i < n_alloc; i++) free (b[i]); free (b); - - return ok; } -} -/* Call lseek (FD, OFFSET, WHENCE), where file descriptor FD - corresponds to the file FILENAME. WHENCE must be SEEK_SET or - SEEK_CUR. Return the resulting offset. Give a diagnostic and - return -1 if lseek fails. */ - -static off_t -elseek (int fd, off_t offset, int whence, char const *filename) -{ - off_t new_offset = lseek (fd, offset, whence); - char buf[INT_BUFSIZE_BOUND (offset)]; - - if (new_offset < 0) - error (0, errno, - _(whence == SEEK_SET - ? N_("%s: cannot seek to offset %s") - : N_("%s: cannot seek to relative offset %s")), - quotearg_colon (filename), - offtostr (offset, buf)); - - return new_offset; + if (0 <= current_pos && elseek (fd, desired_pos, SEEK_SET, filename) < 0) + ok = false; + return ok; } /* For the file FILENAME with descriptor FD, output all but the last N_ELIDE bytes. If SIZE is nonnegative, this is a regular file positioned - at START_POS with SIZE bytes. Return true on success. + at CURRENT_POS with SIZE bytes. Return true on success. Give a diagnostic and return false upon error. */ /* NOTE: if the input file shrinks by more than N_ELIDE bytes between @@ -437,10 +455,11 @@ elseek (int fd, off_t offset, int whence, char const *filename) static bool elide_tail_bytes_file (const char *filename, int fd, uintmax_t n_elide, - off_t current_pos, off_t size) + struct stat const *st, off_t current_pos) { - if (size < 0) - return elide_tail_bytes_pipe (filename, fd, n_elide); + off_t size = st->st_size; + if (presume_input_pipe || size <= ST_BLKSIZE (*st)) + return elide_tail_bytes_pipe (filename, fd, n_elide, current_pos); else { /* Be careful here. The current position may actually be @@ -460,13 +479,16 @@ elide_tail_bytes_file (const char *filename, int fd, uintmax_t n_elide, } } -/* Print all but the last N_ELIDE lines from the input stream - open for reading via file descriptor FD. +/* For an input file with name FILENAME and descriptor FD, + output all but the last N_ELIDE_0 bytes. + If CURRENT_POS is nonnegative, the input file is positioned there + and should be repositioned to just before the elided bytes. Buffer the specified number of lines as a linked list of LBUFFERs, adding them as needed. Return true if successful. */ static bool -elide_tail_lines_pipe (const char *filename, int fd, uintmax_t n_elide) +elide_tail_lines_pipe (const char *filename, int fd, uintmax_t n_elide, + off_t current_pos) { struct linebuffer { @@ -475,6 +497,7 @@ elide_tail_lines_pipe (const char *filename, int fd, uintmax_t n_elide) size_t nlines; struct linebuffer *next; }; + uintmax_t desired_pos = current_pos; typedef struct linebuffer LBUFFER; LBUFFER *first, *last, *tmp; size_t total_lines = 0; /* Total number of newlines in all buffers. */ @@ -497,6 +520,7 @@ elide_tail_lines_pipe (const char *filename, int fd, uintmax_t n_elide) if (! n_elide) { + desired_pos += n_read; xwrite_stdout (tmp->buffer, n_read); continue; } @@ -536,6 +560,7 @@ elide_tail_lines_pipe (const char *filename, int fd, uintmax_t n_elide) last = last->next = tmp; if (n_elide < total_lines - first->nlines) { + desired_pos += first->nbytes; xwrite_stdout (first->buffer, first->nbytes); tmp = first; total_lines -= first->nlines; @@ -565,6 +590,7 @@ elide_tail_lines_pipe (const char *filename, int fd, uintmax_t n_elide) for (tmp = first; n_elide < total_lines - tmp->nlines; tmp = tmp->next) { + desired_pos += tmp->nbytes; xwrite_stdout (tmp->buffer, tmp->nbytes); total_lines -= tmp->nlines; } @@ -581,6 +607,7 @@ elide_tail_lines_pipe (const char *filename, int fd, uintmax_t n_elide) ++tmp->nlines; --n; } + desired_pos += p - tmp->buffer; xwrite_stdout (tmp->buffer, p - tmp->buffer); } @@ -591,6 +618,9 @@ free_lbuffers: free (first); first = tmp; } + + if (0 <= current_pos && elseek (fd, desired_pos, SEEK_SET, filename) < 0) + ok = false; return ok; } @@ -714,10 +744,11 @@ elide_tail_lines_seekable (const char *pretty_filename, int fd, static bool elide_tail_lines_file (const char *filename, int fd, uintmax_t n_elide, - off_t current_pos, off_t size) + struct stat const *st, off_t current_pos) { - if (size < 0) - return elide_tail_lines_pipe (filename, fd, n_elide); + off_t size = st->st_size; + if (presume_input_pipe || size <= ST_BLKSIZE (*st)) + return elide_tail_lines_pipe (filename, fd, n_elide, current_pos); else { /* Find the offset, OFF, of the Nth newline from the end, @@ -802,28 +833,24 @@ head (const char *filename, int fd, uintmax_t n_units, bool count_lines, if (elide_from_end) { - off_t current_pos = -1, size = -1; - if (! presume_input_pipe) + off_t current_pos = -1; + struct stat st; + if (fstat (fd, &st) != 0) { - struct stat st; - if (fstat (fd, &st) != 0) - { - error (0, errno, _("cannot fstat %s"), - quotearg_colon (filename)); - return false; - } - if (S_ISREG (st.st_mode)) - { - size = st.st_size; - current_pos = elseek (fd, 0, SEEK_CUR, filename); - if (current_pos < 0) - return false; - } + error (0, errno, _("cannot fstat %s"), + quotearg_colon (filename)); + return false; + } + if (! presume_input_pipe && usable_st_size (&st)) + { + current_pos = elseek (fd, 0, SEEK_CUR, filename); + if (current_pos < 0) + return false; } if (count_lines) - return elide_tail_lines_file (filename, fd, n_units, current_pos, size); + return elide_tail_lines_file (filename, fd, n_units, &st, current_pos); else - return elide_tail_bytes_file (filename, fd, n_units, current_pos, size); + return elide_tail_bytes_file (filename, fd, n_units, &st, current_pos); } if (count_lines) return head_lines (filename, fd, n_units); @@ -866,7 +893,7 @@ head_file (const char *filename, uintmax_t n_units, bool count_lines, return ok; } -/* Convert a string of decimal digits, N_STRING, with an optional suffinx +/* 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. COUNT_LINES indicates whether N_STRING is a number of bytes or a number @@ -875,27 +902,9 @@ head_file (const char *filename, uintmax_t n_units, bool count_lines, static uintmax_t string_to_integer (bool count_lines, const char *n_string) { - strtol_error s_err; - uintmax_t n; - - s_err = xstrtoumax (n_string, NULL, 10, &n, "bkKmMGTPEZY0"); - - if (s_err == LONGINT_OVERFLOW) - { - error (EXIT_FAILURE, 0, - _("%s: %s is so large that it is not representable"), n_string, - count_lines ? _("number of lines") : _("number of bytes")); - } - - if (s_err != LONGINT_OK) - { - error (EXIT_FAILURE, 0, "%s: %s", n_string, - (count_lines - ? _("invalid number of lines") - : _("invalid number of bytes"))); - } - - return n; + return xdectoumax (n_string, 0, UINTMAX_MAX, "bkKmMGTPEZY0", + count_lines ? _("invalid number of lines") + : _("invalid number of bytes"), 0); } int @@ -1049,8 +1058,8 @@ main (int argc, char **argv) if ( ! count_lines && elide_from_end && OFF_T_MAX < n_units) { char umax_buf[INT_BUFSIZE_BOUND (n_units)]; - error (EXIT_FAILURE, 0, _("%s: number of bytes is too large"), - umaxtostr (n_units, umax_buf)); + error (EXIT_FAILURE, EOVERFLOW, "%s: %s", _("invalid number of bytes"), + quote (umaxtostr (n_units, umax_buf))); } file_list = (optind < argc @@ -1066,5 +1075,5 @@ main (int argc, char **argv) if (have_read_stdin && close (STDIN_FILENO) < 0) error (EXIT_FAILURE, errno, "-"); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/hostid.c b/src/hostid.c index 5b40eb01..b6ef86f6 100644 --- a/src/hostid.c +++ b/src/hostid.c @@ -1,6 +1,6 @@ /* print the hexadecimal identifier for the current host - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -46,7 +46,7 @@ Print the numeric identifier (in hexadecimal) for the current host.\n\ "), program_name); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -84,5 +84,5 @@ main (int argc, char **argv) printf ("%08x\n", id); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/hostname.c b/src/hostname.c index bab51ae4..371a2e1d 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-2014 Free Software Foundation, Inc. + Copyright (C) 1994-2015 Free Software Foundation, Inc. This 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,7 @@ Print or set the hostname of the current system.\n\ program_name, program_name); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -112,5 +112,5 @@ main (int argc, char **argv) usage (EXIT_FAILURE); } - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/id.c b/src/id.c index ccd1e879..26f8e2d6 100644 --- a/src/id.c +++ b/src/id.c @@ -1,5 +1,5 @@ /* id -- print real and effective UIDs and GIDs - Copyright (C) 1989-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -104,7 +104,7 @@ or (when USER omitted) for the current user.\n\ \n\ Without any OPTION, print some useful set of identified information.\n\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -314,7 +314,7 @@ main (int argc, char **argv) putchar (opt_zero ? '\0' : '\n'); IF_LINT (free (pw_name)); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } /* Convert a gid_t to string. Do not use this function directly. diff --git a/src/install.c b/src/install.c index c3424227..bfde21d6 100644 --- a/src/install.c +++ b/src/install.c @@ -1,5 +1,5 @@ /* install - copy files and set attributes - Copyright (C) 1989-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -668,7 +668,7 @@ the VERSION_CONTROL environment variable. Here are the values:\n\ existing, nil numbered if numbered backups exist, simple otherwise\n\ simple, never always make simple backups\n\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -1042,5 +1042,5 @@ main (int argc, char **argv) } } - exit (exit_status); + return exit_status; } diff --git a/src/ioblksize.h b/src/ioblksize.h index 55aaeae1..1b919952 100644 --- a/src/ioblksize.h +++ b/src/ioblksize.h @@ -1,5 +1,5 @@ /* I/O block size definitions for coreutils - Copyright (C) 1989-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This program is free 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 5c26e78a..52e4b18b 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-2014 Free Software Foundation, Inc. + Copyright (C) 1991-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -194,8 +194,14 @@ Usage: %s [OPTION]... FILE1 FILE2\n\ program_name); fputs (_("\ 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\ +standard output. The default join field is the first, delimited by whitespace.\ +\n\ +"), stdout); + fputs (_("\ +\n\ +When FILE1 or FILE2 (not both) is -, read standard input.\n\ +"), stdout); + fputs (_("\ \n\ -a FILENUM also print unpairable lines from file FILENUM, where\n\ FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n\ @@ -239,7 +245,7 @@ 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\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -1191,7 +1197,7 @@ main (int argc, char **argv) error (EXIT_FAILURE, errno, "%s", g_names[1]); if (issued_disorder_warning[0] || issued_disorder_warning[1]) - exit (EXIT_FAILURE); + return EXIT_FAILURE; else - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/kill.c b/src/kill.c index 724667e0..83016ed3 100644 --- a/src/kill.c +++ b/src/kill.c @@ -1,5 +1,5 @@ /* kill -- send a signal to a process - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -99,7 +99,7 @@ or the exit status of a process terminated by a signal.\n\ PID is an integer; if negative it identifies a process group.\n\ "), stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -109,8 +109,8 @@ PID is an integer; if negative it identifies a process group.\n\ maximum name width is NAME_WIDTH, and SIGNAME is the name to print. */ static void -print_table_row (unsigned int num_width, int signum, - unsigned int name_width, char const *signame) +print_table_row (int num_width, int signum, + int name_width, char const *signame) { char const *description = strsignal (signum); printf ("%*d %-*s %s\n", num_width, signum, name_width, signame, @@ -306,7 +306,7 @@ main (int argc, char **argv) usage (EXIT_FAILURE); } - exit (list - ? list_signals (table, optind < argc ? argv + optind : NULL) - : send_signals (signum, argv + optind)); + return (list + ? list_signals (table, optind < argc ? argv + optind : NULL) + : send_signals (signum, argv + optind)); } diff --git a/src/libstdbuf.c b/src/libstdbuf.c index 1281b9de..255df7eb 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-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This 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,9 +18,7 @@ #include #include -#include #include "system.h" -#include "verify.h" /* Note currently for glibc (2.3.5) the following call does not change the buffer size, and more problematically does not give any indication diff --git a/src/link.c b/src/link.c index 9f18fe2e..bbd18292 100644 --- a/src/link.c +++ b/src/link.c @@ -1,5 +1,5 @@ /* link utility for GNU. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ Usage: %s FILE1 FILE2\n\ stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -90,5 +90,5 @@ main (int argc, char **argv) error (EXIT_FAILURE, errno, _("cannot create link %s to %s"), quote_n (0, argv[optind + 1]), quote_n (1, argv[optind])); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/ln.c b/src/ln.c index 42bccfce..652103b1 100644 --- a/src/ln.c +++ b/src/ln.c @@ -1,5 +1,5 @@ /* 'ln' program to create links between files. - Copyright (C) 1986-2014 Free Software Foundation, Inc. + Copyright (C) 1986-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -452,7 +452,7 @@ the VERSION_CONTROL environment variable. Here are the values:\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"); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -647,5 +647,5 @@ main (int argc, char **argv) else ok = do_link (file[0], file[1]); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/local.mk b/src/local.mk index c0d04d68..eaeed08e 100644 --- a/src/local.mk +++ b/src/local.mk @@ -1,7 +1,7 @@ # Make coreutils programs. -*-Makefile-*- # This is included by the top-level Makefile.am. -## Copyright (C) 1990-2014 Free Software Foundation, Inc. +## Copyright (C) 1990-2015 Free Software Foundation, Inc. ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -278,7 +278,7 @@ src_uptime_LDADD += $(GETLOADAVG_LIBS) # for various ACL functions copy_ldadd += $(LIB_ACL) -src_ls_LDADD += $(LIB_ACL) +src_ls_LDADD += $(LIB_HAS_ACL) # for various xattr functions copy_ldadd += $(LIB_XATTR) @@ -340,7 +340,14 @@ copy_sources = \ # 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) +# Don't apply prefix transformations to libstdbuf shared lib +# as that's not generally needed, and we need to reference the +# name directly in LD_PRELOAD etc. In general it's surprising +# that $(transform) is applied to libexec at all given that is +# for internal package naming, not privy to $(transform). + +transform = s/ginstall/install/;/libstdbuf/!$(program_transform_name) + src_ginstall_SOURCES = src/install.c src/prog-fprintf.c $(copy_sources) \ $(selinux_sources) @@ -420,7 +427,8 @@ endif SINGLE_BINARY CLEANFILES += src/coreutils_symlinks src/coreutils_symlinks: Makefile $(AM_V_GEN)touch $@ - $(AM_V_at)for i in $(single_binary_progs); do \ + $(AM_V_at)for i in x $(single_binary_progs); do \ + test $$i = x && continue; \ rm -f src/$$i$(EXEEXT) || exit $$?; \ $(LN_S) -s coreutils$(EXEEXT) src/$$i$(EXEEXT) || exit $$?; \ done @@ -428,7 +436,8 @@ src/coreutils_symlinks: Makefile CLEANFILES += src/coreutils_shebangs src/coreutils_shebangs: Makefile $(AM_V_GEN)touch $@ - $(AM_V_at)for i in $(single_binary_progs); do \ + $(AM_V_at)for i in x $(single_binary_progs); do \ + test $$i = x && continue; \ rm -f src/$$i$(EXEEXT) || exit $$?; \ printf '#!%s --coreutils-prog-shebang=%s\n' \ $(abs_top_builddir)/src/coreutils$(EXEEXT) $$i \ @@ -437,7 +446,8 @@ src/coreutils_shebangs: Makefile done clean-local: - $(AM_V_at)for i in $(single_binary_progs); do \ + $(AM_V_at)for i in x $(single_binary_progs); do \ + test $$i = x && continue; \ rm -f src/$$i$(EXEEXT) || exit $$?; \ done @@ -570,7 +580,8 @@ src/version.h: Makefile DISTCLEANFILES += src/coreutils.h src/coreutils.h: Makefile $(AM_V_GEN)rm -f $@ - $(AM_V_at)for prog in $(single_binary_progs); do \ + $(AM_V_at)for prog in x $(single_binary_progs); do \ + test $$prog = x && continue; \ prog=`basename $$prog`; \ main=`echo $$prog | tr '[' '_'`; \ echo "SINGLE_BINARY_PROGRAM(\"$$prog\", $$main)"; \ diff --git a/src/logname.c b/src/logname.c index 6afa1b50..070c9017 100644 --- a/src/logname.c +++ b/src/logname.c @@ -1,5 +1,5 @@ /* logname -- print user's login name - Copyright (C) 1990-2014 Free Software Foundation, Inc. + Copyright (C) 1990-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -43,7 +43,7 @@ Print the name of the current user.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -72,15 +72,12 @@ main (int argc, char **argv) usage (EXIT_FAILURE); } - /* POSIX requires using getlogin (or equivalent code). */ + /* POSIX requires using getlogin (or equivalent code) and prohibits + using a fallback technique. */ cp = getlogin (); - if (cp) - { - puts (cp); - exit (EXIT_SUCCESS); - } - /* POSIX prohibits using a fallback technique. */ + if (! cp) + error (EXIT_FAILURE, 0, _("no login name")); - error (0, 0, _("no login name")); - exit (EXIT_FAILURE); + puts (cp); + return EXIT_SUCCESS; } diff --git a/src/longlong.h b/src/longlong.h index 25116130..df909e97 100644 --- a/src/longlong.h +++ b/src/longlong.h @@ -1,6 +1,6 @@ /* longlong.h -- definitions for mixed size 32/64 bit arithmetic. -Copyright 1991-2014 Free Software Foundation, Inc. +Copyright 1991-2015 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 @@ -186,7 +186,7 @@ along with this file. If not, see http://www.gnu.org/licenses/. */ UDItype __m0 = (m0), __m1 = (m1); \ __asm__ ("umulh %r1,%2,%0" \ : "=r" (ph) \ - : "%rJ" (m0), "rI" (m1)); \ + : "%rJ" (__m0), "rI" (__m1)); \ (pl) = __m0 * __m1; \ } while (0) #endif @@ -196,7 +196,7 @@ along with this file. If not, see http://www.gnu.org/licenses/. */ #define umul_ppmm(ph, pl, m0, m1) \ do { \ UDItype __m0 = (m0), __m1 = (m1); \ - (ph) = __UMULH (m0, m1); \ + (ph) = __UMULH (__m0, __m1); \ (pl) = __m0 * __m1; \ } while (0) #endif @@ -279,7 +279,7 @@ long __MPN(count_leading_zeros) (UDItype); #define umul_ppmm(ph, pl, m0, m1) \ do { \ UDItype __m0 = (m0), __m1 = (m1); \ - (ph) = _int_mult_upper (m0, m1); \ + (ph) = _int_mult_upper (__m0, __m1); \ (pl) = __m0 * __m1; \ } while (0) #ifndef LONGLONG_STANDALONE @@ -344,9 +344,9 @@ long __MPN(count_leading_zeros) (UDItype); #include #define umul_ppmm(ph, pl, m0, m1) \ do { \ - UWtype _m0 = (m0), _m1 = (m1); \ - ph = _m64_xmahu (_m0, _m1, 0); \ - pl = _m0 * _m1; \ + UWtype __m0 = (m0), __m1 = (m1); \ + ph = _m64_xmahu (__m0, __m1, 0); \ + pl = __m0 * __m1; \ } while (0) #endif #ifndef LONGLONG_STANDALONE @@ -423,7 +423,8 @@ long __MPN(count_leading_zeros) (UDItype); "rIJ" ((USItype) (bl))) #endif -#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32 +#if defined (__arm__) && (defined (__thumb2__) || !defined (__thumb__)) \ + && W_TYPE_SIZE == 32 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3" \ : "=r" (sh), "=&r" (sl) \ @@ -468,7 +469,37 @@ long __MPN(count_leading_zeros) (UDItype); : "=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 */ +#if defined (__ARM_ARCH_2__) || defined (__ARM_ARCH_2A__) \ + || defined (__ARM_ARCH_3__) +#define umul_ppmm(xh, xl, a, b) \ + do { \ + register USItype __t0, __t1, __t2; \ + __asm__ ("%@ Inlined umul_ppmm\n" \ + " mov %2, %5, lsr #16\n" \ + " mov %0, %6, lsr #16\n" \ + " bic %3, %5, %2, lsl #16\n" \ + " bic %4, %6, %0, lsl #16\n" \ + " mul %1, %3, %4\n" \ + " mul %4, %2, %4\n" \ + " mul %3, %0, %3\n" \ + " mul %0, %2, %0\n" \ + " adds %3, %4, %3\n" \ + " addcs %0, %0, #65536\n" \ + " adds %1, %1, %3, lsl #16\n" \ + " adc %0, %0, %3, lsr #16" \ + : "=&r" ((USItype) (xh)), "=r" ((USItype) (xl)), \ + "=&r" (__t0), "=&r" (__t1), "=r" (__t2) \ + : "r" ((USItype) (a)), "r" ((USItype) (b)) __CLOBBER_CC); \ + } while (0) +#define UMUL_TIME 20 +#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 +#else /* ARMv4 or newer */ #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 @@ -484,48 +515,10 @@ long __MPN(count_leading_zeros) (UDItype); #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 any useful common symbol. */ -#if defined (__ARM_ARCH_5__) || defined (__ARM_ARCH_5T__) || \ - defined (__ARM_ARCH_5E__) || defined (__ARM_ARCH_5TE__)|| \ - defined (__ARM_ARCH_6__) || defined (__ARM_ARCH_6J__) || \ - 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)) +#endif /* defined(__ARM_ARCH_2__) ... */ +#define count_leading_zeros(count, x) count_leading_zeros_gcc_clz(count, x) +#define count_trailing_zeros(count, x) count_trailing_zeros_gcc_ctz(count, x) #define COUNT_LEADING_ZEROS_0 32 -#endif #endif /* __arm__ */ #if defined (__aarch64__) && W_TYPE_SIZE == 64 @@ -534,21 +527,21 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype); #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ __asm__ ("adds\t%1, %x4, %5\n\tadc\t%0, %x2, %x3" \ : "=r" (sh), "=&r" (sl) \ - : "rZ" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC) + : "rZ" ((UDItype)(ah)), "rZ" ((UDItype)(bh)), \ + "%r" ((UDItype)(al)), "rI" ((UDItype)(bl)) __CLOBBER_CC) #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ __asm__ ("subs\t%1, %x4, %5\n\tsbc\t%0, %x2, %x3" \ : "=r,r" (sh), "=&r,&r" (sl) \ - : "rZ,rZ" (ah), "rZ,rZ" (bh), "r,Z" (al), "rI,r" (bl) __CLOBBER_CC) + : "rZ,rZ" ((UDItype)(ah)), "rZ,rZ" ((UDItype)(bh)), \ + "r,Z" ((UDItype)(al)), "rI,r" ((UDItype)(bl)) __CLOBBER_CC) #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)); \ + __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_trailing_zeros(count, x) \ - __asm__ ("rbit\t%0, %1\n\tclz\t%0, %0" : "=r" (count) : "r" (x)) +#define count_leading_zeros(count, x) count_leading_zeros_gcc_clz(count, x) +#define count_trailing_zeros(count, x) count_trailing_zeros_gcc_ctz(count, x) #define COUNT_LEADING_ZEROS_0 64 #endif /* __aarch64__ */ @@ -853,6 +846,8 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype); #endif #endif +/* On x86 and x86_64, every asm implicitly clobbers "flags" and "fpsr", + so we don't need __CLOBBER_CC. */ #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" \ @@ -1218,7 +1213,7 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype); w0 = __ll; \ } while (0) #endif -#if !defined (umul_ppmm) && __GMP_GNUC_PREREQ (2,7) +#if !defined (umul_ppmm) && __GMP_GNUC_PREREQ (2,7) && !defined (__clang__) #define umul_ppmm(w1, w0, u, v) \ __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v)) #endif @@ -1241,14 +1236,17 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype); w0 = __ll; \ } while (0) #endif -#if !defined (umul_ppmm) && __GMP_GNUC_PREREQ (2,7) +#if !defined (umul_ppmm) && __GMP_GNUC_PREREQ (2,7) && !defined (__clang__) #define umul_ppmm(w1, w0, u, v) \ - __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v)) + __asm__ ("dmultu %2,%3" \ + : "=l" (w0), "=h" (w1) \ + : "d" ((UDItype)(u)), "d" ((UDItype)(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)) + : "=d" (w0), "=d" (w1) \ + : "d" ((UDItype)(u)), "d" ((UDItype)(v))) #endif #define UMUL_TIME 20 #define UDIV_TIME 140 @@ -1394,14 +1392,19 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype); do { \ if (__builtin_constant_p (bh) && (bh) == 0) \ __asm__ ("add%I4c %1,%3,%4\n\taddze %0,%2" \ - : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl)); \ + : "=r" (sh), "=&r" (sl) \ + : "r" ((UDItype)(ah)), \ + "%r" ((UDItype)(al)), "rI" ((UDItype)(bl))); \ else if (__builtin_constant_p (bh) && (bh) == ~(UDItype) 0) \ __asm__ ("add%I4c %1,%3,%4\n\taddme %0,%2" \ - : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl)); \ + : "=r" (sh), "=&r" (sl) \ + : "r" ((UDItype)(ah)), \ + "%r" ((UDItype)(al)), "rI" ((UDItype)(bl))); \ else \ __asm__ ("add%I5c %1,%4,%5\n\tadde %0,%2,%3" \ - : "=r" (sh), "=&r" (sl) \ - : "r" (ah), "r" (bh), "%r" (al), "rI" (bl)); \ + : "=r" (sh), "=&r" (sl) \ + : "r" ((UDItype)(ah)), "r" ((UDItype)(bh)), \ + "%r" ((UDItype)(al)), "rI" ((UDItype)(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. */ @@ -1410,37 +1413,55 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype); if (__builtin_constant_p (bl) && bl > -0x8000 && bl <= 0x8000) { \ if (__builtin_constant_p (ah) && (ah) == 0) \ __asm__ ("addic %1,%3,%4\n\tsubfze %0,%2" \ - : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "*rI" (-bl)); \ + : "=r" (sh), "=&r" (sl) \ + : "r" ((UDItype)(bh)), \ + "rI" ((UDItype)(al)), "*rI" (-((UDItype)(bl)))); \ else if (__builtin_constant_p (ah) && (ah) == ~(UDItype) 0) \ __asm__ ("addic %1,%3,%4\n\tsubfme %0,%2" \ - : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "*rI" (-bl)); \ + : "=r" (sh), "=&r" (sl) \ + : "r" ((UDItype)(bh)), \ + "rI" ((UDItype)(al)), "*rI" (-((UDItype)(bl)))); \ else if (__builtin_constant_p (bh) && (bh) == 0) \ __asm__ ("addic %1,%3,%4\n\taddme %0,%2" \ - : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "*rI" (-bl)); \ + : "=r" (sh), "=&r" (sl) \ + : "r" ((UDItype)(ah)), \ + "rI" ((UDItype)(al)), "*rI" (-((UDItype)(bl)))); \ else if (__builtin_constant_p (bh) && (bh) == ~(UDItype) 0) \ __asm__ ("addic %1,%3,%4\n\taddze %0,%2" \ - : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "*rI" (-bl)); \ + : "=r" (sh), "=&r" (sl) \ + : "r" ((UDItype)(ah)), \ + "rI" ((UDItype)(al)), "*rI" (-((UDItype)(bl)))); \ else \ __asm__ ("addic %1,%4,%5\n\tsubfe %0,%3,%2" \ : "=r" (sh), "=&r" (sl) \ - : "r" (ah), "r" (bh), "rI" (al), "*rI" (-bl)); \ + : "r" ((UDItype)(ah)), "r" ((UDItype)(bh)), \ + "rI" ((UDItype)(al)), "*rI" (-((UDItype)(bl)))); \ } else { \ if (__builtin_constant_p (ah) && (ah) == 0) \ __asm__ ("subf%I3c %1,%4,%3\n\tsubfze %0,%2" \ - : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl)); \ + : "=r" (sh), "=&r" (sl) \ + : "r" ((UDItype)(bh)), \ + "rI" ((UDItype)(al)), "r" ((UDItype)(bl))); \ else if (__builtin_constant_p (ah) && (ah) == ~(UDItype) 0) \ __asm__ ("subf%I3c %1,%4,%3\n\tsubfme %0,%2" \ - : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl)); \ + : "=r" (sh), "=&r" (sl) \ + : "r" ((UDItype)(bh)), \ + "rI" ((UDItype)(al)), "r" ((UDItype)(bl))); \ else if (__builtin_constant_p (bh) && (bh) == 0) \ __asm__ ("subf%I3c %1,%4,%3\n\taddme %0,%2" \ - : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl)); \ + : "=r" (sh), "=&r" (sl) \ + : "r" ((UDItype)(ah)), \ + "rI" ((UDItype)(al)), "r" ((UDItype)(bl))); \ else if (__builtin_constant_p (bh) && (bh) == ~(UDItype) 0) \ __asm__ ("subf%I3c %1,%4,%3\n\taddze %0,%2" \ - : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl)); \ + : "=r" (sh), "=&r" (sl) \ + : "r" ((UDItype)(ah)), \ + "rI" ((UDItype)(al)), "r" ((UDItype)(bl))); \ else \ __asm__ ("subf%I4c %1,%5,%4\n\tsubfe %0,%3,%2" \ : "=r" (sh), "=&r" (sl) \ - : "r" (ah), "r" (bh), "rI" (al), "r" (bl)); \ + : "r" ((UDItype)(ah)), "r" ((UDItype)(bh)), \ + "rI" ((UDItype)(al)), "r" ((UDItype)(bl))); \ } \ } while (0) #endif /* ! _LONG_LONG_LIMB */ @@ -1460,7 +1481,7 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype); #define umul_ppmm(ph, pl, m0, m1) \ do { \ UDItype __m0 = (m0), __m1 = (m1); \ - __asm__ ("mulhdu %0,%1,%2" : "=r" (ph) : "%r" (m0), "r" (m1)); \ + __asm__ ("mulhdu %0,%1,%2" : "=r" (ph) : "%r" (__m0), "r" (__m1)); \ (pl) = __m0 * __m1; \ } while (0) #endif @@ -1468,7 +1489,7 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype); #define smul_ppmm(ph, pl, m0, m1) \ do { \ DItype __m0 = (m0), __m1 = (m1); \ - __asm__ ("mulhd %0,%1,%2" : "=r" (ph) : "%r" (m0), "r" (m1)); \ + __asm__ ("mulhd %0,%1,%2" : "=r" (ph) : "%r" (__m0), "r" (__m1)); \ (pl) = __m0 * __m1; \ } while (0) #define SMUL_TIME 14 /* ??? */ @@ -1745,18 +1766,20 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype); "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) \ + : "=r" (sh), "=&r" (sl) \ + : "rJ" ((UDItype)(ah)), "rI" ((UDItype)(bh)), \ + "%rJ" ((UDItype)(al)), "rI" ((UDItype)(bl)), \ + "%rJ" ((UDItype)(al) >> 32), "rI" ((UDItype)(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) \ + : "=r" (sh), "=&r" (sl) \ + : "rJ" ((UDItype)(ah)), "rI" ((UDItype)(bh)), \ + "rJ" ((UDItype)(al)), "rI" ((UDItype)(bl)), \ + "rJ" ((UDItype)(al) >> 32), "rI" ((UDItype)(bl) >> 32) \ __CLOBBER_CC) #if __VIS__ >= 0x300 #undef add_ssaaaa @@ -1765,7 +1788,8 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype); "addcc %r4, %5, %1\n" \ " addxc %r2, %r3, %0" \ : "=r" (sh), "=&r" (sl) \ - : "rJ" (ah), "rJ" (bh), "%rJ" (al), "rI" (bl) __CLOBBER_CC) + : "rJ" ((UDItype)(ah)), "rJ" ((UDItype)(bh)), \ + "%rJ" ((UDItype)(al)), "rI" ((UDItype)(bl)) __CLOBBER_CC) #define umul_ppmm(ph, pl, m0, m1) \ do { \ UDItype __m0 = (m0), __m1 = (m1); \ @@ -1776,6 +1800,8 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype); } while (0) #define count_leading_zeros(count, x) \ __asm__ ("lzd\t%1,%0" : "=r" (count) : "r" (x)) +/* Needed by count_leading_zeros_32 in sparc64.h. */ +#define COUNT_LEADING_ZEROS_NEED_CLZ_TAB #endif #endif @@ -1870,13 +1896,19 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype); #endif +#if defined (__cplusplus) +#define __longlong_h_C "C" +#else +#define __longlong_h_C +#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); +extern __longlong_h_C UWtype mpn_umul_ppmm (UWtype *, UWtype, UWtype); #if ! defined (umul_ppmm) && HAVE_NATIVE_mpn_umul_ppmm \ && ! defined (LONGLONG_STANDALONE) @@ -1889,7 +1921,7 @@ extern UWtype mpn_umul_ppmm (UWtype *, UWtype, UWtype); #endif #define mpn_umul_ppmm_r __MPN(umul_ppmm_r) -extern UWtype mpn_umul_ppmm_r (UWtype, UWtype, UWtype *); +extern __longlong_h_C UWtype mpn_umul_ppmm_r (UWtype, UWtype, UWtype *); #if ! defined (umul_ppmm) && HAVE_NATIVE_mpn_umul_ppmm_r \ && ! defined (LONGLONG_STANDALONE) @@ -1902,7 +1934,7 @@ extern UWtype mpn_umul_ppmm_r (UWtype, UWtype, UWtype *); #endif #define mpn_udiv_qrnnd __MPN(udiv_qrnnd) -extern UWtype mpn_udiv_qrnnd (UWtype *, UWtype, UWtype, UWtype); +extern __longlong_h_C UWtype mpn_udiv_qrnnd (UWtype *, UWtype, UWtype, UWtype); #if ! defined (udiv_qrnnd) && HAVE_NATIVE_mpn_udiv_qrnnd \ && ! defined (LONGLONG_STANDALONE) @@ -1916,7 +1948,7 @@ extern UWtype mpn_udiv_qrnnd (UWtype *, UWtype, UWtype, UWtype); #endif #define mpn_udiv_qrnnd_r __MPN(udiv_qrnnd_r) -extern UWtype mpn_udiv_qrnnd_r (UWtype, UWtype, UWtype, UWtype *); +extern __longlong_h_C UWtype mpn_udiv_qrnnd_r (UWtype, UWtype, UWtype, UWtype *); #if ! defined (udiv_qrnnd) && HAVE_NATIVE_mpn_udiv_qrnnd_r \ && ! defined (LONGLONG_STANDALONE) diff --git a/src/ls.c b/src/ls.c index cd5996eb..6860dd41 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-2014 Free Software Foundation, Inc. + Copyright (C) 1985-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -105,6 +105,7 @@ #include "stat-size.h" #include "stat-time.h" #include "strftime.h" +#include "xdectoint.h" #include "xstrtol.h" #include "areadlink.h" #include "mbsalign.h" @@ -284,6 +285,8 @@ static void queue_directory (char const *name, char const *realname, static void sort_files (void); static void parse_ls_color (void); +static void getenv_quoting_style (void); + /* Initial size of hash table. Most hierarchies are likely to be shallower than this. */ #define INITIAL_TABLE_SIZE 30 @@ -577,7 +580,7 @@ static struct bin_str color_indicator[] = { { LEN_STR_PAIR ("\033[") }, /* lc: Left of color sequence */ { LEN_STR_PAIR ("m") }, /* rc: Right of color sequence */ - { 0, NULL }, /* ec: End color (replaces lc+no+rc) */ + { 0, NULL }, /* ec: End color (replaces lc+rs+rc) */ { LEN_STR_PAIR ("0") }, /* rs: Reset to ordinary colors */ { 0, NULL }, /* no: Normal */ { 0, NULL }, /* fi: File: default */ @@ -987,7 +990,7 @@ dev_ino_pop (void) struct dev_ino *di; int dev_ino_size = sizeof *di; assert (dev_ino_size <= obstack_object_size (&dev_ino_obstack)); - obstack_blank (&dev_ino_obstack, -dev_ino_size); + obstack_blank_fast (&dev_ino_obstack, -dev_ino_size); vdi = obstack_next_free (&dev_ino_obstack); di = vdi; return *di; @@ -1511,7 +1514,7 @@ main (int argc, char **argv) hash_free (active_dir_set); } - exit (exit_status); + return exit_status; } /* Set all the option flags according to the switches specified. @@ -1577,20 +1580,7 @@ decode_switches (int argc, char **argv) hide_patterns = NULL; print_scontext = false; - /* FIXME: put this in a function. */ - { - char const *q_style = getenv ("QUOTING_STYLE"); - if (q_style) - { - int i = ARGMATCH (q_style, quoting_style_args, quoting_style_vals); - if (0 <= i) - set_quoting_style (NULL, quoting_style_vals[i]); - else - error (0, 0, - _("ignoring invalid value of environment variable QUOTING_STYLE: %s"), - quotearg (q_style)); - } - } + getenv_quoting_style (); line_length = 80; { @@ -1753,15 +1743,9 @@ decode_switches (int argc, char **argv) break; case 'w': - { - unsigned long int tmp_ulong; - if (xstrtoul (optarg, NULL, 0, &tmp_ulong, NULL) != LONGINT_OK - || ! (0 < tmp_ulong && tmp_ulong <= SIZE_MAX)) - error (LS_FAILURE, 0, _("invalid line width: %s"), - quotearg (optarg)); - line_length = tmp_ulong; - break; - } + line_length = xnumtoumax (optarg, 0, 1, SIZE_MAX, "", + _("invalid line width"), LS_FAILURE); + break; case 'x': format = horizontal; @@ -1827,15 +1811,9 @@ decode_switches (int argc, char **argv) break; case 'T': - { - unsigned long int tmp_ulong; - if (xstrtoul (optarg, NULL, 0, &tmp_ulong, NULL) != LONGINT_OK - || SIZE_MAX < tmp_ulong) - error (LS_FAILURE, 0, _("invalid tab size: %s"), - quotearg (optarg)); - tabsize = tmp_ulong; - break; - } + tabsize = xnumtoumax (optarg, 0, 0, SIZE_MAX, "", + _("invalid tab size"), LS_FAILURE); + break; case 'U': sort_type = sort_none; @@ -2493,6 +2471,25 @@ parse_ls_color (void) color_symlink_as_referent = true; } +/* Set the quoting style default if the environment variable + QUOTING_STYLE is set. */ + +static void +getenv_quoting_style (void) +{ + char const *q_style = getenv ("QUOTING_STYLE"); + if (q_style) + { + int i = ARGMATCH (q_style, quoting_style_args, quoting_style_vals); + if (0 <= i) + set_quoting_style (NULL, quoting_style_vals[i]); + else + error (0, 0, + _("ignoring invalid value of environment variable QUOTING_STYLE: %s"), + quotearg (q_style)); + } +} + /* Set the exit status to report a failure. If SERIOUS, it is a serious failure; otherwise, it is merely a minor problem. */ @@ -2831,10 +2828,7 @@ clear_files (void) static bool errno_unsupported (int err) { - return (err == EINVAL - || err == ENOSYS - || err == ENOTSUP - || err == EOPNOTSUPP); + return (err == EINVAL || err == ENOSYS || is_ENOTSUP (err)); } /* Cache *getfilecon failure, when it's trivial to do so. @@ -2953,7 +2947,6 @@ gobble_file (char const *name, enum filetype type, ino_t inode, || ((print_inode || format_needs_type) && (type == symbolic_link || type == unknown) && (dereference == DEREF_ALWAYS - || (command_line_arg && dereference != DEREF_NEVER) || color_symlink_as_referent || check_symlink_color)) /* Command line dereferences are already taken care of by the above assertion that the inode number is not yet known. */ @@ -3072,7 +3065,7 @@ gobble_file (char const *name, enum filetype type, ino_t inode, ls fail just because the file (even a command line argument) isn't on the right type of file system. I.e., a getfilecon failure isn't in the same class as a stat failure. */ - if (errno == ENOTSUP || errno == EOPNOTSUPP || errno == ENODATA) + if (is_ENOTSUP (errno) || errno == ENODATA) err = 0; } @@ -3555,8 +3548,8 @@ static qsortFunc const sort_functions[][2][2][2] = }; /* The number of sort keys is calculated as the sum of - the number of elements in the sort_type enum (i.e. sort_numtypes) - the number of elements in the time_type enum (i.e. time_numtypes) - 1 + the number of elements in the sort_type enum (i.e., sort_numtypes) + the number of elements in the time_type enum (i.e., time_numtypes) - 1 This is because when sort_type==sort_time, we have up to time_numtypes possible sort keys. @@ -3668,7 +3661,8 @@ align_nstrftime (char *buf, size_t size, char const *fmt, struct tm const *tm, the replacement is not done. A malloc here slows ls down by 2% */ char rpl_fmt[sizeof (abmon[0]) + 100]; const char *pb; - if (required_mon_width && (pb = strstr (fmt, "%b"))) + if (required_mon_width && (pb = strstr (fmt, "%b")) + && 0 <= tm->tm_mon && tm->tm_mon <= 11) { if (strlen (fmt) < (sizeof (rpl_fmt) - sizeof (abmon[0]) + 2)) { @@ -4803,9 +4797,10 @@ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\ "), stdout); fputs (_("\ -C list entries by columns\n\ - --color[=WHEN] colorize the output; WHEN can be 'never', 'auto',\ + --color[=WHEN] colorize the output; WHEN can be 'always' (default\ +\n\ + if omitted), 'auto', or 'never'; more info below\ \n\ - or 'always' (the default); more info below\n\ -d, --directory list directories themselves, not their contents\n\ -D, --dired generate output designed for Emacs' dired mode\n\ "), stdout); @@ -4884,14 +4879,15 @@ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\ -s, --size print the allocated size of each file, in blocks\n\ "), stdout); fputs (_("\ - -S sort by file size\n\ + -S sort by file size, largest first\n\ --sort=WORD sort by WORD instead of name: none (-U), size (-S)\ ,\n\ time (-t), version (-v), extension (-X)\n\ --time=WORD with -l, show time as WORD instead of default\n\ - modification time: atime or access or use (-u)\n\ + modification time: atime or access or use (-u);\ +\n\ ctime or status (-c); also use specified time\n\ - as sort key if --sort=time\n\ + as sort key if --sort=time (newest first)\n\ "), stdout); fputs (_("\ --time-style=STYLE with -l, show times using style STYLE:\n\ @@ -4912,7 +4908,7 @@ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\ fputs (_("\ -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\ + otherwise: sort by access time, newest first\n\ -U do not sort; list entries in directory order\n\ -v natural sort of (version) numbers within text\n\ "), stdout); @@ -4921,7 +4917,8 @@ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\ -x list entries by lines instead of by columns\n\ -X sort alphabetically by entry extension\n\ -Z, --context print any security context of each file\n\ - -1 list one file per line\n\ + -1 list one file per line. Avoid '\\n' with -q or -b\ +\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); @@ -4940,7 +4937,7 @@ Exit status:\n\ 1 if minor problems (e.g., cannot access subdirectory),\n\ 2 if serious trouble (e.g., cannot access command-line argument).\n\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } diff --git a/src/make-prime-list.c b/src/make-prime-list.c index c01b1200..0d5b614f 100644 --- a/src/make-prime-list.c +++ b/src/make-prime-list.c @@ -3,7 +3,7 @@ Contributed to the GNU project by Torbjörn Granlund and Niels Möller Contains code from GNU MP. -Copyright 2012-2014 Free Software Foundation, Inc. +Copyright 2012-2015 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -131,7 +131,7 @@ output_primes (const struct prime *primes, unsigned nprimes) 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); + printf ("),\n UINTMAX_MAX / %u)\n", primes[i].p); p = primes[i].p; } @@ -187,7 +187,7 @@ main (int argc, char **argv) } limit = atoi (argv[1]); if (limit < 3) - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; /* Make limit odd */ if ( !(limit & 1)) @@ -211,12 +211,15 @@ main (int argc, char **argv) for (j = (p*p - 3)/2; j < size; j+= p) sieve[j] = 0; - while (i < size && sieve[++i] == 0) + while (++i < size && sieve[i] == 0) ; } output_primes (prime_list, nprimes); + free (sieve); + free (prime_list); + if (ferror (stdout) + fclose (stdout)) { fprintf (stderr, "write error: %s\n", strerror (errno)); diff --git a/src/md5sum.c b/src/md5sum.c index cc6dd49e..bc2b7092 100644 --- a/src/md5sum.c +++ b/src/md5sum.c @@ -1,5 +1,5 @@ /* Compute checksums of files or strings. - Copyright (C) 1995-2014 Free Software Foundation, Inc. + Copyright (C) 1995-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -164,18 +164,21 @@ usage (int status) printf (_("\ 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\ "), program_name, DIGEST_TYPE_STRING, DIGEST_BITS); + + emit_stdin_note (); + if (O_BINARY) fputs (_("\ +\n\ -b, --binary read in binary mode (default unless reading tty stdin)\n\ "), stdout); else fputs (_("\ +\n\ -b, --binary read in binary mode\n\ "), stdout); printf (_("\ @@ -206,11 +209,11 @@ The following four options are useful only when verifying checksums:\n\ printf (_("\ \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"), +should be a former output of this program. The default mode is to print a\n\ +line with checksum, a space, a character indicating input mode ('*' for binary,\ +\n' ' for text or where binary is insignificant), and name for each FILE.\n"), DIGEST_REFERENCE); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); @@ -874,5 +877,5 @@ main (int argc, char **argv) if (have_read_stdin && fclose (stdin) == EOF) error (EXIT_FAILURE, errno, _("standard input")); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/mkdir.c b/src/mkdir.c index eb9693cc..ff51ae1e 100644 --- a/src/mkdir.c +++ b/src/mkdir.c @@ -1,5 +1,5 @@ /* mkdir -- make directories - Copyright (C) 1990-2014 Free Software Foundation, Inc. + Copyright (C) 1990-2015 Free Software Foundation, Inc. This 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,7 +75,7 @@ Create the DIRECTORY(ies), if they do not already exist.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -151,23 +151,11 @@ static int process_dir (char *dir, struct savewd *wd, void *options) { struct mkdir_options const *o = options; - bool set_defaultcon = false; /* If possible set context before DIR created. */ if (o->set_security_context) { - if (! o->make_ancestor_function) - set_defaultcon = true; - else - { - char *pdir = dir_name (dir); - struct stat st; - if (STREQ (pdir, ".") - || (stat (pdir, &st) == 0 && S_ISDIR (st.st_mode))) - set_defaultcon = true; - free (pdir); - } - if (set_defaultcon && defaultcon (dir, S_IFDIR) < 0 + if (! o->make_ancestor_function && defaultcon (dir, S_IFDIR) < 0 && ! ignorable_ctx_err (errno)) error (0, errno, _("failed to set default creation context for %s"), quote (dir)); @@ -184,7 +172,8 @@ process_dir (char *dir, struct savewd *wd, void *options) final component of DIR is created. So for now, create the final component with the context from previous component and here we set the context for the final component. */ - if (ret == EXIT_SUCCESS && o->set_security_context && ! set_defaultcon) + if (ret == EXIT_SUCCESS && o->set_security_context + && o->make_ancestor_function) { if (! restorecon (last_component (dir), false, false) && ! ignorable_ctx_err (errno)) @@ -301,6 +290,6 @@ main (int argc, char **argv) options.mode = S_IRWXUGO; } - exit (savewd_process_files (argc - optind, argv + optind, - process_dir, &options)); + return savewd_process_files (argc - optind, argv + optind, + process_dir, &options); } diff --git a/src/mkfifo.c b/src/mkfifo.c index 415ae562..090656bd 100644 --- a/src/mkfifo.c +++ b/src/mkfifo.c @@ -1,5 +1,5 @@ /* mkfifo -- make fifo's (named pipes) - Copyright (C) 1990-2014 Free Software Foundation, Inc. + Copyright (C) 1990-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -67,7 +67,7 @@ Create named pipes (FIFOs) with the given NAMEs.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -177,5 +177,5 @@ main (int argc, char **argv) } } - exit (exit_status); + return exit_status; } diff --git a/src/mknod.c b/src/mknod.c index 8f547e9c..73342ce2 100644 --- a/src/mknod.c +++ b/src/mknod.c @@ -1,5 +1,5 @@ /* mknod -- make special files - Copyright (C) 1990-2014 Free Software Foundation, Inc. + Copyright (C) 1990-2015 Free Software Foundation, Inc. This 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,7 +83,7 @@ otherwise, as decimal. TYPE may be:\n\ p create a FIFO\n\ "), stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -94,7 +94,7 @@ main (int argc, char **argv) mode_t newmode; char const *specified_mode = NULL; int optc; - int expected_operands; + size_t expected_operands; mode_t node_type; char const *scontext = NULL; bool set_security_context = false; @@ -269,5 +269,5 @@ main (int argc, char **argv) error (EXIT_FAILURE, errno, _("cannot set permissions of %s"), quote (argv[optind])); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/mktemp.c b/src/mktemp.c index 2bd80bae..c2a449fa 100644 --- a/src/mktemp.c +++ b/src/mktemp.c @@ -1,5 +1,5 @@ /* Create a temporary file or directory, safely. - Copyright (C) 2007-2014 Free Software Foundation, Inc. + Copyright (C) 2007-2015 Free Software Foundation, Inc. This 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,7 @@ Files are created u+rw, and directories u+rwx, minus umask restrictions.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); @@ -345,5 +345,5 @@ main (int argc, char **argv) free (template); #endif - exit (status); + return status; } diff --git a/src/mv.c b/src/mv.c index 1db404ff..0bcc1bb6 100644 --- a/src/mv.c +++ b/src/mv.c @@ -1,5 +1,5 @@ /* mv -- move or rename files - Copyright (C) 1986-2014 Free Software Foundation, Inc. + Copyright (C) 1986-2015 Free Software Foundation, Inc. This 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 @@ cp_option_init (struct cp_options *x) cp_options_default (x); x->copy_as_regular = false; /* FIXME: maybe make this an option */ - x->reflink_mode = REFLINK_NEVER; + x->reflink_mode = REFLINK_AUTO; x->dereference = DEREF_NEVER; x->unlink_dest_before_opening = false; x->unlink_dest_after_failed_open = false; @@ -336,7 +336,7 @@ the VERSION_CONTROL environment variable. Here are the values:\n\ existing, nil numbered if numbered backups exist, simple otherwise\n\ simple, never always make simple backups\n\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -508,5 +508,5 @@ main (int argc, char **argv) else ok = movefile (file[0], file[1], false, &x); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/nice.c b/src/nice.c index 488ef95a..121d1c09 100644 --- a/src/nice.c +++ b/src/nice.c @@ -1,5 +1,5 @@ /* nice -- run a program with modified niceness - Copyright (C) 1990-2014 Free Software Foundation, Inc. + Copyright (C) 1990-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -85,7 +85,7 @@ With no COMMAND, print the current niceness. Niceness values range from\n\ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -187,7 +187,7 @@ main (int argc, char **argv) if (current_niceness == -1 && errno != 0) error (EXIT_CANCELED, errno, _("cannot get niceness")); printf ("%d\n", current_niceness); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } errno = 0; @@ -209,14 +209,12 @@ main (int argc, char **argv) encountered a write failure, there is no need to try calling error() again. */ if (ferror (stderr)) - exit (EXIT_CANCELED); + return EXIT_CANCELED; } execvp (argv[i], &argv[i]); - { - int exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE); - error (0, errno, "%s", argv[i]); - exit (exit_status); - } + int exit_status = errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE; + error (0, errno, "%s", argv[i]); + return exit_status; } diff --git a/src/nl.c b/src/nl.c index 982f468e..1132af39 100644 --- a/src/nl.c +++ b/src/nl.c @@ -1,5 +1,5 @@ /* nl -- number lines of files - Copyright (C) 1989-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This 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 @@ #include "fadvise.h" #include "linebuffer.h" #include "quote.h" -#include "xstrtol.h" +#include "xdectoint.h" /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "nl" @@ -178,9 +178,9 @@ Usage: %s [OPTION]... [FILE]...\n\ program_name); fputs (_("\ Write each FILE to standard output, with line numbers added.\n\ -With no FILE, or when FILE is -, read standard input.\n\ "), stdout); + emit_stdin_note (); emit_mandatory_arg_note (); fputs (_("\ @@ -223,7 +223,7 @@ FORMAT is one of:\n\ rz right justified, leading zeros\n\ \n\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -497,53 +497,27 @@ main (int argc, char **argv) } break; case 'v': - if (xstrtoimax (optarg, NULL, 10, &starting_line_number, "") - != LONGINT_OK) - { - error (0, 0, _("invalid starting line number: %s"), - quote (optarg)); - ok = false; - } + starting_line_number = xdectoimax (optarg, INTMAX_MIN, INTMAX_MAX, "", + _("invalid starting line number"), + 0); break; case 'i': - if (! (xstrtoimax (optarg, NULL, 10, &page_incr, "") == LONGINT_OK - && 0 < page_incr)) - { - error (0, 0, _("invalid line number increment: %s"), - quote (optarg)); - ok = false; - } + page_incr = xdectoimax (optarg, 1, INTMAX_MAX, "", + _("invalid line number increment"), 0); break; case 'p': reset_numbers = false; break; case 'l': - if (! (xstrtoimax (optarg, NULL, 10, &blank_join, "") == LONGINT_OK - && 0 < blank_join)) - { - error (0, 0, _("invalid number of blank lines: %s"), - quote (optarg)); - ok = false; - } + blank_join = xdectoimax (optarg, 1, INTMAX_MAX, "", + _("invalid line number of blank lines"), 0); break; case 's': separator_str = optarg; break; case 'w': - { - long int tmp_long; - if (xstrtol (optarg, NULL, 10, &tmp_long, "") != LONGINT_OK - || tmp_long <= 0 || tmp_long > INT_MAX) - { - error (0, 0, _("invalid line number field width: %s"), - quote (optarg)); - ok = false; - } - else - { - lineno_width = tmp_long; - } - } + lineno_width = xdectoimax (optarg, 1, INT_MAX, "", + _("invalid line number field width"), 0); break; case 'n': if (STREQ (optarg, "ln")) @@ -612,5 +586,5 @@ main (int argc, char **argv) if (have_read_stdin && fclose (stdin) == EOF) error (EXIT_FAILURE, errno, "-"); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/nohup.c b/src/nohup.c index eca1f512..8cdacedb 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-2014 Free Software Foundation, Inc. + Copyright (C) 2003-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -63,14 +63,14 @@ Run COMMAND, ignoring hangup signals.\n\ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); printf (_("\n\ -If standard input is a terminal, redirect it from /dev/null.\n\ +If standard input is a terminal, redirect it from an unreadable file.\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"), program_name); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -123,10 +123,8 @@ main (int argc, char **argv) if (ignoring_input) { if (fd_reopen (STDIN_FILENO, "/dev/null", O_WRONLY, 0) < 0) - { - error (0, errno, _("failed to render standard input unusable")); - exit (exit_internal_failure); - } + error (exit_internal_failure, errno, + _("failed to render standard input unusable")); if (!redirecting_stdout && !redirecting_stderr) error (0, 0, _("ignoring input")); } @@ -164,7 +162,7 @@ main (int argc, char **argv) if (in_home) error (0, saved_errno2, _("failed to open %s"), quote (in_home)); - exit (exit_internal_failure); + return exit_internal_failure; } file = in_home; } @@ -213,28 +211,23 @@ main (int argc, char **argv) error() again, particularly since we may have just changed the underlying fd out from under stderr. */ if (ferror (stderr)) - exit (exit_internal_failure); + return exit_internal_failure; signal (SIGHUP, SIG_IGN); - { - int exit_status; - int saved_errno; - char **cmd = argv + optind; - - execvp (*cmd, cmd); - exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE); - saved_errno = errno; - - /* The execve failed. Output a diagnostic to stderr only if: - - stderr was initially redirected to a non-tty, or - - stderr was initially directed to a tty, and we - can dup2 it to point back to that same tty. - In other words, output the diagnostic if possible, but only if - it will go to the original stderr. */ - if (dup2 (saved_stderr_fd, STDERR_FILENO) == STDERR_FILENO) - error (0, saved_errno, _("failed to run command %s"), quote (*cmd)); - - exit (exit_status); - } + char **cmd = argv + optind; + execvp (*cmd, cmd); + int exit_status = errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE; + int saved_errno = errno; + + /* The execve failed. Output a diagnostic to stderr only if: + - stderr was initially redirected to a non-tty, or + - stderr was initially directed to a tty, and we + can dup2 it to point back to that same tty. + In other words, output the diagnostic if possible, but only if + it will go to the original stderr. */ + if (dup2 (saved_stderr_fd, STDERR_FILENO) == STDERR_FILENO) + error (0, saved_errno, _("failed to run command %s"), quote (*cmd)); + + return exit_status; } diff --git a/src/nproc.c b/src/nproc.c index 9bfc8b39..63c78cd4 100644 --- a/src/nproc.c +++ b/src/nproc.c @@ -1,5 +1,5 @@ /* nproc - print the number of processors. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This 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,7 @@ #include "error.h" #include "nproc.h" #include "quote.h" -#include "xstrtol.h" +#include "xdectoint.h" /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "nproc" @@ -67,7 +67,7 @@ which may be less than the number of online processors\n\ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -102,11 +102,7 @@ main (int argc, char **argv) break; case IGNORE_OPTION: - if (xstrtoul (optarg, NULL, 10, &ignore, "") != LONGINT_OK) - { - error (0, 0, _("%s: invalid number to ignore"), optarg); - usage (EXIT_FAILURE); - } + ignore = xdectoumax (optarg, 0, ULONG_MAX, "", _("invalid number"),0); break; default: @@ -129,5 +125,5 @@ main (int argc, char **argv) printf ("%lu\n", nproc); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/numfmt.c b/src/numfmt.c index 206866ac..35c5c5b9 100644 --- a/src/numfmt.c +++ b/src/numfmt.c @@ -1,5 +1,5 @@ /* Reformat numbers like 11505426432 to the more human-readable 11G - Copyright (C) 2012-2014 Free Software Foundation, Inc. + Copyright (C) 2012-2015 Free Software Foundation, Inc. This 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,12 @@ #include "system.h" #include "xstrtol.h" #include "xstrndup.h" +#include "gl_linked_list.h" +#include "gl_xlist.h" + +#if HAVE_FPSETPREC +# include +#endif /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "numfmt" @@ -151,7 +157,7 @@ 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 }; +enum { MAX_UNSCALED_DIGITS = LDBL_DIG }; /* Maximum number of digits we can work with. This is equivalent to 999Y. @@ -161,8 +167,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 enum round_type round_style = round_from_zero; +static enum inval_type inval_style = inval_abort; static const char *suffix = NULL; static uintmax_t from_unit_size = 1; static uintmax_t to_unit_size = 1; @@ -171,6 +177,7 @@ static char *padding_buffer = NULL; static size_t padding_buffer_size = 0; static long int padding_width = 0; static long int zero_padding_width = 0; +static long int user_precision = -1; static const char *format_str = NULL; static char *format_str_prefix = NULL; static char *format_str_suffix = NULL; @@ -182,7 +189,10 @@ 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 bool all_fields = false; +static size_t all_fields_after = 0; +static size_t all_fields_before = 0; +static gl_list_t field_list; static int delimiter = DELIMITER_DEFAULT; /* if non-zero, the first 'header' lines from STDIN are skipped. */ @@ -382,30 +392,41 @@ simple_round_nearest (long double val) return val < 0 ? val - 0.5 : val + 0.5; } -static inline intmax_t +static inline long double _GL_ATTRIBUTE_CONST simple_round (long double val, enum round_type t) { + intmax_t rval; + intmax_t intmax_mul = val / INTMAX_MAX; + val -= (long double) INTMAX_MAX * intmax_mul; + switch (t) { case round_ceiling: - return simple_round_ceiling (val); + rval = simple_round_ceiling (val); + break; case round_floor: - return simple_round_floor (val); + rval = simple_round_floor (val); + break; case round_from_zero: - return simple_round_from_zero (val); + rval = simple_round_from_zero (val); + break; case round_to_zero: - return simple_round_to_zero (val); + rval = simple_round_to_zero (val); + break; case round_nearest: - return simple_round_nearest (val); + rval = simple_round_nearest (val); + break; default: /* to silence the compiler - this should never happen. */ return 0; } + + return (long double) INTMAX_MAX * intmax_mul + rval; } enum simple_strtod_error @@ -445,6 +466,7 @@ simple_strtod_int (const char *input_str, long double val = 0; unsigned int digits = 0; + bool found_digit = false; if (*input_str == '-') { @@ -459,10 +481,14 @@ simple_strtod_int (const char *input_str, { int digit = (**endptr) - '0'; + found_digit = true; + + if (val || digit) + digits++; + if (digits > MAX_UNSCALED_DIGITS) e = SSE_OK_PRECISION_LOSS; - ++digits; if (digits > MAX_ACCEPTABLE_DIGITS) return SSE_OVERFLOW; @@ -471,7 +497,8 @@ simple_strtod_int (const char *input_str, ++(*endptr); } - if (digits == 0) + if (! found_digit + && ! STREQ_LEN (*endptr, decimal_point, decimal_point_length)) return SSE_INVALID_NUMBER; if (*negative) val = -val; @@ -513,7 +540,6 @@ simple_strtod_float (const char *input_str, if (e != SSE_OK && e != SSE_OK_PRECISION_LOSS) return e; - /* optional decimal point + fraction. */ if (STREQ_LEN (*endptr, decimal_point, decimal_point_length)) { @@ -536,6 +562,8 @@ simple_strtod_float (const char *input_str, val_frac = ((long double) val_frac) / powerld (10, exponent); + /* TODO: detect loss of precision (only really 18 digits + of precision across all digits (before and after '.')). */ if (value) { if (negative) @@ -565,7 +593,7 @@ simple_strtod_float (const char *input_str, Returns: SSE_OK - valid number. - SSE_OK_PRECISION_LOSS - if more than 18 digits were used. + SSE_OK_PRECISION_LOSS - if more than LDBL_DIG 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 @@ -580,9 +608,12 @@ simple_strtod_human (const char *input_str, /* 'scale_auto' is checked below. */ int scale_base = default_scale_base (allowed_scaling); - devmsg ("simple_strtod_human:\n input string: %s\n " - "locale decimal-point: %s\n", - quote_n (0, input_str), quote_n (1, decimal_point)); + devmsg ("simple_strtod_human:\n input string: %s\n" + " locale decimal-point: %s\n" + " MAX_UNSCALED_DIGITS: %d\n", + quote_n (0, input_str), + quote_n (1, decimal_point), + MAX_UNSCALED_DIGITS); enum simple_strtod_error e = simple_strtod_float (input_str, endptr, value, precision); @@ -677,7 +708,7 @@ simple_strtod_fatal (enum simple_strtod_error err, char const *input_str) } - if (_invalid != inval_ignore) + if (inval_style != inval_ignore) error (conv_exit_code, 0, gettext (msgid), quote (input_str)); } @@ -729,18 +760,23 @@ double_to_human (long double val, int precision, /* 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); + devmsg (" scaled value to %Lf * %0.f ^ %u\n", val, scale_base, power); /* Perform rounding. */ - int ten_or_less = 0; - if (absld (val) < 10) + unsigned int power_adjust = 0; + if (user_precision != -1) + power_adjust = MIN (power * 3, user_precision); + else 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; + power_adjust = 1; } + + val *= powerld (10, power_adjust); val = simple_round (val, round); + val /= powerld (10, power_adjust); + /* 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. */ @@ -749,20 +785,21 @@ double_to_human (long double val, int precision, 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); + devmsg (" after rounding, value=%Lf * %0.f ^ %u\n", val, scale_base, power); - stpcpy (pfmt, show_decimal_point ? ".1Lf%s" : ".0Lf%s"); + stpcpy (pfmt, ".*Lf%s"); + + int prec = user_precision == -1 ? show_decimal_point : user_precision; /* buf_size - 1 used here to ensure place for possible scale_IEC_I suffix. */ - num_size = snprintf (buf, buf_size - 1, fmt, val, suffix_power_char (power)); + num_size = snprintf (buf, buf_size - 1, fmt, prec, val, + suffix_power_char (power)); if (num_size < 0 || num_size >= (int) buf_size - 1) error (EXIT_FAILURE, 0, _("failed to prepare value '%Lf' for printing"), val); @@ -776,19 +813,48 @@ double_to_human (long double val, int precision, } /* Convert a string of decimal digits, N_STRING, with an optional suffix - to an integral value. Upon successful conversion, return that value. + to an integral value. Suffixes are handled as with --from=auto. + 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; + const char *c_string = n_string; + char *t_string = NULL; + size_t n_len = strlen (n_string); char *end = NULL; uintmax_t n; + const char *suffixes = "KMGTPEZY"; + + /* Adjust suffixes so K=1000, Ki=1024, KiB=invalid. */ + if (n_len && ! c_isdigit (n_string[n_len - 1])) + { + t_string = xmalloc (n_len + 2); + end = t_string + n_len - 1; + memcpy (t_string, n_string, n_len); - s_err = xstrtoumax (n_string, &end, 10, &n, "KMGTPEZY"); + if (*end == 'i' && 2 <= n_len && ! c_isdigit (*(end - 1))) + *end = '\0'; + else + { + *++end = 'B'; + *++end = '\0'; + suffixes = "KMGTPEZY0"; + } + + c_string = t_string; + } + + s_err = xstrtoumax (c_string, &end, 10, &n, suffixes); if (s_err != LONGINT_OK || *end || n == 0) - error (EXIT_FAILURE, 0, _("invalid unit size: %s"), quote (n_string)); + { + free (t_string); + error (EXIT_FAILURE, 0, _("invalid unit size: %s"), quote (n_string)); + } + + free (t_string); return n; } @@ -825,7 +891,8 @@ Reformat NUMBER(s), or the numbers from standard input if none are specified.\n\ -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\ + --field=FIELDS replace the numbers in these input fields (default=1)\n\ + see FIELDS below\n\ "), stdout); fputs (_("\ --format=FORMAT use printf style floating-point FORMAT;\n\ @@ -903,11 +970,22 @@ UNIT options:\n"), stdout); 1Mi = 1048576,\n\ ...\n"), stdout); + fputs (_("\n\ +FIELDS supports cut(1) style field ranges:\n\ + N N'th field, counted from 1\n\ + N- from N'th field, to end of line\n\ + N-M from N'th to M'th field (inclusive)\n\ + -M from first to M'th field (inclusive)\n\ + - all fields\n\ +Multiple fields/ranges can be separated with commas\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 zero (%010f) width\n\ will zero pad the number. Optional negative values (%-10f) will left align.\n\ +Optional precision (%.1f) will override the input determined precision.\n\ "), stdout); printf (_("\n\ @@ -931,14 +1009,14 @@ Examples:\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\ + $ df -B1 | %s --header --field 2-4 --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 (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -951,7 +1029,6 @@ Examples:\n\ Only a limited subset of printf(3) syntax is supported. TODO: - support .precision support %e %g etc. rather than just %f NOTES: @@ -1005,7 +1082,7 @@ parse_format_string (char const *fmt) if (endptr != (fmt + i) && pad != 0) { if (debug && padding_width && !(zero_padding && pad > 0)) - error (0, 0, _("--format padding overridding --padding")); + error (0, 0, _("--format padding overriding --padding")); if (pad < 0) { @@ -1026,9 +1103,28 @@ parse_format_string (char const *fmt) if (fmt[i] == '\0') error (EXIT_FAILURE, 0, _("format %s ends in %%"), quote (fmt)); + if (fmt[i] == '.') + { + i++; + errno = 0; + user_precision = strtol (fmt + i, &endptr, 10); + if (errno == ERANGE || user_precision < 0 || SIZE_MAX < user_precision + || isblank (fmt[i]) || fmt[i] == '+') + { + /* Note we disallow negative user_precision to be + consistent with printf(1). POSIX states that + negative precision is only supported (and ignored) + when used with '.*f'. glibc at least will malform + output when passed a direct negative precision. */ + error (EXIT_FAILURE, 0, + _("invalid precision in format %s"), quote (fmt)); + } + i = endptr - fmt; + } + if (fmt[i] != 'f') error (EXIT_FAILURE, 0, _("invalid format %s," - " directive must be %%[0]['][-][N]f"), + " directive must be %%[0]['][-][N][.][N]f"), quote (fmt)); i++; suffix_pos = i; @@ -1077,7 +1173,7 @@ parse_human_number (const char *str, long double /*output */ *value, if (ptr && *ptr != '\0') { - if (_invalid != inval_ignore) + if (inval_style != inval_ignore) error (conv_exit_code, 0, _("invalid suffix in input %s: %s"), quote_n (0, str), quote_n (1, ptr)); e = SSE_INVALID_SUFFIX; @@ -1094,27 +1190,39 @@ prepare_padded_number (const long double val, size_t precision) /* Generate Output. */ char buf[128]; + size_t precision_used = user_precision == -1 ? precision : user_precision; + /* 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 (scale_to == scale_none + && x + precision_used > MAX_UNSCALED_DIGITS) { - if (_invalid != inval_ignore) - error (conv_exit_code, 0, _("value too large to be printed: '%Lg'" - " (consider using --to)"), val); + if (inval_style != inval_ignore) + { + if (precision_used) + error (conv_exit_code, 0, + _("value/precision too large to be printed: '%Lg/%"PRIuMAX"'" + " (consider using --to)"), val, (uintmax_t)precision_used); + else + 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) + if (inval_style != 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); + double_to_human (val, precision_used, buf, sizeof (buf), + scale_to, grouping, round_style); if (suffix) strncat (buf, suffix, sizeof (buf) - strlen (buf) -1); @@ -1153,7 +1261,8 @@ print_padded_number (void) /* 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) +process_suffixed_number (char *text, long double *result, + size_t *precision, long int field) { if (suffix && strlen (text) > strlen (suffix)) { @@ -1204,139 +1313,253 @@ process_suffixed_number (char *text, long double *result, size_t *precision) 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 * _GL_ATTRIBUTE_PURE -skip_fields (char *buf, int fields) +typedef struct range_pair { - 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 (to_uchar (*ptr))) - ++ptr; - while (*ptr && !isblank (to_uchar (*ptr))) - ++ptr; - } - return ptr; + size_t lo; + size_t hi; +} range_pair_t; + +static int +sort_field (const void *elt1, const void *elt2) +{ + range_pair_t* rp1 = (range_pair_t*) elt1; + range_pair_t* rp2 = (range_pair_t*) elt2; + + if (rp1->lo < rp2->lo) + return -1; + + return rp1->lo > rp2->lo; } -/* Parse a delimited string, and extracts the requested field. - NOTE: the input buffer is modified. +static int +match_field (const void *elt1, const void *elt2) +{ + range_pair_t* rp = (range_pair_t*) elt1; + size_t field = *(size_t*) elt2; - 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? + if (rp->lo <= field && field <= rp->hi) + return 0; + + if (rp->lo < field) + return -1; + + return 1; +} - 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) +free_field (const void *elt) { - char *ptr = line; - *_prefix = NULL; - *_data = NULL; - *_suffix = NULL; + void *p = (void *)elt; + free (p); +} - devmsg ("extracting Fields:\n input: %s\n field: %d\n", - quote (line), _field); +/* Add the specified fields to field_list. + The format recognized is similar to cut. + TODO: Refactor the more performant cut implementation + for use by both utilities. */ +static void +parse_field_arg (char *arg) +{ + + char *start, *end; + range_pair_t *rp; + size_t field_val; + size_t range_val = 0; + + start = end = arg; - if (field > 1) + if (STREQ (arg, "-")) { - /* 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", quote (*_prefix)); - return; - } + all_fields = true; + + return; + } + + if (*start == '-') + { + /* range -M */ + ++start; + + all_fields_before = strtol (start, &end, 10); + + if (start == end || all_fields_before <=0) + error (EXIT_FAILURE, 0, _("invalid field value %s"), + quote (start)); + + return; + } + + field_list = gl_list_create_empty (GL_LINKED_LIST, + NULL, NULL, free_field, false); + + while (*end != '\0') { + field_val = strtol (start, &end, 10); + + if (start == end || field_val <=0) + error (EXIT_FAILURE, 0, _("invalid field value %s"), + quote (start)); + + if (! range_val) + { + /* field N */ + rp = xmalloc (sizeof (*rp)); + rp->lo = rp->hi = field_val; + gl_sortedlist_add (field_list, sort_field, rp); + } + else + { + /* range N-M + The last field was the start of the field range. The current + field is the end of the field range. We already added the + start field, so increment and add all the fields through + range end. */ + if (field_val < range_val) + error (EXIT_FAILURE, 0, _("invalid decreasing range")); + rp = xmalloc (sizeof (*rp)); + rp->lo = range_val + 1; + rp->hi = field_val; + gl_sortedlist_add (field_list, sort_field, rp); + + range_val = 0; + } + + switch (*end) { + case ',': + /* discrete field separator */ + ++end; + start = end; + break; - *ptr = '\0'; - ++ptr; + case '-': + /* field range separator */ + ++end; + start = end; + range_val = field_val; + break; } + } - *_data = ptr; - *_suffix = skip_fields (*_data, 1); - if (**_suffix) + if (range_val) { - /* 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); + /* range N- + range_val was not reset indicating ARG + ended with a trailing '-' */ + all_fields_after = range_val; + } +} + +/* Return a pointer to the beginning of the next field in line. + The line pointer is moved to the end of the next field. */ +static char* +next_field (char **line) +{ + char *field_start = *line; + char *field_end = field_start; + + if (delimiter != DELIMITER_DEFAULT) + { + if (*field_start != delimiter) + { + while (*field_end && *field_end != delimiter) + ++field_end; + } + /* else empty field */ } else - *_suffix = NULL; + { + /* keep any space prefix in the returned field */ + while (*field_end && isblank (to_uchar (*field_end))) + ++field_end; - devmsg (" prefix: %s\n number: %s\n suffix: %s\n", - quote_n (0, *_prefix ? *_prefix : ""), - quote_n (1, *_data), - quote_n (2, *_suffix ? *_suffix : "")); + while (*field_end && !isblank (to_uchar (*field_end))) + ++field_end; + } + + *line = field_end; + return field_start; } +static bool +include_field (size_t field) +{ + if (all_fields) + return true; -/* 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) + if (all_fields_after && all_fields_after <= field) + return true; + + if (all_fields_before && field <= all_fields_before) + return true; + + /* default to field 1 */ + if (! field_list) + return field == 1; + + return gl_sortedlist_search (field_list, match_field, &field); +} + +/* Convert and output the given field. If it is not included in the set + of fields to process just output the original */ +static bool +process_field (char *text, size_t field) { - 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); + bool valid_number = true; - if (num) + if (include_field (field)) { - valid_number = process_suffixed_number (num, &val, &precision); + valid_number = + process_suffixed_number (text, &val, &precision, field); + if (valid_number) valid_number = prepare_padded_number (val, precision); + + if (valid_number) + print_padded_number (); + else + fputs (text, stdout); } + else + fputs (text, stdout); - if (pre) - fputs (pre, stdout); + return valid_number; +} - if (pre && num) - fputc ((delimiter == DELIMITER_DEFAULT) ? ' ' : delimiter, stdout); +/* Convert 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 *next; + size_t field = 0; + bool valid_number = true; - if (valid_number) - { - print_padded_number (); - } - else - { - if (num) - fputs (num, stdout); - } + while (true) { + ++field; + next = next_field (&line); - if (suf) - { - fputc ((delimiter == DELIMITER_DEFAULT) ? ' ' : delimiter, stdout); - fputs (suf, stdout); - } + if (*line != '\0') + { + /* nul terminate the current field string and process */ + *line = '\0'; + + if (! process_field (next, field)) + valid_number = false; + + fputc ((delimiter == DELIMITER_DEFAULT) ? + ' ' : delimiter, stdout); + ++line; + } + else + { + /* end of the line, process the last field and finish */ + if (! process_field (next, field)) + valid_number = false; + + break; + } + } if (newline) putchar ('\n'); @@ -1355,6 +1578,11 @@ main (int argc, char **argv) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); +#if HAVE_FPSETPREC + /* Enabled extended precision if needed. */ + fpsetprec (FP_PE); +#endif + decimal_point = nl_langinfo (RADIXCHAR); if (decimal_point == NULL || strlen (decimal_point) == 0) decimal_point = "."; @@ -1390,7 +1618,7 @@ main (int argc, char **argv) break; case ROUND_OPTION: - _round = XARGMATCH ("--round", optarg, round_args, round_types); + round_style = XARGMATCH ("--round", optarg, round_args, round_types); break; case GROUPING_OPTION: @@ -1412,10 +1640,12 @@ main (int argc, char **argv) break; case FIELD_OPTION: - if (xstrtol (optarg, NULL, 10, &field, "") != LONGINT_OK - || field <= 0) - error (EXIT_FAILURE, 0, _("invalid field value %s"), - quote (optarg)); + if (all_fields || all_fields_before || all_fields_after || field_list) + { + error (EXIT_FAILURE, 0, + _("multiple field specifications")); + } + parse_field_arg (optarg); break; case 'd': @@ -1458,7 +1688,8 @@ main (int argc, char **argv) break; case INVALID_OPTION: - _invalid = XARGMATCH ("--invalid", optarg, inval_args, inval_types); + inval_style = XARGMATCH ("--invalid", optarg, + inval_args, inval_types); break; case_GETOPT_HELP_CHAR; @@ -1492,7 +1723,7 @@ main (int argc, char **argv) setup_padding_buffer (padding_width); auto_padding = (padding_width == 0 && delimiter == DELIMITER_DEFAULT); - if (_invalid != inval_abort) + if (inval_style != inval_abort) conv_exit_code = 0; if (argc > optind) @@ -1526,17 +1757,22 @@ main (int argc, char **argv) error (0, errno, _("error reading input")); } +#ifdef lint free (padding_buffer); free (format_str_prefix); free (format_str_suffix); + if (field_list) + gl_list_free (field_list); +#endif 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) + if (!valid_numbers + && inval_style != inval_warn && inval_style != inval_ignore) exit_status = EXIT_CONVERSION_WARNINGS; - exit (exit_status); + return exit_status; } diff --git a/src/od.c b/src/od.c index 7bc0e2a8..0ca3ca78 100644 --- a/src/od.c +++ b/src/od.c @@ -1,5 +1,5 @@ /* od -- dump files in octal and other formats - Copyright (C) 1992-2014 Free Software Foundation, Inc. + Copyright (C) 1992-2015 Free Software Foundation, Inc. This 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,7 @@ #include "error.h" #include "ftoastr.h" #include "quote.h" +#include "stat-size.h" #include "xfreopen.h" #include "xprintf.h" #include "xstrtol.h" @@ -327,10 +328,12 @@ Usage: %s [OPTION]... [FILE]...\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\ "), stdout); + + emit_stdin_note (); + 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\ @@ -414,7 +417,7 @@ BYTES is hex with 0x or 0X prefix, and may have a multiplier suffix:\n\ M 1024*1024\n\ and so on for G, T, P, E, Z, Y.\n\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -1034,9 +1037,11 @@ skip (uintmax_t n_skip) If the number of bytes left to skip is larger than the size of the current file, we can decrement n_skip and go on to the next file. Skip this optimization also - when st_size is 0, because some kernels report that - nonempty files in /proc have st_size == 0. */ - if (S_ISREG (file_stats.st_mode) && 0 < file_stats.st_size) + when st_size is no greater than the block size, because + some kernels report nonsense small file sizes for + proc-like file systems. */ + if (usable_st_size (&file_stats) + && ST_BLKSIZE (file_stats) < file_stats.st_size) { if ((uintmax_t) file_stats.st_size < n_skip) n_skip -= file_stats.st_size; @@ -1052,6 +1057,7 @@ skip (uintmax_t n_skip) } /* If it's not a regular file with nonnegative size, + or if it's so small that it might be in a proc-like file system, position the file pointer by reading. */ else @@ -1067,10 +1073,15 @@ skip (uintmax_t n_skip) n_skip -= n_bytes_read; if (n_bytes_read != n_bytes_to_read) { - in_errno = errno; - ok = false; - n_skip = 0; - break; + if (ferror (in_stream)) + { + in_errno = errno; + ok = false; + n_skip = 0; + break; + } + if (feof (in_stream)) + break; } } } @@ -1280,9 +1291,6 @@ read_block (size_t n, char *block, size_t *n_bytes_in_buffer) *n_bytes_in_buffer = 0; - if (n == 0) - return true; - while (in_stream != NULL) /* EOF. */ { size_t n_needed; @@ -1781,7 +1789,7 @@ main (int argc, char **argv) } if (!ok) - exit (EXIT_FAILURE); + return EXIT_FAILURE; if (flag_dump_strings && n_specs > 0) error (EXIT_FAILURE, 0, @@ -1953,7 +1961,8 @@ main (int argc, char **argv) } #ifdef DEBUG - printf ("lcm=%d, width_per_block=%zu\n", l_c_m, width_per_block); + printf ("lcm=%d, width_per_block=%"PRIuMAX"\n", l_c_m, + (uintmax_t) width_per_block); for (i = 0; i < n_specs; i++) { int fields_per_block = bytes_per_block / width_bytes[spec[i].size]; @@ -1972,5 +1981,5 @@ cleanup: if (have_read_stdin && fclose (stdin) == EOF) error (EXIT_FAILURE, errno, _("standard input")); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/operand2sig.c b/src/operand2sig.c index eb40f364..bc3b2279 100644 --- a/src/operand2sig.c +++ b/src/operand2sig.c @@ -1,5 +1,5 @@ /* operand2sig.c -- common function for parsing signal specifications - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free 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 04d27d1a..9babe6ad 100644 --- a/src/operand2sig.h +++ b/src/operand2sig.h @@ -1,6 +1,6 @@ /* operand2sig.h -- prototype for signal specification function - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free 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 3663aaf6..7a5b5d7a 100644 --- a/src/paste.c +++ b/src/paste.c @@ -1,5 +1,5 @@ /* paste - merge lines of files - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. Copyright (C) 1984 David M. Ihnat This program is free software: you can redistribute it and/or modify @@ -235,7 +235,7 @@ paste_parallel (size_t nfiles, char **fnamptr) { int chr IF_LINT ( = 0); /* Input character. */ int err IF_LINT ( = 0); /* Input errno value. */ - size_t line_length = 0; /* Number of chars in line. */ + bool sometodo = false; /* Input chars to process. */ if (fileptr[i]) { @@ -250,7 +250,7 @@ paste_parallel (size_t nfiles, char **fnamptr) while (chr != EOF) { - line_length++; + sometodo = true; if (chr == '\n') break; xputchar (chr); @@ -259,7 +259,7 @@ paste_parallel (size_t nfiles, char **fnamptr) } } - if (line_length == 0) + if (! sometodo) { /* EOF, read error, or closed file. If an EOF or error, close the file. */ @@ -439,9 +439,9 @@ Usage: %s [OPTION]... [FILE]...\n\ fputs (_("\ 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\ "), stdout); + emit_stdin_note (); emit_mandatory_arg_note (); fputs (_("\ @@ -451,7 +451,7 @@ With no FILE, or when FILE is -, read standard input.\n\ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); /* FIXME: add a couple of examples. */ - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -518,5 +518,5 @@ main (int argc, char **argv) if (have_read_stdin && fclose (stdin) == EOF) error (EXIT_FAILURE, errno, "-"); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/pathchk.c b/src/pathchk.c index 4b3884fe..e05ecf7f 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-2014 Free Software Foundation, Inc. + Copyright (C) 1991-2015 Free Software Foundation, Inc. This 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,7 @@ Diagnose invalid or unportable file names.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -153,7 +153,7 @@ main (int argc, char **argv) ok &= validate_file_name (argv[optind], check_basic_portability, check_extra_portability); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } /* If FILE contains a component with a leading "-", report an error diff --git a/src/pinky.c b/src/pinky.c index c48e1705..71650bfa 100644 --- a/src/pinky.c +++ b/src/pinky.c @@ -1,5 +1,5 @@ /* GNU's pinky. - Copyright (C) 1992-2014 Free Software Foundation, Inc. + Copyright (C) 1992-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -445,8 +445,7 @@ scan_entries (size_t n, const STRUCT_UTMP *utmp_buf, int i; for (i = 0; i < argc_names; i++) - if (strncmp (UT_USER (utmp_buf), argv_names[i], UT_USER_SIZE) - == 0) + if (STREQ_LEN (UT_USER (utmp_buf), argv_names[i], UT_USER_SIZE)) { print_entry (utmp_buf); break; @@ -515,7 +514,7 @@ usage (int status) A lightweight 'finger' program; print user information.\n\ The utmp file will be %s.\n\ "), UTMP_FILE); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -604,5 +603,5 @@ main (int argc, char **argv) else long_pinky (n_users, argv + optind); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/pr.c b/src/pr.c index 1515b4a4..d79d84f1 100644 --- a/src/pr.c +++ b/src/pr.c @@ -1,5 +1,5 @@ /* pr -- convert text files for printing. - Copyright (C) 1988-2014 Free Software Foundation, Inc. + Copyright (C) 1988-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -46,7 +46,7 @@ only one POSIX requirement has to be met: The default n-separator should be a TAB. The consequence is a different width between the number and the text if the output position - of the separator changes, i.e. it depends upon the left margin used. + of the separator changes, i.e., it depends upon the left margin used. That's not nice but easy-to-use together with the defaults of other utilities, e.g. sort or cut. - Same as SunOS does. - With multicolumn output @@ -322,6 +322,7 @@ #include "stdio--.h" #include "strftime.h" #include "xstrtol.h" +#include "xdectoint.h" /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "pr" @@ -424,6 +425,8 @@ static bool skip_to_page (uintmax_t page); static void print_header (void); static void pad_across_to (int position); static void add_line_number (COLUMN *p); +static void getoptnum (const char *n_str, int min, int *num, + const char *errfmt); static void getoptarg (char *arg, char switch_char, char *character, int *number); static void print_files (int number_of_files, char **av); @@ -435,7 +438,7 @@ static void init_store_cols (void); static void store_columns (void); static void balance (int total_stored); static void store_char (char c); -static void pad_down (int lines); +static void pad_down (unsigned int lines); static void read_rest_of_line (COLUMN *p); static void skip_read (COLUMN *p, int column_number); static void print_char (char c); @@ -768,12 +771,12 @@ static struct option const long_options[] = /* Return the number of columns that have either an open file or stored lines. */ -static int _GL_ATTRIBUTE_PURE +static unsigned int _GL_ATTRIBUTE_PURE cols_ready_to_print (void) { COLUMN *q; - int i; - int n; + unsigned int i; + unsigned int n; n = 0; for (q = column_vector, i = 0; i < columns; ++q, ++i) @@ -820,18 +823,12 @@ first_last_page (int oi, char c, char const *pages) /* Parse column count string S, and if it's valid (1 or larger and within range of the type of 'columns') set the global variables - columns and explicit_columns and return true. - Otherwise, exit with a diagnostic. */ + columns and explicit_columns. Otherwise, exit with a diagnostic. */ + static void parse_column_count (char const *s) { - long int tmp_long; - if (xstrtol (s, NULL, 10, &tmp_long, "") != LONGINT_OK - || !(1 <= tmp_long && tmp_long <= INT_MAX)) - error (EXIT_FAILURE, 0, - _("invalid number of columns: %s"), quote (s)); - - columns = tmp_long; + getoptnum (s, 1, &columns, _("invalid number of columns")); explicit_columns = true; } @@ -966,18 +963,9 @@ main (int argc, char **argv) join_lines = true; break; case 'l': - { - long int tmp_long; - if (xstrtol (optarg, NULL, 10, &tmp_long, "") != LONGINT_OK - || tmp_long <= 0 || tmp_long > INT_MAX) - { - error (EXIT_FAILURE, 0, - _("'-l PAGE_LENGTH' invalid number of lines: %s"), - quote (optarg)); - } - lines_per_page = tmp_long; - break; - } + getoptnum (optarg, 1, &lines_per_page, + _("'-l PAGE_LENGTH' invalid number of lines")); + break; case 'm': parallel_files = true; storing_columns = false; @@ -990,28 +978,13 @@ main (int argc, char **argv) break; case 'N': skip_count = false; - { - long int tmp_long; - if (xstrtol (optarg, NULL, 10, &tmp_long, "") != LONGINT_OK - || tmp_long > INT_MAX) - { - error (EXIT_FAILURE, 0, - _("'-N NUMBER' invalid starting line number: %s"), - quote (optarg)); - } - start_line_num = tmp_long; - break; - } + getoptnum (optarg, INT_MIN, &start_line_num, + _("'-N NUMBER' invalid starting line number")); + break; case 'o': - { - long int tmp_long; - if (xstrtol (optarg, NULL, 10, &tmp_long, "") != LONGINT_OK - || tmp_long < 0 || tmp_long > INT_MAX) - error (EXIT_FAILURE, 0, - _("'-o MARGIN' invalid line offset: %s"), quote (optarg)); - chars_per_margin = tmp_long; - break; - } + getoptnum (optarg, 0, &chars_per_margin, + _("'-o MARGIN' invalid line offset")); + break; case 'r': ignore_failed_opens = true; break; @@ -1045,29 +1018,19 @@ main (int argc, char **argv) old_options = true; old_w = true; { - long int tmp_long; - if (xstrtol (optarg, NULL, 10, &tmp_long, "") != LONGINT_OK - || tmp_long <= 0 || tmp_long > INT_MAX) - error (EXIT_FAILURE, 0, - _("'-w PAGE_WIDTH' invalid number of characters: %s"), - quote (optarg)); - if (!truncate_lines) - chars_per_line = tmp_long; - break; + int tmp_cpl; + getoptnum (optarg, 1, &tmp_cpl, + _("'-w PAGE_WIDTH' invalid number of characters")); + if (! truncate_lines) + chars_per_line = tmp_cpl; } + break; case 'W': old_w = false; /* dominates -w */ truncate_lines = true; - { - long int tmp_long; - if (xstrtol (optarg, NULL, 10, &tmp_long, "") != LONGINT_OK - || tmp_long <= 0 || tmp_long > INT_MAX) - error (EXIT_FAILURE, 0, - _("'-W PAGE_WIDTH' invalid number of characters: %s"), - quote (optarg)); - chars_per_line = tmp_long; - break; - } + getoptnum (optarg, 1, &chars_per_line, + _("'-W PAGE_WIDTH' invalid number of characters")); + break; case_GETOPT_HELP_CHAR; case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); default: @@ -1170,9 +1133,16 @@ main (int argc, char **argv) if (have_read_stdin && fclose (stdin) == EOF) error (EXIT_FAILURE, errno, _("standard input")); - if (failed_opens) - exit (EXIT_FAILURE); - exit (EXIT_SUCCESS); + return failed_opens ? EXIT_FAILURE : EXIT_SUCCESS; +} + +/* Parse numeric arguments, ensuring MIN <= number <= INT_MAX. */ + +static void +getoptnum (const char *n_str, int min, int *num, const char *err) +{ + intmax_t tnum = xdectoimax (n_str, min, INT_MAX, "", err, 0); + *num = tnum; } /* Parse options of the form -scNNN. @@ -1190,9 +1160,9 @@ getoptarg (char *arg, char switch_char, char *character, int *number) { long int tmp_long; if (xstrtol (arg, NULL, 10, &tmp_long, "") != LONGINT_OK - || tmp_long <= 0 || tmp_long > INT_MAX) + || tmp_long <= 0 || INT_MAX < tmp_long) { - error (0, 0, + error (0, INT_MAX < tmp_long ? EOVERFLOW : errno, _("'-%c' extra characters or invalid number in the argument: %s"), switch_char, quote (arg)); usage (EXIT_FAILURE); @@ -1817,7 +1787,7 @@ print_page (void) --p->lines_to_print; if (p->lines_to_print <= 0) { - if (cols_ready_to_print () <= 0) + if (cols_ready_to_print () == 0) break; } @@ -1851,7 +1821,7 @@ print_page (void) --lines_left_on_page; } - if (cols_ready_to_print () <= 0 && !extremities) + if (cols_ready_to_print () == 0 && !extremities) break; if (double_space && pv) @@ -2082,9 +2052,9 @@ pad_across_to (int position) Otherwise, use newlines. */ static void -pad_down (int lines) +pad_down (unsigned int lines) { - int i; + unsigned int i; if (use_form_feed) putchar ('\f'); @@ -2758,6 +2728,7 @@ Usage: %s [OPTION]... [FILE]...\n\ Paginate or columnate FILE(s) for printing.\n\ "), stdout); + emit_stdin_note (); emit_mandatory_arg_note (); fputs (_("\ @@ -2798,7 +2769,10 @@ Paginate or columnate FILE(s) for printing.\n\ fputs (_("\ -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\ + (default number of lines of text 56, and with -F 63).\n\ + implies -t if PAGE_LENGTH <= 10\n\ +"), stdout); + fputs (_("\ -m, --merge print all files in parallel, one in each column,\n\ truncate lines, but join lines of full length with -J\n\ "), stdout); @@ -2830,7 +2804,10 @@ Paginate or columnate FILE(s) for printing.\n\ separate columns by STRING,\n\ without -S: Default separator with -J and \n\ otherwise (same as -S\" \"), no effect on column options\n\ - -t, --omit-header omit page headers and trailers\n\ +"), stdout); + fputs (_("\ + -t, --omit-header omit page headers and trailers;\n\ + implied if PAGE_LENGTH <= 10\n\ "), stdout); fputs (_("\ -T, --omit-pagination\n\ @@ -2850,12 +2827,7 @@ Paginate or columnate FILE(s) for printing.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - fputs (_("\ -\n\ --t is implied if PAGE_LENGTH <= 10. With no FILE, or when FILE is -, read\n\ -standard input.\n\ -"), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } diff --git a/src/printenv.c b/src/printenv.c index e1faeb5f..6e8dbe6a 100644 --- a/src/printenv.c +++ b/src/printenv.c @@ -1,5 +1,5 @@ /* printenv -- print all or part of environment - Copyright (C) 1989-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This 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,7 @@ If no VARIABLE is specified, print name and value pairs for them all.\n\ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -150,5 +150,5 @@ main (int argc, char **argv) ok = (matches == argc - optind); } - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/printf.c b/src/printf.c index 7d523100..4260519d 100644 --- a/src/printf.c +++ b/src/printf.c @@ -1,5 +1,5 @@ /* printf - format and print data - Copyright (C) 1990-2014 Free Software Foundation, Inc. + Copyright (C) 1990-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -129,7 +129,7 @@ and all C format specifications ending with one of diouxXfeEgGcs, with\n\ ARGUMENTs converted to proper type first. Variable widths are handled.\n\ "), stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -657,7 +657,7 @@ main (int argc, char **argv) { version_etc (stdout, PROGRAM_NAME, PACKAGE_NAME, Version, AUTHORS, (char *) NULL); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } } @@ -692,5 +692,5 @@ main (int argc, char **argv) _("warning: ignoring excess arguments, starting with %s"), quote (argv[0])); - exit (exit_status); + return exit_status; } diff --git a/src/prog-fprintf.c b/src/prog-fprintf.c index 4d3b449f..e7a96069 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free 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 93df75a7..c639cd45 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-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free 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 d165e966..3aea4cdf 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-2014 Free Software Foundation, Inc. + Copyright (C) 1990-2015 Free Software Foundation, Inc. François Pinard , 1988. This program is free software: you can redistribute it and/or modify @@ -631,9 +631,9 @@ sort_found_occurs (void) { /* Only one language for the time being. */ - - qsort (occurs_table[0], number_of_occurs[0], sizeof **occurs_table, - compare_occurs); + if (number_of_occurs[0]) + qsort (occurs_table[0], number_of_occurs[0], sizeof **occurs_table, + compare_occurs); } /* Parameter files reading routines. */ @@ -1825,12 +1825,16 @@ Usage: %s [OPTION]... [INPUT]... (without -G)\n\ Output a permuted index, including context, of the words in the input files.\n\ "), stdout); + emit_stdin_note (); emit_mandatory_arg_note (); fputs (_("\ -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\ +"), stdout); + fputs (_("\ + -F, --flag-truncation=STRING use STRING for flagging line truncations.\n\ + The default is '/'\n\ "), stdout); fputs (_("\ -M, --macro-name=STRING macro name to use instead of 'xx'\n\ @@ -1854,11 +1858,7 @@ Output a permuted index, including context, of the words in the input files.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - fputs (_("\ -\n\ -With no FILE, or when FILE is -, read standard input. Default is '-F /'.\n\ -"), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -2155,5 +2155,5 @@ main (int argc, char **argv) /* All done. */ - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/pwd.c b/src/pwd.c index d126ed75..9b9ddeb2 100644 --- a/src/pwd.c +++ b/src/pwd.c @@ -1,5 +1,5 @@ /* pwd - print current directory - Copyright (C) 1994-2014 Free Software Foundation, Inc. + Copyright (C) 1994-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -68,7 +68,7 @@ Print the full filename of the current working directory.\n\ If no option is specified, -P is assumed.\n\ "), stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -372,7 +372,7 @@ main (int argc, char **argv) if (wd) { puts (wd); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } } @@ -390,5 +390,5 @@ main (int argc, char **argv) file_name_free (file_name); } - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/readlink.c b/src/readlink.c index f46d948e..1778f639 100644 --- a/src/readlink.c +++ b/src/readlink.c @@ -1,5 +1,5 @@ /* readlink -- display value of a symbolic link. - Copyright (C) 2002-2014 Free Software Foundation, Inc. + Copyright (C) 2002-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -85,7 +85,7 @@ usage (int status) "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -174,5 +174,5 @@ main (int argc, char **argv) } } - exit (status); + return status; } diff --git a/src/realpath.c b/src/realpath.c index 0c553271..d1fca7b3 100644 --- a/src/realpath.c +++ b/src/realpath.c @@ -1,5 +1,5 @@ /* realpath - print the resolved path - Copyright (C) 2011-2014 Free Software Foundation, Inc. + Copyright (C) 2011-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -88,7 +88,7 @@ all but the last component must exist\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -273,5 +273,5 @@ main (int argc, char **argv) for (; optind < argc; ++optind) ok &= process_path (argv[optind], can_mode); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/relpath.c b/src/relpath.c index 29472e57..5ba4b9c1 100644 --- a/src/relpath.c +++ b/src/relpath.c @@ -1,5 +1,5 @@ /* relpath - print the relative path - Copyright (C) 2012-2014 Free Software Foundation, Inc. + Copyright (C) 2012-2015 Free Software Foundation, Inc. This program is free 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 9017653a..759a8578 100644 --- a/src/relpath.h +++ b/src/relpath.h @@ -1,5 +1,5 @@ /* relpath - print the relative path - Copyright (C) 2012-2014 Free Software Foundation, Inc. + Copyright (C) 2012-2015 Free Software Foundation, Inc. This program is free 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 4cc4a081..db8f993e 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-2014 Free Software Foundation, Inc. + Copyright (C) 1988-2015 Free Software Foundation, Inc. This program is free 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.h b/src/remove.h index 2563553d..a4501920 100644 --- a/src/remove.h +++ b/src/remove.h @@ -1,6 +1,6 @@ /* Remove directory entries. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/rm.c b/src/rm.c index 5baea153..c1a23d5f 100644 --- a/src/rm.c +++ b/src/rm.c @@ -1,5 +1,5 @@ /* 'rm' file deletion utility for GNU. - Copyright (C) 1988-2014 Free Software Foundation, Inc. + Copyright (C) 1988-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -132,7 +132,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 (_("\ Remove (unlink) the FILE(s).\n\ \n\ @@ -180,7 +180,7 @@ 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\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -315,7 +315,7 @@ main (int argc, char **argv) if (argc <= optind) { if (x.ignore_missing_files) - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; else { error (0, 0, _("missing operand")); @@ -332,25 +332,25 @@ main (int argc, char **argv) quote ("/")); } - size_t n_files = argc - optind; + uintmax_t n_files = argc - optind; char **file = argv + optind; if (prompt_once && (x.recursive || 3 < n_files)) { fprintf (stderr, (x.recursive - ? ngettext ("%s: remove %zu argument recursively? ", - "%s: remove %zu arguments recursively? ", + ? ngettext ("%s: remove %"PRIuMAX" argument recursively? ", + "%s: remove %"PRIuMAX" arguments recursively? ", select_plural (n_files)) - : ngettext ("%s: remove %zu argument? ", - "%s: remove %zu arguments? ", + : ngettext ("%s: remove %"PRIuMAX" argument? ", + "%s: remove %"PRIuMAX" arguments? ", select_plural (n_files))), program_name, n_files); if (!yesno ()) - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } enum RM_status status = rm (file, &x); assert (VALID_STATUS (status)); - exit (status == RM_ERROR ? EXIT_FAILURE : EXIT_SUCCESS); + return status == RM_ERROR ? EXIT_FAILURE : EXIT_SUCCESS; } diff --git a/src/rmdir.c b/src/rmdir.c index e67d3b00..457e855e 100644 --- a/src/rmdir.c +++ b/src/rmdir.c @@ -1,6 +1,6 @@ /* rmdir -- remove directories - Copyright (C) 1990-2014 Free Software Foundation, Inc. + Copyright (C) 1990-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -177,7 +177,7 @@ Remove the DIRECTORY(ies), if they are empty.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -248,5 +248,5 @@ main (int argc, char **argv) } } - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/runcon.c b/src/runcon.c index 14ccc3d5..5b9cb334 100644 --- a/src/runcon.c +++ b/src/runcon.c @@ -1,5 +1,5 @@ /* runcon -- run command with specified security context - Copyright (C) 2005-2014 Free Software Foundation, Inc. + Copyright (C) 2005-2015 Free Software Foundation, Inc. This 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,7 +102,7 @@ With neither CONTEXT nor COMMAND, print the current security context.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -177,7 +177,7 @@ main (int argc, char **argv) error (EXIT_FAILURE, errno, _("failed to get current context")); fputs (cur_context, stdout); fputc ('\n', stdout); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } if (!(user || role || type || range || compute_trans)) @@ -258,9 +258,7 @@ main (int argc, char **argv) execvp (argv[optind], argv + optind); - { - int exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE); - error (0, errno, "%s", argv[optind]); - exit (exit_status); - } + int exit_status = errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE; + error (0, errno, "%s", argv[optind]); + return exit_status; } diff --git a/src/selinux.c b/src/selinux.c index ae454f8a..99b1fb0b 100644 --- a/src/selinux.c +++ b/src/selinux.c @@ -1,5 +1,5 @@ /* selinux - core functions for maintaining SELinux labeling - Copyright (C) 2012-2014 Free Software Foundation, Inc. + Copyright (C) 2012-2015 Free Software Foundation, Inc. This program is free 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/selinux.h b/src/selinux.h index 8afaa495..f9b32768 100644 --- a/src/selinux.h +++ b/src/selinux.h @@ -1,5 +1,5 @@ /* selinux - core functions for maintaining SELinux labeling - Copyright (C) 2012-2014 Free Software Foundation, Inc. + Copyright (C) 2012-2015 Free Software Foundation, Inc. This program is free 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/seq.c b/src/seq.c index 1124358c..2426c4de 100644 --- a/src/seq.c +++ b/src/seq.c @@ -1,5 +1,5 @@ /* seq - print sequence of numbers to standard output. - Copyright (C) 1994-2014 Free Software Foundation, Inc. + Copyright (C) 1994-2015 Free Software Foundation, Inc. This 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,7 +98,7 @@ 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\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -147,17 +147,24 @@ scan_arg (const char *arg) while (isspace (to_uchar (*arg)) || *arg == '+') arg++; - ret.width = strlen (arg); + /* Default to auto width and precision. */ + ret.width = 0; ret.precision = INT_MAX; + /* Use no precision (and possibly fast generation) for integers. */ + char const *decimal_point = strchr (arg, '.'); + if (! decimal_point && ! strchr (arg, 'p') /* not a hex float */) + ret.precision = 0; + + /* auto set width and precision for decimal inputs. */ if (! arg[strcspn (arg, "xX")] && isfinite (ret.value)) { - char const *decimal_point = strchr (arg, '.'); - if (! decimal_point) - ret.precision = 0; - else + size_t fraction_len = 0; + ret.width = strlen (arg); + + if (decimal_point) { - size_t fraction_len = strcspn (decimal_point + 1, "eE"); + fraction_len = strcspn (decimal_point + 1, "eE"); if (fraction_len <= INT_MAX) ret.precision = fraction_len; ret.width += (fraction_len == 0 /* #. -> # */ @@ -171,7 +178,8 @@ scan_arg (const char *arg) if (e) { long exponent = strtol (e + 1, NULL, 10); - ret.precision += exponent < 0 ? -exponent : 0; + ret.precision += exponent < 0 ? -exponent + : - MIN (ret.precision, exponent); /* 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. */ @@ -186,6 +194,12 @@ scan_arg (const char *arg) ret.width++; exponent = -exponent; } + else + { + if (decimal_point && ret.precision == 0 && fraction_len) + ret.width--; /* discount space for '.' */ + exponent -= MIN (fraction_len, exponent); + } ret.width += exponent; } } @@ -411,52 +425,84 @@ trim_leading_zeros (char const *s) static bool seq_fast (char const *a, char const *b) { + bool inf = STREQ (b, "inf"); + /* 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; + size_t q_len = inf ? 0 : strlen (b); + + /* Allow for at least 31 digits without realloc. + 1 more than p_len is needed for the inf case. */ + size_t inc_size = MAX (MAX (p_len + 1, q_len), 31); + + /* Copy input strings (incl NUL) to end of new buffers. */ + char *p0 = xmalloc (inc_size + 1); + char *p = memcpy (p0 + inc_size - p_len, a, p_len + 1); + char *q; + char *q0; + if (! inf) + { + q0 = xmalloc (inc_size + 1); + q = memcpy (q0 + inc_size - q_len, b, q_len + 1); + } + else + q = q0 = NULL; + + bool ok = inf || 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 + /* Reduce number of fwrite calls which is seen to + give 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); + size_t buf_size = MAX (BUFSIZ, (inc_size + 1) * 2); + char *buf = xmalloc (buf_size); + char const *buf_end = buf + buf_size; - char *z = buf; + char *bufp = buf; /* Write first number to buffer. */ - z = mempcpy (z, p, p_len); + bufp = mempcpy (bufp, p, p_len); /* Append separator then number. */ - while (cmp (p, p_len, q, q_len) < 0) + while (inf || cmp (p, p_len, q, q_len) < 0) { - *z++ = *separator; + *bufp++ = *separator; incr (&p, &p_len); - z = mempcpy (z, p, p_len); + + /* Double up the buffers when needed for the inf case. */ + if (p_len == inc_size) + { + inc_size *= 2; + p0 = xrealloc (p0, inc_size + 1); + p = memmove (p0 + p_len, p0, p_len + 1); + + if (buf_size < (inc_size + 1) * 2) + { + size_t buf_offset = bufp - buf; + buf_size = (inc_size + 1) * 2; + buf = xrealloc (buf, buf_size); + buf_end = buf + buf_size; + bufp = buf + buf_offset; + } + } + + bufp = mempcpy (bufp, 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) + if (buf_end - (p_len + 1) < bufp) { - fwrite (buf, z - buf, 1, stdout); - z = buf; + fwrite (buf, bufp - buf, 1, stdout); + bufp = buf; } } /* Write any remaining buffered output, and the terminator. */ - *z++ = *terminator; - fwrite (buf, z - buf, 1, stdout); + *bufp++ = *terminator; + fwrite (buf, bufp - buf, 1, stdout); IF_LINT (free (buf)); } @@ -574,7 +620,7 @@ main (int argc, char **argv) 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); + return EXIT_SUCCESS; /* Upon any failure, let the more general code deal with it. */ } @@ -593,7 +639,8 @@ main (int argc, char **argv) } } - if (first.precision == 0 && step.precision == 0 && last.precision == 0 + if ((isfinite (first.value) && 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) { @@ -601,14 +648,16 @@ main (int argc, char **argv) char *s2; if (asprintf (&s1, "%0.Lf", first.value) < 0) xalloc_die (); - if (asprintf (&s2, "%0.Lf", last.value) < 0) + if (! isfinite (last.value)) + s2 = xstrdup ("inf"); /* Ensure "inf" is used. */ + else if (asprintf (&s2, "%0.Lf", last.value) < 0) xalloc_die (); if (*s1 != '-' && *s2 != '-' && seq_fast (s1, s2)) { IF_LINT (free (s1)); IF_LINT (free (s2)); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } free (s1); @@ -621,5 +670,5 @@ main (int argc, char **argv) print_numbers (format_str, layout, first.value, step.value, last.value); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/shred.c b/src/shred.c index bd88e383..63bcd6fc 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-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2015 Free Software Foundation, Inc. Copyright (C) 1997, 1998, 1999 Colin Plumb. This program is free software: you can redistribute it and/or modify @@ -86,7 +86,7 @@ #include "system.h" #include "argmatch.h" -#include "xstrtol.h" +#include "xdectoint.h" #include "error.h" #include "fcntl--.h" #include "human.h" @@ -170,6 +170,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\ +"), stdout); + fputs (_("\ +\n\ +If FILE is -, shred standard output.\n\ "), stdout); emit_mandatory_arg_note (); @@ -191,8 +195,6 @@ for even very expensive hardware probing to recover the data.\n\ fputs (VERSION_OPTION_DESCRIPTION, stdout); fputs (_("\ \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.\n\ @@ -243,7 +245,7 @@ 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\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -517,7 +519,7 @@ dopass (int fd, struct stat const *st, char const *qname, off_t *sizep, /* Retry without direct I/O since this may not be supported at all on some (file) systems, or with the current size. - I.E. a specified --size that is not aligned, or when + I.e., a specified --size that is not aligned, or when dealing with slop at the end of a file with --exact. */ if (! try_without_directio && errno == EINVAL) { @@ -1228,16 +1230,10 @@ main (int argc, char **argv) break; case 'n': - { - uintmax_t tmp; - if (xstrtoumax (optarg, NULL, 10, &tmp, NULL) != LONGINT_OK - || MIN (ULONG_MAX, SIZE_MAX / sizeof (int)) <= tmp) - { - error (EXIT_FAILURE, 0, _("%s: invalid number of passes"), - quotearg_colon (optarg)); - } - flags.n_iterations = tmp; - } + flags.n_iterations = xdectoumax (optarg, 0, + MIN (ULONG_MAX, + SIZE_MAX / sizeof (int)), "", + _("invalid number of passes"), 0); break; case RANDOM_SOURCE_OPTION: @@ -1255,17 +1251,8 @@ main (int argc, char **argv) break; case 's': - { - uintmax_t tmp; - if ((xstrtoumax (optarg, NULL, 0, &tmp, "cbBkKMGTPEZY0") - != LONGINT_OK) - || OFF_T_MAX < tmp) - { - error (EXIT_FAILURE, 0, _("%s: invalid file size"), - quotearg_colon (optarg)); - } - flags.size = tmp; - } + flags.size = xnumtoumax (optarg, 0, 0, OFF_T_MAX, "cbBkKMGTPEZY0", + _("invalid file size"), 0); break; case 'v': @@ -1318,7 +1305,7 @@ main (int argc, char **argv) free (qname); } - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } /* * vim:sw=2:sts=2: diff --git a/src/shuf.c b/src/shuf.c index 2505be6f..ff2337d3 100644 --- a/src/shuf.c +++ b/src/shuf.c @@ -1,6 +1,6 @@ /* Shuffle lines of text. - Copyright (C) 2006-2014 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. This 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,6 +32,7 @@ #include "randperm.h" #include "read-file.h" #include "stdio--.h" +#include "xdectoint.h" #include "xstrtol.h" /* The official name of this program (e.g., no 'g' prefix). */ @@ -68,6 +69,7 @@ Usage: %s [OPTION]... [FILE]\n\ Write a random permutation of the input lines to standard output.\n\ "), stdout); + emit_stdin_note (); emit_mandatory_arg_note (); fputs (_("\ @@ -83,11 +85,7 @@ Write a random permutation of the input lines to standard output.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - fputs (_("\ -\n\ -With no FILE, or when FILE is -, read standard input.\n\ -"), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); @@ -272,7 +270,7 @@ read_input (FILE *in, char eolbyte, char ***pline) size_t n_lines; /* TODO: We should limit the amount of data read here, - to less than RESERVOIR_MIN_INPUT. I.E. adjust fread_file() to support + to less than RESERVOIR_MIN_INPUT. I.e., adjust fread_file() to support taking a byte limit. We'd then need to ensure we handle a line spanning this boundary. With that in place we could set use_reservoir_sampling when used==RESERVOIR_MIN_INPUT, and have read_input_reservoir_sampling() @@ -422,7 +420,6 @@ main (int argc, char **argv) case 'i': { - unsigned long int argval = 0; char *p = strchr (optarg, '-'); char const *hi_optarg = optarg; bool invalid = !p; @@ -434,22 +431,19 @@ main (int argc, char **argv) if (p) { *p = '\0'; - invalid = ((xstrtoul (optarg, NULL, 10, &argval, NULL) - != LONGINT_OK) - || SIZE_MAX < argval); + lo_input = xdectoumax (optarg, 0, SIZE_MAX, "", + _("invalid input range"), 0); *p = '-'; - lo_input = argval; hi_optarg = p + 1; } - invalid |= ((xstrtoul (hi_optarg, NULL, 10, &argval, NULL) - != LONGINT_OK) - || SIZE_MAX < argval); - hi_input = argval; + hi_input = xdectoumax (hi_optarg, 0, SIZE_MAX, "", + _("invalid input range"), 0); + n_lines = hi_input - lo_input + 1; invalid |= ((lo_input <= hi_input) == (n_lines == 0)); if (invalid) - error (EXIT_FAILURE, 0, _("invalid input range %s"), + error (EXIT_FAILURE, errno, "%s: %s", _("invalid input range"), quote (optarg)); } break; @@ -462,7 +456,7 @@ main (int argc, char **argv) if (e == LONGINT_OK) head_lines = MIN (head_lines, argval); else if (e != LONGINT_OVERFLOW) - error (EXIT_FAILURE, 0, _("invalid line count %s"), + error (EXIT_FAILURE, 0, _("invalid line count: %s"), quote (optarg)); } break; @@ -504,7 +498,7 @@ main (int argc, char **argv) } if (input_range ? 0 < n_operands : !echo && 1 < n_operands) { - error (0, 0, _("extra operand %s"), quote (operand[1])); + error (0, 0, _("extra operand %s"), quote (operand[!input_range])); usage (EXIT_FAILURE); } @@ -622,5 +616,5 @@ main (int argc, char **argv) } #endif - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/single-binary.mk b/src/single-binary.mk index cc836d75..de3f299e 100644 --- a/src/single-binary.mk +++ b/src/single-binary.mk @@ -6,475 +6,475 @@ src_libsinglebin_arch_a_DEPENDENCIES = src/libsinglebin_uname.a noinst_LIBRARIES += src/libsinglebin_arch.a src_libsinglebin_arch_a_SOURCES = src/coreutils-arch.c src_libsinglebin_arch_a_ldadd = src/libsinglebin_uname.a -src_libsinglebin_arch_a_CFLAGS = "-Dmain=_single_binary_main_arch(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_arch" -Dusage=_usage_arch $(src_coreutils_CFLAGS) +src_libsinglebin_arch_a_CFLAGS = "-Dmain=single_binary_main_arch (int, char **); int single_binary_main_arch" -Dusage=_usage_arch $(src_coreutils_CFLAGS) # Command hostname noinst_LIBRARIES += src/libsinglebin_hostname.a src_libsinglebin_hostname_a_SOURCES = src/hostname.c src_libsinglebin_hostname_a_ldadd = $(GETHOSTNAME_LIB) -src_libsinglebin_hostname_a_CFLAGS = "-Dmain=_single_binary_main_hostname(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_hostname" -Dusage=_usage_hostname $(src_coreutils_CFLAGS) +src_libsinglebin_hostname_a_CFLAGS = "-Dmain=single_binary_main_hostname (int, char **); int single_binary_main_hostname" -Dusage=_usage_hostname $(src_coreutils_CFLAGS) # Command chroot noinst_LIBRARIES += src/libsinglebin_chroot.a src_libsinglebin_chroot_a_SOURCES = src/chroot.c -src_libsinglebin_chroot_a_CFLAGS = "-Dmain=_single_binary_main_chroot(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_chroot" -Dusage=_usage_chroot $(src_coreutils_CFLAGS) +src_libsinglebin_chroot_a_CFLAGS = "-Dmain=single_binary_main_chroot (int, char **); int single_binary_main_chroot" -Dusage=_usage_chroot $(src_coreutils_CFLAGS) # Command df noinst_LIBRARIES += src/libsinglebin_df.a src_libsinglebin_df_a_SOURCES = src/df.c src/find-mount-point.c src_libsinglebin_df_a_ldadd = $(LIBICONV) -src_libsinglebin_df_a_CFLAGS = "-Dmain=_single_binary_main_df(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_df" -Dusage=_usage_df $(src_coreutils_CFLAGS) +src_libsinglebin_df_a_CFLAGS = "-Dmain=single_binary_main_df (int, char **); int single_binary_main_df" -Dusage=_usage_df $(src_coreutils_CFLAGS) # Command hostid noinst_LIBRARIES += src/libsinglebin_hostid.a src_libsinglebin_hostid_a_SOURCES = src/hostid.c -src_libsinglebin_hostid_a_CFLAGS = "-Dmain=_single_binary_main_hostid(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_hostid" -Dusage=_usage_hostid $(src_coreutils_CFLAGS) +src_libsinglebin_hostid_a_CFLAGS = "-Dmain=single_binary_main_hostid (int, char **); int single_binary_main_hostid" -Dusage=_usage_hostid $(src_coreutils_CFLAGS) # Command nice noinst_LIBRARIES += src/libsinglebin_nice.a src_libsinglebin_nice_a_SOURCES = src/nice.c -src_libsinglebin_nice_a_CFLAGS = "-Dmain=_single_binary_main_nice(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_nice" -Dusage=_usage_nice $(src_coreutils_CFLAGS) +src_libsinglebin_nice_a_CFLAGS = "-Dmain=single_binary_main_nice (int, char **); int single_binary_main_nice" -Dusage=_usage_nice $(src_coreutils_CFLAGS) # Command pinky noinst_LIBRARIES += src/libsinglebin_pinky.a src_libsinglebin_pinky_a_SOURCES = src/pinky.c src_libsinglebin_pinky_a_ldadd = $(GETADDRINFO_LIB) -src_libsinglebin_pinky_a_CFLAGS = "-Dmain=_single_binary_main_pinky(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_pinky" -Dusage=_usage_pinky $(src_coreutils_CFLAGS) +src_libsinglebin_pinky_a_CFLAGS = "-Dmain=single_binary_main_pinky (int, char **); int single_binary_main_pinky" -Dusage=_usage_pinky $(src_coreutils_CFLAGS) # Command stdbuf noinst_LIBRARIES += src/libsinglebin_stdbuf.a src_libsinglebin_stdbuf_a_SOURCES = src/stdbuf.c src_libsinglebin_stdbuf_a_ldadd = $(LIBICONV) -src_libsinglebin_stdbuf_a_CFLAGS = "-Dmain=_single_binary_main_stdbuf(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_stdbuf" -Dusage=_usage_stdbuf $(src_coreutils_CFLAGS) +src_libsinglebin_stdbuf_a_CFLAGS = "-Dmain=single_binary_main_stdbuf (int, char **); int single_binary_main_stdbuf" -Dusage=_usage_stdbuf $(src_coreutils_CFLAGS) # Command stty noinst_LIBRARIES += src/libsinglebin_stty.a src_libsinglebin_stty_a_SOURCES = src/stty.c -src_libsinglebin_stty_a_CFLAGS = "-Dmain=_single_binary_main_stty(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_stty" -Dusage=_usage_stty $(src_coreutils_CFLAGS) +src_libsinglebin_stty_a_CFLAGS = "-Dmain=single_binary_main_stty (int, char **); int single_binary_main_stty" -Dusage=_usage_stty $(src_coreutils_CFLAGS) # Command uptime noinst_LIBRARIES += src/libsinglebin_uptime.a src_libsinglebin_uptime_a_SOURCES = src/uptime.c src_libsinglebin_uptime_a_ldadd = $(GETLOADAVG_LIBS) -src_libsinglebin_uptime_a_CFLAGS = "-Dmain=_single_binary_main_uptime(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_uptime" -Dusage=_usage_uptime $(src_coreutils_CFLAGS) +src_libsinglebin_uptime_a_CFLAGS = "-Dmain=single_binary_main_uptime (int, char **); int single_binary_main_uptime" -Dusage=_usage_uptime $(src_coreutils_CFLAGS) # Command users noinst_LIBRARIES += src/libsinglebin_users.a src_libsinglebin_users_a_SOURCES = src/users.c -src_libsinglebin_users_a_CFLAGS = "-Dmain=_single_binary_main_users(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_users" -Dusage=_usage_users $(src_coreutils_CFLAGS) +src_libsinglebin_users_a_CFLAGS = "-Dmain=single_binary_main_users (int, char **); int single_binary_main_users" -Dusage=_usage_users $(src_coreutils_CFLAGS) # Command who noinst_LIBRARIES += src/libsinglebin_who.a src_libsinglebin_who_a_SOURCES = src/who.c src_libsinglebin_who_a_ldadd = $(GETADDRINFO_LIB) -src_libsinglebin_who_a_CFLAGS = "-Dmain=_single_binary_main_who(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_who" -Dusage=_usage_who $(src_coreutils_CFLAGS) +src_libsinglebin_who_a_CFLAGS = "-Dmain=single_binary_main_who (int, char **); int single_binary_main_who" -Dusage=_usage_who $(src_coreutils_CFLAGS) # Command _ noinst_LIBRARIES += src/libsinglebin__.a src_libsinglebin___a_SOURCES = src/lbracket.c src_libsinglebin___a_ldadd = $(src_test_LDADD) -src_libsinglebin___a_CFLAGS = "-Dmain=_single_binary_main__(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main__" -Dusage=_usage__ $(src_coreutils_CFLAGS) +src_libsinglebin___a_CFLAGS = "-Dmain=single_binary_main__ (int, char **); int single_binary_main__" -Dusage=_usage__ $(src_coreutils_CFLAGS) # Command base64 noinst_LIBRARIES += src/libsinglebin_base64.a src_libsinglebin_base64_a_SOURCES = src/base64.c -src_libsinglebin_base64_a_CFLAGS = "-Dmain=_single_binary_main_base64(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_base64" -Dusage=_usage_base64 $(src_coreutils_CFLAGS) +src_libsinglebin_base64_a_CFLAGS = "-Dmain=single_binary_main_base64 (int, char **); int single_binary_main_base64" -Dusage=_usage_base64 $(src_coreutils_CFLAGS) # Command basename noinst_LIBRARIES += src/libsinglebin_basename.a src_libsinglebin_basename_a_SOURCES = src/basename.c -src_libsinglebin_basename_a_CFLAGS = "-Dmain=_single_binary_main_basename(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_basename" -Dusage=_usage_basename $(src_coreutils_CFLAGS) +src_libsinglebin_basename_a_CFLAGS = "-Dmain=single_binary_main_basename (int, char **); int single_binary_main_basename" -Dusage=_usage_basename $(src_coreutils_CFLAGS) # Command cat noinst_LIBRARIES += src/libsinglebin_cat.a src_libsinglebin_cat_a_SOURCES = src/cat.c src_libsinglebin_cat_a_ldadd = $(LIBICONV) -src_libsinglebin_cat_a_CFLAGS = "-Dmain=_single_binary_main_cat(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_cat" -Dusage=_usage_cat $(src_coreutils_CFLAGS) +src_libsinglebin_cat_a_CFLAGS = "-Dmain=single_binary_main_cat (int, char **); int single_binary_main_cat" -Dusage=_usage_cat $(src_coreutils_CFLAGS) # Command chcon noinst_LIBRARIES += src/libsinglebin_chcon.a src_libsinglebin_chcon_a_SOURCES = src/chcon.c src_libsinglebin_chcon_a_ldadd = $(LIB_SELINUX) -src_libsinglebin_chcon_a_CFLAGS = "-Dmain=_single_binary_main_chcon(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_chcon" -Dusage=_usage_chcon $(src_coreutils_CFLAGS) +src_libsinglebin_chcon_a_CFLAGS = "-Dmain=single_binary_main_chcon (int, char **); int single_binary_main_chcon" -Dusage=_usage_chcon $(src_coreutils_CFLAGS) # Command chgrp noinst_LIBRARIES += src/libsinglebin_chgrp.a src_libsinglebin_chgrp_a_SOURCES = src/chgrp.c src/chown-core.c -src_libsinglebin_chgrp_a_CFLAGS = "-Dmain=_single_binary_main_chgrp(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_chgrp" -Dusage=_usage_chgrp $(src_coreutils_CFLAGS) +src_libsinglebin_chgrp_a_CFLAGS = "-Dmain=single_binary_main_chgrp (int, char **); int single_binary_main_chgrp" -Dusage=_usage_chgrp $(src_coreutils_CFLAGS) # Command chmod noinst_LIBRARIES += src/libsinglebin_chmod.a src_libsinglebin_chmod_a_SOURCES = src/chmod.c -src_libsinglebin_chmod_a_CFLAGS = "-Dmain=_single_binary_main_chmod(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_chmod" -Dusage=_usage_chmod $(src_coreutils_CFLAGS) +src_libsinglebin_chmod_a_CFLAGS = "-Dmain=single_binary_main_chmod (int, char **); int single_binary_main_chmod" -Dusage=_usage_chmod $(src_coreutils_CFLAGS) # Command chown noinst_LIBRARIES += src/libsinglebin_chown.a src_libsinglebin_chown_a_SOURCES = src/chown.c src/chown-core.c -src_libsinglebin_chown_a_CFLAGS = "-Dmain=_single_binary_main_chown(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_chown" -Dusage=_usage_chown $(src_coreutils_CFLAGS) +src_libsinglebin_chown_a_CFLAGS = "-Dmain=single_binary_main_chown (int, char **); int single_binary_main_chown" -Dusage=_usage_chown $(src_coreutils_CFLAGS) # Command cksum noinst_LIBRARIES += src/libsinglebin_cksum.a src_libsinglebin_cksum_a_SOURCES = src/cksum.c -src_libsinglebin_cksum_a_CFLAGS = "-Dmain=_single_binary_main_cksum(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_cksum" -Dusage=_usage_cksum $(src_coreutils_CFLAGS) +src_libsinglebin_cksum_a_CFLAGS = "-Dmain=single_binary_main_cksum (int, char **); int single_binary_main_cksum" -Dusage=_usage_cksum $(src_coreutils_CFLAGS) # Command comm noinst_LIBRARIES += src/libsinglebin_comm.a src_libsinglebin_comm_a_SOURCES = src/comm.c -src_libsinglebin_comm_a_CFLAGS = "-Dmain=_single_binary_main_comm(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_comm" -Dusage=_usage_comm $(src_coreutils_CFLAGS) +src_libsinglebin_comm_a_CFLAGS = "-Dmain=single_binary_main_comm (int, char **); int single_binary_main_comm" -Dusage=_usage_comm $(src_coreutils_CFLAGS) # Command cp noinst_LIBRARIES += src/libsinglebin_cp.a src_libsinglebin_cp_a_SOURCES = src/cp.c $(copy_sources) $(selinux_sources) src_libsinglebin_cp_a_ldadd = $(copy_ldadd) $(LIBICONV) -src_libsinglebin_cp_a_CFLAGS = "-Dmain=_single_binary_main_cp(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_cp" -Dusage=_usage_cp $(src_coreutils_CFLAGS) +src_libsinglebin_cp_a_CFLAGS = "-Dmain=single_binary_main_cp (int, char **); int single_binary_main_cp" -Dusage=_usage_cp $(src_coreutils_CFLAGS) # Command csplit noinst_LIBRARIES += src/libsinglebin_csplit.a src_libsinglebin_csplit_a_SOURCES = src/csplit.c -src_libsinglebin_csplit_a_CFLAGS = "-Dmain=_single_binary_main_csplit(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_csplit" -Dusage=_usage_csplit $(src_coreutils_CFLAGS) +src_libsinglebin_csplit_a_CFLAGS = "-Dmain=single_binary_main_csplit (int, char **); int single_binary_main_csplit" -Dusage=_usage_csplit $(src_coreutils_CFLAGS) # Command cut noinst_LIBRARIES += src/libsinglebin_cut.a src_libsinglebin_cut_a_SOURCES = src/cut.c -src_libsinglebin_cut_a_CFLAGS = "-Dmain=_single_binary_main_cut(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_cut" -Dusage=_usage_cut $(src_coreutils_CFLAGS) +src_libsinglebin_cut_a_CFLAGS = "-Dmain=single_binary_main_cut (int, char **); int single_binary_main_cut" -Dusage=_usage_cut $(src_coreutils_CFLAGS) # Command date noinst_LIBRARIES += src/libsinglebin_date.a src_libsinglebin_date_a_SOURCES = src/date.c src_libsinglebin_date_a_ldadd = $(LIB_CLOCK_GETTIME) -src_libsinglebin_date_a_CFLAGS = "-Dmain=_single_binary_main_date(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_date" -Dusage=_usage_date $(src_coreutils_CFLAGS) +src_libsinglebin_date_a_CFLAGS = "-Dmain=single_binary_main_date (int, char **); int single_binary_main_date" -Dusage=_usage_date $(src_coreutils_CFLAGS) # Command dd noinst_LIBRARIES += src/libsinglebin_dd.a src_libsinglebin_dd_a_SOURCES = src/dd.c src_libsinglebin_dd_a_ldadd = $(LIB_GETHRXTIME) $(LIB_FDATASYNC) -src_libsinglebin_dd_a_CFLAGS = "-Dmain=_single_binary_main_dd(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_dd" -Dusage=_usage_dd $(src_coreutils_CFLAGS) +src_libsinglebin_dd_a_CFLAGS = "-Dmain=single_binary_main_dd (int, char **); int single_binary_main_dd" -Dusage=_usage_dd $(src_coreutils_CFLAGS) # Command dir noinst_LIBRARIES += src/libsinglebin_dir.a src_libsinglebin_dir_a_SOURCES = src/coreutils-dir.c src_libsinglebin_dir_a_ldadd = $(src_ls_LDADD) src/libsinglebin_ls.a -src_libsinglebin_dir_a_CFLAGS = "-Dmain=_single_binary_main_dir(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_dir" -Dusage=_usage_dir $(src_coreutils_CFLAGS) +src_libsinglebin_dir_a_CFLAGS = "-Dmain=single_binary_main_dir (int, char **); int single_binary_main_dir" -Dusage=_usage_dir $(src_coreutils_CFLAGS) # Command dircolors noinst_LIBRARIES += src/libsinglebin_dircolors.a src_libsinglebin_dircolors_a_SOURCES = src/dircolors.c -src_libsinglebin_dircolors_a_CFLAGS = "-Dmain=_single_binary_main_dircolors(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_dircolors" -Dusage=_usage_dircolors $(src_coreutils_CFLAGS) +src_libsinglebin_dircolors_a_CFLAGS = "-Dmain=single_binary_main_dircolors (int, char **); int single_binary_main_dircolors" -Dusage=_usage_dircolors $(src_coreutils_CFLAGS) # Command dirname noinst_LIBRARIES += src/libsinglebin_dirname.a src_libsinglebin_dirname_a_SOURCES = src/dirname.c -src_libsinglebin_dirname_a_CFLAGS = "-Dmain=_single_binary_main_dirname(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_dirname" -Dusage=_usage_dirname $(src_coreutils_CFLAGS) +src_libsinglebin_dirname_a_CFLAGS = "-Dmain=single_binary_main_dirname (int, char **); int single_binary_main_dirname" -Dusage=_usage_dirname $(src_coreutils_CFLAGS) # Command du noinst_LIBRARIES += src/libsinglebin_du.a src_libsinglebin_du_a_SOURCES = src/du.c src_libsinglebin_du_a_ldadd = $(LIBICONV) -src_libsinglebin_du_a_CFLAGS = "-Dmain=_single_binary_main_du(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_du" -Dusage=_usage_du $(src_coreutils_CFLAGS) +src_libsinglebin_du_a_CFLAGS = "-Dmain=single_binary_main_du (int, char **); int single_binary_main_du" -Dusage=_usage_du $(src_coreutils_CFLAGS) # Command echo noinst_LIBRARIES += src/libsinglebin_echo.a src_libsinglebin_echo_a_SOURCES = src/echo.c -src_libsinglebin_echo_a_CFLAGS = "-Dmain=_single_binary_main_echo(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_echo" -Dusage=_usage_echo $(src_coreutils_CFLAGS) +src_libsinglebin_echo_a_CFLAGS = "-Dmain=single_binary_main_echo (int, char **); int single_binary_main_echo" -Dusage=_usage_echo $(src_coreutils_CFLAGS) # Command env noinst_LIBRARIES += src/libsinglebin_env.a src_libsinglebin_env_a_SOURCES = src/env.c -src_libsinglebin_env_a_CFLAGS = "-Dmain=_single_binary_main_env(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_env" -Dusage=_usage_env $(src_coreutils_CFLAGS) +src_libsinglebin_env_a_CFLAGS = "-Dmain=single_binary_main_env (int, char **); int single_binary_main_env" -Dusage=_usage_env $(src_coreutils_CFLAGS) # Command expand noinst_LIBRARIES += src/libsinglebin_expand.a src_libsinglebin_expand_a_SOURCES = src/expand.c -src_libsinglebin_expand_a_CFLAGS = "-Dmain=_single_binary_main_expand(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_expand" -Dusage=_usage_expand $(src_coreutils_CFLAGS) +src_libsinglebin_expand_a_CFLAGS = "-Dmain=single_binary_main_expand (int, char **); int single_binary_main_expand" -Dusage=_usage_expand $(src_coreutils_CFLAGS) # Command expr noinst_LIBRARIES += src/libsinglebin_expr.a src_libsinglebin_expr_a_SOURCES = src/expr.c src_libsinglebin_expr_a_ldadd = $(LIB_GMP) -src_libsinglebin_expr_a_CFLAGS = "-Dmain=_single_binary_main_expr(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_expr" -Dusage=_usage_expr $(src_coreutils_CFLAGS) +src_libsinglebin_expr_a_CFLAGS = "-Dmain=single_binary_main_expr (int, char **); int single_binary_main_expr" -Dusage=_usage_expr $(src_coreutils_CFLAGS) # Command factor noinst_LIBRARIES += src/libsinglebin_factor.a src_libsinglebin_factor_a_SOURCES = src/factor.c src_libsinglebin_factor_a_ldadd = $(LIB_GMP) $(LIBICONV) -src_libsinglebin_factor_a_CFLAGS = "-Dmain=_single_binary_main_factor(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_factor" -Dusage=_usage_factor $(src_coreutils_CFLAGS) +src_libsinglebin_factor_a_CFLAGS = "-Dmain=single_binary_main_factor (int, char **); int single_binary_main_factor" -Dusage=_usage_factor $(src_coreutils_CFLAGS) # Command false noinst_LIBRARIES += src/libsinglebin_false.a src_libsinglebin_false_a_SOURCES = src/false.c -src_libsinglebin_false_a_CFLAGS = "-Dmain=_single_binary_main_false(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_false" -Dusage=_usage_false $(src_coreutils_CFLAGS) +src_libsinglebin_false_a_CFLAGS = "-Dmain=single_binary_main_false (int, char **); int single_binary_main_false" -Dusage=_usage_false $(src_coreutils_CFLAGS) # Command fmt noinst_LIBRARIES += src/libsinglebin_fmt.a src_libsinglebin_fmt_a_SOURCES = src/fmt.c -src_libsinglebin_fmt_a_CFLAGS = "-Dmain=_single_binary_main_fmt(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_fmt" -Dusage=_usage_fmt $(src_coreutils_CFLAGS) +src_libsinglebin_fmt_a_CFLAGS = "-Dmain=single_binary_main_fmt (int, char **); int single_binary_main_fmt" -Dusage=_usage_fmt $(src_coreutils_CFLAGS) # Command fold noinst_LIBRARIES += src/libsinglebin_fold.a src_libsinglebin_fold_a_SOURCES = src/fold.c -src_libsinglebin_fold_a_CFLAGS = "-Dmain=_single_binary_main_fold(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_fold" -Dusage=_usage_fold $(src_coreutils_CFLAGS) +src_libsinglebin_fold_a_CFLAGS = "-Dmain=single_binary_main_fold (int, char **); int single_binary_main_fold" -Dusage=_usage_fold $(src_coreutils_CFLAGS) # Command ginstall noinst_LIBRARIES += src/libsinglebin_ginstall.a src_libsinglebin_ginstall_a_SOURCES = src/install.c src/prog-fprintf.c $(copy_sources) $(selinux_sources) src_libsinglebin_ginstall_a_ldadd = $(copy_ldadd) $(LIB_SELINUX) $(LIB_CLOCK_GETTIME) -src_libsinglebin_ginstall_a_CFLAGS = "-Dmain=_single_binary_main_ginstall(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_ginstall" -Dusage=_usage_ginstall $(src_coreutils_CFLAGS) +src_libsinglebin_ginstall_a_CFLAGS = "-Dmain=single_binary_main_ginstall (int, char **); int single_binary_main_ginstall" -Dusage=_usage_ginstall $(src_coreutils_CFLAGS) src_libsinglebin_ginstall_a_CPPFLAGS = -DENABLE_MATCHPATHCON=1 $(AM_CPPFLAGS) # Command groups noinst_LIBRARIES += src/libsinglebin_groups.a src_libsinglebin_groups_a_SOURCES = src/groups.c src/group-list.c -src_libsinglebin_groups_a_CFLAGS = "-Dmain=_single_binary_main_groups(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_groups" -Dusage=_usage_groups $(src_coreutils_CFLAGS) +src_libsinglebin_groups_a_CFLAGS = "-Dmain=single_binary_main_groups (int, char **); int single_binary_main_groups" -Dusage=_usage_groups $(src_coreutils_CFLAGS) # Command head noinst_LIBRARIES += src/libsinglebin_head.a src_libsinglebin_head_a_SOURCES = src/head.c -src_libsinglebin_head_a_CFLAGS = "-Dmain=_single_binary_main_head(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_head" -Dusage=_usage_head $(src_coreutils_CFLAGS) +src_libsinglebin_head_a_CFLAGS = "-Dmain=single_binary_main_head (int, char **); int single_binary_main_head" -Dusage=_usage_head $(src_coreutils_CFLAGS) # Command id noinst_LIBRARIES += src/libsinglebin_id.a src_libsinglebin_id_a_SOURCES = src/id.c src/group-list.c src_libsinglebin_id_a_ldadd = $(LIB_SELINUX) $(LIB_SMACK) -src_libsinglebin_id_a_CFLAGS = "-Dmain=_single_binary_main_id(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_id" -Dusage=_usage_id $(src_coreutils_CFLAGS) +src_libsinglebin_id_a_CFLAGS = "-Dmain=single_binary_main_id (int, char **); int single_binary_main_id" -Dusage=_usage_id $(src_coreutils_CFLAGS) # Command join noinst_LIBRARIES += src/libsinglebin_join.a src_libsinglebin_join_a_SOURCES = src/join.c -src_libsinglebin_join_a_CFLAGS = "-Dmain=_single_binary_main_join(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_join" -Dusage=_usage_join $(src_coreutils_CFLAGS) +src_libsinglebin_join_a_CFLAGS = "-Dmain=single_binary_main_join (int, char **); int single_binary_main_join" -Dusage=_usage_join $(src_coreutils_CFLAGS) # Command kill noinst_LIBRARIES += src/libsinglebin_kill.a src_libsinglebin_kill_a_SOURCES = src/kill.c src/operand2sig.c src_libsinglebin_kill_a_ldadd = $(LIBTHREAD) -src_libsinglebin_kill_a_CFLAGS = "-Dmain=_single_binary_main_kill(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_kill" -Dusage=_usage_kill $(src_coreutils_CFLAGS) +src_libsinglebin_kill_a_CFLAGS = "-Dmain=single_binary_main_kill (int, char **); int single_binary_main_kill" -Dusage=_usage_kill $(src_coreutils_CFLAGS) # Command link noinst_LIBRARIES += src/libsinglebin_link.a src_libsinglebin_link_a_SOURCES = src/link.c -src_libsinglebin_link_a_CFLAGS = "-Dmain=_single_binary_main_link(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_link" -Dusage=_usage_link $(src_coreutils_CFLAGS) +src_libsinglebin_link_a_CFLAGS = "-Dmain=single_binary_main_link (int, char **); int single_binary_main_link" -Dusage=_usage_link $(src_coreutils_CFLAGS) # Command ln noinst_LIBRARIES += src/libsinglebin_ln.a src_libsinglebin_ln_a_SOURCES = src/ln.c src/relpath.c src/relpath.h -src_libsinglebin_ln_a_CFLAGS = "-Dmain=_single_binary_main_ln(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_ln" -Dusage=_usage_ln $(src_coreutils_CFLAGS) +src_libsinglebin_ln_a_CFLAGS = "-Dmain=single_binary_main_ln (int, char **); int single_binary_main_ln" -Dusage=_usage_ln $(src_coreutils_CFLAGS) # Command logname noinst_LIBRARIES += src/libsinglebin_logname.a src_libsinglebin_logname_a_SOURCES = src/logname.c -src_libsinglebin_logname_a_CFLAGS = "-Dmain=_single_binary_main_logname(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_logname" -Dusage=_usage_logname $(src_coreutils_CFLAGS) +src_libsinglebin_logname_a_CFLAGS = "-Dmain=single_binary_main_logname (int, char **); int single_binary_main_logname" -Dusage=_usage_logname $(src_coreutils_CFLAGS) # Command ls noinst_LIBRARIES += src/libsinglebin_ls.a src_libsinglebin_ls_a_SOURCES = src/ls.c src/ls-ls.c -src_libsinglebin_ls_a_ldadd = $(LIB_SELINUX) $(LIB_SMACK) $(LIB_CLOCK_GETTIME) $(LIB_CAP) $(LIB_ACL) -src_libsinglebin_ls_a_CFLAGS = "-Dmain=_single_binary_main_ls(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_ls" -Dusage=_usage_ls $(src_coreutils_CFLAGS) +src_libsinglebin_ls_a_ldadd = $(LIB_SELINUX) $(LIB_SMACK) $(LIB_CLOCK_GETTIME) $(LIB_CAP) $(LIB_HAS_ACL) +src_libsinglebin_ls_a_CFLAGS = "-Dmain=single_binary_main_ls (int, char **); int single_binary_main_ls" -Dusage=_usage_ls $(src_coreutils_CFLAGS) # Command md5sum noinst_LIBRARIES += src/libsinglebin_md5sum.a src_libsinglebin_md5sum_a_SOURCES = src/md5sum.c src_libsinglebin_md5sum_a_ldadd = $(LIB_CRYPTO) -src_libsinglebin_md5sum_a_CFLAGS = "-Dmain=_single_binary_main_md5sum(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_md5sum" -Dusage=_usage_md5sum $(src_coreutils_CFLAGS) +src_libsinglebin_md5sum_a_CFLAGS = "-Dmain=single_binary_main_md5sum (int, char **); int single_binary_main_md5sum" -Dusage=_usage_md5sum $(src_coreutils_CFLAGS) src_libsinglebin_md5sum_a_CPPFLAGS = -DHASH_ALGO_MD5=1 $(AM_CPPFLAGS) # Command mkdir noinst_LIBRARIES += src/libsinglebin_mkdir.a src_libsinglebin_mkdir_a_SOURCES = src/mkdir.c src/prog-fprintf.c $(selinux_sources) src_libsinglebin_mkdir_a_ldadd = $(LIB_SELINUX) $(LIB_SMACK) -src_libsinglebin_mkdir_a_CFLAGS = "-Dmain=_single_binary_main_mkdir(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_mkdir" -Dusage=_usage_mkdir $(src_coreutils_CFLAGS) +src_libsinglebin_mkdir_a_CFLAGS = "-Dmain=single_binary_main_mkdir (int, char **); int single_binary_main_mkdir" -Dusage=_usage_mkdir $(src_coreutils_CFLAGS) # Command mkfifo noinst_LIBRARIES += src/libsinglebin_mkfifo.a src_libsinglebin_mkfifo_a_SOURCES = src/mkfifo.c $(selinux_sources) src_libsinglebin_mkfifo_a_ldadd = $(LIB_SELINUX) $(LIB_SMACK) -src_libsinglebin_mkfifo_a_CFLAGS = "-Dmain=_single_binary_main_mkfifo(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_mkfifo" -Dusage=_usage_mkfifo $(src_coreutils_CFLAGS) +src_libsinglebin_mkfifo_a_CFLAGS = "-Dmain=single_binary_main_mkfifo (int, char **); int single_binary_main_mkfifo" -Dusage=_usage_mkfifo $(src_coreutils_CFLAGS) # Command mknod noinst_LIBRARIES += src/libsinglebin_mknod.a src_libsinglebin_mknod_a_SOURCES = src/mknod.c $(selinux_sources) src_libsinglebin_mknod_a_ldadd = $(LIB_SELINUX) $(LIB_SMACK) -src_libsinglebin_mknod_a_CFLAGS = "-Dmain=_single_binary_main_mknod(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_mknod" -Dusage=_usage_mknod $(src_coreutils_CFLAGS) +src_libsinglebin_mknod_a_CFLAGS = "-Dmain=single_binary_main_mknod (int, char **); int single_binary_main_mknod" -Dusage=_usage_mknod $(src_coreutils_CFLAGS) # Command mktemp noinst_LIBRARIES += src/libsinglebin_mktemp.a src_libsinglebin_mktemp_a_SOURCES = src/mktemp.c -src_libsinglebin_mktemp_a_CFLAGS = "-Dmain=_single_binary_main_mktemp(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_mktemp" -Dusage=_usage_mktemp $(src_coreutils_CFLAGS) +src_libsinglebin_mktemp_a_CFLAGS = "-Dmain=single_binary_main_mktemp (int, char **); int single_binary_main_mktemp" -Dusage=_usage_mktemp $(src_coreutils_CFLAGS) # Command mv noinst_LIBRARIES += src/libsinglebin_mv.a src_libsinglebin_mv_a_SOURCES = src/mv.c src/remove.c $(copy_sources) $(selinux_sources) src_libsinglebin_mv_a_ldadd = $(copy_ldadd) $(remove_ldadd) -src_libsinglebin_mv_a_CFLAGS = "-Dmain=_single_binary_main_mv(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_mv" -Dusage=_usage_mv $(src_coreutils_CFLAGS) +src_libsinglebin_mv_a_CFLAGS = "-Dmain=single_binary_main_mv (int, char **); int single_binary_main_mv" -Dusage=_usage_mv $(src_coreutils_CFLAGS) # Command nl noinst_LIBRARIES += src/libsinglebin_nl.a src_libsinglebin_nl_a_SOURCES = src/nl.c -src_libsinglebin_nl_a_CFLAGS = "-Dmain=_single_binary_main_nl(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_nl" -Dusage=_usage_nl $(src_coreutils_CFLAGS) +src_libsinglebin_nl_a_CFLAGS = "-Dmain=single_binary_main_nl (int, char **); int single_binary_main_nl" -Dusage=_usage_nl $(src_coreutils_CFLAGS) # Command nproc noinst_LIBRARIES += src/libsinglebin_nproc.a src_libsinglebin_nproc_a_SOURCES = src/nproc.c -src_libsinglebin_nproc_a_CFLAGS = "-Dmain=_single_binary_main_nproc(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_nproc" -Dusage=_usage_nproc $(src_coreutils_CFLAGS) +src_libsinglebin_nproc_a_CFLAGS = "-Dmain=single_binary_main_nproc (int, char **); int single_binary_main_nproc" -Dusage=_usage_nproc $(src_coreutils_CFLAGS) # Command nohup noinst_LIBRARIES += src/libsinglebin_nohup.a src_libsinglebin_nohup_a_SOURCES = src/nohup.c -src_libsinglebin_nohup_a_CFLAGS = "-Dmain=_single_binary_main_nohup(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_nohup" -Dusage=_usage_nohup $(src_coreutils_CFLAGS) +src_libsinglebin_nohup_a_CFLAGS = "-Dmain=single_binary_main_nohup (int, char **); int single_binary_main_nohup" -Dusage=_usage_nohup $(src_coreutils_CFLAGS) # Command numfmt noinst_LIBRARIES += src/libsinglebin_numfmt.a src_libsinglebin_numfmt_a_SOURCES = src/numfmt.c -src_libsinglebin_numfmt_a_CFLAGS = "-Dmain=_single_binary_main_numfmt(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_numfmt" -Dusage=_usage_numfmt $(src_coreutils_CFLAGS) +src_libsinglebin_numfmt_a_CFLAGS = "-Dmain=single_binary_main_numfmt (int, char **); int single_binary_main_numfmt" -Dusage=_usage_numfmt $(src_coreutils_CFLAGS) # Command od noinst_LIBRARIES += src/libsinglebin_od.a src_libsinglebin_od_a_SOURCES = src/od.c -src_libsinglebin_od_a_CFLAGS = "-Dmain=_single_binary_main_od(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_od" -Dusage=_usage_od $(src_coreutils_CFLAGS) +src_libsinglebin_od_a_CFLAGS = "-Dmain=single_binary_main_od (int, char **); int single_binary_main_od" -Dusage=_usage_od $(src_coreutils_CFLAGS) # Command paste noinst_LIBRARIES += src/libsinglebin_paste.a src_libsinglebin_paste_a_SOURCES = src/paste.c -src_libsinglebin_paste_a_CFLAGS = "-Dmain=_single_binary_main_paste(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_paste" -Dusage=_usage_paste $(src_coreutils_CFLAGS) +src_libsinglebin_paste_a_CFLAGS = "-Dmain=single_binary_main_paste (int, char **); int single_binary_main_paste" -Dusage=_usage_paste $(src_coreutils_CFLAGS) # Command pathchk noinst_LIBRARIES += src/libsinglebin_pathchk.a src_libsinglebin_pathchk_a_SOURCES = src/pathchk.c -src_libsinglebin_pathchk_a_CFLAGS = "-Dmain=_single_binary_main_pathchk(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_pathchk" -Dusage=_usage_pathchk $(src_coreutils_CFLAGS) +src_libsinglebin_pathchk_a_CFLAGS = "-Dmain=single_binary_main_pathchk (int, char **); int single_binary_main_pathchk" -Dusage=_usage_pathchk $(src_coreutils_CFLAGS) # Command pr noinst_LIBRARIES += src/libsinglebin_pr.a src_libsinglebin_pr_a_SOURCES = src/pr.c src_libsinglebin_pr_a_ldadd = $(LIB_CLOCK_GETTIME) -src_libsinglebin_pr_a_CFLAGS = "-Dmain=_single_binary_main_pr(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_pr" -Dusage=_usage_pr $(src_coreutils_CFLAGS) +src_libsinglebin_pr_a_CFLAGS = "-Dmain=single_binary_main_pr (int, char **); int single_binary_main_pr" -Dusage=_usage_pr $(src_coreutils_CFLAGS) # Command printenv noinst_LIBRARIES += src/libsinglebin_printenv.a src_libsinglebin_printenv_a_SOURCES = src/printenv.c -src_libsinglebin_printenv_a_CFLAGS = "-Dmain=_single_binary_main_printenv(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_printenv" -Dusage=_usage_printenv $(src_coreutils_CFLAGS) +src_libsinglebin_printenv_a_CFLAGS = "-Dmain=single_binary_main_printenv (int, char **); int single_binary_main_printenv" -Dusage=_usage_printenv $(src_coreutils_CFLAGS) # Command printf noinst_LIBRARIES += src/libsinglebin_printf.a src_libsinglebin_printf_a_SOURCES = src/printf.c src_libsinglebin_printf_a_ldadd = $(LIBICONV) -src_libsinglebin_printf_a_CFLAGS = "-Dmain=_single_binary_main_printf(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_printf" -Dusage=_usage_printf $(src_coreutils_CFLAGS) +src_libsinglebin_printf_a_CFLAGS = "-Dmain=single_binary_main_printf (int, char **); int single_binary_main_printf" -Dusage=_usage_printf $(src_coreutils_CFLAGS) # Command ptx noinst_LIBRARIES += src/libsinglebin_ptx.a src_libsinglebin_ptx_a_SOURCES = src/ptx.c src_libsinglebin_ptx_a_ldadd = $(LIBICONV) -src_libsinglebin_ptx_a_CFLAGS = "-Dmain=_single_binary_main_ptx(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_ptx" -Dusage=_usage_ptx $(src_coreutils_CFLAGS) +src_libsinglebin_ptx_a_CFLAGS = "-Dmain=single_binary_main_ptx (int, char **); int single_binary_main_ptx" -Dusage=_usage_ptx $(src_coreutils_CFLAGS) # Command pwd noinst_LIBRARIES += src/libsinglebin_pwd.a src_libsinglebin_pwd_a_SOURCES = src/pwd.c -src_libsinglebin_pwd_a_CFLAGS = "-Dmain=_single_binary_main_pwd(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_pwd" -Dusage=_usage_pwd $(src_coreutils_CFLAGS) +src_libsinglebin_pwd_a_CFLAGS = "-Dmain=single_binary_main_pwd (int, char **); int single_binary_main_pwd" -Dusage=_usage_pwd $(src_coreutils_CFLAGS) # Command readlink noinst_LIBRARIES += src/libsinglebin_readlink.a src_libsinglebin_readlink_a_SOURCES = src/readlink.c -src_libsinglebin_readlink_a_CFLAGS = "-Dmain=_single_binary_main_readlink(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_readlink" -Dusage=_usage_readlink $(src_coreutils_CFLAGS) +src_libsinglebin_readlink_a_CFLAGS = "-Dmain=single_binary_main_readlink (int, char **); int single_binary_main_readlink" -Dusage=_usage_readlink $(src_coreutils_CFLAGS) # Command realpath noinst_LIBRARIES += src/libsinglebin_realpath.a src_libsinglebin_realpath_a_SOURCES = src/realpath.c src/relpath.c src/relpath.h src_libsinglebin_realpath_a_ldadd = $(LIBICONV) -src_libsinglebin_realpath_a_CFLAGS = "-Dmain=_single_binary_main_realpath(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_realpath" -Dusage=_usage_realpath $(src_coreutils_CFLAGS) +src_libsinglebin_realpath_a_CFLAGS = "-Dmain=single_binary_main_realpath (int, char **); int single_binary_main_realpath" -Dusage=_usage_realpath $(src_coreutils_CFLAGS) # Command rm noinst_LIBRARIES += src/libsinglebin_rm.a src_libsinglebin_rm_a_SOURCES = src/rm.c src/remove.c src_libsinglebin_rm_a_ldadd = $(remove_ldadd) -src_libsinglebin_rm_a_CFLAGS = "-Dmain=_single_binary_main_rm(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_rm" -Dusage=_usage_rm $(src_coreutils_CFLAGS) +src_libsinglebin_rm_a_CFLAGS = "-Dmain=single_binary_main_rm (int, char **); int single_binary_main_rm" -Dusage=_usage_rm $(src_coreutils_CFLAGS) # Command rmdir noinst_LIBRARIES += src/libsinglebin_rmdir.a src_libsinglebin_rmdir_a_SOURCES = src/rmdir.c src/prog-fprintf.c -src_libsinglebin_rmdir_a_CFLAGS = "-Dmain=_single_binary_main_rmdir(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_rmdir" -Dusage=_usage_rmdir $(src_coreutils_CFLAGS) +src_libsinglebin_rmdir_a_CFLAGS = "-Dmain=single_binary_main_rmdir (int, char **); int single_binary_main_rmdir" -Dusage=_usage_rmdir $(src_coreutils_CFLAGS) # Command runcon noinst_LIBRARIES += src/libsinglebin_runcon.a src_libsinglebin_runcon_a_SOURCES = src/runcon.c src_libsinglebin_runcon_a_ldadd = $(LIB_SELINUX) -src_libsinglebin_runcon_a_CFLAGS = "-Dmain=_single_binary_main_runcon(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_runcon" -Dusage=_usage_runcon $(src_coreutils_CFLAGS) +src_libsinglebin_runcon_a_CFLAGS = "-Dmain=single_binary_main_runcon (int, char **); int single_binary_main_runcon" -Dusage=_usage_runcon $(src_coreutils_CFLAGS) # Command seq noinst_LIBRARIES += src/libsinglebin_seq.a src_libsinglebin_seq_a_SOURCES = src/seq.c -src_libsinglebin_seq_a_CFLAGS = "-Dmain=_single_binary_main_seq(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_seq" -Dusage=_usage_seq $(src_coreutils_CFLAGS) +src_libsinglebin_seq_a_CFLAGS = "-Dmain=single_binary_main_seq (int, char **); int single_binary_main_seq" -Dusage=_usage_seq $(src_coreutils_CFLAGS) # Command sha1sum noinst_LIBRARIES += src/libsinglebin_sha1sum.a src_libsinglebin_sha1sum_a_SOURCES = src/md5sum.c src_libsinglebin_sha1sum_a_ldadd = $(LIB_CRYPTO) -src_libsinglebin_sha1sum_a_CFLAGS = "-Dmain=_single_binary_main_sha1sum(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_sha1sum" -Dusage=_usage_sha1sum $(src_coreutils_CFLAGS) +src_libsinglebin_sha1sum_a_CFLAGS = "-Dmain=single_binary_main_sha1sum (int, char **); int single_binary_main_sha1sum" -Dusage=_usage_sha1sum $(src_coreutils_CFLAGS) src_libsinglebin_sha1sum_a_CPPFLAGS = -DHASH_ALGO_SHA1=1 $(AM_CPPFLAGS) # Command sha224sum noinst_LIBRARIES += src/libsinglebin_sha224sum.a src_libsinglebin_sha224sum_a_SOURCES = src/md5sum.c src_libsinglebin_sha224sum_a_ldadd = $(LIB_CRYPTO) -src_libsinglebin_sha224sum_a_CFLAGS = "-Dmain=_single_binary_main_sha224sum(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_sha224sum" -Dusage=_usage_sha224sum $(src_coreutils_CFLAGS) +src_libsinglebin_sha224sum_a_CFLAGS = "-Dmain=single_binary_main_sha224sum (int, char **); int single_binary_main_sha224sum" -Dusage=_usage_sha224sum $(src_coreutils_CFLAGS) src_libsinglebin_sha224sum_a_CPPFLAGS = -DHASH_ALGO_SHA224=1 $(AM_CPPFLAGS) # Command sha256sum noinst_LIBRARIES += src/libsinglebin_sha256sum.a src_libsinglebin_sha256sum_a_SOURCES = src/md5sum.c src_libsinglebin_sha256sum_a_ldadd = $(LIB_CRYPTO) -src_libsinglebin_sha256sum_a_CFLAGS = "-Dmain=_single_binary_main_sha256sum(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_sha256sum" -Dusage=_usage_sha256sum $(src_coreutils_CFLAGS) +src_libsinglebin_sha256sum_a_CFLAGS = "-Dmain=single_binary_main_sha256sum (int, char **); int single_binary_main_sha256sum" -Dusage=_usage_sha256sum $(src_coreutils_CFLAGS) src_libsinglebin_sha256sum_a_CPPFLAGS = -DHASH_ALGO_SHA256=1 $(AM_CPPFLAGS) # Command sha384sum noinst_LIBRARIES += src/libsinglebin_sha384sum.a src_libsinglebin_sha384sum_a_SOURCES = src/md5sum.c src_libsinglebin_sha384sum_a_ldadd = $(LIB_CRYPTO) -src_libsinglebin_sha384sum_a_CFLAGS = "-Dmain=_single_binary_main_sha384sum(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_sha384sum" -Dusage=_usage_sha384sum $(src_coreutils_CFLAGS) +src_libsinglebin_sha384sum_a_CFLAGS = "-Dmain=single_binary_main_sha384sum (int, char **); int single_binary_main_sha384sum" -Dusage=_usage_sha384sum $(src_coreutils_CFLAGS) src_libsinglebin_sha384sum_a_CPPFLAGS = -DHASH_ALGO_SHA384=1 $(AM_CPPFLAGS) # Command sha512sum noinst_LIBRARIES += src/libsinglebin_sha512sum.a src_libsinglebin_sha512sum_a_SOURCES = src/md5sum.c src_libsinglebin_sha512sum_a_ldadd = $(LIB_CRYPTO) -src_libsinglebin_sha512sum_a_CFLAGS = "-Dmain=_single_binary_main_sha512sum(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_sha512sum" -Dusage=_usage_sha512sum $(src_coreutils_CFLAGS) +src_libsinglebin_sha512sum_a_CFLAGS = "-Dmain=single_binary_main_sha512sum (int, char **); int single_binary_main_sha512sum" -Dusage=_usage_sha512sum $(src_coreutils_CFLAGS) src_libsinglebin_sha512sum_a_CPPFLAGS = -DHASH_ALGO_SHA512=1 $(AM_CPPFLAGS) # Command shred noinst_LIBRARIES += src/libsinglebin_shred.a src_libsinglebin_shred_a_SOURCES = src/shred.c src_libsinglebin_shred_a_ldadd = $(LIB_FDATASYNC) -src_libsinglebin_shred_a_CFLAGS = "-Dmain=_single_binary_main_shred(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_shred" -Dusage=_usage_shred $(src_coreutils_CFLAGS) +src_libsinglebin_shred_a_CFLAGS = "-Dmain=single_binary_main_shred (int, char **); int single_binary_main_shred" -Dusage=_usage_shred $(src_coreutils_CFLAGS) # Command shuf noinst_LIBRARIES += src/libsinglebin_shuf.a src_libsinglebin_shuf_a_SOURCES = src/shuf.c -src_libsinglebin_shuf_a_CFLAGS = "-Dmain=_single_binary_main_shuf(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_shuf" -Dusage=_usage_shuf $(src_coreutils_CFLAGS) +src_libsinglebin_shuf_a_CFLAGS = "-Dmain=single_binary_main_shuf (int, char **); int single_binary_main_shuf" -Dusage=_usage_shuf $(src_coreutils_CFLAGS) # Command sleep noinst_LIBRARIES += src/libsinglebin_sleep.a src_libsinglebin_sleep_a_SOURCES = src/sleep.c src_libsinglebin_sleep_a_ldadd = $(LIB_NANOSLEEP) -src_libsinglebin_sleep_a_CFLAGS = "-Dmain=_single_binary_main_sleep(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_sleep" -Dusage=_usage_sleep $(src_coreutils_CFLAGS) +src_libsinglebin_sleep_a_CFLAGS = "-Dmain=single_binary_main_sleep (int, char **); int single_binary_main_sleep" -Dusage=_usage_sleep $(src_coreutils_CFLAGS) # Command sort noinst_LIBRARIES += src/libsinglebin_sort.a src_libsinglebin_sort_a_SOURCES = src/sort.c src_libsinglebin_sort_a_ldadd = $(LIB_EACCESS) $(LIB_NANOSLEEP) $(LIB_CRYPTO) $(LIB_PTHREAD) -src_libsinglebin_sort_a_CFLAGS = "-Dmain=_single_binary_main_sort(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_sort" -Dusage=_usage_sort $(src_coreutils_CFLAGS) +src_libsinglebin_sort_a_CFLAGS = "-Dmain=single_binary_main_sort (int, char **); int single_binary_main_sort" -Dusage=_usage_sort $(src_coreutils_CFLAGS) # Command split noinst_LIBRARIES += src/libsinglebin_split.a src_libsinglebin_split_a_SOURCES = src/split.c src_libsinglebin_split_a_ldadd = $(LIBICONV) -src_libsinglebin_split_a_CFLAGS = "-Dmain=_single_binary_main_split(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_split" -Dusage=_usage_split $(src_coreutils_CFLAGS) +src_libsinglebin_split_a_CFLAGS = "-Dmain=single_binary_main_split (int, char **); int single_binary_main_split" -Dusage=_usage_split $(src_coreutils_CFLAGS) # Command stat noinst_LIBRARIES += src/libsinglebin_stat.a src_libsinglebin_stat_a_SOURCES = src/stat.c src/find-mount-point.c src_libsinglebin_stat_a_ldadd = $(LIB_SELINUX) $(LIB_NVPAIR) -src_libsinglebin_stat_a_CFLAGS = "-Dmain=_single_binary_main_stat(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_stat" -Dusage=_usage_stat $(src_coreutils_CFLAGS) +src_libsinglebin_stat_a_CFLAGS = "-Dmain=single_binary_main_stat (int, char **); int single_binary_main_stat" -Dusage=_usage_stat $(src_coreutils_CFLAGS) # Command sum noinst_LIBRARIES += src/libsinglebin_sum.a src_libsinglebin_sum_a_SOURCES = src/sum.c -src_libsinglebin_sum_a_CFLAGS = "-Dmain=_single_binary_main_sum(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_sum" -Dusage=_usage_sum $(src_coreutils_CFLAGS) +src_libsinglebin_sum_a_CFLAGS = "-Dmain=single_binary_main_sum (int, char **); int single_binary_main_sum" -Dusage=_usage_sum $(src_coreutils_CFLAGS) # Command sync noinst_LIBRARIES += src/libsinglebin_sync.a src_libsinglebin_sync_a_SOURCES = src/sync.c -src_libsinglebin_sync_a_CFLAGS = "-Dmain=_single_binary_main_sync(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_sync" -Dusage=_usage_sync $(src_coreutils_CFLAGS) +src_libsinglebin_sync_a_CFLAGS = "-Dmain=single_binary_main_sync (int, char **); int single_binary_main_sync" -Dusage=_usage_sync $(src_coreutils_CFLAGS) # Command tac noinst_LIBRARIES += src/libsinglebin_tac.a src_libsinglebin_tac_a_SOURCES = src/tac.c -src_libsinglebin_tac_a_CFLAGS = "-Dmain=_single_binary_main_tac(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_tac" -Dusage=_usage_tac $(src_coreutils_CFLAGS) +src_libsinglebin_tac_a_CFLAGS = "-Dmain=single_binary_main_tac (int, char **); int single_binary_main_tac" -Dusage=_usage_tac $(src_coreutils_CFLAGS) # Command tail noinst_LIBRARIES += src/libsinglebin_tail.a src_libsinglebin_tail_a_SOURCES = src/tail.c src_libsinglebin_tail_a_ldadd = $(LIB_NANOSLEEP) -src_libsinglebin_tail_a_CFLAGS = "-Dmain=_single_binary_main_tail(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_tail" -Dusage=_usage_tail $(src_coreutils_CFLAGS) +src_libsinglebin_tail_a_CFLAGS = "-Dmain=single_binary_main_tail (int, char **); int single_binary_main_tail" -Dusage=_usage_tail $(src_coreutils_CFLAGS) # Command tee noinst_LIBRARIES += src/libsinglebin_tee.a src_libsinglebin_tee_a_SOURCES = src/tee.c -src_libsinglebin_tee_a_CFLAGS = "-Dmain=_single_binary_main_tee(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_tee" -Dusage=_usage_tee $(src_coreutils_CFLAGS) +src_libsinglebin_tee_a_CFLAGS = "-Dmain=single_binary_main_tee (int, char **); int single_binary_main_tee" -Dusage=_usage_tee $(src_coreutils_CFLAGS) # Command test noinst_LIBRARIES += src/libsinglebin_test.a src_libsinglebin_test_a_SOURCES = src/test.c src_libsinglebin_test_a_ldadd = $(LIB_EACCESS) -src_libsinglebin_test_a_CFLAGS = "-Dmain=_single_binary_main_test(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_test" -Dusage=_usage_test $(src_coreutils_CFLAGS) +src_libsinglebin_test_a_CFLAGS = "-Dmain=single_binary_main_test (int, char **); int single_binary_main_test" -Dusage=_usage_test $(src_coreutils_CFLAGS) # Command timeout noinst_LIBRARIES += src/libsinglebin_timeout.a src_libsinglebin_timeout_a_SOURCES = src/timeout.c src/operand2sig.c src_libsinglebin_timeout_a_ldadd = $(LIB_TIMER_TIME) $(LIBICONV) -src_libsinglebin_timeout_a_CFLAGS = "-Dmain=_single_binary_main_timeout(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_timeout" -Dusage=_usage_timeout $(src_coreutils_CFLAGS) +src_libsinglebin_timeout_a_CFLAGS = "-Dmain=single_binary_main_timeout (int, char **); int single_binary_main_timeout" -Dusage=_usage_timeout $(src_coreutils_CFLAGS) # Command touch noinst_LIBRARIES += src/libsinglebin_touch.a src_libsinglebin_touch_a_SOURCES = src/touch.c src_libsinglebin_touch_a_ldadd = $(LIB_CLOCK_GETTIME) -src_libsinglebin_touch_a_CFLAGS = "-Dmain=_single_binary_main_touch(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_touch" -Dusage=_usage_touch $(src_coreutils_CFLAGS) +src_libsinglebin_touch_a_CFLAGS = "-Dmain=single_binary_main_touch (int, char **); int single_binary_main_touch" -Dusage=_usage_touch $(src_coreutils_CFLAGS) # Command tr noinst_LIBRARIES += src/libsinglebin_tr.a src_libsinglebin_tr_a_SOURCES = src/tr.c -src_libsinglebin_tr_a_CFLAGS = "-Dmain=_single_binary_main_tr(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_tr" -Dusage=_usage_tr $(src_coreutils_CFLAGS) +src_libsinglebin_tr_a_CFLAGS = "-Dmain=single_binary_main_tr (int, char **); int single_binary_main_tr" -Dusage=_usage_tr $(src_coreutils_CFLAGS) # Command true noinst_LIBRARIES += src/libsinglebin_true.a src_libsinglebin_true_a_SOURCES = src/true.c -src_libsinglebin_true_a_CFLAGS = "-Dmain=_single_binary_main_true(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_true" -Dusage=_usage_true $(src_coreutils_CFLAGS) +src_libsinglebin_true_a_CFLAGS = "-Dmain=single_binary_main_true (int, char **); int single_binary_main_true" -Dusage=_usage_true $(src_coreutils_CFLAGS) # Command truncate noinst_LIBRARIES += src/libsinglebin_truncate.a src_libsinglebin_truncate_a_SOURCES = src/truncate.c src_libsinglebin_truncate_a_ldadd = $(LIBICONV) -src_libsinglebin_truncate_a_CFLAGS = "-Dmain=_single_binary_main_truncate(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_truncate" -Dusage=_usage_truncate $(src_coreutils_CFLAGS) +src_libsinglebin_truncate_a_CFLAGS = "-Dmain=single_binary_main_truncate (int, char **); int single_binary_main_truncate" -Dusage=_usage_truncate $(src_coreutils_CFLAGS) # Command tsort noinst_LIBRARIES += src/libsinglebin_tsort.a src_libsinglebin_tsort_a_SOURCES = src/tsort.c -src_libsinglebin_tsort_a_CFLAGS = "-Dmain=_single_binary_main_tsort(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_tsort" -Dusage=_usage_tsort $(src_coreutils_CFLAGS) +src_libsinglebin_tsort_a_CFLAGS = "-Dmain=single_binary_main_tsort (int, char **); int single_binary_main_tsort" -Dusage=_usage_tsort $(src_coreutils_CFLAGS) # Command tty noinst_LIBRARIES += src/libsinglebin_tty.a src_libsinglebin_tty_a_SOURCES = src/tty.c -src_libsinglebin_tty_a_CFLAGS = "-Dmain=_single_binary_main_tty(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_tty" -Dusage=_usage_tty $(src_coreutils_CFLAGS) +src_libsinglebin_tty_a_CFLAGS = "-Dmain=single_binary_main_tty (int, char **); int single_binary_main_tty" -Dusage=_usage_tty $(src_coreutils_CFLAGS) # Command uname noinst_LIBRARIES += src/libsinglebin_uname.a src_libsinglebin_uname_a_SOURCES = src/uname.c src/uname-uname.c src_libsinglebin_uname_a_ldadd = $(GETHOSTNAME_LIB) -src_libsinglebin_uname_a_CFLAGS = "-Dmain=_single_binary_main_uname(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_uname" -Dusage=_usage_uname $(src_coreutils_CFLAGS) +src_libsinglebin_uname_a_CFLAGS = "-Dmain=single_binary_main_uname (int, char **); int single_binary_main_uname" -Dusage=_usage_uname $(src_coreutils_CFLAGS) # Command unexpand noinst_LIBRARIES += src/libsinglebin_unexpand.a src_libsinglebin_unexpand_a_SOURCES = src/unexpand.c -src_libsinglebin_unexpand_a_CFLAGS = "-Dmain=_single_binary_main_unexpand(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_unexpand" -Dusage=_usage_unexpand $(src_coreutils_CFLAGS) +src_libsinglebin_unexpand_a_CFLAGS = "-Dmain=single_binary_main_unexpand (int, char **); int single_binary_main_unexpand" -Dusage=_usage_unexpand $(src_coreutils_CFLAGS) # Command uniq noinst_LIBRARIES += src/libsinglebin_uniq.a src_libsinglebin_uniq_a_SOURCES = src/uniq.c -src_libsinglebin_uniq_a_CFLAGS = "-Dmain=_single_binary_main_uniq(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_uniq" -Dusage=_usage_uniq $(src_coreutils_CFLAGS) +src_libsinglebin_uniq_a_CFLAGS = "-Dmain=single_binary_main_uniq (int, char **); int single_binary_main_uniq" -Dusage=_usage_uniq $(src_coreutils_CFLAGS) # Command unlink noinst_LIBRARIES += src/libsinglebin_unlink.a src_libsinglebin_unlink_a_SOURCES = src/unlink.c -src_libsinglebin_unlink_a_CFLAGS = "-Dmain=_single_binary_main_unlink(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_unlink" -Dusage=_usage_unlink $(src_coreutils_CFLAGS) +src_libsinglebin_unlink_a_CFLAGS = "-Dmain=single_binary_main_unlink (int, char **); int single_binary_main_unlink" -Dusage=_usage_unlink $(src_coreutils_CFLAGS) # Command vdir noinst_LIBRARIES += src/libsinglebin_vdir.a src_libsinglebin_vdir_a_SOURCES = src/coreutils-vdir.c src_libsinglebin_vdir_a_ldadd = $(src_ls_LDADD) src/libsinglebin_ls.a -src_libsinglebin_vdir_a_CFLAGS = "-Dmain=_single_binary_main_vdir(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_vdir" -Dusage=_usage_vdir $(src_coreutils_CFLAGS) +src_libsinglebin_vdir_a_CFLAGS = "-Dmain=single_binary_main_vdir (int, char **); int single_binary_main_vdir" -Dusage=_usage_vdir $(src_coreutils_CFLAGS) # Command wc noinst_LIBRARIES += src/libsinglebin_wc.a src_libsinglebin_wc_a_SOURCES = src/wc.c -src_libsinglebin_wc_a_CFLAGS = "-Dmain=_single_binary_main_wc(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_wc" -Dusage=_usage_wc $(src_coreutils_CFLAGS) +src_libsinglebin_wc_a_CFLAGS = "-Dmain=single_binary_main_wc (int, char **); int single_binary_main_wc" -Dusage=_usage_wc $(src_coreutils_CFLAGS) # Command whoami noinst_LIBRARIES += src/libsinglebin_whoami.a src_libsinglebin_whoami_a_SOURCES = src/whoami.c -src_libsinglebin_whoami_a_CFLAGS = "-Dmain=_single_binary_main_whoami(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_whoami" -Dusage=_usage_whoami $(src_coreutils_CFLAGS) +src_libsinglebin_whoami_a_CFLAGS = "-Dmain=single_binary_main_whoami (int, char **); int single_binary_main_whoami" -Dusage=_usage_whoami $(src_coreutils_CFLAGS) # Command yes noinst_LIBRARIES += src/libsinglebin_yes.a src_libsinglebin_yes_a_SOURCES = src/yes.c -src_libsinglebin_yes_a_CFLAGS = "-Dmain=_single_binary_main_yes(int, char**) ATTRIBUTE_NORETURN; int _single_binary_main_yes" -Dusage=_usage_yes $(src_coreutils_CFLAGS) +src_libsinglebin_yes_a_CFLAGS = "-Dmain=single_binary_main_yes (int, char **); int single_binary_main_yes" -Dusage=_usage_yes $(src_coreutils_CFLAGS) diff --git a/src/sleep.c b/src/sleep.c index e24c2512..788601be 100644 --- a/src/sleep.c +++ b/src/sleep.c @@ -1,5 +1,5 @@ /* sleep - delay for a specified amount of time. - Copyright (C) 1984-2014 Free Software Foundation, Inc. + Copyright (C) 1984-2015 Free Software Foundation, Inc. This 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,7 @@ specified by the sum of their values.\n\ program_name, program_name); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -145,5 +145,5 @@ main (int argc, char **argv) if (xnanosleep (seconds)) error (EXIT_FAILURE, errno, _("cannot read realtime clock")); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/sort.c b/src/sort.c index c2493192..85fc38f7 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-2014 Free Software Foundation, Inc. + Copyright (C) 1988-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -428,6 +428,7 @@ Usage: %s [OPTION]... [FILE]...\n\ Write sorted concatenation of all FILE(s) to standard output.\n\ "), stdout); + emit_stdin_note (); emit_mandatory_arg_note (); fputs (_("\ @@ -524,14 +525,12 @@ SIZE may be followed by the following multiplicative suffixes:\n\ fputs (_("\ % 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\ "), stdout ); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); @@ -4708,7 +4707,7 @@ main (int argc, char **argv) /* POSIX requires that sort return 1 IFF invoked with -c or -C and the input is not properly sorted. */ - exit (check (files[0], checkonly) ? EXIT_SUCCESS : SORT_OUT_OF_ORDER); + return check (files[0], checkonly) ? EXIT_SUCCESS : SORT_OUT_OF_ORDER; } /* Check all inputs are accessible, or exit immediately. */ @@ -4746,5 +4745,5 @@ main (int argc, char **argv) if (have_read_stdin && fclose (stdin) == EOF) die (_("close failed"), "-"); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/split.c b/src/split.c index dacacaa8..35f2629a 100644 --- a/src/split.c +++ b/src/split.c @@ -1,5 +1,5 @@ /* split.c -- split a file into pieces. - Copyright (C) 1988-2014 Free Software Foundation, Inc. + Copyright (C) 1988-2015 Free Software Foundation, Inc. This 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,10 +16,9 @@ /* By tege@sics.se, with rms. - To do: - * Implement -t CHAR or -t REGEX to specify break characters other - than newline. */ - + TODO: + * support -p REGEX as in BSD's split. + * support --suppress-matched as in csplit. */ #include #include @@ -39,6 +38,7 @@ #include "safe-read.h" #include "sig2str.h" #include "xfreopen.h" +#include "xdectoint.h" #include "xstrtol.h" /* The official name of this program (e.g., no 'g' prefix). */ @@ -108,6 +108,9 @@ static bool elide_empty_files; input to output, which is much slower, so disabled by default. */ static bool unbuffered; +/* The character marking end of line. Defaults to \n below. */ +static int eolchar = -1; + /* The split mode to use. */ enum Split_type { @@ -139,6 +142,7 @@ static struct option const longopts[] = {"numeric-suffixes", optional_argument, NULL, 'd'}, {"filter", required_argument, NULL, FILTER_OPTION}, {"verbose", no_argument, NULL, VERBOSE_OPTION}, + {"separator", required_argument, NULL, 't'}, {"-io-blksize", required_argument, NULL, IO_BLKSIZE_OPTION}, /* do not document */ {GETOPT_HELP_OPTION_DECL}, @@ -158,7 +162,7 @@ set_suffix_length (uintmax_t n_units, enum Split_type split_type) { #define DEFAULT_SUFFIX_LENGTH 2 - size_t suffix_needed = 0; + uintmax_t suffix_needed = 0; /* The suffix auto length feature is incompatible with a user specified start value as the generated suffixes @@ -170,9 +174,26 @@ set_suffix_length (uintmax_t n_units, enum Split_type split_type) if (split_type == type_chunk_bytes || split_type == type_chunk_lines || split_type == type_rr) { + uintmax_t n_units_end = n_units; + if (numeric_suffix_start) + { + uintmax_t n_start; + strtol_error e = xstrtoumax (numeric_suffix_start, NULL, 10, + &n_start, ""); + if (e == LONGINT_OK && n_start <= UINTMAX_MAX - n_units) + { + /* Restrict auto adjustment so we don't keep + incrementing a suffix size arbitrarily, + as that would break sort order for files + generated from multiple split runs. */ + if (n_start < n_units) + n_units_end += n_start; + } + + } size_t alphabet_len = strlen (suffix_alphabet); - bool alphabet_slop = (n_units % alphabet_len) != 0; - while (n_units /= alphabet_len) + bool alphabet_slop = (n_units_end % alphabet_len) != 0; + while (n_units_end /= alphabet_len) suffix_needed++; suffix_needed += alphabet_slop; suffix_auto = false; @@ -183,7 +204,7 @@ set_suffix_length (uintmax_t n_units, enum Split_type split_type) if (suffix_length < suffix_needed) { error (EXIT_FAILURE, 0, - _("the suffix length needs to be at least %zu"), + _("the suffix length needs to be at least %"PRIuMAX), suffix_needed); } suffix_auto = false; @@ -201,28 +222,30 @@ usage (int status) else { printf (_("\ -Usage: %s [OPTION]... [INPUT [PREFIX]]\n\ +Usage: %s [OPTION]... [FILE [PREFIX]]\n\ "), program_name); fputs (_("\ -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\ +Output pieces of FILE to PREFIXaa, PREFIXab, ...;\n\ +default size is 1000 lines, and default PREFIX is 'x'.\n\ "), stdout); + emit_stdin_note (); 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\ -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\ + -C, --line-bytes=SIZE put at most SIZE bytes of records 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\ + -l, --lines=NUMBER put NUMBER lines/records per output file\n\ -n, --number=CHUNKS generate CHUNKS output files; see explanation below\n\ + -t, --separator=SEP use SEP instead of newline as the record separator;\n\ + '\\0' (zero) specifies the NUL character\n\ -u, --unbuffered immediately copy input to output with '-n r/...'\n\ "), DEFAULT_SUFFIX_LENGTH); fputs (_("\ @@ -234,18 +257,49 @@ is -, read standard input.\n\ emit_size_note (); fputs (_("\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\ + 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/records\n\ + l/K/N output Kth of N to stdout without splitting lines/records\n\ + r/N like 'l' but use round robin distribution\n\ + r/K/N likewise but only output Kth of N to stdout\n\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } +/* Return the number of bytes that can be read from FD, a file with + apparent size SIZE. Actually read the data into BUF (of size + BUFSIZE) if the file appears to be smaller than BUFSIZE, as this + works better on proc-like file systems. If the returned value is + less than BUFSIZE, store all the file's data into BUF; otherwise, + restore the input file's position so that the file can be reread if + needed. */ + +static off_t +input_file_size (int fd, off_t size, char *buf, size_t bufsize) +{ + if (size < bufsize) + { + size = 0; + while (true) + { + size_t save = size < bufsize ? size : 0; + size_t n_read = safe_read (fd, buf + save, bufsize - save); + if (n_read == 0) + break; + if (n_read == SAFE_READ_ERROR) + error (EXIT_FAILURE, errno, "%s", infile); + size += n_read; + } + if (bufsize <= size && lseek (fd, - size, SEEK_CUR) < 0) + error (EXIT_FAILURE, errno, "%s", infile); + } + + return size; +} + /* Compute the next sequential output file name and store it into the string 'outfile'. */ @@ -485,7 +539,7 @@ closeout (FILE *fp, int fd, pid_t pid, char const *name) { /* shouldn't happen. */ error (EXIT_FAILURE, 0, - _("unknown status from command (0x%X)"), wstatus); + _("unknown status from command (0x%X)"), wstatus + 0u); } } } @@ -511,10 +565,13 @@ cwrite (bool new_file_flag, const char *bp, size_t bytes) } /* Split into pieces of exactly N_BYTES bytes. - Use buffer BUF, whose size is BUFSIZE. */ + Use buffer BUF, whose size is BUFSIZE. + If INITIAL_READ != SIZE_MAX, the entire input file has already been + partly read into BUF and BUF contains INITIAL_READ input bytes. */ static void -bytes_split (uintmax_t n_bytes, char *buf, size_t bufsize, uintmax_t max_files) +bytes_split (uintmax_t n_bytes, char *buf, size_t bufsize, size_t initial_read, + uintmax_t max_files) { size_t n_read; bool new_file_flag = true; @@ -525,9 +582,17 @@ bytes_split (uintmax_t n_bytes, char *buf, size_t bufsize, uintmax_t max_files) do { - n_read = safe_read (STDIN_FILENO, buf, bufsize); - if (n_read == SAFE_READ_ERROR) - error (EXIT_FAILURE, errno, "%s", infile); + if (initial_read != SIZE_MAX) + { + n_read = initial_read; + initial_read = SIZE_MAX; + } + else + { + n_read = safe_read (STDIN_FILENO, buf, bufsize); + if (n_read == SAFE_READ_ERROR) + error (EXIT_FAILURE, errno, "%s", infile); + } bp_out = buf; to_read = n_read; while (true) @@ -588,10 +653,10 @@ lines_split (uintmax_t n_lines, char *buf, size_t bufsize) error (EXIT_FAILURE, errno, "%s", infile); bp = bp_out = buf; eob = bp + n_read; - *eob = '\n'; + *eob = eolchar; while (true) { - bp = memchr (bp, '\n', eob - bp + 1); + bp = memchr (bp, eolchar, eob - bp + 1); if (bp == eob) { if (eob != bp_out) /* do not write 0 bytes! */ @@ -650,10 +715,10 @@ line_bytes_split (uintmax_t n_bytes, char *buf, size_t bufsize) /* Have enough for split. */ split_rest = n_bytes - n_out - n_hold; eoc = sob + split_rest - 1; - eol = memrchr (sob, '\n', split_rest); + eol = memrchr (sob, eolchar, split_rest); } else - eol = memrchr (sob, '\n', n_left); + eol = memrchr (sob, eolchar, n_left); /* Output hold space if possible. */ if (n_hold && !(!eol && n_out)) @@ -736,7 +801,7 @@ line_bytes_split (uintmax_t n_bytes, char *buf, size_t bufsize) static void lines_chunk_split (uintmax_t k, uintmax_t n, char *buf, size_t bufsize, - off_t file_size) + size_t initial_read, off_t file_size) { assert (n && k <= n && n <= file_size); @@ -751,7 +816,12 @@ lines_chunk_split (uintmax_t k, uintmax_t n, char *buf, size_t bufsize, { /* Start reading 1 byte before kth chunk of file. */ off_t start = (k - 1) * chunk_size - 1; - if (lseek (STDIN_FILENO, start, SEEK_CUR) < 0) + if (initial_read != SIZE_MAX) + { + memmove (buf, buf + start, initial_read - start); + initial_read -= start; + } + else if (lseek (STDIN_FILENO, start, SEEK_CUR) < 0) error (EXIT_FAILURE, errno, "%s", infile); n_written = start; chunk_no = k - 1; @@ -761,10 +831,19 @@ lines_chunk_split (uintmax_t k, uintmax_t n, char *buf, size_t bufsize, while (n_written < file_size) { char *bp = buf, *eob; - size_t n_read = safe_read (STDIN_FILENO, buf, bufsize); - if (n_read == SAFE_READ_ERROR) - error (EXIT_FAILURE, errno, "%s", infile); - else if (n_read == 0) + size_t n_read; + if (initial_read != SIZE_MAX) + { + n_read = initial_read; + initial_read = SIZE_MAX; + } + else + { + n_read = safe_read (STDIN_FILENO, buf, bufsize); + if (n_read == SAFE_READ_ERROR) + error (EXIT_FAILURE, errno, "%s", infile); + } + if (n_read == 0) break; /* eof. */ n_read = MIN (n_read, file_size - n_written); chunk_truncated = false; @@ -777,7 +856,7 @@ lines_chunk_split (uintmax_t k, uintmax_t n, char *buf, size_t bufsize, /* Begin looking for '\n' at last byte of chunk. */ off_t skip = MIN (n_read, MAX (0, chunk_end - n_written)); - char *bp_out = memchr (bp + skip, '\n', n_read - skip); + char *bp_out = memchr (bp + skip, eolchar, n_read - skip); if (bp_out++) next = true; else @@ -841,7 +920,7 @@ lines_chunk_split (uintmax_t k, uintmax_t n, char *buf, size_t bufsize, static void bytes_chunk_extract (uintmax_t k, uintmax_t n, char *buf, size_t bufsize, - off_t file_size) + size_t initial_read, off_t file_size) { off_t start; off_t end; @@ -851,15 +930,29 @@ bytes_chunk_extract (uintmax_t k, uintmax_t n, char *buf, size_t bufsize, start = (k - 1) * (file_size / n); end = (k == n) ? file_size : k * (file_size / n); - if (lseek (STDIN_FILENO, start, SEEK_CUR) < 0) + if (initial_read != SIZE_MAX) + { + memmove (buf, buf + start, initial_read - start); + initial_read -= start; + } + else if (lseek (STDIN_FILENO, start, SEEK_CUR) < 0) error (EXIT_FAILURE, errno, "%s", infile); while (start < end) { - size_t n_read = safe_read (STDIN_FILENO, buf, bufsize); - if (n_read == SAFE_READ_ERROR) - error (EXIT_FAILURE, errno, "%s", infile); - else if (n_read == 0) + size_t n_read; + if (initial_read != SIZE_MAX) + { + n_read = initial_read; + initial_read = SIZE_MAX; + } + else + { + n_read = safe_read (STDIN_FILENO, buf, bufsize); + if (n_read == SAFE_READ_ERROR) + error (EXIT_FAILURE, errno, "%s", infile); + } + if (n_read == 0) break; /* eof. */ n_read = MIN (n_read, end - start); if (full_write (STDOUT_FILENO, buf, n_read) != n_read @@ -915,11 +1008,11 @@ ofile_open (of_t *files, size_t i_check, size_t nfiles) In specialised cases the consumer can keep reading from the fifo, terminating on conditions in the data itself, or perhaps never in the case of 'tail -f'. - I.E. for fifos it is valid to attempt this reopen. + I.e., for fifos it is valid to attempt this reopen. We don't handle the filter_command case here, as create() will exit if there are not enough files in that case. - I.E. we don't support restarting filters, as that would + I.e., we don't support restarting filters, as that would put too much burden on users specifying --filter commands. */ fd = open (files[i_check].of_name, O_WRONLY | O_BINARY | O_APPEND | O_NONBLOCK); @@ -1010,7 +1103,7 @@ lines_rr (uintmax_t k, uintmax_t n, char *buf, size_t bufsize) bool next = false; /* Find end of line. */ - char *bp_out = memchr (bp, '\n', eob - bp); + char *bp_out = memchr (bp, eolchar, eob - bp); if (bp_out) { bp_out++; @@ -1104,19 +1197,20 @@ no_filters: } \ while (0) + /* Parse K/N syntax of chunk options. */ static void parse_chunk (uintmax_t *k_units, uintmax_t *n_units, char *slash) { - *slash = '\0'; - if (xstrtoumax (slash + 1, NULL, 10, n_units, "") != LONGINT_OK - || *n_units == 0) - error (EXIT_FAILURE, 0, _("%s: invalid number of chunks"), slash + 1); - if (slash != optarg /* a leading number is specified. */ - && (xstrtoumax (optarg, NULL, 10, k_units, "") != LONGINT_OK - || *k_units == 0 || *n_units < *k_units)) - error (EXIT_FAILURE, 0, _("%s: invalid chunk number"), optarg); + *n_units = xdectoumax (slash + 1, 1, UINTMAX_MAX, "", + _("invalid number of chunks"), 0); + if (slash != optarg) /* a leading number is specified. */ + { + *slash = '\0'; + *k_units = xdectoumax (optarg, 1, *n_units, "", + _("invalid chunk number"), 0); + } } @@ -1127,7 +1221,7 @@ main (int argc, char **argv) size_t in_blk_size = 0; /* optimal block size of input file device */ size_t page_size = getpagesize (); uintmax_t k_units = 0; - uintmax_t n_units; + uintmax_t n_units = 0; static char const multipliers[] = "bEGKkMmPTYZ0"; int c; @@ -1153,7 +1247,7 @@ main (int argc, char **argv) int this_optind = optind ? optind : 1; char *slash; - c = getopt_long (argc, argv, "0123456789C:a:b:del:n:u", + c = getopt_long (argc, argv, "0123456789C:a:b:del:n:t:u", longopts, NULL); if (c == -1) break; @@ -1161,16 +1255,8 @@ main (int argc, char **argv) switch (c) { case 'a': - { - unsigned long tmp; - if (xstrtoul (optarg, NULL, 10, &tmp, "") != LONGINT_OK - || SIZE_MAX / sizeof (size_t) < tmp) - { - error (0, 0, _("%s: invalid suffix length"), optarg); - usage (EXIT_FAILURE); - } - suffix_length = tmp; - } + suffix_length = xdectoumax (optarg, 0, SIZE_MAX / sizeof (size_t), + "", _("invalid suffix length"), 0); break; case ADDITIONAL_SUFFIX_OPTION: @@ -1188,46 +1274,27 @@ main (int argc, char **argv) if (split_type != type_undef) FAIL_ONLY_ONE_WAY (); split_type = type_bytes; - if (xstrtoumax (optarg, NULL, 10, &n_units, multipliers) != LONGINT_OK - || n_units == 0) - { - error (0, 0, _("%s: invalid number of bytes"), optarg); - usage (EXIT_FAILURE); - } - /* If input is a pipe, we could get more data than is possible - to write to a single file, so indicate that immediately - rather than having possibly future invocations fail. */ - if (OFF_T_MAX < n_units) - error (EXIT_FAILURE, EFBIG, - _("%s: invalid number of bytes"), optarg); - + /* Limit to OFF_T_MAX, becaue if input is a pipe, we could get more + data than is possible to write to a single file, so indicate that + immediately rather than having possibly future invocations fail. */ + n_units = xdectoumax (optarg, 1, OFF_T_MAX, multipliers, + _("invalid number of bytes"), 0); break; case 'l': if (split_type != type_undef) FAIL_ONLY_ONE_WAY (); split_type = type_lines; - if (xstrtoumax (optarg, NULL, 10, &n_units, "") != LONGINT_OK - || n_units == 0) - { - error (0, 0, _("%s: invalid number of lines"), optarg); - usage (EXIT_FAILURE); - } + n_units = xdectoumax (optarg, 1, UINTMAX_MAX, "", + _("invalid number of lines"), 0); break; case 'C': if (split_type != type_undef) FAIL_ONLY_ONE_WAY (); split_type = type_byteslines; - if (xstrtoumax (optarg, NULL, 10, &n_units, multipliers) != LONGINT_OK - || n_units == 0 || SIZE_MAX < n_units) - { - error (0, 0, _("%s: invalid number of bytes"), optarg); - usage (EXIT_FAILURE); - } - if (OFF_T_MAX < n_units) - error (EXIT_FAILURE, EFBIG, - _("%s: invalid number of bytes"), optarg); + n_units = xdectoumax (optarg, 1, MIN (SIZE_MAX, OFF_T_MAX), + multipliers, _("invalid number of bytes"), 0); break; case 'n': @@ -1250,15 +1317,45 @@ main (int argc, char **argv) split_type = type_chunk_bytes; if ((slash = strchr (optarg, '/'))) parse_chunk (&k_units, &n_units, slash); - else if (xstrtoumax (optarg, NULL, 10, &n_units, "") != LONGINT_OK - || n_units == 0) - error (EXIT_FAILURE, 0, _("%s: invalid number of chunks"), optarg); + else + n_units = xdectoumax (optarg, 1, UINTMAX_MAX, "", + _("invalid number of chunks"), 0); break; case 'u': unbuffered = true; break; + case 't': + { + char neweol = optarg[0]; + if (! neweol) + error (EXIT_FAILURE, 0, _("empty record separator")); + if (optarg[1]) + { + if (STREQ (optarg, "\\0")) + neweol = '\0'; + else + { + /* Provoke with 'split -txx'. Complain about + "multi-character tab" instead of "multibyte tab", so + that the diagnostic's wording does not need to be + changed once multibyte characters are supported. */ + error (EXIT_FAILURE, 0, _("multi-character separator %s"), + quote (optarg)); + } + } + /* Make it explicit we don't support multiple separators. */ + if (0 <= eolchar && neweol != eolchar) + { + error (EXIT_FAILURE, 0, + _("multiple separator characters specified")); + } + + eolchar = neweol; + } + break; + case '0': case '1': case '2': @@ -1318,15 +1415,8 @@ main (int argc, char **argv) break; case IO_BLKSIZE_OPTION: - { - uintmax_t tmp_blk_size; - if (xstrtoumax (optarg, NULL, 10, &tmp_blk_size, - multipliers) != LONGINT_OK - || tmp_blk_size == 0 || SIZE_MAX - page_size < tmp_blk_size) - error (0, 0, _("%s: invalid IO block size"), optarg); - else - in_blk_size = tmp_blk_size; - } + in_blk_size = xdectoumax (optarg, 1, SIZE_MAX - page_size, + multipliers, _("invalid IO block size"), 0); break; case VERBOSE_OPTION: @@ -1357,10 +1447,13 @@ main (int argc, char **argv) if (n_units == 0) { - error (0, 0, _("%s: invalid number of lines"), "0"); + error (0, 0, "%s: %s", _("invalid number of lines"), quote ("0")); usage (EXIT_FAILURE); } + if (eolchar < 0) + eolchar = '\n'; + set_suffix_length (n_units, split_type); /* Get out the filename arguments. */ @@ -1400,40 +1493,53 @@ main (int argc, char **argv) if (fstat (STDIN_FILENO, &in_stat_buf) != 0) error (EXIT_FAILURE, errno, "%s", infile); - if (in_blk_size == 0) + + bool specified_buf_size = !! in_blk_size; + if (! specified_buf_size) in_blk_size = io_blksize (in_stat_buf); + void *b = xmalloc (in_blk_size + 1 + page_size - 1); + char *buf = ptr_align (b, page_size); + size_t initial_read = SIZE_MAX; + 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 (&in_stat_buf)) - file_size = in_stat_buf.st_size; - else if (0 <= input_offset) + if (0 <= input_offset) { - file_size = lseek (STDIN_FILENO, 0, SEEK_END); - input_offset = (file_size < 0 - ? file_size - : lseek (STDIN_FILENO, input_offset, SEEK_SET)); + if (usable_st_size (&in_stat_buf) && ! specified_buf_size) + { + assert (ST_BLKSIZE (in_stat_buf) <= in_blk_size); + file_size = input_file_size (STDIN_FILENO, in_stat_buf.st_size, + buf, in_blk_size); + if (file_size < in_blk_size) + initial_read = file_size; + } + else + { + file_size = lseek (STDIN_FILENO, 0, SEEK_END); + input_offset = (file_size < 0 + ? file_size + : lseek (STDIN_FILENO, input_offset, SEEK_SET)); + file_size -= input_offset; + } } if (input_offset < 0) error (EXIT_FAILURE, 0, _("%s: cannot determine file size"), quote (infile)); - file_size -= input_offset; /* Overflow, and sanity checking. */ if (OFF_T_MAX < n_units) { char buffer[INT_BUFSIZE_BOUND (uintmax_t)]; - error (EXIT_FAILURE, EFBIG, _("%s: invalid number of chunks"), - umaxtostr (n_units, buffer)); + error (EXIT_FAILURE, EOVERFLOW, "%s: %s", + _("invalid number of chunks"), + quote (umaxtostr (n_units, buffer))); } /* increase file_size to n_units here, so that we still process any input data, and create empty files for the rest. */ file_size = MAX (file_size, n_units); } - 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. */ if (filter_command) @@ -1454,7 +1560,7 @@ main (int argc, char **argv) break; case type_bytes: - bytes_split (n_units, buf, in_blk_size, 0); + bytes_split (n_units, buf, in_blk_size, SIZE_MAX, 0); break; case type_byteslines: @@ -1463,13 +1569,16 @@ main (int argc, char **argv) case type_chunk_bytes: if (k_units == 0) - bytes_split (file_size / n_units, buf, in_blk_size, n_units); + bytes_split (file_size / n_units, buf, in_blk_size, initial_read, + n_units); else - bytes_chunk_extract (k_units, n_units, buf, in_blk_size, file_size); + bytes_chunk_extract (k_units, n_units, buf, in_blk_size, initial_read, + file_size); break; case type_chunk_lines: - lines_chunk_split (k_units, n_units, buf, in_blk_size, file_size); + lines_chunk_split (k_units, n_units, buf, in_blk_size, initial_read, + file_size); break; case type_rr: @@ -1488,5 +1597,5 @@ main (int argc, char **argv) error (EXIT_FAILURE, errno, "%s", infile); closeout (NULL, output_desc, filter_pid, outfile); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/stat.c b/src/stat.c index b65dbe55..6d236653 100644 --- a/src/stat.c +++ b/src/stat.c @@ -1,5 +1,5 @@ /* stat.c -- display file or file system status - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This 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,15 +74,16 @@ #include "xvasprintf.h" #if USE_STATVFS -# define STRUCT_STATVFS struct statvfs # define STRUCT_STATXFS_F_FSID_IS_INTEGER STRUCT_STATVFS_F_FSID_IS_INTEGER # define HAVE_STRUCT_STATXFS_F_TYPE HAVE_STRUCT_STATVFS_F_TYPE # if HAVE_STRUCT_STATVFS_F_NAMEMAX # define SB_F_NAMEMAX(S) ((S)->f_namemax) # endif # if ! STAT_STATVFS && STAT_STATVFS64 +# define STRUCT_STATVFS struct statvfs64 # define STATFS statvfs64 # else +# define STRUCT_STATVFS struct statvfs # define STATFS statvfs # endif # define STATFS_FRSIZE(S) ((S)->f_frsize) @@ -336,6 +337,8 @@ human_fstype (STRUCT_STATVFS const *statfsbuf) return "hugetlbfs"; case S_MAGIC_MTD_INODE_FS: /* 0x11307854 local */ return "inodefs"; + case S_MAGIC_IBRIX: /* 0x013111A8 remote */ + return "ibrix"; case S_MAGIC_INOTIFYFS: /* 0x2BAD1DEA local */ return "inotifyfs"; case S_MAGIC_ISOFS: /* 0x9660 local */ @@ -1491,7 +1494,7 @@ Valid format sequences for file systems:\n\ %T file system type in human readable form\n\ "), stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -1575,5 +1578,5 @@ main (int argc, char *argv[]) ? do_statfs (argv[i], format) : do_stat (argv[i], format, format2)); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/stdbuf.c b/src/stdbuf.c index 92ee2826..116619d7 100644 --- a/src/stdbuf.c +++ b/src/stdbuf.c @@ -1,5 +1,5 @@ /* stdbuf -- setup the standard streams for a command - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2015 Free Software Foundation, Inc. This 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 @@ parse_size (char const *str, size_t *size) { uintmax_t tmp_size; enum strtol_error e = xstrtoumax (str, NULL, 10, &tmp_size, "EGkKMPTYZ0"); - if (e == LONGINT_OK && tmp_size > SIZE_MAX) + if (e == LONGINT_OK && SIZE_MAX < tmp_size) e = LONGINT_OVERFLOW; if (e == LONGINT_OK) @@ -76,7 +76,7 @@ parse_size (char const *str, size_t *size) return 0; } - errno = (e == LONGINT_OVERFLOW ? EOVERFLOW : 0); + errno = (e == LONGINT_OVERFLOW ? EOVERFLOW : errno); return -1; } @@ -115,11 +115,11 @@ size set to MODE bytes.\n\ "), stdout); fputs (_("\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\ +for example) then that will override corresponding changes 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\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -256,7 +256,7 @@ set_LD_PRELOAD (void) ret = putenv (LD_PRELOAD); #ifdef __APPLE__ if (ret == 0) - ret = putenv ("DYLD_FORCE_FLAT_NAMESPACE=y"); + ret = setenv ("DYLD_FORCE_FLAT_NAMESPACE", "y", 1); #endif if (ret != 0) @@ -387,9 +387,7 @@ main (int argc, char **argv) execvp (*argv, argv); - { - int exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE); - error (0, errno, _("failed to run command %s"), quote (argv[0])); - exit (exit_status); - } + int exit_status = errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE; + error (0, errno, _("failed to run command %s"), quote (argv[0])); + return exit_status; } diff --git a/src/stty.c b/src/stty.c index 3c485786..c0057f2d 100644 --- a/src/stty.c +++ b/src/stty.c @@ -1,5 +1,5 @@ /* stty -- change and print terminal line settings - Copyright (C) 1990-2014 Free Software Foundation, Inc. + Copyright (C) 1990-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -58,6 +58,7 @@ #include "error.h" #include "fd-reopen.h" #include "quote.h" +#include "xdectoint.h" #include "xstrtol.h" /* The official name of this program (e.g., no 'g' prefix). */ @@ -190,6 +191,7 @@ enum mode_type #define SANE_UNSET 2 /* Unset in 'sane' mode. */ #define REV 4 /* Can be turned off by prepending '-'. */ #define OMIT 8 /* Don't display value. */ +#define NO_SETATTR 16 /* tcsetattr not used to set mode bits. */ /* Each mode. */ struct mode_info @@ -341,6 +343,11 @@ static struct mode_info const mode_info[] = {"echoke", local, SANE_SET | REV, ECHOKE, 0}, {"crtkill", local, REV | OMIT, ECHOKE, 0}, #endif +#if defined TIOCEXT + {"extproc", local, SANE_UNSET | REV | NO_SETATTR, EXTPROC, 0}, +#elif defined EXTPROC + {"extproc", local, SANE_UNSET | REV, EXTPROC, 0}, +#endif {"evenp", combination, REV | OMIT, 0, 0}, {"parity", combination, REV | OMIT, 0, 0}, @@ -413,7 +420,8 @@ static struct control_info const control_info[] = {"lnext", CLNEXT, VLNEXT}, #endif #ifdef VFLUSHO - {"flush", CFLUSHO, VFLUSHO}, + {"flush", CFLUSHO, VFLUSHO}, /* deprecated compat option. */ + {"discard", CFLUSHO, VFLUSHO}, #endif #ifdef VSTATUS {"status", CSTATUS, VSTATUS}, @@ -539,45 +547,94 @@ settings. The underlying system defines which settings are available.\n\ "), stdout); fputs (_("\ \n\ -Special characters:\n\ +Special characters:\n"), stdout); +#ifdef VFLUSHO + fputs (_("\ + * discard CHAR CHAR will toggle discarding of output\n\ +"), stdout); +#endif +#ifdef VDSUSP + fputs (_("\ * dsusp CHAR CHAR will send a terminal stop signal once input flushed\n\ +"), stdout); +#endif + fputs (_("\ eof CHAR CHAR will send an end of file (terminate the input)\n\ eol CHAR CHAR will end the line\n\ "), stdout); +#ifdef VEOL2 fputs (_("\ * eol2 CHAR alternate CHAR for ending the line\n\ +"), stdout); +#endif + fputs (_("\ 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\ "), stdout); +#ifdef VLNEXT fputs (_("\ * lnext CHAR CHAR will enter the next character quoted\n\ +"), stdout); +#endif +#ifdef VSTATUS + fputs (_("\ + * status CHAR CHAR will send an info signal\n\ +"), stdout); +#endif + fputs (_("\ quit CHAR CHAR will send a quit signal\n\ +"), stdout); +#if defined CREPRINT || defined VREPRINT + fputs (_("\ * rprnt CHAR CHAR will redraw the current line\n\ - start CHAR CHAR will restart the output after stopping it\n\ "), stdout); +#endif fputs (_("\ + start CHAR CHAR will restart the output after stopping it\n\ stop CHAR CHAR will stop the output\n\ susp CHAR CHAR will send a terminal stop signal\n\ +"), stdout); +#ifdef VSWTCH + fputs (_("\ * swtch CHAR CHAR will switch to a different shell layer\n\ +"), stdout); +#endif +#ifdef VWERASE + fputs (_("\ * werase CHAR CHAR will erase the last word typed\n\ "), stdout); +#endif fputs (_("\ \n\ Special settings:\n\ N set the input and output speeds to N bauds\n\ +"), stdout); +#ifdef TIOCGWINSZ + fputs (_("\ * cols N tell the kernel that the terminal has N columns\n\ * columns N same as cols N\n\ "), stdout); +#endif fputs (_("\ ispeed N set the input speed to N\n\ +"), stdout); +#ifdef HAVE_C_LINE + fputs (_("\ * line N use line discipline N\n\ +"), stdout); +#endif + fputs (_("\ min N with -icanon, set N characters minimum for a completed read\n\ ospeed N set the output speed to N\n\ "), stdout); +#ifdef TIOCGWINSZ fputs (_("\ * 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\ +"), stdout); +#endif + fputs (_("\ speed print the terminal speed\n\ time N with -icanon, set read timeout of N tenths of a second\n\ "), stdout); @@ -586,8 +643,18 @@ Special settings:\n\ Control settings:\n\ [-]clocal disable modem control signals\n\ [-]cread allow input to be received\n\ +"), stdout); +#ifdef CRTSCTS + fputs (_("\ * [-]crtscts enable RTS/CTS handshaking\n\ +"), stdout); +#endif +#ifdef CDTRDSR + fputs (_("\ * [-]cdtrdsr enable DTR/DSR handshaking\n\ +"), stdout); +#endif + fputs (_("\ csN set character size to N bits, N in [5..8]\n\ "), stdout); fputs (_("\ @@ -596,8 +663,12 @@ Control settings:\n\ [-]hupcl same as [-]hup\n\ [-]parenb generate parity bit in output and expect parity bit in input\n\ [-]parodd set odd parity (or even parity with '-')\n\ +"), stdout); +#ifdef CMSPAR + fputs (_("\ * [-]cmspar use \"stick\" (mark/space) parity\n\ "), stdout); +#endif fputs (_("\ \n\ Input settings:\n\ @@ -605,20 +676,34 @@ Input settings:\n\ [-]icrnl translate carriage return to newline\n\ [-]ignbrk ignore break characters\n\ [-]igncr ignore carriage return\n\ + [-]ignpar ignore characters with parity errors\n\ "), stdout); +#ifdef IMAXBEL fputs (_("\ - [-]ignpar ignore characters with parity errors\n\ * [-]imaxbel beep and do not flush a full input buffer on a character\n\ +"), stdout); +#endif + fputs (_("\ [-]inlcr translate newline to carriage return\n\ [-]inpck enable input parity checking\n\ [-]istrip clear high (8th) bit of input characters\n\ "), stdout); +#ifdef IUTF8 fputs (_("\ * [-]iutf8 assume input characters are UTF-8 encoded\n\ "), stdout); +#endif +#ifdef IUCLC fputs (_("\ * [-]iuclc translate uppercase characters to lowercase\n\ +"), stdout); +#endif +#ifdef IXANY + fputs (_("\ * [-]ixany let any character restart output, not only start character\n\ +"), stdout); +#endif + fputs (_("\ [-]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\ @@ -627,59 +712,163 @@ Input settings:\n\ fputs (_("\ \n\ Output settings:\n\ +"), stdout); +#ifdef BSDLY + fputs (_("\ * bsN backspace delay style, N in [0..1]\n\ +"), stdout); +#endif +#ifdef CRDLY + fputs (_("\ * crN carriage return delay style, N in [0..3]\n\ +"), stdout); +#endif +#ifdef FFDLY + fputs (_("\ * ffN form feed delay style, N in [0..1]\n\ +"), stdout); +#endif +#ifdef NLDLY + fputs (_("\ * nlN newline delay style, N in [0..1]\n\ "), stdout); +#endif +#ifdef OCRNL fputs (_("\ * [-]ocrnl translate carriage return to newline\n\ +"), stdout); +#endif +#ifdef OFDEL + fputs (_("\ * [-]ofdel use delete characters for fill instead of NUL characters\n\ +"), stdout); +#endif +#ifdef OFILL + fputs (_("\ * [-]ofill use fill (padding) characters instead of timing for delays\n\ +"), stdout); +#endif +#ifdef OLCUC + fputs (_("\ * [-]olcuc translate lowercase characters to uppercase\n\ +"), stdout); +#endif +#ifdef ONLCR + fputs (_("\ * [-]onlcr translate newline to carriage return-newline\n\ +"), stdout); +#endif +#ifdef ONLRET + fputs (_("\ * [-]onlret newline performs a carriage return\n\ "), stdout); +#endif +#ifdef ONOCR fputs (_("\ * [-]onocr do not print carriage returns in the first column\n\ +"), stdout); +#endif + fputs (_("\ [-]opost postprocess output\n\ +"), stdout); +#if defined TABDLY || defined OXTABS + fputs (_("\ * tabN horizontal tab delay style, N in [0..3]\n\ * tabs same as tab0\n\ * -tabs same as tab3\n\ +"), stdout); +#endif +#ifdef VTDLY + fputs (_("\ * vtN vertical tab delay style, N in [0..1]\n\ "), stdout); +#endif fputs (_("\ \n\ Local settings:\n\ [-]crterase echo erase characters as backspace-space-backspace\n\ +"), stdout); +#ifdef ECHOKE + fputs (_("\ * crtkill kill all line by obeying the echoprt and echoe settings\n\ * -crtkill kill all line by obeying the echoctl and echok settings\n\ "), stdout); +#endif +#ifdef ECHOCTL fputs (_("\ * [-]ctlecho echo control characters in hat notation ('^c')\n\ +"), stdout); +#endif + fputs (_("\ [-]echo echo input characters\n\ +"), stdout); +#ifdef ECHOCTL + fputs (_("\ * [-]echoctl same as [-]ctlecho\n\ +"), stdout); +#endif + fputs (_("\ [-]echoe same as [-]crterase\n\ [-]echok echo a newline after a kill character\n\ "), stdout); +#ifdef ECHOKE fputs (_("\ * [-]echoke same as [-]crtkill\n\ +"), stdout); +#endif + fputs (_("\ [-]echonl echo newline even if not echoing other characters\n\ +"), stdout); +#ifdef ECHOPRT + fputs (_("\ * [-]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\ "), stdout); +#endif +#if defined EXTPROC || defined TIOCEXT + fputs (_("\ + * [-]extproc enable \"LINEMODE\"; useful with high latency links\n\ +"), stdout); +#endif + printf (_("\ + [-]icanon enable special characters: %s\n\ + [-]iexten enable non-POSIX special characters\n\ +"), "erase, kill" +#ifdef VWERASE + ", werase" +#endif +#if defined CREPRINT || defined VREPRINT + ", rprnt" +#endif +); fputs (_("\ [-]isig enable interrupt, quit, and suspend special characters\n\ [-]noflsh disable flushing after interrupt and quit special characters\n\ +"), stdout); +#ifdef ECHOPRT + fputs (_("\ * [-]prterase same as [-]echoprt\n\ +"), stdout); +#endif +#ifdef TOSTOP + fputs (_("\ * [-]tostop stop background jobs that try to write to the terminal\n\ +"), stdout); +#endif +#ifdef XCASE + fputs (_("\ * [-]xcase with icanon, escape with '\\' for uppercase characters\n\ "), stdout); +#endif fputs (_("\ \n\ Combination settings:\n\ +"), stdout); +#if defined XCASE && defined IUCLC && defined OLCUC + fputs (_("\ * [-]LCASE same as [-]lcase\n\ +"), stdout); +#endif + fputs (_("\ cbreak same as -icanon\n\ -cbreak same as icanon\n\ "), stdout); @@ -687,22 +876,69 @@ Combination settings:\n\ 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\ "), stdout); - fputs (_("\ - dec same as echoe echoctl echoke -ixany intr ^c erase 0177\n\ + printf (_("\ + crt same as %s\n\ +"), "echoe" +#ifdef ECHOCTL + " echoctl" +#endif +#ifdef ECHOKE + " echoke" +#endif +); + printf (_("\ + dec same as %s intr ^c erase 0177\n\ kill ^u\n\ +"), "echoe" +#ifdef ECHOCTL + " echoctl" +#endif +#ifdef ECHOKE + " echoke" +#endif +#ifdef IXANY + " -ixany" +#endif +); +#ifdef IXANY + fputs (_("\ * [-]decctlq same as [-]ixany\n\ +"), stdout); +#endif + fputs (_("\ ek erase and kill characters to their default values\n\ evenp same as parenb -parodd cs7\n\ + -evenp same as -parenb cs8\n\ "), stdout); +#if defined XCASE && defined IUCLC && defined OLCUC fputs (_("\ - -evenp same as -parenb cs8\n\ * [-]lcase same as xcase iuclc olcuc\n\ +"), stdout); +#endif + fputs (_("\ 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\ +"), stdout); + printf (_("\ + nl same as %s\n\ + -nl same as %s\n\ +"), "-icrnl" +#ifdef ONLCR + " -onlcr" +#endif + , "icrnl -inlcr -igncr" +#ifdef ONLCR + " onlcr" +#endif +#ifdef OCRNL + " -ocrnl" +#endif +#ifdef ONLRET + " -onlret" +#endif +); + fputs (_("\ "), stdout); fputs (_("\ oddp same as parenb parodd cs7\n\ @@ -711,20 +947,108 @@ Combination settings:\n\ pass8 same as -parenb -istrip cs8\n\ -pass8 same as parenb istrip cs7\n\ "), stdout); - fputs (_("\ + printf (_("\ 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\ + -inlcr -igncr -icrnl -ixon -ixoff -icanon -opost\n\ + -isig%s min 1 time 0\n\ -raw same as cooked\n\ -"), stdout); - fputs (_("\ - 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\ -"), stdout); +"), +#ifdef IUCLC + " -iuclc" +#endif +#ifdef IXANY + " -ixany" +#endif +#ifdef IMAXBEL + " -imaxbel" +#endif +#ifdef XCASE + " -xcase" +#endif +); + printf (_("\ + sane same as cread -ignbrk brkint -inlcr -igncr icrnl\n\ + icanon iexten echo echoe echok -echonl -noflsh\n\ + %s\n\ + %s\n\ + %s,\n\ + all special characters to their default values\n\ +"), + "-ixoff" +#ifdef IUTF8 + " -iutf8" +#endif +#ifdef IUCLC + " -iuclc" +#endif +#ifdef IXANY + " -ixany" +#endif +#ifdef IMAXBEL + " imaxbel" +#endif +#ifdef XCASE + " -xcase" +#endif +#ifdef OLCUC + " -olcuc" +#endif +#ifdef OCRNL + " -ocrnl" +#endif + + , "opost" +#ifdef OFILL + " -ofill" +#endif +#ifdef ONLCR + " onlcr" +#endif +#ifdef ONOCR + " -onocr" +#endif +#ifdef ONLRET + " -onlret" +#endif +#ifdef NLDLY + " nl0" +#endif +#ifdef CRDLY + " cr0" +#endif +#ifdef TAB0 + " tab0" +#endif +#ifdef BSDLY + " bs0" +#endif +#ifdef VTDLY + " vt0" +#endif +#ifdef FFDLY + " ff0" +#endif + + , "isig" +#ifdef TOSTOP + " -tostop" +#endif +#ifdef OFDEL + " -ofdel" +#endif +#ifdef ECHOPRT + " -echoprt" +#endif +#ifdef ECHOCTL + " echoctl" +#endif +#ifdef ECHOKE + " echoke" +#endif +#ifdef EXTPROC + " -extproc" +#endif +); fputs (_("\ \n\ Handle the tty line connected to standard input. Without arguments,\n\ @@ -732,7 +1056,7 @@ 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\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -862,7 +1186,7 @@ main (int argc, char **argv) max_col = screen_columns (); current_col = 0; display_settings (output_type, &mode, device_name); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } speed_was_set = false; @@ -871,6 +1195,7 @@ main (int argc, char **argv) { char const *arg = argv[k]; bool match_found = false; + bool not_set_attr = false; bool reversed = false; int i; @@ -886,8 +1211,13 @@ main (int argc, char **argv) { if (STREQ (arg, mode_info[i].name)) { - match_found = set_mode (&mode_info[i], reversed, &mode); - require_set_attr = true; + if ((mode_info[i].flags & NO_SETATTR) == 0) + { + match_found = set_mode (&mode_info[i], reversed, &mode); + require_set_attr = true; + } + else + match_found = not_set_attr = true; break; } } @@ -915,7 +1245,7 @@ main (int argc, char **argv) } } } - if (!match_found) + if (!match_found || not_set_attr) { if (STREQ (arg, "ispeed")) { @@ -941,6 +1271,20 @@ main (int argc, char **argv) speed_was_set = true; require_set_attr = true; } +#ifdef TIOCEXT + /* This is the BSD interface to "extproc". + Even though it's an lflag, an ioctl is used to set it. */ + else if (STREQ (arg, "extproc")) + { + int val = ! reversed; + + if (ioctl (STDIN_FILENO, TIOCEXT, &val) != 0) + { + error (EXIT_FAILURE, errno, _("%s: error setting %s"), + device_name, quote (arg)); + } + } +#endif #ifdef TIOCGWINSZ else if (STREQ (arg, "rows")) { @@ -1070,7 +1414,7 @@ main (int argc, char **argv) } } - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } /* Return false if not applied because not reversible; otherwise @@ -1506,6 +1850,12 @@ display_changed (struct termios *mode) { if (mode->c_cc[control_info[i].offset] == control_info[i].saneval) continue; + +#ifdef VFLUSHO + /* 'flush' is the deprecated equivalent of 'discard'. */ + if (STREQ (control_info[i].name, "flush")) + continue; +#endif /* If swtch is the same as susp, don't print both. */ #if VSWTCH == VSUSP if (STREQ (control_info[i].name, "swtch")) @@ -1596,6 +1946,11 @@ display_all (struct termios *mode, char const *device_name) for (i = 0; ! STREQ (control_info[i].name, "min"); ++i) { +#ifdef VFLUSHO + /* 'flush' is the deprecated equivalent of 'discard'. */ + if (STREQ (control_info[i].name, "flush")) + continue; +#endif /* If swtch is the same as susp, don't print both. */ #if VSWTCH == VSUSP if (STREQ (control_info[i].name, "swtch")) @@ -1847,6 +2202,9 @@ sane_mode (struct termios *mode) for (i = 0; mode_info[i].name != NULL; ++i) { + if (mode_info[i].flags & NO_SETATTR) + continue; + if (mode_info[i].flags & SANE_SET) { bitsp = mode_type_flag (mode_info[i].type, mode); @@ -1918,11 +2276,5 @@ visible (cc_t ch) static unsigned long int integer_arg (const char *s, unsigned long int maxval) { - unsigned long int value; - if (xstrtoul (s, NULL, 0, &value, "bB") != LONGINT_OK || maxval < value) - { - error (0, 0, _("invalid integer argument %s"), quote (s)); - usage (EXIT_FAILURE); - } - return value; + return xnumtoumax (s, 0, 0, maxval, "bB", _("invalid integer argument"), 0); } diff --git a/src/sum.c b/src/sum.c index 442b7ad8..51956c61 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-2014 Free Software Foundation, Inc. + Copyright (C) 1986-2015 Free Software Foundation, Inc. This 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,17 +61,18 @@ Usage: %s [OPTION]... [FILE]...\n\ program_name); fputs (_("\ Print checksum and block counts for each FILE.\n\ +"), stdout); + + emit_stdin_note (); + + fputs (_("\ \n\ -r use BSD sum algorithm, use 1K blocks\n\ -s, --sysv use System V sum algorithm, use 512 bytes blocks\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - fputs (_("\ -\n\ -With no FILE, or when FILE is -, read standard input.\n\ -"), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -270,5 +271,5 @@ main (int argc, char **argv) if (have_read_stdin && fclose (stdin) == EOF) error (EXIT_FAILURE, errno, "-"); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/sync.c b/src/sync.c index 8c890432..5e1dbb8c 100644 --- a/src/sync.c +++ b/src/sync.c @@ -1,5 +1,5 @@ /* sync - update the super block - Copyright (C) 1994-2014 Free Software Foundation, Inc. + Copyright (C) 1994-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,18 +17,42 @@ /* Written by Jim Meyering */ #include +#include #include #include #include #include "system.h" #include "error.h" -#include "long-options.h" +#include "quote.h" /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "sync" -#define AUTHORS proper_name ("Jim Meyering") +#define AUTHORS \ + proper_name ("Jim Meyering"), \ + proper_name ("Giuseppe Scrivano") + +#ifndef HAVE_SYNCFS +# define HAVE_SYNCFS 0 +#endif + +enum sync_mode +{ + MODE_FILE, + MODE_DATA, + MODE_FILE_SYSTEM, + MODE_SYNC +}; + +static struct option const long_options[] = +{ + {"data", no_argument, NULL, 'd'}, + {"file-system", no_argument, NULL, 'f'}, + {GETOPT_HELP_OPTION_DECL}, + {GETOPT_VERSION_OPTION_DECL}, + {NULL, 0, NULL, 0} +}; void usage (int status) @@ -37,21 +61,119 @@ usage (int status) emit_try_help (); else { - printf (_("Usage: %s [OPTION]\n"), program_name); + printf (_("Usage: %s [OPTION] [FILE]...\n"), program_name); fputs (_("\ -Force changed blocks to disk, update the super block.\n\ +Synchronize cached writes to persistent storage\n\ +\n\ +If one or more files are specified, sync only them,\n\ +or their containing file systems.\n\ \n\ "), stdout); + + fputs (_("\ + -d, --data sync only file data, no unneeded metadata\n\ +"), stdout); + fputs (_("\ + -f, --file-system sync the file systems that contain the files\n\ +"), stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } +/* Sync the specified FILE, or file systems associated with FILE. + Return 1 on success. */ + +static bool +sync_arg (enum sync_mode mode, char const *file) +{ + bool ret = true; + int open_flags = O_RDONLY | O_NONBLOCK; + int fd; + +#ifdef _AIX + /* AIX 7.1 fsync requires write access to file. */ + if (mode == MODE_FILE) + open_flags = O_WRONLY | O_NONBLOCK; +#endif + + /* Note O_PATH might be supported with syncfs(), + though as of Linux 3.18 is not. */ + fd = open (file, open_flags); + if (fd < 0) + { + /* Use the O_RDONLY errno, which is significant + with directories for example. */ + int rd_errno = errno; + if (open_flags != (O_WRONLY | O_NONBLOCK)) + fd = open (file, O_WRONLY | O_NONBLOCK); + if (fd < 0) + error (0, rd_errno, _("error opening %s"), quote (file)); + return false; + } + + /* We used O_NONBLOCK above to not hang with fifos, + so reset that here. */ + int fdflags = fcntl (fd, F_GETFL); + if (fdflags == -1 + || fcntl (fd, F_SETFL, fdflags & ~O_NONBLOCK) < 0) + { + error (0, errno, _("couldn't reset non-blocking mode %s"), quote (file)); + ret = false; + } + + if (ret == true) + { + int sync_status = -1; + + switch (mode) + { + case MODE_DATA: + sync_status = fdatasync (fd); + break; + + case MODE_FILE: + sync_status = fsync (fd); + break; + +#if HAVE_SYNCFS + case MODE_FILE_SYSTEM: + sync_status = syncfs (fd); + break; +#endif + + default: + assert ("invalid sync_mode"); + } + + if (sync_status < 0) + { + error (0, errno, _("error syncing %s"), quote (file)); + ret = false; + } + } + + if (close (fd) < 0) + { + error (0, errno, _("failed to close %s"), quote (file)); + ret = false; + } + + return ret; +} + int main (int argc, char **argv) { + int c; + bool args_specified; + bool arg_data = false, arg_file_system = false; + enum sync_mode mode; + bool ok = true; + initialize_main (&argc, &argv); set_program_name (argv[0]); setlocale (LC_ALL, ""); @@ -60,14 +182,55 @@ main (int argc, char **argv) atexit (close_stdout); - parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, Version, - usage, AUTHORS, (char const *) NULL); - if (getopt_long (argc, argv, "", NULL, NULL) != -1) - usage (EXIT_FAILURE); + while ((c = getopt_long (argc, argv, "df", long_options, NULL)) + != -1) + { + switch (c) + { + case 'd': + arg_data = true; + break; + + case 'f': + arg_file_system = true; + break; + + case_GETOPT_HELP_CHAR; - if (optind < argc) - error (0, 0, _("ignoring all arguments")); + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + + default: + usage (EXIT_FAILURE); + } + } + + args_specified = optind < argc; + + if (arg_data && arg_file_system) + { + error (EXIT_FAILURE, 0, + _("cannot specify both --data and --file-system")); + } + + if (!args_specified && arg_data) + error (EXIT_FAILURE, 0, _("--data needs at least one argument")); + + if (! args_specified || (arg_file_system && ! HAVE_SYNCFS)) + mode = MODE_SYNC; + else if (arg_file_system) + mode = MODE_FILE_SYSTEM; + else if (! arg_data) + mode = MODE_FILE; + else + mode = MODE_DATA; + + if (mode == MODE_SYNC) + sync (); + else + { + for (; optind < argc; optind++) + ok &= sync_arg (mode, argv[optind]); + } - sync (); - exit (EXIT_SUCCESS); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/system.h b/src/system.h index 162446c1..8f6a2ea8 100644 --- a/src/system.h +++ b/src/system.h @@ -1,5 +1,5 @@ /* system-dependent definitions for coreutils - Copyright (C) 1989-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This 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,6 @@ #include -/* Include before this file. - Note this doesn't warn if we're included - before all system headers. */ - -#if 2 < __GLIBC__ || ( 2 == ___GLIBC__ && 2 <= __GLIBC_MINOR__ ) -# if ! defined _SYS_TYPES_H -you must include before including this file -# endif -#endif - #include /* Commonly used file permission combination. */ @@ -135,9 +125,14 @@ enum #include /* Redirection and wildcarding when done by the utility itself. - Generally a noop, but used in particular for native VMS. */ + Generally a noop, but used in particular for OS/2. */ #ifndef initialize_main -# define initialize_main(ac, av) +# ifndef __OS2__ +# define initialize_main(ac, av) +# else +# define initialize_main(ac, av) \ + do { _wildcard (ac, av); _response (ac, av); } while (0) +# endif #endif #include "stat-macros.h" @@ -188,12 +183,11 @@ select_plural (uintmax_t n) #define STREQ(a, b) (strcmp (a, b) == 0) #define STREQ_LEN(a, b, n) (strncmp (a, b, n) == 0) -#define STRPREFIX(a, b) (strncmp(a, b, strlen (b)) == 0) +#define STRPREFIX(a, b) (strncmp (a, b, strlen (b)) == 0) /* Just like strncmp, but the second argument must be a literal string and you don't specify the length; that comes from the literal. */ -#define STRNCMP_LIT(s, literal) \ - strncmp (s, "" literal "", sizeof (literal) - 1) +#define STRNCMP_LIT(s, lit) strncmp (s, "" lit "", sizeof (lit) - 1) #if !HAVE_DECL_GETLOGIN char *getlogin (); @@ -537,6 +531,13 @@ is_nul (void const *buf, size_t bufsize) ? false : (((Accum) = (Accum) * 10 + (Digit_val)), true)) \ ) +static inline void +emit_stdin_note (void) +{ + fputs (_("\n\ +With no FILE, or when FILE is -, read standard input.\n\ +"), stdout); +} static inline void emit_mandatory_arg_note (void) { @@ -565,9 +566,29 @@ Otherwise, units default to 1024 bytes (or 512 if POSIXLY_CORRECT is set).\n\ } static inline void -emit_ancillary_info (void) +emit_ancillary_info (char const *program) { + struct infomap { char const *program; char const *node; } const infomap[] = { + { "[", "test invocation" }, + { "coreutils", "Multi-call invocation" }, + { "sha224sum", "sha2 utilities" }, + { "sha256sum", "sha2 utilities" }, + { "sha384sum", "sha2 utilities" }, + { "sha512sum", "sha2 utilities" }, + { NULL, NULL } + }; + + char const *node = program; + struct infomap const *map_prog = infomap; + + while (map_prog->program && ! STREQ (program, map_prog->program)) + map_prog++; + + if (map_prog->node) + node = map_prog->node; + printf (_("\n%s online help: <%s>\n"), PACKAGE_NAME, PACKAGE_URL); + /* Don't output this redundant message for English locales. Note we still output for 'C' so that it gets included in the man page. */ const char *lc_messages = setlocale (LC_MESSAGES, NULL); @@ -578,11 +599,12 @@ emit_ancillary_info (void) the URLs at http://translationproject.org/team/. Otherwise, replace the entire URL with your translation team's email address. */ printf (_("Report %s translation bugs to " - "\n"), - last_component (program_name)); + "\n"), program); } - printf (_("For complete documentation, run: " - "info coreutils '%s invocation'\n"), last_component (program_name)); + printf (_("Full documentation at: <%s%s>\n"), + PACKAGE_URL, program); + printf (_("or available locally via: info '(coreutils) %s%s'\n"), + node, node == program ? " invocation" : ""); } static inline void @@ -663,3 +685,13 @@ stzncpy (char *restrict dest, char const *restrict src, size_t len) in selinux.h before libselinux-2.3 (May 2014). When version >= 2.3 is ubiquitous remove this function. */ static inline char * se_const (char const * sctx) { return (char *) sctx; } + +/* Return true if ERR is ENOTSUP or EOPNOTSUPP, otherwise false. + This wrapper function avoids the redundant 'or'd comparison on + systems like Linux for which they have the same value. It also + avoids the gcc warning to that effect. */ +static inline bool +is_ENOTSUP (int err) +{ + return err == EOPNOTSUPP || (ENOTSUP != EOPNOTSUPP && err == ENOTSUP); +} diff --git a/src/tac-pipe.c b/src/tac-pipe.c index 8e634f3e..669a8655 100644 --- a/src/tac-pipe.c +++ b/src/tac-pipe.c @@ -1,6 +1,6 @@ /* tac from a pipe. - Copyright (C) 1997-2014 Free Software Foundation, Inc. + Copyright (C) 1997-2015 Free Software Foundation, Inc. This program is free 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 c76afc77..57e7e761 100644 --- a/src/tac.c +++ b/src/tac.c @@ -1,5 +1,5 @@ /* tac - concatenate and print files in reverse - Copyright (C) 1988-2014 Free Software Foundation, Inc. + Copyright (C) 1988-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -136,9 +136,9 @@ Usage: %s [OPTION]... [FILE]...\n\ program_name); fputs (_("\ Write each FILE to standard output, last line first.\n\ -With no FILE, or when FILE is -, read standard input.\n\ "), stdout); + emit_stdin_note (); emit_mandatory_arg_note (); fputs (_("\ @@ -148,7 +148,7 @@ With no FILE, or when FILE is -, read standard input.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -187,10 +187,11 @@ output (const char *start, const char *past_end) } /* Print in reverse the file open on descriptor FD for reading FILE. + The file is already positioned at FILE_POS, which should be near its end. Return true if successful. */ static bool -tac_seekable (int input_fd, const char *file) +tac_seekable (int input_fd, const char *file, off_t file_pos) { /* Pointer to the location in 'G_buffer' where the search for the next separator will begin. */ @@ -203,9 +204,6 @@ tac_seekable (int input_fd, const char *file) /* Length of the record growing in 'G_buffer'. */ size_t saved_record_size; - /* Offset in the file of the next read. */ - off_t file_pos; - /* True if 'output' has not been called yet for any file. Only used when the separator is attached to the preceding record. */ bool first_time = true; @@ -213,27 +211,43 @@ tac_seekable (int input_fd, const char *file) char const *separator1 = separator + 1; /* Speed optimization, non-regexp. */ size_t match_length1 = match_length - 1; /* Speed optimization, non-regexp. */ - /* Find the size of the input file. */ - file_pos = lseek (input_fd, 0, SEEK_END); - if (file_pos < 1) - return true; /* It's an empty file. */ - /* Arrange for the first read to lop off enough to leave the rest of the file a multiple of 'read_size'. Since 'read_size' can change, this may not always hold during the program run, but since it usually will, leave it here for i/o efficiency (page/sector boundaries and all that). Note: the efficiency gain has not been verified. */ - saved_record_size = file_pos % read_size; - if (saved_record_size == 0) - saved_record_size = read_size; - file_pos -= saved_record_size; - /* 'file_pos' now points to the start of the last (probably partial) block - in the input file. */ + size_t remainder = file_pos % read_size; + if (remainder != 0) + { + file_pos -= remainder; + if (lseek (input_fd, file_pos, SEEK_SET) < 0) + error (0, errno, _("%s: seek failed"), quotearg_colon (file)); + } - if (lseek (input_fd, file_pos, SEEK_SET) < 0) - error (0, errno, _("%s: seek failed"), quotearg_colon (file)); + /* Scan backward, looking for end of file. This caters to proc-like + file systems where the file size is just an estimate. */ + while ((saved_record_size = safe_read (input_fd, G_buffer, read_size)) == 0 + && file_pos != 0) + { + off_t rsize = read_size; + if (lseek (input_fd, -rsize, SEEK_CUR) < 0) + error (0, errno, _("%s: seek failed"), quotearg_colon (file)); + file_pos -= read_size; + } - if (safe_read (input_fd, G_buffer, saved_record_size) != saved_record_size) + /* Now scan forward, looking for end of file. */ + while (saved_record_size == read_size) + { + size_t nread = safe_read (input_fd, G_buffer, read_size); + if (nread == 0) + break; + saved_record_size = nread; + if (saved_record_size == SAFE_READ_ERROR) + break; + file_pos += nread; + } + + if (saved_record_size == SAFE_READ_ERROR) { error (0, errno, _("%s: read error"), quotearg_colon (file)); return false; @@ -282,8 +296,8 @@ tac_seekable (int input_fd, const char *file) { /* 'match_length' is constant for non-regexp boundaries. */ while (*--match_start != first_char - || (match_length1 && strncmp (match_start + 1, separator1, - match_length1))) + || (match_length1 && !STREQ_LEN (match_start + 1, separator1, + match_length1))) /* Do nothing. */ ; } @@ -307,8 +321,6 @@ tac_seekable (int input_fd, const char *file) 'G_buffer_size'. */ char *newbuffer; size_t offset = sentinel_length ? sentinel_length : 1; - ptrdiff_t match_start_offset = match_start - G_buffer; - ptrdiff_t past_end_offset = past_end - G_buffer; size_t old_G_buffer_size = G_buffer_size; read_size *= 2; @@ -317,9 +329,6 @@ tac_seekable (int input_fd, const char *file) xalloc_die (); newbuffer = xrealloc (G_buffer - offset, G_buffer_size); newbuffer += offset; - /* Adjust the pointers for the new buffer location. */ - match_start = newbuffer + match_start_offset; - past_end = newbuffer + past_end_offset; G_buffer = newbuffer; } @@ -485,15 +494,16 @@ temp_stream (FILE **fp, char **file_name) /* Copy from file descriptor INPUT_FD (corresponding to the named FILE) to a temporary file, and set *G_TMP and *G_TEMPFILE to the resulting stream - and file name. Return true if successful. */ + and file name. Return the number of bytes copied, or -1 on error. */ -static bool +static off_t copy_to_temp (FILE **g_tmp, char **g_tempfile, int input_fd, char const *file) { FILE *fp; char *file_name; + uintmax_t bytes_copied = 0; if (!temp_stream (&fp, &file_name)) - return false; + return -1; while (1) { @@ -511,6 +521,11 @@ copy_to_temp (FILE **g_tmp, char **g_tempfile, int input_fd, char const *file) error (0, errno, _("%s: write error"), quotearg_colon (file_name)); goto Fail; } + + /* Implicitly <= OFF_T_MAX due to preceding fwrite(), + but unsigned type used to avoid compiler warnings + not aware of this fact. */ + bytes_copied += bytes_read; } if (fflush (fp) != 0) @@ -521,11 +536,11 @@ copy_to_temp (FILE **g_tmp, char **g_tempfile, int input_fd, char const *file) *g_tmp = fp; *g_tempfile = file_name; - return true; + return bytes_copied; Fail: fclose (fp); - return false; + return -1; } /* Copy INPUT_FD to a temporary, then tac that file. @@ -536,10 +551,11 @@ tac_nonseekable (int input_fd, const char *file) { FILE *tmp_stream; char *tmp_file; - if (!copy_to_temp (&tmp_stream, &tmp_file, input_fd, file)) + off_t bytes_copied = copy_to_temp (&tmp_stream, &tmp_file, input_fd, file); + if (bytes_copied < 0) return false; - bool ok = tac_seekable (fileno (tmp_stream), tmp_file); + bool ok = tac_seekable (fileno (tmp_stream), tmp_file, bytes_copied); return ok; } @@ -578,7 +594,7 @@ tac_file (const char *filename) ok = (file_size < 0 || isatty (fd) ? tac_nonseekable (fd, filename) - : tac_seekable (fd, filename)); + : tac_seekable (fd, filename, file_size)); if (!is_stdin && close (fd) != 0) { @@ -699,5 +715,5 @@ main (int argc, char **argv) free (G_buffer - offset); #endif - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/tail.c b/src/tail.c index 5ff738df..c062d403 100644 --- a/src/tail.c +++ b/src/tail.c @@ -1,5 +1,5 @@ /* tail -- output the last part of file(s) - Copyright (C) 1989-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -40,9 +40,11 @@ #include "posixver.h" #include "quote.h" #include "safe-read.h" +#include "stat-size.h" #include "stat-time.h" #include "xfreopen.h" #include "xnanosleep.h" +#include "xdectoint.h" #include "xstrtol.h" #include "xstrtod.h" @@ -157,13 +159,6 @@ struct File_spec uintmax_t n_unchanged_stats; }; -#if HAVE_INOTIFY -/* The events mask used with inotify on files. This mask is not used on - directories. */ -static const uint32_t inotify_wd_mask = (IN_MODIFY | IN_ATTRIB - | IN_DELETE_SELF | IN_MOVE_SELF); -#endif - /* Keep trying to open a file even if it is inaccessible when tail starts or if it becomes inaccessible later -- useful only with -f. */ static bool reopen_inaccessible_files; @@ -262,9 +257,9 @@ Usage: %s [OPTION]... [FILE]...\n\ printf (_("\ 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\ "), DEFAULT_N_LINES); + emit_stdin_note (); emit_mandatory_arg_note (); fputs (_("\ @@ -321,7 +316,7 @@ 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\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -930,12 +925,10 @@ fremote (int fd, const char *name) # define fremote(fd, name) false #endif -/* FIXME: describe */ - +/* open/fstat F->name and handle changes. */ static void recheck (struct File_spec *f, bool blocking) { - /* open/fstat the file and announce if dev/ino have changed */ struct stat new_stats; bool ok = true; bool is_stdin = (STREQ (f->name, "-")); @@ -1026,42 +1019,45 @@ recheck (struct File_spec *f, bool blocking) assert (f->fd == -1); error (0, 0, _("%s has become accessible"), quote (pretty_name (f))); } + else if (f->fd == -1) + { + /* A new file even when inodes haven't changed as + pairs can be reused, and we know the file was missing + on the previous iteration. Note this also means the file + is redisplayed in --follow=name mode if renamed away from + and back to a monitored name. */ + new_file = true; + + error (0, 0, + _("%s has appeared; following new file"), + quote (pretty_name (f))); + } else if (f->ino != new_stats.st_ino || f->dev != new_stats.st_dev) { + /* File has been replaced (e.g., via log rotation) -- + tail the new one. */ new_file = true; - if (f->fd == -1) - { - error (0, 0, - _("%s has appeared; following end of new file"), - quote (pretty_name (f))); - } - else - { - /* Close the old one. */ - close_fd (f->fd, pretty_name (f)); - - /* File has been replaced (e.g., via log rotation) -- - tail the new one. */ - error (0, 0, - _("%s has been replaced; following end of new file"), - quote (pretty_name (f))); - } + + error (0, 0, + _("%s has been replaced; following new file"), + quote (pretty_name (f))); + + /* Close the old one. */ + close_fd (f->fd, pretty_name (f)); + } else { - if (f->fd == -1) - { - /* This happens when one iteration finds the file missing, - then the preceding pair is reused as the - file is recreated. */ - new_file = true; - } - else - { - close_fd (fd, pretty_name (f)); - } + /* No changes detected, so close new fd. */ + close_fd (fd, pretty_name (f)); } + /* FIXME: When a log is rotated, daemons tend to log to the + old file descriptor until the new file is present and + the daemon is sent a signal. Therefore tail may miss entries + being written to the old file. Perhaps we should keep + the older file open and continue to monitor it until + data is written to a new file. */ if (new_file) { /* Start at the beginning of the file. */ @@ -1200,13 +1196,16 @@ tail_forever (struct File_spec *f, size_t n_files, double sleep_interval) /* reset counter */ f[i].n_unchanged_stats = 0; + /* XXX: This is only a heuristic, as the file may have also + been truncated and written to if st_size >= size + (in which case we ignore new data <= size). */ if (S_ISREG (mode) && stats.st_size < f[i].size) { error (0, 0, _("%s: file truncated"), name); - last = i; - xlseek (fd, stats.st_size, SEEK_SET, name); - f[i].size = stats.st_size; - continue; + /* Assume the file was truncated to 0, + and therefore output all "new" data. */ + xlseek (fd, 0, SEEK_SET, name); + f[i].size = 0; } if (i != last) @@ -1317,9 +1316,9 @@ wd_comparator (const void *e1, const void *e2) return spec1->wd == spec2->wd; } -/* Helper function used by 'tail_forever_inotify'. */ +/* Output (new) data for FSPEC->fd. */ static void -check_fspec (struct File_spec *fspec, int wd, int *prev_wd) +check_fspec (struct File_spec *fspec, struct File_spec **prev_fspec) { struct stat stats; char const *name; @@ -1337,22 +1336,26 @@ check_fspec (struct File_spec *fspec, int wd, int *prev_wd) return; } + /* XXX: This is only a heuristic, as the file may have also + been truncated and written to if st_size >= size + (in which case we ignore new data <= size). + Though in the inotify case it's more likely we'll get + separate events for truncate() and write(). */ if (S_ISREG (fspec->mode) && stats.st_size < fspec->size) { error (0, 0, _("%s: file truncated"), name); - *prev_wd = wd; - xlseek (fspec->fd, stats.st_size, SEEK_SET, name); - fspec->size = stats.st_size; + xlseek (fspec->fd, 0, SEEK_SET, name); + fspec->size = 0; } else if (S_ISREG (fspec->mode) && stats.st_size == fspec->size && timespec_cmp (fspec->mtime, get_stat_mtime (&stats)) == 0) return; - if (wd != *prev_wd) + if (fspec != *prev_fspec) { if (print_headers) write_header (name); - *prev_wd = wd; + *prev_fspec = fspec; } uintmax_t bytes_read = dump_remainder (name, fspec->fd, COPY_TO_EOF); @@ -1369,16 +1372,22 @@ static bool tail_forever_inotify (int wd, struct File_spec *f, size_t n_files, double sleep_interval) { +# if TAIL_TEST_SLEEP + /* Delay between open() and inotify_add_watch() + to help trigger different cases. */ + xnanosleep (1000000); +# endif unsigned int max_realloc = 3; /* Map an inotify watch descriptor to the name of the file it's watching. */ Hash_table *wd_to_name; bool found_watchable_file = false; + bool tailed_but_unwatchable = false; bool found_unwatchable_dir = false; bool no_inotify_resources = false; bool writer_is_dead = false; - int prev_wd; + struct File_spec *prev_fspec; size_t evlen = 0; char *evbuf; size_t evbuf_off = 0; @@ -1388,6 +1397,13 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files, if (! wd_to_name) xalloc_die (); + /* The events mask used with inotify on files (not directories). */ + uint32_t inotify_wd_mask = IN_MODIFY; + /* TODO: Perhaps monitor these events in Follow_descriptor mode also, + to tag reported file names with "deleted", "moved" etc. */ + if (follow_mode == Follow_name) + inotify_wd_mask |= (IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF); + /* Add an inotify watch for each watched file. If -F is specified then watch its parent directory too, in this way when they re-appear we can add them again to the watch list. */ @@ -1436,10 +1452,13 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files, if (f[i].wd < 0) { - if (errno == ENOSPC) + if (f[i].fd != -1) /* already tailed. */ + tailed_but_unwatchable = true; + if (errno == ENOSPC || errno == ENOMEM) { no_inotify_resources = true; error (0, 0, _("inotify resources exhausted")); + break; } else if (errno != f[i].errnum) error (0, errno, _("cannot watch %s"), quote (f[i].name)); @@ -1456,24 +1475,53 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files, /* Linux kernel 2.6.24 at least has a bug where eventually, ENOSPC is always returned by inotify_add_watch. In any case we should revert to polling when there are no inotify resources. Also a specified directory may not - be currently present or accessible, so revert to polling. */ - if (no_inotify_resources || found_unwatchable_dir) + be currently present or accessible, so revert to polling. Also an already + tailed but unwatchable due rename/unlink race, should also revert. */ + if (no_inotify_resources || found_unwatchable_dir + || (follow_mode == Follow_descriptor && tailed_but_unwatchable)) { - /* FIXME: release hash and inotify resources allocated above. */ + hash_free (wd_to_name); + errno = 0; return true; } if (follow_mode == Follow_descriptor && !found_watchable_file) return false; - prev_wd = f[n_files - 1].wd; + prev_fspec = &(f[n_files - 1]); - /* Check files again. New data can be available since last time we checked - and before they are watched by inotify. */ + /* Check files again. New files or data can be available since last time we + checked and before they are watched by inotify. */ for (i = 0; i < n_files; i++) { - if (!f[i].ignore) - check_fspec (&f[i], f[i].wd, &prev_wd); + if (! f[i].ignore) + { + /* check for new files. */ + if (follow_mode == Follow_name) + recheck (&(f[i]), false); + else if (f[i].fd != -1) + { + /* If the file was replaced in the small window since we tailed, + then assume the watch is on the wrong item (different to + that we've already produced output for), and so revert to + polling the original descriptor. */ + struct stat stats; + + if (stat (f[i].name, &stats) == 0 + && (f[i].dev != stats.st_dev || f[i].ino != stats.st_ino)) + { + error (0, errno, _("%s was replaced"), + quote (pretty_name (&(f[i])))); + hash_free (wd_to_name); + + errno = 0; + return true; + } + } + + /* check for new data. */ + check_fspec (&f[i], &prev_fspec); + } } evlen += sizeof (struct inotify_event) + 1; @@ -1553,7 +1601,7 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files, ev = void_ev; evbuf_off += sizeof (*ev) + ev->len; - if (ev->len) /* event on ev->name in watched directory */ + if (ev->len) /* event on ev->name in watched directory. */ { size_t j; for (j = 0; j < n_files; j++) @@ -1569,35 +1617,58 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files, if (j == n_files) continue; - /* It's fine to add the same file more than once. */ + fspec = &(f[j]); + + /* Adding the same inode again will look up any existing wd. */ int new_wd = inotify_add_watch (wd, f[j].name, inotify_wd_mask); if (new_wd < 0) { - /* Can get ENOENT for a dangling symlink for example. */ - error (0, errno, _("cannot watch %s"), quote (f[j].name)); - continue; + if (errno == ENOSPC || errno == ENOMEM) + { + error (0, 0, _("inotify resources exhausted")); + hash_free (wd_to_name); + errno = 0; + return true; /* revert to polling. */ + } + else + { + /* Can get ENOENT for a dangling symlink for example. */ + error (0, errno, _("cannot watch %s"), quote (f[j].name)); + } + /* We'll continue below after removing the existing watch. */ } - fspec = &(f[j]); - - /* Remove 'fspec' and re-add it using 'new_fd' as its key. */ - hash_delete (wd_to_name, fspec); - fspec->wd = new_wd; + /* This will be false if only attributes of file change. */ + bool new_watch = fspec->wd < 0 || new_wd != fspec->wd; - /* If the file was moved then inotify will use the source file wd for - the destination file. Make sure the key is not present in the - table. */ - struct File_spec *prev = hash_delete (wd_to_name, fspec); - if (prev && prev != fspec) + if (new_watch) { - if (follow_mode == Follow_name) - recheck (prev, false); - prev->wd = -1; - close_fd (prev->fd, pretty_name (prev)); - } + if (0 <= fspec->wd) + { + inotify_rm_watch (wd, fspec->wd); + hash_delete (wd_to_name, fspec); + } - if (hash_insert (wd_to_name, fspec) == NULL) - xalloc_die (); + fspec->wd = new_wd; + + if (new_wd == -1) + continue; + + /* If the file was moved then inotify will use the source file wd + for the destination file. Make sure the key is not present in + the table. */ + struct File_spec *prev = hash_delete (wd_to_name, fspec); + if (prev && prev != fspec) + { + if (follow_mode == Follow_name) + recheck (prev, false); + prev->wd = -1; + close_fd (prev->fd, pretty_name (prev)); + } + + if (hash_insert (wd_to_name, fspec) == NULL) + xalloc_die (); + } if (follow_mode == Follow_name) recheck (fspec, false); @@ -1614,24 +1685,21 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files, if (ev->mask & (IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF)) { - /* For IN_DELETE_SELF, we always want to remove the watch. - However, for IN_MOVE_SELF (the file we're watching has - been clobbered via a rename), when tailing by NAME, we - must continue to watch the file. It's only when following - by file descriptor that we must remove the watch. */ - if ((ev->mask & IN_DELETE_SELF) - || ((ev->mask & IN_MOVE_SELF) - && follow_mode == Follow_descriptor)) + /* Note for IN_MOVE_SELF (the file we're watching has + been clobbered via a rename) we leave the watch + in place since it may still be part of the set + of watched names. */ + if (ev->mask & IN_DELETE_SELF) { inotify_rm_watch (wd, fspec->wd); hash_delete (wd_to_name, fspec); } - if (follow_mode == Follow_name) - recheck (fspec, false); + + recheck (fspec, false); continue; } - check_fspec (fspec, ev->wd, &prev_wd); + check_fspec (fspec, &prev_fspec); } } #endif @@ -1665,40 +1733,30 @@ tail_bytes (const char *pretty_filename, int fd, uintmax_t n_bytes, if (t) return t < 0; } - *read_pos += dump_remainder (pretty_filename, fd, COPY_TO_EOF); + n_bytes = COPY_TO_EOF; } else { - if ( ! presume_input_pipe - && S_ISREG (stats.st_mode) && n_bytes <= OFF_T_MAX) + off_t end_pos = ((! presume_input_pipe && usable_st_size (&stats) + && n_bytes <= OFF_T_MAX) + ? stats.st_size : -1); + if (end_pos <= ST_BLKSIZE (stats)) + return pipe_bytes (pretty_filename, fd, n_bytes, read_pos); + off_t current_pos = xlseek (fd, 0, SEEK_CUR, pretty_filename); + if (current_pos < end_pos) { - off_t current_pos = xlseek (fd, 0, SEEK_CUR, pretty_filename); - off_t end_pos = xlseek (fd, 0, SEEK_END, pretty_filename); - off_t diff = end_pos - current_pos; - /* Be careful here. The current position may actually be - beyond the end of the file. */ - off_t bytes_remaining = diff < 0 ? 0 : diff; - off_t nb = n_bytes; - - if (bytes_remaining <= nb) - { - /* From the current position to end of file, there are no - more bytes than have been requested. So reposition the - file pointer to the incoming current position and print - everything after that. */ - *read_pos = xlseek (fd, current_pos, SEEK_SET, pretty_filename); - } - else + off_t bytes_remaining = end_pos - current_pos; + + if (n_bytes < bytes_remaining) { - /* There are more bytes remaining than were requested. - Back up. */ - *read_pos = xlseek (fd, -nb, SEEK_END, pretty_filename); + current_pos = end_pos - n_bytes; + xlseek (fd, current_pos, SEEK_SET, pretty_filename); } - *read_pos += dump_remainder (pretty_filename, fd, n_bytes); } - else - return pipe_bytes (pretty_filename, fd, n_bytes, read_pos); + *read_pos = current_pos; } + + *read_pos += dump_remainder (pretty_filename, fd, n_bytes); return true; } @@ -1826,7 +1884,7 @@ tail_file (struct File_spec *f, uintmax_t n_units) { struct stat stats; -#if TEST_RACE_BETWEEN_FINAL_READ_AND_INITIAL_FSTAT +#if TAIL_TEST_SLEEP /* Before the tail function provided 'read_pos', there was a race condition described in the URL below. This sleep call made the window big enough to exercise the problem. */ @@ -1958,7 +2016,10 @@ parse_obsolete_option (int argc, char * const *argv, uintmax_t *n_units) else if ((xstrtoumax (n_string, NULL, 10, n_units, "b") & ~LONGINT_INVALID_SUFFIX_CHAR) != LONGINT_OK) - error (EXIT_FAILURE, 0, _("number in %s is too large"), quote (argv[1])); + { + error (EXIT_FAILURE, errno, "%s: %s", _("invalid number"), + quote (argv[1])); + } /* Set globals. */ from_start = t_from_start; @@ -1995,17 +2056,10 @@ parse_options (int argc, char **argv, else if (*optarg == '-') ++optarg; - { - strtol_error s_err; - s_err = xstrtoumax (optarg, NULL, 10, n_units, "bkKmMGTPEZY0"); - if (s_err != LONGINT_OK) - { - error (EXIT_FAILURE, 0, "%s: %s", optarg, - (c == 'n' - ? _("invalid number of lines") - : _("invalid number of bytes"))); - } - } + *n_units = xdectoumax (optarg, 0, UINTMAX_MAX, "bkKmMGTPEZY0", + count_lines + ? _("invalid number of lines") + : _("invalid number of bytes"), 0); break; case 'f': @@ -2024,15 +2078,9 @@ parse_options (int argc, char **argv, case MAX_UNCHANGED_STATS_OPTION: /* --max-unchanged-stats=N */ - if (xstrtoumax (optarg, NULL, 10, - &max_n_unchanged_stats_between_opens, - "") - != LONGINT_OK) - { - error (EXIT_FAILURE, 0, - _("%s: invalid maximum number of unchanged stats between opens"), - optarg); - } + max_n_unchanged_stats_between_opens = + xdectoumax (optarg, 0, UINTMAX_MAX, "", + _("invalid maximum number of unchanged stats between opens"), 0); break; case DISABLE_INOTIFY_OPTION: @@ -2040,16 +2088,7 @@ parse_options (int argc, char **argv, break; case PID_OPTION: - { - strtol_error s_err; - unsigned long int tmp_ulong; - s_err = xstrtoul (optarg, NULL, 10, &tmp_ulong, ""); - if (s_err != LONGINT_OK || tmp_ulong > PID_T_MAX) - { - error (EXIT_FAILURE, 0, _("%s: invalid PID"), optarg); - } - pid = tmp_ulong; - } + pid = xdectoumax (optarg, 0, PID_T_MAX, "", _("invalid PID"), 0); break; case PRESUME_INPUT_PIPE_OPTION: @@ -2065,7 +2104,7 @@ parse_options (int argc, char **argv, double s; if (! (xstrtod (optarg, NULL, &s, c_strtod) && 0 <= s)) error (EXIT_FAILURE, 0, - _("%s: invalid number of seconds"), optarg); + _("invalid number of seconds: %s"), quote (optarg)); *sleep_interval = s; } break; @@ -2185,6 +2224,8 @@ main (int argc, char **argv) --n_units; } + IF_LINT (assert (0 <= argc)); + if (optind < argc) { n_files = argc - optind; @@ -2218,7 +2259,7 @@ main (int argc, char **argv) /* Don't read anything if we'll never output anything. */ if (! n_units && ! forever && ! from_start) - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; F = xnmalloc (n_files, sizeof *F); for (i = 0; i < n_files; i++) @@ -2267,7 +2308,12 @@ main (int argc, char **argv) FIXME: when using inotify, and a directory for a watched file is recreated, then we don't recheck any new file when - follow_mode == Follow_name */ + follow_mode == Follow_name. + + FIXME-maybe: inotify has a watch descriptor per inode, and hence with + our current hash implementation will only --follow data for one + of the names when multiple hardlinked files are specified, or + for one name when a name is specified multiple times. */ if (!disable_inotify && (tailable_stdin (F, n_files) || any_remote_file (F, n_files) || any_symlinks (F, n_files) @@ -2285,10 +2331,23 @@ main (int argc, char **argv) if (fflush (stdout) != 0) error (EXIT_FAILURE, errno, _("write error")); - if (!tail_forever_inotify (wd, F, n_files, sleep_interval)) - exit (EXIT_FAILURE); + if (! tail_forever_inotify (wd, F, n_files, sleep_interval)) + return EXIT_FAILURE; } error (0, errno, _("inotify cannot be used, reverting to polling")); + + /* Free resources as this process can be long lived, + and we may have exhausted system resources above. */ + + for (i = 0; i < n_files; i++) + { + /* It's OK to remove the same watch multiple times, + ignoring the EINVAL from redundant calls. */ + if (F[i].wd != -1) + inotify_rm_watch (wd, F[i].wd); + if (F[i].parent_wd != -1) + inotify_rm_watch (wd, F[i].parent_wd); + } } #endif disable_inotify = true; @@ -2297,5 +2356,5 @@ main (int argc, char **argv) if (have_read_stdin && close (STDIN_FILENO) < 0) error (EXIT_FAILURE, errno, "-"); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/tee.c b/src/tee.c index be365604..3c39a4ab 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-2014 Free Software Foundation, Inc. + Copyright (C) 1985-2015 Free Software Foundation, Inc. This 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 @@ #include #include "system.h" +#include "argmatch.h" #include "error.h" #include "fadvise.h" #include "stdio--.h" @@ -43,15 +44,38 @@ static bool append; /* If true, ignore interrupts. */ static bool ignore_interrupts; +enum output_error + { + output_error_sigpipe, /* traditional behavior, sigpipe enabled. */ + output_error_warn, /* warn on EPIPE, but continue. */ + output_error_warn_nopipe, /* ignore EPIPE, continue. */ + output_error_exit, /* exit on any output error. */ + output_error_exit_nopipe /* exit on any output error except EPIPE. */ + }; + +static enum output_error output_error; + static struct option const long_options[] = { {"append", no_argument, NULL, 'a'}, {"ignore-interrupts", no_argument, NULL, 'i'}, + {"output-error", optional_argument, NULL, 'p'}, {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, {NULL, 0, NULL, 0} }; +static char const *const output_error_args[] = +{ + "warn", "warn-nopipe", "exit", "exit-nopipe", NULL +}; +static enum output_error const output_error_types[] = +{ + output_error_warn, output_error_warn_nopipe, + output_error_exit, output_error_exit_nopipe +}; +ARGMATCH_VERIFY (output_error_args, output_error_types); + void usage (int status) { @@ -65,14 +89,25 @@ 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\ +"), stdout); + fputs (_("\ + -p, --output-error[=MODE] behavior on write error. See MODE details below\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); fputs (_("\ \n\ -If a FILE is -, copy again to standard output.\n\ +MODE determines behavior with write errors on the outputs:\n\ + 'warn' diagnose errors writing to any output\n\ + 'warn-nopipe' diagnose errors writing to any output not a pipe\n\ + 'exit' exit on error writing to any output\n\ + 'exit-nopipe' exit on error writing to any output not a pipe\n\ +The default MODE for the -p option is 'warn-nopipe'.\n\ +The default operation when --output-error is not specified, is to\n\ +exit immediately on error writing to a pipe, and diagnose errors\n\ +writing to non pipe outputs.\n\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -94,7 +129,7 @@ main (int argc, char **argv) append = false; ignore_interrupts = false; - while ((optc = getopt_long (argc, argv, "ai", long_options, NULL)) != -1) + while ((optc = getopt_long (argc, argv, "aip", long_options, NULL)) != -1) { switch (optc) { @@ -106,6 +141,14 @@ main (int argc, char **argv) ignore_interrupts = true; break; + case 'p': + if (optarg) + output_error = XARGMATCH ("--output-error", optarg, + output_error_args, output_error_types); + else + output_error = output_error_warn_nopipe; + break; + case_GETOPT_HELP_CHAR; case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); @@ -118,6 +161,9 @@ main (int argc, char **argv) if (ignore_interrupts) signal (SIGINT, SIG_IGN); + if (output_error != output_error_sigpipe) + signal (SIGPIPE, SIG_IGN); + /* Do *not* warn if tee is given no file arguments. POSIX requires that it work when given no arguments. */ @@ -125,7 +171,7 @@ main (int argc, char **argv) if (close (STDIN_FILENO) != 0) error (EXIT_FAILURE, errno, _("standard input")); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } /* Copy the standard input into each of the NFILES files in FILES @@ -135,9 +181,10 @@ main (int argc, char **argv) static bool tee_files (int nfiles, const char **files) { + size_t n_outputs = 0; FILE **descriptors; char buffer[BUFSIZ]; - ssize_t bytes_read; + ssize_t bytes_read = 0; int i; bool ok = true; char const *mode_string = @@ -164,22 +211,27 @@ tee_files (int nfiles, const char **files) descriptors[0] = stdout; files[0] = _("standard output"); setvbuf (stdout, NULL, _IONBF, 0); + n_outputs++; for (i = 1; i <= nfiles; i++) { - descriptors[i] = (STREQ (files[i], "-") - ? stdout - : fopen (files[i], mode_string)); + /* Do not treat "-" specially - as mandated by POSIX. */ + descriptors[i] = fopen (files[i], mode_string); if (descriptors[i] == NULL) { - error (0, errno, "%s", files[i]); + error (output_error == output_error_exit + || output_error == output_error_exit_nopipe, + errno, "%s", files[i]); ok = false; } else - setvbuf (descriptors[i], NULL, _IONBF, 0); + { + setvbuf (descriptors[i], NULL, _IONBF, 0); + n_outputs++; + } } - while (1) + while (n_outputs) { bytes_read = read (0, buffer, sizeof buffer); if (bytes_read < 0 && errno == EINTR) @@ -193,9 +245,21 @@ tee_files (int nfiles, const char **files) if (descriptors[i] && fwrite (buffer, bytes_read, 1, descriptors[i]) != 1) { - error (0, errno, "%s", files[i]); + int w_errno = errno; + bool fail = errno != EPIPE || (output_error == output_error_exit + || output_error == output_error_warn); + if (descriptors[i] == stdout) + clearerr (stdout); /* Avoid redundant close_stdout diagnostic. */ + if (fail) + { + error (output_error == output_error_exit + || output_error == output_error_exit_nopipe, + w_errno, "%s", files[i]); + } descriptors[i] = NULL; - ok = false; + if (fail) + ok = false; + n_outputs--; } } @@ -207,8 +271,7 @@ tee_files (int nfiles, const char **files) /* Close the files, but not standard output. */ for (i = 1; i <= nfiles; i++) - if (!STREQ (files[i], "-") - && descriptors[i] && fclose (descriptors[i]) != 0) + if (descriptors[i] && fclose (descriptors[i]) != 0) { error (0, errno, "%s", files[i]); ok = false; diff --git a/src/test.c b/src/test.c index 75968798..80cc679c 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-2014 Free Software Foundation, Inc. +/* Copyright (C) 1987-2015 Free Software Foundation, Inc. This 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,10 +57,12 @@ enum { TEST_TRUE, TEST_FALSE, TEST_FAILURE }; #if defined TEST_STANDALONE # define test_exit(val) exit (val) +# define test_main_return(val) return val #else static jmp_buf test_exit_buf; static int test_error_return = 0; # define test_exit(val) test_error_return = val, longjmp (test_exit_buf, 1) +# define test_main_return(val) test_exit (val) #endif /* !TEST_STANDALONE */ static int pos; /* The offset of the current argument in ARGV. */ @@ -789,7 +791,7 @@ 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\ "), stdout); printf (USAGE_BUILTIN_WARNING, _("test and/or [")); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -851,7 +853,7 @@ main (int margc, char **margv) { version_etc (stdout, PROGRAM_NAME, PACKAGE_NAME, Version, AUTHORS, (char *) NULL); - test_exit (EXIT_SUCCESS); + test_main_return (EXIT_SUCCESS); } } if (margc < 2 || !STREQ (margv[margc - 1], "]")) @@ -864,12 +866,12 @@ main (int margc, char **margv) pos = 1; if (pos >= argc) - test_exit (TEST_FALSE); + test_main_return (TEST_FALSE); value = posixtest (argc - 1); if (pos != argc) test_syntax_error (_("extra argument %s"), quote (argv[pos])); - test_exit (value ? TEST_TRUE : TEST_FALSE); + test_main_return (value ? TEST_TRUE : TEST_FALSE); } diff --git a/src/timeout.c b/src/timeout.c index 68baa23c..98378f6f 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -1,5 +1,5 @@ /* timeout -- run a command with bounded time - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -203,15 +203,17 @@ cleanup (int sig) in case it has itself become group leader, or is not running in a separate group. */ send_sig (monitored_pid, sig); + /* The normal case is the job has remained in our newly created process group, so send to all processes in that. */ if (!foreground) - send_sig (0, sig); - if (sig != SIGKILL && sig != SIGCONT) { - send_sig (monitored_pid, SIGCONT); - if (!foreground) - send_sig (0, SIGCONT); + send_sig (0, sig); + if (sig != SIGKILL && sig != SIGCONT) + { + send_sig (monitored_pid, SIGCONT); + send_sig (0, SIGCONT); + } } } else /* we're the child or the child is not exec'd yet. */ @@ -266,7 +268,7 @@ 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 (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -440,12 +442,10 @@ main (int argc, char **argv) if (monitored_pid == -1) { error (0, errno, _("fork system call failed")); - exit (EXIT_CANCELED); + return EXIT_CANCELED; } else if (monitored_pid == 0) { /* child */ - int exit_status; - /* exec doesn't reset SIG_IGN -> SIG_DFL. */ signal (SIGTTIN, SIG_DFL); signal (SIGTTOU, SIG_DFL); @@ -453,9 +453,9 @@ main (int argc, char **argv) execvp (argv[0], argv); /* FIXME: should we use "sh -c" ... here? */ /* exit like sh, env, nohup, ... */ - exit_status = (errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE); + int exit_status = errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE; error (0, errno, _("failed to run command %s"), quote (argv[0])); - exit (exit_status); + return exit_status; } else { @@ -494,14 +494,13 @@ main (int argc, char **argv) else { /* shouldn't happen. */ - error (0, 0, _("unknown status from command (0x%X)"), status); + error (0, 0, _("unknown status from command (%d)"), status); status = EXIT_FAILURE; } } if (timed_out && !preserve_status) - exit (EXIT_TIMEDOUT); - else - exit (status); + status = EXIT_TIMEDOUT; + return status; } } diff --git a/src/touch.c b/src/touch.c index 1ba24269..628610a8 100644 --- a/src/touch.c +++ b/src/touch.c @@ -1,5 +1,5 @@ /* touch -- change modification and access times of files - Copyright (C) 1987-2014 Free Software Foundation, Inc. + Copyright (C) 1987-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -247,7 +247,7 @@ change the times of the file associated with standard output.\n\ \n\ Note that the -d and -t options accept different time-date formats.\n\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -433,5 +433,5 @@ main (int argc, char **argv) for (; optind < argc; ++optind) ok &= touch (argv[optind]); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/tr.c b/src/tr.c index 06858f91..fe6f466b 100644 --- a/src/tr.c +++ b/src/tr.c @@ -1,5 +1,5 @@ /* tr -- a filter to translate characters - Copyright (C) 1991-2014 Free Software Foundation, Inc. + Copyright (C) 1991-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -346,7 +346,7 @@ 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\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -1804,13 +1804,13 @@ main (int argc, char **argv) spec_init (s1); if (!parse_str (argv[optind], s1)) - exit (EXIT_FAILURE); + return EXIT_FAILURE; if (non_option_args == 2) { spec_init (s2); if (!parse_str (argv[optind + 1], s2)) - exit (EXIT_FAILURE); + return EXIT_FAILURE; } else s2 = NULL; @@ -1944,5 +1944,5 @@ main (int argc, char **argv) if (close (STDIN_FILENO) != 0) error (EXIT_FAILURE, errno, _("standard input")); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/true.c b/src/true.c index 8a1c4f92..22d141d0 100644 --- a/src/true.c +++ b/src/true.c @@ -1,5 +1,5 @@ /* Exit with a status code indicating success. - Copyright (C) 1999-2014 Free Software Foundation, Inc. + Copyright (C) 1999-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -47,7 +47,7 @@ Usage: %s [ignored command line arguments]\n\ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); exit (status); } @@ -76,5 +76,5 @@ main (int argc, char **argv) (char *) NULL); } - exit (EXIT_STATUS); + return EXIT_STATUS; } diff --git a/src/truncate.c b/src/truncate.c index f3125092..c40cd611 100644 --- a/src/truncate.c +++ b/src/truncate.c @@ -1,5 +1,5 @@ /* truncate -- truncate or extend the length of files. - Copyright (C) 2008-2014 Free Software Foundation, Inc. + Copyright (C) 2008-2015 Free Software Foundation, Inc. This 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 "error.h" #include "quote.h" #include "stat-size.h" -#include "xstrtol.h" +#include "xdectoint.h" /* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "truncate" @@ -59,33 +59,6 @@ static struct option const longopts[] = typedef enum { rm_abs = 0, rm_rel, rm_min, rm_max, rm_rdn, rm_rup } rel_mode_t; -/* Set size to the value of STR, interpreted as a decimal integer, - optionally multiplied by various values. - Return -1 on error, 0 on success. - - This supports dd BLOCK size suffixes + lowercase g,t,m for bsd compat - Note we don't support dd's b=512, c=1, w=2 or 21x512MiB formats. */ -static int -parse_len (char const *str, off_t *size) -{ - enum strtol_error e; - intmax_t tmp_size; - e = xstrtoimax (str, NULL, 10, &tmp_size, "EgGkKmMPtTYZ0"); - if (e == LONGINT_OK - && !(OFF_T_MIN <= tmp_size && tmp_size <= OFF_T_MAX)) - e = LONGINT_OVERFLOW; - - if (e == LONGINT_OK) - { - errno = 0; - *size = tmp_size; - return 0; - } - - errno = (e == LONGINT_OVERFLOW ? EOVERFLOW : 0); - return -1; -} - void usage (int status) { @@ -122,7 +95,7 @@ reads as zero bytes.\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"), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -306,9 +279,10 @@ main (int argc, char **argv) } rel_mode = rm_rel; } - if (parse_len (optarg, &size) == -1) - error (EXIT_FAILURE, errno, _("invalid number %s"), - quote (optarg)); + /* Support dd BLOCK size suffixes + lowercase g,t,m for bsd compat. + Note we don't support dd's b=512, c=1, w=2 or 21x512MiB formats. */ + size = xdectoimax (optarg, OFF_T_MIN, OFF_T_MAX, "EgGkKmMPtTYZ0", + _("Invalid number"), 0); /* Rounding to multiple of 0 is nonsensical */ if ((rel_mode == rm_rup || rel_mode == rm_rdn) && size == 0) error (EXIT_FAILURE, 0, _("division by zero")); @@ -420,5 +394,5 @@ main (int argc, char **argv) } } - exit (errors ? EXIT_FAILURE : EXIT_SUCCESS); + return errors ? EXIT_FAILURE : EXIT_SUCCESS; } diff --git a/src/tsort.c b/src/tsort.c index 661c7173..d4be03d4 100644 --- a/src/tsort.c +++ b/src/tsort.c @@ -1,5 +1,5 @@ /* tsort - topological sort. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -82,12 +82,16 @@ usage (int status) printf (_("\ 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\ "), program_name); + + emit_stdin_note (); + + fputs (_("\ +\n\ +"), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); @@ -557,5 +561,5 @@ main (int argc, char **argv) ok = tsort (optind == argc ? "-" : argv[optind]); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/tty.c b/src/tty.c index 16301e12..eaa499e2 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-2014 Free Software Foundation, Inc. + Copyright (C) 1990-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -69,7 +69,7 @@ Print the file name of the terminal connected to standard input.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -120,5 +120,5 @@ main (int argc, char **argv) puts (_("not a tty")); } - exit (isatty (STDIN_FILENO) ? EXIT_SUCCESS : EXIT_FAILURE); + return isatty (STDIN_FILENO) ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/uname.c b/src/uname.c index e3bed488..39bd28c7 100644 --- a/src/uname.c +++ b/src/uname.c @@ -1,6 +1,6 @@ /* uname -- print system information - Copyright (C) 1989-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -148,7 +148,7 @@ Print machine architecture.\n\ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -371,5 +371,5 @@ main (int argc, char **argv) putchar ('\n'); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/unexpand.c b/src/unexpand.c index 505e223c..e0f7c22a 100644 --- a/src/unexpand.c +++ b/src/unexpand.c @@ -1,5 +1,5 @@ /* unexpand - convert blanks to tabs - Copyright (C) 1989-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -116,9 +116,9 @@ Usage: %s [OPTION]... [FILE]...\n\ program_name); fputs (_("\ Convert blanks in each FILE to tabs, writing to standard output.\n\ -With no FILE, or when FILE is -, read standard input.\n\ "), stdout); + emit_stdin_note (); emit_mandatory_arg_note (); fputs (_("\ @@ -129,7 +129,7 @@ With no FILE, or when FILE is -, read standard input.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -528,5 +528,5 @@ main (int argc, char **argv) if (have_read_stdin && fclose (stdin) != 0) error (EXIT_FAILURE, errno, "-"); - exit (exit_status); + return exit_status; } diff --git a/src/uniq.c b/src/uniq.c index 54200ff4..e0cfe4dd 100644 --- a/src/uniq.c +++ b/src/uniq.c @@ -1,5 +1,5 @@ /* uniq -- remove duplicate lines from a sorted file - Copyright (C) 1986-2014 Free Software Foundation, Inc. + Copyright (C) 1986-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -185,15 +185,15 @@ With no options, matching lines are merged to the first occurrence.\n\ -d, --repeated only print duplicate lines, one for each group\n\ "), stdout); fputs (_("\ - -D, --all-repeated[=METHOD] print all duplicate lines\n\ - groups can be delimited with an empty line\n\ + -D, --all-repeated[=METHOD] print all duplicate lines;\n\ + groups can be delimited with an empty line;\n\ METHOD={none(default),prepend,separate}\n\ "), stdout); fputs (_("\ -f, --skip-fields=N avoid comparing the first N fields\n\ "), stdout); fputs (_("\ - --group[=METHOD] show all items, separating groups with an empty line\n\ + --group[=METHOD] show all items, separating groups with an empty line;\n\ METHOD={separate(default),prepend,append,both}\n\ "), stdout); fputs (_("\ @@ -220,7 +220,7 @@ 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\ "), stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -662,5 +662,5 @@ main (int argc, char **argv) check_file (file[0], file[1], delimiter); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/unlink.c b/src/unlink.c index 260a5301..0b26fd4e 100644 --- a/src/unlink.c +++ b/src/unlink.c @@ -1,5 +1,5 @@ /* unlink utility for GNU. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -49,7 +49,7 @@ Usage: %s FILE\n\ stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -85,5 +85,5 @@ main (int argc, char **argv) if (unlink (argv[optind]) != 0) error (EXIT_FAILURE, errno, _("cannot unlink %s"), quote (argv[optind])); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/uptime.c b/src/uptime.c index 4ab914f3..51233860 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -1,5 +1,5 @@ /* GNU's uptime. - Copyright (C) 1992-2014 Free Software Foundation, Inc. + Copyright (C) 1992-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -217,7 +217,7 @@ If FILE is not specified, use %s. %s as FILE is common.\n\ UTMP_FILE, WTMP_FILE); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -253,5 +253,5 @@ main (int argc, char **argv) usage (EXIT_FAILURE); } - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/users.c b/src/users.c index ee44c815..353753ca 100644 --- a/src/users.c +++ b/src/users.c @@ -1,5 +1,5 @@ /* GNU's users. - Copyright (C) 1992-2014 Free Software Foundation, Inc. + Copyright (C) 1992-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -111,7 +111,7 @@ If FILE is not specified, use %s. %s as FILE is common.\n\ UTMP_FILE, WTMP_FILE); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -147,5 +147,5 @@ main (int argc, char **argv) usage (EXIT_FAILURE); } - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/wc.c b/src/wc.c index 4909d9fe..9fbaee7b 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-2014 Free Software Foundation, Inc. + Copyright (C) 1985-2015 Free Software Foundation, Inc. This 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 @@ #include "quotearg.h" #include "readtokens0.h" #include "safe-read.h" +#include "stat-size.h" #include "xfreopen.h" #if !defined iswspace && !HAVE_ISWSPACE @@ -116,9 +117,14 @@ Usage: %s [OPTION]... [FILE]...\n\ program_name, program_name); fputs (_("\ 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\ +more than one FILE is specified. A word is a non-zero-length sequence of\n\ +characters delimited by white space.\n\ +"), stdout); + + emit_stdin_note (); + + fputs (_("\ +\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\ @@ -129,12 +135,12 @@ the following order: newline, word, character, byte, maximum line length.\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\ - -L, --max-line-length print the length of the longest line\n\ + -L, --max-line-length print the maximum display width\n\ -w, --words print the word counts\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -184,9 +190,10 @@ write_counts (uintmax_t lines, /* Count words. FILE_X is the name of the file (or NULL for standard input) that is open on descriptor FD. *FSTATUS is its status. + CURRENT_POS is the current file offset if known, negative if unknown. Return true if successful. */ static bool -wc (int fd, char const *file_x, struct fstatus *fstatus) +wc (int fd, char const *file_x, struct fstatus *fstatus, off_t current_pos) { bool ok = true; char buf[BUFFER_SIZE + 1]; @@ -229,42 +236,43 @@ wc (int fd, char const *file_x, struct fstatus *fstatus) if (count_bytes && !count_chars && !print_lines && !count_complicated) { - off_t current_pos, end_pos; - if (0 < fstatus->failed) fstatus->failed = fstat (fd, &fstatus->st); - if (! fstatus->failed && S_ISREG (fstatus->st.st_mode) - && (current_pos = lseek (fd, 0, SEEK_CUR)) != -1 - && (end_pos = lseek (fd, 0, SEEK_END)) != -1) + /* For sized files, seek to one st_blksize before EOF rather than to EOF. + This works better for files in proc-like file systems where + the size is only approximate. */ + if (! fstatus->failed && usable_st_size (&fstatus->st) + && 0 <= fstatus->st.st_size) { - /* Be careful here. The current position may actually be - beyond the end of the file. As in the example above. */ - bytes = end_pos < current_pos ? 0 : end_pos - current_pos; + size_t end_pos = fstatus->st.st_size; + off_t hi_pos = end_pos - end_pos % (ST_BLKSIZE (fstatus->st) + 1); + if (current_pos < 0) + current_pos = lseek (fd, 0, SEEK_CUR); + if (0 <= current_pos && current_pos < hi_pos + && 0 <= lseek (fd, hi_pos, SEEK_CUR)) + bytes = hi_pos - current_pos; } - else + + fdadvise (fd, 0, 0, FADVISE_SEQUENTIAL); + while ((bytes_read = safe_read (fd, buf, BUFFER_SIZE)) > 0) { - fdadvise (fd, 0, 0, FADVISE_SEQUENTIAL); - while ((bytes_read = safe_read (fd, buf, BUFFER_SIZE)) > 0) + if (bytes_read == SAFE_READ_ERROR) { - if (bytes_read == SAFE_READ_ERROR) - { - error (0, errno, "%s", file); - ok = false; - break; - } - bytes += bytes_read; + error (0, errno, "%s", file); + ok = false; + break; } + bytes += bytes_read; } } else if (!count_chars && !count_complicated) { /* Use a separate loop when counting only lines or lines and bytes -- but not chars or words. */ + bool long_lines = false; while ((bytes_read = safe_read (fd, buf, BUFFER_SIZE)) > 0) { - char *p = buf; - if (bytes_read == SAFE_READ_ERROR) { error (0, errno, "%s", file); @@ -272,12 +280,38 @@ wc (int fd, char const *file_x, struct fstatus *fstatus) break; } - while ((p = memchr (p, '\n', (buf + bytes_read) - p))) + bytes += bytes_read; + + char *p = buf; + char *end = p + bytes_read; + uintmax_t plines = lines; + + if (! long_lines) { - ++p; - ++lines; + /* Avoid function call overhead for shorter lines. */ + while (p != end) + lines += *p++ == '\n'; } - bytes += bytes_read; + else + { + /* memchr is more efficient with longer lines. */ + while ((p = memchr (p, '\n', end - p))) + { + ++p; + ++lines; + } + } + + /* If the average line length in the block is >= 15, then use + memchr for the next block, where system specific optimizations + may outweigh function call overhead. + FIXME: This line length was determined in 2015, on both + x86_64 and ppc64, but it's worth re-evaluating in future with + newer compilers, CPUs, or memchr() implementations etc. */ + if (lines - plines <= bytes_read / 15) + long_lines = true; + else + long_lines = false; } } #if MB_LEN_MAX > 1 @@ -500,7 +534,7 @@ wc_file (char const *file, struct fstatus *fstatus) have_read_stdin = true; if (O_BINARY && ! isatty (STDIN_FILENO)) xfreopen (NULL, "rb", stdin); - return wc (STDIN_FILENO, file, fstatus); + return wc (STDIN_FILENO, file, fstatus, -1); } else { @@ -512,7 +546,7 @@ wc_file (char const *file, struct fstatus *fstatus) } else { - bool ok = wc (fd, file, fstatus); + bool ok = wc (fd, file, fstatus, 0); if (close (fd) != 0) { error (0, errno, "%s", file); @@ -530,7 +564,7 @@ wc_file (char const *file, struct fstatus *fstatus) that happens when we don't know how long the list of file names will be. */ static struct fstatus * -get_input_fstatus (int nfiles, char *const *file) +get_input_fstatus (size_t nfiles, char *const *file) { struct fstatus *fstatus = xnmalloc (nfiles ? nfiles : 1, sizeof *fstatus); @@ -542,7 +576,7 @@ get_input_fstatus (int nfiles, char *const *file) fstatus[0].failed = 1; else { - int i; + size_t i; for (i = 0; i < nfiles; i++) fstatus[i].failed = (! file[i] || STREQ (file[i], "-") @@ -558,7 +592,7 @@ get_input_fstatus (int nfiles, char *const *file) get_input_fstatus optimizes. */ static int _GL_ATTRIBUTE_PURE -compute_number_width (int nfiles, struct fstatus const *fstatus) +compute_number_width (size_t nfiles, struct fstatus const *fstatus) { int width = 1; @@ -566,7 +600,7 @@ compute_number_width (int nfiles, struct fstatus const *fstatus) { int minimum_width = 1; uintmax_t regular_total = 0; - int i; + size_t i; for (i = 0; i < nfiles; i++) if (! fstatus[i].failed) @@ -592,7 +626,7 @@ main (int argc, char **argv) { bool ok; int optc; - int nfiles; + size_t nfiles; char **files; char *files_from = NULL; struct fstatus *fstatus; @@ -797,5 +831,5 @@ main (int argc, char **argv) if (have_read_stdin && close (STDIN_FILENO) != 0) error (EXIT_FAILURE, errno, "-"); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/who.c b/src/who.c index f07cee61..0a09411f 100644 --- a/src/who.c +++ b/src/who.c @@ -1,5 +1,5 @@ /* GNU's who. - Copyright (C) 1992-2014 Free Software Foundation, Inc. + Copyright (C) 1992-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -582,8 +582,8 @@ scan_entries (size_t n, const STRUCT_UTMP *utmp_buf) while (n--) { if (!my_line_only - || strncmp (ttyname_b, utmp_buf->ut_line, - sizeof (utmp_buf->ut_line)) == 0) + || STREQ_LEN (ttyname_b, utmp_buf->ut_line, + sizeof (utmp_buf->ut_line))) { if (need_users && IS_USER_PROCESS (utmp_buf)) print_user (utmp_buf, boottime); @@ -675,7 +675,7 @@ Print information about users who are currently logged in.\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\ "), UTMP_FILE, WTMP_FILE); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -828,5 +828,5 @@ main (int argc, char **argv) usage (EXIT_FAILURE); } - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } diff --git a/src/whoami.c b/src/whoami.c index 7301abb1..507910bb 100644 --- a/src/whoami.c +++ b/src/whoami.c @@ -1,6 +1,6 @@ /* whoami -- print effective userid - Copyright (C) 1989-2014 Free Software Foundation, Inc. + Copyright (C) 1989-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -49,7 +49,7 @@ Same as id -un.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -83,12 +83,9 @@ main (int argc, char **argv) errno = 0; uid = geteuid (); pw = (uid == NO_UID && errno ? NULL : getpwuid (uid)); - if (pw) - { - puts (pw->pw_name); - exit (EXIT_SUCCESS); - } - fprintf (stderr, _("%s: cannot find name for user ID %lu\n"), - program_name, (unsigned long int) uid); - exit (EXIT_FAILURE); + if (!pw) + error (EXIT_FAILURE, errno, _("cannot find name for user ID %lu"), + (unsigned long int) uid); + puts (pw->pw_name); + return EXIT_SUCCESS; } diff --git a/src/yes.c b/src/yes.c index 97213124..07885be9 100644 --- a/src/yes.c +++ b/src/yes.c @@ -1,5 +1,5 @@ /* yes - output a string repeatedly until killed - Copyright (C) 1991-2014 Free Software Foundation, Inc. + Copyright (C) 1991-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ Repeatedly output a line with all specified STRING(s), or 'y'.\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -58,6 +58,10 @@ Repeatedly output a line with all specified STRING(s), or 'y'.\n\ int main (int argc, char **argv) { + char buf[BUFSIZ]; + char *pbuf = buf; + int i; + initialize_main (&argc, &argv); set_program_name (argv[0]); setlocale (LC_ALL, ""); @@ -77,12 +81,54 @@ main (int argc, char **argv) argv[argc++] = bad_cast ("y"); } - while (true) + /* Buffer data locally once, rather than having the + large overhead of stdio buffering each item. */ + for (i = optind; i < argc; i++) + { + size_t len = strlen (argv[i]); + if (BUFSIZ < len || BUFSIZ - len <= pbuf - buf) + break; + memcpy (pbuf, argv[i], len); + pbuf += len; + *pbuf++ = i == argc - 1 ? '\n' : ' '; + } + if (i == argc) + { + size_t line_len = pbuf - buf; + size_t lines = BUFSIZ / line_len; + while (--lines) + { + memcpy (pbuf, pbuf - line_len, line_len); + pbuf += line_len; + } + } + + /* The normal case is to continuously output the local buffer. */ + while (i == argc) + { + if (write (STDOUT_FILENO, buf, pbuf - buf) == -1) + { + error (0, errno, _("standard output")); + return EXIT_FAILURE; + } + } + + /* If the data doesn't fit in BUFSIZ then output + what we've buffered, and iterate over the remaining items. */ + while (true /* i != argc */) { - int i; - for (i = optind; i < argc; i++) - if (fputs (argv[i], stdout) == EOF - || putchar (i == argc - 1 ? '\n' : ' ') == EOF) - error (EXIT_FAILURE, errno, _("standard output")); + int j; + if ((pbuf - buf) && fwrite (buf, pbuf - buf, 1, stdout) != 1) + { + error (0, errno, _("standard output")); + return EXIT_FAILURE; + } + for (j = i; j < argc; j++) + if (fputs (argv[j], stdout) == EOF + || putchar (j == argc - 1 ? '\n' : ' ') == EOF) + { + error (0, errno, _("standard output")); + return EXIT_FAILURE; + } } } diff --git a/tests/Coreutils.pm b/tests/Coreutils.pm index cfa41a96..bd2088f6 100644 --- a/tests/Coreutils.pm +++ b/tests/Coreutils.pm @@ -1,7 +1,7 @@ package Coreutils; # This is a testing framework. -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -91,7 +91,7 @@ defined $ENV{DJDIR} # If the EXIT-keyed one is omitted, then expect the exit status to be zero. # FIXME: Make sure that no junkfile is also listed as a -# non-junkfile (i.e. with undef for contents) +# non-junkfile (i.e., with undef for contents) sub _shell_quote ($) { @@ -576,7 +576,7 @@ sub run_tests ($$$$$) } # For each test in @$TESTS, generate two additional tests, -# one using stdin, the other using a pipe. I.e., given this one +# one using stdin, the other using a pipe. I.e., given this one # ['idem-0', {IN=>''}, {OUT=>''}], # generate these: # ['idem-0.r', '<', {IN=>''}, {OUT=>''}], diff --git a/tests/CuSkip.pm b/tests/CuSkip.pm index d0cfdb54..a25688a6 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This program is free software: 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 7e73f65e..fd65556f 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/chgrp/basic.sh b/tests/chgrp/basic.sh index 153b36c3..39a8d3c8 100755 --- a/tests/chgrp/basic.sh +++ b/tests/chgrp/basic.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure chgrp is reasonable -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/chgrp/default-no-deref.sh b/tests/chgrp/default-no-deref.sh index c8c1da24..a0080e7b 100755 --- a/tests/chgrp/default-no-deref.sh +++ b/tests/chgrp/default-no-deref.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that chgrp -R does not dereference symlinks. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/chgrp/deref.sh b/tests/chgrp/deref.sh index 97eadfd0..22548ea3 100755 --- a/tests/chgrp/deref.sh +++ b/tests/chgrp/deref.sh @@ -1,7 +1,7 @@ #!/bin/sh # see if chgrp can change the group of a symlink -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/chgrp/no-x.sh b/tests/chgrp/no-x.sh index 27248af4..b532c97e 100755 --- a/tests/chgrp/no-x.sh +++ b/tests/chgrp/no-x.sh @@ -2,7 +2,7 @@ # Make sure chgrp gives the right diagnostic for a readable, # but inaccessible directory. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/chgrp/posix-H.sh b/tests/chgrp/posix-H.sh index 093d5181..205d0732 100755 --- a/tests/chgrp/posix-H.sh +++ b/tests/chgrp/posix-H.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test POSIX-mandated -H option. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/chgrp/recurse.sh b/tests/chgrp/recurse.sh index cd973838..05b987a0 100755 --- a/tests/chgrp/recurse.sh +++ b/tests/chgrp/recurse.sh @@ -1,7 +1,7 @@ #!/bin/sh # ad-hoc tests of chgrp with -R and -H or -L and symlinks -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/chmod/c-option.sh b/tests/chmod/c-option.sh index 03e1db9a..bba557af 100755 --- a/tests/chmod/c-option.sh +++ b/tests/chmod/c-option.sh @@ -1,7 +1,7 @@ #!/bin/sh # Verify that chmod's --changes (-c) option works. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/chmod/equal-x.sh b/tests/chmod/equal-x.sh index 75a2fa1a..98f6bc49 100755 --- a/tests/chmod/equal-x.sh +++ b/tests/chmod/equal-x.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test "chmod =x" and the like. -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/chmod/equals.sh b/tests/chmod/equals.sh index 4daba4be..b7f4362e 100755 --- a/tests/chmod/equals.sh +++ b/tests/chmod/equals.sh @@ -3,7 +3,7 @@ # Before fileutils-4.1.2, some of them didn't. # Also, before coreutils-5.3.1, =[ugo] sometimes didn't work. -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/chmod/inaccessible.sh b/tests/chmod/inaccessible.sh index 2ef2a61f..e57cf92a 100755 --- a/tests/chmod/inaccessible.sh +++ b/tests/chmod/inaccessible.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test for the bug fixed on 2006-09-20. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/chmod/no-x.sh b/tests/chmod/no-x.sh index 64e81ed8..d43c4a25 100755 --- a/tests/chmod/no-x.sh +++ b/tests/chmod/no-x.sh @@ -2,7 +2,7 @@ # Make sure chmod gives the right diagnostic for a readable, # but inaccessible directory. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/chmod/octal.sh b/tests/chmod/octal.sh index 895c8348..23d0542f 100755 --- a/tests/chmod/octal.sh +++ b/tests/chmod/octal.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that chmod diagnoses a certain type of invalid mode string -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This 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,8 +22,8 @@ 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 +for mode in '0-anything' '7-anything' '8'; do + returns_ 1 chmod "$mode" . 2>/dev/null || fail=1 +done Exit $fail diff --git a/tests/chmod/setgid.sh b/tests/chmod/setgid.sh index 0c0722de..1e82e882 100755 --- a/tests/chmod/setgid.sh +++ b/tests/chmod/setgid.sh @@ -3,7 +3,7 @@ # on directories with the setgid bit set. Also, check that the GNU octal # notations work. -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/chmod/silent.sh b/tests/chmod/silent.sh index 5d5dcb58..d0d2b158 100755 --- a/tests/chmod/silent.sh +++ b/tests/chmod/silent.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that chgrp, chmod, chown -f don't print some diagnostics -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/chmod/thru-dangling.sh b/tests/chmod/thru-dangling.sh index 4a137e81..5cd0ad96 100755 --- a/tests/chmod/thru-dangling.sh +++ b/tests/chmod/thru-dangling.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test for proper error and exit code of chmod on a dangling symlink. -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/chmod/umask-x.sh b/tests/chmod/umask-x.sh index 9e0e0012..f31452a3 100755 --- a/tests/chmod/umask-x.sh +++ b/tests/chmod/umask-x.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test that chmod -x file reports an error if the result is executable. -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This 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,6 @@ print_ver_ chmod touch file chmod 755 file -(umask 77 && chmod -x file) 2>/dev/null && fail=1 +(umask 77 && returns_ 1 chmod -x file) 2>/dev/null || fail=1 Exit $fail diff --git a/tests/chmod/usage.sh b/tests/chmod/usage.sh index 7e27e7ce..ac6d635a 100755 --- a/tests/chmod/usage.sh +++ b/tests/chmod/usage.sh @@ -1,7 +1,7 @@ #!/bin/sh # Verify that chmod works correctly with odd option combinations. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -67,7 +67,7 @@ for case in $cases; do case $files in '') touch -- $all_files || framework_failure_ - chmod $args 2>/dev/null && fail=1 + returns_ 1 chmod $args 2>/dev/null || fail=1 ;; ?*) touch -- $files || framework_failure_ @@ -77,7 +77,7 @@ for case in $cases; do # 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 + returns_ 1 chmod $args 2>/dev/null || fail=1 done ;; esac diff --git a/tests/chown/basic.sh b/tests/chown/basic.sh index d4b2b9b0..e57b9c89 100755 --- a/tests/chown/basic.sh +++ b/tests/chown/basic.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure chown --from=... works -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This 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 @@ 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 +returns_ 1 chown -v 0 nf > out || fail=1 printf "failed to change ownership of 'nf' to 0\n" > exp compare exp out || fail=1 diff --git a/tests/chown/deref.sh b/tests/chown/deref.sh index e576a9f9..30b4ed9e 100755 --- a/tests/chown/deref.sh +++ b/tests/chown/deref.sh @@ -2,7 +2,7 @@ # For coreutils-5.2.1 and earlier, chown --dereference would skip # symlinks having owner/group matching the specified owner/group. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/chown/preserve-root.sh b/tests/chown/preserve-root.sh index 176c7c4f..cbef76a8 100755 --- a/tests/chown/preserve-root.sh +++ b/tests/chown/preserve-root.sh @@ -1,7 +1,7 @@ #!/bin/sh # Verify that --preserve-root works. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/chown/separator.sh b/tests/chown/separator.sh index f5ecb5bb..642b0023 100755 --- a/tests/chown/separator.sh +++ b/tests/chown/separator.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure "chown USER:GROUP FILE" works, and similar tests with separators. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This 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 @@ for u in $id_u "$id_un" ''; do esac for sep in $seps; do case $u$sep$g in - [0-9]*$sep) chown "$u$sep$g" . 2> /dev/null && fail=1 ;; + [0-9]*$sep) returns_ 1 chown "$u$sep$g" . 2>/dev/null || fail=1 ;; *) chown "$u$sep$g" . || fail=1 ;; esac done diff --git a/tests/cp/abuse.sh b/tests/cp/abuse.sh index 80eb1d62..cf7b45ab 100755 --- a/tests/cp/abuse.sh +++ b/tests/cp/abuse.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that cp does not write through a just-copied symlink -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/acl.sh b/tests/cp/acl.sh index 36a5d298..e397ff06 100755 --- a/tests/cp/acl.sh +++ b/tests/cp/acl.sh @@ -2,7 +2,7 @@ # copy files/directories across file system boundaries # and make sure acls are preserved appropriately -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/attr-existing.sh b/tests/cp/attr-existing.sh index 7e48fbbc..74b26d73 100755 --- a/tests/cp/attr-existing.sh +++ b/tests/cp/attr-existing.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure cp --attributes-only doesn't truncate existing data -# Copyright 2012-2014 Free Software Foundation, Inc. +# Copyright 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/backup-1.sh b/tests/cp/backup-1.sh index 033f8a93..39f48170 100755 --- a/tests/cp/backup-1.sh +++ b/tests/cp/backup-1.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test cp backup. -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/backup-dir.sh b/tests/cp/backup-dir.sh index 2b11fd18..e6ead6cf 100755 --- a/tests/cp/backup-dir.sh +++ b/tests/cp/backup-dir.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that cp -b doesn't back up directories. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/backup-is-src.sh b/tests/cp/backup-is-src.sh index ae2502e5..5b9da8dc 100755 --- a/tests/cp/backup-is-src.sh +++ b/tests/cp/backup-is-src.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test cp backup to source file. -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/capability.sh b/tests/cp/capability.sh index fb3bc1c8..843b520e 100755 --- a/tests/cp/capability.sh +++ b/tests/cp/capability.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure cp --preserves copies capabilities -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/cp-HL.sh b/tests/cp/cp-HL.sh index bdc31ed5..08a72b13 100755 --- a/tests/cp/cp-HL.sh +++ b/tests/cp/cp-HL.sh @@ -1,7 +1,7 @@ #!/bin/sh # test cp's -H and -L options -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This 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 @@ test -d dest-dir/src-dir || fail=1 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 +returns_ 1 cat dest-dir/src-dir/slink >/dev/null 2>&1 || fail=1 # FIXME: test -L, too. diff --git a/tests/cp/cp-a-selinux.sh b/tests/cp/cp-a-selinux.sh index 58887d27..d000ee8f 100755 --- a/tests/cp/cp-a-selinux.sh +++ b/tests/cp/cp-a-selinux.sh @@ -4,7 +4,7 @@ # Check also locally if --preserve=context, -a and --preserve=all # does work -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This 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,14 +49,16 @@ rm -f f # in the destination, so SELinux contexts should be updated too. chmod o+rw restore/existing_dir mkdir -p backup/existing_dir/ || framework_failure_ -ls -Zd backup/existing_dir | grep $ctx && framework_failure_ +ls -Zd backup/existing_dir > ed_ctx || fail=1 +grep $ctx ed_ctx && framework_failure_ touch backup/existing_dir/file || framework_failure_ chcon $ctx backup/existing_dir/file || framework_failure_ # Set the dir context to ensure it is reset mkdir -p --context="$ctx" restore/existing_dir || framework_failure_ # Copy and ensure existing directories updated cp -a backup/. restore/ -ls -Zd restore/existing_dir | grep $ctx && +ls -Zd restore/existing_dir > ed_ctx || fail=1 +grep $ctx ed_ctx && { ls -lZd restore/existing_dir; fail=1; } # Check restorecon (-Z) functionality for file and directory @@ -64,7 +66,7 @@ get_selinux_type() { ls -Zd "$1" | sed -n 's/.*:\(.*_t\):.*/\1/p'; } # Also make a dir with our known context mkdir c_d || framework_failure_ chcon $ctx c_d || framework_failure_ -# Get the type of this known context for file and dir +# Get the type of this known context for file and dir for tracing old_type_f=$(get_selinux_type c) old_type_d=$(get_selinux_type c_d) # Setup copies for manipulation with restorecon @@ -80,7 +82,7 @@ if restorecon Z1 Z1_d 2>/dev/null; then cpZ_type_f=$(get_selinux_type Z2) test "$cpZ_type_f" = "$new_type_f" || fail=1 - # Ensuze -Z overrides -a and that dirs are handled too + # Ensure -Z overrides -a and that dirs are handled too cp -aZ c Z3 || fail=1 cp -aZ c_d Z3_d || fail=1 cpaZ_type_f=$(get_selinux_type Z3) @@ -175,6 +177,7 @@ for no_g_cmd in '' 'rm -f g'; do # restorecon equivalent. Note even though the context # returned from matchpathcon() will not match $ctx # the resulting ENOTSUP warning will be suppressed. + # With absolute path $no_g_cmd cp -Z ../f $(realpath g) || fail=1 @@ -186,7 +189,7 @@ for no_g_cmd in '' 'rm -f g'; do cp -Z -a ../f g || fail=1 # -Z doesn't take an arg $no_g_cmd - cp -Z "$ctx" ../f g && fail=1 + returns_ 1 cp -Z "$ctx" ../f g || fail=1 # Explicit context $no_g_cmd @@ -197,9 +200,9 @@ for no_g_cmd in '' 'rm -f g'; do cp -a --context="$ctx" ../f g || fail=1 done -# Mutually exlusive options -cp -Z --preserve=context ../f g && fail=1 -cp --preserve=context -Z ../f g && fail=1 -cp --preserve=context --context="$ctx" ../f g && fail=1 +# Mutually exclusive options +returns_ 1 cp -Z --preserve=context ../f g || fail=1 +returns_ 1 cp --preserve=context -Z ../f g || fail=1 +returns_ 1 cp --preserve=context --context="$ctx" ../f g || fail=1 Exit $fail diff --git a/tests/cp/cp-deref.sh b/tests/cp/cp-deref.sh index 63a1c22d..7de56e44 100755 --- a/tests/cp/cp-deref.sh +++ b/tests/cp/cp-deref.sh @@ -2,7 +2,7 @@ # cp -RL dir1 dir2' must handle the case in which each of dir1 and dir2 # contain a symlink pointing to some third directory. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/cp-i.sh b/tests/cp/cp-i.sh index 9f2905e6..e7414130 100755 --- a/tests/cp/cp-i.sh +++ b/tests/cp/cp-i.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test whether cp -i prompts in the right place. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This 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,6 @@ 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 +returns_ 1 cp -bn c d 2>/dev/null || fail=1 Exit $fail diff --git a/tests/cp/cp-mv-backup.sh b/tests/cp/cp-mv-backup.sh index e313b72c..15695f19 100755 --- a/tests/cp/cp-mv-backup.sh +++ b/tests/cp/cp-mv-backup.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test basic --backup functionality for both cp and mv. -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/cp-mv-enotsup-xattr.sh b/tests/cp/cp-mv-enotsup-xattr.sh index f46977b6..13f477d6 100755 --- a/tests/cp/cp-mv-enotsup-xattr.sh +++ b/tests/cp/cp-mv-enotsup-xattr.sh @@ -3,7 +3,7 @@ # as expected on file system without their support and do show correct # diagnostics when required -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/cp-parents.sh b/tests/cp/cp-parents.sh index e326d6bd..f0454f71 100755 --- a/tests/cp/cp-parents.sh +++ b/tests/cp/cp-parents.sh @@ -2,7 +2,7 @@ # cp -R --parents dir-specified-with-trailing-slash/ other-dir # would get a failed assertion. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,7 +42,7 @@ test -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 +returns_ 1 cp --parents f/g d 2>/dev/null || fail=1 test -d d/f && fail=1 # Check that re_protect works. diff --git a/tests/cp/deref-slink.sh b/tests/cp/deref-slink.sh index b81997be..8e094ff2 100755 --- a/tests/cp/deref-slink.sh +++ b/tests/cp/deref-slink.sh @@ -2,7 +2,7 @@ # Demonstrate bug when using -d with an existing destination file # that is a symlink. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/dir-rm-dest.sh b/tests/cp/dir-rm-dest.sh index 2723631d..e9e79937 100755 --- a/tests/cp/dir-rm-dest.sh +++ b/tests/cp/dir-rm-dest.sh @@ -1,7 +1,7 @@ #!/bin/sh # verify that cp's --remove-destination option works with -R -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/dir-slash.sh b/tests/cp/dir-slash.sh index 42bf0696..0042de94 100755 --- a/tests/cp/dir-slash.sh +++ b/tests/cp/dir-slash.sh @@ -2,7 +2,7 @@ # Make sure that cp -R DIR1 DIR2 does the right thing # when DIR1 is written with a trailing slash. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/dir-vs-file.sh b/tests/cp/dir-vs-file.sh index 5398656e..8ac159c0 100755 --- a/tests/cp/dir-vs-file.sh +++ b/tests/cp/dir-vs-file.sh @@ -1,7 +1,7 @@ #!/bin/sh # A directory may not replace an existing file. -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This 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 @@ touch file || framework_failure_ # In 4.0.35, this cp invocation silently succeeded. -cp -R dir file 2>/dev/null && fail=1 +returns_ 1 cp -R dir file 2>/dev/null || fail=1 # Make sure file is not replaced with a directory. # In 4.0.35, it was. diff --git a/tests/cp/duplicate-sources.sh b/tests/cp/duplicate-sources.sh new file mode 100755 index 00000000..3b9e0cc1 --- /dev/null +++ b/tests/cp/duplicate-sources.sh @@ -0,0 +1,44 @@ +#!/bin/sh +# Ensure cp warns about but otherwise ignores source +# items specified multiple times. + +# Copyright (C) 2014-2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cp + +mkdir a || framework_failure_ +touch f || framework_failure_ + +# verify multiple files and dir sources only warned about +mkdir dest || framework_failure_ +cp -a a a f f dest 2>err || fail=1 +rm -Rf dest || framework_failure_ + +# verify multiple dirs and files with different names copied +mkdir dest || framework_failure_ +ln -s a al || framework_failure_ +ln -s f fl || framework_failure_ +cp -aH a al f fl dest 2>>err || fail=1 + +cat <exp +cp: warning: source directory 'a' specified more than once +cp: warning: source file 'f' specified more than once +EOF + +compare exp err || fail=1 + +Exit $fail diff --git a/tests/cp/existing-perm-dir.sh b/tests/cp/existing-perm-dir.sh index 46f1be0d..b56041b1 100755 --- a/tests/cp/existing-perm-dir.sh +++ b/tests/cp/existing-perm-dir.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure cp -p doesn't "restore" permissions it shouldn't (Bug#9170). -# Copyright 2011-2014 Free Software Foundation, Inc. +# Copyright 2011-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/existing-perm-race.sh b/tests/cp/existing-perm-race.sh index c12cbb85..f48369cd 100755 --- a/tests/cp/existing-perm-race.sh +++ b/tests/cp/existing-perm-race.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure cp -p isn't too generous with existing file permissions. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This 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,10 +37,12 @@ chgrp $g1 fifo && chgrp $g2 fifo-copy && chmod g+r fifo-copy || framework-failure +# Terminate any background cp process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + # 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=$! +cp -p --copy-contents fifo fifo-copy & pid=$! ( # Now 'cp' is reading the fifo. Wait for the destination file to @@ -77,7 +79,7 @@ case $mode in *) fail=1;; esac -wait $cp_pid || fail=1 +wait $pid || fail=1 # Check that the final mode and group are right. ls -l -n fifo-copy >ls.out && diff --git a/tests/cp/fail-perm.sh b/tests/cp/fail-perm.sh index 83518417..6a9cc880 100755 --- a/tests/cp/fail-perm.sh +++ b/tests/cp/fail-perm.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This 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 @@ 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 +returns_ 1 cp -pR D DD > /dev/null 2>&1 || fail=1 # Permissions on DD must be 'dr-x------' diff --git a/tests/cp/fiemap-2.sh b/tests/cp/fiemap-2.sh index 79e2c1c4..054be5f8 100755 --- a/tests/cp/fiemap-2.sh +++ b/tests/cp/fiemap-2.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise a few more corners of the fiemap-copying code. -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/fiemap-FMR.sh b/tests/cp/fiemap-FMR.sh index 7c9e3198..96cc3bd2 100755 --- a/tests/cp/fiemap-FMR.sh +++ b/tests/cp/fiemap-FMR.sh @@ -1,7 +1,7 @@ #!/bin/sh # Trigger a free-memory read bug in cp from coreutils-[8.11..8.19] -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/fiemap-empty.sh b/tests/cp/fiemap-empty.sh index 34aec424..b3b2cd72 100755 --- a/tests/cp/fiemap-empty.sh +++ b/tests/cp/fiemap-empty.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test cp reads unwritten extents efficiently -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This 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 @@ 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. +# Note also if checking allocations may need to sync first on BTRFS at least skip_ 'disabled for now' touch fiemap_chk diff --git a/tests/cp/fiemap-perf.sh b/tests/cp/fiemap-perf.sh index 10bb7324..5517ad0c 100755 --- a/tests/cp/fiemap-perf.sh +++ b/tests/cp/fiemap-perf.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that a sparse file is copied efficiently, by default -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This 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 @@ timeout 10 truncate -s1T f || # 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 || skip_ "the 'filefrag' utility is missing" filefrag f | grep -F ': 0 extents found' > /dev/null || skip_ 'this file system reports extents for holes' diff --git a/tests/cp/file-perm-race.sh b/tests/cp/file-perm-race.sh index 5a01675c..8197962d 100755 --- a/tests/cp/file-perm-race.sh +++ b/tests/cp/file-perm-race.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure cp -p isn't too generous with file permissions. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This 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,10 +25,12 @@ require_local_dir_ umask 022 mkfifo_or_skip_ fifo +# Terminate any background cp process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + # 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=$! +cp -p --copy-contents fifo fifo-copy & pid=$! ( # Now 'cp' is reading the fifo. Wait for the destination file to @@ -51,6 +53,6 @@ case $(cat ls.out) in *) fail=1;; esac -wait $cp_pid || fail=1 +wait $pid || fail=1 Exit $fail diff --git a/tests/cp/into-self.sh b/tests/cp/into-self.sh index 124be241..6799d659 100755 --- a/tests/cp/into-self.sh +++ b/tests/cp/into-self.sh @@ -1,7 +1,7 @@ #!/bin/sh # Confirm that copying a directory into itself gets a proper diagnostic. -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/link-deref.sh b/tests/cp/link-deref.sh index 1b666589..b0efb6f8 100755 --- a/tests/cp/link-deref.sh +++ b/tests/cp/link-deref.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise cp --link's behavior regarding the dereferencing of symbolic links. -# Copyright (C) 2013-2014 Free Software Foundation, Inc. +# Copyright (C) 2013-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,7 +19,8 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp -if grep '^#define HAVE_LINKAT 1' "$CONFIG_HEADER" > /dev/null \ +if { grep '^#define HAVE_LINKAT 1' "$CONFIG_HEADER" > /dev/null \ + && grep '#undef LINKAT_SYMLINK_NOTSUP' "$CONFIG_HEADER" > /dev/null; } \ || grep '^#define LINK_FOLLOWS_SYMLINKS 0' "$CONFIG_HEADER" > /dev/null; then # With this config cp will attempt to linkat() to hardlink a symlink. # So now double check the current file system supports this operation. diff --git a/tests/cp/link-heap.sh b/tests/cp/link-heap.sh index 594ade89..901a92fc 100755 --- a/tests/cp/link-heap.sh +++ b/tests/cp/link-heap.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that cp --preserve=link --link doesn't waste heap -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/link-no-deref.sh b/tests/cp/link-no-deref.sh index 13fd0ef5..582ea5a3 100755 --- a/tests/cp/link-no-deref.sh +++ b/tests/cp/link-no-deref.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that cp --link --no-dereference works properly -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/link-preserve.sh b/tests/cp/link-preserve.sh index c2cfd4ae..00ebe15c 100755 --- a/tests/cp/link-preserve.sh +++ b/tests/cp/link-preserve.sh @@ -2,7 +2,7 @@ # ensure that 'cp -d' preserves hard-links between command line arguments # ensure that --preserve=links works with -RH and -RL -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/link-symlink.sh b/tests/cp/link-symlink.sh index 9aab0b85..6bdc9f59 100755 --- a/tests/cp/link-symlink.sh +++ b/tests/cp/link-symlink.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that cp -a --link maintains timestamps if possible -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/link.sh b/tests/cp/link.sh index 034a6275..b7917016 100755 --- a/tests/cp/link.sh +++ b/tests/cp/link.sh @@ -2,7 +2,7 @@ # Make sure cp --link -f works when the target exists. # This failed for 4.0z (due to a bug introduced in that test release). -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/nfs-removal-race.sh b/tests/cp/nfs-removal-race.sh index 6969e8bd..fdac03f7 100755 --- a/tests/cp/nfs-removal-race.sh +++ b/tests/cp/nfs-removal-race.sh @@ -13,7 +13,7 @@ # This test is skipped on systems that lack LD_PRELOAD support; that's fine. # Similarly, on a system that lacks or __xstat, skipping it is fine. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This 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 @@ require_gcc_shared_ # Replace each stat call with a call to this wrapper. cat > k.c <<'EOF' || framework_failure_ #define _GNU_SOURCE +#include #include #include @@ -49,6 +50,7 @@ int __xstat (int ver, const char *path, struct stat *st) { static int (*real_stat)(int ver, const char *path, struct stat *st) = NULL; + fclose(fopen("preloaded", "w")); if (!real_stat) real_stat = dlsym (RTLD_NEXT, "__xstat"); /* When asked to stat nonexistent "d", @@ -65,7 +67,9 @@ touch d2 || framework_failure_ echo xyz > src || framework_failure_ # Finally, run the test: -LD_PRELOAD=./k.so cp src d || fail=1 +LD_PRELOAD=$LD_PRELOAD:./k.so cp src d || fail=1 + +test -f preloaded || skip_ 'LD_PRELOAD was ineffective?' compare src d || fail=1 Exit $fail diff --git a/tests/cp/no-ctx.sh b/tests/cp/no-ctx.sh index 8b1328a4..852b8e64 100755 --- a/tests/cp/no-ctx.sh +++ b/tests/cp/no-ctx.sh @@ -4,7 +4,7 @@ # This test is skipped on systems that lack LD_PRELOAD support; that's fine. # Similarly, on a system that lacks lgetfilecon altogether, skipping it is fine. -# Copyright (C) 2014 Free Software Foundation, Inc. +# Copyright (C) 2014-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -50,14 +50,15 @@ gcc_shared_ k.c k.so \ touch file_src # New file with SELinux context optionally included -LD_PRELOAD=./k.so cp -a file_src file_dst || fail=1 +LD_PRELOAD=$LD_PRELOAD:./k.so cp -a file_src file_dst || fail=1 # Existing file with SELinux context optionally included -LD_PRELOAD=./k.so cp -a file_src file_dst || fail=1 +LD_PRELOAD=$LD_PRELOAD:./k.so cp -a file_src file_dst || fail=1 # ENODATA should give an immediate error when required to preserve ctx # This is debatable, and maybe we should not fail when no context available? -LD_PRELOAD=./k.so cp --preserve=context file_src file_dst && fail=1 +( export LD_PRELOAD=$LD_PRELOAD:./k.so + returns_ 1 cp --preserve=context file_src file_dst ) || fail=1 test -e preloaded || skip_ 'LD_PRELOAD interception failed' diff --git a/tests/cp/no-deref-link1.sh b/tests/cp/no-deref-link1.sh index 50a94d37..7206b24b 100755 --- a/tests/cp/no-deref-link1.sh +++ b/tests/cp/no-deref-link1.sh @@ -1,7 +1,7 @@ #!/bin/sh # cp from 3.16 fails this test -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/no-deref-link2.sh b/tests/cp/no-deref-link2.sh index cf07bf9e..87ab74c3 100755 --- a/tests/cp/no-deref-link2.sh +++ b/tests/cp/no-deref-link2.sh @@ -1,7 +1,7 @@ #!/bin/sh # cp from 3.16 fails this test -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/no-deref-link3.sh b/tests/cp/no-deref-link3.sh index a8416855..ea69e217 100755 --- a/tests/cp/no-deref-link3.sh +++ b/tests/cp/no-deref-link3.sh @@ -1,7 +1,7 @@ #!/bin/sh # cp from 3.16 fails this test -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/parent-perm-race.sh b/tests/cp/parent-perm-race.sh index b7ea9143..c370f9e0 100755 --- a/tests/cp/parent-perm-race.sh +++ b/tests/cp/parent-perm-race.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure cp -pR --parents isn't too generous with parent permissions. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This 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 @@ umask 002 mkdir mode ownership d || framework_failure_ chmod g+s d 2>/dev/null # The cp test is valid either way. +# Terminate any background cp process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } for attr in mode ownership do @@ -33,8 +35,7 @@ do # 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=$! + cp --preserve=$attr -R --copy-contents --parents $attr d & pid=$! ( # Now 'cp' is reading the fifo. @@ -58,7 +59,7 @@ do fail=1;; esac - wait $cp_pid || fail=1 + wait $pid || fail=1 done Exit $fail diff --git a/tests/cp/parent-perm.sh b/tests/cp/parent-perm.sh index 0a9c41e0..3b557b6d 100755 --- a/tests/cp/parent-perm.sh +++ b/tests/cp/parent-perm.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that cp --parents works properly with a preexisting dest. directory -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/perm.sh b/tests/cp/perm.sh index 8311cd21..a8b87977 100755 --- a/tests/cp/perm.sh +++ b/tests/cp/perm.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure the permission-preserving code in copy.c (mv, cp, install) works. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/preserve-2.sh b/tests/cp/preserve-2.sh index ac2fcf6a..9918e119 100755 --- a/tests/cp/preserve-2.sh +++ b/tests/cp/preserve-2.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that cp's --preserve=X,Y option is parsed properly -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/preserve-gid.sh b/tests/cp/preserve-gid.sh index f141ac14..89b88575 100755 --- a/tests/cp/preserve-gid.sh +++ b/tests/cp/preserve-gid.sh @@ -1,7 +1,7 @@ #!/bin/sh # Verify that cp -p preserves GID when it is possible. -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This 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,7 +117,8 @@ t1() { u=$1; shift g=$1; shift t0 "$f" "$u" "$g" \ - chroot --user=+$nameless_uid:+$nameless_gid1 \ + chroot --skip-chdir \ + --user=+$nameless_uid:+$nameless_gid1 \ --groups="+$nameless_gid1,+$nameless_gid2" \ / env PATH="$tmp_path" "$@" } diff --git a/tests/cp/preserve-link.sh b/tests/cp/preserve-link.sh index b7e4aa28..b0eb7de7 100755 --- a/tests/cp/preserve-link.sh +++ b/tests/cp/preserve-link.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise the fix for http://debbugs.gnu.org/8419 -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/preserve-mode.sh b/tests/cp/preserve-mode.sh index 3b36defc..c86c5503 100755 --- a/tests/cp/preserve-mode.sh +++ b/tests/cp/preserve-mode.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that cp's --no-preserve=mode works correctly -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/preserve-slink-time.sh b/tests/cp/preserve-slink-time.sh index c6c3548f..68114fa8 100755 --- a/tests/cp/preserve-slink-time.sh +++ b/tests/cp/preserve-slink-time.sh @@ -1,7 +1,7 @@ #!/bin/sh # Verify that cp -Pp preserves times even on symlinks. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/proc-short-read.sh b/tests/cp/proc-short-read.sh index bd665620..5dbf8fd5 100755 --- a/tests/cp/proc-short-read.sh +++ b/tests/cp/proc-short-read.sh @@ -1,7 +1,7 @@ #!/bin/sh # exercise cp's short-read failure when operating on >4KB files in /proc -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/proc-zero-len.sh b/tests/cp/proc-zero-len.sh index 3fcd5aab..33006b14 100755 --- a/tests/cp/proc-zero-len.sh +++ b/tests/cp/proc-zero-len.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that cp copies contents of non-empty "regular" file with st_size==0 -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This 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 @@ cat $f > out || fail=1 # number of the file changed during the cp run. cp $f exp 2>err \ || { fail=1; - grep 'replaced while being copied' \ + grep 'replaced while being copied' err \ && skip_ "File $f is being replaced while being copied"; } # Don't simply compare contents; they might differ, diff --git a/tests/cp/r-vs-symlink.sh b/tests/cp/r-vs-symlink.sh index 9398c9b4..bc2ef360 100755 --- a/tests/cp/r-vs-symlink.sh +++ b/tests/cp/r-vs-symlink.sh @@ -1,7 +1,7 @@ #!/bin/sh # cp -r should not create symlinks. Fixed in fileutils-4.1.5. -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/reflink-auto.sh b/tests/cp/reflink-auto.sh index a16fdc66..b0464a2e 100755 --- a/tests/cp/reflink-auto.sh +++ b/tests/cp/reflink-auto.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test cp --reflink=auto -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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 @@ 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 +returns_ 1 cp --reflink "$a_other" b || fail=1 # --reflink=auto should fall back to a normal copy cp --reflink=auto "$a_other" b || fail=1 diff --git a/tests/cp/reflink-perm.sh b/tests/cp/reflink-perm.sh index 52f5e257..7160f46d 100755 --- a/tests/cp/reflink-perm.sh +++ b/tests/cp/reflink-perm.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test cp --reflink copies permissions -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/same-file.sh b/tests/cp/same-file.sh index f62a9a72..47c6507c 100755 --- a/tests/cp/same-file.sh +++ b/tests/cp/same-file.sh @@ -2,7 +2,7 @@ # Test some of cp's options and how cp handles situations in # which a naive implementation might overwrite the source file. -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This 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 @@ ln dangling-slink hard-link > /dev/null 2>&1 \ 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='/^0 -[bf]*l .*sl1 ->/d; /hlsl/d' \ || remove_these_sed='/^ELIDE NO TEST OUTPUT/d' exec 3>&1 1> actual @@ -44,7 +44,8 @@ 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 args in 'foo symlink' 'symlink foo' 'foo foo' 'sl1 sl2' \ + 'foo hardlink' 'hlsl sl2'; 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 @@ -76,6 +77,8 @@ for args in 'foo symlink' 'symlink foo' 'foo foo' 'sl1 sl2' 'foo hardlink'; do continue ;; 'yes:sl1 sl2:-bfl') continue ;; + yes:hlsl*) + continue ;; esac rm -rf dir @@ -86,6 +89,7 @@ for args in 'foo symlink' 'symlink foo' 'foo foo' 'sl1 sl2' 'foo hardlink'; do 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 + case "$args" in *hlsl*) ln sl2 hlsl;; esac ( ( # echo 1>&2 cp $options $args @@ -211,6 +215,24 @@ cat <<\EOF | sed "$remove_these_sed" > expected 0 -bfl (foo hardlink) 0 -bdfl (foo hardlink) +1 [cp: 'hlsl' and 'sl2' are the same file] (foo hlsl -> foo sl2 -> foo) +0 -d (foo hlsl -> foo sl2 -> foo) +1 -f [cp: 'hlsl' and 'sl2' are the same file] (foo hlsl -> foo sl2 -> foo) +0 -df (foo hlsl -> foo sl2 -> foo) +0 --rem (foo hlsl -> foo sl2) +0 -b (foo hlsl -> foo sl2 sl2.~1~ -> foo) +0 -bd (foo hlsl -> foo sl2 -> foo sl2.~1~ -> foo) +0 -bf (foo hlsl -> foo sl2 sl2.~1~ -> foo) +0 -bdf (foo hlsl -> foo sl2 -> foo sl2.~1~ -> foo) +1 -l [cp: cannot create hard link 'sl2' to 'hlsl'] (foo hlsl -> foo sl2 -> foo) +0 -dl (foo hlsl -> foo sl2 -> foo) +0 -fl (foo hlsl -> foo sl2) +0 -dfl (foo hlsl -> foo sl2 -> foo) +0 -bl (foo hlsl -> foo sl2 sl2.~1~ -> foo) +0 -bdl (foo hlsl -> foo sl2 -> foo) +0 -bfl (foo hlsl -> foo sl2 sl2.~1~ -> foo) +0 -bdfl (foo hlsl -> foo sl2 -> foo) + EOF exec 1>&3 3>&- diff --git a/tests/cp/slink-2-slink.sh b/tests/cp/slink-2-slink.sh index 19a28621..65cce9e6 100755 --- a/tests/cp/slink-2-slink.sh +++ b/tests/cp/slink-2-slink.sh @@ -2,7 +2,7 @@ # 'test cp --update A B' where A and B are both symlinks that point # to the same file -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/sparse-fiemap.sh b/tests/cp/sparse-fiemap.sh index 7aa24715..ac6ea3c7 100755 --- a/tests/cp/sparse-fiemap.sh +++ b/tests/cp/sparse-fiemap.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test cp --sparse=always through fiemap copy -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/sparse-to-pipe.sh b/tests/cp/sparse-to-pipe.sh index b800e069..2c3dcefb 100755 --- a/tests/cp/sparse-to-pipe.sh +++ b/tests/cp/sparse-to-pipe.sh @@ -1,7 +1,7 @@ #!/bin/sh # copy a sparse file to a pipe, to exercise some seldom-used parts of copy.c -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This 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,14 +21,17 @@ print_ver_ cp require_sparse_support_ +# Terminate any background cp process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + mkfifo_or_skip_ pipe -timeout 10 cat pipe > copy & +timeout 10 cat pipe > copy & pid=$! truncate -s1M sparse || framework_failure_ cp sparse pipe || fail=1 # Ensure that the cat has completed before comparing. -wait +wait $pid cmp sparse copy || fail=1 diff --git a/tests/cp/sparse.sh b/tests/cp/sparse.sh index d6cc4c4b..958de830 100755 --- a/tests/cp/sparse.sh +++ b/tests/cp/sparse.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test cp --sparse=always -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This 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,40 @@ cp --sparse=always sparse copy || fail=1 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 +returns_ 1 cp --sparse=always --reflink sparse copy || fail=1 +returns_ 1 cp --sparse=never --reflink sparse copy || fail=1 + + +# Ensure we handle sparse/non-sparse transitions correctly +maxn=128 # how many $hole_size chunks per file +hole_size=$(stat -c %o copy) +dd if=/dev/zero bs=$hole_size count=$maxn of=zeros || framework_failure_ +tr '\0' 'U' < zeros > nonzero || framework_failure_ + +for pattern in 1 0; do + test "$pattern" = 1 && pattern="$(printf '%s\n%s' nonzero zeros)" + test "$pattern" = 0 && pattern="$(printf '%s\n%s' zeros nonzero)" + + for n in 1 2 4 11 32 $maxn; do + parts=$(expr $maxn / $n) + + rm -f sparse.in + + # Generate non sparse file for copying with alternating + # hole/data patterns of size n * $hole_size + for i in $(yes "$pattern" | head -n$parts); do + dd iflag=fullblock if=$i of=sparse.in conv=notrunc oflag=append \ + bs=$hole_size count=$n status=none || framework_failure_ + done + + cp --sparse=always sparse.in sparse.out || fail=1 # non sparse input + cp --sparse=always sparse.out sparse.out2 || fail=1 # sparse input + + cmp sparse.in sparse.out || fail=1 + cmp sparse.in sparse.out2 || fail=1 + + ls -lsh sparse.* + done +done Exit $fail diff --git a/tests/cp/special-bits.sh b/tests/cp/special-bits.sh index a55eea21..ec17ccec 100755 --- a/tests/cp/special-bits.sh +++ b/tests/cp/special-bits.sh @@ -2,7 +2,7 @@ # make sure 'cp -p' preserves special bits # This works only when run as root. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,7 +42,8 @@ set _ $(ls -l b); shift; p1=$1 set _ $(ls -l b2); shift; p2=$1 test $p1 = $p2 || fail=1 -chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" cp -p c c2 || fail=1 +chroot --skip-chdir --user=$NON_ROOT_USERNAME / env PATH="$PATH" cp -p c c2 \ + || fail=1 set _ $(ls -l c); shift; p1=$1 set _ $(ls -l c2); shift; p2=$1 test $p1 = $p2 && fail=1 diff --git a/tests/cp/special-f.sh b/tests/cp/special-f.sh index ee01bb33..2217c675 100755 --- a/tests/cp/special-f.sh +++ b/tests/cp/special-f.sh @@ -2,7 +2,7 @@ # Ensure that "cp -Rf fifo E" unlinks E and retries. # Up until coreutils-6.10.171, it would not. -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/src-base-dot.sh b/tests/cp/src-base-dot.sh index 599f4cdc..75aa62e0 100755 --- a/tests/cp/src-base-dot.sh +++ b/tests/cp/src-base-dot.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that "mkdir x y; cd y; cp -ab ../x/. ." is a successful, silent, no-op. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/symlink-slash.sh b/tests/cp/symlink-slash.sh index 1ae846b6..ee70b77e 100755 --- a/tests/cp/symlink-slash.sh +++ b/tests/cp/symlink-slash.sh @@ -2,7 +2,7 @@ # Make sure that cp -dR dereferences a symlink arg if its name is # written with a trailing slash. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cp/thru-dangling.sh b/tests/cp/thru-dangling.sh index f4a609d5..bd8e7084 100755 --- a/tests/cp/thru-dangling.sh +++ b/tests/cp/thru-dangling.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that cp works as documented, when the destination is a dangling symlink -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/d_type-check b/tests/d_type-check index 33c1fd6d..ff1eb60b 100644 --- a/tests/d_type-check +++ b/tests/d_type-check @@ -5,7 +5,7 @@ import sys fail = 1 try: - import ctypes + import ctypes.util (DT_UNKNOWN, DT_DIR,) = (0, 4,) @@ -19,8 +19,7 @@ try: direntp = ctypes.POINTER(dirent) - # FIXME: find a way to avoid hard-coding libc's so-name. - libc = ctypes.cdll.LoadLibrary("libc.so.6") + libc = ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True) libc.readdir.restype = direntp dirp = libc.opendir(".") diff --git a/tests/dd/ascii.sh b/tests/dd/ascii.sh index 7dc39cc9..be6494a0 100755 --- a/tests/dd/ascii.sh +++ b/tests/dd/ascii.sh @@ -1,7 +1,7 @@ #!/bin/sh # test conv=ascii -# Copyright (C) 2014 Free Software Foundation, Inc. +# Copyright (C) 2014-2015 Free Software Foundation, Inc. # This 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,45 +21,46 @@ print_ver_ dd { # Two lines, EBCDIC " A A" and " A ", followed by all the bytes in order. - printf '\100\301\100\301\100\301\100\100' && - printf $(printf '\\%03o' $(seq 0 255)); + env printf '\100\301\100\301\100\301\100\100' && + env printf $(env printf '\\%03o' $(seq 0 255)); } >in || framework_failure_ { # The converted lines, with trailing spaces removed. - printf ' A A\n A\n' && - printf '\000\001\002\003\n\234\011\206\177\n' && - printf '\227\215\216\013\n\014\015\016\017\n' && - printf '\020\021\022\023\n\235\205\010\207\n' && - printf '\030\031\222\217\n\034\035\036\037\n' && - printf '\200\201\202\203\n\204\012\027\033\n' && - printf '\210\211\212\213\n\214\005\006\007\n' && - printf '\220\221\026\223\n\224\225\226\004\n' && - printf '\230\231\232\233\n\024\025\236\032\n' && - printf '\040\240\241\242\n\243\244\245\246\n' && - printf '\247\250\325\056\n\074\050\053\174\n' && - printf '\046\251\252\253\n\254\255\256\257\n' && - printf '\260\261\041\044\n\052\051\073\176\n' && - printf '\055\057\262\263\n\264\265\266\267\n' && - printf '\270\271\313\054\n\045\137\076\077\n' && - printf '\272\273\274\275\n\276\277\300\301\n' && - printf '\302\140\072\043\n\100\047\075\042\n' && - printf '\303\141\142\143\n\144\145\146\147\n' && - printf '\150\151\304\305\n\306\307\310\311\n' && - printf '\312\152\153\154\n\155\156\157\160\n' && - printf '\161\162\136\314\n\315\316\317\320\n' && - printf '\321\345\163\164\n\165\166\167\170\n' && - printf '\171\172\322\323\n\324\133\326\327\n' && - printf '\330\331\332\333\n\334\335\336\337\n' && - printf '\340\341\342\343\n\344\135\346\347\n' && - printf '\173\101\102\103\n\104\105\106\107\n' && - printf '\110\111\350\351\n\352\353\354\355\n' && - printf '\175\112\113\114\n\115\116\117\120\n' && - printf '\121\122\356\357\n\360\361\362\363\n' && - printf '\134\237\123\124\n\125\126\127\130\n' && - printf '\131\132\364\365\n\366\367\370\371\n' && - printf '\060\061\062\063\n\064\065\066\067\n' && - printf '\070\071\372\373\n\374\375\376\377\n'; +env printf \ +' A A\n A\n'\ +'\000\001\002\003\n\234\011\206\177\n'\ +'\227\215\216\013\n\014\015\016\017\n'\ +'\020\021\022\023\n\235\205\010\207\n'\ +'\030\031\222\217\n\034\035\036\037\n'\ +'\200\201\202\203\n\204\012\027\033\n'\ +'\210\211\212\213\n\214\005\006\007\n'\ +'\220\221\026\223\n\224\225\226\004\n'\ +'\230\231\232\233\n\024\025\236\032\n'\ +'\040\240\241\242\n\243\244\245\246\n'\ +'\247\250\325\056\n\074\050\053\174\n'\ +'\046\251\252\253\n\254\255\256\257\n'\ +'\260\261\041\044\n\052\051\073\176\n'\ +'\055\057\262\263\n\264\265\266\267\n'\ +'\270\271\313\054\n\045\137\076\077\n'\ +'\272\273\274\275\n\276\277\300\301\n'\ +'\302\140\072\043\n\100\047\075\042\n'\ +'\303\141\142\143\n\144\145\146\147\n'\ +'\150\151\304\305\n\306\307\310\311\n'\ +'\312\152\153\154\n\155\156\157\160\n'\ +'\161\162\136\314\n\315\316\317\320\n'\ +'\321\345\163\164\n\165\166\167\170\n'\ +'\171\172\322\323\n\324\133\326\327\n'\ +'\330\331\332\333\n\334\335\336\337\n'\ +'\340\341\342\343\n\344\135\346\347\n'\ +'\173\101\102\103\n\104\105\106\107\n'\ +'\110\111\350\351\n\352\353\354\355\n'\ +'\175\112\113\114\n\115\116\117\120\n'\ +'\121\122\356\357\n\360\361\362\363\n'\ +'\134\237\123\124\n\125\126\127\130\n'\ +'\131\132\364\365\n\366\367\370\371\n'\ +'\060\061\062\063\n\064\065\066\067\n'\ +'\070\071\372\373\n\374\375\376\377\n'; } >exp || framework_failure_ dd if=in of=out conv=ascii cbs=4 || fail=1 diff --git a/tests/dd/bytes.sh b/tests/dd/bytes.sh index 1b72cc4c..68e98f7a 100755 --- a/tests/dd/bytes.sh +++ b/tests/dd/bytes.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/dd/direct.sh b/tests/dd/direct.sh index f6065cae..6b741472 100755 --- a/tests/dd/direct.sh +++ b/tests/dd/direct.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that dd's oflag=direct works -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/dd/misc.sh b/tests/dd/misc.sh index f877fddf..bc5fb37e 100755 --- a/tests/dd/misc.sh +++ b/tests/dd/misc.sh @@ -2,7 +2,7 @@ # Ensure dd treats '--' properly. # Also test some flag values. -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # This 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,9 +35,12 @@ dd status=none if=$tmp_in of=/dev/null 2> err || fail=1 compare /dev/null err || fail=1 dd status=none if=$tmp_in skip=2 of=/dev/null 2> err || fail=1 compare /dev/null err || fail=1 -# check status=none is cumulative with status=noxfer -dd status=none status=noxfer if=$tmp_in of=/dev/null 2> err || fail=1 +# check later status=none overrides earlier status=noxfer +dd status=noxfer status=none if=$tmp_in of=/dev/null 2> err || fail=1 compare /dev/null err || fail=1 +# check later status=noxfer overrides earlier status=none +dd status=none status=noxfer if=$tmp_in of=/dev/null 2> err || fail=1 +compare /dev/null err && fail=1 dd if=$tmp_in of=$tmp_out 2> /dev/null || fail=1 compare $tmp_in $tmp_out || fail=1 @@ -58,12 +61,12 @@ case $(cat /dev/stdin <$tmp_in 2>/dev/null) in 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 + returns_ 1 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 + returns_ 1 dd iflag=directory count=0 <$tmp_in 2> /dev/null || fail=1 fi old_ls=$(ls -u --full-time $tmp_in) @@ -84,8 +87,8 @@ EOF 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 + returns_ 1 dd iflag=nolinks if=$tmp_in > /dev/null 2>&1 || fail=1 + returns_ 1 dd iflag=nolinks < $tmp_in > /dev/null 2>&1 || fail=1 dd oflag=nolinks < $tmp_in > $tmp_out 2>&1 || fail=1 fi diff --git a/tests/dd/no-allocate.sh b/tests/dd/no-allocate.sh index 62170b9b..99e0542a 100755 --- a/tests/dd/no-allocate.sh +++ b/tests/dd/no-allocate.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure that dd doesn't allocate memory unnecessarily -# Copyright (C) 2013-2014 Free Software Foundation, Inc. +# Copyright (C) 2013-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/dd/nocache.sh b/tests/dd/nocache.sh index 4756663d..e7fdf4e5 100755 --- a/tests/dd/nocache.sh +++ b/tests/dd/nocache.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure dd handles the 'nocache' flag -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This 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,10 +23,10 @@ print_ver_ dd 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 +dd count=0 | returns_ 1 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 +returns_ 1 dd iflag=nocache,direct if=/dev/null || fail=1 # The rest ensure that the documented uses cases # proceed without error diff --git a/tests/dd/not-rewound.sh b/tests/dd/not-rewound.sh index 4b38c216..beaf6403 100755 --- a/tests/dd/not-rewound.sh +++ b/tests/dd/not-rewound.sh @@ -2,7 +2,7 @@ # Make sure dd does the right thing when the input file descriptor # is not rewound. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/dd/reblock.sh b/tests/dd/reblock.sh index ccae9459..cd9d9420 100755 --- a/tests/dd/reblock.sh +++ b/tests/dd/reblock.sh @@ -1,7 +1,7 @@ #!/bin/sh # test dd reblocking vs. bs= -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/dd/skip-seek-past-dev.sh b/tests/dd/skip-seek-past-dev.sh index 5eb7ab5a..216898c4 100755 --- a/tests/dd/skip-seek-past-dev.sh +++ b/tests/dd/skip-seek-past-dev.sh @@ -1,7 +1,7 @@ #!/bin/sh # test diagnostics are printed immediately when seeking beyond device. -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/dd/skip-seek-past-file.sh b/tests/dd/skip-seek-past-file.sh index 8ed1d3f6..2e15a84d 100755 --- a/tests/dd/skip-seek-past-file.sh +++ b/tests/dd/skip-seek-past-file.sh @@ -1,7 +1,7 @@ #!/bin/sh # test diagnostics are printed when seeking too far in seekable files. -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/dd/skip-seek.pl b/tests/dd/skip-seek.pl index e2a7d022..6bacf67d 100755 --- a/tests/dd/skip-seek.pl +++ b/tests/dd/skip-seek.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test dd's skip and seek options. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/dd/skip-seek2.sh b/tests/dd/skip-seek2.sh index aa6d65dd..62d08f07 100755 --- a/tests/dd/skip-seek2.sh +++ b/tests/dd/skip-seek2.sh @@ -2,7 +2,7 @@ # show how to skip an amount that is smaller than the nominal block size. # There's a more realistic example in the documentation. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/dd/sparse.sh b/tests/dd/sparse.sh index a7e90d2b..626b4059 100755 --- a/tests/dd/sparse.sh +++ b/tests/dd/sparse.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This 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,7 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ dd +is_local_dir_ . || very_expensive_ require_sparse_support_ # Ensure basic sparse generation works @@ -50,6 +51,9 @@ dd if=/dev/zero of=file.in bs=1M count=1 seek=1 conv=notrunc || fail=1 kb_alloc() { du -k "$1"|cut -f1; } +# sync out data for async allocators like NFS/BTRFS +# sync file.in || fail=1 + # 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 @@ -58,7 +62,10 @@ 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 + dd if=file.in of=file.out bs=2M conv=sparse || fail=1 + + # Intermittently BTRFS returns 0 allocation for file.out unless synced + sync file.out || framework_failure_ test 2500 -lt $(kb_alloc file.out) || fail=1 # Note we recreate a sparse file first to avoid diff --git a/tests/dd/stats.sh b/tests/dd/stats.sh new file mode 100755 index 00000000..a82c66d2 --- /dev/null +++ b/tests/dd/stats.sh @@ -0,0 +1,73 @@ +#!/bin/sh +# Check stats output for SIG{INFO,USR1} and status=progress + +# Copyright (C) 2014-2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ dd + +env kill -l | grep '^INFO$' && SIGINFO='INFO' || SIGINFO='USR1' + +# This to avoid races in the USR1 case +# as the dd process will terminate by default until +# it has its handler enabled. +trap '' $SIGINFO + +mkfifo_or_skip_ fifo + +# Terminate any background processes +cleanup_() +{ + kill $pid 2>/dev/null + kill $pid2 2>/dev/null + wait +} + +for open in '' '1'; do + # Run dd with the fullblock iflag to avoid short reads + # which can be triggered by reception of signals + dd iflag=fullblock if=/dev/zero of=fifo count=50 bs=5000000 2>err & pid=$! + + # Note if we sleep here we give dd a chance to exec and block on open. + # Otherwise we're probably testing SIG_IGN in the forked shell or early dd. + test "$open" && sleep .1 + + # dd will block on open until fifo is opened for reading. + # Timeout in case dd goes away erroneously which we check for below. + timeout 20 sh -c 'wc -c < fifo > nwritten' & pid2=$! + + # Send lots of signals immediately to ensure dd not killed due + # to race setting handler, or blocking on open of fifo. + # Many signals also check that short reads are handled. + until ! kill -s $SIGINFO $pid 2>/dev/null; do + sleep .01 + done + + wait + + # Ensure all data processed and at least last status written + grep '250000000 bytes .* copied' err || { cat err; fail=1; } +done + +progress_output() +{ + { sleep "$1"; echo 1; } | dd bs=1 status=progress of=/dev/null 2>err + # Progress output should be for "byte ... copied", while final is "bytes ..." + grep 'byte .* copied' err +} +retry_delay_ progress_output 1 4 || { cat err; fail=1; } + +Exit $fail diff --git a/tests/dd/stderr.sh b/tests/dd/stderr.sh index d0a304a7..82ab08f1 100755 --- a/tests/dd/stderr.sh +++ b/tests/dd/stderr.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure dd recognizes failure to write to stderr. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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,12 @@ dd --help >/dev/null 2>&- || fail=1 # 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 + : | returns_ 1 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 + : | returns_ 1 dd 2>/dev/full || fail=1 fi Exit $fail diff --git a/tests/dd/unblock-sync.sh b/tests/dd/unblock-sync.sh index 72fd2ab0..751cefdf 100755 --- a/tests/dd/unblock-sync.sh +++ b/tests/dd/unblock-sync.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that dd conv=unblock,sync works. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/dd/unblock.pl b/tests/dd/unblock.pl index 586b7b4d..1e6a47d1 100755 --- a/tests/dd/unblock.pl +++ b/tests/dd/unblock.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Exercise dd's conv=unblock mode -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/df/df-P.sh b/tests/df/df-P.sh index aff6e1b5..f40da30a 100755 --- a/tests/df/df-P.sh +++ b/tests/df/df-P.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that df -P is not affected by BLOCK_SIZE settings -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/df/df-output.sh b/tests/df/df-output.sh index b2715885..d81f0ee4 100755 --- a/tests/df/df-output.sh +++ b/tests/df/df-output.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise df's --output option. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -93,7 +93,7 @@ EOF df -B1K --output=size '.' >out || fail=1 sed -e '1 { - s/ // + s/ *// q }' out > out2 compare exp out2 || fail=1 diff --git a/tests/df/df-symlink.sh b/tests/df/df-symlink.sh index 6d96bd2a..b5930978 100755 --- a/tests/df/df-symlink.sh +++ b/tests/df/df-symlink.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that df dereferences symlinks to disk nodes -# Copyright (C) 2013-2014 Free Software Foundation, Inc. +# Copyright (C) 2013-2015 Free Software Foundation, Inc. # This 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 @@ compare exp out || fail=1 # Ensure we output the same values for device nodes and '.' # This was not the case in coreutil-8.22 on systems # where the device in the mount list was a symlink itself. -# I.E. '.' => /dev/mapper/fedora-home -> /dev/dm-2 +# I.e., '.' => /dev/mapper/fedora-home -> /dev/dm-2 df --out=source,target '.' > out || fail=1 compare exp out || fail=1 diff --git a/tests/df/header.sh b/tests/df/header.sh index 664ef800..d315a33f 100755 --- a/tests/df/header.sh +++ b/tests/df/header.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that "df ." outputs a header. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/df/no-mtab-status.sh b/tests/df/no-mtab-status.sh index 9ea2036d..c35da6b8 100755 --- a/tests/df/no-mtab-status.sh +++ b/tests/df/no-mtab-status.sh @@ -2,7 +2,7 @@ # Test df's behaviour when the mount list cannot be read. # This test is skipped on systems that lack LD_PRELOAD support; that's fine. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,7 +21,8 @@ print_ver_ df require_gcc_shared_ -df || skip_ "df fails" +# Protect against inaccessible remote mounts etc. +timeout 10 df || skip_ "df fails" grep '^#define HAVE_MNTENT_H 1' $CONFIG_HEADER > /dev/null \ || skip_ "no mntent.h available to confirm the interface" @@ -30,10 +31,43 @@ grep '^#define HAVE_GETMNTENT 1' $CONFIG_HEADER > /dev/null \ || skip_ "getmntent is not used on this system" # Simulate "mtab" failure. -cat > k.c <<'EOF' || framework_failure_ +cat > k.c < #include #include +#include +#include + +#define STREQ(a, b) (strcmp (a, b) == 0) + +FILE* fopen(const char *path, const char *mode) +{ + static FILE* (*fopen_func)(char const *, char const *); + + /* get reference to original (libc provided) fopen */ + if (!fopen_func) + { + fopen_func = (FILE*(*)(char const *, char const *)) + dlsym(RTLD_NEXT, "fopen"); + if (!fopen_func) + { + fprintf (stderr, "Failed to find fopen()\n"); + errno = ESRCH; + return NULL; + } + } + + /* Returning ENOENT here will get read_file_system_list() + to fall back to using getmntent() below. */ + if (STREQ (path, "/proc/self/mountinfo")) + { + errno = ENOENT; + return NULL; + } + else + return fopen_func(path, mode); +} struct mntent *getmntent (FILE *fp) { @@ -54,34 +88,38 @@ EOF gcc_shared_ k.c k.so \ || framework_failure_ 'failed to build shared library' +cleanup_() { unset LD_PRELOAD; } + +export LD_PRELOAD=$LD_PRELOAD:./k.so + # Test if LD_PRELOAD works: -LD_PRELOAD=./k.so df +df 2>/dev/null 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 +df '.' || fail=1 +df -i '.' || fail=1 +df -T '.' || fail=1 +df -Ti '.' || fail=1 +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 +returns_ 1 df || fail=1 +returns_ 1 df -i || fail=1 +returns_ 1 df -T || fail=1 +returns_ 1 df -Ti || fail=1 +returns_ 1 df --total || fail=1 -LD_PRELOAD=./k.so df -a && fail=1 -LD_PRELOAD=./k.so df -a '.' && fail=1 +returns_ 1 df -a || fail=1 +returns_ 1 df -a '.' || fail=1 -LD_PRELOAD=./k.so df -l && fail=1 -LD_PRELOAD=./k.so df -l '.' && fail=1 +returns_ 1 df -l || fail=1 +returns_ 1 df -l '.' || fail=1 -LD_PRELOAD=./k.so df -t hello && fail=1 -LD_PRELOAD=./k.so df -t hello '.' && fail=1 +returns_ 1 df -t hello || fail=1 +returns_ 1 df -t hello '.' || fail=1 -LD_PRELOAD=./k.so df -x hello && fail=1 -LD_PRELOAD=./k.so df -x hello '.' && fail=1 +returns_ 1 df -x hello || fail=1 +returns_ 1 df -x hello '.' || fail=1 Exit $fail diff --git a/tests/df/over-mount-device.sh b/tests/df/over-mount-device.sh index a85ce8db..82eab4bd 100755 --- a/tests/df/over-mount-device.sh +++ b/tests/df/over-mount-device.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that df /dev/loop0 errors out if overmounted by another device -# Copyright (C) 2014 Free Software Foundation, Inc. +# Copyright (C) 2014-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/df/problematic-chars.sh b/tests/df/problematic-chars.sh index bdabf0c0..eb938f6b 100755 --- a/tests/df/problematic-chars.sh +++ b/tests/df/problematic-chars.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that df outputs one line per entry -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/df/skip-duplicates.sh b/tests/df/skip-duplicates.sh index 52b9014a..40696047 100755 --- a/tests/df/skip-duplicates.sh +++ b/tests/df/skip-duplicates.sh @@ -2,7 +2,7 @@ # Test df's behavior when the mount list contains duplicate entries. # This test is skipped on systems that lack LD_PRELOAD support; that's fine. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This 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,10 +23,15 @@ require_gcc_shared_ # We use --local here so as to not activate # potentially very many remote mounts. -df --local || skip_ "df fails" +df --local || skip_ 'df fails' export CU_NONROOT_FS=$(df --local --output=target 2>&1 | grep /. | head -n1) -test -z "$CU_NONROOT_FS" && unique_entries=1 || unique_entries=2 +export CU_REMOTE_FS=$(df --local --output=target 2>&1 | grep /. | + tail -n+2 | head -n1) + +unique_entries=1 +test -z "$CU_NONROOT_FS" || unique_entries=$(expr $unique_entries + 1) +test -z "$CU_REMOTE_FS" || unique_entries=$(expr $unique_entries + 2) grep '^#define HAVE_MNTENT_H 1' $CONFIG_HEADER > /dev/null \ || skip_ "no mntent.h available to confirm the interface" @@ -35,17 +40,51 @@ grep '^#define HAVE_GETMNTENT 1' $CONFIG_HEADER > /dev/null \ || skip_ "getmntent is not used on this system" # Simulate an mtab file to test various cases. -cat > k.c <<'EOF' || framework_failure_ +cat > k.c < #include -#include +#include #include +#include +#include + +#define STREQ(a, b) (strcmp (a, b) == 0) + +FILE* fopen(const char *path, const char *mode) +{ + static FILE* (*fopen_func)(char const *, char const *); + + /* get reference to original (libc provided) fopen */ + if (!fopen_func) + { + fopen_func = (FILE*(*)(char const *, char const *)) + dlsym(RTLD_NEXT, "fopen"); + if (!fopen_func) + { + fprintf (stderr, "Failed to find fopen()\n"); + errno = ESRCH; + return NULL; + } + } + + /* Returning ENOENT here will get read_file_system_list() + to fall back to using getmntent() below. */ + if (STREQ (path, "/proc/self/mountinfo")) + { + errno = ENOENT; + return NULL; + } + else + return fopen_func(path, mode); +} #define STREQ(a, b) (strcmp (a, b) == 0) struct mntent *getmntent (FILE *fp) { static char *nonroot_fs; + static char *remote_fs; static int done; /* Prove that LD_PRELOAD works. */ @@ -56,13 +95,16 @@ struct mntent *getmntent (FILE *fp) } static struct mntent mntents[] = { - {.mnt_fsname="/short", .mnt_dir="/invalid/mount/dir"}, - {.mnt_fsname="fsname", .mnt_dir="/",}, - {.mnt_fsname="/fsname", .mnt_dir="/."}, - {.mnt_fsname="/fsname", .mnt_dir="/"}, - {.mnt_fsname="virtfs", .mnt_dir="/NONROOT", .mnt_type="fstype1"}, - {.mnt_fsname="virtfs2", .mnt_dir="/NONROOT", .mnt_type="fstype2"}, - {.mnt_fsname="netns", .mnt_dir="net:[1234567]"}, + {.mnt_fsname="/short", .mnt_dir="/invalid/mount/dir", .mnt_opts=""}, + {.mnt_fsname="fsname", .mnt_dir="/", .mnt_opts=""}, + {.mnt_fsname="/fsname", .mnt_dir="/.", .mnt_opts=""}, + {.mnt_fsname="/fsname", .mnt_dir="/", .mnt_opts=""}, + {.mnt_fsname="virtfs", .mnt_dir="/NONROOT", .mnt_type="t1", .mnt_opts=""}, + {.mnt_fsname="virtfs2", .mnt_dir="/NONROOT", .mnt_type="t2", .mnt_opts=""}, + {.mnt_fsname="netns", .mnt_dir="net:[1234567]", .mnt_opts=""}, + {.mnt_fsname="rem:ote1",.mnt_dir="/REMOTE", .mnt_opts=""}, + {.mnt_fsname="rem:ote1",.mnt_dir="/REMOTE", .mnt_opts=""}, + {.mnt_fsname="rem:ote2",.mnt_dir="/REMOTE", .mnt_opts=""}, }; if (done == 1) @@ -70,17 +112,28 @@ struct mntent *getmntent (FILE *fp) nonroot_fs = getenv ("CU_NONROOT_FS"); if (!nonroot_fs || !*nonroot_fs) nonroot_fs = "/"; /* merge into / entries. */ + + remote_fs = getenv ("CU_REMOTE_FS"); } if (done == 1 && !getenv ("CU_TEST_DUPE_INVALID")) done++; /* skip the first entry. */ - while (done++ <= 7) + while (done++ <= 10) { if (!mntents[done-2].mnt_type) mntents[done-2].mnt_type = "-"; + if (!mntents[done-2].mnt_opts) + mntents[done-2].mnt_opts = "-"; if (STREQ (mntents[done-2].mnt_dir, "/NONROOT")) mntents[done-2].mnt_dir = nonroot_fs; + if (STREQ (mntents[done-2].mnt_dir, "/REMOTE")) + { + if (!remote_fs || !*remote_fs) + continue; + else + mntents[done-2].mnt_dir = remote_fs; + } return &mntents[done-2]; } @@ -93,17 +146,23 @@ gcc_shared_ k.c k.so \ || framework_failure_ 'failed to build shared library' # Test if LD_PRELOAD works: -LD_PRELOAD=./k.so df +LD_PRELOAD=$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 entries # having the same device number; thus the output should # consist of a header and unique entries. -LD_PRELOAD=./k.so df -T >out || fail=1 +LD_PRELOAD=$LD_PRELOAD:./k.so df -T >out || fail=1 test $(wc -l out || fail=1 +test "$CU_REMOTE_FS" && elide_remote=1 || elide_remote=0 +test $(wc -l out || fail=1 +LD_PRELOAD=$LD_PRELOAD:./k.so CU_TEST_DUPE_INVALID=1 df -T >out || fail=1 test $(wc -l out || fail=1 -test $(wc -l out || fail=1 +total_fs=6; test "$CU_REMOTE_FS" && total_fs=$(expr $total_fs + 3) +test $(wc -l out || fail=1 -grep '^rootfs' out || skip_ "no rootfs in mtab" +grep '^rootfs' out || skip_ 'no rootfs in mtab' # Ensure that rootfs is suppressed when no options is specified. df >out || fail=1 @@ -32,7 +35,7 @@ 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 +returns_ 1 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" diff --git a/tests/df/total-unprocessed.sh b/tests/df/total-unprocessed.sh index 9b17c8aa..9779471d 100755 --- a/tests/df/total-unprocessed.sh +++ b/tests/df/total-unprocessed.sh @@ -2,7 +2,7 @@ # Ensure that df exits non-Zero and writes an error message when # --total is used but no file system has been processed. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/df/total-verify.sh b/tests/df/total-verify.sh index 63cbe8f7..ba50b03c 100755 --- a/tests/df/total-verify.sh +++ b/tests/df/total-verify.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure "df --total" computes accurate totals -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,7 +20,8 @@ print_ver_ df require_perl_ -df || skip_ "df fails" +# Protect against inaccessible remote mounts etc. +timeout 10 df || skip_ "df fails" cat <<\EOF > check-df || framework_failure_ my ($total, $used, $avail) = (0, 0, 0); diff --git a/tests/df/unreadable.sh b/tests/df/unreadable.sh index 4ad23373..9e3da0ed 100755 --- a/tests/df/unreadable.sh +++ b/tests/df/unreadable.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that df can handle an unreadable argument -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/2g.sh b/tests/du/2g.sh index f766d4d9..12c2eede 100755 --- a/tests/du/2g.sh +++ b/tests/du/2g.sh @@ -3,7 +3,7 @@ # Before coreutils-5.93, on systems with a signed, 32-bit stat.st_blocks # one of du's computations would overflow. -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This 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,6 @@ 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. free_kb=$(df -k --output=avail . | tail -n1) @@ -42,16 +41,22 @@ test $min_kb -lt $free_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 + +if ! fallocate -l2G $big; then + rm -f $big + { + is_local_dir_ . || skip 'Not writing 2GB data to remote' + for i in $(seq 100); do + # Note: 2147483648 == 2^31. Print floor(2^31/100) per iteration. + printf %21474836s x || fail=1 + done + # After the final iteration, append the remaining 48 bytes. + printf %48s x || fail=1 + } > $big || fail=1 +fi + +# The allocation may be done asynchronously (BTRFS for example) +sync $big || framework_failure_ du -k $big > out1 || fail=1 rm -f $big diff --git a/tests/du/8gb.sh b/tests/du/8gb.sh index 399fe7e5..696dd9f0 100755 --- a/tests/du/8gb.sh +++ b/tests/du/8gb.sh @@ -2,7 +2,7 @@ # Ensure that du does not rely on narrow types like size_t for # file sizes or sums. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/basic.sh b/tests/du/basic.sh index 75bc9be1..b14a1b41 100755 --- a/tests/du/basic.sh +++ b/tests/du/basic.sh @@ -1,7 +1,7 @@ #!/bin/sh # Compare actual numbers from du, assuming block size matches mine. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/bigtime.sh b/tests/du/bigtime.sh index eebdeb04..ad484f81 100755 --- a/tests/du/bigtime.sh +++ b/tests/du/bigtime.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise du on a file with a big time stamp. -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/bind-mount-dir-cycle-v2.sh b/tests/du/bind-mount-dir-cycle-v2.sh new file mode 100755 index 00000000..f897098e --- /dev/null +++ b/tests/du/bind-mount-dir-cycle-v2.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# Check that du can handle sub-bind-mounts cycles as well. + +# Copyright (C) 2014-2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ du +require_root_ + +cleanup_() { umount a/b/c; } + +mkdir -p a/b/c || framework_failure_ +mount --bind a a/b/c \ + || skip_ 'This test requires mount with a working --bind option.' + +echo a/b/c > exp || framework_failure_ +echo a/b >> exp || framework_failure_ + +du a/b > out 2> err || fail=1 +sed 's/^[0-9][0-9]* //' out > k && mv k out + +compare /dev/null err || fail=1 +compare exp out || fail=1 + +Exit $fail diff --git a/tests/du/bind-mount-dir-cycle.sh b/tests/du/bind-mount-dir-cycle.sh index ac6bf2e2..88ae057a 100755 --- a/tests/du/bind-mount-dir-cycle.sh +++ b/tests/du/bind-mount-dir-cycle.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise du's new ability to handle bind-mount-induced dir cycles. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/deref-args.sh b/tests/du/deref-args.sh index 50e525a1..d35fe5bb 100755 --- a/tests/du/deref-args.sh +++ b/tests/du/deref-args.sh @@ -2,7 +2,7 @@ # Ensure that --dereference-args (-D) gives reasonable names. # This test would fail for coreutils-5.0.91. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/deref.sh b/tests/du/deref.sh index 543b7395..6c2a4724 100755 --- a/tests/du/deref.sh +++ b/tests/du/deref.sh @@ -4,7 +4,7 @@ # Also, up to coreutils-8.5, du -L sometimes incorrectly # counted the space of the followed symlinks. -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This 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 @@ ln -s nowhere dangle || framework_failure_ 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 +returns_ 1 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) diff --git a/tests/du/exclude.sh b/tests/du/exclude.sh index 26ba598e..c738a7a0 100755 --- a/tests/du/exclude.sh +++ b/tests/du/exclude.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure du's --exclude option works -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/fd-leak.sh b/tests/du/fd-leak.sh index ba8518e1..51eff9b4 100755 --- a/tests/du/fd-leak.sh +++ b/tests/du/fd-leak.sh @@ -1,7 +1,7 @@ #!/bin/sh # check for file descriptor leak -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/files0-from-dir.sh b/tests/du/files0-from-dir.sh index 67088434..2f55c4ed 100755 --- a/tests/du/files0-from-dir.sh +++ b/tests/du/files0-from-dir.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that du and wc handle --files0-from=DIR -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/files0-from.pl b/tests/du/files0-from.pl index 13c03c0c..3854059f 100755 --- a/tests/du/files0-from.pl +++ b/tests/du/files0-from.pl @@ -2,7 +2,7 @@ # Exercise du's --files0-from option. # FIXME: keep this file in sync with tests/misc/wc-files0-from. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/hard-link.sh b/tests/du/hard-link.sh index 1d431e4c..66287aed 100755 --- a/tests/du/hard-link.sh +++ b/tests/du/hard-link.sh @@ -3,7 +3,7 @@ # Likewise for excluded directories. # Ensure that hard links _are_ listed twice when using --count-links. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/inacc-dest.sh b/tests/du/inacc-dest.sh index 578237c3..749ad246 100755 --- a/tests/du/inacc-dest.sh +++ b/tests/du/inacc-dest.sh @@ -2,7 +2,7 @@ # Prior to coreutils-6.5, an inaccessible destination dir (chmod a-x) # would cause du to exit prematurely on systems with native openat support. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/inacc-dir.sh b/tests/du/inacc-dir.sh index 4c053909..048fe774 100755 --- a/tests/du/inacc-dir.sh +++ b/tests/du/inacc-dir.sh @@ -1,6 +1,6 @@ #!/bin/sh # Ensure that du counts the size of an inaccessible directory. -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/inaccessible-cwd.sh b/tests/du/inaccessible-cwd.sh index 663e0401..e5a6549f 100755 --- a/tests/du/inaccessible-cwd.sh +++ b/tests/du/inaccessible-cwd.sh @@ -2,7 +2,7 @@ # Ensure that even when run from an inaccessible directory, du can still # operate on accessible directories elsewhere. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/inodes.sh b/tests/du/inodes.sh index 6d2c28bb..384eaf69 100755 --- a/tests/du/inodes.sh +++ b/tests/du/inodes.sh @@ -1,7 +1,7 @@ #!/bin/sh # exercise du's --inodes option -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/long-from-unreadable.sh b/tests/du/long-from-unreadable.sh index e343bb56..4081eca2 100755 --- a/tests/du/long-from-unreadable.sh +++ b/tests/du/long-from-unreadable.sh @@ -1,7 +1,7 @@ #!/bin/sh # Show fts fails on old-fashioned systems. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/long-sloop.sh b/tests/du/long-sloop.sh index 5168ac00..9c325b6d 100755 --- a/tests/du/long-sloop.sh +++ b/tests/du/long-sloop.sh @@ -3,7 +3,7 @@ # Show that du fails with ELOOP (Too many levels of symbolic links) # when it encounters that condition. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/max-depth.sh b/tests/du/max-depth.sh index 4d201095..25ad4689 100755 --- a/tests/du/max-depth.sh +++ b/tests/du/max-depth.sh @@ -1,7 +1,7 @@ #!/bin/sh # exercise du's --max-depth=N option -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/move-dir-while-traversing.sh b/tests/du/move-dir-while-traversing.sh index 046dad90..67bb3458 100755 --- a/tests/du/move-dir-while-traversing.sh +++ b/tests/du/move-dir-while-traversing.sh @@ -1,7 +1,7 @@ #!/bin/sh # Trigger a failed assertion in coreutils-8.9 and earlier. -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This 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,14 +71,17 @@ for i in $(seq 50); do mkdir -p $t/3/a/b/c/$i/$long || framework_failure_ done +# Terminate any background cp process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + # 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 & +timeout 6 ./inotify-watch-for-dir-access.py $t/3/a/b > start-msg & pid=$! # Wait for the watcher to start... nonempty() { test -s start-msg || { sleep $1; return 1; }; } -retry_delay_ nonempty .1 5 +retry_delay_ nonempty .1 5 || fail=1 # 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 diff --git a/tests/du/no-deref.sh b/tests/du/no-deref.sh index 0708bd35..1388f5d0 100755 --- a/tests/du/no-deref.sh +++ b/tests/du/no-deref.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that by default, du doesn't dereference command-line symlinks. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/no-x.sh b/tests/du/no-x.sh index 625eb96a..c035e3f2 100755 --- a/tests/du/no-x.sh +++ b/tests/du/no-x.sh @@ -2,7 +2,7 @@ # Make sure du gives the right diagnostic for a readable, # but inaccessible directory. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/one-file-system.sh b/tests/du/one-file-system.sh index db18d9b7..ab42286b 100755 --- a/tests/du/one-file-system.sh +++ b/tests/du/one-file-system.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test for bugs in du's --one-file-system (-x) option. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/restore-wd.sh b/tests/du/restore-wd.sh index 605399e4..aa05557b 100755 --- a/tests/du/restore-wd.sh +++ b/tests/du/restore-wd.sh @@ -2,7 +2,7 @@ # due to a bug in glibc's ftw.c, in some cases, nftw w/FTW_CHDIR # would not restore the working directory. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/slash.sh b/tests/du/slash.sh index 3073cb1b..87e280b7 100755 --- a/tests/du/slash.sh +++ b/tests/du/slash.sh @@ -1,7 +1,7 @@ #!/bin/sh # 'du /' would omit the '/' on the last line. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/threshold.sh b/tests/du/threshold.sh index 1985a6be..a4e488ae 100755 --- a/tests/du/threshold.sh +++ b/tests/du/threshold.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise du's --threshold option. -# Copyright (C) 2013-2014 Free Software Foundation, Inc. +# Copyright (C) 2013-2015 Free Software Foundation, Inc. # This 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,9 +102,11 @@ 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 +du --threshold > out.tmp 2>&1 && fail=1 +sed 's/argument.*/argument/; s/option.*requires/option requires/' \ + < out.tmp > out || framework_failure_ cat < exp -du: option '--threshold' requires an argument +du: option requires an argument Try 'du --help' for more information. EOF compare exp out || fail=1 diff --git a/tests/du/trailing-slash.sh b/tests/du/trailing-slash.sh index d6a935ad..42eb9116 100755 --- a/tests/du/trailing-slash.sh +++ b/tests/du/trailing-slash.sh @@ -2,7 +2,7 @@ # Ensure that du works properly for an argument that refers to a # symbolic link, and that is specified with a trailing slash. -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/du/two-args.sh b/tests/du/two-args.sh index b5ec3024..999774f3 100755 --- a/tests/du/two-args.sh +++ b/tests/du/two-args.sh @@ -2,7 +2,7 @@ # Make sure 'du d/1 d/2' works. # That command failed with du from fileutils-4.0q. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/envvar-check b/tests/envvar-check index b6d94b4c..28d95f30 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This 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,12 +28,14 @@ vars=' _STDBUF_E _STDBUF_I _STDBUF_O + BASH_ENV BLOCKSIZE BLOCK_SIZE CDPATH COLUMNS DF_BLOCK_SIZE DU_BLOCK_SIZE + ENV LANGUAGE LS_BLOCK_SIZE LS_COLORS diff --git a/tests/factor/create-test.sh b/tests/factor/create-test.sh index b9519725..8d79373b 100755 --- a/tests/factor/create-test.sh +++ b/tests/factor/create-test.sh @@ -1,7 +1,7 @@ #!/bin/sh # Create the factor test scripts. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. test_name=$1 template=$2 diff --git a/tests/factor/run.sh b/tests/factor/run.sh index d7bae642..2cf2b47e 100755 --- a/tests/factor/run.sh +++ b/tests/factor/run.sh @@ -10,7 +10,7 @@ # # See: tests/factor/create-test.sh -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src diff --git a/tests/fmt/base.pl b/tests/fmt/base.pl index c6b97878..695d91bd 100755 --- a/tests/fmt/base.pl +++ b/tests/fmt/base.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Basic tests for "fmt". -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This 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 @@ use strict; (my $program_name = $0) =~ s|.*/||; +my $normalize_strerror = "s/': .*/'/"; my @Tests = ( @@ -26,9 +27,11 @@ my @Tests = {IN=> "ça\nçb\n"}, {OUT=>"ça b\n"}], ['wide-1', '-w 32768', - {ERR => "fmt: invalid width: '32768'\n"}, {EXIT => 1}], + {ERR => "fmt: invalid width: '32768'\n"}, {EXIT => 1}, + {ERR_SUBST => $normalize_strerror}], ['wide-2', '-w 2147483647', - {ERR => "fmt: invalid width: '2147483647'\n"}, {EXIT => 1}], + {ERR => "fmt: invalid width: '2147483647'\n"}, {EXIT => 1}, + {ERR_SUBST => $normalize_strerror}], ['bad-suffix', '-72x', {IN=> ''}, {ERR => "fmt: invalid width: '72x'\n"}, {EXIT => 1}], ['no-file', 'no-such-file', diff --git a/tests/fmt/goal-option.sh b/tests/fmt/goal-option.sh index d2d60c83..322f239e 100755 --- a/tests/fmt/goal-option.sh +++ b/tests/fmt/goal-option.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise the fmt -g option. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/fmt/long-line.sh b/tests/fmt/long-line.sh index 33a85016..6f529c0a 100755 --- a/tests/fmt/long-line.sh +++ b/tests/fmt/long-line.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure fmt -s works even on long lines -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/id/context.sh b/tests/id/context.sh index 4629c1a0..b1aefe73 100755 --- a/tests/id/context.sh +++ b/tests/id/context.sh @@ -1,6 +1,6 @@ #!/bin/sh # Ensure that "id" outputs SELinux context only without specified user -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This 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,10 @@ 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 +name=$(id -nu) || { test $? -ne 1 && fail=1; } +if test "$name"; then + id "$name" > id_name || fail=1 + grep context= id_name >/dev/null && fail=1 +fi Exit $fail diff --git a/tests/id/gnu-zero-uids.sh b/tests/id/gnu-zero-uids.sh index 89ca3097..c2ee6cfb 100755 --- a/tests/id/gnu-zero-uids.sh +++ b/tests/id/gnu-zero-uids.sh @@ -1,7 +1,7 @@ #!/bin/sh # On GNU, 'id' must fail for processes with zero UIDs. -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This 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,6 @@ 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 +returns_ 1 sush - id > out || fail=1 Exit $fail diff --git a/tests/id/no-context.sh b/tests/id/no-context.sh index 7b699278..ff4f44d1 100755 --- a/tests/id/no-context.sh +++ b/tests/id/no-context.sh @@ -1,7 +1,7 @@ #!/bin/sh # With POSIXLY_CORRECT, id must not print context=... -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/id/setgid.sh b/tests/id/setgid.sh index 6d9d74f4..2ea249a0 100755 --- a/tests/id/setgid.sh +++ b/tests/id/setgid.sh @@ -1,7 +1,7 @@ #!/bin/sh # Verify that id [-G] prints the right group when run set-GID. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This 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,14 +27,14 @@ echo $gp1 > exp || framework_failure_ # With coreutils-8.16 and earlier, id -G would print both: # $gp1 $NON_ROOT_GID -chroot --user=$NON_ROOT_USERNAME:+$gp1 --groups='' / env PATH="$PATH" \ - id -G > out || fail=1 +chroot --skip-chdir --user=$NON_ROOT_USERNAME:+$gp1 --groups='' / \ + env PATH="$PATH" id -G > out || fail=1 compare exp out || fail=1 # With coreutils-8.22 and earlier, id would erroneously print # groups=$NON_ROOT_GID -chroot --user=$NON_ROOT_USERNAME:+$gp1 --groups='' / env PATH="$PATH" \ - id > out || fail=1 +chroot --skip-chdir --user=$NON_ROOT_USERNAME:+$gp1 --groups='' / \ + env PATH="$PATH" id > out || fail=1 grep -F "groups=$gp1" out || { cat out; fail=1; } Exit $fail diff --git a/tests/id/smack.sh b/tests/id/smack.sh index 227db3e8..10350cc2 100755 --- a/tests/id/smack.sh +++ b/tests/id/smack.sh @@ -1,7 +1,7 @@ #!/bin/sh # SMACK test for the id-command. # Derived from tests/id/context.sh and tests/id/no-context.sh. -# Copyright (C) 2014 Free Software Foundation, Inc. +# Copyright (C) 2014-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/id/uid.sh b/tests/id/uid.sh index 919ffbe2..e7a83858 100755 --- a/tests/id/uid.sh +++ b/tests/id/uid.sh @@ -1,6 +1,6 @@ #!/bin/sh # Ensure that "id" works with numeric user ids -# Copyright (C) 2013-2014 Free Software Foundation, Inc. +# Copyright (C) 2013-2015 Free Software Foundation, Inc. # This 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 @@ uid=$(id -u) || fail=1 user=$(id -nu) || fail=1 # Ensure the empty user spec is discarded -id '' && fail=1 +returns_ 1 id '' || fail=1 for mode in '' '-G' '-g'; do id $mode $user > user_out || fail=1 # lookup name for comparison diff --git a/tests/id/zero.sh b/tests/id/zero.sh index c826ff43..7bee3a64 100755 --- a/tests/id/zero.sh +++ b/tests/id/zero.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise "id --zero". -# Copyright (C) 2013-2014 Free Software Foundation, Inc. +# Copyright (C) 2013-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -51,8 +51,10 @@ while read u ; do printf '\n%s: ' "id -${o}${n}[z] $u" >> out || framework_failure_ # There may be no name corresponding to an id, so don't check # exit status when in name lookup mode - id -${o}${n} $u >> exp || { test -z "$n" && fail=1; } - id -${o}${n}z $u > tmp || { test -z "$n" && fail=1; } + id -${o}${n} $u >> exp || + { test $? -ne 1 || test -z "$n" && fail=1; } + id -${o}${n}z $u > tmp || + { test $? -ne 1 || test -z "$n" && fail=1; } head -c-1 < tmp >> out || framework_failure_ done done diff --git a/tests/init.sh b/tests/init.sh index fbd293d6..d3662061 100755 --- a/tests/init.sh +++ b/tests/init.sh @@ -1,6 +1,6 @@ # source this file; set up for tests -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -93,6 +93,27 @@ skip_ () { warn_ "$ME_: skipped test: $@"; Exit 77; } fatal_ () { warn_ "$ME_: hard error: $@"; Exit 99; } framework_failure_ () { warn_ "$ME_: set-up failure: $@"; Exit 99; } +# This is used to simplify checking of the return value +# which is useful when ensuring a command fails as desired. +# I.e., just doing `command ... &&fail=1` will not catch +# a segfault in command for example. With this helper you +# instead check an explicit exit code like +# returns_ 1 command ... || fail +returns_ () { + # Disable tracing so it doesn't interfere with stderr of the wrapped command + { set +x; } 2>/dev/null + + local exp_exit="$1" + shift + "$@" + test $? -eq $exp_exit && ret_=0 || ret_=1 + + if test "$VERBOSE" = yes && test "$gl_set_x_corrupts_stderr_" = false; then + set -x + fi + { return $ret_; } 2>/dev/null +} + # Sanitize this shell to POSIX mode, if possible. DUALCASE=1; export DUALCASE if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -129,6 +150,7 @@ fi # ? - not ok gl_shell_test_script_=' test $(echo y) = y || exit 1 +f_local_() { local v=1; }; f_local_ || exit 1 score_=10 if test "$VERBOSE" = yes; then test -n "$( (exec 3>&1; set -x; P=1 true 2>&3) 2> /dev/null)" && score_=9 diff --git a/tests/install/basic-1.sh b/tests/install/basic-1.sh index 0c0d1de8..db3b3c31 100755 --- a/tests/install/basic-1.sh +++ b/tests/install/basic-1.sh @@ -1,7 +1,7 @@ #! /bin/sh # Basic tests for "install". -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -80,8 +80,8 @@ iwd=$(pwd) mkdir sub || fail=1 (cd sub && chmod 0 . && - ginstall -d "$iwd/xx/yy" rel/sub1 rel/sub2 2> /dev/null -) && fail=1 + returns_ 1 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. diff --git a/tests/install/create-leading.sh b/tests/install/create-leading.sh index 0bff21db..c9cb1dc2 100755 --- a/tests/install/create-leading.sh +++ b/tests/install/create-leading.sh @@ -1,7 +1,7 @@ #! /bin/sh # Test -D option. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/install/d-slashdot.sh b/tests/install/d-slashdot.sh index 044b8bf5..eeb62ae9 100755 --- a/tests/install/d-slashdot.sh +++ b/tests/install/d-slashdot.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that ginstall -d works with arguments specified with a trailing "/.". -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/install/install-C-root.sh b/tests/install/install-C-root.sh index 473725af..cadc8e22 100755 --- a/tests/install/install-C-root.sh +++ b/tests/install/install-C-root.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure "install -C" compares owner and group. -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/install/install-C-selinux.sh b/tests/install/install-C-selinux.sh index 722e5b01..06e6c025 100755 --- a/tests/install/install-C-selinux.sh +++ b/tests/install/install-C-selinux.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure "install -C" compares SELinux context. -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/install/install-C.sh b/tests/install/install-C.sh index 9ee1685a..630005c8 100755 --- a/tests/install/install-C.sh +++ b/tests/install/install-C.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure "install -C" works. (basic tests) -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This 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,9 +107,9 @@ 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 +returns_ 1 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 +returns_ 1 ginstall -C --strip --strip-program=echo a b || fail=1 Exit $fail diff --git a/tests/install/strip-program.sh b/tests/install/strip-program.sh index 874329ae..103f5494 100755 --- a/tests/install/strip-program.sh +++ b/tests/install/strip-program.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure "install -s --strip-program=PROGRAM" uses the program to strip -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This 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 @@ print_ver_ ginstall working_umask_or_skip_ cat < b || framework_failure_ -#!$PREFERABLY_POSIX_SHELL +#!$SHELL sed s/b/B/ \$1 > \$1.t && mv \$1.t \$1 EOF chmod a+x b || framework_failure_ @@ -34,7 +34,7 @@ ginstall src dest -s --strip-program=./b || fail=1 compare exp dest || fail=1 # Check that install cleans up properly if strip fails. -ginstall src dest2 -s --strip-program=./FOO && fail=1 +returns_ 1 ginstall src dest2 -s --strip-program=./FOO || fail=1 test -e dest2 && fail=1 Exit $fail diff --git a/tests/install/trap.sh b/tests/install/trap.sh index 235cd1d1..0851ba62 100755 --- a/tests/install/trap.sh +++ b/tests/install/trap.sh @@ -2,7 +2,7 @@ # Ensure that 'install -s' doesn't infloop when its parent # process traps CHLD signal. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ln/backup-1.sh b/tests/ln/backup-1.sh index 15aff2d0..08551c51 100755 --- a/tests/ln/backup-1.sh +++ b/tests/ln/backup-1.sh @@ -2,7 +2,7 @@ # Try to create a symlink with backup where the destination file exists # and the backup file name is a hard link to the destination file. -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ln/hard-backup.sh b/tests/ln/hard-backup.sh index 5f867bc9..317b2f3a 100755 --- a/tests/ln/hard-backup.sh +++ b/tests/ln/hard-backup.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that 'ln --backup F F' gives a proper diagnostic. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ln/hard-to-sym.sh b/tests/ln/hard-to-sym.sh index 995d3cf6..edcee660 100755 --- a/tests/ln/hard-to-sym.sh +++ b/tests/ln/hard-to-sym.sh @@ -1,7 +1,7 @@ #!/bin/sh # Tests for ln -L/-P. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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,24 +29,30 @@ 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 +if ln -P -L symlink3 hard-to-a; then + ls=$(ls -lG hard-to-a)x + case "$ls" in + *'hard-to-ax') ;; + *'hard-to-a -> '*x) fail=1 ;; + *) framework_failure_ ;; + esac +else + fail=1 +fi # =================================================== # 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 +if ln -L -P symlink3 hard-to-3; then + 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 +else + fail=1 +fi # =================================================== # Create a hard link to a dangling symlink. diff --git a/tests/ln/misc.sh b/tests/ln/misc.sh index 0615d6c5..68756309 100755 --- a/tests/ln/misc.sh +++ b/tests/ln/misc.sh @@ -1,7 +1,7 @@ #!/bin/sh # Miscellaneous tests for "ln". -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This 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,20 +52,20 @@ rm -rf $d $f 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 +returns_ 1 ln $f $d/ 2> /dev/null || fail=1 +returns_ 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 +returns_ 1 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 +returns_ 1 ln -sf $t $t 2> /dev/null || fail=1 rm $t # Create a symlink with source file and no explicit directory diff --git a/tests/ln/relative.sh b/tests/ln/relative.sh index 5cf280a5..bb71e268 100755 --- a/tests/ln/relative.sh +++ b/tests/ln/relative.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test "ln --relative". -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ln/sf-1.sh b/tests/ln/sf-1.sh index 17e67a9f..2895e14c 100755 --- a/tests/ln/sf-1.sh +++ b/tests/ln/sf-1.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test "ln -sf". -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ln/slash-decorated-nonexistent-dest.sh b/tests/ln/slash-decorated-nonexistent-dest.sh index 6e537a9b..7a0696f2 100755 --- a/tests/ln/slash-decorated-nonexistent-dest.sh +++ b/tests/ln/slash-decorated-nonexistent-dest.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that touch f; ln -T f no-such-file/ does not mistakenly succeed -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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 @@ touch f || framework_failure_ # Before coreutils-7.6, this would succeed on Solaris 10 -ln -T f no-such-file/ && fail=1 +returns_ 1 ln -T f no-such-file/ || fail=1 test -e no-such-file && fail=1 Exit $fail diff --git a/tests/ln/target-1.sh b/tests/ln/target-1.sh index 2ddad3fc..cdd0c2e2 100755 --- a/tests/ln/target-1.sh +++ b/tests/ln/target-1.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test "ln --target-dir" with one file. -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/local.mk b/tests/local.mk index e0f1f84e..7df04dac 100644 --- a/tests/local.mk +++ b/tests/local.mk @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*-. -## Copyright (C) 2007-2014 Free Software Foundation, Inc. +## Copyright (C) 2007-2015 Free Software Foundation, Inc. ## This 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,7 @@ TESTS_ENVIRONMENT = \ MAKE=$(MAKE) \ PACKAGE_VERSION=$(PACKAGE_VERSION) \ PERL='$(PERL)' \ - PREFERABLY_POSIX_SHELL='$(PREFERABLY_POSIX_SHELL)' \ + 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 @@ -117,6 +117,7 @@ all_root_tests = \ tests/df/problematic-chars.sh \ tests/df/over-mount-device.sh \ tests/du/bind-mount-dir-cycle.sh \ + tests/du/bind-mount-dir-cycle-v2.sh \ tests/id/setgid.sh \ tests/install/install-C-root.sh \ tests/ls/capability.sh \ @@ -127,6 +128,7 @@ all_root_tests = \ tests/misc/truncate-owned-by-other.sh \ tests/mkdir/writable-under-readonly.sh \ tests/mkdir/smack-root.sh \ + tests/mv/hardlink-case.sh \ tests/mv/sticky-to-xpart.sh \ tests/rm/fail-2eperm.sh \ tests/rm/no-give-up.sh \ @@ -159,6 +161,7 @@ check-root: all_tests = \ tests/misc/help-version.sh \ tests/tail-2/inotify-race.sh \ + tests/tail-2/inotify-race2.sh \ tests/misc/invalid-opt.pl \ tests/rm/ext3-perf.sh \ tests/rm/cycle.sh \ @@ -169,7 +172,10 @@ all_tests = \ tests/tail-2/inotify-hash-abuse2.sh \ tests/tail-2/F-vs-missing.sh \ tests/tail-2/F-vs-rename.sh \ + tests/tail-2/F-headers.sh \ + tests/tail-2/descriptor-vs-rename.sh \ tests/tail-2/inotify-rotate.sh \ + tests/tail-2/inotify-rotate-resources.sh \ tests/chmod/no-x.sh \ tests/chgrp/basic.sh \ tests/rm/dangling-symlink.sh \ @@ -193,7 +199,6 @@ all_tests = \ 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 \ @@ -231,6 +236,7 @@ all_tests = \ tests/misc/test.pl \ tests/misc/seq.pl \ tests/misc/seq-long-double.sh \ + tests/misc/seq-precision.sh \ tests/misc/head.pl \ tests/misc/head-elide-tail.pl \ tests/tail-2/tail-n0f.sh \ @@ -256,8 +262,10 @@ all_tests = \ tests/misc/wc-files0-from.pl \ tests/misc/wc-files0.sh \ tests/misc/wc-parallel.sh \ + tests/misc/wc-proc.sh \ tests/misc/cat-proc.sh \ tests/misc/cat-buf.sh \ + tests/misc/cat-self.sh \ tests/misc/base64.pl \ tests/misc/basename.pl \ tests/misc/close-stdout.sh \ @@ -274,6 +282,7 @@ all_tests = \ tests/misc/expand.pl \ tests/misc/expr.pl \ tests/misc/factor.pl \ + tests/misc/factor-parallel.sh \ tests/misc/false-status.sh \ tests/misc/fold.pl \ tests/misc/groups-dash.sh \ @@ -294,6 +303,7 @@ all_tests = \ tests/misc/nproc-positive.sh \ tests/misc/numfmt.pl \ tests/misc/od-N.sh \ + tests/misc/od-j.sh \ tests/misc/od-multiple-t.sh \ tests/misc/od-x8.sh \ tests/misc/paste.pl \ @@ -315,9 +325,9 @@ all_tests = \ tests/misc/sha384sum.pl \ tests/misc/sha512sum.pl \ tests/misc/shred-exact.sh \ - tests/misc/shred-negative.sh \ tests/misc/shred-passes.sh \ tests/misc/shred-remove.sh \ + tests/misc/shred-size.sh \ tests/misc/shuf.sh \ tests/misc/shuf-reservoir.sh \ tests/misc/sort.pl \ @@ -353,6 +363,7 @@ all_tests = \ tests/split/line-bytes.sh \ tests/split/l-chunk.sh \ tests/split/r-chunk.sh \ + tests/split/record-sep.sh \ tests/split/numeric.sh \ tests/split/guard-input.sh \ tests/misc/stat-birthtime.sh \ @@ -369,12 +380,12 @@ all_tests = \ tests/misc/stty-row-col.sh \ tests/misc/sum.pl \ tests/misc/sum-sysv.sh \ + tests/misc/sync.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 \ @@ -395,9 +406,12 @@ all_tests = \ tests/misc/uniq.pl \ tests/misc/uniq-perf.sh \ tests/misc/xattr.sh \ + tests/misc/yes.sh \ tests/tail-2/wait.sh \ tests/tail-2/retry.sh \ - tests/tail-2/symlink.sh \ + tests/tail-2/symlink.sh \ + tests/tail-2/tail-c.sh \ + tests/tail-2/truncate.sh \ tests/chmod/c-option.sh \ tests/chmod/equal-x.sh \ tests/chmod/equals.sh \ @@ -426,6 +440,7 @@ all_tests = \ tests/cp/dir-rm-dest.sh \ tests/cp/dir-slash.sh \ tests/cp/dir-vs-file.sh \ + tests/cp/duplicate-sources.sh \ tests/cp/existing-perm-dir.sh \ tests/cp/existing-perm-race.sh \ tests/cp/fail-perm.sh \ @@ -476,7 +491,7 @@ all_tests = \ tests/dd/ascii.sh \ tests/dd/direct.sh \ tests/dd/misc.sh \ - tests/dd/no-allocate.sh \ + tests/dd/no-allocate.sh \ tests/dd/nocache.sh \ tests/dd/not-rewound.sh \ tests/dd/reblock.sh \ @@ -488,6 +503,7 @@ all_tests = \ tests/dd/stderr.sh \ tests/dd/unblock.pl \ tests/dd/unblock-sync.sh \ + tests/dd/stats.sh \ tests/df/total-verify.sh \ tests/du/2g.sh \ tests/du/8gb.sh \ @@ -549,6 +565,7 @@ all_tests = \ tests/ls/file-type.sh \ tests/ls/follow-slink.sh \ tests/ls/getxattr-speedup.sh \ + tests/ls/hex-option.sh \ tests/ls/infloop.sh \ tests/ls/inode.sh \ tests/ls/m-option.sh \ @@ -599,7 +616,6 @@ all_tests = \ 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 \ diff --git a/tests/ls/abmon-align.sh b/tests/ls/abmon-align.sh index 7630889e..088be160 100755 --- a/tests/ls/abmon-align.sh +++ b/tests/ls/abmon-align.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure ls output is aligned when using abbreviated months from the locale -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/block-size.sh b/tests/ls/block-size.sh index c4861629..9208b40d 100755 --- a/tests/ls/block-size.sh +++ b/tests/ls/block-size.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise ls --block-size and related options. -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/capability.sh b/tests/ls/capability.sh index 54ba296c..bd32be26 100755 --- a/tests/ls/capability.sh +++ b/tests/ls/capability.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure "ls --color" properly colorizes file with capability. -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/color-clear-to-eol.sh b/tests/ls/color-clear-to-eol.sh index a9cc6e91..54878184 100755 --- a/tests/ls/color-clear-to-eol.sh +++ b/tests/ls/color-clear-to-eol.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that ls --color works well when a colored name is wrapped -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/color-dtype-dir.sh b/tests/ls/color-dtype-dir.sh index 559a1884..2c891727 100755 --- a/tests/ls/color-dtype-dir.sh +++ b/tests/ls/color-dtype-dir.sh @@ -4,7 +4,7 @@ # directories the same as the first one -- but only on a file system # with dirent.d_type support. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/color-norm.sh b/tests/ls/color-norm.sh index 23c01871..8d86f19a 100755 --- a/tests/ls/color-norm.sh +++ b/tests/ls/color-norm.sh @@ -1,9 +1,9 @@ #!/bin/sh # Ensure "ls --color" properly colors "normal" text and files. -# I.E. that it uses NORMAL to style non file name output and +# 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/color-term.sh b/tests/ls/color-term.sh index 8eb3783a..97b0aa36 100755 --- a/tests/ls/color-term.sh +++ b/tests/ls/color-term.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure "ls --color" doesn't output colors for TERM=dumb -# Copyright (C) 2014 Free Software Foundation, Inc. +# Copyright (C) 2014-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/dangle.sh b/tests/ls/dangle.sh index 628f760b..d27f03fe 100755 --- a/tests/ls/dangle.sh +++ b/tests/ls/dangle.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure ls properly handles dangling symlinks vs. ls's -L, -H, options. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,6 +19,9 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls +LS_MINOR_PROBLEM=1 +LS_FAILURE=2 + ln -s no-such-file dangle || framework_failure_ mkdir -p dir/sub || framework_failure_ ln -s dir slink-to-dir || framework_failure_ @@ -27,11 +30,10 @@ 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 +returns_ $LS_FAILURE ls -L dangle > /dev/null 2>&1 || fail=1 # So must this. -ls -H dangle > /dev/null 2>&1 && fail=1 +returns_ $LS_FAILURE ls -H dangle > /dev/null 2>&1 || fail=1 # This must exit successfully. ls dangle >> out || fail=1 @@ -51,12 +53,12 @@ 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 +returns_ $LS_MINOR_PROBLEM 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 +returns_ $LS_MINOR_PROBLEM ls -Ls d > out 2>/dev/null || fail=1 compare subdir_Ls_exp out || fail=1 Exit $fail diff --git a/tests/ls/dired.sh b/tests/ls/dired.sh index e87590e7..6a501ad1 100755 --- a/tests/ls/dired.sh +++ b/tests/ls/dired.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure --dired option works -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/file-type.sh b/tests/ls/file-type.sh index 0afa4d4e..e594c999 100755 --- a/tests/ls/file-type.sh +++ b/tests/ls/file-type.sh @@ -1,7 +1,7 @@ #!/bin/sh # contrast ls -F, ls -p, and ls --indicator-style=file-type -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/follow-slink.sh b/tests/ls/follow-slink.sh index 3357439a..edf6a481 100755 --- a/tests/ls/follow-slink.sh +++ b/tests/ls/follow-slink.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure ls -L always follows symlinks -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This 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 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ ls +LS_FAILURE=2 + # Isolate output files from directory being listed mkdir dir dir/sub dir1 || framework_failure_ cd dir || framework_failure_ @@ -32,7 +34,7 @@ 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 +returns_ $LS_FAILURE 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 diff --git a/tests/ls/getxattr-speedup.sh b/tests/ls/getxattr-speedup.sh index 0144571e..be43c50e 100755 --- a/tests/ls/getxattr-speedup.sh +++ b/tests/ls/getxattr-speedup.sh @@ -4,7 +4,7 @@ # This test is skipped on systems that lack LD_PRELOAD support; that's fine. # Similarly, on a system that lacks getxattr altogether, skipping it is fine. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This 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 @@ gcc_shared_ k.c k.so \ seq 20 | xargs touch || framework_failure_ # Finally, run the test: -LD_PRELOAD=./k.so ls --color=always -l . || fail=1 +LD_PRELOAD=$LD_PRELOAD:./k.so ls --color=always -l . || fail=1 test -f x || skip_ "internal test failure: maybe LD_PRELOAD doesn't work?" diff --git a/tests/ls/hex-option.sh b/tests/ls/hex-option.sh new file mode 100755 index 00000000..3f915ee7 --- /dev/null +++ b/tests/ls/hex-option.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# accept hex/oct numbers to -w and -T + +# Copyright (C) 2014-2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ ls + +ls -x -T0x10 -w010 || fail=1 + +Exit $fail diff --git a/tests/ls/infloop.sh b/tests/ls/infloop.sh index 48d356a0..34dbfb2c 100755 --- a/tests/ls/infloop.sh +++ b/tests/ls/infloop.sh @@ -2,7 +2,7 @@ # show that the following no longer makes ls infloop # mkdir loop; cd loop; ln -s ../loop sub; ls -RL # Also ensure ls exits with status = 2 in that case. -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/inode.sh b/tests/ls/inode.sh index e09efa60..ea5494e9 100755 --- a/tests/ls/inode.sh +++ b/tests/ls/inode.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure that ls -i works properly on symlinks. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/m-option.sh b/tests/ls/m-option.sh index 2255b6eb..ca8e01b5 100755 --- a/tests/ls/m-option.sh +++ b/tests/ls/m-option.sh @@ -1,7 +1,7 @@ #!/bin/sh # exercise the -m option -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/multihardlink.sh b/tests/ls/multihardlink.sh index 4407ba61..25ed08f3 100755 --- a/tests/ls/multihardlink.sh +++ b/tests/ls/multihardlink.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure "ls --color" properly colorizes hard linked files. -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/nameless-uid.sh b/tests/ls/nameless-uid.sh index db6c56ea..cd3a4094 100755 --- a/tests/ls/nameless-uid.sh +++ b/tests/ls/nameless-uid.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that ls -l works on files with nameless uid and/or gid -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/no-arg.sh b/tests/ls/no-arg.sh index e356a296..793080f1 100755 --- a/tests/ls/no-arg.sh +++ b/tests/ls/no-arg.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure ls and 'ls -R' do the right thing when invoked with no arguments. -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/no-cap.sh b/tests/ls/no-cap.sh index a75180c2..ecbfb31c 100755 --- a/tests/ls/no-cap.sh +++ b/tests/ls/no-cap.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that an empty "ca=" attribute disables ls's capability-checking -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This 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,14 @@ print_ver_ ls require_strace_ capget +LS_COLORS=ca=1; export LS_COLORS 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 +LS_COLORS=ca=:; export LS_COLORS +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.sh b/tests/ls/proc-selinux-segfault.sh index 1b7a39be..333e040d 100755 --- a/tests/ls/proc-selinux-segfault.sh +++ b/tests/ls/proc-selinux-segfault.sh @@ -1,7 +1,7 @@ #!/bin/sh # ls -l /proc/sys would segfault when built against libselinux1 2.0.15-2+b1 -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/readdir-mountpoint-inode.sh b/tests/ls/readdir-mountpoint-inode.sh index 83ebe68c..e566dc24 100755 --- a/tests/ls/readdir-mountpoint-inode.sh +++ b/tests/ls/readdir-mountpoint-inode.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that ls -i works also for mount points -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/recursive.sh b/tests/ls/recursive.sh index be2d849b..05a384c7 100755 --- a/tests/ls/recursive.sh +++ b/tests/ls/recursive.sh @@ -2,7 +2,7 @@ # 4.1.1 and 4.1.2 had a bug whereby some recursive listings # didn't include a blank line between per-directory groups of files. -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/root-rel-symlink-color.sh b/tests/ls/root-rel-symlink-color.sh index 2318a479..0b977fcb 100755 --- a/tests/ls/root-rel-symlink-color.sh +++ b/tests/ls/root-rel-symlink-color.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise the 8.17 ls bug with coloring relative-named symlinks in "/". -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/rt-1.sh b/tests/ls/rt-1.sh index 99c62afe..44e02476 100755 --- a/tests/ls/rt-1.sh +++ b/tests/ls/rt-1.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure name is used as secondary key when sorting on mtime or ctime. -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/slink-acl.sh b/tests/ls/slink-acl.sh index 8ba3be15..05b98cec 100755 --- a/tests/ls/slink-acl.sh +++ b/tests/ls/slink-acl.sh @@ -1,7 +1,7 @@ #!/bin/sh # verify that ls -lL works when applied to a symlink to an ACL'd file -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/stat-dtype.sh b/tests/ls/stat-dtype.sh index 01da0c8a..1d6f5ec3 100755 --- a/tests/ls/stat-dtype.sh +++ b/tests/ls/stat-dtype.sh @@ -3,7 +3,7 @@ # Also check for the dtype-related (and fs-type dependent) bug # in coreutils-6.0 that made ls -CF columns misaligned. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/stat-failed.sh b/tests/ls/stat-failed.sh index 9de018f3..002b71cf 100755 --- a/tests/ls/stat-failed.sh +++ b/tests/ls/stat-failed.sh @@ -2,7 +2,7 @@ # Verify that ls works properly when it fails to stat a file that is # not mentioned on the command line. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This 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,8 @@ print_ver_ ls skip_if_root_ +LS_MINOR_PROBLEM=1 + mkdir d || framework_failure_ ln -s / d/s || framework_failure_ chmod 600 d || framework_failure_ @@ -38,7 +40,7 @@ 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 +returns_ $LS_MINOR_PROBLEM ls --dired -l d > out || fail=1 cat <<\EOF > exp || fail=1 total 0 diff --git a/tests/ls/stat-free-color.sh b/tests/ls/stat-free-color.sh index 72a09bb6..fb2ee8b5 100755 --- a/tests/ls/stat-free-color.sh +++ b/tests/ls/stat-free-color.sh @@ -1,7 +1,7 @@ #!/bin/sh # Show that --color need not use stat, as long as we have d_type support. -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/stat-free-symlinks.sh b/tests/ls/stat-free-symlinks.sh index 0bc4c6aa..a9322e03 100755 --- a/tests/ls/stat-free-symlinks.sh +++ b/tests/ls/stat-free-symlinks.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that ls does not stat a symlink in an unusual case -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/stat-vs-dirent.sh b/tests/ls/stat-vs-dirent.sh index 57c718a9..9903d27b 100755 --- a/tests/ls/stat-vs-dirent.sh +++ b/tests/ls/stat-vs-dirent.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that d_ino (from ls -di) and st_ino (from stat --format=%i) match. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/symlink-slash.sh b/tests/ls/symlink-slash.sh index da5da28f..4f521b9e 100755 --- a/tests/ls/symlink-slash.sh +++ b/tests/ls/symlink-slash.sh @@ -1,7 +1,7 @@ #!/bin/sh # Do dereference a symlink arg if its name is written with a trailing slash. -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/time-style-diag.sh b/tests/ls/time-style-diag.sh index d292c982..1d6d8616 100755 --- a/tests/ls/time-style-diag.sh +++ b/tests/ls/time-style-diag.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that an invalid --time-style=ARG is diagnosed the way we want. -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ls/x-option.sh b/tests/ls/x-option.sh index f009cdc2..1ec23d5b 100755 --- a/tests/ls/x-option.sh +++ b/tests/ls/x-option.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise the -x option. -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/arch.sh b/tests/misc/arch.sh index 95369067..d5ae5822 100755 --- a/tests/misc/arch.sh +++ b/tests/misc/arch.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that arch output is equal to uname -m -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/base64.pl b/tests/misc/base64.pl index 54e2cc21..fd75c624 100755 --- a/tests/misc/base64.pl +++ b/tests/misc/base64.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Exercise base64. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/basename.pl b/tests/misc/basename.pl index 3aace6f8..7b0ea7dd 100755 --- a/tests/misc/basename.pl +++ b/tests/misc/basename.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # Test basename. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This 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 @@ my @Tests = ); # Append a newline to end of each expected 'OUT' string. -# Skip -z tests, i.e. those whose 'OUT' string has a trailing '\0'. +# Skip -z tests, i.e., those whose 'OUT' string has a trailing '\0'. my $t; foreach $t (@Tests) { diff --git a/tests/misc/cat-buf.sh b/tests/misc/cat-buf.sh index 592b5a1d..31382481 100755 --- a/tests/misc/cat-buf.sh +++ b/tests/misc/cat-buf.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that cat outputs processed data immediately. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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 @@ print_ver_ cat # write separately. mkfifo_or_skip_ fifo +# Terminate any background cp process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } echo 1 > exp @@ -33,9 +35,9 @@ cat_buf_1() { local delay="$1" - dd count=1 if=fifo > out & + dd count=1 if=fifo > out & pid=$! (echo 1; sleep $delay; echo 2) | cat -v > fifo - wait # for dd to complete + wait $pid compare exp out } diff --git a/tests/misc/cat-proc.sh b/tests/misc/cat-proc.sh index 7b826ef3..32e71e10 100755 --- a/tests/misc/cat-proc.sh +++ b/tests/misc/cat-proc.sh @@ -2,7 +2,7 @@ # Ensure that cat -E produces same output as cat, module '$'s, # even when applied to a file in /proc. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/cat-self.sh b/tests/misc/cat-self.sh new file mode 100755 index 00000000..57777e53 --- /dev/null +++ b/tests/misc/cat-self.sh @@ -0,0 +1,33 @@ +#!/bin/sh +# Check that cat operates correctly when the input is the same as the output. + +# Copyright 2014-2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ cat + +echo x >out || framework_failure_ +echo x >out1 || framework_failure_ +returns_ 1 cat out >>out || fail=1 +compare out out1 || fail=1 + +# This example is taken from the POSIX spec for 'cat'. +echo x >doc || framework_failure_ +echo y >doc.end || framework_failure_ +cat doc doc.end >doc || fail=1 +compare doc doc.end || fail=1 + +Exit $fail diff --git a/tests/misc/chcon-fail.sh b/tests/misc/chcon-fail.sh index 77b91d3b..5265fa01 100755 --- a/tests/misc/chcon-fail.sh +++ b/tests/misc/chcon-fail.sh @@ -2,7 +2,7 @@ # Ensure that chcon fails when it should. # These tests don't use any actual SE Linux syscalls. -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This 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,16 +22,16 @@ print_ver_ chcon # neither context nor file -chcon 2> /dev/null && fail=1 +returns_ 1 chcon 2> /dev/null || fail=1 # No file -chcon CON 2> /dev/null && fail=1 +returns_ 1 chcon CON 2> /dev/null || fail=1 # No file touch f -chcon --reference=f 2> /dev/null && fail=1 +returns_ 1 chcon --reference=f 2> /dev/null || fail=1 # No file -chcon -u anyone 2> /dev/null && fail=1 +returns_ 1 chcon -u anyone 2> /dev/null || fail=1 Exit $fail diff --git a/tests/misc/chcon.sh b/tests/misc/chcon.sh index ec573967..e3f61e8b 100755 --- a/tests/misc/chcon.sh +++ b/tests/misc/chcon.sh @@ -1,7 +1,7 @@ #!/bin/sh # exercise chcon -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This 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 @@ 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 +t2=unlabeled_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 @@ -63,8 +63,8 @@ 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|-uroot|root:object_r:$t2:$range +f|-robject_r|root:object_r:$t2:$range f|-ttmp_t|root:object_r:tmp_t:$range EOF diff --git a/tests/misc/chroot-credentials.sh b/tests/misc/chroot-credentials.sh index b06e8b7f..8b677100 100755 --- a/tests/misc/chroot-credentials.sh +++ b/tests/misc/chroot-credentials.sh @@ -1,7 +1,7 @@ #!/bin/sh # Verify that the credentials are changed correctly. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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,8 @@ print_ver_ chroot require_root_ +EXIT_CANCELED=125 + grep '^#define HAVE_SETGROUPS 1' "$CONFIG_HEADER" >/dev/null \ && HAVE_SETGROUPS=1 @@ -36,7 +38,8 @@ chroot --userspec=$NON_ROOT_UID: / true || fail=1 # verify that invalid groups are diagnosed for g in ' ' ',' '0trail'; do - test "$(chroot --groups="$g" / id -G)" && fail=1 + returns_ $EXIT_CANCELED chroot --groups="$g" / id -G >invalid || fail=1 + compare /dev/null invalid || fail=1 done # Verify that root credentials are kept. @@ -111,7 +114,7 @@ if ! id -u +12342; then test "$(chroot --userspec=+12342:+5678 / id -G)" = '5678' || fail=1 # Ensure we fail when we don't know what groups to set for an unknown ID - chroot --userspec=+12342 / true && fail=1 + returns_ $EXIT_CANCELED chroot --userspec=+12342 / true || fail=1 fi Exit $fail diff --git a/tests/misc/chroot-fail.sh b/tests/misc/chroot-fail.sh index a84826fd..14499edd 100755 --- a/tests/misc/chroot-fail.sh +++ b/tests/misc/chroot-fail.sh @@ -1,7 +1,7 @@ #!/bin/sh # Verify that internal failure in chroot gives exact status. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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,20 +29,42 @@ test $? = 125 || fail=1 chroot --- / true # unknown option test $? = 125 || fail=1 -# Note chroot("/") succeeds for non-root users on some systems, but not all, -# however we avoid the chroot() with "/" to have common behvavior. -chroot / sh -c 'exit 2' # exit status propagation -test $? = 2 || fail=1 -chroot / . # invalid command -test $? = 126 || fail=1 -chroot / no_such # no such command -test $? = 127 || fail=1 - -# Ensure we don't chdir("/") when not changing root -# to allow only changing user ids for a command. -for dir in '/' '/.' '/../'; do - curdir=$(chroot "$dir" env pwd) || fail=1 - test "$curdir" = '/' && fail=1 -done +# chroot("/") succeeds for non-root users on some systems, but not all. +if chroot / true ; then + can_chroot_root=1 + 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 + can_chroot_root=0 +fi + +# Ensure that --skip-chdir fails with a non-"/" argument. +cat <<\EOF > exp || framework_failure_ +chroot: option --skip-chdir only permitted if NEWROOT is old '/' +Try 'chroot --help' for more information. +EOF +chroot --skip-chdir . env pwd >out 2>err && fail=1 +compare /dev/null out || fail=1 +compare exp err || fail=1 + +# Ensure we chdir("/") appropriately when NEWROOT is old "/". +if test $can_chroot_root = 1; then + ln -s / isroot || framework_failure_ + for dir in '/' '/.' '/../' isroot; do + # Verify that chroot(1) succeeds and performs chdir("/") + # (chroot(1) of coreutils-8.23 failed to run the latter). + curdir=$(chroot "$dir" env pwd) || fail=1 + test "$curdir" = '/' || fail=1 + + # Test the "--skip-chdir" option. + curdir=$(chroot --skip-chdir "$dir" env pwd) || fail=1 + test "$curdir" = '/' && fail=1 + done +fi Exit $fail diff --git a/tests/misc/close-stdout.sh b/tests/misc/close-stdout.sh index 4da696c4..6714ec0f 100755 --- a/tests/misc/close-stdout.sh +++ b/tests/misc/close-stdout.sh @@ -2,7 +2,7 @@ # Ensure that several programs work fine, even with stdout initially closed. # This is effectively a test of closeout.c's close_stdout function. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This 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,21 +44,21 @@ sleep 0 >&- || fail=1 # 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 + returns_ 1 "$p/src/printf" 'foo' >&- 2>/dev/null || fail=1 + returns_ 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 + returns_ 1 mktemp tmpfile-XXXXXX >&- 2>/dev/null || fail=1 + returns_ 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 + returns_ 1 "$p/src/printf" 'foo' >/dev/full 2>/dev/null || fail=1 + returns_ 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 + returns_ 1 mktemp -d tmpdir-XXXXXX >/dev/full 2>/dev/null || fail=1 + returns_ 1 mktemp -d -q tmpdir-XXXXXX >/dev/full 2>/dev/null || fail=1 case $(echo tmpfile-??????) in 'tmpfile-??????') ;; *) fail=1 ;; esac fi diff --git a/tests/misc/comm.pl b/tests/misc/comm.pl index c96939b1..76be936f 100755 --- a/tests/misc/comm.pl +++ b/tests/misc/comm.pl @@ -2,7 +2,7 @@ # -*- perl -*- # Test comm -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/coreutils.sh b/tests/misc/coreutils.sh index a22bc9f6..c568ac02 100755 --- a/tests/misc/coreutils.sh +++ b/tests/misc/coreutils.sh @@ -1,7 +1,7 @@ #!/bin/sh # Verify behavior of separate coreutils multicall binary -# Copyright (C) 2014 Free Software Foundation, Inc. +# Copyright (C) 2014-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/csplit-1000.sh b/tests/misc/csplit-1000.sh index 6757a464..9baac2fa 100755 --- a/tests/misc/csplit-1000.sh +++ b/tests/misc/csplit-1000.sh @@ -1,7 +1,7 @@ #!/bin/sh # cause a 1-byte heap buffer overrun -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/csplit-heap.sh b/tests/misc/csplit-heap.sh index 03fc9a36..9e51cb15 100755 --- a/tests/misc/csplit-heap.sh +++ b/tests/misc/csplit-heap.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that csplit uses a bounded amount of memory -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/csplit-suppress-matched.pl b/tests/misc/csplit-suppress-matched.pl index cea64e4f..d4ca3cd0 100755 --- a/tests/misc/csplit-suppress-matched.pl +++ b/tests/misc/csplit-suppress-matched.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2013-2014 Free Software Foundation, Inc. +# Copyright (C) 2013-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/csplit.sh b/tests/misc/csplit.sh index da09c1f0..1ccf1218 100755 --- a/tests/misc/csplit.sh +++ b/tests/misc/csplit.sh @@ -1,7 +1,7 @@ #!/bin/sh # various csplit tests -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/cut-huge-range.sh b/tests/misc/cut-huge-range.sh index e2c4108c..035d8d08 100755 --- a/tests/misc/cut-huge-range.sh +++ b/tests/misc/cut-huge-range.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that cut does not allocate mem for large ranges -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This 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,8 +56,8 @@ CUT_MAX=$(echo $SIZE_MAX | sed "$subtract_one") (ulimit -v 20000; : | cut -b1-$CUT_MAX >> err 2>&1) || fail=1 # Explicitly disallow values above CUT_MAX -(ulimit -v 20000; : | cut -b$SIZE_MAX 2>/dev/null) && fail=1 -(ulimit -v 20000; : | cut -b$SIZE_OFLOW 2>/dev/null) && fail=1 +(ulimit -v 20000; : | returns_ 1 cut -b$SIZE_MAX 2>/dev/null) || fail=1 +(ulimit -v 20000; : | returns_ 1 cut -b$SIZE_OFLOW 2>/dev/null) || fail=1 compare /dev/null err || fail=1 diff --git a/tests/misc/cut.pl b/tests/misc/cut.pl index 04188621..23e9ce36 100755 --- a/tests/misc/cut.pl +++ b/tests/misc/cut.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test "cut". -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/date-next-dow.pl b/tests/misc/date-next-dow.pl index a1c21127..feb076be 100755 --- a/tests/misc/date-next-dow.pl +++ b/tests/misc/date-next-dow.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test "date". -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/date-sec.sh b/tests/misc/date-sec.sh index 9c001fdc..d3d5e6c5 100755 --- a/tests/misc/date-sec.sh +++ b/tests/misc/date-sec.sh @@ -3,7 +3,7 @@ # date --date="21:04 +0100" +%S' always prints '00'. # Before coreutils-5.2.1, it would print the seconds from the current time. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/date.pl b/tests/misc/date.pl index 40be4cab..6a7c6f88 100755 --- a/tests/misc/date.pl +++ b/tests/misc/date.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test "date". -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/dircolors.pl b/tests/misc/dircolors.pl index a70a8c5d..b9f8a1d2 100755 --- a/tests/misc/dircolors.pl +++ b/tests/misc/dircolors.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Simple dircolors tests. -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/dirname.pl b/tests/misc/dirname.pl index 34c905d4..98416694 100755 --- a/tests/misc/dirname.pl +++ b/tests/misc/dirname.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test "dirname". -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/env-null.sh b/tests/misc/env-null.sh index 9b9c95e7..de9e016d 100755 --- a/tests/misc/env-null.sh +++ b/tests/misc/env-null.sh @@ -1,7 +1,7 @@ #!/bin/sh # Verify behavior of env -0 and printenv -0. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/env.sh b/tests/misc/env.sh index d06a1fb0..d7c5a099 100755 --- a/tests/misc/env.sh +++ b/tests/misc/env.sh @@ -1,7 +1,7 @@ #!/bin/sh # Verify behavior of env. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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,7 +102,7 @@ cat < unlikely_name/also_unlikely || framework_failure_ echo pass EOF chmod +x unlikely_name/also_unlikely || framework_failure_ -env also_unlikely && fail=1 +returns_ 127 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 diff --git a/tests/misc/expand.pl b/tests/misc/expand.pl index 939e22b8..283b8579 100755 --- a/tests/misc/expand.pl +++ b/tests/misc/expand.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Exercise expand. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/expr.pl b/tests/misc/expr.pl index c084b118..0fa7111e 100755 --- a/tests/misc/expr.pl +++ b/tests/misc/expr.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Basic tests for "expr". -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/factor-parallel.sh b/tests/misc/factor-parallel.sh new file mode 100755 index 00000000..8cec630e --- /dev/null +++ b/tests/misc/factor-parallel.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# Test for complete lines on output + +# Copyright (C) 2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ factor + + +odd() { LC_ALL=C sed '/[24680]$/d'; } +primes() { LC_ALL=C sed 's/.*: //; / /d'; } + +# Before v8.24 the number reported here would vary +# Note -u not supplied to split, increased batching of quickly processed items. +# As processing cost increases it becomes advantageous to use -u to keep +# the factor processes supplied with data. +nprimes=$(seq 1e6 | odd | split -nr/4 --filter='factor' | primes | wc -l) + +test "$nprimes" = '78498' || fail=1 + +Exit $fail diff --git a/tests/misc/factor.pl b/tests/misc/factor.pl index 294b814f..b48eb3c0 100755 --- a/tests/misc/factor.pl +++ b/tests/misc/factor.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Basic tests for "factor". -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/false-status.sh b/tests/misc/false-status.sh index 77bea451..03fe98c2 100755 --- a/tests/misc/false-status.sh +++ b/tests/misc/false-status.sh @@ -2,7 +2,7 @@ # ensure that false exits nonzero even with --help or --version # and ensure that true exits nonzero when it can't write --help or --version -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,12 +20,12 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ false true -env false --version > /dev/null && fail=1 -env false --help > /dev/null && fail=1 +returns_ 1 env false --version > /dev/null || fail=1 +returns_ 1 env false --help > /dev/null || fail=1 if test -w /dev/full && test -c /dev/full; then - env true --version > /dev/full && fail=1 - env true --help > /dev/full && fail=1 + returns_ 1 env true --version > /dev/full || fail=1 + returns_ 1 env true --help > /dev/full || fail=1 fi Exit $fail diff --git a/tests/misc/fold.pl b/tests/misc/fold.pl index 69b0c5b5..be13cc14 100755 --- a/tests/misc/fold.pl +++ b/tests/misc/fold.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Exercise fold. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/groups-dash.sh b/tests/misc/groups-dash.sh index 0aed2229..8f7ec759 100755 --- a/tests/misc/groups-dash.sh +++ b/tests/misc/groups-dash.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure groups handles -- sanely -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/groups-version.sh b/tests/misc/groups-version.sh index a867701c..44394435 100755 --- a/tests/misc/groups-version.sh +++ b/tests/misc/groups-version.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure groups --version output is similar to id --version -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/head-c.sh b/tests/misc/head-c.sh index d6433d0d..a553a55b 100755 --- a/tests/misc/head-c.sh +++ b/tests/misc/head-c.sh @@ -1,7 +1,7 @@ #!/bin/sh # exercise head -c -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This 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,4 +42,16 @@ esac # based on the value passed to -c (ulimit -v 20000; head --bytes=-$SSIZE_MAX < /dev/null) || fail=1 +# Make sure it works on funny files in /proc and /sys. + +for file in /proc/version /sys/kernel/profiling; do + if test -r $file; then + cp -f $file copy && + head -c -1 copy > exp1 || framework_failure_ + + head -c -1 $file > out1 || fail=1 + compare exp1 out1 || fail=1 + fi +done + Exit $fail diff --git a/tests/misc/head-elide-tail.pl b/tests/misc/head-elide-tail.pl index 3c178d69..bae87174 100755 --- a/tests/misc/head-elide-tail.pl +++ b/tests/misc/head-elide-tail.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Exercise head's --bytes=-N option. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/head-pos.sh b/tests/misc/head-pos.sh index 1cf9e04b..c195f320 100755 --- a/tests/misc/head-pos.sh +++ b/tests/misc/head-pos.sh @@ -2,7 +2,7 @@ # When reading a specified number of lines, ensure that the output # file pointer is positioned just after those lines. -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/head-write-error.sh b/tests/misc/head-write-error.sh index 22ecf993..53582278 100755 --- a/tests/misc/head-write-error.sh +++ b/tests/misc/head-write-error.sh @@ -2,7 +2,7 @@ # Ensure we diagnose and not continue writing to # the output if we get a write error. -# Copyright (C) 2014 Free Software Foundation, Inc. +# Copyright (C) 2014-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/head.pl b/tests/misc/head.pl index 159d4efc..b8bbd676 100755 --- a/tests/misc/head.pl +++ b/tests/misc/head.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # test head -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/help-version.sh b/tests/misc/help-version.sh index 0598557f..78150374 100755 --- a/tests/misc/help-version.sh +++ b/tests/misc/help-version.sh @@ -2,7 +2,7 @@ # Make sure all of these programs work properly # when invoked with --help or --version. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,14 +17,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# 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 +# Terminate any background processes +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + expected_failure_status_chroot=125 expected_failure_status_env=125 expected_failure_status_nice=125 @@ -216,8 +213,8 @@ 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=$! + env sleep 10m & pid=$! + args=$pid } link_setup () { args="$tmp_in link-target"; } diff --git a/tests/misc/invalid-opt.pl b/tests/misc/invalid-opt.pl index bcf6ee71..a319bb14 100755 --- a/tests/misc/invalid-opt.pl +++ b/tests/misc/invalid-opt.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # exercise the 'invalid option' handling code in each program -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/join.pl b/tests/misc/join.pl index cf3f4bd4..08f29656 100755 --- a/tests/misc/join.pl +++ b/tests/misc/join.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test join. -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/ls-misc.pl b/tests/misc/ls-misc.pl index a47e70b7..f88c7a8e 100755 --- a/tests/misc/ls-misc.pl +++ b/tests/misc/ls-misc.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -266,7 +266,7 @@ my @Tests = # 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 + # 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"}, diff --git a/tests/misc/ls-time.sh b/tests/misc/ls-time.sh index 3ce4a91c..676d1850 100755 --- a/tests/misc/ls-time.sh +++ b/tests/misc/ls-time.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test some of ls's sorting options. -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/md5sum-bsd.sh b/tests/misc/md5sum-bsd.sh index f73e0622..c5069f35 100755 --- a/tests/misc/md5sum-bsd.sh +++ b/tests/misc/md5sum-bsd.sh @@ -2,7 +2,7 @@ # 'md5sum' tests for generation and checking of # BSD traditional and alternate formats (md5 [-r]) -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This 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,7 @@ print_ver_ md5sum # 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 '*' +# I.e., one not starting with ' ' or '*' for i in 'a' ' b' '*c' 'dd' ' '; do echo "$i" > "$i" md5sum "$i" >> check.md5sum @@ -40,20 +40,20 @@ md5sum --strict -c check.md5 || fail=1 # 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 +tail -n+2 check.md5 | returns_ 1 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 +returns_ 1 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 +returns_ 1 md5sum --tag --text /dev/null || fail=1 # Ensure we can --check BSD traditional format we produce rm check.md5 diff --git a/tests/misc/md5sum-newline.pl b/tests/misc/md5sum-newline.pl index b418d5b4..4d2c21e4 100755 --- a/tests/misc/md5sum-newline.pl +++ b/tests/misc/md5sum-newline.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Newline tests for "md5sum". -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/md5sum-parallel.sh b/tests/misc/md5sum-parallel.sh index 92f66296..2a526bdf 100755 --- a/tests/misc/md5sum-parallel.sh +++ b/tests/misc/md5sum-parallel.sh @@ -2,7 +2,7 @@ # Ensure that md5sum prints each checksum atomically # so that concurrent md5sums don't intersperse their output -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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,17 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ md5sum +xargs -P2 /dev/null 2>&1 \ + || skip_ 'xargs -P is required' + (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) | +(find tmp tmp tmp -type f | xargs -n500 -P2 md5sum 2>err) | sed -n '/[0-9a-f]\{32\} /!p' | grep . > /dev/null && fail=1 +compare /dev/null err || fail=1 Exit $fail diff --git a/tests/misc/md5sum.pl b/tests/misc/md5sum.pl index 0aa0056f..b3ff4b4f 100755 --- a/tests/misc/md5sum.pl +++ b/tests/misc/md5sum.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Basic tests for "md5sum". -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/mknod.sh b/tests/misc/mknod.sh index fb907f16..8ca35648 100755 --- a/tests/misc/mknod.sh +++ b/tests/misc/mknod.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that mknod, mkfifo, mkdir -m MODE work with a restrictive umask -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/mktemp.pl b/tests/misc/mktemp.pl index 13ee03f5..ca6a8516 100755 --- a/tests/misc/mktemp.pl +++ b/tests/misc/mktemp.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test "mktemp". -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/nice-fail.sh b/tests/misc/nice-fail.sh index 3bf823ab..2e957000 100755 --- a/tests/misc/nice-fail.sh +++ b/tests/misc/nice-fail.sh @@ -1,7 +1,7 @@ #!/bin/sh # Verify that internal failure in nice gives exact status. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/nice.sh b/tests/misc/nice.sh index 26a01ca9..59316ec5 100755 --- a/tests/misc/nice.sh +++ b/tests/misc/nice.sh @@ -1,7 +1,7 @@ #! /bin/sh # Test "nice". -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This 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,7 +73,7 @@ done 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 + compare /dev/null err && fail=1 mv err exp || framework_failure_ nice --1 true 2> err || fail=1 compare exp err || fail=1 diff --git a/tests/misc/nl.sh b/tests/misc/nl.sh index 676c75d7..310d45fe 100755 --- a/tests/misc/nl.sh +++ b/tests/misc/nl.sh @@ -1,7 +1,7 @@ #!/bin/sh # exercise nl functionality -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/nohup.sh b/tests/misc/nohup.sh index b3f4274c..b0621f4d 100755 --- a/tests/misc/nohup.sh +++ b/tests/misc/nohup.sh @@ -1,7 +1,7 @@ #!/bin/sh # test nohup -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/nproc-avail.sh b/tests/misc/nproc-avail.sh index 1a7e7219..a045c580 100755 --- a/tests/misc/nproc-avail.sh +++ b/tests/misc/nproc-avail.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that "nproc" is less than or equal to "nproc --all". -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/nproc-positive.sh b/tests/misc/nproc-positive.sh index c8fe9bae..fb825fac 100755 --- a/tests/misc/nproc-positive.sh +++ b/tests/misc/nproc-positive.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that nproc prints a number > 0 -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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 @@ for i in 0 ' 1' 1000; do done for i in -1 N; do - nproc --ignore=$i && fail=1 + returns_ 1 nproc --ignore=$i || fail=1 done procs=$(OMP_NUM_THREADS=42 nproc --ignore=40) diff --git a/tests/misc/numfmt.pl b/tests/misc/numfmt.pl index dfb4b2e0..0e4dc79c 100755 --- a/tests/misc/numfmt.pl +++ b/tests/misc/numfmt.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Basic tests for "numfmt". -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This 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,8 @@ use strict; (my $program_name = $0) =~ s|.*/||; my $prog = 'numfmt'; +my $limits = getlimits (); + # TODO: add localization tests with "grouping" # Turn off localization of executable's output. @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; @@ -92,10 +94,16 @@ my @Tests = ['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"}, + ['unit-7', '--from-unit=K 30', {OUT=>"30000"}], + ['unit-7.1', '--from-unit=Ki 30', {OUT=>"30720"}], + ['unit-7.2', '--from-unit=i 0', + {ERR => "$prog: invalid unit size: 'i'\n"}, + {EXIT => '1'}], + ['unit-7.3', '--from-unit=1i 0', + {ERR => "$prog: invalid unit size: '1i'\n"}, + {EXIT => '1'}], + ['unit-8', '--from-unit='.$limits->{UINTMAX_OFLOW}.' --to=iec 30', + {ERR => "$prog: invalid unit size: '$limits->{UINTMAX_OFLOW}'\n"}, {EXIT => '1'}], ['unit-9', '--from-unit=0 1', {ERR => "$prog: invalid unit size: '0'\n"}, @@ -188,21 +196,16 @@ my @Tests = ['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"}], + ['delim-6', '-d: --field 3 --from=auto 40M:60M', {OUT=>"40M:60M"}], #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"', + {OUT=>"Hello 40M "}, {ERR=>"$prog: invalid number: 'World'\n"}, {EXIT => 2},], # Last field - no text after number @@ -217,10 +220,32 @@ my @Tests = {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"}], + ['field-8', '--field 3 --to=si "Hello World"', {OUT=>"Hello World"}], + + # Multiple fields + ['field-range-1', '--field 2,4 --to=si "1000 2000 3000 4000 5000"', + {OUT=>"1000 2.0K 3000 4.0K 5000"}], + + ['field-range-2', '--field 2-4 --to=si "1000 2000 3000 4000 5000"', + {OUT=>"1000 2.0K 3.0K 4.0K 5000"}], + + ['field-range-3', '--field 1,2,3-5 --to=si "1000 2000 3000 4000 5000"', + {OUT=>"1.0K 2.0K 3.0K 4.0K 5.0K"}], + + ['field-range-4', '--field 1-5 --to=si "1000 2000 3000 4000 5000"', + {OUT=>"1.0K 2.0K 3.0K 4.0K 5.0K"}], + + ['field-range-5', '--field 1-3,5 --to=si "1000 2000 3000 4000 5000"', + {OUT=>"1.0K 2.0K 3.0K 4000 5.0K"}], + + ['field-range-6', '--field 3- --to=si "1000 2000 3000 4000 5000"', + {OUT=>"1000 2000 3.0K 4.0K 5.0K"}], + + ['field-range-7', '--field -3 --to=si "1000 2000 3000 4000 5000"', + {OUT=>"1.0K 2.0K 3.0K 4000 5000"}], + + ['all-fields-1', '--field=- --to=si "1000 2000 3000 4000 5000"', + {OUT=>"1.0K 2.0K 3.0K 4.0K 5.0K"}], # Auto-consume white-space, setup auto-padding ['whitespace-1', '--to=si --field 2 "A 500 B"', {OUT=>"A 500 B"}], @@ -336,15 +361,6 @@ my @Tests = {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"}, @@ -358,15 +374,6 @@ my @Tests = {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"}, @@ -502,128 +509,35 @@ my @Tests = {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"}, + # Leading zeros weren't handled appropriately before 8.24 + ['leading-1','0000000000000000000000000001', {OUT=>"1"}], + ['leading-2','.1', {OUT=>"0.1"}], + ['leading-3','bad.1', + {ERR => "$prog: invalid number: 'bad.1'\n"}, {EXIT => 2}], - ['large-4.18','--from=si 800Z', - {ERR => "$prog: value too large to be printed: '8e+23' " . - "(consider using --to)\n"}, + ['leading-4','..1', + {ERR => "$prog: invalid suffix in input: '..1'\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"}, + ['leading-5','1.', + {ERR => "$prog: invalid number: '1.'\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}], + # precision override + ['precision-1','--format=%.4f 9991239123 --to=si', {OUT=>"9.9913G"}], + ['precision-2','--format=%.1f 9991239123 --to=si', {OUT=>"10.0G"}], + ['precision-3','--format=%.1f 1', {OUT=>"1.0"}], + ['precision-4','--format=%.1f 1.12', {OUT=>"1.2"}], + ['precision-5','--format=%.1f 9991239123 --to-unit=G', {OUT=>"10.0"}], + ['precision-6','--format="% .1f" 9991239123 --to-unit=G', {OUT=>"10.0"}], + ['precision-7','--format=%.-1f 1.1', + {ERR => "$prog: invalid precision in format '%.-1f'\n"}, + {EXIT => 1}], + ['precision-8','--format=%.+1f 1.1', + {ERR => "$prog: invalid precision in format '%.+1f'\n"}, + {EXIT => 1}], + ['precision-9','--format="%. 1f" 1.1', + {ERR => "$prog: invalid precision in format '%. 1f'\n"}, + {EXIT => 1}], # debug warnings ['debug-1', '--debug 4096', {OUT=>"4096"}, @@ -632,14 +546,6 @@ my @Tests = ['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. @@ -673,14 +579,12 @@ my @Tests = ['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" . + {ERR=>"$prog: unrecognized option\n" . "Try '$prog --help' for more information.\n"}, + {ERR_SUBST=>"s/option.*/option/; s/unknown/unrecognized/"}, {EXIT=>1}], ## Format string - check error detection @@ -695,17 +599,17 @@ my @Tests = {EXIT=>1}], ['fmt-err-4', '--format "%d"', {ERR=>"$prog: invalid format '%d', " . - "directive must be %[0]['][-][N]f\n"}, + "directive must be %[0]['][-][N][.][N]f\n"}, {EXIT=>1}], ['fmt-err-5', '--format "% -43 f"', {ERR=>"$prog: invalid format '% -43 f', " . - "directive must be %[0]['][-][N]f\n"}, + "directive must be %[0]['][-][N][.][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'". + ['fmt-err-7', '--format "%'.$limits->{LONG_OFLOW}.'f"', + {ERR=>"$prog: invalid format '%$limits->{LONG_OFLOW}f'". " (width overflow)\n"}, {EXIT=>1}], ['fmt-err-9', '--format "%f" --grouping', @@ -781,11 +685,6 @@ my @Tests = {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"}, @@ -800,16 +699,6 @@ my @Tests = "'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', @@ -849,15 +738,184 @@ my @Tests = {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 @Limit_Tests = + ( + # 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}], + ['large-4','1000000000000000000.0', + {ERR => "$prog: value/precision too large to be printed: " . + "'1e+18/1' (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}], + + # intmax_t overflow when rounding caused this to fail before 8.24 + ['large-15',$limits->{INTMAX_OFLOW}, {OUT=>$limits->{INTMAX_OFLOW}}], + ['large-16','9.300000000000000000', {OUT=>'9.300000000000000000'}], + + # INTEGRAL_OVERFLOW + ['strtod-3', '--from=si "1234567890123456789012345678901234567890'. + '1234567890123456789012345678901234567890"', + {ERR=>"$prog: value too large to be converted: '" . + "1234567890123456789012345678901234567890" . + "1234567890123456789012345678901234567890'\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}], + + ['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"}], + + ['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}], + ); +# Restrict these tests to systems with LDBL_DIG == 18 +(system "$prog ---debug 1 2>&1|grep 'MAX_UNSCALED_DIGITS: 18' > /dev/null") == 0 + and push @Tests, @Limit_Tests; + my @Locale_Tests = ( # Locale that supports grouping, but without '--grouping' parameter diff --git a/tests/misc/od-N.sh b/tests/misc/od-N.sh index 247ea546..ec417d27 100755 --- a/tests/misc/od-N.sh +++ b/tests/misc/od-N.sh @@ -1,7 +1,7 @@ #!/bin/sh # Verify that 'od -N N' reads no more than N bytes of input. -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/od-endian.sh b/tests/misc/od-endian.sh index a01ae0a8..c3acca70 100755 --- a/tests/misc/od-endian.sh +++ b/tests/misc/od-endian.sh @@ -1,7 +1,7 @@ #!/bin/sh # verify that od --endian works properly -# Copyright (C) 2014 Free Software Foundation, Inc. +# Copyright (C) 2014-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/od-float.sh b/tests/misc/od-float.sh index 8a8e29b2..bbfa5704 100755 --- a/tests/misc/od-float.sh +++ b/tests/misc/od-float.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test od on floating-point values. -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This 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 @@ export LC_ALL=C # on x86: sometimes there was no space between the columns. set x $(echo aaaabaaa | tr ab '\376\377' | od -t fF) || - framework_failure_ + fail=1 case "$*" in *0-*) fail=1;; esac @@ -38,7 +38,7 @@ case $3,$4 in esac set x $(echo aaaaaaaabaaaaaaa | tr ab '\376\377' | od -t fD) || - framework_failure_ + fail=1 case "$*" in *0-*) fail=1;; esac @@ -47,7 +47,7 @@ case $3,$4 in esac set x $(echo aaaaaaaaaaaaaaaabaaaaaaaaaaaaaaa | tr ab '\376\377' | od -t fL) || - framework_failure_ + fail=1 case "$*" in *0-*) fail=1;; esac @@ -55,4 +55,18 @@ case $3,$4 in -1.023442870282055988e+4855,-1.023442870282055988e+4855) fail=1;; esac +# Ensure od doesn't crash as it did on glibc <= 2.5: +# https://sourceware.org/bugzilla/show_bug.cgi?id=4586 +set x $(printf 00000000ff000000 | tr 0f '\000\377' | od -t fL) || fail=1 +# With coreutils <= 8.7 we used to print "nan" for the above invalid value. +# However since v8.7-22-ga71c22f we deferred to the system printf routines +# through the use of the ftoastr module. So the following check would only +# be valid on x86_64 if we again handle the conversion internally or +# if this glibc bug is resolved: +# https://sourceware.org/bugzilla/show_bug.cgi?id=17661 +#case "$*" in +#*nan*) ;; +#*) fail=1;; +#esac + Exit $fail diff --git a/tests/misc/od-j.sh b/tests/misc/od-j.sh new file mode 100755 index 00000000..293aad5f --- /dev/null +++ b/tests/misc/od-j.sh @@ -0,0 +1,39 @@ +#!/bin/sh +# Verify that 'od -j N' skips N bytes of input. + +# Copyright 2014-2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ od + +for file in ${srcdir=.}/tests/init.sh /proc/version /sys/kernel/profiling; do + test -r $file || continue + + cp -f $file copy && + bytes=$(wc -c < copy) || framework_failure_ + + od -An $file > exp || fail=1 + od -An -j $bytes $file $file > out || fail=1 + compare exp out || fail=1 + + od -An -j 4096 copy copy > exp1 2> experr1; expstatus=$? + od -An -j 4096 $file $file > out1 2> err1; status=$? + test $status -eq $expstatus || fail=1 + compare exp1 out1 || fail=1 + compare experr1 err1 || fail=1 +done + +Exit $fail diff --git a/tests/misc/od-multiple-t.sh b/tests/misc/od-multiple-t.sh index 451fa2f5..07fc1a1f 100755 --- a/tests/misc/od-multiple-t.sh +++ b/tests/misc/od-multiple-t.sh @@ -2,7 +2,7 @@ # verify that multiple -t specifiers to od align well # This would fail before coreutils-6.13. -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/od-x8.sh b/tests/misc/od-x8.sh index 6e72dee7..c10f07fb 100755 --- a/tests/misc/od-x8.sh +++ b/tests/misc/od-x8.sh @@ -2,7 +2,7 @@ # verify that od -t x8 works properly # This would fail before coreutils-4.5.2. -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/od.pl b/tests/misc/od.pl index edddf4e3..601fbbcb 100755 --- a/tests/misc/od.pl +++ b/tests/misc/od.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Exercise od -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/paste.pl b/tests/misc/paste.pl index 04f8ec07..8d957f46 100755 --- a/tests/misc/paste.pl +++ b/tests/misc/paste.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test paste. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/pathchk1.sh b/tests/misc/pathchk1.sh index 616e763f..6c8a5088 100755 --- a/tests/misc/pathchk1.sh +++ b/tests/misc/pathchk1.sh @@ -1,7 +1,7 @@ #!/bin/sh # pathchk tests -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This 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,14 +25,14 @@ 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 +returns_ 1 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 +returns_ 1 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 +returns_ 1 pathchk -P '' > /dev/null 2>&1 || fail=1 +returns_ 1 pathchk -P -- - > /dev/null 2>&1 || fail=1 +returns_ 1 pathchk -p -P x/- > /dev/null 2>&1 || fail=1 Exit $fail diff --git a/tests/misc/printenv.sh b/tests/misc/printenv.sh index 054b02c2..862b48ba 100755 --- a/tests/misc/printenv.sh +++ b/tests/misc/printenv.sh @@ -1,7 +1,7 @@ #!/bin/sh # Verify behavior of printenv. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -23,8 +23,12 @@ print_ver_ printenv # 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 +# Note the apparently redundant "env env": this is to ensure to get +# env's output the same way as that of printenv and works around a bug +# on aarch64 at least where libc's execvp reverses the order of the +# output. +env -- 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. diff --git a/tests/misc/printf-cov.pl b/tests/misc/printf-cov.pl index 3d797284..4be97971 100755 --- a/tests/misc/printf-cov.pl +++ b/tests/misc/printf-cov.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # improve printf.c test coverage -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/printf-hex.sh b/tests/misc/printf-hex.sh index 27503fae..04044560 100755 --- a/tests/misc/printf-hex.sh +++ b/tests/misc/printf-hex.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure that only two hex. digits are consumed in a \xHHH sequence -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/printf-surprise.sh b/tests/misc/printf-surprise.sh index 6083806d..20e6b098 100755 --- a/tests/misc/printf-surprise.sh +++ b/tests/misc/printf-surprise.sh @@ -1,7 +1,7 @@ #!/bin/sh # Detect printf(3) failure even when it doesn't set stream error indicator -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This 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,10 @@ mkfifo_or_skip_ fifo # http://bugs.debian.org/481543#77 export MALLOC_PERTURB_=0 -head -c 10 fifo > out & +# Terminate any background process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + +head -c 10 fifo > out & pid=$! # Choosing the virtual memory limit, 11000 is enough, but 10000 is too # little and provokes a "memory exhausted" diagnostic on FreeBSD 9.0-p3. @@ -63,7 +66,7 @@ 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' :) +err_msg=$(tr '\n' : < err-msg) # By some bug, on Solaris 11 (5.11 snv_86), err_msg ends up # containing '1> fifo:printf: write error:'. Recognize that, too. diff --git a/tests/misc/printf.sh b/tests/misc/printf.sh index b2292252..87ca489f 100755 --- a/tests/misc/printf.sh +++ b/tests/misc/printf.sh @@ -1,7 +1,7 @@ #!/bin/sh # basic tests for printf -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This 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,9 @@ getlimits_ # Verify the 3 methods of specifying "Escape": -test $($prog "\x1b\n\33\n\e\n" | uniq -u) && fail=1 +printf '%s\n' . . . | tr . '\033' > exp +$prog '\x1b\n\33\n\e\n' > out || fail=1 +compare exp out || fail=1 # This would fail (by printing the '--') for printf in sh-utils # and in coreutils 4.5.1. @@ -68,17 +70,17 @@ $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 +returns_ 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 +returns_ 1 $prog '%#d\n' 0 >>out 2> /dev/null || fail=1 -$prog '%0s\n' 0 >>out 2> /dev/null && fail=1 +returns_ 1 $prog '%0s\n' 0 >>out 2> /dev/null || fail=1 -$prog '%.9c\n' 0 >>out 2> /dev/null && fail=1 +returns_ 1 $prog '%.9c\n' 0 >>out 2> /dev/null || fail=1 -$prog '%'\''s\n' 0 >>out 2> /dev/null && fail=1 +returns_ 1 $prog '%'\''s\n' 0 >>out 2> /dev/null || fail=1 cat <<\EOF > exp 1 x y diff --git a/tests/misc/ptx-overrun.sh b/tests/misc/ptx-overrun.sh index be9fb524..301e8dc6 100755 --- a/tests/misc/ptx-overrun.sh +++ b/tests/misc/ptx-overrun.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/ptx.pl b/tests/misc/ptx.pl index 8a91d616..83583238 100755 --- a/tests/misc/ptx.pl +++ b/tests/misc/ptx.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/pwd-long.sh b/tests/misc/pwd-long.sh index 1ba0c1a9..3ced777a 100755 --- a/tests/misc/pwd-long.sh +++ b/tests/misc/pwd-long.sh @@ -2,7 +2,7 @@ # -*- perl -*- # Ensure that pwd works even when run from a very deep directory. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This 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,7 +56,6 @@ sub normalize_to_cwd_relative ($$$) } # 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 diff --git a/tests/misc/pwd-option.sh b/tests/misc/pwd-option.sh index 0eba9429..fb2ad15b 100755 --- a/tests/misc/pwd-option.sh +++ b/tests/misc/pwd-option.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that pwd options work. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/readlink-fp-loop.sh b/tests/misc/readlink-fp-loop.sh index 4ae2dc52..1c4428b9 100755 --- a/tests/misc/readlink-fp-loop.sh +++ b/tests/misc/readlink-fp-loop.sh @@ -1,7 +1,7 @@ #!/bin/sh # readlink from 6.9 would fail with a false-positive symlink loop error -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/readlink-root.sh b/tests/misc/readlink-root.sh index f33574cb..44693bdf 100755 --- a/tests/misc/readlink-root.sh +++ b/tests/misc/readlink-root.sh @@ -1,7 +1,7 @@ #!/bin/sh # tests for canonicalize-existing mode (readlink -e) on /. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/realpath.sh b/tests/misc/realpath.sh index 257b9f24..ed4be396 100755 --- a/tests/misc/realpath.sh +++ b/tests/misc/realpath.sh @@ -1,7 +1,7 @@ #!/bin/sh # Validate realpath operation -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This 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,17 +42,17 @@ 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 +returns_ 1 realpath >/dev/null || fail=1 +returns_ 1 realpath --relative-base . --relative-to . || fail=1 +returns_ 1 realpath --relative-base . || fail=1 # -e --relative-* require directories -realpath -e --relative-to=dir1/f --relative-base=. . && fail=1 +returns_ 1 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 +returns_ 1 realpath -m '' || fail=1 +returns_ 1 realpath --relative-base= --relative-to=. . || fail=1 # symlink resolution this=$(realpath .) diff --git a/tests/misc/runcon-no-reorder.sh b/tests/misc/runcon-no-reorder.sh index ca8ad5b3..274d2d7d 100755 --- a/tests/misc/runcon-no-reorder.sh +++ b/tests/misc/runcon-no-reorder.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that runcon does not reorder its arguments. -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/selinux.sh b/tests/misc/selinux.sh index 2a8ad89f..1f906dde 100755 --- a/tests/misc/selinux.sh +++ b/tests/misc/selinux.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test SELinux-related options. -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -47,7 +47,7 @@ c=$(ls -l f|cut -c11); test "$c" = . || fail=1 # Copy with an invalid context and ensure it fails # Note this may succeed when root and selinux is in permissive mode if test "$(getenforce)" = Enforcing; then - cp --context='invalid-selinux-context' f f.cp && fail=1 + returns_ 1 cp --context='invalid-selinux-context' f f.cp || fail=1 fi # Copy each to a new directory and ensure that context is preserved. diff --git a/tests/misc/seq-long-double.sh b/tests/misc/seq-long-double.sh index 78ed50f5..dbc59386 100755 --- a/tests/misc/seq-long-double.sh +++ b/tests/misc/seq-long-double.sh @@ -3,7 +3,7 @@ # Ensure that seq prints exactly two numbers for a 2-number integral # range at the limit of floating point precision. -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/seq-precision.sh b/tests/misc/seq-precision.sh new file mode 100755 index 00000000..b8382ca1 --- /dev/null +++ b/tests/misc/seq-precision.sh @@ -0,0 +1,79 @@ +#!/bin/sh +# Test for output with appropriate precision + +# Copyright (C) 2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ seq + +# Integer only. Before v8.24 these would switch output format + +seq 999999 inf | head -n2 > out || fail=1 +printf "%s\n" 999999 1000000 > exp || framework_failure_ +compare exp out || fail=1 + +# Excercise buffer handling in non floating point output +for i in $(seq 100); do + n1="$(printf '%*s' $i '' | tr ' ' 9)" + n2="1$(echo $n1 | tr 9 0)" + + seq $n1 $n2 > out || fail=1 + printf "%s\n" "$n1" "$n2" > exp || framework_failure_ + compare exp out || fail=1 +done + +seq 0xF423F 0xF4240 > out || fail=1 +printf "%s\n" 999999 1000000 > exp || framework_failure_ +compare exp out || fail=1 + +# Ensure consistent precision for inf +seq 1 .1 inf | head -n2 > out || fail=1 +printf "%s\n" 1.0 1.1 > exp || framework_failure_ +compare exp out || fail=1 + +# Ensure standard output methods with inf start +seq inf inf | head -n2 | uniq > out || fail=1 +test "$(wc -l < out)" = 1 || fail=1 + +# Ensure auto precision for hex float +seq 1 0x1p-1 2 > out || fail=1 +printf "%s\n" 1 1.5 2 > exp || framework_failure_ +compare exp out || fail=1 + +# Ensure consistent precision for hex +seq 1 .1 0x2 | head -n2 > out || fail=1 +printf "%s\n" 1.0 1.1 > exp || framework_failure_ +compare exp out || fail=1 + +# Ensure consistent handling of precision/width for exponents + +seq 1.1e1 12 > out || fail=1 +printf "%s\n" 11 12 > exp || framework_failure_ +compare exp out || fail=1 + +seq 11 1.2e1 > out || fail=1 +printf "%s\n" 11 12 > exp || framework_failure_ +compare exp out || fail=1 + +seq -w 1.1e4 | head -n1 > out || fail=1 +printf "%s\n" 00001 > exp || framework_failure_ +compare exp out || fail=1 + +seq -w 1.10000e5 1.10000e5 > out || fail=1 +printf "%s\n" 110000 > exp || framework_failure_ +compare exp out || fail=1 + +Exit $fail diff --git a/tests/misc/seq.pl b/tests/misc/seq.pl index 92484363..d24acad1 100755 --- a/tests/misc/seq.pl +++ b/tests/misc/seq.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test "seq". -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sha1sum-vec.pl b/tests/misc/sha1sum-vec.pl index 14005a76..fdf20459 100755 --- a/tests/misc/sha1sum-vec.pl +++ b/tests/misc/sha1sum-vec.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Sample vectors for "sha1sum". -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sha1sum.pl b/tests/misc/sha1sum.pl index fdb243a0..de923b63 100755 --- a/tests/misc/sha1sum.pl +++ b/tests/misc/sha1sum.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test "sha1sum". -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sha224sum.pl b/tests/misc/sha224sum.pl index 384738b8..71464a6c 100755 --- a/tests/misc/sha224sum.pl +++ b/tests/misc/sha224sum.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test "sha224sum". -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sha256sum.pl b/tests/misc/sha256sum.pl index e5f29392..ae724f50 100755 --- a/tests/misc/sha256sum.pl +++ b/tests/misc/sha256sum.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test "sha256sum". -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sha384sum.pl b/tests/misc/sha384sum.pl index eafbf5b4..6cf8797c 100755 --- a/tests/misc/sha384sum.pl +++ b/tests/misc/sha384sum.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test "sha384sum". -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sha512sum.pl b/tests/misc/sha512sum.pl index c4a1cd4a..157a1158 100755 --- a/tests/misc/sha512sum.pl +++ b/tests/misc/sha512sum.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test "sha512sum". -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/shred-exact.sh b/tests/misc/shred-exact.sh index 5434229c..679e2675 100755 --- a/tests/misc/shred-exact.sh +++ b/tests/misc/shred-exact.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test functionality of --exact -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This 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 @@ done # make sure direct I/O is handled appropriately at end of file # Create a 1MiB file as we'll probably not be using blocks larger than that -# (i.e. we want to test failed writes not at the start). +# (i.e., we want to test failed writes not at the start). truncate -s1MiB file.slop || framework_failure_ truncate -s+1 file.slop || framework_failure_ shred --exact -n2 file.slop || fail=1 diff --git a/tests/misc/shred-negative.sh b/tests/misc/shred-negative.sh deleted file mode 100755 index 86cbf3e0..00000000 --- a/tests/misc/shred-negative.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# Exercise shred -s-3 FILE - -# Copyright (C) 2014 Free Software Foundation, Inc. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src -print_ver_ shred - -echo 'shred: -2: invalid file size' > exp || framework_failure_ -echo 1234 > f || framework_failure_ - -shred -s-2 f 2>err && fail=1 -compare exp err || fail=1 - -Exit $fail diff --git a/tests/misc/shred-passes.sh b/tests/misc/shred-passes.sh index 268af950..0fa63be2 100755 --- a/tests/misc/shred-passes.sh +++ b/tests/misc/shred-passes.sh @@ -1,7 +1,7 @@ #!/bin/sh # Verify the operations done by shred -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/shred-remove.sh b/tests/misc/shred-remove.sh index 9765e352..cb27c1ca 100755 --- a/tests/misc/shred-remove.sh +++ b/tests/misc/shred-remove.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise shred --remove -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -30,7 +30,7 @@ chmod 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 +returns_ 1 shred -u $file > /dev/null 2>&1 || fail=1 rm -f $file || framework_failure_ # Ensure all --remove methods at least unlink the file @@ -42,6 +42,6 @@ done # Ensure incorrect params are diagnosed touch $file || framework_failure_ -shred -n0 --remove=none $file 2>/dev/null && fail=1 +returns_ 1 shred -n0 --remove=none $file 2>/dev/null || fail=1 Exit $fail diff --git a/tests/misc/shred-size.sh b/tests/misc/shred-size.sh new file mode 100755 index 00000000..c6ac2d07 --- /dev/null +++ b/tests/misc/shred-size.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# Exercise shred --size + +# Copyright (C) 2014-2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ shred + +# Negative size +echo "shred: invalid file size: '-2'" > exp || framework_failure_ +echo 1234 > f || framework_failure_ +shred -s-2 f 2>err && fail=1 +compare exp err || fail=1 + +# Octal/Hex +shred -s010 f || fail=1 +test $(stat --printf=%s f) = 8 || fail=1 +shred -s0x10 f || fail=1 +test $(stat --printf=%s f) = 16 || fail=1 + +Exit $fail diff --git a/tests/misc/shuf-reservoir.sh b/tests/misc/shuf-reservoir.sh index aa9edbea..3eea5e70 100755 --- a/tests/misc/shuf-reservoir.sh +++ b/tests/misc/shuf-reservoir.sh @@ -4,7 +4,7 @@ # These tests do not check valid randomness, # they just check memory allocation related code. -# Copyright (C) 2013-2014 Free Software Foundation, Inc. +# Copyright (C) 2013-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/shuf.sh b/tests/misc/shuf.sh index d7251d1d..c7db14f6 100755 --- a/tests/misc/shuf.sh +++ b/tests/misc/shuf.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that shuf randomizes its input. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -47,6 +47,11 @@ test "$t" = 'a b c d e' || { fail=1; echo "not a permutation" 1>&2; } shuf -er test $? -eq 1 || fail=1 +# coreutils-8.22 and 8.23 dump core +# with a single redundant operand with --input-range +shuf -i0-0 1 +test $? -eq 1 || fail=1 + # Before coreutils-6.3, this would infloop. # "seq 1860" produces 8193 (8K + 1) bytes of output. seq 1860 | shuf > /dev/null || fail=1 @@ -66,7 +71,7 @@ touch unreadable || framework_failure_ chmod 0 unreadable || framework_failure_ if ! test -r unreadable; then shuf -n0 unreadable || fail=1 - shuf -n1 unreadable && fail=1 + { shuf -n1 unreadable || test $? -ne 1; } && fail=1 fi # Multiple -n is accepted, should use the smallest value @@ -77,25 +82,25 @@ test "$c" -eq 3 || { fail=1; echo "Multiple -n failed">&2 ; } # Test error conditions # -i and -e must not be used together -: | shuf -i0-9 -e A B && +: | { shuf -i0-9 -e A B || test $? -ne 1; } && { fail=1; echo "shuf did not detect erroneous -e and -i usage.">&2 ; } # Test invalid value for -n -: | shuf -nA && +: | { shuf -nA || test $? -ne 1; } && { fail=1; echo "shuf did not detect erroneous -n usage.">&2 ; } # Test multiple -i -shuf -i0-9 -n10 -i8-90 && +{ shuf -i0-9 -n10 -i8-90 || test $? -ne 1; } && { fail=1; echo "shuf did not detect multiple -i usage.">&2 ; } # Test invalid range for ARG in '1' 'A' '1-' '1-A'; do - shuf -i$ARG && + { shuf -i$ARG || test $? -ne 1; } && { fail=1; echo "shuf did not detect erroneous -i$ARG usage.">&2 ; } done # multiple -o are forbidden -shuf -i0-9 -o A -o B && +{ shuf -i0-9 -o A -o B || test $? -ne 1; } && { fail=1; echo "shuf did not detect erroneous multiple -o usage.">&2 ; } # multiple random-sources are forbidden -shuf -i0-9 --random-source A --random-source B && +{ shuf -i0-9 --random-source A --random-source B || test $? -ne 1; } && { fail=1; echo "shuf did not detect multiple --random-source usage.">&2 ; } # Test --repeat option @@ -120,7 +125,7 @@ test "$c" = "0 1 2 3 4 5 6 7 8 9" || # check --repeat with non-zero low value shuf --rep -i222-233 -n2000 > exp || framework_failure_ -c=$(cat exp | sort -nu | paste -s -d ' ') || framework_failure_ +c=$(sort -nu exp | paste -s -d ' ') || framework_failure_ test "$c" = "222 223 224 225 226 227 228 229 230 231 232 233" || { fail=1; echo "--repeat produced bad output with non-zero low">&2 ; } diff --git a/tests/misc/sort-NaN-infloop.sh b/tests/misc/sort-NaN-infloop.sh index 9c6e021a..15fa4e52 100755 --- a/tests/misc/sort-NaN-infloop.sh +++ b/tests/misc/sort-NaN-infloop.sh @@ -1,7 +1,7 @@ #!/bin/sh # exercise the NaN-infloop bug in coreutils-8.13 -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sort-benchmark-random.sh b/tests/misc/sort-benchmark-random.sh index c074301f..d13073e2 100755 --- a/tests/misc/sort-benchmark-random.sh +++ b/tests/misc/sort-benchmark-random.sh @@ -1,7 +1,7 @@ #!/bin/sh # Benchmark sort on randomly generated data. -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sort-compress-hang.sh b/tests/misc/sort-compress-hang.sh index cc1e6d36..dc101fea 100755 --- a/tests/misc/sort-compress-hang.sh +++ b/tests/misc/sort-compress-hang.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test for sort --compress hang -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,8 +20,8 @@ print_ver_ sort very_expensive_ -cat <<\EOF >compress || framework_failure_ -#!/bin/sh +cat <compress || framework_failure_ +#!$SHELL tr 41 14 || exit touch ok EOF diff --git a/tests/misc/sort-compress-proc.sh b/tests/misc/sort-compress-proc.sh index d06eb56f..05017a54 100755 --- a/tests/misc/sort-compress-proc.sh +++ b/tests/misc/sort-compress-proc.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test use of compression subprocesses by sort -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This 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,11 @@ print_ver_ sort expensive_ +# Terminate any background processes +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + +SORT_FAILURE=2 + seq -w 2000 > exp || fail=1 tac exp > in || fail=1 insize=$(stat -c %s - compress || framework_failure_ -#!/bin/sh + +printf '%s\n' '#!'"$SHELL" >compress || framework_failure_ +cat <<\EOF >>compress || framework_failure_ eval "$PRE_COMPRESS" tr 41 14 || exit eval "$POST_COMPRESS" @@ -52,7 +58,8 @@ do 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 + ' sort --compress-program=./compress -S 1k --batch-size=2 in > out + test $? -eq $SORT_FAILURE || fail=1 done # "Pre-exec child" test @@ -60,7 +67,7 @@ done # Ignore a random child process created before 'sort' was exec'ed. # This bug was also present in coreutils 8.7. # -( (sleep 1; exec false) & +( (sleep 1; exec false) & pid=$! PRE_COMPRESS='test -f ok || sleep 2' POST_COMPRESS='touch ok' exec sort --compress-program=./compress -S 1k in >out diff --git a/tests/misc/sort-compress.sh b/tests/misc/sort-compress.sh index 8f215b8b..584110e1 100755 --- a/tests/misc/sort-compress.sh +++ b/tests/misc/sort-compress.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test use of compression by sort -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This 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,8 +27,8 @@ 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 +cat < gzip || fail=1 +#!$SHELL tr 41 14 touch ok EOF diff --git a/tests/misc/sort-continue.sh b/tests/misc/sort-continue.sh index 1c4030d9..0860287a 100755 --- a/tests/misc/sort-continue.sh +++ b/tests/misc/sort-continue.sh @@ -1,7 +1,7 @@ #!/bin/sh # Tests for file descriptor exhaustion. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sort-debug-keys.sh b/tests/misc/sort-debug-keys.sh index ff1e19b6..776fb67c 100755 --- a/tests/misc/sort-debug-keys.sh +++ b/tests/misc/sort-debug-keys.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test annotation of sort keys -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sort-debug-warn.sh b/tests/misc/sort-debug-warn.sh index fd16829b..19015664 100755 --- a/tests/misc/sort-debug-warn.sh +++ b/tests/misc/sort-debug-warn.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test warnings for sort options -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sort-discrim.sh b/tests/misc/sort-discrim.sh index e3cd1907..9b7ad997 100755 --- a/tests/misc/sort-discrim.sh +++ b/tests/misc/sort-discrim.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test discriminator-based sorting. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sort-exit-early.sh b/tests/misc/sort-exit-early.sh index 2a70253e..c675503c 100755 --- a/tests/misc/sort-exit-early.sh +++ b/tests/misc/sort-exit-early.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test 'sort' exits early on inaccessible inputs or output -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This 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,18 +20,18 @@ print_ver_ sort skip_if_root_ +SORT_FAILURE=2 + # 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 +returns_ $SORT_FAILURE timeout 10 sort -o input || 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 +returns_ $SORT_FAILURE timeout 10 sort -o typo - output || fail=1 test -e typo && fail=1 Exit $fail diff --git a/tests/misc/sort-files0-from.pl b/tests/misc/sort-files0-from.pl index 77c1b1aa..63c5bb3e 100755 --- a/tests/misc/sort-files0-from.pl +++ b/tests/misc/sort-files0-from.pl @@ -2,7 +2,7 @@ # Exercise sort's --files0-from option. # FIXME: keep this file in sync with tests/du/files0-from. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sort-float.sh b/tests/misc/sort-float.sh index 7a4e8292..1c760baf 100755 --- a/tests/misc/sort-float.sh +++ b/tests/misc/sort-float.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure sort -g sorts floating point limits correctly -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sort-merge-fdlimit.sh b/tests/misc/sort-merge-fdlimit.sh index 0df7aa66..ce1a6c48 100755 --- a/tests/misc/sort-merge-fdlimit.sh +++ b/tests/misc/sort-merge-fdlimit.sh @@ -2,7 +2,7 @@ # Test whether sort avoids opening more file descriptors than it is # allowed when merging files. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sort-merge.pl b/tests/misc/sort-merge.pl index 06e3c15f..c60e2626 100755 --- a/tests/misc/sort-merge.pl +++ b/tests/misc/sort-merge.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test "sort -m". -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sort-month.sh b/tests/misc/sort-month.sh index 40c814da..ab49cc28 100755 --- a/tests/misc/sort-month.sh +++ b/tests/misc/sort-month.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test sorting of abbreviated months from the locale -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sort-rand.sh b/tests/misc/sort-rand.sh index 2397fb4b..3fc5fef2 100755 --- a/tests/misc/sort-rand.sh +++ b/tests/misc/sort-rand.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that sort --sort-random doesn't sort. -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sort-spinlock-abuse.sh b/tests/misc/sort-spinlock-abuse.sh index 49ed920f..e81abf80 100755 --- a/tests/misc/sort-spinlock-abuse.sh +++ b/tests/misc/sort-spinlock-abuse.sh @@ -2,7 +2,7 @@ # trigger a bug that would make parallel sort use 100% of one or more # CPU while blocked on output. -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This 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,16 @@ very_expensive_ grep '^#define HAVE_PTHREAD_T 1' "$CONFIG_HEADER" > /dev/null || skip_ 'requires pthreads' +# Terminate any background processes +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + 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 & + cat > /dev/null) < fifo & pid=$! # However, under heavy load, it can easily take more than # one second of CPU time, so set a permissive limit: diff --git a/tests/misc/sort-stale-thread-mem.sh b/tests/misc/sort-stale-thread-mem.sh index 78defd23..dd4789eb 100755 --- a/tests/misc/sort-stale-thread-mem.sh +++ b/tests/misc/sort-stale-thread-mem.sh @@ -1,7 +1,7 @@ #!/bin/sh # Trigger a bug that would cause 'sort' to reference stale thread stack memory. -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sort-u-FMR.sh b/tests/misc/sort-u-FMR.sh index 3019cbe8..0720ed43 100755 --- a/tests/misc/sort-u-FMR.sh +++ b/tests/misc/sort-u-FMR.sh @@ -1,7 +1,7 @@ #!/bin/sh # Before 8.19, this would trigger a free-memory read. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sort-unique-segv.sh b/tests/misc/sort-unique-segv.sh index 148dc243..bd0dc575 100755 --- a/tests/misc/sort-unique-segv.sh +++ b/tests/misc/sort-unique-segv.sh @@ -1,7 +1,7 @@ #!/bin/sh # parallel sort with --unique (-u) would segfault -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sort-unique.sh b/tests/misc/sort-unique.sh index d7a7629c..eaaef681 100755 --- a/tests/misc/sort-unique.sh +++ b/tests/misc/sort-unique.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test 'sort -u'. -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sort-version.sh b/tests/misc/sort-version.sh index d8db1e1c..383f100f 100755 --- a/tests/misc/sort-version.sh +++ b/tests/misc/sort-version.sh @@ -1,7 +1,7 @@ #!/bin/sh # exercise sort's --sort=version option -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sort.pl b/tests/misc/sort.pl index db732094..f6a222c2 100755 --- a/tests/misc/sort.pl +++ b/tests/misc/sort.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -271,11 +271,11 @@ my @Tests = ["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. +# 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. +# 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"}], @@ -317,6 +317,10 @@ my @Tests = ["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"}], +# This fails in Fedora 20, per Göran Uddeborg in: http://bugs.gnu.org/18540 +["23", '-s -k1,1 -t/', {IN=>"a b/x\na-b-c/x\n"}, {OUT=>"a b/x\na-b-c/x\n"}, + {ENV => "LC_ALL=$mb_locale"}], + ["no-file1", 'no-file', {EXIT=>2}, {ERR=>$no_file}], # This test failed until 1.22f. Sort didn't give an error. # From Will Edgington. diff --git a/tests/misc/stat-birthtime.sh b/tests/misc/stat-birthtime.sh index f06ddea8..d7877c59 100755 --- a/tests/misc/stat-birthtime.sh +++ b/tests/misc/stat-birthtime.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that stat attempts birthtime access -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/stat-fmt.sh b/tests/misc/stat-fmt.sh index 3982f23b..2a3e9d2a 100755 --- a/tests/misc/stat-fmt.sh +++ b/tests/misc/stat-fmt.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that stat properly handles a format string ending with % -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/stat-hyphen.sh b/tests/misc/stat-hyphen.sh index 9f090a0f..a2e0a3fb 100755 --- a/tests/misc/stat-hyphen.sh +++ b/tests/misc/stat-hyphen.sh @@ -1,7 +1,7 @@ #!/bin/sh # demonstrate that stat - works and stat -f - does not. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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 @@ printf -- '-\n' > exp || framework_failure_ touch f || framework_failure_ stat --format=%n - < f > out || fail=1 -stat -f - < f && fail=1 +returns_ 1 stat -f - < f || fail=1 compare exp out || fail=1 diff --git a/tests/misc/stat-mount.sh b/tests/misc/stat-mount.sh index ab1ff479..34193875 100755 --- a/tests/misc/stat-mount.sh +++ b/tests/misc/stat-mount.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test stat -c%m -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/stat-nanoseconds.sh b/tests/misc/stat-nanoseconds.sh index 30c47c02..f08ac983 100755 --- a/tests/misc/stat-nanoseconds.sh +++ b/tests/misc/stat-nanoseconds.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise format strings involving %:X, %:Y, etc. -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/stat-printf.pl b/tests/misc/stat-printf.pl index 5021130d..967eef7d 100755 --- a/tests/misc/stat-printf.pl +++ b/tests/misc/stat-printf.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test "stat --printf". -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/stat-slash.sh b/tests/misc/stat-slash.sh index 465de2ed..fecb7b69 100755 --- a/tests/misc/stat-slash.sh +++ b/tests/misc/stat-slash.sh @@ -1,7 +1,7 @@ #!/bin/sh # demonstrate that stat handles trailing slashes correctly -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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 @@ EOF # This failed on Solaris 9 for coreutils 8.0. stat --format=%n link1 > out || fail=1 -stat --format=%n link1/ >> out && fail=1 +returns_ 1 stat --format=%n link1/ >> out || fail=1 stat --format=%F link2 >> out || fail=1 stat -L --format=%F link2 >> out || fail=1 diff --git a/tests/misc/stdbuf.sh b/tests/misc/stdbuf.sh index e0ca3530..428d4a2f 100755 --- a/tests/misc/stdbuf.sh +++ b/tests/misc/stdbuf.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise stdbuf functionality -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -58,15 +58,18 @@ test $? = 126 || fail=1 stdbuf -o1 no_such # no such command test $? = 127 || fail=1 +# Terminate any background processes +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + # Ensure line buffering stdout takes effect stdbuf_linebuffer() { local delay="$1" printf '1\n' > exp - dd count=1 if=fifo > out 2> err & + dd count=1 if=fifo > out 2> err & pid=$! (printf '1\n'; sleep $delay; printf '2\n') | stdbuf -oL uniq > fifo - wait # for dd to complete + wait $pid compare exp out } @@ -78,16 +81,16 @@ stdbuf_unbuffer() # Ensure un buffering stdout takes effect printf '1\n' > exp - dd count=1 if=fifo > out 2> err & + dd count=1 if=fifo > out 2> err & pid=$! (printf '1\n'; sleep $delay; printf '2\n') | stdbuf -o0 uniq > fifo - wait # for dd to complete + wait $pid 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 +# 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 diff --git a/tests/misc/stty-invalid.sh b/tests/misc/stty-invalid.sh index 36bc8aa0..881146f6 100755 --- a/tests/misc/stty-invalid.sh +++ b/tests/misc/stty-invalid.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that stty diagnoses invalid inputs, rather than silently misbehaving. -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This 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,8 +34,10 @@ stty $saved_state || fail=1 # 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 +returns_ 1 stty $(echo $saved_state |sed 's/^[^:]*:/'$hex_2_64:/) \ + 2>/dev/null || fail=1 +returns_ 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. diff --git a/tests/misc/stty-pairs.sh b/tests/misc/stty-pairs.sh index 1a7c26cf..129c22f0 100755 --- a/tests/misc/stty-pairs.sh +++ b/tests/misc/stty-pairs.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure stty can parse most of its options - in pairs [expensive]. -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/stty-row-col.sh b/tests/misc/stty-row-col.sh index 729d6f91..0616812e 100755 --- a/tests/misc/stty-row-col.sh +++ b/tests/misc/stty-row-col.sh @@ -1,7 +1,7 @@ #! /bin/sh # Test "stty" with rows and columns. -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -47,6 +47,8 @@ tests=' 7 rows_1 1_1 8 columns_80 1_80 9 rows_30 30_80 +10 rows_0x1E 30_80 +11 rows_036 30_80 NA LAST NA ' set $tests diff --git a/tests/misc/stty.sh b/tests/misc/stty.sh index ab1c78de..5e39b72e 100755 --- a/tests/misc/stty.sh +++ b/tests/misc/stty.sh @@ -1,7 +1,7 @@ #! /bin/sh # Make sure stty can parse most of its options. -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This 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,9 +34,9 @@ stty $(cat $saved_state) || fail=1 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 +returns_ 1 stty -F 2>/dev/null || fail=1 +returns_ 1 stty -raw -F no/such/file 2>/dev/null || fail=1 +returns_ 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, @@ -57,6 +57,10 @@ for opt in $options; do cstopb|crtscts|cdtrdsr|icanon) continue;; esac + # This is listed as supported on FreeBSD + # but the ioctl returns ENOTTY. + test $opt = extproc && continue + stty $opt || fail=1 # Likewise, 'stty -cread' would fail, so skip that, too. diff --git a/tests/misc/sum-sysv.sh b/tests/misc/sum-sysv.sh index 7624685f..8b732eef 100755 --- a/tests/misc/sum-sysv.sh +++ b/tests/misc/sum-sysv.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure 'sum -s' works for input whose sum of bytes is larger than 2^32 -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sum.pl b/tests/misc/sum.pl index 696eda4b..7b9412ef 100755 --- a/tests/misc/sum.pl +++ b/tests/misc/sum.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test "sum". -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/sync.sh b/tests/misc/sync.sh new file mode 100755 index 00000000..c6e09beb --- /dev/null +++ b/tests/misc/sync.sh @@ -0,0 +1,52 @@ +#!/bin/sh +# Test various sync(1) operations + +# Copyright (C) 2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ sync + +touch file + +# fdatasync+syncfs is nonsensical +returns_ 1 sync --data --file-system || fail=1 + +# fdatasync needs an operand +returns_ 1 sync -d || fail=1 + +# Test syncing of file (fsync) (little side effects) +sync file || fail=1 + +# Ensure multiple args are processed and diagnosed +returns_ 1 sync file nofile || fail=1 + +# Ensure inaccessible dirs give an appropriate error +mkdir norw || framework_failure_ +chmod 0 norw || framework_failure_ +if ! test -r norw; then + sync norw 2>err + printf "sync: error opening 'norw': Permission denied\n" >exp + compare exp err || fail=1 +fi + +if test "$fail" != '1'; then + # Ensure a fifo doesn't block + mkfifo_or_skip_ fifo + timeout 10 sync fifo + test $? = 124 && fail=1 +fi + +Exit $fail diff --git a/tests/misc/tac-2-nonseekable.sh b/tests/misc/tac-2-nonseekable.sh index c27694c1..60f3dd4d 100755 --- a/tests/misc/tac-2-nonseekable.sh +++ b/tests/misc/tac-2-nonseekable.sh @@ -1,7 +1,7 @@ #!/bin/sh -# ensure that tac works with two or more non-seekable inputs +# ensure that tac works with non-seekable or quasi-seekable inputs -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This 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,4 +24,16 @@ echo x > exp || fail=1 compare exp out || fail=1 compare /dev/null err || fail=1 +# Make sure it works on funny files in /proc and /sys. + +for file in /proc/version /sys/kernel/profiling; do + if test -r $file; then + cp -f $file copy && + tac copy > exp1 || framework_failure_ + + tac $file > out1 || fail=1 + compare exp1 out1 || fail=1 + fi +done + Exit $fail diff --git a/tests/misc/tac-continue.sh b/tests/misc/tac-continue.sh index d4280650..1389072b 100755 --- a/tests/misc/tac-continue.sh +++ b/tests/misc/tac-continue.sh @@ -3,7 +3,7 @@ # when it encounters an error with say the first one. # With coreutils-5.2.1 and earlier, this test would fail. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This 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,9 +33,15 @@ if ! test -d "$FULL_PARTITION_TMPDIR"; then 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). +cleanup_() +{ + # Terminate any background process + # and remove tmp dir + rm -f "$fp_tmp" + kill $pid 2>/dev/null && wait $pid +} + +# 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 @@ -54,7 +60,7 @@ 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 & +seq 1000 > fifo & pid=$! TMPDIR=$FULL_PARTITION_TMPDIR tac fifo in >out 2>err && fail=1 cat <<\EOF > exp || fail=1 diff --git a/tests/misc/tac.pl b/tests/misc/tac.pl index 0f21affd..38196d23 100755 --- a/tests/misc/tac.pl +++ b/tests/misc/tac.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/tail.pl b/tests/misc/tail.pl index 6798eb05..7f113aaf 100755 --- a/tests/misc/tail.pl +++ b/tests/misc/tail.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test tail. -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ use strict; my $prog = 'tail'; -my $normalize_filename = {ERR_SUBST => 's/^$prog: .*?:/$prog: -:/'}; +my $normalize_strerror = "s/': .*/'/"; # Turn off localization of executable's output. @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; @@ -59,7 +59,7 @@ my @tv = ( "$prog: cannot open '+cl' for reading: No such file or directory\n"], ['err-2', '-cl', '', '', 1, - "$prog: l: invalid number of bytes\n"], + "$prog: invalid number of bytes: 'l'\n", $normalize_strerror], ['err-3', '+2cz', '', '', 1, "$prog: cannot open '+2cz' for reading: No such file or directory\n"], @@ -72,9 +72,10 @@ my @tv = ( # 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"], + "$prog: invalid number of bytes: '99999999999999999999'\n", + $normalize_strerror], ['err-6', '-c --', '', '', 1, - "$prog: -: invalid number of bytes\n", $normalize_filename], + "$prog: invalid number of bytes: '-'\n", $normalize_strerror], # Same as -n 10 ['minus-1', '-', '', '', 0], @@ -106,10 +107,10 @@ my @Tests; foreach my $t (@tv) { - my ($test_name, $flags, $in, $exp, $ret, $err_msg) = @$t; + my ($test_name, $flags, $in, $exp, $ret, $err_msg, $err_sub) = @$t; my $e = [$test_name, $flags, {IN=>$in}, {OUT=>$exp}]; $ret - and push @$e, {EXIT=>$ret}, {ERR=>$err_msg}; + and push @$e, {EXIT=>$ret}, {ERR=>$err_msg}, {ERR_SUBST=>$err_sub}; $test_name =~ /^(obs-plus-|minus-)/ and push @$e, {ENV=>'_POSIX2_VERSION=199209'}; diff --git a/tests/misc/tee-dash.sh b/tests/misc/tee-dash.sh deleted file mode 100755 index 761a4780..00000000 --- a/tests/misc/tee-dash.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# test for "tee -". - -# Copyright (C) 2005-2014 Free Software Foundation, Inc. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src -print_ver_ tee - -tee - sample || framework_failure_ -nums=$(seq 9) || framework_failure_ - -for n in 0 $nums; do - files=$(seq $n) - rm -f $files - tee $files out || fail=1 - for f in out $files; do - compare sample $f || fail=1 - done + +# POSIX says: "Processing of at least 13 file operands shall be supported." +for n in 0 1 2 12 13; do + files=$(seq $n) + rm -f $files + tee $files out || fail=1 + for f in out $files; do + compare sample $f || fail=1 + done done +# Ensure tee treats '-' as the name of a file, as mandated by POSIX. +# Between v5.3.0 and v8.23, a '-' argument caused tee to send another +# copy of input to standard output. +tee - out 2>err || fail=1 +compare sample ./- || fail=1 +compare sample out || fail=1 +compare /dev/null err || fail + +# Ensure tee exits early if no more writable outputs +if test -w /dev/full && test -c /dev/full; then + yes | returns_ 1 timeout 10 tee /dev/full 2>err >/dev/full || fail=1 + # Ensure an error for each of the 2 outputs + # (and no redundant errors for stdout). + test $(wc -l < err) = 2 || { cat err; fail=1; } + + + # Ensure we continue with outputs that are OK + seq 10000 > multi_read || framework_failure_ + + returns_ 1 tee /dev/full out2 2>err >out1 err >/dev/full fifo +pipe_status=$? + +# Default operation is to continue on output errors but exit silently on SIGPIPE +read_fifo +yes | returns_ $pipe_status timeout 10 tee ./e/noent 2>err >fifo || fail=1 +test $(wc -l < err) = 1 || { cat err; fail=1; } + +# With -p, SIGPIPE is suppressed, exit 0 for EPIPE when all outputs finished +read_fifo +yes | timeout 10 tee -p 2>err >fifo || fail=1 +test $(wc -l < err) = 0 || { cat err; fail=1; } + +# With --output-error=warn, exit 1 for EPIPE when all outputs finished +read_fifo +yes | returns_ 1 timeout 10 tee --output-error=warn 2>err >fifo || fail=1 +test $(wc -l < err) = 1 || { cat err; fail=1; } + +# With --output-error=exit, exit 1 immediately for EPIPE +read_fifo +yes | returns_ 1 timeout 10 tee --output-error=exit /dev/null 2>err >fifo \ + || fail=1 +test $(wc -l < err) = 1 || { cat err; fail=1; } + +# With --output-error=exit, exit 1 immediately on output error +read_fifo +yes | returns_ 1 timeout 10 tee --output-error=exit ./e/noent 2>err >fifo \ + || fail=1 +test $(wc -l < err) = 1 || { cat err; fail=1; } + +# With --output-error=exit-nopipe, exit 0 for EPIPE +read_fifo +yes | timeout 10 tee --output-error=exit-nopipe 2>err >fifo || fail=1 +test $(wc -l < err) = 0 || { cat err; fail=1; } + +wait Exit $fail diff --git a/tests/misc/test-diag.pl b/tests/misc/test-diag.pl index 14d0f4d5..f498d1a8 100755 --- a/tests/misc/test-diag.pl +++ b/tests/misc/test-diag.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test the diagnostics of "test". -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/test.pl b/tests/misc/test.pl index b27adb48..f4c1ed1a 100755 --- a/tests/misc/test.pl +++ b/tests/misc/test.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/timeout-blocked.pl b/tests/misc/timeout-blocked.pl index b5f31c96..77bf6667 100755 --- a/tests/misc/timeout-blocked.pl +++ b/tests/misc/timeout-blocked.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test that timeout handles blocked SIGALRM from its parent. -# Copyright (C) 2013-2014 Free Software Foundation, Inc. +# Copyright (C) 2013-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/timeout-group.sh b/tests/misc/timeout-group.sh index 23c1b065..d47f0dc8 100755 --- a/tests/misc/timeout-group.sh +++ b/tests/misc/timeout-group.sh @@ -1,7 +1,7 @@ #!/bin/sh # test program group handling -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This 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,8 +30,8 @@ print_ver_ timeout setsid true || skip_ "setsid required to control groups" -cat > timeout.cmd <<\EOF -#!/bin/sh +printf '%s\n' '#!'"$SHELL" > timeout.cmd || framework_failure_ +cat >> timeout.cmd <<\EOF trap 'touch int.received; exit' INT touch timeout.running count=$1 @@ -42,8 +42,8 @@ done EOF chmod a+x timeout.cmd -cat > group.sh <<\EOF -#!/bin/sh +cat > group.sh </dev/null && wait $pid; } # Start above script in its own group. # We could use timeout for this, but that assumes an implementation. -setsid ./group.sh & +setsid ./group.sh & pid=$! # 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 -- -$! +env kill -INT -- -$pid wait test -e int.received || fail=1 @@ -82,8 +84,7 @@ 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=$! +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 diff --git a/tests/misc/timeout-parameters.sh b/tests/misc/timeout-parameters.sh index fca30f0b..0bdb38ac 100755 --- a/tests/misc/timeout-parameters.sh +++ b/tests/misc/timeout-parameters.sh @@ -1,7 +1,7 @@ #!/bin/sh # Validate timeout parameter combinations -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/timeout.sh b/tests/misc/timeout.sh index 8eaeef95..3cebd330 100755 --- a/tests/misc/timeout.sh +++ b/tests/misc/timeout.sh @@ -1,7 +1,7 @@ #!/bin/sh # Validate timeout basic operation -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/tr-case-class.sh b/tests/misc/tr-case-class.sh index 952aae45..07c37607 100755 --- a/tests/misc/tr-case-class.sh +++ b/tests/misc/tr-case-class.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test case conversion classes -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This 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,11 +29,11 @@ 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 +returns_ 1 tr 'A-Z[:lower:]' 'a-y[:upper:]' EISDIR # open ("missing/file", O_CREAT & (O_WRONLY | O_RDWR), ...) -> ENOENT -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/truncate-fifo.sh b/tests/misc/truncate-fifo.sh index c2c0bbfc..db2e5647 100755 --- a/tests/misc/truncate-fifo.sh +++ b/tests/misc/truncate-fifo.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure truncate works on fifos without hanging -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/truncate-no-create-missing.sh b/tests/misc/truncate-no-create-missing.sh index 1cf55330..fbac330e 100755 --- a/tests/misc/truncate-no-create-missing.sh +++ b/tests/misc/truncate-no-create-missing.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that truncate -c no-such-file doesn't fail. -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/truncate-overflow.sh b/tests/misc/truncate-overflow.sh index 72ed626b..c690c406 100755 --- a/tests/misc/truncate-overflow.sh +++ b/tests/misc/truncate-overflow.sh @@ -1,7 +1,7 @@ #!/bin/sh # Validate truncate integer overflow -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,13 +27,13 @@ truncate -s-1 create-zero-len-file || fail=1 echo > non-empty-file # signed overflow -truncate -s$OFF_T_OFLOW file && fail=1 +returns_ 1 truncate -s$OFF_T_OFLOW file || fail=1 # += signed overflow -truncate -s+$OFF_T_MAX non-empty-file && fail=1 +returns_ 1 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 +returns_ 1 truncate --io-blocks --size=$IO_BLOCK_OFLOW file || fail=1 Exit $fail diff --git a/tests/misc/truncate-owned-by-other.sh b/tests/misc/truncate-owned-by-other.sh index e70badb6..b224864f 100755 --- a/tests/misc/truncate-owned-by-other.sh +++ b/tests/misc/truncate-owned-by-other.sh @@ -1,7 +1,7 @@ #!/bin/sh # Demonstrate that "truncate -s0 writable-but-owned-by-other" works. -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This 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 @@ chmod g+w root-owned # Ensure that the current directory is searchable by $NON_ROOT_USERNAME. chmod g+x . -chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" \ +chroot --skip-chdir --user=$NON_ROOT_USERNAME / env PATH="$PATH" \ truncate -s0 root-owned || fail=1 Exit $fail diff --git a/tests/misc/truncate-parameters.sh b/tests/misc/truncate-parameters.sh index d9e6d64d..d3cf5940 100755 --- a/tests/misc/truncate-parameters.sh +++ b/tests/misc/truncate-parameters.sh @@ -1,7 +1,7 @@ #!/bin/sh # Validate truncate parameter combinations -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This 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,22 +21,22 @@ print_ver_ truncate # must specify at least 1 file -truncate --size=0 && fail=1 +returns_ 1 truncate --size=0 || fail=1 # must specify size. don't default to 0 -truncate file && fail=1 +returns_ 1 truncate file || fail=1 # mixture of absolute size & reference not allowed -truncate --size=0 --reference=file file && fail=1 +returns_ 1 truncate --size=0 --reference=file file || fail=1 # blocks without size is not valid -truncate --io-blocks --reference=file file && fail=1 +returns_ 1 truncate --io-blocks --reference=file file || fail=1 # must specify valid numbers -truncate --size="invalid" file && fail=1 +returns_ 1 truncate --size="invalid" file || fail=1 # spaces not significant around size -truncate --size="> -1" file && fail=1 +returns_ 1 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 diff --git a/tests/misc/truncate-relative.sh b/tests/misc/truncate-relative.sh index 3daa073e..97be8cb7 100755 --- a/tests/misc/truncate-relative.sh +++ b/tests/misc/truncate-relative.sh @@ -1,7 +1,7 @@ #!/bin/sh # Validate truncate relative sizes -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This 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,15 +21,15 @@ print_ver_ truncate # mixture of relative modifiers not allowed -truncate --size="+>0" file && fail=1 +returns_ 1 truncate --size="+>0" file || fail=1 # mixture of relative modifiers not allowed -truncate --size=">+0" file && fail=1 +returns_ 1 truncate --size=">+0" file || fail=1 # division by zero -truncate --size="/0" file && fail=1 +returns_ 1 truncate --size="/0" file || fail=1 # division by zero -truncate --size="%0" file && fail=1 +returns_ 1 truncate --size="%0" file || fail=1 Exit $fail diff --git a/tests/misc/tsort.pl b/tests/misc/tsort.pl index e59af328..4d04866a 100755 --- a/tests/misc/tsort.pl +++ b/tests/misc/tsort.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test "tsort". -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/tty-eof.pl b/tests/misc/tty-eof.pl index b4d36de6..c49efc24 100755 --- a/tests/misc/tty-eof.pl +++ b/tests/misc/tty-eof.pl @@ -4,7 +4,7 @@ # Do the same for all programs that can read stdin, # require no arguments and that write to standard output. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/unexpand.pl b/tests/misc/unexpand.pl index 8c5b693b..548bc91c 100755 --- a/tests/misc/unexpand.pl +++ b/tests/misc/unexpand.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test "unexpand". -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/uniq-perf.sh b/tests/misc/uniq-perf.sh index 31c40e53..b8bac973 100755 --- a/tests/misc/uniq-perf.sh +++ b/tests/misc/uniq-perf.sh @@ -1,7 +1,7 @@ #!/bin/sh # before coreutils-8.10, seq 100000|uniq -f 10000000000 would run for days -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This 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,6 @@ print_ver_ uniq seq 100 > in || fail=1 -timeout 1 uniq -f 10000000000 in || fail=1 +timeout 10 uniq -f 10000000000 in || fail=1 Exit $fail diff --git a/tests/misc/uniq.pl b/tests/misc/uniq.pl index d07f15f1..5eae7010 100755 --- a/tests/misc/uniq.pl +++ b/tests/misc/uniq.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test uniq. -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/wc-files0-from.pl b/tests/misc/wc-files0-from.pl index 4ff10019..cae3fc22 100755 --- a/tests/misc/wc-files0-from.pl +++ b/tests/misc/wc-files0-from.pl @@ -2,7 +2,7 @@ # Exercise wc's --files0-from option. # FIXME: keep this file in sync with tests/du/files0-from. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/wc-files0.sh b/tests/misc/wc-files0.sh index 37fd1ab0..c52b8b0d 100755 --- a/tests/misc/wc-files0.sh +++ b/tests/misc/wc-files0.sh @@ -1,7 +1,7 @@ #!/bin/sh # Show that wc's new --files0-from option works. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/wc-parallel.sh b/tests/misc/wc-parallel.sh index 01005820..19497e04 100755 --- a/tests/misc/wc-parallel.sh +++ b/tests/misc/wc-parallel.sh @@ -2,7 +2,7 @@ # Ensure that wc prints counts atomically # so that concurrent processes don't intersperse their output -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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,17 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ wc +xargs -P2 /dev/null 2>&1 \ + || skip_ 'xargs -P is required' + (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) | +(find tmp tmp tmp -type f | xargs -n2000 -P2 wc 2>err) | sed -n '/0 0 0 /!p' | grep . > /dev/null && fail=1 +compare /dev/null err || fail=1 Exit $fail diff --git a/tests/misc/wc-proc.sh b/tests/misc/wc-proc.sh new file mode 100755 index 00000000..5b83aa41 --- /dev/null +++ b/tests/misc/wc-proc.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# Test wc on /proc and /sys files. + +# Copyright 2014-2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ wc + +for file in /proc/version /sys/kernel/profiling; do + if test -r $file; then + cp -f $file copy && + wc -c < copy > exp1 || framework_failure_ + + wc -c < $file > out1 || fail=1 + compare exp1 out1 || fail=1 + fi +done + +Exit $fail diff --git a/tests/misc/wc.pl b/tests/misc/wc.pl index 076ce049..3b8a6a23 100755 --- a/tests/misc/wc.pl +++ b/tests/misc/wc.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Basic tests for "wc". -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/xattr.sh b/tests/misc/xattr.sh index f208090f..56a40574 100755 --- a/tests/misc/xattr.sh +++ b/tests/misc/xattr.sh @@ -3,7 +3,7 @@ # attributes and install does not preserve extended attributes. # cp -a should preserve xattr, error diagnostics should not be displayed -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/xstrtol.pl b/tests/misc/xstrtol.pl index fed8d7d6..2140c1f8 100755 --- a/tests/misc/xstrtol.pl +++ b/tests/misc/xstrtol.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # exercise xstrtol's diagnostics via pr -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/misc/yes.sh b/tests/misc/yes.sh new file mode 100755 index 00000000..79f8b87c --- /dev/null +++ b/tests/misc/yes.sh @@ -0,0 +1,42 @@ +#!/bin/sh +# Validate yes buffer handling + +# Copyright (C) 2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ yes + +# Check various single item sizes, with the most important +# size being BUFSIZ used for the local buffer to yes(1). +# Note a \n is added, so actual sizes required internally +# are 1 more than the size used here. +for size in 1 1999 4095 4096 8191 8192 16383 16384; do + printf "%${size}s\n" '' > out.1 + yes "$(printf %${size}s '')" | head -n2 | uniq > out.2 + compare out.1 out.2 || fail=1 +done + +# Check the many small items case, +# both fitting and overflowing the internal buffer +if env true $(seq 4000); then + for i in 100 4000; do + seq $i | paste -s -d ' ' | sed p > out.1 + yes $(seq $i) | head -n2 > out.2 + compare out.1 out.2 || fail=1 + done +fi + +Exit $fail diff --git a/tests/mkdir/p-1.sh b/tests/mkdir/p-1.sh index e08fd33d..5ed74dce 100755 --- a/tests/mkdir/p-1.sh +++ b/tests/mkdir/p-1.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test "mkdir -p". -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mkdir/p-2.sh b/tests/mkdir/p-2.sh index 874a56af..c13a91fd 100755 --- a/tests/mkdir/p-2.sh +++ b/tests/mkdir/p-2.sh @@ -1,7 +1,7 @@ #!/bin/sh # Just like p-1, but with an absolute path. -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mkdir/p-3.sh b/tests/mkdir/p-3.sh index 6d55adee..199e7e1d 100755 --- a/tests/mkdir/p-3.sh +++ b/tests/mkdir/p-3.sh @@ -3,7 +3,7 @@ # causes immediate failure. Also, ensure that we don't create # subsequent, relative command-line arguments in the wrong place. -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This 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,8 @@ 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 +(cd no-access && chmod 0 . && mkdir -p "$p/a/b" u/v) 2> /dev/null +test $? -eq 1 || fail=1 test -d "$p/a/b" || fail=1 # Same as above, but with a following *absolute* name, it should succeed diff --git a/tests/mkdir/p-acl.sh b/tests/mkdir/p-acl.sh index dd4473a9..a4a29727 100755 --- a/tests/mkdir/p-acl.sh +++ b/tests/mkdir/p-acl.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test "mkdir -p" with default ACLs. -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mkdir/p-slashdot.sh b/tests/mkdir/p-slashdot.sh index bbca9ad7..e318547e 100755 --- a/tests/mkdir/p-slashdot.sh +++ b/tests/mkdir/p-slashdot.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that mkdir -p works with arguments specified with a trailing "/.". -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mkdir/p-thru-slink.sh b/tests/mkdir/p-thru-slink.sh index a884a386..ffa4450b 100755 --- a/tests/mkdir/p-thru-slink.sh +++ b/tests/mkdir/p-thru-slink.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that mkdir -p foo/bar works when foo is a symbolic link to a directory -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mkdir/p-v.sh b/tests/mkdir/p-v.sh index a6a51cbc..963038f4 100755 --- a/tests/mkdir/p-v.sh +++ b/tests/mkdir/p-v.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test mkdir -pv. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mkdir/parents.sh b/tests/mkdir/parents.sh index 786f08f9..ebdb5271 100755 --- a/tests/mkdir/parents.sh +++ b/tests/mkdir/parents.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure mkdir's -p options works properly -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This 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 @@ 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 +returns_ 1 mkdir e-dir > /dev/null 2>&1 || fail=1 # Create an existing directory. umask 077 diff --git a/tests/mkdir/perm.sh b/tests/mkdir/perm.sh index bf0f6a8e..ff0a57dc 100755 --- a/tests/mkdir/perm.sh +++ b/tests/mkdir/perm.sh @@ -2,7 +2,7 @@ # Verify that mkdir's '-m MODE' option works properly # with various umask settings. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This 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 @@ for p in empty -p; do # If we're not using -p, then create the parent manually, # and adjust expectations accordingly. - test x$p = x && \ + test x$p = x && { mkdir -m =,u=rwx parent || fail=1 parent_perms=drwx------ diff --git a/tests/mkdir/restorecon.sh b/tests/mkdir/restorecon.sh index 14a8b899..7d6a671b 100755 --- a/tests/mkdir/restorecon.sh +++ b/tests/mkdir/restorecon.sh @@ -1,7 +1,7 @@ #!/bin/sh # test mkdir, mknod, mkfifo -Z -# Copyright (C) 2013-2014 Free Software Foundation, Inc. +# Copyright (C) 2013-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ # along with this program. If not, see . . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src -print_ver_ mkdir +print_ver_ mkdir mknod mkfifo require_selinux_ @@ -38,6 +38,7 @@ if restorecon restored 2>/dev/null; then mkdir -Z single || fail=1 # Run these as separate processes in case global context # set for an arg, impacts on another arg + # TODO: Have the defaultcon() vary over these directories for dir in single_p single_p/existing multi/ple; do mkdir -Zp "$dir" || fail=1 done diff --git a/tests/mkdir/selinux.sh b/tests/mkdir/selinux.sh index 983ceb57..4d3cbce7 100755 --- a/tests/mkdir/selinux.sh +++ b/tests/mkdir/selinux.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that an invalid context doesn't cause a segfault -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mkdir/smack-no-root.sh b/tests/mkdir/smack-no-root.sh index 527940b3..fac16ede 100755 --- a/tests/mkdir/smack-no-root.sh +++ b/tests/mkdir/smack-no-root.sh @@ -3,7 +3,7 @@ # Derived from tests/mkdir/selinux.sh. # Ensure that an unsettable SMACK label doesn't cause a segfault. -# Copyright (C) 2014 Free Software Foundation, Inc. +# Copyright (C) 2014-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mkdir/smack-root.sh b/tests/mkdir/smack-root.sh index 8d7ec9b7..772eb60a 100755 --- a/tests/mkdir/smack-root.sh +++ b/tests/mkdir/smack-root.sh @@ -3,7 +3,7 @@ # Derived from tests/mkdir/selinux.sh. # Ensure that SMACK label gets set. -# Copyright (C) 2014 Free Software Foundation, Inc. +# Copyright (C) 2014-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mkdir/special-1.sh b/tests/mkdir/special-1.sh index 8c65a757..a6ba642f 100755 --- a/tests/mkdir/special-1.sh +++ b/tests/mkdir/special-1.sh @@ -1,7 +1,7 @@ #!/bin/sh # verify that mkdir honors special bits in MODE -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This 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 @@ rmdir $tmp || fail=1 tmp2=$tmp/sub # This should fail. -mkdir -m$set_mode_string $tmp2 2> /dev/null && fail=1 +returns_ 1 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 diff --git a/tests/mkdir/t-slash.sh b/tests/mkdir/t-slash.sh index d9e8d3eb..e16db501 100755 --- a/tests/mkdir/t-slash.sh +++ b/tests/mkdir/t-slash.sh @@ -2,7 +2,7 @@ # Ensure that mkdir works with arguments specified with and without # a trailing slash. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mkdir/writable-under-readonly.sh b/tests/mkdir/writable-under-readonly.sh index e7c4a9ca..c2f81c5a 100755 --- a/tests/mkdir/writable-under-readonly.sh +++ b/tests/mkdir/writable-under-readonly.sh @@ -1,7 +1,7 @@ #!/bin/sh # FIXME: convert this to a root-only test. -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/acl.sh b/tests/mv/acl.sh index f681f5d0..b09125c5 100755 --- a/tests/mv/acl.sh +++ b/tests/mv/acl.sh @@ -2,7 +2,7 @@ # move files/directories across file system boundaries # and make sure acls are preserved -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/atomic.sh b/tests/mv/atomic.sh index a026bd5b..6d8c5a92 100755 --- a/tests/mv/atomic.sh +++ b/tests/mv/atomic.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that mv doesn't first unlink its destination in one particular case -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/atomic2.sh b/tests/mv/atomic2.sh index 92a8e436..6787dd34 100755 --- a/tests/mv/atomic2.sh +++ b/tests/mv/atomic2.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that mv doesn't first unlink a multi-hard-linked destination -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/backup-dir.sh b/tests/mv/backup-dir.sh index 682173d4..f547a63e 100755 --- a/tests/mv/backup-dir.sh +++ b/tests/mv/backup-dir.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure "mv --verbose --backup" works the same for dirs and non-dirs. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/backup-is-src.sh b/tests/mv/backup-is-src.sh index 4208d91e..acfe5684 100755 --- a/tests/mv/backup-is-src.sh +++ b/tests/mv/backup-is-src.sh @@ -1,7 +1,7 @@ #!/bin/sh # Force mv to use the copying code. -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/childproof.sh b/tests/mv/childproof.sh index c212b83d..cc879ff1 100755 --- a/tests/mv/childproof.sh +++ b/tests/mv/childproof.sh @@ -3,7 +3,7 @@ # With fileutils-4.1 and earlier, this test would fail for cp and mv. # With coreutils-6.9 and earlier, this test would fail for ln. -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This 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 @@ echo a > a/f || framework_failure_ echo b > b/f || framework_failure_ -cp a/f b/f c 2> /dev/null && fail=1 +returns_ 1 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 @@ -43,7 +43,7 @@ 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 +returns_ 1 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 @@ -62,7 +62,7 @@ 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 +returns_ 1 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 @@ -74,7 +74,7 @@ test -f c/g || fail=1 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 +returns_ 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 diff --git a/tests/mv/diag.sh b/tests/mv/diag.sh index b38fb18c..62bc2da5 100755 --- a/tests/mv/diag.sh +++ b/tests/mv/diag.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure we get proper diagnostics: e.g., with --target-dir=d but no args -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/dir-file.sh b/tests/mv/dir-file.sh index bb32f356..7b798ed6 100755 --- a/tests/mv/dir-file.sh +++ b/tests/mv/dir-file.sh @@ -1,7 +1,7 @@ #!/bin/sh # mv must fail when src and dest are mismatched directory/non-directory. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This 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 @@ mkdir -p dir/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 +returns_ 1 mv dir file > /dev/null 2>&1 || fail=1 +returns_ 1 mv file dir > /dev/null 2>&1 || fail=1 Exit $fail diff --git a/tests/mv/dir2dir.sh b/tests/mv/dir2dir.sh index 7a8f7fd3..6f9c3ce7 100755 --- a/tests/mv/dir2dir.sh +++ b/tests/mv/dir2dir.sh @@ -2,7 +2,7 @@ # Ensure that mv prints the right diagnostic for a dir->dir move # where the destination directory is not empty. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/dup-source.sh b/tests/mv/dup-source.sh index d3b56c5e..c160c0de 100755 --- a/tests/mv/dup-source.sh +++ b/tests/mv/dup-source.sh @@ -4,7 +4,7 @@ # made this fail: cp a a d/ # Ensure that mv fails with a similar command. -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/force.sh b/tests/mv/force.sh index 05adabc5..cd4e7948 100755 --- a/tests/mv/force.sh +++ b/tests/mv/force.sh @@ -1,7 +1,7 @@ #!/bin/sh # move a file onto itself -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # This 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,18 +25,19 @@ 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 +# mv should fail for the same name, or separate hardlinks as in +# both cases rename() will do nothing and return success. +# One could unlink(src) in the hardlink case, but that would +# introduce races with overlapping mv instances removing both hardlinks. -cat > exp < out 2>&1 && fail=1 -compare exp out || fail=1 -test $(cat $ff) = force-contents || fail=1 + printf "mv: '$ff' and '$dest' are the same file\n" > exp + compare exp out || fail=1 -# This should succeed, even though the source and destination -# device and inodes are the same. -mv $ff $ff2 || fail=1 + test $(cat $ff) = force-contents || fail=1 +done Exit $fail diff --git a/tests/mv/hard-2.sh b/tests/mv/hard-2.sh index 0b2880a2..1276c9eb 100755 --- a/tests/mv/hard-2.sh +++ b/tests/mv/hard-2.sh @@ -2,7 +2,7 @@ # Ensure that moving hard-linked arguments onto existing destinations works. # Likewise when using cp --preserve=link. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/hard-3.sh b/tests/mv/hard-3.sh index a3acd1a6..380aa4ca 100755 --- a/tests/mv/hard-3.sh +++ b/tests/mv/hard-3.sh @@ -2,7 +2,7 @@ # Ensure that using 'cp --preserve=link' to copy hard-linked arguments # onto existing destinations works, even when one of the link operations fails. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/hard-4.sh b/tests/mv/hard-4.sh index d518e3bc..c751c33d 100755 --- a/tests/mv/hard-4.sh +++ b/tests/mv/hard-4.sh @@ -1,7 +1,7 @@ #!/bin/sh -# ensure that mv removes a in this case: touch a; ln a b; mv a b +# ensure that mv maintains a in this case: touch a; ln a b; mv a b -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This 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,15 +21,18 @@ print_ver_ mv touch a || framework_failure_ ln a b || framework_failure_ +# Between coreutils-5.0 and coreutils-8.24, 'a' would be removed. +# Before coreutils-5.0.1 the issue would not have been diagnosed. +# We don't emulate the rename(a,b) with unlink(a) as that would +# introduce races with overlapping mv instances removing both links. +mv a b 2>err && fail=1 +printf "mv: 'a' and 'b' are the same file\n" > exp +compare exp err || fail=1 -mv a b || fail=1 - -# In coreutils-5.0 and earlier, a would not be removed. -test -r a && fail=1 +test -r a || fail=1 test -r b || fail=1 -# Make sure it works also with --backup. -ln b a +# Make sure it works with --backup. mv --backup=simple a b || fail=1 test -r a && fail=1 test -r b || fail=1 diff --git a/tests/mv/hard-link-1.sh b/tests/mv/hard-link-1.sh index fdf355a3..392ca2ef 100755 --- a/tests/mv/hard-link-1.sh +++ b/tests/mv/hard-link-1.sh @@ -2,7 +2,7 @@ # move a directory containing hard-linked files and # make sure the links are preserved -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/hard-verbose.sh b/tests/mv/hard-verbose.sh deleted file mode 100755 index 45491ab0..00000000 --- a/tests/mv/hard-verbose.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# ensure that mv's --verbose options works even in this unusual case - -# Copyright (C) 2006-2014 Free Software Foundation, Inc. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -. "${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/hardlink-case.sh b/tests/mv/hardlink-case.sh new file mode 100755 index 00000000..3e51c38a --- /dev/null +++ b/tests/mv/hardlink-case.sh @@ -0,0 +1,37 @@ +#!/bin/sh +# Ensure multi-hardlinked files are not lost on case insensitive file systems + +# Copyright (C) 2014-2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ mv +require_root_ + +cwd=$(pwd) +cleanup_() { cd /; umount "$cwd/mnt"; } + +truncate -s100M hfs.img || framework_failure_ +mkfs -t hfsplus hfs.img || skip_ 'failed to create hfs file system' +mkdir mnt || framework_failure_ +mount hfs.img mnt || skip_ 'failed to mount hfs file system' + +cd mnt +touch foo +ln foo whatever +returns_ 1 mv foo Foo || fail=1 +test -r foo || fail=1 + +Exit $fail diff --git a/tests/mv/i-1.pl b/tests/mv/i-1.pl index 84902ee2..714783c8 100755 --- a/tests/mv/i-1.pl +++ b/tests/mv/i-1.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Make sure a 'n' reply to 'mv -i...' aborts the move operation. -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/i-2.sh b/tests/mv/i-2.sh index 4202b5c5..39cdafb2 100755 --- a/tests/mv/i-2.sh +++ b/tests/mv/i-2.sh @@ -2,7 +2,7 @@ # Test both cp and mv for their behavior with -if and -fi # The standards (POSIX and SuS) dictate annoyingly inconsistent behavior. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/i-3.sh b/tests/mv/i-3.sh index 8c58d5d3..5dba1fe4 100755 --- a/tests/mv/i-3.sh +++ b/tests/mv/i-3.sh @@ -2,7 +2,7 @@ # Make sure that 'mv file unwritable-file' prompts the user # and that 'mv -f file unwritable-file' doesn't. -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This 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 @@ require_controlling_input_terminal_ skip_if_root_ trap '' TTIN # Ignore SIGTTIN -test "$(uname -s)" = FreeBSD && skip_ "known spurious failure on FreeBSD" +uname -s | grep 'BSD$' && skip_ 'known spurious failure on *BSD' touch f g h i || framework_failure_ chmod 0 g i || framework_failure_ @@ -39,6 +39,9 @@ tty=$(readlink -f /dev/stdin) test -r "$tty" 2>&1 \ || skip_ '/dev/stdin is not readable' +# Terminate any background processes +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + mv f g < $tty > out 2>&1 & pid=$! # Test for the expected prompt; sleep upon non-match. @@ -54,7 +57,7 @@ check_overwrite_prompt() # Wait for up to 12.7 seconds for the expected prompt. retry_delay_ check_overwrite_prompt .1 7 || { fail=1; cat out; } -kill $pid +cleanup_ mv -f h i > out 2>&1 || fail=1 test -f i || fail=1 diff --git a/tests/mv/i-4.sh b/tests/mv/i-4.sh index b366bc46..ff3513a8 100755 --- a/tests/mv/i-4.sh +++ b/tests/mv/i-4.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure 'mv -i a b' does its job with a positive response -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This 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 @@ for i in a b; do echo $i > $i || framework_failure_ done echo y > y || framework_failure_ +echo n > n || framework_failure_ mv -i a b < y >/dev/null 2>&1 || fail=1 @@ -32,18 +33,15 @@ case "$(cat b)" in *) 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 +# Ensure that mv -i a b works properly with 'n' and 'y' responses, +# when a and b are hard links to the same file. rm -f a b echo a > a ln a b -mv -i a b < n >/dev/null 2>&1 || fail=1 +mv -i a b < y 2>err && 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 +printf "mv: 'a' and 'b' are the same file\n" > exp +compare exp err || fail=1 Exit $fail diff --git a/tests/mv/i-5.sh b/tests/mv/i-5.sh index c69f1784..85931122 100755 --- a/tests/mv/i-5.sh +++ b/tests/mv/i-5.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure 'mv -i dir file' prompts before failing. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/i-link-no.sh b/tests/mv/i-link-no.sh index 67a8ff9c..59bee0b1 100755 --- a/tests/mv/i-link-no.sh +++ b/tests/mv/i-link-no.sh @@ -1,7 +1,7 @@ #!/bin/sh # Show that mv doesn't preserve links to files the user has declined to move. -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/into-self-2.sh b/tests/mv/into-self-2.sh index 4109d9e6..645ed41a 100755 --- a/tests/mv/into-self-2.sh +++ b/tests/mv/into-self-2.sh @@ -3,7 +3,7 @@ # Consider the case where SRC and DEST are on different # partitions and DEST is a symlink to SRC. -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/into-self-3.sh b/tests/mv/into-self-3.sh index 52069b88..e7a1ee76 100755 --- a/tests/mv/into-self-3.sh +++ b/tests/mv/into-self-3.sh @@ -1,7 +1,7 @@ #!/bin/sh # move a directory into itself, with a twist -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/into-self-4.sh b/tests/mv/into-self-4.sh index ac78f90b..2ae0468f 100755 --- a/tests/mv/into-self-4.sh +++ b/tests/mv/into-self-4.sh @@ -2,7 +2,7 @@ # confirm that 'mv symlink symlink' doesn't remove symlink # Based on an example from David Luyer. -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This 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,7 @@ ln -s file s || framework_failure_ # This must fail. -mv s s 2> /dev/null && fail=1 +returns_ 1 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. diff --git a/tests/mv/into-self.sh b/tests/mv/into-self.sh index 76aefa26..0a08154b 100755 --- a/tests/mv/into-self.sh +++ b/tests/mv/into-self.sh @@ -1,7 +1,7 @@ #! /bin/sh # Demonstrate how mv fails when it tries to move a directory into itself. -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/leak-fd.sh b/tests/mv/leak-fd.sh index 6b81f5cb..b36da8d3 100755 --- a/tests/mv/leak-fd.sh +++ b/tests/mv/leak-fd.sh @@ -2,7 +2,7 @@ # Exercise mv's file-descriptor-leak bug, reported against coreutils-5.2.1 # and fixed (properly) on 2004-10-21. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/mv-n.sh b/tests/mv/mv-n.sh index 30ba35bb..8c3fedb8 100755 --- a/tests/mv/mv-n.sh +++ b/tests/mv/mv-n.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test whether mv -n works as documented (not overwrite target). -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This 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,6 @@ 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 +returns_ 1 mv -bn a b 2>/dev/null || fail=1 Exit $fail diff --git a/tests/mv/mv-special-1.sh b/tests/mv/mv-special-1.sh index 34449150..0c649f03 100755 --- a/tests/mv/mv-special-1.sh +++ b/tests/mv/mv-special-1.sh @@ -1,7 +1,7 @@ #! /bin/sh # Test "mv" with special files. -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/no-target-dir.sh b/tests/mv/no-target-dir.sh index ac65ff7f..d7bca59b 100755 --- a/tests/mv/no-target-dir.sh +++ b/tests/mv/no-target-dir.sh @@ -2,7 +2,7 @@ # ensure that --no-target-directory (-T) works when the destination is # an empty directory. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,6 +20,8 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mv +LS_FAILURE=2 + mkdir -p d/sub empty src d2/sub e2 || framework_failure_ touch f || framework_failure_ @@ -35,15 +37,15 @@ mv a b || mv -fT d empty || fail=1 # Ensure that the source, d, is gone. -ls -d d > /dev/null 2>&1 && fail=1 +returns_ $LS_FAILURE 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 +returns_ 1 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 +returns_ 1 mv -fT f e2 2> /dev/null || fail=1 Exit $fail diff --git a/tests/mv/part-fail.sh b/tests/mv/part-fail.sh index 71ee30c0..164a6393 100755 --- a/tests/mv/part-fail.sh +++ b/tests/mv/part-fail.sh @@ -4,7 +4,7 @@ # This is a bit fragile since it relies on the string used # for EPERM: 'permission denied'. -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/part-hardlink.sh b/tests/mv/part-hardlink.sh index 8eacaabc..c4a5830f 100755 --- a/tests/mv/part-hardlink.sh +++ b/tests/mv/part-hardlink.sh @@ -4,7 +4,7 @@ # For additional constraints, see the comment in copy.c. # Before coreutils-5.2.1, this test would fail. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/part-rename.sh b/tests/mv/part-rename.sh index ba68f6e6..b84f6886 100755 --- a/tests/mv/part-rename.sh +++ b/tests/mv/part-rename.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test various cases for moving directories across file systems -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This 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,13 +31,13 @@ mv foo/ "$other_partition_tmpdir/bar" || fail=1 # Moving a non directory from source shouldn't replace empty dir in dest touch bar || framework_failure_ -mv bar "$other_partition_tmpdir/" && fail=1 +returns_ 1 mv bar "$other_partition_tmpdir/" || fail=1 # Moving a directory from source shouldn't replace non directory in dest mkdir bar2 touch "$other_partition_tmpdir/bar2" -mv bar2 "$other_partition_tmpdir/" && fail=1 +returns_ 1 mv bar2 "$other_partition_tmpdir/" || fail=1 # As per POSIX moving directory from source should replace empty dir in dest @@ -51,7 +51,7 @@ test -e "$other_partition_tmpdir/bar3/file" || fail=1 # As per POSIX moving directory from source shouldn't update dir in dest mkdir bar3 touch bar3/file2 -mv bar3 "$other_partition_tmpdir/" && fail=1 +returns_ 1 mv bar3 "$other_partition_tmpdir/" || fail=1 test -e "$other_partition_tmpdir/bar3/file2" && fail=1 Exit $fail diff --git a/tests/mv/part-symlink.sh b/tests/mv/part-symlink.sh index 9604d873..16856259 100755 --- a/tests/mv/part-symlink.sh +++ b/tests/mv/part-symlink.sh @@ -2,7 +2,7 @@ # make sure cp and mv can handle many combinations of local and # other-partition regular/symlink'd files. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/partition-perm.sh b/tests/mv/partition-perm.sh index 713988f7..18c1a77f 100755 --- a/tests/mv/partition-perm.sh +++ b/tests/mv/partition-perm.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure permissions are preserved when moving from one partition to another. -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/perm-1.sh b/tests/mv/perm-1.sh index 2826c61f..3632d8d4 100755 --- a/tests/mv/perm-1.sh +++ b/tests/mv/perm-1.sh @@ -2,7 +2,7 @@ # ensure that mv gives one diagnostic, not two, when failing # due to lack of permissions -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/sticky-to-xpart.sh b/tests/mv/sticky-to-xpart.sh index e0c99e94..602562cc 100755 --- a/tests/mv/sticky-to-xpart.sh +++ b/tests/mv/sticky-to-xpart.sh @@ -4,7 +4,7 @@ # mv: cannot remove 'x': Operation not permitted # Affects coreutils-6.0-6.9. -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,7 +42,8 @@ chmod go+x . || framework_failure_ # Ensure that $NON_ROOT_USERNAME can access the required version of mv. version=$( - chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" mv --version | + chroot --skip-chdir --user=$NON_ROOT_USERNAME / env PATH="$PATH" \ + mv --version | sed -n '1s/.* //p' ) case $version in @@ -50,7 +51,7 @@ case $version in *) skip_ "cannot access just-built mv as user $NON_ROOT_USERNAME";; esac -chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" \ +chroot --skip-chdir --user=$NON_ROOT_USERNAME / env PATH="$PATH" \ mv t/root-owned "$other_partition_tmpdir" 2> out-t && fail=1 # On some systems, we get 'Not owner'. Convert it. diff --git a/tests/mv/symlink-onto-hardlink-to-self.sh b/tests/mv/symlink-onto-hardlink-to-self.sh index f3e8ff98..295844c0 100755 --- a/tests/mv/symlink-onto-hardlink-to-self.sh +++ b/tests/mv/symlink-onto-hardlink-to-self.sh @@ -1,10 +1,10 @@ #!/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, +# Demonstrate that when moving a symlink onto a hardlink-to-that-symlink, +# an error is presented. 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This 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,27 +26,34 @@ print_ver_ mv 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_ - # 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 - # 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 +for opt in '' --backup; do - mv $opt s1 s2 > out 2>&1 || fail=1 - compare /dev/null out || fail=1 + if test "$opt" = --backup; then + 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 + # 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 + echo "mv: 's1' and 's2' are the same file" > exp + mv $opt s1 s2 2>err && fail=1 + compare exp err || fail=1 + + # Ensure that s1 is still present. + test -e s1 || fail=1 + # Without --backup, ensure there is no backup file. test -e s2~ && fail=1 fi diff --git a/tests/mv/symlink-onto-hardlink.sh b/tests/mv/symlink-onto-hardlink.sh index 5b4dead0..9bd370b1 100755 --- a/tests/mv/symlink-onto-hardlink.sh +++ b/tests/mv/symlink-onto-hardlink.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that mv works with a few symlink-onto-hard-link cases. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/to-symlink.sh b/tests/mv/to-symlink.sh index 70ca6179..8b8091a9 100755 --- a/tests/mv/to-symlink.sh +++ b/tests/mv/to-symlink.sh @@ -2,7 +2,7 @@ # Make sure that the copying code used in an inter-partition # move unlinks a destination symlink before opening it. -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/mv/trailing-slash.sh b/tests/mv/trailing-slash.sh index e3225025..47335d3c 100755 --- a/tests/mv/trailing-slash.sh +++ b/tests/mv/trailing-slash.sh @@ -4,7 +4,7 @@ # Also, ensure that "mv dir non-exist-dir/" works. # Also, ensure that "cp dir non-exist-dir/" works. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -48,14 +48,14 @@ done # 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 +#returns_ 1 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 +cp b no-such/ 2> err # 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 diff --git a/tests/mv/update.sh b/tests/mv/update.sh index 4c0553a5..2ada7dd1 100755 --- a/tests/mv/update.sh +++ b/tests/mv/update.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure --update works as advertised -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/other-fs-tmpdir b/tests/other-fs-tmpdir index e82058ad..22d8ccad 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-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/pr/pr-tests.pl b/tests/pr/pr-tests.pl index 10947ac9..575943f4 100755 --- a/tests/pr/pr-tests.pl +++ b/tests/pr/pr-tests.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test pr. -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This 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 @@ use strict; @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; my $prog = 'pr'; +my $normalize_strerror = "s/': .*/'/"; my @tv = ( @@ -385,9 +386,9 @@ my @tv = ( ['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"], + "$prog: invalid number of columns: '0'\n", $normalize_strerror], ['col-inval', '-'.'9'x100, '', '', 1, - "$prog: invalid number of columns: '". ('9'x100) ."'\n"], + "$prog: invalid number of columns: '". ('9'x100) ."'\n", $normalize_strerror], # Before coreutils-5.3.1, --pages=1:-1 would be treated like # --pages=1:18446744073709551615. @@ -427,7 +428,7 @@ 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 ($test_name, $flags, $in, $exp, $ret, $err_msg, $err_sub) = @$t; my $new_ent = [$test_name, $common_option_prefix, $flags]; if (!ref $in) { @@ -454,7 +455,7 @@ foreach my $t (@tv) } } $ret - and push @$new_ent, {EXIT=>$ret}, {ERR=>$err_msg}; + and push @$new_ent, {EXIT=>$ret}, {ERR=>$err_msg}, {ERR_SUBST=>$err_sub}; push @Tests, $new_ent; } diff --git a/tests/readlink/can-e.sh b/tests/readlink/can-e.sh index a6415b94..05f297b7 100755 --- a/tests/readlink/can-e.sh +++ b/tests/readlink/can-e.sh @@ -1,7 +1,7 @@ #!/bin/sh # tests for canonicalize-existing mode (readlink -e). -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This 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 @@ 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 + v=$(returns_ 1 readlink -e .) || fail=1 test -z "$v" || fail=1 fi @@ -49,7 +49,7 @@ 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 + v=$(returns_ 1 readlink -e "${p}./regfile/") || fail=1 test -z "$v" || fail=1 v=$(readlink -e "${p}subdir") || fail=1 @@ -58,19 +58,19 @@ for p in "" "$pwd/$tmp/"; do v=$(readlink -e "${p}./subdir/") || fail=1 test "$v" = "$my_pwd/$tmp/subdir" || fail=1 - v=$(readlink -e "${p}missing") && fail=1 + v=$(returns_ 1 readlink -e "${p}missing") || fail=1 test -z "$v" || fail=1 - v=$(readlink -e "${p}./missing/") && fail=1 + v=$(returns_ 1 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 + v=$(returns_ 1 readlink -e "${p}./link1/") || fail=1 test -z "$v" || fail=1 - v=$(readlink -e "${p}link1/more") && fail=1 + v=$(returns_ 1 readlink -e "${p}link1/more") || fail=1 test -z "$v" || fail=1 v=$(readlink -e "${p}link2") || fail=1 @@ -79,25 +79,25 @@ for p in "" "$pwd/$tmp/"; do v=$(readlink -e "${p}./link2/") || fail=1 test "$v" = "$my_pwd/$tmp/subdir" || fail=1 - v=$(readlink -e "${p}link2/more") && fail=1 + v=$(returns_ 1 readlink -e "${p}link2/more") || fail=1 test -z "$v" || fail=1 - v=$(readlink -e "${p}link3") && fail=1 + v=$(returns_ 1 readlink -e "${p}link3") || fail=1 test -z "$v" || fail=1 - v=$(readlink -e "${p}./link3/") && fail=1 + v=$(returns_ 1 readlink -e "${p}./link3/") || fail=1 test -z "$v" || fail=1 - v=$(readlink -e "${p}link3/more") && fail=1 + v=$(returns_ 1 readlink -e "${p}link3/more") || fail=1 test -z "$v" || fail=1 - v=$(readlink -e "${p}link4") && fail=1 + v=$(returns_ 1 readlink -e "${p}link4") || fail=1 test -z "$v" || fail=1 - v=$(readlink -e "${p}./link4/") && fail=1 + v=$(returns_ 1 readlink -e "${p}./link4/") || fail=1 test -z "$v" || fail=1 - v=$(readlink -e "${p}link4/more") && fail=1 + v=$(returns_ 1 readlink -e "${p}link4/more") || fail=1 test -z "$v" || fail=1 done diff --git a/tests/readlink/can-f.sh b/tests/readlink/can-f.sh index 2a980fa8..4b25fc63 100755 --- a/tests/readlink/can-f.sh +++ b/tests/readlink/can-f.sh @@ -1,7 +1,7 @@ #!/bin/sh # tests for canonicalize mode (readlink -f). -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -39,7 +39,7 @@ 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 + v=$(returns_ 1 readlink -e .) || fail=1 test -z "$v" || fail=1 fi @@ -50,13 +50,13 @@ 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 + v=$(returns_ 1 readlink -f "${p}./regfile/") || fail=1 test -z "$v" || fail=1 - v=$(readlink -f "${p}regfile/more") && fail=1 + v=$(returns_ 1 readlink -f "${p}regfile/more") || fail=1 test -z "$v" || fail=1 - v=$(readlink -f "${p}./regfile/more/") && fail=1 + v=$(returns_ 1 readlink -f "${p}./regfile/more/") || fail=1 test -z "$v" || fail=1 v=$(readlink -f "${p}subdir") || fail=1 @@ -77,22 +77,22 @@ for p in "" "$pwd/$tmp/"; do v=$(readlink -f "${p}./missing/") || fail=1 test "$v" = "$my_pwd/$tmp/missing" || fail=1 - v=$(readlink -f "${p}missing/more") && fail=1 + v=$(returns_ 1 readlink -f "${p}missing/more") || fail=1 test -z "$v" || fail=1 - v=$(readlink -f "${p}./missing/more/") && fail=1 + v=$(returns_ 1 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 + v=$(returns_ 1 readlink -f "${p}./link1/") || fail=1 test -z "$v" || fail=1 - v=$(readlink -f "${p}link1/more") && fail=1 + v=$(returns_ 1 readlink -f "${p}link1/more") || fail=1 test -z "$v" || fail=1 - v=$(readlink -f "${p}./link1/more/") && fail=1 + v=$(returns_ 1 readlink -f "${p}./link1/more/") || fail=1 test -z "$v" || fail=1 v=$(readlink -f "${p}link2") || fail=1 @@ -107,10 +107,10 @@ for p in "" "$pwd/$tmp/"; do 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 + v=$(returns_ 1 readlink -f "${p}link2/more/more2") || fail=1 test -z "$v" || fail=1 - v=$(readlink -f "${p}./link2/more/more2/") && fail=1 + v=$(returns_ 1 readlink -f "${p}./link2/more/more2/") || fail=1 test -z "$v" || fail=1 v=$(readlink -f "${p}link3") || fail=1 @@ -119,10 +119,10 @@ for p in "" "$pwd/$tmp/"; do v=$(readlink -f "${p}./link3/") || fail=1 test "$v" = "$my_pwd/$tmp/missing" || fail=1 - v=$(readlink -f "${p}link3/more") && fail=1 + v=$(returns_ 1 readlink -f "${p}link3/more") || fail=1 test -z "$v" || fail=1 - v=$(readlink -f "${p}./link3/more/") && fail=1 + v=$(returns_ 1 readlink -f "${p}./link3/more/") || fail=1 test -z "$v" || fail=1 v=$(readlink -f "${p}link4") || fail=1 @@ -131,22 +131,22 @@ for p in "" "$pwd/$tmp/"; do v=$(readlink -f "${p}./link4/") || fail=1 test "$v" = "$my_pwd/$tmp/subdir/missing" || fail=1 - v=$(readlink -f "${p}link4/more") && fail=1 + v=$(returns_ 1 readlink -f "${p}link4/more") || fail=1 test -z "$v" || fail=1 - v=$(readlink -f "${p}./link4/more") && fail=1 + v=$(returns_ 1 readlink -f "${p}./link4/more") || fail=1 test -z "$v" || fail=1 - v=$(readlink -f "${p}link5") && fail=1 + v=$(returns_ 1 readlink -f "${p}link5") || fail=1 test -z "$v" || fail=1 - v=$(readlink -f "${p}./link5/") && fail=1 + v=$(returns_ 1 readlink -f "${p}./link5/") || fail=1 test -z "$v" || fail=1 - v=$(readlink -f "${p}link5/more") && fail=1 + v=$(returns_ 1 readlink -f "${p}link5/more") || fail=1 test -z "$v" || fail=1 - v=$(readlink -f "${p}./link5/more") && fail=1 + v=$(returns_ 1 readlink -f "${p}./link5/more") || fail=1 test -z "$v" || fail=1 done diff --git a/tests/readlink/can-m.sh b/tests/readlink/can-m.sh index 768c552b..2eb13565 100755 --- a/tests/readlink/can-m.sh +++ b/tests/readlink/can-m.sh @@ -1,7 +1,7 @@ #!/bin/sh # tests for canonicalize-missing mode (readlink -m). -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This 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 @@ 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 + v=$(returns_ 1 readlink -e .) || fail=1 test -z "$v" || fail=1 fi diff --git a/tests/readlink/multi.sh b/tests/readlink/multi.sh index e4878ecc..c7c2ef71 100755 --- a/tests/readlink/multi.sh +++ b/tests/readlink/multi.sh @@ -1,7 +1,7 @@ #!/bin/sh # test multiple argument handling. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -23,8 +23,8 @@ 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 +returns_ 1 readlink link1 link2 || fail=1 +returns_ 1 readlink link1 link2 link1 || fail=1 readlink -m link1 link2 || fail=1 printf '/1\0/1\0' > exp || framework_failure_ diff --git a/tests/readlink/rl-1.sh b/tests/readlink/rl-1.sh index ede0a915..5b429ede 100755 --- a/tests/readlink/rl-1.sh +++ b/tests/readlink/rl-1.sh @@ -1,7 +1,7 @@ #!/bin/sh # test for readlink mode. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This 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,13 +31,13 @@ test "$v" = regfile || fail=1 v=$(readlink link2) || fail=1 test "$v" = missing || fail=1 -v=$(readlink subdir) && fail=1 +v=$(returns_ 1 readlink subdir) || fail=1 test -z "$v" || fail=1 -v=$(readlink regfile) && fail=1 +v=$(returns_ 1 readlink regfile) || fail=1 test -z "$v" || fail=1 -v=$(readlink missing) && fail=1 +v=$(returns_ 1 readlink missing) || fail=1 test -z "$v" || fail=1 Exit $fail diff --git a/tests/rm/cycle.sh b/tests/rm/cycle.sh index 589ee73a..259efd28 100755 --- a/tests/rm/cycle.sh +++ b/tests/rm/cycle.sh @@ -1,7 +1,7 @@ #!/bin/sh # rm (coreutils-4.5.4) could be tricked into mistakenly reporting a cycle. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/d-1.sh b/tests/rm/d-1.sh index dd7cfd0f..43b753eb 100755 --- a/tests/rm/d-1.sh +++ b/tests/rm/d-1.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test "rm --dir --verbose". -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/d-2.sh b/tests/rm/d-2.sh index 87fb100c..98e39990 100755 --- a/tests/rm/d-2.sh +++ b/tests/rm/d-2.sh @@ -2,7 +2,7 @@ # Ensure that 'rm -d dir' (i.e., without --recursive) gives a reasonable # diagnostic when failing. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/d-3.sh b/tests/rm/d-3.sh index 646ecd06..af39da38 100755 --- a/tests/rm/d-3.sh +++ b/tests/rm/d-3.sh @@ -2,7 +2,7 @@ # Ensure that 'rm -d -i dir' (i.e., without --recursive) gives a prompt and # then deletes the directory if it is empty -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/dangling-symlink.sh b/tests/rm/dangling-symlink.sh index 1e5cdfa9..d2e08a8a 100755 --- a/tests/rm/dangling-symlink.sh +++ b/tests/rm/dangling-symlink.sh @@ -4,7 +4,7 @@ # But for fileutils-4.1.9, it would do the former and # for fileutils-4.1.10 the latter. -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This 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,9 +25,10 @@ print_ver_ rm ln -s no-file dangle ln -s / symlink +# Terminate any background processes +cleanup_() { kill $pid 2>/dev/null && wait $pid; } -rm ---presume-input-tty dangle symlink & -pid=$! +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 @@ -40,6 +41,6 @@ check_files_removed() { } retry_delay_ check_files_removed .1 5 || fail=1 -kill $pid > /dev/null 2>&1 +cleanup_ Exit $fail diff --git a/tests/rm/deep-1.sh b/tests/rm/deep-1.sh index 1f1b307c..82b3fe2e 100755 --- a/tests/rm/deep-1.sh +++ b/tests/rm/deep-1.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test "rm" with a deep hierarchy. -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/deep-2.sh b/tests/rm/deep-2.sh index c3ea0856..7a7f6114 100755 --- a/tests/rm/deep-2.sh +++ b/tests/rm/deep-2.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure rm -r DIR does not prompt for very long full relative names in DIR. -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/dir-no-w.sh b/tests/rm/dir-no-w.sh index de9035e9..1cecedb4 100755 --- a/tests/rm/dir-no-w.sh +++ b/tests/rm/dir-no-w.sh @@ -2,7 +2,7 @@ # rm (without -r) must give a diagnostic for any directory. # It must not prompt, even if that directory is unwritable. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/dir-nonrecur.sh b/tests/rm/dir-nonrecur.sh index 45956da7..d2dcbb74 100755 --- a/tests/rm/dir-nonrecur.sh +++ b/tests/rm/dir-nonrecur.sh @@ -2,7 +2,7 @@ # Ensure that 'rm dir' (i.e., without --recursive) gives a reasonable # diagnostic when failing. -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/dot-rel.sh b/tests/rm/dot-rel.sh index 4e1a8ce0..ac34b0e3 100755 --- a/tests/rm/dot-rel.sh +++ b/tests/rm/dot-rel.sh @@ -2,7 +2,7 @@ # Use rm -r to remove two non-empty dot-relative directories. # This would have failed between 2004-10-18 and 2004-10-21. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/empty-inacc.sh b/tests/rm/empty-inacc.sh index e3771530..791937c7 100755 --- a/tests/rm/empty-inacc.sh +++ b/tests/rm/empty-inacc.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that rm -rf removes an empty-and-inaccessible directory. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/empty-name.pl b/tests/rm/empty-name.pl index b6ee6ad5..a050081f 100755 --- a/tests/rm/empty-name.pl +++ b/tests/rm/empty-name.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Make sure that rm -r '' fails. -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/ext3-perf.sh b/tests/rm/ext3-perf.sh index ef4fee46..baa8d5dc 100755 --- a/tests/rm/ext3-perf.sh +++ b/tests/rm/ext3-perf.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that "rm -rf DIR-with-many-entries" is not O(N^2) -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/f-1.sh b/tests/rm/f-1.sh index 0fc95c4f..c068c778 100755 --- a/tests/rm/f-1.sh +++ b/tests/rm/f-1.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test "rm -f" with a nonexistent file. -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/fail-2eperm.sh b/tests/rm/fail-2eperm.sh index 6e8ce9ba..0bbd028d 100755 --- a/tests/rm/fail-2eperm.sh +++ b/tests/rm/fail-2eperm.sh @@ -2,7 +2,7 @@ # Like fail-eperm, but the failure must be for a file encountered # while trying to remove the containing directory with the sticky bit set. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -32,14 +32,16 @@ touch a/b || framework_failure_ # Try to ensure that $NON_ROOT_USERNAME can access # the required version of rm. rm_version=$( - chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" rm --version | + chroot --skip-chdir --user=$NON_ROOT_USERNAME / env PATH="$PATH" \ + rm --version | sed -n '1s/.* //p' ) case $rm_version in $PACKAGE_VERSION) ;; *) skip_ "cannot access just-built rm as user $NON_ROOT_USERNAME";; esac -chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" rm -rf a 2> out-t && fail=1 +chroot --skip-chdir --user=$NON_ROOT_USERNAME / \ + env PATH="$PATH" rm -rf a 2> out-t && fail=1 # On some systems, we get 'Not owner'. Convert it. # On other systems (HPUX), we get 'Permission denied'. Convert it, too. diff --git a/tests/rm/fail-eacces.sh b/tests/rm/fail-eacces.sh index dd31ea4c..64242a50 100755 --- a/tests/rm/fail-eacces.sh +++ b/tests/rm/fail-eacces.sh @@ -4,7 +4,7 @@ # With the symlink, rm from coreutils-6.9 would fail with a misleading # ELOOP diagnostic. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/fail-eperm.xpl b/tests/rm/fail-eperm.xpl index b167d0ba..7a5b9ce1 100755 --- a/tests/rm/fail-eperm.xpl +++ b/tests/rm/fail-eperm.xpl @@ -2,7 +2,7 @@ # Ensure that rm gives the expected diagnostic when failing to remove a file # owned by some other user in a directory with the sticky bit set. -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This 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,6 @@ my $verbose = $ENV{VERBOSE} && $ENV{VERBOSE} eq 'yes'; $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 diff --git a/tests/rm/hash.sh b/tests/rm/hash.sh index 6bc82bdc..7b0d452f 100755 --- a/tests/rm/hash.sh +++ b/tests/rm/hash.sh @@ -3,7 +3,7 @@ # Before then, rm would fail occasionally, sometimes via # a failed assertion, others with a seg fault. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/i-1.sh b/tests/rm/i-1.sh index 6a4ca64b..1aeec0ca 100755 --- a/tests/rm/i-1.sh +++ b/tests/rm/i-1.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test "rm -i". -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/i-never.sh b/tests/rm/i-never.sh index 6302174a..751473e4 100755 --- a/tests/rm/i-never.sh +++ b/tests/rm/i-never.sh @@ -2,7 +2,7 @@ # Ensure that rm --interactive=never works does not prompt, even for # an unwritable file. -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/i-no-r.sh b/tests/rm/i-no-r.sh index 8a535faf..22819ab6 100755 --- a/tests/rm/i-no-r.sh +++ b/tests/rm/i-no-r.sh @@ -3,7 +3,7 @@ # recurse into directory DIR. rm -i (without -r) must fail in that case. # Fixed in coreutils-4.5.2. -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This 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 @@ echo y > y || framework_failure_ # This must fail. -rm -i dir < y > /dev/null 2>&1 && fail=1 +returns_ 1 rm -i dir < y > /dev/null 2>&1 || fail=1 # The directory must remain. test -d dir || fail=1 diff --git a/tests/rm/ignorable.sh b/tests/rm/ignorable.sh index 8d656eea..e4ddcc2d 100755 --- a/tests/rm/ignorable.sh +++ b/tests/rm/ignorable.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that rm -f existing-non-dir/anything exits successfully -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/inaccessible.sh b/tests/rm/inaccessible.sh index e3c48dfe..42cda786 100755 --- a/tests/rm/inaccessible.sh +++ b/tests/rm/inaccessible.sh @@ -2,7 +2,7 @@ # Ensure that rm works even when run from a directory # for which the user has no access at all. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/interactive-always.sh b/tests/rm/interactive-always.sh index 627d923e..ef72002a 100755 --- a/tests/rm/interactive-always.sh +++ b/tests/rm/interactive-always.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test the --interactive[=WHEN] changes added to coreutils 6.0 -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/interactive-once.sh b/tests/rm/interactive-once.sh index db10bba6..398826e6 100755 --- a/tests/rm/interactive-once.sh +++ b/tests/rm/interactive-once.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test the -I option added to coreutils 6.0 -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/ir-1.sh b/tests/rm/ir-1.sh index 86a5595f..002ea454 100755 --- a/tests/rm/ir-1.sh +++ b/tests/rm/ir-1.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test "rm -ir". -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/isatty.sh b/tests/rm/isatty.sh index 0ff8d1fa..4eea4432 100755 --- a/tests/rm/isatty.sh +++ b/tests/rm/isatty.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure 'chown 0 f; rm f' prompts before removing f. -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This 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,10 +25,12 @@ skip_if_root_ ls /dev/stdin >/dev/null 2>&1 \ || skip_ 'there is no /dev/stdin file' +# Terminate any background processes +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + touch f chmod 0 f -rm ---presume-input-tty f > out 2>&1 & -pid=$! +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. @@ -37,7 +39,7 @@ sleep 1 # The file must still exist. test -f f || fail=1 -kill $pid > /dev/null 2>&1 +cleanup_ # Note the trailing 'x' -- so I don't have to have a trailing # blank in this file :-) diff --git a/tests/rm/many-dir-entries-vs-OOM.sh b/tests/rm/many-dir-entries-vs-OOM.sh index c45453d7..e9c95d5d 100755 --- a/tests/rm/many-dir-entries-vs-OOM.sh +++ b/tests/rm/many-dir-entries-vs-OOM.sh @@ -2,7 +2,7 @@ # In coreutils-8.12, rm,du,chmod, etc. would use too much memory # when processing a directory with many entries (as in > 100,000). -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/no-give-up.sh b/tests/rm/no-give-up.sh index 41070c9d..a5134d76 100755 --- a/tests/rm/no-give-up.sh +++ b/tests/rm/no-give-up.sh @@ -2,7 +2,7 @@ # With rm from coreutils-5.2.1 and earlier, 'rm -r' would mistakenly # give up too early under some conditions. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This 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,8 +30,8 @@ chmod go=x . || framework_failure_ # This must fail, since '.' is not writable by $NON_ROOT_USERNAME. -chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" \ - rm -rf d 2>/dev/null && fail=1 +returns_ 1 chroot --skip-chdir --user=$NON_ROOT_USERNAME / env PATH="$PATH" \ + rm -rf d 2>/dev/null || fail=1 # d must remain. test -d d || fail=1 diff --git a/tests/rm/one-file-system.sh b/tests/rm/one-file-system.sh index 09a0464b..11492092 100755 --- a/tests/rm/one-file-system.sh +++ b/tests/rm/one-file-system.sh @@ -1,7 +1,7 @@ #!/bin/sh # Demonstrate rm's new --one-file-system option. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/one-file-system2.sh b/tests/rm/one-file-system2.sh index e4e8a417..1a27dfd1 100755 --- a/tests/rm/one-file-system2.sh +++ b/tests/rm/one-file-system2.sh @@ -1,7 +1,7 @@ #!/bin/sh # Verify --one-file-system does delete within a file system -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/r-1.sh b/tests/rm/r-1.sh index 6e1d6089..21564c6a 100755 --- a/tests/rm/r-1.sh +++ b/tests/rm/r-1.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test "rm -r --verbose". -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/r-2.sh b/tests/rm/r-2.sh index a8049bd2..a99bdbf4 100755 --- a/tests/rm/r-2.sh +++ b/tests/rm/r-2.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test "rm -r --verbose". -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/r-3.sh b/tests/rm/r-3.sh index 82c35bed..a8bea100 100755 --- a/tests/rm/r-3.sh +++ b/tests/rm/r-3.sh @@ -1,7 +1,7 @@ #!/bin/sh # Create and remove a directory with more than 254 files. -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/r-4.sh b/tests/rm/r-4.sh index 095f1516..91a8b58a 100755 --- a/tests/rm/r-4.sh +++ b/tests/rm/r-4.sh @@ -1,7 +1,7 @@ #!/bin/sh # Try to remove '.' and '..' recursively. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This 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,8 +43,8 @@ rmtest 'd/..' || fail=1 rmtest 'd/../' || fail=1 -# This test is too dangerous -- if there's a bug you're wiped out! -# rm -fr / 2>/dev/null && fail=1 +# This test is handled more carefully in r-root.sh +# returns_ 1 rm -fr / 2>/dev/null || fail=1 test -f d/a || fail=1 diff --git a/tests/rm/r-root.sh b/tests/rm/r-root.sh index e17b85bd..c06332ae 100755 --- a/tests/rm/r-root.sh +++ b/tests/rm/r-root.sh @@ -1,7 +1,7 @@ #!/bin/sh # Try to remove '/' recursively. -# Copyright (C) 2013-2014 Free Software Foundation, Inc. +# Copyright (C) 2013-2015 Free Software Foundation, Inc. # This 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 @@ exercise_rm_r_root () fi timeout --signal=KILL 2 \ - env LD_PRELOAD=./k.so $skip_exit \ + env LD_PRELOAD=$LD_PRELOAD:./k.so $skip_exit \ rm -rv --one-file-system "$@" > out 2> err return $? @@ -143,8 +143,7 @@ for opts in \ 'rootlink2/' \ 'rootlink3/' ; do - exercise_rm_r_root $opts \ - && fail=1 + returns_ 1 exercise_rm_r_root $opts || fail=1 # For some of the synonyms, the error diagnostic slightly differs from that # of the basic "/" case (see gnulib's fts_open' and ROOT_DEV_INO_WARN): @@ -178,8 +177,7 @@ done # by setting the following variable. CU_TEST_SKIP_EXIT=1 -exercise_rm_r_root --preserve-root file1 '/' file2 \ - && fail=1 +returns_ 1 exercise_rm_r_root --preserve-root file1 '/' file2 || fail=1 unset CU_TEST_SKIP_EXIT @@ -219,8 +217,7 @@ for file in \ test -d "$file" || continue # if e.g. /etc does not exist. - exercise_rm_r_root --preserve-root "$file" \ - && fail=1 + returns_ 1 exercise_rm_r_root --preserve-root "$file" || fail=1 grep "^rm: refusing to remove '\.' or '\.\.' directory: skipping" err \ || fail=1 @@ -244,11 +241,10 @@ exercise_rm_r_root --interactive=never --no-preserve-root '/' \ || fail=1 # The 'err' file should not contain the above error diagnostic. -grep "^rm: it is dangerous to operate recursively on '/'" err \ - && fail=1 +grep "^rm: it is dangerous to operate recursively on '/'" err && fail=1 # Instead, rm(1) should have called the intercepted unlinkat() function, -# i.e. the evidence file "x" should exist. +# i.e., the evidence file "x" should exist. test -f x || fail=1 test $fail = 1 && { cat out; cat err; } diff --git a/tests/rm/read-only.sh b/tests/rm/read-only.sh index 377305cd..4375f1bc 100755 --- a/tests/rm/read-only.sh +++ b/tests/rm/read-only.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that rm -f nonexistent-file-on-read-only-fs succeeds. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -47,6 +47,6 @@ compare /dev/null 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 +compare /dev/null out && fail=1 Exit $fail diff --git a/tests/rm/readdir-bug.sh b/tests/rm/readdir-bug.sh index d54a71c1..0ff02714 100755 --- a/tests/rm/readdir-bug.sh +++ b/tests/rm/readdir-bug.sh @@ -2,7 +2,7 @@ # Exercise the Darwin/MacOS bug worked around on 2006-09-29, # whereby rm would fail to remove all entries in a directory. -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/rm1.sh b/tests/rm/rm1.sh index 575a78dd..dcdfecf4 100755 --- a/tests/rm/rm1.sh +++ b/tests/rm/rm1.sh @@ -1,7 +1,7 @@ #!/bin/sh # exercise another small part of remove.c -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/rm2.sh b/tests/rm/rm2.sh index 93ca66e2..2bc558ef 100755 --- a/tests/rm/rm2.sh +++ b/tests/rm/rm2.sh @@ -1,7 +1,7 @@ #!/bin/sh # exercise another small part of remove.c -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/rm3.sh b/tests/rm/rm3.sh index dda27a60..df426b7e 100755 --- a/tests/rm/rm3.sh +++ b/tests/rm/rm3.sh @@ -1,7 +1,7 @@ #!/bin/sh # exercise another small part of remove.c -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/rm4.sh b/tests/rm/rm4.sh index 60eb4a78..e0f141fd 100755 --- a/tests/rm/rm4.sh +++ b/tests/rm/rm4.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that 'rm dir' fails without --recursive -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This 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 @@ mkdir dir || framework_failure_ # This should fail. -rm dir > /dev/null 2>&1 && fail=1 +returns_ 1 rm dir > /dev/null 2>&1 || fail=1 test -d dir || fail=1 diff --git a/tests/rm/rm5.sh b/tests/rm/rm5.sh index 6ccd6c6b..7e017a68 100755 --- a/tests/rm/rm5.sh +++ b/tests/rm/rm5.sh @@ -1,7 +1,7 @@ #!/bin/sh # a basic test of rm -ri -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/sunos-1.sh b/tests/rm/sunos-1.sh index cc8a02b7..db4221f0 100755 --- a/tests/rm/sunos-1.sh +++ b/tests/rm/sunos-1.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure that rm -r '' fails. -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # This 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,6 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ rm -rm -r '' > /dev/null 2>&1 && fail=1 +returns_ 1 rm -r '' > /dev/null 2>&1 || fail=1 Exit $fail diff --git a/tests/rm/unread2.sh b/tests/rm/unread2.sh index 977d557d..3e532497 100755 --- a/tests/rm/unread2.sh +++ b/tests/rm/unread2.sh @@ -1,7 +1,7 @@ #!/bin/sh # exercise one small part of remove.c -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/unread3.sh b/tests/rm/unread3.sh index a8df825c..3d9d74cb 100755 --- a/tests/rm/unread3.sh +++ b/tests/rm/unread3.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that rm works even from an unreadable working directory. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/unreadable.pl b/tests/rm/unreadable.pl index 7f0cd3d6..4abf301d 100755 --- a/tests/rm/unreadable.pl +++ b/tests/rm/unreadable.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Test "rm" and unreadable directories. -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rm/v-slash.sh b/tests/rm/v-slash.sh index 69730a19..5cabb0bc 100755 --- a/tests/rm/v-slash.sh +++ b/tests/rm/v-slash.sh @@ -1,7 +1,7 @@ #!/bin/sh # avoid extra slashes in --verbose output -# Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Copyright (C) 2007-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rmdir/fail-perm.sh b/tests/rmdir/fail-perm.sh index 1072feef..985cb23b 100755 --- a/tests/rmdir/fail-perm.sh +++ b/tests/rmdir/fail-perm.sh @@ -2,7 +2,7 @@ # For unwritable directory 'd', 'rmdir -p d d/e/f' would emit # diagnostics but would not fail. Fixed in 5.1.2. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This 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,6 @@ 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 +returns_ 1 rmdir -p d d/e/f 2> /dev/null || fail=1 Exit $fail diff --git a/tests/rmdir/ignore.sh b/tests/rmdir/ignore.sh index 487dd9fd..6cf5c225 100755 --- a/tests/rmdir/ignore.sh +++ b/tests/rmdir/ignore.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure rmdir's --ignore-fail-on-non-empty option works -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/rmdir/t-slash.sh b/tests/rmdir/t-slash.sh index 8d010412..4bf9c915 100755 --- a/tests/rmdir/t-slash.sh +++ b/tests/rmdir/t-slash.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure rmdir -p works on a directory specified with a trailing slash -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/sample-test b/tests/sample-test index a6dcc21b..2ddf3b8f 100644 --- a/tests/sample-test +++ b/tests/sample-test @@ -1,7 +1,7 @@ #!/bin/sh # FIXME -# Copyright (C) 2014 Free Software Foundation, Inc. +# Copyright (C) 2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/split/additional-suffix.sh b/tests/split/additional-suffix.sh index 7a4d2d7b..79a3f972 100755 --- a/tests/split/additional-suffix.sh +++ b/tests/split/additional-suffix.sh @@ -1,7 +1,7 @@ #!/bin/sh # show that 'split --additional-suffix=SUFFIX' works. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This 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,6 +39,6 @@ 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 +returns_ 1 split --lines=2 --additional-suffix=a/b in 2>/dev/null >out || fail=1 Exit $fail diff --git a/tests/split/b-chunk.sh b/tests/split/b-chunk.sh index 86f95a05..d10fbb9d 100755 --- a/tests/split/b-chunk.sh +++ b/tests/split/b-chunk.sh @@ -1,7 +1,7 @@ #!/bin/sh # test splitting into 3 chunks -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This 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,22 +29,33 @@ rm -f x?? 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 +printf '1\n2\n3\n4\n5\n' > input || framework_failure_ + +for file in input /proc/version /sys/kernel/profiling; do + test -f $file || continue + + split -n 3 $file > out || fail=1 + split -n 1/3 $file > b1 || fail=1 + split -n 2/3 $file > b2 || fail=1 + split -n 3/3 $file > b3 || fail=1 + + case $file in + input) + 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 + ;; + esac + + compare xaa b1 || fail=1 + compare xab b2 || fail=1 + compare xac b3 || fail=1 + cat xaa xab xac | compare - $file || fail=1 + test -f xad && fail=1 +done Exit $fail diff --git a/tests/split/fail.sh b/tests/split/fail.sh index 33694129..e8f7bc3c 100755 --- a/tests/split/fail.sh +++ b/tests/split/fail.sh @@ -1,7 +1,7 @@ #!/bin/sh # split must fail when given length/count of zero. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,13 +24,13 @@ 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 +returns_ 1 split -b 0 in 2> /dev/null || fail=1 +returns_ 1 split -C 0 in 2> /dev/null || fail=1 +returns_ 1 split -l 0 in 2> /dev/null || fail=1 +returns_ 1 split -n 0 in 2> /dev/null || fail=1 +returns_ 1 split -n 1/0 in 2> /dev/null || fail=1 +returns_ 1 split -n 0/1 in 2> /dev/null || fail=1 +returns_ 1 split -n 2/1 in 2> /dev/null || fail=1 # Make sure -C doesn't create empty files. rm -f x?? || fail=1 @@ -42,21 +42,21 @@ test -f xac && fail=1 split -1 in 2> /dev/null || fail=1 # Then make sure that -0 evokes a failure. -split -0 in 2> /dev/null && fail=1 +returns_ 1 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 +returns_ 1 split --line-bytes=$OFF_T_OFLOW 2> /dev/null in || fail=1 +returns_ 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 || fail=1 -split --number=r/$UINTMAX_OFLOW /dev/null && fail=1 +returns_ 1 split --number=r/$UINTMAX_OFLOW /dev/null || fail=1 # Make sure that a huge obsolete option evokes the right failure. -split -99999999999999999991 2> out && fail=1 +split -99999999999999999991 2> out # On losing systems (x86 Solaris 5.9 c89), we get a message like this: # split: line count option -9999999999... is too large @@ -75,7 +75,7 @@ compare exp out || fail=1 # (the current directory in this case) if ! cat . >/dev/null; then # can't read() directories - split . && fail=1 + returns_ 1 split . || fail=1 fi Exit $fail diff --git a/tests/split/filter.sh b/tests/split/filter.sh index fed8c7a4..55610e41 100755 --- a/tests/split/filter.sh +++ b/tests/split/filter.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise split's new --filter option. -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This 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 @@ 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 +returns_ 1 split -n 1/2 --filter='true' /dev/null 2>&1 || fail=1 # Ensure SIGPIPEs sent by the children don't propagate back # where they would result in a non zero exit from split. diff --git a/tests/split/guard-input.sh b/tests/split/guard-input.sh index 56b3158b..1213ab04 100755 --- a/tests/split/guard-input.sh +++ b/tests/split/guard-input.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure split doesn't overwrite input with output. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This 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,10 +23,10 @@ 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 +returns_ 1 split -C 6 xaa || fail=1 +returns_ 1 split -C 6 in2 || fail=1 +returns_ 1 split -C 6 in3 || fail=1 +returns_ 1 split -C 6 - < xaa || fail=1 compare exp-1 xaa || fail=1 diff --git a/tests/split/l-chunk.sh b/tests/split/l-chunk.sh index 792c5569..c97b3b56 100755 --- a/tests/split/l-chunk.sh +++ b/tests/split/l-chunk.sh @@ -1,7 +1,7 @@ #!/bin/sh # test splitting into newline delineated chunks (-n l/...) -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ print_ver_ split # invalid number of chunks -echo 'split: 1o: invalid number of chunks' > exp +echo "split: invalid number of chunks: '1o'" > exp split -n l/1o 2>err && fail=1 compare exp err || fail=1 @@ -53,8 +53,9 @@ lines=\ 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 +echo "split: invalid chunk number: '16'" > exp +split -n l/16/15 in 2>err.t && fail=1 +sed "s/': .*/'/" < err.t > err || framework_failure_ compare exp err || fail=1 printf '%s' "\ diff --git a/tests/split/line-bytes.sh b/tests/split/line-bytes.sh index 5f6f505b..6e2f1376 100755 --- a/tests/split/line-bytes.sh +++ b/tests/split/line-bytes.sh @@ -1,7 +1,7 @@ #!/bin/sh # test -C, --lines-bytes -# Copyright (C) 2013-2014 Free Software Foundation, Inc. +# Copyright (C) 2013-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/split/lines.sh b/tests/split/lines.sh index 09dc8c77..5363eb4d 100755 --- a/tests/split/lines.sh +++ b/tests/split/lines.sh @@ -1,7 +1,7 @@ #!/bin/sh # show that 'split --lines=2' works. -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/split/numeric.sh b/tests/split/numeric.sh index 6467cb7f..9c4e1c55 100755 --- a/tests/split/numeric.sh +++ b/tests/split/numeric.sh @@ -1,7 +1,7 @@ #!/bin/sh # Show that split --numeric-suffixes[=from] works. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # This 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,10 +56,10 @@ 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 +returns_ 1 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 +returns_ 1 split --numeric-suffixes=-1 in 2> /dev/null || fail=1 +returns_ 1 split --numeric-suffixes=one in 2> /dev/null || fail=1 Exit $fail diff --git a/tests/split/r-chunk.sh b/tests/split/r-chunk.sh index 8a5f221e..b03defb4 100755 --- a/tests/split/r-chunk.sh +++ b/tests/split/r-chunk.sh @@ -1,7 +1,7 @@ #!/bin/sh # test splitting into round-robin chunks -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/split/record-sep.sh b/tests/split/record-sep.sh new file mode 100755 index 00000000..69eb27fa --- /dev/null +++ b/tests/split/record-sep.sh @@ -0,0 +1,78 @@ +#!/bin/sh +# test split with custom record separators + +# Copyright (C) 2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ split + +NL=' +' + +for sep in "$NL" '\0' ':'; do + + test "$sep" = "$NL" && tr='\n' || tr="$sep" + + for mode in '--lines=2' '--line-bytes=4' '--number=l/3' '--number=r/3'; do + + # Generate in default mode for comparison + printf '1\n2\n3\n4\n5\n' > in || framework_failure_ + split $mode in || fail=1 + tr '\n' "$tr" < xaa > exp1 + tr '\n' "$tr" < xab > exp2 + tr '\n' "$tr" < xac > exp3 + + rm -f x?? + + # Generate output with specified --separator + printf '1\n2\n3\n4\n5\n' | tr '\n' "$tr" > in || framework_failure_ + split $mode -t "$sep" in || fail=1 + + compare exp1 xaa || fail=1 + compare exp2 xab || fail=1 + compare exp3 xac || fail=1 + test -f xad && fail=1 + done + +done + + +# +# Test usage edge cases +# + +# Should fail: '-t' requires an argument +returns_ 1 split -t = number of files +# That's the multi run use case which is invalid to adjust suffix len +# as that would result in an incorrect order for the total output file set +returns_ 1 split --numeric-suffixes=100 --number=r/100 file.in || fail=1 + Exit $fail diff --git a/tests/split/suffix-length.sh b/tests/split/suffix-length.sh index af5e95ee..0be3e9bc 100755 --- a/tests/split/suffix-length.sh +++ b/tests/split/suffix-length.sh @@ -1,7 +1,7 @@ #!/bin/sh # Show that split -a works. -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -70,7 +70,7 @@ 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 +returns_ 1 split -a2 -n1000 < /dev/null || fail=1 test -f xaa && fail=1 Exit $fail diff --git a/tests/tail-2/F-headers.sh b/tests/tail-2/F-headers.sh new file mode 100755 index 00000000..31d0fa6b --- /dev/null +++ b/tests/tail-2/F-headers.sh @@ -0,0 +1,59 @@ +#!/bin/sh +# Ensure tail -F distinguishes output with the correct headers +# Between coreutils 7.5 and 8.23 inclusive, 'tail -F ...' would +# not output headers for or created/renamed files in certain cases. + +# Copyright (C) 2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tail + +check_tail_output() +{ + local delay="$1" + grep "$tail_re" out || + { sleep $delay; return 1; } +} + +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + +# Speedup the non inotify case +fastpoll='-s.1 --max-unchanged-stats=1' + +for mode in '' '---disable-inotify'; do + rm -f a b out + + tail $mode -F $fastpoll a b > out 2>&1 & pid=$! + + # Wait up to 12.7s for tail to start. + tail_re="cannot open 'b'" retry_delay_ check_tail_output .1 7 || + { cat out; fail=1; } + + echo x > a + # Wait up to 12.7s for a's header to appear in the output: + tail_re='==> a <==' retry_delay_ check_tail_output .1 7 || + { echo "$0: a: unexpected delay?"; cat out; fail=1; } + + echo y > b + # Wait up to 12.7s for b's header to appear in the output: + tail_re='==> b <==' retry_delay_ check_tail_output .1 7 || + { echo "$0: b: unexpected delay?"; cat out; fail=1; } + + cleanup_ +done + +Exit $fail diff --git a/tests/tail-2/F-vs-missing.sh b/tests/tail-2/F-vs-missing.sh index d47b3022..54fe30a8 100755 --- a/tests/tail-2/F-vs-missing.sh +++ b/tests/tail-2/F-vs-missing.sh @@ -3,7 +3,7 @@ # Before coreutils-8.6, tail -F missing/file would not # notice any subsequent availability of the missing/file. -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,10 +21,6 @@ . "${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" @@ -32,33 +28,32 @@ check_tail_output() { 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 +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } -mkdir missing || fail=1 -(cd missing && echo x > file) +# Speedup the non inotify case +fastpoll='-s.1 --max-unchanged-stats=1' -# 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; } +for mode in '' '---disable-inotify'; do + rm -rf out missing -kill -HUP $pid + tail $mode -F $fastpoll missing/file > out 2>&1 & pid=$! -cleanup() -{ - local delay="$1" - rm -rf missing || - { sleep $delay; return 1; } -} + # Wait up to 12.7s 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 || + { cat out; fail=1; } + + mkdir missing || framework_failure_ + (cd missing && echo x > file) || framework_failure_ + + # Wait up to 12.7s for this to appear in the output: + # "tail: '...' has appeared; following new file" + tail_re='has appeared' retry_delay_ check_tail_output .1 7 || + { echo "$0: file: unexpected delay?"; cat out; fail=1; } + + cleanup_ +done -# 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.sh b/tests/tail-2/F-vs-rename.sh index 3e31ec8c..06733fb4 100755 --- a/tests/tail-2/F-vs-rename.sh +++ b/tests/tail-2/F-vs-rename.sh @@ -1,9 +1,9 @@ #!/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". +# Demonstrate that tail -F works when renaming the tailed files. +# Between coreutils 7.5 and 8.2 inclusive, 'tail -F a b' would +# stop tracking additions to b after 'mv a b'. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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,55 +21,63 @@ . "${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 || + grep "$tail_re" out || { 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 +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + +# Speedup the non inotify case +fastpoll='-s.1 --max-unchanged-stats=1' + +for mode in '' '---disable-inotify'; do + rm -f a b out + touch a b || framework_failure_ + + tail $mode -F $fastpoll a b > out 2>&1 & pid=$! + + # Wait up to 12.7s for tail to start. + echo x > a + tail_re='^x$' retry_delay_ check_tail_output .1 7 || { cat out; fail=1; } + + mv a b || framework_failure_ + + # Wait 12.7s for this diagnostic: + # tail: 'a' has become inaccessible: No such file or directory + tail_re='inaccessible' retry_delay_ check_tail_output .1 7 || + { cat out; fail=1; } + + echo x > a + # Wait up to 12.7s for this to appear in the output: + # "tail: '...' has appeared; following 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 12.7s 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 12.7s 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; } + + cleanup_ +done Exit $fail diff --git a/tests/tail-2/append-only.sh b/tests/tail-2/append-only.sh index 7414da3e..2ea5df1f 100755 --- a/tests/tail-2/append-only.sh +++ b/tests/tail-2/append-only.sh @@ -2,7 +2,7 @@ # Ensure that tail -f works on an append-only file # Requires root access to do chattr +a, as well as an ext[23] or xfs file system -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # This 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,9 @@ print_ver_ tail require_root_ +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + chattr_a_works=1 touch f chattr +a f 2>/dev/null || chattr_a_works=0 @@ -32,10 +35,10 @@ if test $chattr_a_works = 0; then fi -for inotify in ---disable-inotify ''; do - sleep 1 & - pid=$! - tail --pid=$pid -f $inotify f || fail=1 +for mode in '' '---disable-inotify'; do + sleep 1 & pid=$! + tail --pid=$pid -f $mode f || fail=1 + cleanup_ done chattr -a f 2>/dev/null diff --git a/tests/tail-2/assert-2.sh b/tests/tail-2/assert-2.sh index 930e422a..67804fea 100755 --- a/tests/tail-2/assert-2.sh +++ b/tests/tail-2/assert-2.sh @@ -1,9 +1,9 @@ #!/bin/sh -# This variant of 'assert' would get a UMR reliably in 2.0.9. +# This variant of 'assert' would get a Uninit Mem Read 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-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This 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,29 +21,37 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail -# Not "expensive" per se, but sleeping for so long is annoying. -very_expensive_ +check_tail_output() +{ + local delay="$1" + grep "$tail_re" out || + { sleep $delay; return 1; } +} -ok='ok ok ok' +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } -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 +# Speedup the non inotify case +fastpoll='-s.1 --max-unchanged-stats=1' -# echo waiting.... -wait +for mode in '' '---disable-inotify'; do + rm -f a foo out + touch a || framework_failure_ -case "$(cat err)" in - *$ok) ;; - *) fail=1;; -esac + tail $mode --follow=name $fastpoll a foo > out 2>&1 & pid=$! -test $fail = 1 && cat err + # Wait up to 12.7s for tail to start. + echo x > a || framework_failure_ + tail_re='^x$' retry_delay_ check_tail_output .1 7 || + { cat out; fail=1; break; } + + # Wait up to 12.7s for tail to notice new foo file + ok='ok ok ok' + echo "$ok" > foo || framework_failure_ + tail_re="^$ok$" retry_delay_ check_tail_output .1 7 || + { echo "$0: foo: unexpected delay?"; cat out; fail=1; break; } + + cleanup_ +done Exit $fail diff --git a/tests/tail-2/assert.sh b/tests/tail-2/assert.sh index 35a10da2..43bd1e14 100755 --- a/tests/tail-2/assert.sh +++ b/tests/tail-2/assert.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test for assertion failure in "test". -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # This 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,36 +26,43 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail -# Not "expensive" per se, but sleeping for so long is annoying. -very_expensive_ +check_tail_output() +{ + local delay="$1" + grep "$tail_re" out || + { sleep $delay; return 1; } +} -ok='ok ok ok' +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } -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) & +# Speedup the non inotify case +fastpoll='-s.1 --max-unchanged-stats=1' -echo sleeping for 7 seconds... +for mode in '' '---disable-inotify'; do + rm -f a foo out + touch a foo || framework_failure_ -# Give the backgrounded 'tail' a chance to start before removing foo. -# Otherwise, without --retry, tail wouldn't try to open 'foo' again. -sleep 1 + tail $mode --follow=name $fastpoll a foo > out 2>&1 & pid=$! -rm -f foo -sleep 6 -echo $ok > f -mv f foo + # Wait up to 12.7s for tail to start. + echo x > a || framework_failure_ + tail_re='^x$' retry_delay_ check_tail_output .1 7 || + { cat out; fail=1; break; } -# echo waiting.... -wait + # Wait 12.7s for this diagnostic: + # tail: foo: No such file or directory + rm foo || framework_failure_ + tail_re='No such file' retry_delay_ check_tail_output .1 7 || + { cat out; fail=1; break; } -case "$(cat err)" in - *$ok) ;; - *) fail=1;; -esac + # Wait up to 12.7s for tail to notice new foo file + ok='ok ok ok' + echo "$ok" > foo || framework_failure_ + tail_re="^$ok$" retry_delay_ check_tail_output .1 7 || + { echo "$0: foo: unexpected delay?"; cat out; fail=1; break; } -test $fail = 1 && cat err + cleanup_ +done Exit $fail diff --git a/tests/tail-2/big-4gb.sh b/tests/tail-2/big-4gb.sh index cfd867b7..ac07a022 100755 --- a/tests/tail-2/big-4gb.sh +++ b/tests/tail-2/big-4gb.sh @@ -2,7 +2,7 @@ # Demonstrate a bug in 'tail -cN' when operating on files of size 4G and larger # Fixed in coreutils-4.5.2. -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/tail-2/descriptor-vs-rename.sh b/tests/tail-2/descriptor-vs-rename.sh new file mode 100755 index 00000000..083d7144 --- /dev/null +++ b/tests/tail-2/descriptor-vs-rename.sh @@ -0,0 +1,56 @@ +#!/bin/sh +# Demonstrate that tail -f works when renaming the tailed files. +# Between coreutils 7.5 and 8.23 inclusive, 'tail -f a' would +# stop tracking additions to b after 'mv a b'. + +# Copyright (C) 2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tail + +check_tail_output() +{ + local delay="$1" + grep "$tail_re" out || + { sleep $delay; return 1; } +} + +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + +# Speedup the non inotify case +fastpoll='-s.1 --max-unchanged-stats=1' + +for mode in '' '---disable-inotify'; do + rm -f a out + touch a || framework_failure_ + + tail $mode $fastpoll -f a > out 2>&1 & pid=$! + + # Wait up to 12.7s for tail to start. + echo x > a + tail_re='^x$' retry_delay_ check_tail_output .1 7 || { cat out; fail=1; } + + mv a b || framework_failure_ + + echo y >> b + # Wait up to 12.7s for "y" to appear in the output: + tail_re='^y$' retry_delay_ check_tail_output .1 7 || { cat out; fail=1; } + + cleanup_ +done + +Exit $fail diff --git a/tests/tail-2/flush-initial.sh b/tests/tail-2/flush-initial.sh index fd14eae9..a25bbeb1 100755 --- a/tests/tail-2/flush-initial.sh +++ b/tests/tail-2/flush-initial.sh @@ -1,7 +1,7 @@ #!/bin/sh # inotify-based tail -f didn't flush its initial output before blocking -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,13 +19,18 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail -echo line > in || fail=1 +# Speedup the non inotify case +fastpoll='-s.1 --max-unchanged-stats=1' + +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + +echo line > in || framework_failure_ # 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=$! +tail $fastpoll -f in > out & pid=$! -# Wait for 1.5s for the file to be flushed. +# Wait for 3.1s for the file to be flushed. tail_flush() { local delay="$1" @@ -35,6 +40,6 @@ tail_flush() } retry_delay_ tail_flush .1 5 || fail=1 -kill $tail_pid +cleanup_ Exit $fail diff --git a/tests/tail-2/follow-name.sh b/tests/tail-2/follow-name.sh index f70baec3..be68479e 100755 --- a/tests/tail-2/follow-name.sh +++ b/tests/tail-2/follow-name.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that --follow=name does not imply --retry -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/tail-2/follow-stdin.sh b/tests/tail-2/follow-stdin.sh index 1769ee2c..f50dd726 100755 --- a/tests/tail-2/follow-stdin.sh +++ b/tests/tail-2/follow-stdin.sh @@ -1,7 +1,7 @@ #!/bin/sh # tail -f - would fail with the initial inotify implementation -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/tail-2/infloop-1.sh b/tests/tail-2/infloop-1.sh deleted file mode 100755 index 37d081f3..00000000 --- a/tests/tail-2/infloop-1.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# This test would fail with tail from pre-1.22i textutils. - -# Copyright (C) 1999-2014 Free Software Foundation, Inc. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -. "${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.sh b/tests/tail-2/inotify-hash-abuse.sh index 6492049d..6333699c 100755 --- a/tests/tail-2/inotify-hash-abuse.sh +++ b/tests/tail-2/inotify-hash-abuse.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise an abort-inducing flaw in inotify-enabled tail -F. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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,10 +23,6 @@ print_ver_ tail 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" @@ -34,30 +30,42 @@ check_tail_output() { 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 +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } -mv 1 f || fail=1 +# Speedup the non inotify case +fastpoll='-s.1 --max-unchanged-stats=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 +for mode in '' '---disable-inotify'; do + rm -f out -# Trigger the bug. Before the fix, this would provoke the abort. -echo a > 1 || fail=1 + tail $mode $fastpoll -qF $(seq $n) > out 2>&1 & pid=$! -# 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 + # Wait up to 12.7s for tail to start + echo x > $n + tail_re='^x$' retry_delay_ check_tail_output .1 7 || + { cat out; fail=1; } + + mv 1 f || framework_failure_ + + # Wait 12.7s for this diagnostic: + # tail: '1' has become inaccessible: No such file or directory + tail_re='inaccessible' retry_delay_ check_tail_output .1 7 || + { cat out; fail=1; } -# Kill the working tail, or fail if it has already aborted -kill $pid || fail=1 + # Trigger the bug. Before the fix, this would provoke the abort. + echo a > 1 || framework_failure_ + + # Wait up to 6.3s for the "tail: '1' has appeared; ..." message + # (or for the buggy tail to die) + tail_re='has appeared' retry_delay_ check_tail_output .1 6 || + { cat out; fail=1; } + + # Double check that tail hasn't aborted + kill -0 $pid || fail=1 + + cleanup_ +done -cat out Exit $fail diff --git a/tests/tail-2/inotify-hash-abuse2.sh b/tests/tail-2/inotify-hash-abuse2.sh index 6018448f..d641c241 100755 --- a/tests/tail-2/inotify-hash-abuse2.sh +++ b/tests/tail-2/inotify-hash-abuse2.sh @@ -2,7 +2,7 @@ # Exercise an abort-inducing flaw in inotify-enabled tail -F. # Like inotify-hash-abuse, but without a hard-coded "9". -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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,20 +20,27 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail -touch f || framework_failure_ +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } -debug='---disable-inotify -s .001' -debug= -tail $debug -F f & pid=$! -cleanup_() { kill $pid; } +# Speedup the non inotify case +fastpoll='-s.1 --max-unchanged-stats=1' -for i in $(seq 200); do - kill -0 $pid || break; - mv f g - touch f -done +for mode in '' '---disable-inotify'; do + touch f || framework_failure_ + + tail $mode $fastpoll -F f & 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 + # Ensure tail hasn't aborted + kill -0 $pid || fail=1 + + cleanup_ +done Exit $fail diff --git a/tests/tail-2/inotify-race.sh b/tests/tail-2/inotify-race.sh index c25f354a..4ce05083 100755 --- a/tests/tail-2/inotify-race.sh +++ b/tests/tail-2/inotify-race.sh @@ -5,7 +5,7 @@ # indefinitely if no *other* data is appended, but it would be printed as # soon as any additional appended data is detected. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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,10 +23,11 @@ . "${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_ +# Terminate any background gdb/tail process +cleanup_() { + kill $pid 2>/dev/null && wait $pid + kill $sleep 2>/dev/null && wait $sleep +} touch file || framework_failure_ touch tail.out || framework_failure_ @@ -37,37 +38,61 @@ case $(cat gdb.out) in *) skip_ "can't run gdb";; esac -break_src="$abs_top_builddir/src/tail.c" +# Break on a line rather than a symbol, to cater for inline functions +break_src="$abs_top_srcdir/src/tail.c" break_line=$(grep -n ^tail_forever_inotify "$break_src") || framework_failure_ break_line=$(echo "$break_line" | cut -d: -f1) || framework_failure_ + +# Note we get tail to monitor a background sleep process +# rather than using timeout(1), as timeout sends SIGCONT +# signals to its monitored process, and gdb (7.9 at least) +# has _intermittent_ issues with this. +# Sending SIGCONT resulted in either delayed child termination, +# or no child termination resulting in a hung test. +# See https://sourceware.org/bugzilla/show_bug.cgi?id=18364 + +env sleep 10 & sleep=$! + # See if gdb works and # tail_forever_inotify is compiled and run -timeout 10s gdb -nx --batch-silent \ +gdb -nx --batch-silent \ --eval-command="break $break_line" \ - --eval-command='run -f file' \ + --eval-command="run --pid=$sleep -f file" \ --eval-command='quit' \ - tail < /dev/null > gdb.out 2>&1 || skip_ 'breakpoint not hit' + tail < /dev/null > gdb.out 2>&1 + +kill $sleep || skip_ 'breakpoint not hit' +wait $sleep # 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 compare /dev/null gdb.out || skip_ "can't set breakpoints in tail" +env sleep 10 & sleep=$! + # 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 \ +gdb -nx --batch-silent \ --eval-command="break $break_line" \ - --eval-command='run -f file >> tail.out' \ + --eval-command="run --pid=$sleep -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 < /dev/null > /dev/null 2>&1 & pid=$! + +tail --pid=$pid -f tail.out | (read REPLY; kill $pid) + +# 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, but +# killing sleep, should cause the tail process and thus gdb to exit. +kill $sleep +wait $sleep -tail --pid=$pid -f tail.out | (read; kill $pid) +wait $pid -test -s tail.out || fail=1 +compare /dev/null tail.out && fail=1 Exit $fail diff --git a/tests/tail-2/inotify-race2.sh b/tests/tail-2/inotify-race2.sh new file mode 100755 index 00000000..1e01d505 --- /dev/null +++ b/tests/tail-2/inotify-race2.sh @@ -0,0 +1,103 @@ +#!/bin/sh +# Ensure that tail does not ignore a tailed-forever file that has been +# replaced between tail's initial read-to-EOF, and when the inotify watches +# are established in tail_forever_inotify. That new file would be ignored +# indefinitely. + +# Copyright (C) 2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tail + +# Terminate any background gdb/tail process +cleanup_() { + kill $pid 2>/dev/null && wait $pid + kill $sleep 2>/dev/null && wait $sleep +} + +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 + +# Break on a line rather than a symbol, to cater for inline functions +break_src="$abs_top_srcdir/src/tail.c" +break_line=$(grep -n ^tail_forever_inotify "$break_src") || framework_failure_ +break_line=$(echo "$break_line" | cut -d: -f1) || framework_failure_ + + +# Note we get tail to monitor a background sleep process +# rather than using timeout(1), as timeout sends SIGCONT +# signals to its monitored process, and gdb (7.9 at least) +# has _intermittent_ issues with this. +# Sending SIGCONT resulted in either delayed child termination, +# or no child termination resulting in a hung test. +# See https://sourceware.org/bugzilla/show_bug.cgi?id=18364 + +env sleep 10 & sleep=$! + +# See if gdb works and +# tail_forever_inotify is compiled and run +gdb -nx --batch-silent \ + --eval-command="break $break_line" \ + --eval-command="run --pid=$sleep -f file" \ + --eval-command='quit' \ + tail < /dev/null > gdb.out 2>&1 + +kill $sleep || skip_ 'breakpoint not hit' +wait $sleep + +# 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 +compare /dev/null gdb.out || skip_ "can't set breakpoints in tail" + +env sleep 10 & sleep=$! + +echo never-seen-with-tail-8.23 > file.new || framework_failure_ + +# Run "tail -F file", stopping to replace with a new file before +# inotify initialization, and then continue. Before the fix, +# changes to the new file would effectively be ignored. +gdb -nx --batch-silent \ + --eval-command="break $break_line" \ + --eval-command="run --pid=$sleep -F file 2>tail.err >>tail.out" \ + --eval-command='shell mv file.new file' \ + --eval-command='continue' \ + --eval-command='quit' \ + tail < /dev/null > /dev/null 2>&1 & pid=$! + +# Note even updating the watched 'file' wouldn't have output +# anything between coreutils 7.5 and 8.23 inclusive as +# The old file descriptor (still held open by tail) was being fstat(). + +tail --pid=$pid -f tail.out | (read REPLY; kill $pid) + +# 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, but +# killing sleep, should cause the tail process and thus gdb to exit. +kill $sleep +wait $sleep + +wait $pid + +compare /dev/null tail.out && { cat tail.err; fail=1; } + +Exit $fail diff --git a/tests/tail-2/inotify-rotate-resources.sh b/tests/tail-2/inotify-rotate-resources.sh new file mode 100755 index 00000000..fe5d9127 --- /dev/null +++ b/tests/tail-2/inotify-rotate-resources.sh @@ -0,0 +1,108 @@ +#!/bin/sh +# ensure that tail -F doesn't leak inotify resources + +# Copyright (C) 2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tail + +grep '^#define HAVE_INOTIFY 1' "$CONFIG_HEADER" >/dev/null \ + || skip_ 'inotify required' + +require_strace_ 'inotify_add_watch,inotify_rm_watch' + +# Quickly skip on remote file systems +is_local_dir_ . || skip_ 'inotify not used on remote file system' + +check_tail_output() +{ + local delay="$1" + grep "$tail_re" out > /dev/null || + { sleep $delay; return 1; } +} + +# Wait up to 25.5 seconds for grep REGEXP 'out' to succeed. +grep_timeout() { tail_re="$1" retry_delay_ check_tail_output .1 8; } + +check_strace() +{ + local delay="$1" + grep "$strace_re" strace.out > /dev/null || + { sleep $delay; return 1; } +} + +cleanup_fail() +{ + cat out + warn_ $1 + fail=1 +} + +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + +fastpoll='-s.1 --max-unchanged-stats=1' + +touch k || framework_failure_ + +# Note the timeout guard isn't strictly necessary here, +# however without it strace will ignore SIGTERM. +# strace does always honor SIGTERM with the -I2 option, +# though that's not available on RHEL6 for example. +timeout 180 strace -e inotify_add_watch,inotify_rm_watch -o strace.out \ + tail -F $fastpoll k >> out 2>&1 & pid=$! + +reverted_to_polling_=0 +for i in $(seq 2); do + echo $i + + echo 'tailed' > k; + + # Wait for watch on (new) file + strace_re='inotify_add_watch.*MODIFY' retry_delay_ check_strace .1 8 || + no_watch_=1 + + # Assume this is not because we're leaking + # (resources may already be depleted) + # The explicit check for inotify_rm_watch should confirm that. + grep -F 'reverting to polling' out >/dev/null && skip_ 'inotify unused' + + # Otherwise failure is unknown + test "$no_watch_" && { cat out; framework_failure_ 'no inotify_add_watch'; } + + mv k k.tmp + # wait for tail to detect the rename + grep_timeout 'inaccessible' || + { cleanup_fail 'failed to detect rename'; break; } + + # Note we strace here rather than consuming all available watches + # to be more efficient, but more importantly avoid depleting resources. + # Note also available resources can currently be tuned with: + # sudo sysctl -w fs.inotify.max_user_watches=$smallish_number + # However that impacts all processes for the current user, and also + # may not be supported in future, instead being auto scaled to RAM + # like the Linux epoll resources were. + if test "$i" -gt 1; then + strace_re='inotify_rm_watch' retry_delay_ check_strace .1 8 || + { cleanup_fail 'failed to find inotify_rm_watch syscall'; break; } + fi + + >out && >strace.out || framework_failure_ 'failed to reset output files' +done + +cleanup_ + +Exit $fail diff --git a/tests/tail-2/inotify-rotate.sh b/tests/tail-2/inotify-rotate.sh index 1c942cc3..638a3bbb 100755 --- a/tests/tail-2/inotify-rotate.sh +++ b/tests/tail-2/inotify-rotate.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that tail -F handles rotation -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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,55 +16,62 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if test "$VERBOSE" = yes; then - set -x - tail --version -fi - . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src -expensive_ +print_ver_ tail + +grep '^#define HAVE_INOTIFY 1' "$CONFIG_HEADER" >/dev/null \ + || expensive_ + +check_tail_output() +{ + local delay="$1" + grep "$tail_re" out > /dev/null || + { sleep $delay; return 1; } +} + +# Wait up to 25.5 seconds for grep REGEXP 'out' to succeed. +grep_timeout() { tail_re="$1" retry_delay_ check_tail_output .1 8; } -# Wait several seconds for grep REGEXP FILE to succeed. -# Usage: grep_timeout REGEXP FILE -grep_timeout() +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + +cleanup_fail() { - local j - for j in $(seq 150); do - grep $1 $2 > /dev/null && return 0 - sleep 0.1 - done - return 1 + cat out + warn_ $1 + cleanup_ + fail=1 } -# For details, see -# http://lists.gnu.org/archive/html/bug-coreutils/2009-11/msg00213.html +# Speedup the non inotify case +fastpoll='-s.1 --max-unchanged-stats=1' # Perform at least this many iterations, because on multi-core systems # the offending sequence of events can be surprisingly uncommon. +# See: http://lists.gnu.org/archive/html/bug-coreutils/2009-11/msg00213.html for i in $(seq 50); do echo $i - rm -rf k x out + rm -f 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 + timeout 60 tail $fastpoll -F k > out 2>&1 & pid=$! + + echo 'tailed' > k; + # wait for 'tailed' to appear in out + grep_timeout 'tailed' || { cleanup_fail 'failed to find "tailed"'; break; } + mv x k # wait for tail to detect the rename - grep_timeout tail: out || { cat out; fail_ failed to detect rename; } + grep_timeout 'tail:' || { cleanup_fail 'failed to detect rename'; break; } + 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"'; } + # wait for "ok" to appear in 'out' + grep_timeout 'ok' || { cleanup_fail 'failed to detect echoed ok'; break; } + + cleanup_ done -wait Exit $fail diff --git a/tests/tail-2/pid.sh b/tests/tail-2/pid.sh index ef440818..b410478e 100755 --- a/tests/tail-2/pid.sh +++ b/tests/tail-2/pid.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test the --pid option of tail. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This 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,29 +22,29 @@ getlimits_ touch empty here || framework_failure_ +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } -for inotify in ---disable-inotify ''; do +for mode 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=$! + tail -f $mode here & pid=$! # Ensure that tail --pid=PID does not exit when PID is alive. - timeout 1 tail -f -s.1 --pid=$bg_pid $inotify here + timeout 1 tail -f -s.1 --pid=$pid $mode here test $? = 124 || fail=1 - # Cleanup background process - kill $bg_pid + cleanup_ # 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 + timeout 10 tail -f -s.1 --pid=$PID_T_MAX $mode 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 + timeout 10 tail -f -s10 --pid=$PID_T_MAX $mode empty test $? = 124 && fail=1 done diff --git a/tests/tail-2/pipe-f.sh b/tests/tail-2/pipe-f.sh index eaa928fb..22850c49 100755 --- a/tests/tail-2/pipe-f.sh +++ b/tests/tail-2/pipe-f.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that :|tail -f doesn't hang, per POSIX -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/tail-2/pipe-f2.sh b/tests/tail-2/pipe-f2.sh index 13ccd0b3..71a081c3 100755 --- a/tests/tail-2/pipe-f2.sh +++ b/tests/tail-2/pipe-f2.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that "tail -f fifo" tails indefinitely. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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,13 @@ mkfifo_or_skip_ fifo echo 1 > fifo & echo 1 > exp || framework_failure_ -timeout 10 tail -f fifo > out & pid=$! +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + +# Speedup the non inotify case +fastpoll='-s.1 --max-unchanged-stats=1' + +timeout 10 tail $fastpoll -f fifo > out & pid=$! check_tail_output() { @@ -32,12 +38,14 @@ check_tail_output() test -s out || { sleep $n_sec; return 1; } } -# Wait 6.3s for tail to write something. +# Wait 12.7s 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 +# Ensure tail is still running +kill -0 $pid || fail=1 + +cleanup_ Exit $fail diff --git a/tests/tail-2/proc-ksyms.sh b/tests/tail-2/proc-ksyms.sh index 3f799649..cd007744 100755 --- a/tests/tail-2/proc-ksyms.sh +++ b/tests/tail-2/proc-ksyms.sh @@ -1,7 +1,7 @@ #!/bin/sh # Prior to textutils-2.0.17, 'tail /proc/ksyms' would segfault on Linux. -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/tail-2/retry.sh b/tests/tail-2/retry.sh index dbe66a4e..a1497d90 100755 --- a/tests/tail-2/retry.sh +++ b/tests/tail-2/retry.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exercise tail's behavior regarding missing files with/without --retry. -# Copyright (C) 2013-2014 Free Software Foundation, Inc. +# Copyright (C) 2013-2015 Free Software Foundation, Inc. # This 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,13 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail +# Function to count number of lines from tail +# while ignoring transient errors due to resource limits +countlines_ () +{ + grep -Ev 'inotify (resources exhausted|cannot be used)' out | wc -l +} + # Function to check the expected line count in 'out'. # Called via retry_delay_(). Sleep some time - see retry_delay_() - if the # line count is still smaller than expected. @@ -26,34 +33,41 @@ wait4lines_ () { local delay=$1 local elc=$2 # Expected line count. - [ "$( wc -l < out )" -ge "$elc" ] || { sleep $delay; return 1; } + [ "$(countlines_)" -ge "$elc" ] || { sleep $delay; return 1; } } +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + +# Speedup the non inotify case +fastpoll='-s.1 --max-unchanged-stats=1' + # === Test: # Retry without --follow results in a warning. touch file tail --retry file > out 2>&1 || fail=1 -[ $( wc -l < out ) = 1 ] || fail=1 -grep -F 'tail: warning: --retry ignored' out || fail=1 +[ "$(countlines_)" = 1 ] || { cat out; fail=1; } +grep -F 'tail: warning: --retry ignored' out || { cat out; fail=1; } # === Test: # The same with a missing file: expect error message and exit 1. tail --retry missing > out 2>&1 && fail=1 -[ $( wc -l < out ) = 2 ] || fail=1 -grep -F 'tail: warning: --retry ignored' out || fail=1 +[ "$(countlines_)" = 2 ] || { cat out; fail=1; } +grep -F 'tail: warning: --retry ignored' out || { cat out; fail=1; } # === Test: # Ensure that "tail --retry --follow=name" waits for the file to appear. # Clear 'out' so that we can check its contents without races >out || framework_failure_ -timeout 10 tail -s.1 --follow=name --retry missing >out 2>&1 & pid=$! -retry_delay_ wait4lines_ .1 6 1 || fail=1 # Wait for "cannot open" error. -echo "X" > missing || fail=1 -retry_delay_ wait4lines_ .1 6 3 || fail=1 # Wait for the expected output. -kill $pid -wait $pid +timeout 10 tail $fastpoll --follow=name --retry missing >out 2>&1 & pid=$! +# Wait for "cannot open" error. +retry_delay_ wait4lines_ .1 6 1 || { cat out; fail=1; } +echo "X" > missing || framework_failure_ +# Wait for the expected output. +retry_delay_ wait4lines_ .1 6 3 || { cat out; fail=1; } +cleanup_ # Expect 3 lines in the output file. -[ $( wc -l < out ) = 3 ] || { fail=1; cat out; } +[ "$(countlines_)" = 3 ] || { fail=1; cat out; } grep -F 'cannot open' out || { fail=1; cat out; } grep -F 'has appeared' out || { fail=1; cat out; } grep '^X$' out || { fail=1; cat out; } @@ -62,14 +76,15 @@ rm -f missing out || framework_failure_ # === Test: # Ensure that "tail --retry --follow=descriptor" waits for the file to appear. # tail-8.21 failed at this (since the implementation of the inotify support). -timeout 10 tail -s.1 --follow=descriptor --retry missing >out 2>&1 & pid=$! -retry_delay_ wait4lines_ .1 6 2 || fail=1 # Wait for "cannot open" error. -echo "X" > missing || fail=1 -retry_delay_ wait4lines_ .1 6 4 || fail=1 # Wait for the expected output. -kill $pid -wait $pid +timeout 10 tail $fastpoll --follow=descriptor --retry missing >out 2>&1 & pid=$! +# Wait for "cannot open" error. +retry_delay_ wait4lines_ .1 6 2 || { cat out; fail=1; } +echo "X" > missing || framework_failure_ +# Wait for the expected output. +retry_delay_ wait4lines_ .1 6 4 || { cat out; fail=1; } +cleanup_ # Expect 4 lines in the output file. -[ $( wc -l < out ) = 4 ] || { fail=1; cat out; } +[ "$(countlines_)" = 4 ] || { fail=1; cat out; } grep -F 'retry only effective for the initial open' out \ || { fail=1; cat out; } grep -F 'cannot open' out || { fail=1; cat out; } @@ -80,13 +95,15 @@ rm -f missing out || framework_failure_ # === Test: # Ensure that tail --follow=descriptor --retry exits when the file appears # untailable. Expect exit status 1. -timeout 10 tail -s.1 --follow=descriptor --retry missing >out 2>&1 & pid=$! -retry_delay_ wait4lines_ .1 6 2 || fail=1 # Wait for "cannot open" error. -mkdir missing || fail=1 # Create untailable 'missing'. -retry_delay_ wait4lines_ .1 6 4 || fail=1 # Wait for the expected output. +timeout 10 tail $fastpoll --follow=descriptor --retry missing >out 2>&1 & pid=$! +# Wait for "cannot open" error. +retry_delay_ wait4lines_ .1 6 2 || { cat out; fail=1; } +mkdir missing || framework_failure_ # Create untailable +# Wait for the expected output. +retry_delay_ wait4lines_ .1 6 4 || { cat out; fail=1; } wait $pid rc=$? -[ $( wc -l < out ) = 4 ] || { fail=1; cat out; } +[ "$(countlines_)" = 4 ] || { fail=1; cat out; } grep -F 'retry only effective for the initial open' out \ || { fail=1; cat out; } grep -F 'cannot open' out || { fail=1; cat out; } @@ -100,14 +117,14 @@ rm -fd missing out || framework_failure_ # file to appear. Expect 2 lines in the output file ("cannot open" + # "no files remaining") and exit status 1. tail --follow=descriptor missing >out 2>&1 && fail=1 -[ $( wc -l < out ) = 2 ] || { fail=1; cat out; } +[ "$(countlines_)" = 2 ] || { fail=1; cat out; } grep -F 'cannot open' out || { fail=1; cat out; } grep -F 'no files remaining' out || { fail=1; cat out; } # === Test: # Likewise for --follow=name (without --retry). tail --follow=name missing >out 2>&1 && fail=1 -[ $( wc -l < out ) = 2 ] || { fail=1; cat out; } +[ "$(countlines_)" = 2 ] || { fail=1; cat out; } grep -F 'cannot open' out || { fail=1; cat out; } grep -F 'no files remaining' out || { fail=1; cat out; } diff --git a/tests/tail-2/start-middle.sh b/tests/tail-2/start-middle.sh index dbf9bae8..9c709aee 100755 --- a/tests/tail-2/start-middle.sh +++ b/tests/tail-2/start-middle.sh @@ -2,7 +2,7 @@ # Verify that tail works even when it's reading from a file # that is not at its beginning. Based on a report from John Roll. -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/tail-2/symlink.sh b/tests/tail-2/symlink.sh index b21f9e15..b5dcbbd6 100755 --- a/tests/tail-2/symlink.sh +++ b/tests/tail-2/symlink.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure tail tracks symlinks properly. -# Copyright (C) 2013-2014 Free Software Foundation, Inc. +# Copyright (C) 2013-2015 Free Software Foundation, Inc. # This 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,13 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail +# Function to count number of lines from tail +# while ignoring transient errors due to resource limits +countlines_ () +{ + grep -Ev 'inotify (resources exhausted|cannot be used)' out | wc -l +} + # Function to check the expected line count in 'out'. # Called via retry_delay_(). Sleep some time - see retry_delay_() - if the # line count is still smaller than expected. @@ -26,43 +33,52 @@ wait4lines_ () { local delay=$1 local elc=$2 # Expected line count. - [ "$( wc -l < out )" -ge "$elc" ] || { sleep $delay; return 1; } + [ "$(countlines_)" -ge "$elc" ] || { sleep $delay; return 1; } } +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + +# speedup non inotify case +fastpoll='-s.1 --max-unchanged-stats=1' + # Ensure changing targets of cli specified symlinks are handled. # Prior to v8.22, inotify would fail to recognize changes in the targets. # Clear 'out' so that we can check its contents without races. >out || framework_failure_ ln -nsf target symlink || framework_failure_ -timeout 10 tail -s.1 -F symlink >out 2>&1 & pid=$! -retry_delay_ wait4lines_ .1 6 1 || fail=1 # Wait for "cannot open..." -echo "X" > target || fail=1 -retry_delay_ wait4lines_ .1 6 3 || fail=1 # Wait for the expected output. -kill $pid -wait $pid +timeout 10 tail $fastpoll -F symlink >out 2>&1 & pid=$! +# Wait for "cannot open..." +retry_delay_ wait4lines_ .1 6 1 || { cat out; fail=1; } +echo "X" > target || framework_failure_ +# Wait for the expected output. +retry_delay_ wait4lines_ .1 6 3 || { cat out; fail=1; } +cleanup_ # Expect 3 lines in the output file. -[ $( wc -l < out ) = 3 ] || { fail=1; cat out; } +[ "$(countlines_)" = 3 ] || { fail=1; cat out; } grep -F 'cannot open' out || { fail=1; cat out; } grep -F 'has appeared' out || { fail=1; cat out; } grep '^X$' out || { fail=1; cat out; } rm -f target out || framework_failure_ # Ensure we correctly handle the source symlink itself changing. -# I.E. that we don't operate solely on the targets. +# I.e., that we don't operate solely on the targets. # Clear 'out' so that we can check its contents without races. >out || framework_failure_ echo "X1" > target1 || framework_failure_ ln -nsf target1 symlink || framework_failure_ -timeout 10 tail -s.1 -F symlink >out 2>&1 & pid=$! -retry_delay_ wait4lines_ .1 6 1 || fail=1 # Wait for the expected output. +timeout 10 tail $fastpoll -F symlink >out 2>&1 & pid=$! +# Wait for the expected output. +retry_delay_ wait4lines_ .1 6 1 || { cat out; fail=1; } ln -nsf target2 symlink || framework_failure_ -retry_delay_ wait4lines_ .1 6 2 || fail=1 # Wait for "become inaccess..." -echo "X2" > target2 || fail=1 -retry_delay_ wait4lines_ .1 6 4 || fail=1 # Wait for the expected output. -kill $pid -wait $pid +# Wait for "become inaccess..." +retry_delay_ wait4lines_ .1 6 2 || { cat out; fail=1; } +echo "X2" > target2 || framework_failure_ +# Wait for the expected output. +retry_delay_ wait4lines_ .1 6 4 || { cat out; fail=1; } +cleanup_ # Expect 4 lines in the output file. -[ $( wc -l < out ) = 4 ] || { fail=1; cat out; } +[ "$(countlines_)" = 4 ] || { fail=1; cat out; } grep -F 'become inacce' out || { fail=1; cat out; } grep -F 'has appeared' out || { fail=1; cat out; } grep '^X1$' out || { fail=1; cat out; } @@ -70,7 +86,7 @@ grep '^X2$' out || { fail=1; cat out; } rm -f target1 target2 out || framework_failure_ # Note other symlink edge cases are currently just diagnosed -# rather than being handled. I.E. if you specify a missing item, +# rather than being handled. I.e., if you specify a missing item, # or existing file that later change to a symlink, if inotify # is in use, you'll get a diagnostic saying that link will # no longer be tailed. diff --git a/tests/tail-2/tail-c.sh b/tests/tail-2/tail-c.sh new file mode 100755 index 00000000..04ff782b --- /dev/null +++ b/tests/tail-2/tail-c.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# exercise tail -c + +# Copyright 2014-2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tail + +# Make sure it works on funny files in /proc and /sys. + +for file in /proc/version /sys/kernel/profiling; do + if test -r $file; then + cp -f $file copy && + tail -c -1 copy > exp1 || framework_failure_ + + tail -c -1 $file > out1 || fail=1 + compare exp1 out1 || fail=1 + fi +done + +Exit $fail diff --git a/tests/tail-2/tail-n0f.sh b/tests/tail-2/tail-n0f.sh index 1d020ac9..ba9f4071 100755 --- a/tests/tail-2/tail-n0f.sh +++ b/tests/tail-2/tail-n0f.sh @@ -2,7 +2,7 @@ # Make sure that 'tail -n0 -f' and 'tail -c0 -f' sleep # rather than doing what amounted to a busy-wait. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This 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,11 +35,13 @@ chmod 0 unreadable || framework_failure_ tail -c0 unreadable || fail=1 tail -n0 unreadable || fail=1 -for inotify in ---disable-inotify ''; do +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + +for mode 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 --sleep=4 -${c_or_n} 0 -f $mode $file & pid=$! tail_sleeping() { local delay="$1"; sleep $delay @@ -52,7 +54,7 @@ for inotify in ---disable-inotify ''; do # 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 + cleanup_ done done done diff --git a/tests/tail-2/truncate.sh b/tests/tail-2/truncate.sh new file mode 100755 index 00000000..82720fda --- /dev/null +++ b/tests/tail-2/truncate.sh @@ -0,0 +1,56 @@ +#!/bin/sh +# Ensure all logs are output upon file truncation + +# Copyright (C) 2015 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src +print_ver_ tail + +check_tail_output() +{ + local delay="$1" + grep "$tail_re" out > /dev/null || + { sleep $delay; return 1; } +} + +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + +# Speedup the non inotify case +fastpoll='-s.1 --max-unchanged-stats=1' + +for follow in '-f' '-F'; do + for mode in '' '---disable-inotify'; do + rm -f out + seq 10 > f || framework_failure_ + + tail $follow $mode $fastpoll f > out 2>&1 & pid=$! + + # Wait up to 12.7s for tail to start + tail_re='^10$' retry_delay_ check_tail_output .1 7 || + { cat out; fail=1; } + + seq 11 15 > f || framework_failure_ + + # Wait up to 12.7s for new data + tail_re='^15$' retry_delay_ check_tail_output .1 7 || + { cat out; fail=1; } + + cleanup_ + done +done + +Exit $fail diff --git a/tests/tail-2/wait.sh b/tests/tail-2/wait.sh index 3dec55c0..2e58e821 100755 --- a/tests/tail-2/wait.sh +++ b/tests/tail-2/wait.sh @@ -2,7 +2,7 @@ # Make sure that 'tail -f' returns immediately if a file doesn't exist # while 'tail -F' waits for it to appear. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This 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,47 +20,60 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ tail +grep '^#define HAVE_INOTIFY 1' "$CONFIG_HEADER" >/dev/null \ + && HAVE_INOTIFY=1 + +inotify_failed_re='inotify (resources exhausted|cannot be used)' + touch here || framework_failure_ { touch unreadable && chmod a-r unreadable; } || framework_failure_ +# Terminate any background tail process +cleanup_() { kill $pid 2>/dev/null && wait $pid; } + +# speedup non inotify case +fastpoll='-s.1 --max-unchanged-stats=1' -for inotify in ---disable-inotify ''; do - timeout 10 tail -s0.1 -f $inotify not_here +for mode in '' '---disable-inotify'; do + timeout 10 tail $fastpoll -f $mode 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 + timeout 10 tail $fastpoll -f $mode unreadable test $? = 124 && fail=1 fi - timeout 1 tail -s0.1 -f $inotify here 2>tail.err + timeout .1 tail $fastpoll -f $mode 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 + timeout .1 tail $fastpoll -F $mode 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 + timeout .1 tail $fastpoll -F $mode unreadable test $? = 124 || fail=1 fi - timeout 1 tail -s0.1 -F $inotify not_here + timeout .1 tail $fastpoll -F $mode not_here test $? = 124 || fail=1 - grep -Ev 'inotify (resources exhausted|cannot be used)' tail.err > x + grep -Ev "$inotify_failed_re" tail.err > x mv x tail.err compare /dev/null tail.err || fail=1 >tail.err +done +if test "$HAVE_INOTIFY"; then + # Ensure -F never follows a descriptor after rename + # either with tiny or significant delays between operations tail_F() { local delay="$1" touch k || framework_failure_ - tail -s.1 --max-unchanged-stats=2 -F $inotify k > tail.out & - pid=$! + tail $fastpoll -F $mode k >tail.out 2>tail.err & pid=$! sleep $delay mv k l sleep $delay @@ -69,12 +82,15 @@ for inotify in ---disable-inotify ''; do sleep $delay echo NO >> l sleep $delay - kill $pid + cleanup_ rm -f k l - test ! -s tail.out + test -s tail.out \ + && ! grep -E "$inotify_failed_re" tail.err >/dev/null } - retry_delay_ tail_F .1 4 || fail=1 -done + + retry_delay_ tail_F 0 1 && { cat tail.out; fail=1; } + retry_delay_ tail_F .2 1 && { cat tail.out; fail=1; } +fi Exit $fail diff --git a/tests/touch/60-seconds.sh b/tests/touch/60-seconds.sh index f0d5b89e..c8b798ea 100755 --- a/tests/touch/60-seconds.sh +++ b/tests/touch/60-seconds.sh @@ -1,7 +1,7 @@ #!/bin/sh # touch -t would mistakenly reject a time specifying "60" seconds -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/touch/dangling-symlink.sh b/tests/touch/dangling-symlink.sh index 9adfd4bd..52845006 100755 --- a/tests/touch/dangling-symlink.sh +++ b/tests/touch/dangling-symlink.sh @@ -2,7 +2,7 @@ # Make sure touch can create a file through a dangling symlink. # This was broken in the 4.0[e-i] test releases. -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/touch/empty-file.sh b/tests/touch/empty-file.sh index e6d1b334..17432aba 100755 --- a/tests/touch/empty-file.sh +++ b/tests/touch/empty-file.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure touch can set the mtime on an empty file. -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/touch/fail-diag.sh b/tests/touch/fail-diag.sh index 191ec30c..86215c68 100755 --- a/tests/touch/fail-diag.sh +++ b/tests/touch/fail-diag.sh @@ -1,7 +1,7 @@ #!/bin/sh # make sure touch gives reasonable diagnostics -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/touch/fifo.sh b/tests/touch/fifo.sh index 71ae7791..f8c6d885 100755 --- a/tests/touch/fifo.sh +++ b/tests/touch/fifo.sh @@ -1,7 +1,7 @@ #!/bin/sh # Make sure touch works on fifos without hanging. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/touch/no-create-missing.sh b/tests/touch/no-create-missing.sh index 7ce63b1b..7ad1a3a9 100755 --- a/tests/touch/no-create-missing.sh +++ b/tests/touch/no-create-missing.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that touch -c no-such-file no longer fails (it did in 4.1.8). -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/touch/no-dereference.sh b/tests/touch/no-dereference.sh index 0f4fdca9..fc0c7237 100755 --- a/tests/touch/no-dereference.sh +++ b/tests/touch/no-dereference.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that touch -h works. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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,8 +26,8 @@ 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 +returns_ 1 touch -h no-file 2> err || fail=1 +compare /dev/null err && fail=1 touch -h -c no-file 2> err || fail=1 compare /dev/null err || fail=1 @@ -75,7 +75,7 @@ touch -h - > file || fail=1 # If stdout is open, it is not a symlink. if env test -w /dev/stdout >/dev/null && env test ! -w /dev/stdout >&-; then - touch -h - >&- && fail=1 + returns_ 1 touch -h - >&- || fail=1 touch -h -c - >&- || fail=1 fi diff --git a/tests/touch/no-rights.sh b/tests/touch/no-rights.sh index 085c8307..baf39d40 100755 --- a/tests/touch/no-rights.sh +++ b/tests/touch/no-rights.sh @@ -2,7 +2,7 @@ # Make sure touch can update the times on a file that is neither # readable nor writable. -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/touch/not-owner.sh b/tests/touch/not-owner.sh index c822f0b5..987b85d2 100755 --- a/tests/touch/not-owner.sh +++ b/tests/touch/not-owner.sh @@ -2,7 +2,7 @@ # Make sure that touch gives reasonable diagnostics when applied # to an unwritable directory owned by some other user. -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/touch/now-owned-by-other.sh b/tests/touch/now-owned-by-other.sh index d01097ed..67789e79 100755 --- a/tests/touch/now-owned-by-other.sh +++ b/tests/touch/now-owned-by-other.sh @@ -1,7 +1,7 @@ #!/bin/sh # Demonstrate that "touch -d now writable-but-owned-by-other" works. -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This 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 @@ chmod g+w root-owned # Ensure that the current directory is searchable by $NON_ROOT_USERNAME. chmod g+x . -chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" \ +chroot --skip-chdir --user=$NON_ROOT_USERNAME / env PATH="$PATH" \ touch -d now root-owned || fail=1 Exit $fail diff --git a/tests/touch/obsolescent.sh b/tests/touch/obsolescent.sh index 7dd1418b..3c4dc734 100755 --- a/tests/touch/obsolescent.sh +++ b/tests/touch/obsolescent.sh @@ -1,7 +1,7 @@ #!/bin/sh # Test touch with obsolescent 8- or 10-digit time stamps. -# Copyright (C) 2000-2014 Free Software Foundation, Inc. +# Copyright (C) 2000-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/touch/read-only.sh b/tests/touch/read-only.sh index d2397385..9cce6478 100755 --- a/tests/touch/read-only.sh +++ b/tests/touch/read-only.sh @@ -1,7 +1,7 @@ #!/bin/sh # ensure that touch can operate on read-only files -# Copyright (C) 2005-2014 Free Software Foundation, Inc. +# Copyright (C) 2005-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/touch/relative.sh b/tests/touch/relative.sh index 396c2f11..acfb03bf 100755 --- a/tests/touch/relative.sh +++ b/tests/touch/relative.sh @@ -2,7 +2,7 @@ # Demonstrate using a combination of --reference and --date to # set the time of a file back by an arbitrary amount. -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/touch/trailing-slash.sh b/tests/touch/trailing-slash.sh index 7e6eb908..2d57007b 100755 --- a/tests/touch/trailing-slash.sh +++ b/tests/touch/trailing-slash.sh @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that touch honors trailing slash. -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # This 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,22 +29,22 @@ 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 +returns_ 1 touch no-file/ || fail=1 +returns_ 1 touch file/ || fail=1 +returns_ 1 touch dangling/ || fail=1 +returns_ 1 touch loop/ || fail=1 +returns_ 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 +returns_ 1 touch -c file/ || fail=1 touch -c dangling/ || fail=1 -touch -c loop/ && fail=1 -touch -c link1/ && fail=1 +returns_ 1 touch -c loop/ || fail=1 +returns_ 1 touch -c link1/ || fail=1 touch -c dir/ || fail=1 -test -f no-file && fail=1 -test -f nowhere && fail=1 +returns_ 1 test -f no-file || fail=1 +returns_ 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 -- cgit v1.2.3